From 6df721f7a9038c78f78891d972add791d757b18f Mon Sep 17 00:00:00 2001
From: Peter Hrvatin <peter.hrvatin@gmail.com>
Date: Mon, 2 May 2022 08:56:58 +0200
Subject: [PATCH] Redesgn popravki napak - popravki textov, neuporabnih
 nastavitev, gdpr linkov

---
 admin/survey/SurveyAdminSettings.php | 10 +++++-----
 admin/survey/classes/class.GDPR.php  |  6 +++---
 lang/1.php                           |  4 ++--
 lang/2.php                           |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 7ab5ef12a..0ecc62f07 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -541,7 +541,7 @@ class SurveyAdminSettings {
 			echo '</div>';
 			
 			// zamakni
-			echo '<div class="setting_holder">';
+			/*echo '<div class="setting_holder">';
 
 			echo '<span class="setting_title">'.$lang['a_show'].'</span>'; 
 			echo '<div class="setting_item">';
@@ -561,7 +561,7 @@ class SurveyAdminSettings {
 			echo Help::display('srv_branching_popup');
 			echo '</div>';
 
-			echo '</div>';
+			echo '</div>';*/
 
 			
 			echo '</fieldset>';
@@ -10426,12 +10426,12 @@ class SurveyAdminSettings {
 			echo '</div>';
 
 			$alternativni_emaili = User::getInstance()->allEmails('brez primarnega');
-
+$alternativni_emaili=array('aaa', 'sss');
 			echo '<div class="setting_holder">';
 			echo '<label>'.$lang['email'].':</label>';
 			echo '<div class="icon_holder">';
 			echo '<input class="large disabled" value="'.$row['email'].'" type="text">';
-				if(!empty($alternativni_emaili))
+			if(!empty($alternativni_emaili))
 				echo '<input name="active_email" value="master" id="active-master" type="radio" '.(User::getInstance()->primaryEmail() == $row['email'] ? 'checked="checked"' : '').'><label for="active-master">'.$lang['login_email_subscription'].'</label>';
 			echo '</div>';
 			echo '</div>';
@@ -10456,7 +10456,7 @@ class SurveyAdminSettings {
 
             echo '<div class="setting_holder dodaj-alternativni-email" style="display: none;">';
 			echo '<div class="setting_item">';
-			echo '<label for="alternativni-email">'.$lang['login_alternative_emails'].' :</label>';
+			echo '<label for="alternativni-email">'.$lang['login_alternative_emails'].':</label>';
 					echo '<div class="vnos button_holder inline bottom0">';
                     echo '<input class="large" id="alternativni-email" value="" type="text">';
                     echo '<button type="button" class="medium blue" onclick="dodajAlternativniEmail()">'.$lang['srv_inv_btn_add_recipients_add'].'</button>';
diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index afa4a3011..c4f5689e2 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -37,7 +37,7 @@ class GDPR{
 		array('country'=>'Portugal', 'drzava'=>'Portugalska', 'name'=>'Filipa CALVÃO', 'title'=>'President, Comissão Nacional de Protecção de Dados', 'email'=>'geral@cnpd.pt', 'phone'=>'+351 21 392 84 00', 'fax'=>'+351 21 397 68 32'),
 		array('country'=>'Romania', 'drzava'=>'Romunija', 'name'=>'Ancuţa Gianina OPRE', 'title'=>'President of the National Supervisory Authority for Personal Data Processing', 'email'=>'anspdcp@dataprotection.ro', 'phone'=>'+40 21 252 5599', 'fax'=>'+40 21 252 5757'),
 		array('country'=>'Slovakia', 'drzava'=>'Slovaška', 'name'=>'Soňa PŐTHEOVÁ', 'title'=>'President of the Office for Personal Data Protection of the Slovak Republic', 'email'=>'statny.dozor@pdp.gov.sk', 'phone'=>'+ 421 2 32 31 32 14', 'fax'=>'+ 421 2 32 31 32 34'),
-		array('country'=>'Slovenia', 'drzava'=>'Slovenija', 'name'=>'Mojca PRELESNIK', 'title'=>'Information Commissioner of the Republic of Slovenia', 'email'=>'gp.ip@ip-rs.si', 'phone'=>'+386 1 230 9730', 'fax'=>'+386 1 230 9778'),
+		array('country'=>'Slovenia', 'drzava'=>'Slovenija', 'name'=>'Mojca PRELESNIK', 'title'=>'Informacijska pooblaščenka Republike Slovenije', 'email'=>'gp.ip@ip-rs.si', 'phone'=>'+386 1 230 9730', 'fax'=>'+386 1 230 9778'),
 		array('country'=>'Spain', 'drzava'=>'Španija', 'name'=>'María del Mar España Martí', 'title'=>'Director of the Spanish Data Protection Agency', 'email'=>'internacional@agpd.es', 'phone'=>'+34 91399 6200', 'fax'=>'+34 91455 5699'),
 		array('country'=>'Sweden', 'drzava'=>'Švedska', 'name'=>'Kristina SVAHN STARRSJÖ', 'title'=>'Director General of the Data Inspection Board', 'email'=>'datainspektionen@datainspektionen.se', 'phone'=>'+46 8 657 6100', 'fax'=>'+46 8 652 8652'),
 		array('country'=>'United Kingdom', 'drzava'=>'Velika Britanija', 'name'=>'Elizabeth DENHAM', 'title'=>'Information Commissioner', 'email'=>'international.team@ico.org.uk', 'phone'=>'+44 1625 545 745', 'fax'=>''),
@@ -1209,8 +1209,8 @@ class GDPR{
 
         echo '<p>'.$lang['srv_gdpr_dpa_text'].'</p>';
         echo '<ul>';
-        echo '  <li><a href="'.$site_url.'uploadi/dokumenti/DPA_SLO.pdf" target="_blank">'.$lang['srv_gdpr_dpa_slo'].'</a>,</li>';
-        echo '  <li><a href="'.$site_url.'uploadi/dokumenti/DPA_ANG.pdf" target="_blank">'.$lang['srv_gdpr_dpa_eng'].'</a>.</li>';
+        echo '  <li><a href="https://www.1ka.si/uploadi/dokumenti/DPA_SLO.pdf" target="_blank">'.$lang['srv_gdpr_dpa_slo'].'</a>,</li>';
+        echo '  <li><a href="https://www.1ka.si/uploadi/dokumenti/DPA_ANG.pdf" target="_blank">'.$lang['srv_gdpr_dpa_eng'].'</a>.</li>';
         echo '</ul>';
 
         echo '<p class="top16">'.$lang['srv_gdpr_dpa_info'].'</p>';
diff --git a/lang/1.php b/lang/1.php
index b05267b75..beec27ef7 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -8007,7 +8007,7 @@ $lang = array (
 	'srv_gdpr_general_settings_warning' => "Prosimo izpolnite osebne podatke GDPR profila!",
 	'srv_gdpr_user_settings' 		=> "Splošne nastavitve",
 	'srv_gdpr_user_settings_title' 	=> "Splošne GDPR nastavitve",
-	'srv_gdpr_user_settings_desc1' 	=> "S 25. majem 2018 je v veljavi nova Splošna uredba o varstvu podatkov (<a href=\"http://www.eugdpr.org/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>), ki opredeljuje tudi način zbiranja podatkov in respondentom zagotavlja možnost izbrisa, vpogleda, prenosa, omejitve obdelave ali spremembe zbranih osebnih in/ali anketnih podatkov.",
+	'srv_gdpr_user_settings_desc1' 	=> "S 25. majem 2018 je v veljavi nova Splošna uredba o varstvu podatkov (<a href=\"https://gdpr.eu/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>), ki opredeljuje tudi način zbiranja podatkov in respondentom zagotavlja možnost izbrisa, vpogleda, prenosa, omejitve obdelave ali spremembe zbranih osebnih in/ali anketnih podatkov.",
 	'srv_gdpr_user_settings_desc2' 	=> "V skladu s tem je na vaši strani, kot izvajalcu ankete in s tem upravljalcu osebnih podatkov, <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/pravice-respondentov-odgovornosti-urednikov-anket-okviru-gdpr\" target=\"_blank\"><span class=\"bold\">odgovornost</span></a>, da izvršite omenjene zahteve, ki jih na vaših anketah podajo respondenti (zahteva za izbris, vpogled ali spremembo osebnih in/ali anketnih podatkov).",
 	'srv_gdpr_user_settings_desc3' 	=> "Prosimo vas, da izpolnite spodnji obrazec s svojimi podatki. Podatke potrebujemo za pripravo informacij, ki morajo biti v skladu z GDPR na voljo posamezniku (respondentu). Če gre za organizacijo, vnesite tudi podatke o pooblaščeni osebi za varstvo osebnih podatkov (<a href=\"https://www.uradni-list.si/e-bilten/novica/pooblascena-oseba-za-varstvo-podatkov\" target=\"_blank\"><span class=\"bold\">DPO</span></a>). Vnesene podatke bomo uporabili zgolj za namene procesiranja zahtevkov.",
 	'srv_gdpr_user_settings_err' 	=> "Polja označena z * so obvezna.",
@@ -8081,7 +8081,7 @@ $lang = array (
 	'srv_gdpr_requests_organization' => "GDDPR podatki organizacije",
 	'srv_gdpr_requests_done' 		=> "Opravljeni zahtevki",
 	'srv_gdpr_survey_settings' 		=> "GDPR nastavitve ankete",
-	'srv_gdpr_survey_settings_desc1' => "S 25. majem 2018 je v veljavi nova uredba o varovanju osebnih podatkov (<a href=\"http://www.eugdpr.org/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>). Za zbiranje kakršnihkoli osebnih podatkov v anketah mora avtor ankete pridobiti ustrezno soglasje respondenta. Respondent se mora z zbiranjem osebnih podatkov izrecno strinjati, sicer ne more izpolnjevati vprašalnika.",
+	'srv_gdpr_survey_settings_desc1' => "S 25. majem 2018 je v veljavi nova uredba o varovanju osebnih podatkov (<a href=\"https://gdpr.eu/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>). Za zbiranje kakršnihkoli osebnih podatkov v anketah mora avtor ankete pridobiti ustrezno soglasje respondenta. Respondent se mora z zbiranjem osebnih podatkov izrecno strinjati, sicer ne more izpolnjevati vprašalnika.",
 	'srv_gdpr_survey_settings_desc2' => "Če v vaši anketi zbirate osebne podatke, prosimo ustrezno označite. Uporabite lahko pred pripravljeno soglasje za zbiranje podatkov ali ga uredite sami. Pred zbiranjem osebnih podatkov poskrbite tudi, da je ustrezno izpolnjen obrazec z vašimi podatki, ki je dostopen",
 	'srv_gdpr_survey_settings_desc3' => "<a href=\"https://www.1ka.si/d/sl/gdpr\" target=\"_blank\"><span class=\"bold\">Več o GDPR >></span></a>",
     
diff --git a/lang/2.php b/lang/2.php
index b87dbb5fd..49ba0f611 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -7892,7 +7892,7 @@ $lang = array (
 	'srv_gdpr_general_settings_warning' => "Please fill in your personal data in your GDPR profile!",
 	'srv_gdpr_user_settings' 			=> "General settings",
 	'srv_gdpr_user_settings_title' 		=> "General GDPR settings",
-	'srv_gdpr_user_settings_desc1' 		=> "Since May 25th, 2018, a new regulation on the protection of personal data (<a href=\"http://www.eugdpr.org/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>) is in force. New regulation also defines the method of collecting data and provides options for respondents, such as deletion, insight and modifying collected personal and/or survey data.",
+	'srv_gdpr_user_settings_desc1' 		=> "Since May 25th, 2018, a new regulation on the protection of personal data (<a href=\"https://gdpr.eu/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>) is in force. New regulation also defines the method of collecting data and provides options for respondents, such as deletion, insight and modifying collected personal and/or survey data.",
 	'srv_gdpr_user_settings_desc2' 		=> "Accordingly, it is your <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/pravice-respondentov-odgovornosti-urednikov-anket-okviru-gdpr\" target=\"_blank\"><span class=\"bold\">responsibility</span></a> to comply with these requirements, which respondents provide in your surveys (request for the deletion, insight or modification of personal and/or survey data).",
 	'srv_gdpr_user_settings_desc3' 		=> "Please fill in the form below with your details. We need the data to produce the information that must be made available to the individual (respondent) in accordance with the GDPR. In case you are an organization, enter also the data about the data protection officer (<a href=\"https://edps.europa.eu/data-protection/data-protection/reference-library/data-protection-officer-dpo_en\" target=\"_blank\"><span class=\"bold\">DPO</span></a>), authorized person for the protection of personal data. We will only use the data entered for the purpose of processing requests.",
 	'srv_gdpr_user_settings_err' 	    => "Fields marked with * are mandatory.",
@@ -7966,7 +7966,7 @@ $lang = array (
 	'srv_gdpr_requests_organization' => "GDPR organization data",
 	'srv_gdpr_requests_done' 		=> "Done requests",
 	'srv_gdpr_survey_settings' 		=> "GDPR survey settings",
-	'srv_gdpr_survey_settings_desc1' => "Since May  25th, 2018, a new regulation on the protection of personal data (<a href=\"http://www.eugdpr.org/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>)) is in force.  In order to collect any personal data in surveys, the author of the survey must obtain the appropriate consent from the respondent. Respondent must clearly agree to the collection of personal data, otherwise he cannot answer the survey.",
+	'srv_gdpr_survey_settings_desc1' => "Since May  25th, 2018, a new regulation on the protection of personal data (<a href=\"https://gdpr.eu/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>)) is in force.  In order to collect any personal data in surveys, the author of the survey must obtain the appropriate consent from the respondent. Respondent must clearly agree to the collection of personal data, otherwise he cannot answer the survey.",
 	'srv_gdpr_survey_settings_desc2' => "If you collect personal information in your survey, please mark it accordingly. You can use our prepared template consent to collect data or edit it yourself. Before collecting personal information, make sure that your GDPR profile form with your data is properly fulfilled",
 	'srv_gdpr_survey_settings_desc3' => "<a href=\"https://www.1ka.si/d/en/gdpr\" target=\"_blank\">More about GDPR >></a>",