diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php index 3d862b9b3..c2a788920 100644 --- a/admin/survey/classes/class.GDPR.php +++ b/admin/survey/classes/class.GDPR.php @@ -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 '
'; echo ''.$lang['srv_gdpr_survey_settings'].''; @@ -693,8 +714,14 @@ class GDPR{ echo ' '.$lang['srv_gdpr_survey_gdpr_other'].':'; echo ' '; echo ' '; - echo '
 '; - echo ' '; + if($language_slo){ + echo '
 '; + echo ' '.$admin_languages['1'].''; + } + if($language_eng){ + echo '
 '; + echo ' '.$admin_languages['2'].''; + } echo ''; @@ -731,7 +758,7 @@ class GDPR{ $about_text = $gdpr_settings['about']; } echo ' '.$lang['srv_gdpr_survey_gdpr_about'].':

'.$lang['srv_gdpr_survey_gdpr_about_note'].''; - echo ' '; + echo ' '; echo '

'; @@ -761,9 +788,14 @@ class GDPR{ echo ' '.$lang['srv_gdpr_survey_gdpr_expire'].':'; echo ' '; - echo '
'; + echo '
 '; echo ' '; - echo ' '; + if($language_slo){ + echo '
  '.$admin_languages['1'].''; + } + if($language_eng){ + echo '
  '.$admin_languages['2'].''; + } echo '

'; @@ -772,9 +804,14 @@ class GDPR{ echo ' '.$lang['srv_gdpr_survey_gdpr_other_users'].':'; echo ' '; - echo '
'; + echo '
 '; echo ' '; - echo ' '; + if($language_slo){ + echo '
  '.$admin_languages['1'].''; + } + if($language_eng){ + echo '
  '.$admin_languages['2'].''; + } echo '

'; @@ -783,15 +820,32 @@ class GDPR{ echo ' '.$lang['srv_gdpr_survey_gdpr_export'].':'; echo ' '; - echo '
'; + echo '
 '; echo ' '; - echo ' '; + if($language_slo){ + echo '
  '.$admin_languages['1'].''; + } + if($language_eng){ + echo '
  '.$admin_languages['2'].''; + } - echo '
'; - echo ' '.$lang['srv_gdpr_survey_gdpr_export_user'].' '; + echo '

'.$lang['srv_gdpr_survey_gdpr_export_user'].':'; + if($language_slo){ + echo ' '.$admin_languages['1'].''; + echo '
'; + } + if($language_eng){ + echo ' '.$admin_languages['2'].''; + } - echo '
'; - echo ' '.$lang['srv_gdpr_survey_gdpr_export_legal'].' '; + echo '

'.$lang['srv_gdpr_survey_gdpr_export_legal'].':'; + if($language_slo){ + echo ' '.$admin_languages['1'].''; + echo '
 '; + } + if($language_eng){ + echo ' '.$admin_languages['2'].''; + } echo '

'; @@ -863,14 +917,19 @@ class GDPR{ // Opomba echo ' '.$lang['note'].':'; - echo ' '; + if($language_slo){ + echo ' '.$admin_languages['1'].''; + echo '  '; + } + if($language_eng){ + echo ' '.$admin_languages['2'].''; + } echo '

'; echo '
'; - // Gumb shrani spremembe echo '
'; @@ -897,13 +956,28 @@ class GDPR{ if(!$userAccess->checkUserAccess($what='gdpr_export')){ $userAccess->displayNoAccess($what='gdpr_export'); } - else{ - echo ' PDF - (Adobe Acrobat)'; - echo '
'; - echo ' DOC - (Microsoft Word)'; - } + else{ - echo '

'; + echo '
'; + + if($language_slo){ + echo ''.$admin_languages['1'].':
'; + echo ' PDF - (Adobe Acrobat)'; + echo '
'; + echo ' DOC - (Microsoft Word)'; + + echo '

'; + } + + if($language_eng){ + echo ''.$admin_languages['2'].':
'; + echo ' PDF - (Adobe Acrobat)'; + echo '
'; + echo ' DOC - (Microsoft Word)'; + + echo '

'; + } + } echo ''; @@ -924,9 +998,26 @@ class GDPR{ $userAccess->displayNoAccess($what='gdpr_export'); } else{ - echo ' PDF - (Adobe Acrobat)'; - echo '
'; - echo ' DOC - (Microsoft Word)'; + + echo '
'; + + if($language_slo){ + echo ''.$admin_languages['1'].':
'; + echo ' PDF - (Adobe Acrobat)'; + echo '
'; + echo ' DOC - (Microsoft Word)'; + + echo '

'; + } + + if($language_eng){ + echo ''.$admin_languages['2'].':
'; + echo ' PDF - (Adobe Acrobat)'; + echo '
'; + echo ' DOC - (Microsoft Word)'; + + echo '

'; + } } echo '

'; @@ -1245,6 +1336,8 @@ class GDPR{ else{ $user_settings = GDPR::getSurveySettings($ank_id); + $translation = ($lang['id'] == '1') ? '_slo' : '_eng'; + $naslov = '

'.$lang['srv_gdpr_intro_title'].'

'; $naslov .= '

'.$lang['srv_gdpr_intro'].':

'; @@ -1260,7 +1353,7 @@ class GDPR{ if($user_settings['web']) $naslov .= '
  • '.$lang['srv_gdpr_intro_web'].'
    • '; if($user_settings['other']) - $naslov .= '
  • '.$lang['srv_gdpr_intro_other'].' - '.$user_settings['other_text'].'
    • '; + $naslov .= '
  • '.$lang['srv_gdpr_intro_other'].' - '.$user_settings['other_text'.$translation].'
    • '; $naslov .= ''; $naslov .= '

    '.$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] .= ' '.substr(ucfirst(strtolower($temp_text)), 0,-2).''; @@ -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] .= ' '.$gdpr_survey_settings['expire_text'].'.'; + if($gdpr_survey_settings['expire'] == '1' && $gdpr_survey_settings['expire_text'.$translation] != '') + $result[1]['text'][2] .= ' '.$gdpr_survey_settings['expire_text'.$translation].'.'; else $result[1]['text'][2] .= ' '.$lang['srv_gdpr_survey_gdpr_about_text2_5'].''; @@ -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'].' '.$gdpr_survey_settings['other_users_text'].'. '; + 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'].' '.$gdpr_survey_settings['other_users_text'.$translation].'. '; else $result[2]['text'][1] = ''.$lang['srv_gdpr_survey_gdpr_about_text3_31'].'.'; @@ -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'].' '.$gdpr_survey_settings['export_country'].' '.$lang['srv_gdpr_survey_gdpr_about_text4_22_3']; - $result[3]['text'][1] = $lang['srv_gdpr_survey_gdpr_about_text4_22_4'].' '.$gdpr_survey_settings['export_user'].''; - $result[3]['text'][1] = ' '.$lang['srv_gdpr_survey_gdpr_about_text4_22_5'].' '.$gdpr_survey_settings['export_legal'].'.'; + $result[3]['text'][0] = $lang['srv_gdpr_survey_gdpr_about_text4_22'].' '.$lang['srv_gdpr_survey_gdpr_about_text4_22_2'].' '.$gdpr_survey_settings['export_country'.$translation].' '.$lang['srv_gdpr_survey_gdpr_about_text4_22_3']; + $result[3]['text'][1] = $lang['srv_gdpr_survey_gdpr_about_text4_22_4'].' '.$gdpr_survey_settings['export_user'.$translation].''; + $result[3]['text'][1] = ' '.$lang['srv_gdpr_survey_gdpr_about_text4_22_5'].' '.$gdpr_survey_settings['export_legal'.$translation].'.'; } else{ $result[3]['text'][0] = ''.$lang['srv_gdpr_survey_gdpr_about_text4_21'].''; @@ -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] = ''.$gdpr_survey_settings['note'].''; + $result[7]['text'][0] = ''.$gdpr_survey_settings['note'.$translation].''; } @@ -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] = ''.substr(ucfirst(strtolower($temp_text)), 0,-2).''; @@ -1939,7 +2034,7 @@ class GDPR{ if($gdpr_survey_settings['expire'] != '1') $result[6]['text'][0] .= ''.$lang['srv_gdpr_survey_gdpr_evidenca_text7_2'].''; else - $result[6]['text'][0] .= ''.$gdpr_survey_settings['expire_text'].'.'; + $result[6]['text'][0] .= ''.$gdpr_survey_settings['expire_text'.$translation].'.'; $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] = ''.ucfirst($gdpr_survey_settings['other_users_text']).''; + $result[7]['text'][2] = ''.ucfirst($gdpr_survey_settings['other_users_text'.$translation]).''; $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] .= ''.$gdpr_survey_settings['export_country'].''; + $result[8]['text'][0] .= ''.$gdpr_survey_settings['export_country'.$translation].''; $result[8]['text'][0] .= $lang['srv_gdpr_survey_gdpr_evidenca_text9_23'].' '; - $result[8]['text'][0] .= ''.$gdpr_survey_settings['export_user'].''; + $result[8]['text'][0] .= ''.$gdpr_survey_settings['export_user'.$translation].''; $result[8]['text'][0] .= $lang['srv_gdpr_survey_gdpr_evidenca_text9_24'].' '; - $result[8]['text'][0] .= ''.$gdpr_survey_settings['export_legal'].'.'; + $result[8]['text'][0] .= ''.$gdpr_survey_settings['export_legal'.$translation].'.'; } else{ $result[8]['text'][0] = ''.$lang['srv_gdpr_survey_gdpr_evidenca_text9_21'].''; @@ -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']); diff --git a/sql/update2.sql b/sql/update2.sql index aeb1b2ddb..237917ae7 100644 --- a/sql/update2.sql +++ b/sql/update2.sql @@ -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"; \ No newline at end of file +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";