Popravki GDPR prevodov
This commit is contained in:
pero1203
parent
4a64b22aee
commit
033068519a
@ -619,6 +619,7 @@ class GDPR{
|
||||
public function displayGDPRSurvey($ank_id){
|
||||
global $site_url;
|
||||
global $lang;
|
||||
global $admin_languages;
|
||||
global $global_user_id;
|
||||
|
||||
$gdpr_settings = self::getSurveySettings($ank_id);
|
||||
@ -629,6 +630,26 @@ class GDPR{
|
||||
else
|
||||
$gdpr_show_advanced = false;
|
||||
|
||||
|
||||
// Preverimo, če imamo anketo v večih jezikih
|
||||
$survey_settings = SurveyInfo::getInstance()->getSurveyRow();
|
||||
|
||||
$language_slo = ($survey_settings['lang_resp'] == 1) ? true : false;
|
||||
$language_eng = ($survey_settings['lang_resp'] > 1) ? true : false;
|
||||
|
||||
$sqlLang = sisplet_query("SELECT lang_id FROM srv_language WHERE ank_id='".$ank_id."' ORDER BY lang_id ASC");
|
||||
while ($rowLang = mysqli_fetch_array($sqlLang)) {
|
||||
|
||||
if($rowLang['lang_id'] == '1'){
|
||||
$language_slo = true;
|
||||
}
|
||||
else{
|
||||
$language_eng = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// GDPR nastavitve ankete
|
||||
echo '<fieldset class="wide">';
|
||||
echo '<legend>'.$lang['srv_gdpr_survey_settings'].'</legend>';
|
||||
@ -693,8 +714,14 @@ class GDPR{
|
||||
echo ' <span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_other'].':</span>';
|
||||
echo ' <label for="other_1"><input type="radio" name="other" id="other_1" '.($gdpr_settings['other'] != 0 ? ' checked':'').' value="1" onChange="showGDPRSettings(); toggleGDPROtherText(this);">'.$lang['yes'].'</label> ';
|
||||
echo ' <label for="other_0"><input type="radio" name="other" id="other_0" '.($gdpr_settings['other'] == 0 ? ' checked':'').' value="0" onChange="showGDPRSettings(); toggleGDPROtherText(this);">'.$lang['no'].'</label> ';
|
||||
echo ' <br /><span class="nastavitveSpan1"> </span>';
|
||||
echo ' <textarea class="other" name="other_text" id="other_text" style="width:550px; height:80px; margin-top:10px; '.($gdpr_settings['other'] == 0 ? ' display:none;' : '').'">'.$gdpr_settings['other_text'].'</textarea>';
|
||||
if($language_slo){
|
||||
echo ' <br /><span class="nastavitveSpan1"> </span>';
|
||||
echo ' <textarea class="other" name="other_text_slo" id="other_text_slo" style="width:500px; height:80px; margin-top:10px; '.($gdpr_settings['other'] == 0 ? ' display:none;' : '').'">'.$gdpr_settings['other_text_slo'].'</textarea> <span class="italic">'.$admin_languages['1'].'</span>';
|
||||
}
|
||||
if($language_eng){
|
||||
echo ' <br /><span class="nastavitveSpan1"> </span>';
|
||||
echo ' <textarea class="other" name="other_text_eng" id="other_text_eng" style="width:500px; height:80px; margin-top:10px; '.($gdpr_settings['other'] == 0 ? ' display:none;' : '').'">'.$gdpr_settings['other_text_eng'].'</textarea> <span class="italic">'.$admin_languages['2'].'</span>';
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
|
||||
@ -731,7 +758,7 @@ class GDPR{
|
||||
$about_text = $gdpr_settings['about'];
|
||||
}
|
||||
echo ' <span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_about'].':<br /><br /><span class="italic">'.$lang['srv_gdpr_survey_gdpr_about_note'].'</span></span>';
|
||||
echo ' <textarea name="about" id="about" style="width:550px; height:200px;" disabled="disabled">'.$about_text.'</textarea> ';
|
||||
echo ' <textarea name="about" id="about" style="width:500px; height:200px;" disabled="disabled">'.$about_text.'</textarea> ';
|
||||
|
||||
echo '<br /><br />';
|
||||
|
||||
@ -761,9 +788,14 @@ class GDPR{
|
||||
echo ' <span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_expire'].':</span>';
|
||||
echo ' <label for="expire_0"><input type="radio" name="expire" id="expire_0" '.($gdpr_settings['expire'] == 0 ? ' checked':'').' value="0" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_expire_0'].'</label> ';
|
||||
|
||||
echo ' <br /><span class="nastavitveSpan1"></span>';
|
||||
echo ' <br /><span class="nastavitveSpan1"> </span>';
|
||||
echo ' <label for="expire_1"><input type="radio" name="expire" id="expire_1" '.($gdpr_settings['expire'] != 0 ? ' checked':'').' value="1" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_expire_1'].'</label> ';
|
||||
echo ' <input type="text" class="line_text expire" placeholder="'.$lang['srv_gdpr_survey_gdpr_expire_1_placeholder'].'" name="expire_text" id="expire_text" value="'.$gdpr_settings['expire_text'].'" '.($gdpr_settings['expire'] == 0 ? ' disabled="disabled"' : '').'>';
|
||||
if($language_slo){
|
||||
echo ' <br /><span class="nastavitveSpan1"> </span><input type="text" class="line_text expire" placeholder="'.$lang['srv_gdpr_survey_gdpr_expire_1_placeholder'].'" name="expire_text_slo" id="expire_text_slo" value="'.$gdpr_settings['expire_text_slo'].'" '.($gdpr_settings['expire'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['1'].'</span>';
|
||||
}
|
||||
if($language_eng){
|
||||
echo ' <br /><span class="nastavitveSpan1"> </span><input type="text" class="line_text expire" placeholder="'.$lang['srv_gdpr_survey_gdpr_expire_1_placeholder'].'" name="expire_text_eng" id="expire_text_eng" value="'.$gdpr_settings['expire_text_eng'].'" '.($gdpr_settings['expire'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['2'].'</span>';
|
||||
}
|
||||
|
||||
echo ' <br /><br />';
|
||||
|
||||
@ -772,9 +804,14 @@ class GDPR{
|
||||
echo ' <span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_other_users'].':</span>';
|
||||
echo ' <label for="other_users_0"><input type="radio" name="other_users" id="other_users_0" '.($gdpr_settings['other_users'] == 0 ? ' checked':'').' value="0" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_other_users_0'].'</label> ';
|
||||
|
||||
echo ' <br /><span class="nastavitveSpan1"></span>';
|
||||
echo ' <br /><span class="nastavitveSpan1"> </span>';
|
||||
echo ' <label for="other_users_1"><input type="radio" name="other_users" id="other_users_1" '.($gdpr_settings['other_users'] != 0 ? ' checked':'').' value="1" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_other_users_1'].'</label> ';
|
||||
echo ' <input type="text" class="line_text other_users" placeholder="'.$lang['srv_gdpr_survey_gdpr_other_users_1_placeholder'].'" name="other_users_text" id="other_users_text" value="'.$gdpr_settings['other_users_text'].'" '.($gdpr_settings['other_users'] == 0 ? ' disabled="disabled"' : '').'>';
|
||||
if($language_slo){
|
||||
echo ' <br /><span class="nastavitveSpan1"> </span><input type="text" class="line_text other_users" placeholder="'.$lang['srv_gdpr_survey_gdpr_other_users_1_placeholder'].'" name="other_users_text_slo" id="other_users_text_slo" value="'.$gdpr_settings['other_users_text_slo'].'" '.($gdpr_settings['other_users'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['1'].'</span>';
|
||||
}
|
||||
if($language_eng){
|
||||
echo ' <br /><span class="nastavitveSpan1"> </span><input type="text" class="line_text other_users" placeholder="'.$lang['srv_gdpr_survey_gdpr_other_users_1_placeholder'].'" name="other_users_text_eng" id="other_users_text_eng" value="'.$gdpr_settings['other_users_text_eng'].'" '.($gdpr_settings['other_users'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['2'].'</span>';
|
||||
}
|
||||
|
||||
echo ' <br /><br />';
|
||||
|
||||
@ -783,15 +820,32 @@ class GDPR{
|
||||
echo ' <span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_export'].':</span>';
|
||||
echo ' <label for="export_0"><input type="radio" name="export" id="export_0" '.($gdpr_settings['export'] == 0 ? ' checked':'').' value="0" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_export_0'].'</label> ';
|
||||
|
||||
echo ' <br /><span class="nastavitveSpan1"></span>';
|
||||
echo ' <br /><span class="nastavitveSpan1"> </span>';
|
||||
echo ' <label for="export_1"><input type="radio" name="export" id="export_1" '.($gdpr_settings['export'] != 0 ? ' checked':'').' value="1" onClick="toggleGDPRInfoText(this);">'.$lang['srv_gdpr_survey_gdpr_export_country'].'</label> ';
|
||||
echo ' <input type="text" class="line_text export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_country_placeholder'].'" name="export_country" id="export_country" value="'.$gdpr_settings['export_country'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'>';
|
||||
if($language_slo){
|
||||
echo ' <br /><span class="nastavitveSpan1"> </span><input type="text" class="line_text export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_country_placeholder'].'" name="export_country_slo" id="export_country_slo" value="'.$gdpr_settings['export_country_slo'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['1'].'</span>';
|
||||
}
|
||||
if($language_eng){
|
||||
echo ' <br /><span class="nastavitveSpan1"> </span><input type="text" class="line_text export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_country_placeholder'].'" name="export_country_eng" id="export_country_eng" value="'.$gdpr_settings['export_country_eng'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['2'].'</span>';
|
||||
}
|
||||
|
||||
echo ' <br /><span class="nastavitveSpan1"></span>';
|
||||
echo ' <span style="padding-left:21px;">'.$lang['srv_gdpr_survey_gdpr_export_user'].'</span> <input type="text" class="line_text export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_user_placeholder'].'" name="export_user" id="export_user" value="'.$gdpr_settings['export_user'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'>';
|
||||
echo ' <br /><br /><span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_export_user'].':</span>';
|
||||
if($language_slo){
|
||||
echo ' <input type="text" class="line_text export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_user_placeholder'].'" name="export_user_slo" id="export_user_slo" value="'.$gdpr_settings['export_user_slo'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['1'].'</span>';
|
||||
echo ' <br />';
|
||||
}
|
||||
if($language_eng){
|
||||
echo ' <input type="text" class="line_text export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_user_placeholder'].'" name="export_user_eng" id="export_user_eng" value="'.$gdpr_settings['export_user_eng'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['2'].'</span>';
|
||||
}
|
||||
|
||||
echo ' <br /><span class="nastavitveSpan1"></span>';
|
||||
echo ' <span style="padding-left:21px;">'.$lang['srv_gdpr_survey_gdpr_export_legal'].'</span> <input type="text" class="line_text long export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_legal_placeholder'].'" name="export_legal" id="export_legal" value="'.$gdpr_settings['export_legal'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'>';
|
||||
echo '<br /><br /><span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_export_legal'].':</span>';
|
||||
if($language_slo){
|
||||
echo ' <input type="text" class="line_text long export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_legal_placeholder'].'" name="export_legal_slo" id="export_legal_slo" value="'.$gdpr_settings['export_legal_slo'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['1'].'</span>';
|
||||
echo ' <br /><span class="nastavitveSpan1"> </span>';
|
||||
}
|
||||
if($language_eng){
|
||||
echo ' <input type="text" class="line_text long export" placeholder="'.$lang['srv_gdpr_survey_gdpr_export_legal_placeholder'].'" name="export_legal_eng" id="export_legal_eng" value="'.$gdpr_settings['export_legal_eng'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'> <span class="italic">'.$admin_languages['2'].'</span>';
|
||||
}
|
||||
|
||||
echo ' <br /><br />';
|
||||
|
||||
@ -863,14 +917,19 @@ class GDPR{
|
||||
|
||||
// Opomba
|
||||
echo ' <span class="nastavitveSpan1">'.$lang['note'].':</span>';
|
||||
echo ' <textarea name="note" id="note" style="width:550px; height:80px;">'.$gdpr_settings['note'].'</textarea>';
|
||||
if($language_slo){
|
||||
echo ' <textarea name="note_slo" id="note_slo" style="width:500px; height:80px;">'.$gdpr_settings['note_slo'].'</textarea> <span class="italic">'.$admin_languages['1'].'</span>';
|
||||
echo ' <span class="nastavitveSpan1"> </span>';
|
||||
}
|
||||
if($language_eng){
|
||||
echo ' <textarea name="note_eng" id="note_eng" style="width:500px; height:80px;">'.$gdpr_settings['note_eng'].'</textarea> <span class="italic">'.$admin_languages['2'].'</span>';
|
||||
}
|
||||
|
||||
echo ' <br /><br />';
|
||||
|
||||
echo '</fieldset>';
|
||||
|
||||
|
||||
|
||||
// Gumb shrani spremembe
|
||||
echo '<br class="clr" />';
|
||||
|
||||
@ -897,13 +956,28 @@ class GDPR{
|
||||
if(!$userAccess->checkUserAccess($what='gdpr_export')){
|
||||
$userAccess->displayNoAccess($what='gdpr_export');
|
||||
}
|
||||
else{
|
||||
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_individual&anketa='.$ank_id).'" target="_blank"><span class="faicon pdf"></span> PDF - (Adobe Acrobat)</a>';
|
||||
echo ' <br />';
|
||||
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_individual&anketa='.$ank_id).'" target="_blank"><span class="faicon rtf"></span> DOC - (Microsoft Word)</a>';
|
||||
}
|
||||
else{
|
||||
|
||||
echo ' <br /><br />';
|
||||
echo '<br />';
|
||||
|
||||
if($language_slo){
|
||||
echo '<span class="bold">'.$admin_languages['1'].':</span><br />';
|
||||
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_individual&anketa='.$ank_id.'&language=1').'" target="_blank"><span class="faicon pdf"></span> PDF - (Adobe Acrobat)</a>';
|
||||
echo '<br />';
|
||||
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_individual&anketa='.$ank_id.'&language=1').'" target="_blank"><span class="faicon rtf"></span> DOC - (Microsoft Word)</a>';
|
||||
|
||||
echo '<br /><br />';
|
||||
}
|
||||
|
||||
if($language_eng){
|
||||
echo '<span class="bold">'.$admin_languages['2'].':</span><br />';
|
||||
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_individual&anketa='.$ank_id.'&language=2').'" target="_blank"><span class="faicon pdf"></span> PDF - (Adobe Acrobat)</a>';
|
||||
echo '<br />';
|
||||
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_individual&anketa='.$ank_id.'&language=2').'" target="_blank"><span class="faicon rtf"></span> DOC - (Microsoft Word)</a>';
|
||||
|
||||
echo '<br /><br />';
|
||||
}
|
||||
}
|
||||
|
||||
echo '</fieldset>';
|
||||
|
||||
@ -924,9 +998,26 @@ class GDPR{
|
||||
$userAccess->displayNoAccess($what='gdpr_export');
|
||||
}
|
||||
else{
|
||||
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_activity&anketa='.$ank_id).'" target="_blank"><span class="faicon pdf"></span> PDF - (Adobe Acrobat)</a>';
|
||||
echo ' <br />';
|
||||
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_activity&anketa='.$ank_id).'" target="_blank"><span class="faicon rtf"></span> DOC - (Microsoft Word)</a>';
|
||||
|
||||
echo '<br />';
|
||||
|
||||
if($language_slo){
|
||||
echo '<span class="bold">'.$admin_languages['1'].':</span><br />';
|
||||
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_activity&anketa='.$ank_id.'&language=1').'" target="_blank"><span class="faicon pdf"></span> PDF - (Adobe Acrobat)</a>';
|
||||
echo ' <br />';
|
||||
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_activity&anketa='.$ank_id.'&language=1').'" target="_blank"><span class="faicon rtf"></span> DOC - (Microsoft Word)</a>';
|
||||
|
||||
echo '<br /><br />';
|
||||
}
|
||||
|
||||
if($language_eng){
|
||||
echo '<span class="bold">'.$admin_languages['2'].':</span><br />';
|
||||
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_gdpr_activity&anketa='.$ank_id.'&language=2').'" target="_blank"><span class="faicon pdf"></span> PDF - (Adobe Acrobat)</a>';
|
||||
echo ' <br />';
|
||||
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_gdpr_activity&anketa='.$ank_id.'&language=2').'" target="_blank"><span class="faicon rtf"></span> DOC - (Microsoft Word)</a>';
|
||||
|
||||
echo '<br /><br />';
|
||||
}
|
||||
}
|
||||
|
||||
echo ' <br /><br />';
|
||||
@ -1245,6 +1336,8 @@ class GDPR{
|
||||
else{
|
||||
$user_settings = GDPR::getSurveySettings($ank_id);
|
||||
|
||||
$translation = ($lang['id'] == '1') ? '_slo' : '_eng';
|
||||
|
||||
$naslov = '<h3 style="margin-top: 0;">'.$lang['srv_gdpr_intro_title'].'</h3>';
|
||||
|
||||
$naslov .= '<p>'.$lang['srv_gdpr_intro'].':</p>';
|
||||
@ -1260,7 +1353,7 @@ class GDPR{
|
||||
if($user_settings['web'])
|
||||
$naslov .= '<li>'.$lang['srv_gdpr_intro_web'].'</li>';
|
||||
if($user_settings['other'])
|
||||
$naslov .= '<li>'.$lang['srv_gdpr_intro_other'].' - '.$user_settings['other_text'].'</li>';
|
||||
$naslov .= '<li>'.$lang['srv_gdpr_intro_other'].' - '.$user_settings['other_text'.$translation].'</li>';
|
||||
$naslov .= '</ul>';
|
||||
|
||||
$naslov .= '<p>'.$lang['srv_gdpr_intro2'];
|
||||
@ -1723,6 +1816,7 @@ class GDPR{
|
||||
$gdpr_settings = self::getUserSettings();
|
||||
$gdpr_survey_settings = self::getSurveySettings($ank_id);
|
||||
|
||||
$translation = ($lang['id'] == '1') ? '_slo' : '_eng';
|
||||
|
||||
$result = array();
|
||||
|
||||
@ -1748,7 +1842,7 @@ class GDPR{
|
||||
if($gdpr_survey_settings['web'])
|
||||
$temp_text .= $lang['srv_gdpr_intro_web'].', ';
|
||||
if($gdpr_survey_settings['other'])
|
||||
$temp_text .= $lang['srv_gdpr_intro_other'].' - '.$gdpr_survey_settings['other_text'].', ';
|
||||
$temp_text .= $lang['srv_gdpr_intro_other'].' - '.$gdpr_survey_settings['other_text'.$translation].', ';
|
||||
|
||||
$result[0]['text'][2] .= ' <strong>'.substr(ucfirst(strtolower($temp_text)), 0,-2).'</strong>';
|
||||
|
||||
@ -1759,8 +1853,8 @@ class GDPR{
|
||||
$result[1]['text'][1] = $lang['srv_gdpr_survey_gdpr_about_text2_3'];
|
||||
$result[1]['text'][2] = $lang['srv_gdpr_survey_gdpr_about_text2_4'];
|
||||
|
||||
if($gdpr_survey_settings['expire'] == '1' && $gdpr_survey_settings['expire_text'] != '')
|
||||
$result[1]['text'][2] .= ' <strong>'.$gdpr_survey_settings['expire_text'].'</strong>.';
|
||||
if($gdpr_survey_settings['expire'] == '1' && $gdpr_survey_settings['expire_text'.$translation] != '')
|
||||
$result[1]['text'][2] .= ' <strong>'.$gdpr_survey_settings['expire_text'.$translation].'</strong>.';
|
||||
else
|
||||
$result[1]['text'][2] .= ' <strong>'.$lang['srv_gdpr_survey_gdpr_about_text2_5'].'</strong>';
|
||||
|
||||
@ -1769,8 +1863,8 @@ class GDPR{
|
||||
$result[2]['heading'] = $lang['srv_gdpr_survey_gdpr_about_text3_1'];
|
||||
$result[2]['text'][0] = $lang['srv_gdpr_survey_gdpr_about_text3_2'];
|
||||
|
||||
if($gdpr_survey_settings['other_users'] == '1' && $gdpr_survey_settings['other_users_text'] != '')
|
||||
$result[2]['text'][1] = $lang['srv_gdpr_survey_gdpr_about_text3_32'].' <strong>'.$gdpr_survey_settings['other_users_text'].'</strong>. ';
|
||||
if($gdpr_survey_settings['other_users'] == '1' && $gdpr_survey_settings['other_users_text'.$translation] != '')
|
||||
$result[2]['text'][1] = $lang['srv_gdpr_survey_gdpr_about_text3_32'].' <strong>'.$gdpr_survey_settings['other_users_text'.$translation].'</strong>. ';
|
||||
else
|
||||
$result[2]['text'][1] = '<strong>'.$lang['srv_gdpr_survey_gdpr_about_text3_31'].'.</strong>';
|
||||
|
||||
@ -1781,9 +1875,9 @@ class GDPR{
|
||||
$result[3]['heading'] = $lang['srv_gdpr_survey_gdpr_about_text4_1'];
|
||||
|
||||
if($gdpr_survey_settings['export'] == '1'){
|
||||
$result[3]['text'][0] = $lang['srv_gdpr_survey_gdpr_about_text4_22'].' '.$lang['srv_gdpr_survey_gdpr_about_text4_22_2'].' <strong>'.$gdpr_survey_settings['export_country'].'</strong> '.$lang['srv_gdpr_survey_gdpr_about_text4_22_3'];
|
||||
$result[3]['text'][1] = $lang['srv_gdpr_survey_gdpr_about_text4_22_4'].' <strong>'.$gdpr_survey_settings['export_user'].'</strong>';
|
||||
$result[3]['text'][1] = ' '.$lang['srv_gdpr_survey_gdpr_about_text4_22_5'].' <strong>'.$gdpr_survey_settings['export_legal'].'</strong>.';
|
||||
$result[3]['text'][0] = $lang['srv_gdpr_survey_gdpr_about_text4_22'].' '.$lang['srv_gdpr_survey_gdpr_about_text4_22_2'].' <strong>'.$gdpr_survey_settings['export_country'.$translation].'</strong> '.$lang['srv_gdpr_survey_gdpr_about_text4_22_3'];
|
||||
$result[3]['text'][1] = $lang['srv_gdpr_survey_gdpr_about_text4_22_4'].' <strong>'.$gdpr_survey_settings['export_user'.$translation].'</strong>';
|
||||
$result[3]['text'][1] = ' '.$lang['srv_gdpr_survey_gdpr_about_text4_22_5'].' <strong>'.$gdpr_survey_settings['export_legal'.$translation].'</strong>.';
|
||||
}
|
||||
else{
|
||||
$result[3]['text'][0] = '<strong>'.$lang['srv_gdpr_survey_gdpr_about_text4_21'].'</strong>';
|
||||
@ -1857,9 +1951,9 @@ class GDPR{
|
||||
|
||||
|
||||
// OPOMBA
|
||||
if($gdpr_survey_settings['note'] != ''){
|
||||
if($gdpr_survey_settings['note'.$translation] != ''){
|
||||
$result[7]['heading'] = $lang['note'];
|
||||
$result[7]['text'][0] = '<strong>'.$gdpr_survey_settings['note'].'</strong>';
|
||||
$result[7]['text'][0] = '<strong>'.$gdpr_survey_settings['note'.$translation].'</strong>';
|
||||
}
|
||||
|
||||
|
||||
@ -1874,6 +1968,7 @@ class GDPR{
|
||||
$gdpr_settings = self::getUserSettings();
|
||||
$gdpr_survey_settings = self::getSurveySettings($ank_id);
|
||||
|
||||
$translation = ($lang['id'] == '1') ? '_slo' : '_eng';
|
||||
|
||||
$result = array();
|
||||
|
||||
@ -1923,7 +2018,7 @@ class GDPR{
|
||||
if($gdpr_survey_settings['web'])
|
||||
$temp_text .= $lang['srv_gdpr_intro_web'].', ';
|
||||
if($gdpr_survey_settings['other'])
|
||||
$temp_text .= $lang['srv_gdpr_intro_other'].' - '.$gdpr_survey_settings['other_text'].', ';
|
||||
$temp_text .= $lang['srv_gdpr_intro_other'].' - '.$gdpr_survey_settings['other_text'.$translation].', ';
|
||||
|
||||
$result[4]['text'][0] = '<strong>'.substr(ucfirst(strtolower($temp_text)), 0,-2).'</strong>';
|
||||
|
||||
@ -1939,7 +2034,7 @@ class GDPR{
|
||||
if($gdpr_survey_settings['expire'] != '1')
|
||||
$result[6]['text'][0] .= '<strong>'.$lang['srv_gdpr_survey_gdpr_evidenca_text7_2'].'</strong>';
|
||||
else
|
||||
$result[6]['text'][0] .= '<strong>'.$gdpr_survey_settings['expire_text'].'</strong>.';
|
||||
$result[6]['text'][0] .= '<strong>'.$gdpr_survey_settings['expire_text'.$translation].'</strong>.';
|
||||
|
||||
|
||||
$result[7]['heading'] = 'VIII. '.$lang['srv_gdpr_survey_gdpr_evidenca_text8'];
|
||||
@ -1947,18 +2042,18 @@ class GDPR{
|
||||
$result[7]['text'][1] = $lang['srv_gdpr_survey_gdpr_evidenca_text8_2'];
|
||||
|
||||
if($gdpr_survey_settings['other_users'] == '1')
|
||||
$result[7]['text'][2] = '<strong>'.ucfirst($gdpr_survey_settings['other_users_text']).'</strong>';
|
||||
$result[7]['text'][2] = '<strong>'.ucfirst($gdpr_survey_settings['other_users_text'.$translation]).'</strong>';
|
||||
|
||||
|
||||
$result[8]['heading'] = 'IX. '.$lang['srv_gdpr_survey_gdpr_evidenca_text9'];
|
||||
|
||||
if($gdpr_survey_settings['export'] == '1'){
|
||||
$result[8]['text'][0] = $lang['srv_gdpr_survey_gdpr_evidenca_text9_22'].' ';
|
||||
$result[8]['text'][0] .= '<strong>'.$gdpr_survey_settings['export_country'].'</strong>';
|
||||
$result[8]['text'][0] .= '<strong>'.$gdpr_survey_settings['export_country'.$translation].'</strong>';
|
||||
$result[8]['text'][0] .= $lang['srv_gdpr_survey_gdpr_evidenca_text9_23'].' ';
|
||||
$result[8]['text'][0] .= '<strong>'.$gdpr_survey_settings['export_user'].'</strong>';
|
||||
$result[8]['text'][0] .= '<strong>'.$gdpr_survey_settings['export_user'.$translation].'</strong>';
|
||||
$result[8]['text'][0] .= $lang['srv_gdpr_survey_gdpr_evidenca_text9_24'].' ';
|
||||
$result[8]['text'][0] .= '<strong>'.$gdpr_survey_settings['export_legal'].'</strong>.';
|
||||
$result[8]['text'][0] .= '<strong>'.$gdpr_survey_settings['export_legal'.$translation].'</strong>.';
|
||||
}
|
||||
else{
|
||||
$result[8]['text'][0] = '<strong>'.$lang['srv_gdpr_survey_gdpr_evidenca_text9_21'].'</strong>';
|
||||
@ -1970,9 +2065,9 @@ class GDPR{
|
||||
|
||||
|
||||
// OPOMBA
|
||||
if($gdpr_survey_settings['note'] != ''){
|
||||
if($gdpr_survey_settings['note'.$translation] != ''){
|
||||
$result[10]['heading'] = 'XI. '.$lang['note'];
|
||||
$result[10]['text'][0] = $gdpr_survey_settings['note'];
|
||||
$result[10]['text'][0] = $gdpr_survey_settings['note'.$translation];
|
||||
}
|
||||
|
||||
|
||||
@ -2185,23 +2280,30 @@ class GDPR{
|
||||
$phone = isset($_POST['phone']) ? $_POST['phone'] : '';
|
||||
$web = isset($_POST['web']) ? $_POST['web'] : '';
|
||||
$other = isset($_POST['other']) ? $_POST['other'] : '';
|
||||
$other_text = isset($_POST['other_text']) ? $_POST['other_text'] : '';
|
||||
$other_text_slo = isset($_POST['other_text_slo']) ? $_POST['other_text_slo'] : '';
|
||||
$other_text_eng = isset($_POST['other_text_eng']) ? $_POST['other_text_eng'] : '';
|
||||
|
||||
$template_1ka = isset($_POST['1ka_template']) ? $_POST['1ka_template'] : '';
|
||||
|
||||
$about = (isset($_POST['about'])) ? $_POST['about'] : '';
|
||||
|
||||
$expire = isset($_POST['expire']) ? $_POST['expire'] : '';
|
||||
$expire_text = isset($_POST['expire_text']) ? $_POST['expire_text'] : '';
|
||||
$expire_text_slo = isset($_POST['expire_text_slo']) ? $_POST['expire_text_slo'] : '';
|
||||
$expire_text_eng = isset($_POST['expire_text_eng']) ? $_POST['expire_text_eng'] : '';
|
||||
$other_users = isset($_POST['other_users']) ? $_POST['other_users'] : '';
|
||||
$other_users_text = isset($_POST['other_users_text']) ? $_POST['other_users_text'] : '';
|
||||
$other_users_text_slo = isset($_POST['other_users_text_slo']) ? $_POST['other_users_text_slo'] : '';
|
||||
$other_users_text_eng = isset($_POST['other_users_text_eng']) ? $_POST['other_users_text_eng'] : '';
|
||||
$export = isset($_POST['export']) ? $_POST['export'] : '';
|
||||
$export_country = isset($_POST['export_country']) ? $_POST['export_country'] : '';
|
||||
$export_user = isset($_POST['export_user']) ? $_POST['export_user'] : '';
|
||||
$export_legal = isset($_POST['export_legal']) ? $_POST['export_legal'] : '';
|
||||
$export_country_slo = isset($_POST['export_country_slo']) ? $_POST['export_country_slo'] : '';
|
||||
$export_country_eng = isset($_POST['export_country_eng']) ? $_POST['export_country_eng'] : '';
|
||||
$export_user_slo = isset($_POST['export_user_slo']) ? $_POST['export_user_slo'] : '';
|
||||
$export_user_eng = isset($_POST['export_user_eng']) ? $_POST['export_user_eng'] : '';
|
||||
$export_legal_slo = isset($_POST['export_legal_slo']) ? $_POST['export_legal_slo'] : '';
|
||||
$export_legal_eng = isset($_POST['export_legal_eng']) ? $_POST['export_legal_eng'] : '';
|
||||
$authorized = isset($_POST['authorized']) ? $_POST['authorized'] : '';
|
||||
$contact_email = isset($_POST['contact_email']) ? $_POST['contact_email'] : '';
|
||||
$note = isset($_POST['note']) ? $_POST['note'] : '';
|
||||
$note_slo = isset($_POST['note_slo']) ? $_POST['note_slo'] : '';
|
||||
$note_eng = isset($_POST['note_eng']) ? $_POST['note_eng'] : '';
|
||||
|
||||
$sql = sisplet_query("INSERT INTO srv_gdpr_anketa (
|
||||
ank_id,
|
||||
@ -2212,19 +2314,26 @@ class GDPR{
|
||||
phone,
|
||||
web,
|
||||
other,
|
||||
other_text,
|
||||
other_text_slo,
|
||||
other_text_eng,
|
||||
about,
|
||||
expire,
|
||||
expire_text,
|
||||
expire_text_slo,
|
||||
expire_text_eng,
|
||||
other_users,
|
||||
other_users_text,
|
||||
other_users_text_slo,
|
||||
other_users_text_eng,
|
||||
export,
|
||||
export_user,
|
||||
export_country,
|
||||
export_legal,
|
||||
export_user_slo,
|
||||
export_user_eng,
|
||||
export_country_slo,
|
||||
export_country_eng,
|
||||
export_legal_slo,
|
||||
export_legal_eng,
|
||||
authorized,
|
||||
contact_email,
|
||||
note
|
||||
note_slo,
|
||||
note_eng
|
||||
)
|
||||
VALUES (
|
||||
'".$ank_id."',
|
||||
@ -2235,19 +2344,26 @@ class GDPR{
|
||||
'".$phone."',
|
||||
'".$web."',
|
||||
'".$other."',
|
||||
'".$other_text."',
|
||||
'".$other_text_slo."',
|
||||
'".$other_text_eng."',
|
||||
'".$about."',
|
||||
'".$expire."',
|
||||
'".$expire_text."',
|
||||
'".$expire_text_slo."',
|
||||
'".$expire_text_eng."',
|
||||
'".$other_users."',
|
||||
'".$other_users_text."',
|
||||
'".$other_users_text_slo."',
|
||||
'".$other_users_text_eng."',
|
||||
'".$export."',
|
||||
'".$export_user."',
|
||||
'".$export_country."',
|
||||
'".$export_legal."',
|
||||
'".$export_user_slo."',
|
||||
'".$export_user_eng."',
|
||||
'".$export_country_slo."',
|
||||
'".$export_country_eng."',
|
||||
'".$export_legal_slo."',
|
||||
'".$export_legal_eng."',
|
||||
'".$authorized."',
|
||||
'".$contact_email."',
|
||||
'".$note."'
|
||||
'".$note_slo."',
|
||||
'".$note_eng."'
|
||||
)
|
||||
ON DUPLICATE KEY UPDATE
|
||||
1ka_template='".$template_1ka."',
|
||||
@ -2257,19 +2373,26 @@ class GDPR{
|
||||
phone='".$phone."',
|
||||
web='".$web."',
|
||||
other='".$other."',
|
||||
other_text='".$other_text."',
|
||||
other_text_slo='".$other_text_slo."',
|
||||
other_text_eng='".$other_text_eng."',
|
||||
about='".$about."',
|
||||
expire='".$expire."',
|
||||
expire_text='".$expire_text."',
|
||||
expire_text_slo='".$expire_text_slo."',
|
||||
expire_text_eng='".$expire_text_eng."',
|
||||
other_users='".$other_users."',
|
||||
other_users_text='".$other_users_text."',
|
||||
other_users_text_slo='".$other_users_text_slo."',
|
||||
other_users_text_eng='".$other_users_text_eng."',
|
||||
export='".$export."',
|
||||
export_user='".$export_user."',
|
||||
export_country='".$export_country."',
|
||||
export_legal='".$export_legal."',
|
||||
export_user_slo='".$export_user_slo."',
|
||||
export_user_eng='".$export_user_eng."',
|
||||
export_country_slo='".$export_country_slo."',
|
||||
export_country_eng='".$export_country_eng."',
|
||||
export_legal_slo='".$export_legal_slo."',
|
||||
export_legal_eng='".$export_legal_eng."',
|
||||
authorized='".$authorized."',
|
||||
contact_email='".$contact_email."',
|
||||
note='".$note."'"
|
||||
note_slo='".$note_slo."',
|
||||
note_eng='".$note_eng."'"
|
||||
);
|
||||
if (!$sql)
|
||||
echo mysqli_error($GLOBALS['connect_db']);
|
||||
|
||||
@ -9443,4 +9443,31 @@ UPDATE misc SET value='20.12.06' WHERE what="version";
|
||||
|
||||
# Drupal verzija je bila posodobljena in vpišemo na 1ka.si in te
|
||||
UPDATE misc SET value='7.78' WHERE what="drupal version";
|
||||
UPDATE misc SET value='21.02.04' WHERE what="version";
|
||||
UPDATE misc SET value='21.02.04' WHERE what="version";
|
||||
|
||||
## Dodana moznost prevodov za gdpr nastavitve
|
||||
ALTER TABLE srv_gdpr_anketa CHANGE COLUMN other_text other_text_slo VARCHAR(255) character set utf8 NOT NULL DEFAULT '';
|
||||
ALTER TABLE srv_gdpr_anketa CHANGE COLUMN expire_text expire_text_slo VARCHAR(255) character set utf8 NOT NULL DEFAULT '';
|
||||
ALTER TABLE srv_gdpr_anketa CHANGE COLUMN other_users_text other_users_text_slo VARCHAR(255) character set utf8 NOT NULL DEFAULT '';
|
||||
ALTER TABLE srv_gdpr_anketa CHANGE COLUMN export_country export_country_slo VARCHAR(255) character set utf8 NOT NULL DEFAULT '';
|
||||
ALTER TABLE srv_gdpr_anketa CHANGE COLUMN export_user export_user_slo VARCHAR(255) character set utf8 NOT NULL DEFAULT '';
|
||||
ALTER TABLE srv_gdpr_anketa CHANGE COLUMN export_legal export_legal_slo VARCHAR(255) character set utf8 NOT NULL DEFAULT '';
|
||||
ALTER TABLE srv_gdpr_anketa CHANGE COLUMN note note_slo TEXT NOT NULL DEFAULT '';
|
||||
|
||||
ALTER TABLE srv_gdpr_anketa ADD COLUMN other_text_eng VARCHAR(255) character set utf8 NOT NULL DEFAULT '' AFTER other_text_slo;
|
||||
ALTER TABLE srv_gdpr_anketa ADD COLUMN expire_text_eng VARCHAR(255) character set utf8 NOT NULL DEFAULT '' AFTER expire_text_slo;
|
||||
ALTER TABLE srv_gdpr_anketa ADD COLUMN other_users_text_eng VARCHAR(255) character set utf8 NOT NULL DEFAULT '' AFTER other_users_text_slo;
|
||||
ALTER TABLE srv_gdpr_anketa ADD COLUMN export_country_eng VARCHAR(255) character set utf8 NOT NULL DEFAULT '' AFTER export_country_slo;
|
||||
ALTER TABLE srv_gdpr_anketa ADD COLUMN export_user_eng VARCHAR(255) character set utf8 NOT NULL DEFAULT '' AFTER export_user_slo;
|
||||
ALTER TABLE srv_gdpr_anketa ADD COLUMN export_legal_eng VARCHAR(255) character set utf8 NOT NULL DEFAULT '' AFTER export_legal_slo;
|
||||
ALTER TABLE srv_gdpr_anketa ADD COLUMN note_eng TEXT NOT NULL DEFAULT '' AFTER note_slo;
|
||||
|
||||
UPDATE srv_gdpr_anketa SET other_text_eng = other_text_slo;
|
||||
UPDATE srv_gdpr_anketa SET expire_text_eng = expire_text_slo;
|
||||
UPDATE srv_gdpr_anketa SET other_users_text_eng = other_users_text_slo;
|
||||
UPDATE srv_gdpr_anketa SET export_country_eng = export_country_slo;
|
||||
UPDATE srv_gdpr_anketa SET export_user_eng = export_user_slo;
|
||||
UPDATE srv_gdpr_anketa SET export_legal_eng = export_legal_slo;
|
||||
UPDATE srv_gdpr_anketa SET note_eng = note_slo;
|
||||
|
||||
UPDATE misc SET value='21.02.16' WHERE what="version";
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user