diff options
Diffstat (limited to 'admin/survey/classes/class.GDPR.php')
| -rw-r--r-- | admin/survey/classes/class.GDPR.php | 1208 |
1 files changed, 758 insertions, 450 deletions
diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php index c5a6c2c..6bb7b2b 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'=>''),
@@ -55,53 +55,102 @@ class GDPR{ global $site_url;
global $lang;
- $survey_list = array();
- $survey_list = $this->getUserSurveys();
+ // Dobimo seznam vseh anket in stevilke
+ list($survey_list, $survey_count) = $this->getUserSurveys();
+
+
+ // 3 boxi na vrhu za filtriranje tabele (gdpr ankete, ne-gdpr ankete, potencialno gdpr ankete)
+ echo '<div class="gdpr-box-container">';
+
+ // Box 1 - gdpr ankete
+ echo ' <div class= "num_box num_box1 checked" id="num_box1" onclick="gdpr_ankete()">';
+
+ echo ' <div id="box_flex" class="box_flex">';
+ echo ' <input type="checkbox" name="GDPR ankete checkbox" id="gdpr_ankete_check" checked="checked" onclick="gdpr_ankete()">';
+ echo ' <div class="naslov_gdpr">'.$lang['srv_gdpr_survey_list_gdpr_surveys'].'</div>';
+ echo ' </div>';
+
+
+ echo ' <div class="box_text">';
+ echo ' <p id="p_num_of_surveys1"> <span class="num_of_surveys" id="num_of_surveys1"> '.$survey_count['gdpr'].' </span> '.$lang['srv_gdpr_survey_list_gdpr_surveys_note'].'</p>';
+ echo ' </div>';
+ echo ' </div>';
+
+ // Box 2 - gdpr ankete
+ echo ' <div class= "num_box num_box2 checked" id="num_box2" onclick="potenc_gdpr_ankete()">';
+
+ echo ' <div id="box_flex" class="box_flex potenc_gdpr">';
+ echo ' <input type="checkbox" name="Potencialno GDPR ankete" id="potenc_gdpr_ankete_check" checked="checked" onclick="potenc_gdpr_ankete()">';
+ echo ' <div class="naslov_gdpr">'.$lang['srv_gdpr_survey_list_potenc_gdpr_surveys'].'</div>';
+ echo ' </div>';
+
+ echo ' <div class="box_text">';
+ echo ' <p id="p_num_of_surveys2"> <span class="num_of_surveys" id="num_of_surveys2"> '.$survey_count['potential_gdpr'].' </span> '.$lang['srv_gdpr_survey_list_potenc_gdpr_surveys_note'].'</p>';
+ echo ' </div>';
- echo '<div style="font-style:italic; margin-top:-10px;">';
+ echo ' </div>';
+
+ // Box 3 - gdpr ankete
+ echo ' <div class= "num_box num_box3 checked" id="num_box3" onclick="ne_gdpr_ankete()">';
- echo '<p>'.$lang['srv_gdpr_survey_list_text'].'</p>';
+ echo ' <div id="box_flex" class="box_flex no_gdpr">';
+ echo ' <input type="checkbox" name="ne-gdpr ankete" id="ne_gdpr_ankete" checked="checked" onclick="ne_gdpr_ankete()" >';
+ echo ' <div class="naslov_gdpr">'.$lang['srv_gdpr_survey_list_no_gdpr_surveys'].'</div>';
+ echo ' </div>';
- echo $lang['srv_gdpr_survey_list_text2'].'<ul style="margin-top:2px;">';
- echo ' <li>'.$lang['srv_gdpr_survey_list_li_1'].'</li>';
- echo ' <li>'.$lang['srv_gdpr_survey_list_li_2'].'</li>';
- echo ' <li>'.$lang['srv_gdpr_survey_list_li_3'].'</li>';
- echo ' <li>'.$lang['srv_gdpr_survey_list_li_4'].'</li>';
- echo '</ul>';
+ echo ' <div class="box_text">';
+ echo ' <p id="p_num_of_surveys3"> <span class="num_of_surveys" id="num_of_surveys3"> '.$survey_count['no_gdpr'].' </span> '.$lang['srv_gdpr_survey_list_no_gdpr_surveys_note'].'</p>';
+ echo ' </div>';
- echo '<p>'.$lang['srv_gdpr_survey_list_text3'].'</p>';
+ echo ' </div>';
echo '</div>';
+ // Text med nastavitvami in tabelo
+ echo '<p class="bottom16">'.$lang['srv_gdpr_survey_list_text'].'</p>';
+
+ echo '<p class="top16 bottom16">'.$lang['srv_gdpr_survey_list_text3'].'</p>';
+
+
+ // Tabela anket
echo '<table class="gdpr_surveys">';
- echo '<tr>';
- echo '<th>'.$lang['srv_gdpr_survey_list_survey'].'</th>';
- echo '<th>'.$lang['srv_gdpr_survey_list_activity'].'</th>';
- echo '<th>'.$lang['srv_gdpr_survey_list_pot_gdpr'].'</th>';
- echo '<th>'.$lang['srv_gdpr_survey_list_gdpr'].'</th>';
- echo '</tr>';
+ // Naslovna vrstica
+ echo ' <tr>';
+ echo ' <th class="center">GDPR</th>';
+ echo ' <th>'.$lang['srv_gdpr_survey_list_survey'].'</th>';
+ echo ' <th>'.$lang['srv_gdpr_survey_list_activity'].'</th>';
+ echo ' <th>'.$lang['srv_gdpr_survey_list_pot_gdpr'].'</th>';
+ echo ' </tr>';
foreach($survey_list as $anketa){
// Nastavimo barvo vrstice
if($anketa['gdpr'] == 1)
- $color = ' class="green_row"';
+ $color = 'green_row';
elseif($anketa['potential_gdpr'] == 1)
- $color = ' class="red_row"';
+ $color = 'red_row';
else
- $color = '';
+ $color = 'grey_row';
+
+ echo '<tr class="'.$color.'">';
- echo '<tr '.$color.'>';
+ if($anketa['active']==1)
+ $anketa_active = $lang['yes'];
+ else
+ $anketa_active = $lang['no'];
- echo '<td><a href="'.$site_url.'admin/survey/index.php?anketa='.$anketa['id'].'&a=gdpr_settings">'.$anketa['naslov'].'</a></td>';
- echo '<td>'.$anketa['active'].'</td>';
- echo '<td>'.$anketa['potential_gdpr'].'</td>';
+ if($anketa['potential_gdpr']==1)
+ $anketa_potential_gdpr = $lang['yes'];
+ else
+ $anketa_potential_gdpr = $lang['no'];
- //echo '<td>'.$anketa['gdpr'].'</td>';
- echo '<td><input type="checkbox" value="1" class="pointer" onClick="setGDPRSurvey(\''.$anketa['id'].'\', this.checked); return false;" '.($anketa['gdpr'] == '1' ? ' checked="checked"' : '').'</td>';
+ echo ' <td class="center"><input type="checkbox" id="gdpr_'.$anketa['id'].'" value="1" onClick="setGDPRSurvey(\''.$anketa['id'].'\', this.checked); return false;" '.($anketa['gdpr'] == '1' ? ' checked="checked"' : '').'><label class="empty" for="gdpr_'.$anketa['id'].'"></label></td>';
+ echo ' <td><a href="'.$site_url.'admin/survey/index.php?anketa='.$anketa['id'].'&a=gdpr_settings">'.$anketa['naslov'].'</a></td>';
+ echo ' <td>'.$anketa_active.'</td>';
+ echo ' <td>'.$anketa_potential_gdpr.'</td>';
echo '</tr>';
}
@@ -116,48 +165,64 @@ class GDPR{ $user_settings = self::getUserSettings();
+ $preklici_url = ltrim(str_replace("&s=1","",$_SERVER['REQUEST_URI']),"/");
+ $preklici_url = "'". $site_url . $preklici_url . "'";
+
echo '<form name="settingsgdpr" id="form_gdpr_user_settings" method="post">';
echo ' <input name="submited" value="1" type="hidden">';
echo ' <fieldset><legend>'.$lang['srv_gdpr_user_settings_title'].'</legend>';
- echo '<p class="italic">'.$lang['srv_gdpr_user_settings_desc1'].'<br />';
- echo $lang['srv_gdpr_user_settings_desc2'].'<br /><br />';
- echo $lang['srv_gdpr_user_settings_desc3'].'</p>';
+ echo '<p class="bottom16">'.$lang['srv_gdpr_user_settings_desc1'].'</p>';
+ echo '<p class="bottom16">'.$lang['srv_gdpr_user_settings_desc2'].'</p>';
+ echo '<p class="bottom16">'.$lang['srv_gdpr_user_settings_desc3'].'</p>';
// PODATKI AVTORJA
// Opozorilo za obvezna polja
- if($user_settings['firstname'] == '' || $user_settings['lastname'] == '' || $user_settings['email'] == '')
- echo '<p><span class="red bold">'.$lang['srv_gdpr_user_settings_err'].'</span></p>';
- else
- echo '<br />';
-
- echo ' <div class="setting '.($user_settings['firstname'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_firstname'].':</label></span> ';
- echo ' <input class="text" name="firstname" value="'.$user_settings['firstname'].'" type="text"></div>';
+ echo '<p class="red bottom16">'.$lang['srv_gdpr_user_settings_err'].'</p>';
- echo ' <div class="setting '.($user_settings['lastname'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_lastname'].':</label></span> ';
- echo ' <input class="text" name="lastname" value="'.$user_settings['lastname'].'" type="text"></div>';
+ echo '<div class="setting_horizontal_wrapper">';
- $email = ($user_settings['email'] == '') ? User::getInstance()->primaryEmail() : $user_settings['email'];
- echo ' <div class="setting '.($user_settings['email'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_email'].':</label></span> ';
- echo ' <input class="text '.(isset($error['email']) ? ' red' : '').'" name="email" value="'.$email.'" type="text"> '.(isset($error['email']) ? '<span class="red italic">'.$lang['srv_remind_email_hard'].'</span>' : '').'</div>';
+ echo '<div class="setting_holder '.($user_settings['firstname'] == '' ? ' red' : '').'">';
+ echo '<label for="firstname">'.$lang['srv_gdpr_user_settings_firstname'].'*:</label>';
+ echo '<input class="large w200" id="firstname" name="firstname" value="'.$user_settings['firstname'].'" type="text">';
+ echo '</div>';
- echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_phone'].':</label></span> ';
- echo ' <input class="text" name="phone" value="'.$user_settings['phone'].'" type="text"></div>';
+ echo '<div class="setting_holder '.($user_settings['lastname'] == '' ? ' red' : '').'">';
+ echo '<label for="lastname">'.$lang['srv_gdpr_user_settings_lastname'].'*:</label>';
+ echo '<input class="large w200" id="lastname" name="lastname" value="'.$user_settings['lastname'].'" type="text">';
+ echo '</div>';
- echo ' <br />';
-
- // Naslov in drzava
- echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_address'].':</label></span> ';
- echo ' <input class="text" name="address" value="'.$user_settings['address'].'" type="text"></div>';
+ echo '</div>';
+
+ echo '<div class="setting_horizontal_wrapper">';
+
+ $email = ($user_settings['email'] == '') ? User::getInstance()->primaryEmail() : $user_settings['email'];
+ echo '<div class="setting_holder '.($user_settings['email'] == '' ? ' red' : '').'">';
+ echo '<label for="email">'.$lang['srv_gdpr_user_settings_email'].'*:</label>';
+ echo '<input class="large w200 '.(isset($error['email']) ? ' red' : '').'" id="email" name="email" value="'.$email.'" type="text"> '.(isset($error['email']) ? '<span class="red italic">'.$lang['srv_remind_email_hard'].'</span>' : '');
+ echo '</div>';
+
+ echo '<div class="setting_holder">';
+ echo '<label>'.$lang['srv_gdpr_user_settings_phone'].':</label>';
+ echo '<input class="large w200" name="phone" value="'.$user_settings['phone'].'" type="text">';
+ echo '</div>';
+
+ echo '</div>';
- echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_country'].':</label></span> ';
+ echo '<div class="setting_horizontal_wrapper">';
+ // Naslov in drzava
+ echo '<div class="setting_holder">';
+ echo '<label for="address">'.$lang['srv_gdpr_user_settings_address'].':</label>';
+ echo '<input class="large w200" name="address" value="'.$user_settings['address'].'" type="text">';
+ echo '</div>';
- echo ' <select name="country" onChange="editGDPRAuthority(this.value); return false;">';
- //echo ' <option value="" '.($user_settings['country'] == '' ? ' selected="selected"' : '').'>'.$lang['srv_gdpr_user_settings_country_select'].'</option>';
- $country_filter = array();
+ echo '<div class="setting_holder">';
+ echo '<label for="country">'.$lang['srv_gdpr_user_settings_country'].':</label>';
+ echo '<select class="dropdown large w200" id="country" name="country" onChange="editGDPRAuthority(this.value); return false;">';
+ $country_filter = array();
foreach(self::$authorities as $authority){
if (in_array($authority['country'], $country_filter)) {
@@ -171,94 +236,122 @@ class GDPR{ $country_filter[] = $authority['country'];
}
- echo ' </select>';
- echo ' </div>';
-
-
- echo ' <br />';
-
+ echo '</select>';
+ echo '</div>';
+
+ echo '</div>';
// ORGANIZACIJA ALI ZASEBNIK
- echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_type'].':</label></span> ';
- echo ' <label for="type_0"><input class="radio" name="type" id="type_0" value="0" type="radio" '.($user_settings['type'] != '1' ? ' checked="checked"' : '').' onClick="toggleGDPRDPO();"> '.$lang['srv_gdpr_user_settings_type_0'].'</label>';
- echo ' <label for="type_1"><input class="radio" name="type" id="type_1" value="1" type="radio" '.($user_settings['type'] == '1' ? ' checked="checked"' : '').' onClick="toggleGDPRDPO();"> '.$lang['srv_gdpr_user_settings_type_1'].'</label>';
- echo ' </div>';
+ echo '<div class="setting_holder">';
+ echo '<span class="setting_title">'.$lang['srv_gdpr_user_settings_type'].':</span> ';
+
+ echo '<div class="setting_item">';
+ echo '<input class="radio" name="type" id="type_0" value="0" type="radio" '.($user_settings['type'] != '1' ? ' checked="checked"' : '').' onClick="toggleGDPRDPO();">';
+ echo '<label for="type_0"> '.$lang['srv_gdpr_user_settings_type_0'].'</label>';
+ echo '</div>';
+ echo '<div class="setting_item">';
+ echo '<input class="radio" name="type" id="type_1" value="1" type="radio" '.($user_settings['type'] == '1' ? ' checked="checked"' : '').' onClick="toggleGDPRDPO();">';
+ echo '<label for="type_1"> '.$lang['srv_gdpr_user_settings_type_1'].'</label>';
+ echo '</div>';
+
+ echo '</div>';
// PODATKI PODJETJA
- echo ' <div id="gdpr_organization" '.($user_settings['type'] != '1' ? ' style="display:none;"' : '').'>';
+ echo ' <div id="gdpr_organization" '.($user_settings['type'] != '1' ? ' class="displayNone"' : '').'>';
- // Opozorilo za obvezna polja
- if($user_settings['organization'] == '' || $user_settings['organization_maticna'] == '')
- echo '<p><span class="red bold">'.$lang['srv_gdpr_user_settings_err2'].'</span></p>';
+ echo '<div class="setting_horizontal_wrapper">';
- echo ' <div class="setting '.($user_settings['organization'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_organization'].':</label></span> ';
- echo ' <input class="text" name="organization" value="'.$user_settings['organization'].'" type="text"></div>';
-
- echo ' <div class="setting '.($user_settings['organization_maticna'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_organization_maticna'].':</label></span> ';
- echo ' <input class="text" name="organization_maticna" value="'.$user_settings['organization_maticna'].'" type="text"></div>';
-
- /*echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_organization_davcna'].':</label></span> ';
- echo ' <input class="text" name="organization_davcna" value="'.$user_settings['organization_davcna'].'" type="text"></div>';*/
-
- echo ' </div>';
+ echo '<div class="setting_holder '.($user_settings['organization'] == '' ? 'red' : '').'">';
+ echo '<label for="organization">'.$lang['srv_gdpr_user_settings_organization'].'*:</label>';
+ echo '<input class="large w200" id="organization" name="organization" value="'.$user_settings['organization'].'" type="text">';
+ echo '</div>';
+
+ echo '<div class="setting_holder '.($user_settings['organization_maticna'] == '' ? 'red' : '').'">';
+ echo '<label for="organization_maticna">'.$lang['srv_gdpr_user_settings_organization_maticna'].'*:</label>';
+ echo '<input class="large w200" id="organization_maticna" name="organization_maticna" value="'.$user_settings['organization_maticna'].'" type="text">';
+ echo '</div>';
+
+ echo '</div>';
+ echo '</div>';
// IMA DPO
- echo ' <div id="gdpr_has_dpo" '.($user_settings['type'] != '0' ? ' style="display:none;"' : '').'>';
-
- echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_has_dpo'].':</label></span> ';
- echo ' <label for="has_dpo_0"><input class="radio" name="has_dpo" id="has_dpo_0" value="0" type="radio" '.($user_settings['has_dpo'] != '1' ? ' checked="checked"' : '').' onClick="toggleGDPRHasDPO();"> '.$lang['no'].'</label>';
- echo ' <label for="has_dpo_1"><input class="radio" name="has_dpo" id="has_dpo_1" value="1" type="radio" '.($user_settings['has_dpo'] == '1' ? ' checked="checked"' : '').' onClick="toggleGDPRHasDPO();"> '.$lang['yes'].'</label>';
- echo ' </div>';
-
- echo '<br /><br />';
+ echo '<div id="gdpr_has_dpo" '.($user_settings['type'] != '0' ? ' class="displayNone"' : '').'>';
- echo ' </div>';
+ echo '<div class="setting_holder bottom16">';
+ echo '<span class="setting_title">'.$lang['srv_gdpr_user_settings_has_dpo'].':</span>';
+
+ echo '<div class="setting_item">';
+ echo '<input class="radio" name="has_dpo" id="has_dpo_0" value="0" type="radio" '.($user_settings['has_dpo'] != '1' ? ' checked="checked"' : '').' onClick="toggleGDPRHasDPO();">';
+ echo '<label for="has_dpo_0"> '.$lang['no'].'</label>';
+ echo '</div>';
+
+ echo '<div class="setting_item">';
+ echo '<input class="radio" name="has_dpo" id="has_dpo_1" value="1" type="radio" '.($user_settings['has_dpo'] == '1' ? ' checked="checked"' : '').' onClick="toggleGDPRHasDPO();">';
+ echo '<label for="has_dpo_1"> '.$lang['yes'].'</label>';
+ echo '</div>';
+
+ echo '</div>';
+
+ echo '</div>';
// DPO
- echo ' <div id="gdpr_dpo" '.($user_settings['type'] != '1' && $user_settings['has_dpo'] != '1' ? ' style="display:none;"' : '').'>';
+
+ echo '<div id="gdpr_dpo" '.($user_settings['type'] != '1' && $user_settings['has_dpo'] != '1' ? ' class="displayNone"' : '').'>';
- echo ' <p class="bold">'.$lang['srv_gdpr_user_settings_dpo'].':</p>';
+ echo '<p class="bottom16">'.$lang['srv_gdpr_user_settings_dpo'].':</p>';
- // Opozorilo za obvezna polja
- if($user_settings['dpo_firstname'] == '' || $user_settings['dpo_lastname'] == '' || $user_settings['dpo_email'] == '')
- echo '<p><span class="red bold">'.$lang['srv_gdpr_user_settings_err'].'</span></p>';
- else
- echo '<br />';
-
- echo ' <div class="setting '.($user_settings['dpo_firstname'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_dpo_firstname'].':</label></span> ';
- echo ' <input class="text" name="dpo_firstname" value="'.$user_settings['dpo_firstname'].'" type="text"></div>';
-
- echo ' <div class="setting '.($user_settings['dpo_lastname'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_dpo_lastname'].':</label></span> ';
- echo ' <input class="text" name="dpo_lastname" value="'.$user_settings['dpo_lastname'].'" type="text"></div>';
-
- echo ' <div class="setting '.($user_settings['dpo_email'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_dpo_email'].':</label></span> ';
- echo ' <input class="text '.(isset($error['dpo_email']) ? ' red' : '').'" name="dpo_email" value="'.$user_settings['dpo_email'].'" type="text"> '.(isset($error['dpo_email']) ? '<span class="red italic">'.$lang['srv_remind_email_hard'].'</span>' : '').'</div>';
-
- echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_dpo_phone'].':</label></span> ';
- echo ' <input class="text" name="dpo_phone" value="'.$user_settings['dpo_phone'].'" type="text"></div>';
-
- echo ' </div>';
+ echo '<div class="setting_horizontal_wrapper">';
+
+ echo '<div class="setting_holder '.($user_settings['dpo_firstname'] == '' ? ' red' : '').'">';
+ echo '<label for="dpo_firstname">'.$lang['srv_gdpr_user_settings_dpo_firstname'].'*:</label>';
+ echo '<input class="large w200" id="dpo_firstname" name="dpo_firstname" value="'.$user_settings['dpo_firstname'].'" type="text">';
+ echo '</div>';
+
+ echo '<div class="setting_holder '.($user_settings['dpo_lastname'] == '' ? ' red' : '').'">';
+ echo '<label for="dpo_lastname">'.$lang['srv_gdpr_user_settings_dpo_lastname'].'*:</label>';
+ echo '<input class="large w200" id="dpo_lastname" name="dpo_lastname" value="'.$user_settings['dpo_lastname'].'" type="text">';
+ echo '</div>';
+
+ echo '</div>';
+
+ echo '<div class="setting_horizontal_wrapper">';
+
+ echo '<div class="setting_holder '.($user_settings['dpo_email'] == '' ? ' red' : '').'">';
+ echo '<label for="dpo_email">'.$lang['srv_gdpr_user_settings_dpo_email'].'*:</label>';
+ echo '<input class="large w200 '.(isset($error['dpo_email']) ? ' red' : '').'" id="dpo_email" name="dpo_email" value="'.$user_settings['dpo_email'].'" type="text"> '.(isset($error['dpo_email']) ? '<span class="red italic">'.$lang['srv_remind_email_hard'].'</span>' : '');
+ echo '</div>';
+
+ echo '<div class="setting_holder ">';
+ echo '<label>'.$lang['srv_gdpr_user_settings_dpo_phone'].':</label>';
+ echo '<input class="large w200" name="dpo_phone" value="'.$user_settings['dpo_phone'].'" type="text">';
+ echo '</div>';
+ echo '</div>';
+
+ echo '</div>';
// Podatki trenutne avtoritete
- echo '<div id="gdpr_authority_info">';
+ echo '<div class="setting_holder" id="gdpr_authority_info">';
self::displayGDPRAuthority($user_settings['country']);
echo '</div>';
- echo ' </fieldset>';
+ echo '</fieldset>';
// Gumb shrani
- echo '<div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="editGDPRProfile(); return false;"><span>'.$lang['edit1337'].'</span></a></div>';
-
+ echo '<div class="button_holder">';
+ echo '<button class="medium white-blue" onClick="window.location='.$preklici_url.';return false;">'.$lang['edit1338'].'</button>';
+ echo '<button class="medium blue" onclick="editGDPRProfile(); return false;">'.$lang['edit1337'].'</button>';
+ echo '</div>';
+
// div za prikaz uspešnosti shranjevanja
- if ($_GET['s'] == '1') {
+ if (isset($_GET['s']) && $_GET['s'] == '1') {
echo '<span class="clr"></span>';
echo '<div id="success_save"></div>';
- echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>';
+ echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>';
}
echo '</form>';
@@ -280,22 +373,22 @@ class GDPR{ $current_authorities[] = $authority;
}
- echo '<p class="bold">'.$lang['srv_gdpr_user_settings_authority'].':</p>';
+ echo '<p class="bottom8">'.$lang['srv_gdpr_user_settings_authority'].':</p>';
// Prikazemo podatke za vse avtoritete (lahko jih je vec na drzavo)
foreach ($current_authorities as $authority) {
echo '<div class="gdpr_authority_info_data">';
if($authority['name'] != '')
- echo '<span class="bold">'.$authority['name'].'</span><br />';
+ echo '<span class="authority_name">'.$authority['name'].'</span><br />';
if($authority['title'] != '')
echo '<span>'.$authority['title'].'</span><br />';
if($authority['email'] != '')
- echo '<span class="spaceLeft">'.$lang['srv_gdpr_user_settings_email'].': '.$authority['email'].'</span><br />';
+ echo '<span class="spaceLeft">'.$lang['srv_gdpr_user_settings_email'].': <div class="bold" > '.$authority['email'].'</div></span>';
if($authority['phone'] != '')
- echo '<span class="spaceLeft">'.$lang['srv_gdpr_user_settings_phone'].': '.$authority['phone'].'</span><br />';
+ echo '<span class="spaceLeft">'.$lang['srv_gdpr_user_settings_phone'].': <div class="bold" > '.$authority['phone'].'</div></span>';
if($authority['fax'] != '')
- echo '<span class="spaceLeft">Fax: '.$authority['fax'].'</span><br />';
+ echo '<span class="spaceLeft">Fax: <div class="bold" > '.$authority['fax'].'</div></span><br />';
echo '</div>';
}
@@ -307,9 +400,8 @@ class GDPR{ global $site_url;
global $lang;
- echo '<div style="font-style:italic; margin-top:-10px;">';
- echo '<p>'.$lang['srv_gdpr_requests_desc'].'</p>';
- echo '</div>';
+
+ echo '<p class="bottom16">'.$lang['srv_gdpr_requests_desc'].'</p>';
// Seznam cakajocih zahtevkov
$request_list = array();
@@ -319,108 +411,114 @@ class GDPR{ $request_list_done = array();
$request_list_done = $this->getUserRequests($ank_id=0, $status=1);
+
+ // Nimamo zahtevkov
+ if(count($request_list) == 0 &&count($request_list_done) == 0){
+ echo '<div class="gdpr_request_table_title bottom8">'.$lang['srv_gdpr_requests_none'].'</div>';
+ return;
+ }
+
+
+ // Tabela neizvrsenih zahtevkov
if(count($request_list) > 0){
+
+ echo '<div class="gdpr_request_table_title bottom8">'.$lang['srv_gdpr_requests_list_unresolved'].'</div>';
+
+ echo '<div class="table-horizontal-scroll-wrapper-outer" id="gdrp_requests_unresolved">';
+ echo '<div class="table-horizontal-scroll-wrapper-inner">';
echo '<table class="gdpr_surveys requests">';
echo '<tr>';
- echo '<th>'.$lang['srv_gdpr_requests_survey'].'</th>';
- //echo '<th>'.$lang['srv_gdpr_requests_recnum'].'</th>';
- //echo '<th>'.$lang['srv_gdpr_requests_ip'].'</th>';
- echo '<th>'.$lang['srv_gdpr_requests_url'].'</th>';
- echo '<th>'.$lang['srv_gdpr_requests_email'].'</th>';
- //echo '<th>'.$lang['srv_gdpr_requests_date'].'</th>';
- echo '<th>'.$lang['srv_gdpr_requests_text'].'</th>';
- echo '<th>'.$lang['srv_gdpr_requests_type'].'</th>';
- echo '<th>'.$lang['srv_gdpr_requests_date_sent'].'</th>';
- echo '<th>'.$lang['srv_gdpr_requests_done'].'</th>';
- echo '<th>'.$lang['srv_gdpr_requests_comment'].'</th>';
+ echo ' <th class="center">'.$lang['srv_gdpr_requests_resolved'].'</th>';
+ echo ' <th>'.$lang['srv_gdpr_requests_survey'].'</th>';
+ echo ' <th class="center">'.$lang['srv_gdpr_requests_text'].'</th>';
+ echo ' <th>'.$lang['srv_gdpr_requests_email'].'</th>';
+ echo ' <th class="center">'.$lang['srv_gdpr_requests_type'].'</th>';
+ echo ' <th class="center">'.$lang['srv_gdpr_requests_date_sent'].'</th>';
+ echo ' <th class="center">'.$lang['srv_gdpr_requests_comment'].'</th>';
echo '</tr>';
foreach($request_list as $request_id => $request){
- echo '<tr '.($request['status'] == 0 ? ' class="red_row"' : '').'>';
+ echo '<tr>';
- echo '<td><a href="'.$site_url.'admin/survey/index.php?anketa='.$request['ank_id'].'&a=data">'.$request['naslov'].'</a></td>';
-
- //echo '<td>'.$request['recnum'].'</td>';
- //echo '<td>'.$request['ip'].'</td>';
- echo '<td>'.$request['url'].'</td>';
- echo '<td>'.$request['email'].'</td>';
- //echo '<td>'.$request['date'].'</td>';
- echo '<td>'.$request['text'].'</td>';
+ // Checkbox ce je zahteva opravljena
+ echo ' <td class="center"><input type="checkbox" id="gdrp_request_'.$request_id.'" value="1" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'>';
+ echo ' <label class="empty" for="gdrp_request_'.$request_id.'"></label>';
+ echo ' </td>';
+
+ echo ' <td><div class="gdpr_requests_wrap"><a href="'.$site_url.'admin/survey/index.php?anketa='.$request['ank_id'].'&a=data">'.$request['naslov'].'</a></div></td>';
- echo '<td>'.$lang['srv_gdpr_requests_type_'.$request['type']].'</td>';
+ echo ' <td class="center"><span class="faicon envelope" onclick="show_gdpr_messeage('.$request_id.', '.$request['ank_id'].')"></span></td>';
+
+ echo ' <td>'.$request['email'].'</td>';
- echo '<td>'.date('j.n.Y', strtotime($request['datum'])).'</td>';
+ echo ' <td class="center">';
+ echo ' <div class="request_type type'.$request['type'].'">'.$lang['srv_gdpr_requests_type_'.$request['type']].'</div>';
+ echo ' </td>';
- // Checkbox ce je zahteva opravljena
- //echo '<td>'.($request['status'] == '1' ? $lang['srv_gdpr_requests_status_1'] : $lang['srv_gdpr_requests_status_0']).'</td>';
- echo '<td><input type="checkbox" value="1" class="pointer" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'></td>';
+ echo ' <td class="center">'.date('j.n.Y', strtotime($request['datum'])).'</td>';
// Komentar avtorja
- echo '<td><textarea style="height:30px; width:200px;" onBlur="setGDPRRequestComment(\''.$request_id.'\', this.value);">'.$request['comment'].'</textarea></td>';
-
+ echo ' <td class="center">';
+ echo ' <textarea class="gdpr_requests_comment" onBlur="setGDPRRequestComment(\''.$request_id.'\', this.value);">'.$request['comment'].'</textarea>';
+ echo ' </td>';
echo '</tr>';
}
echo '</table>';
- }
- else{
- echo '<p>'.$lang['srv_gdpr_requests_none'].'</p>';
- }
-
+ echo '</div>';
+ echo '</div>';
+ }
// Tabela opravljenih zahtevkov
if(count($request_list_done) > 0){
+
+ echo '<div class="gdpr_request_table_title bottom8">'.$lang['srv_gdpr_requests_list_resolved'].'</div>';
- echo '<br /><span class="requests_table_title">'.$lang['srv_gdpr_requests_done'].'</span>';
-
- echo '<table class="gdpr_surveys requests" style="margin-top:0;">';
+ echo '<div class="table-horizontal-scroll-wrapper-outer">';
+ echo '<div class="table-horizontal-scroll-wrapper-inner">';
+ echo '<table class="gdpr_surveys requests">';
echo '<tr>';
- echo '<th>'.$lang['srv_gdpr_requests_survey'].'</th>';
- //echo '<th>'.$lang['srv_gdpr_requests_recnum'].'</th>';
- //echo '<th>'.$lang['srv_gdpr_requests_ip'].'</th>';
- echo '<th>'.$lang['srv_gdpr_requests_url'].'</th>';
- echo '<th>'.$lang['srv_gdpr_requests_email'].'</th>';
- //echo '<th>'.$lang['srv_gdpr_requests_date'].'</th>';
- echo '<th>'.$lang['srv_gdpr_requests_text'].'</th>';
- echo '<th>'.$lang['srv_gdpr_requests_type'].'</th>';
- echo '<th>'.$lang['srv_gdpr_requests_date_sent'].'</th>';
- echo '<th>'.$lang['srv_gdpr_requests_done'].'</th>';
- echo '<th>'.$lang['srv_gdpr_requests_comment'].'</th>';
+ echo ' <th class="center">'.$lang['srv_gdpr_requests_resolved'].'</th>';
+ echo ' <th>'.$lang['srv_gdpr_requests_survey'].'</th>';
+ echo ' <th class="center">'.$lang['srv_gdpr_requests_text'].'</th>';
+ echo ' <th>'.$lang['srv_gdpr_requests_email'].'</th>';
+ echo ' <th class="center">'.$lang['srv_gdpr_requests_type'].'</th>';
+ echo ' <th class="center">'.$lang['srv_gdpr_requests_date_sent'].'</th>';
+ echo ' <th class="center">'.$lang['srv_gdpr_requests_comment'].'</th>';
echo '</tr>';
foreach($request_list_done as $request_id => $request){
- echo '<tr '.($request['status'] == 0 ? ' class="red_row"' : '').'>';
+ echo '<tr>';
- echo '<td><a href="'.$site_url.'admin/survey/index.php?anketa='.$request['ank_id'].'&a=data">'.$request['naslov'].'</a></td>';
-
- //echo '<td>'.$request['recnum'].'</td>';
- //echo '<td>'.$request['ip'].'</td>';
- echo '<td>'.$request['url'].'</td>';
- echo '<td>'.$request['email'].'</td>';
- //echo '<td>'.$request['date'].'</td>';
- echo '<td>'.$request['text'].'</td>';
+ // Checkbox ce je zahteva opravljena
+ echo ' <td class="center"><input type="checkbox" id="gdrp_request_'.$request_id.'" value="1" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'><label class="empty" for="gdrp_request_'.$request_id.'"></label></td>';
+ echo ' <td><div class="gdpr_requests_wrap"><a href="'.$site_url.'admin/survey/index.php?anketa='.$request['ank_id'].'&a=data">'.$request['naslov'].'</a></div></td>';
- echo '<td>'.$lang['srv_gdpr_requests_type_'.$request['type']].'</td>';
+ echo ' <td class="center"><span class="faicon envelope" onclick="show_gdpr_messeage('.$request_id.', '.$request['ank_id'].')"></span></td>';
+
+ echo ' <td>'.$request['email'].'</td>';
- echo '<td>'.date('j.n.Y', strtotime($request['datum'])).'</td>';
+ echo ' <td class="center">';
+ echo ' <div class="request_type type'.$request['type'].'">'.$lang['srv_gdpr_requests_type_'.$request['type']].'</div>';
+ echo ' </td>';
- // Checkbox ce je zahteva opravljena
- //echo '<td>'.($request['status'] == '1' ? $lang['srv_gdpr_requests_status_1'] : $lang['srv_gdpr_requests_status_0']).'</td>';
- echo '<td><input type="checkbox" value="1" class="pointer" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'></td>';
+ echo ' <td class="center">'.date('j.n.Y', strtotime($request['datum'])).'</td>';
// Komentar avtorja
- echo '<td><textarea style="height:30px; width:200px;" onBlur="setGDPRRequestComment(\''.$request_id.'\', this.value);">'.$request['comment'].'</textarea></td>';
-
-
+ echo ' <td class="center">';
+ echo ' <textarea class="gdpr_requests_comment" onBlur="setGDPRRequestComment(\''.$request_id.'\', this.value);">'.$request['comment'].'</textarea>';
+ echo ' </td>';
echo '</tr>';
}
echo '</table>';
+ echo '</div>';
+ echo '</div>';
}
}
@@ -441,7 +539,10 @@ class GDPR{ ORDER BY date(r.datum) ASC");
if(mysqli_num_rows($sql) > 0){
- echo '<table class="gdpr_surveys requests">';
+ echo '<div class="table-horizontal-scroll-wrapper-outer">';
+ echo '<div class="table-horizontal-scroll-wrapper-inner">';
+
+ echo '<table class="gdpr_surveys requests all">';
echo '<tr>';
echo '<th>'.$lang['srv_gdpr_requests_author'].'</th>';
@@ -472,7 +573,7 @@ class GDPR{ echo '<td>'.$row['u_name'].' '.$row['u_surname'].'<br />('.$row['u_email'].')</td>';
// Odgovorna oseba
- echo '<td style="text-align:left; white-space:nowrap;">';
+ echo '<td style="text-align:left;">';
if($row['gu_firstname'] != '' || $row['gu_lastname'] != '' || $row['gu_email'] != '')
echo '<span class="bold">'.$lang['srv_gdpr_user_settings_firstname'].':</span> '.$row['gu_firstname'].' '.$row['gu_lastname'].($row['gu_email'] != '' ? ' ('.$row['gu_email'].')' : '').'<br />';
if($row['gu_phone'] != '')
@@ -482,7 +583,7 @@ class GDPR{ echo '</td>';
// Organizacija
- echo '<td style="text-align:left; white-space:nowrap;">';
+ echo '<td style="text-align:left;">';
if($row['gu_type'] == '1'){
if($row['gu_organization'] != '')
echo '<span class="bold">'.$lang['srv_gdpr_user_settings_organization'].':</span> '.$row['gu_organization'].'<br />';
@@ -514,6 +615,9 @@ class GDPR{ }
echo '</table>';
+
+ echo '</div>';
+ echo '</div>';
}
else{
echo '<p>'.$lang['srv_gdpr_requests_none'].'</p>';
@@ -534,10 +638,11 @@ class GDPR{ if(mysqli_num_rows($sql) > 0){
echo '<br />';
- echo '<a href="#" onClick="$(\'#table_requests_done\').toggle(); $(\'#requests_table_title_plus\').toggle(); $(\'#requests_table_title_minus\').toggle();">';
- echo ' <span class="requests_table_title"><span id="requests_table_title_plus">+</span><span id="requests_table_title_minus" style="display:none;">-</span> '.$lang['srv_gdpr_requests_done'].'</span>';
- echo '</a>';
+ echo ' <button onClick="$(\'#table_requests_done\').toggle(); $(\'#requests_table_title_simbol\').toggleClass(\'minus plus\'); $(this).toggleClass(\'border_blue\'); return false;" class="requests_table_title medium white-gray"><span id="requests_table_title_simbol" class="faicon blue plus"></span>'.$lang['srv_gdpr_requests_done'].'</button>';
+ echo '<div class="table-horizontal-scroll-wrapper-outer">';
+ echo '<div class="table-horizontal-scroll-wrapper-inner">';
+
echo '<table class="gdpr_surveys requests" id="table_requests_done" style="margin-top:0; display:none;">';
echo '<tr>';
@@ -569,7 +674,7 @@ class GDPR{ echo '<td>'.$row['u_name'].' '.$row['u_surname'].'<br />('.$row['u_email'].')</td>';
// Odgovorna oseba
- echo '<td style="text-align:left; white-space:nowrap;">';
+ echo '<td style="text-align:left;">';
if($row['gu_firstname'] != '' || $row['gu_lastname'] != '' || $row['gu_email'] != '')
echo '<span class="bold">'.$lang['srv_gdpr_user_settings_firstname'].':</span> '.$row['gu_firstname'].' '.$row['gu_lastname'].($row['gu_email'] != '' ? ' ('.$row['gu_email'].')' : '').'<br />';
if($row['gu_phone'] != '')
@@ -579,7 +684,7 @@ class GDPR{ echo '</td>';
// Organizacija
- echo '<td style="text-align:left; white-space:nowrap;">';
+ echo '<td style="text-align:left;">';
if($row['gu_type'] == '1'){
if($row['gu_organization'] != '')
echo '<span class="bold">'.$lang['srv_gdpr_user_settings_organization'].':</span> '.$row['gu_organization'].'<br />';
@@ -611,6 +716,9 @@ class GDPR{ }
echo '</table>';
+
+ echo '</div>';
+ echo '</div>';
}
}
@@ -651,98 +759,158 @@ class GDPR{ // GDPR nastavitve ankete
- echo '<fieldset class="wide">';
+ echo '<fieldset id="gdpr_anketa">';
echo '<legend>'.$lang['srv_gdpr_survey_settings'].'</legend>';
// Besedilo na vrhu
- echo '<p class="italic">'.$lang['srv_gdpr_survey_settings_desc1'].'</p>';
+ echo '<p>'.$lang['srv_gdpr_survey_settings_desc1'].'</p>';
- echo '<p class="italic">'.$lang['srv_gdpr_survey_settings_desc2'].' <a href="'.$site_url.'admin/survey/index.php?a=gdpr" target="_blank"><span class="bold">'.$lang['srv_here'].' >></span></a></p>';
+ echo '<p class="bottom16 top16">'.$lang['srv_gdpr_survey_settings_desc2'].' <a href="'.$site_url.'admin/survey/index.php?a=gdpr" target="_blank"><span class="bold">'.$lang['srv_here'].' >></span></a></p>';
- echo '<p class="italic">'.$lang['srv_gdpr_survey_settings_desc3'].'</p>';
+ echo '<p class="bottom16">'.$lang['srv_gdpr_survey_settings_desc3'].'</p>';
// Ali gre za gdpr anketo
- echo '<span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_data'].':</span>';
- echo '<label for="is_gdpr_1"><input type="radio" name="is_gdpr" id="is_gdpr_1" '.($gdpr_settings != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">'.$lang['yes'].'</label> ';
- echo '<label for="is_gdpr_0"><input type="radio" name="is_gdpr" id="is_gdpr_0" '.($gdpr_settings == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">'.$lang['no'].'</label> ';
+ echo '<div class="setting_holder">';
+ echo '<div class="fold ">';
+ echo '<span class="setting_title semi-bold">'.$lang['srv_gdpr_survey_gdpr_data'].':</span>';
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="is_gdpr" id="is_gdpr_1" '.($gdpr_settings['is_gdpr'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">';
+ echo '<label for="is_gdpr_1">'.$lang['yes'].'</label>';
+ echo '</div>';
+
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="is_gdpr" id="is_gdpr_0" '.($gdpr_settings['is_gdpr'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">';
+ echo '<label for="is_gdpr_0">'.$lang['no'].'</label>';
+ echo '</div>';
+
+ echo '</div>';
+ echo '</div>';
- echo '<br /><br />';
+ // Oznacena kot GDPR - prikazemo identifikatorje
+ echo '<div id="gdpr_data_identifiers" '.($gdpr_settings['is_gdpr'] == 0 ? ' style="display:none;"' : '').'>';
+ echo '<p class="semi-bold" >'.$lang['srv_gdpr_survey_gdpr_data_q'].'</p>';
- // Oznacena kot GDPR - prikazemo identifikatorje
- echo '<div id="gdpr_data_identifiers" '.($gdpr_settings == 0 ? ' style="display:none;"' : '').'>';
+ echo '<div class="setting_holder">';
- echo '<span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_data_q'].'</span><br /><br />';
-
// Osebni podatek ime
- echo ' <span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_name'].':</span>';
- echo ' <label for="name_1"><input type="radio" name="name" id="name_1" '.($gdpr_settings['name'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">'.$lang['yes'].'</label> ';
- echo ' <label for="name_0"><input type="radio" name="name" id="name_0" '.($gdpr_settings['name'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">'.$lang['no'].'</label> ';
-
- echo ' <br />';
+ echo '<div class="fold">';
+ echo '<span class="setting_title">'.$lang['srv_gdpr_survey_gdpr_name'].':</span>';
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="name" id="name_1" '.($gdpr_settings['name'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">';
+ echo '<label for="name_1">'.$lang['yes'].'</label> ';
+ echo '</div>';
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="name" id="name_0" '.($gdpr_settings['name'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">';
+ echo '<label for="name_0">'.$lang['no'].'</label> ';
+ echo '</div>';
+ echo '</div>';
// Osebni podatek email
- echo ' <span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_email'].':</span>';
- echo ' <label for="email_1"><input type="radio" name="email" id="email_1" '.($gdpr_settings['email'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">'.$lang['yes'].'</label> ';
- echo ' <label for="email_0"><input type="radio" name="email" id="email_0" '.($gdpr_settings['email'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">'.$lang['no'].'</label> ';
-
- echo ' <br />';
+ echo '<div class="fold">';
+ echo '<span class="setting_title">'.$lang['srv_gdpr_survey_gdpr_email'].':</span>';
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="email" id="email_1" '.($gdpr_settings['email'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">';
+ echo ' <label for="email_1">'.$lang['yes'].'</label> ';
+ echo '</div>';
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="email" id="email_0" '.($gdpr_settings['email'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">';
+ echo ' <label for="email_0">'.$lang['no'].'</label> ';
+ echo '</div>';
+ echo '</div>';
// Osebni podatek lokacija
- echo ' <span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_location'].':</span>';
- echo ' <label for="location_1"><input type="radio" name="location" id="location_1" '.($gdpr_settings['location'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">'.$lang['yes'].'</label> ';
- echo ' <label for="location_0"><input type="radio" name="location" id="location_0" '.($gdpr_settings['location'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">'.$lang['no'].'</label> ';
-
- echo ' <br />';
+ echo '<div class="fold">';
+ echo '<span class="setting_title">'.$lang['srv_gdpr_survey_gdpr_location'].':</span>';
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="location" id="location_1" '.($gdpr_settings['location'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">';
+ echo ' <label for="location_1">'.$lang['yes'].'</label> ';
+ echo '</div>';
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="location" id="location_0" '.($gdpr_settings['location'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">';
+ echo ' <label for="location_0">'.$lang['no'].'</label> ';
+ echo '</div>';
+ echo '</div>';
// Osebni podatek telefon
- echo ' <span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_phone'].':</span>';
- echo ' <label for="phone_1"><input type="radio" name="phone" id="phone_1" '.($gdpr_settings['phone'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">'.$lang['yes'].'</label> ';
- echo ' <label for="phone_0"><input type="radio" name="phone" id="phone_0" '.($gdpr_settings['phone'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">'.$lang['no'].'</label> ';
-
- echo ' <br />';
+ echo '<div class="fold">';
+ echo '<span class="setting_title">'.$lang['srv_gdpr_survey_gdpr_phone'].':</span>';
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="phone" id="phone_1" '.($gdpr_settings['phone'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">';
+ echo ' <label for="phone_1">'.$lang['yes'].'</label> ';
+ echo '</div>';
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="phone" id="phone_0" '.($gdpr_settings['phone'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">';
+ echo ' <label for="phone_0">'.$lang['no'].'</label> ';
+ echo '</div>';
+ echo '</div>';
// Osebni podatek spletni identifikator
- echo ' <span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_web'].':</span>';
- echo ' <label for="web_1"><input type="radio" name="web" id="web_1" '.($gdpr_settings['web'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">'.$lang['yes'].'</label> ';
- echo ' <label for="web_0"><input type="radio" name="web" id="web_0" '.($gdpr_settings['web'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">'.$lang['no'].'</label> ';
-
- echo ' <br />';
+ echo '<div class="fold">';
+ echo '<span class="setting_title">'.$lang['srv_gdpr_survey_gdpr_web'].':</span>';
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="web" id="web_1" '.($gdpr_settings['web'] != 0 ? ' checked':'').' value="1" onClick="showGDPRSettings();">';
+ echo ' <label for="web_1">'.$lang['yes'].'</label> ';
+ echo '</div>';
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="web" id="web_0" '.($gdpr_settings['web'] == 0 ? ' checked':'').' value="0" onClick="showGDPRSettings();">';
+ echo ' <label for="web_0">'.$lang['no'].'</label> ';
+ echo '</div>';
+ echo '</div>';
// Osebni podatek drugo
- 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 '<div class="fold">';
+ echo '<span class="setting_title">'.$lang['srv_gdpr_survey_gdpr_other'].':</span>';
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="other" id="other_1" '.($gdpr_settings['other'] != 0 ? ' checked':'').' value="1" onChange="showGDPRSettings(); toggleGDPROtherText(this);">';
+ echo ' <label for="other_1">'.$lang['yes'].'</label> ';
+ echo '</div>';
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="other" id="other_0" '.($gdpr_settings['other'] == 0 ? ' checked':'').' value="0" onChange="showGDPRSettings(); toggleGDPROtherText(this);">';
+ echo ' <label for="other_0">'.$lang['no'].'</label> ';
+ echo '</div>';
+ echo '</div>';
+
+ echo '</div>';
+
echo '<div id="other_text" '.($gdpr_settings['other'] == 0 ? ' style="display:none;"' : '').'>';
+
if($language_slo){
- echo ' <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_text_slo'].'</textarea> <span class="italic">'.$admin_languages['1'].'</span>';
+ echo ' <p class="gray top16">'.$lang['srv_gdpr_survey_gdpr_other_textA'].' ('.$admin_languages['1'].')</p>';
+ echo ' <textarea class="textarea" name="other_text_slo" id="other_text_slo" >'.$gdpr_settings['other_text_slo'].'</textarea>';
echo '<br />';
}
if($language_eng){
- echo ' <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_text_eng'].'</textarea> <span class="italic">'.$admin_languages['2'].'</span>';
+ echo ' <p class="gray top16">'.$lang['srv_gdpr_survey_gdpr_other_textA'].' ('.$admin_languages['2'].')</p>';
+ echo ' <textarea class="textarea" name="other_text_eng" id="other_text_eng">'.$gdpr_settings['other_text_eng'].'</textarea>';
}
echo '</div>';
echo '</div>';
- echo ' <br /><br />';
-
-
// Oznacena kot GDPR - prikazemo dodatne nastavitve gdpr
echo '<div id="gdpr_data_settings" '.(!$gdpr_show_advanced ? ' style="display:none;"' : '').'>';
// Ali se uporabi 1ka template v uvodu
- echo ' <span class="nastavitveSpan1" >'.$lang['srv_gdpr_survey_gdpr_1ka_template'].':</span>';
- echo ' <label for="1ka_template_1"><input type="radio" name="1ka_template" id="1ka_template_1" '.(!isset($gdpr_settings['1ka_template']) || $gdpr_settings['1ka_template'] != 0 ? ' checked':'').' value="1" onClick="showGDPRTemplate(this.value);">'.$lang['yes'].'</label> ';
- echo ' <label for="1ka_template_0"><input type="radio" name="1ka_template" id="1ka_template_0" '.(isset($gdpr_settings['1ka_template']) && $gdpr_settings['1ka_template'] == 0 ? ' checked':'').' value="0" onClick="showGDPRTemplate(this.value);">'.$lang['no'].'</label> ';
+ echo '<div class="setting_holder">';
+ echo '<div class="fold">';
+ echo '<span class="setting_title semi-bold">'.$lang['srv_gdpr_survey_gdpr_1ka_template'].':</span>';
+
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="1ka_template" id="1ka_template_1" '.(!isset($gdpr_settings['1ka_template']) || $gdpr_settings['1ka_template'] != 0 ? ' checked':'').' value="1" onClick="showGDPRTemplate(this.value);">';
+ echo ' <label for="1ka_template_1">'.$lang['yes'].'</label> ';
+ echo '</div>';
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="1ka_template" id="1ka_template_0" '.(isset($gdpr_settings['1ka_template']) && $gdpr_settings['1ka_template'] == 0 ? ' checked':'').' value="0" onClick="showGDPRTemplate(this.value);">';
+ echo ' <label for="1ka_template_0">'.$lang['no'].'</label> ';
+ echo '</div>';
+
+ echo '</div>';
+ echo '</div>';
- echo ' <div class="spaceLeft floatRight red" style="display:inline; width:520px;">';
- // Obvestilo z linkom na preview preduvoda
+ /* Obvestilo z linkom na preview preduvoda
echo '<span id="gdpr_data_template" class="italic" '.(isset($gdpr_settings['1ka_template']) && $gdpr_settings['1ka_template'] == 0 ? ' style="display:none;"' : '').'>';
echo $lang['srv_gdpr_survey_gdpr_1ka_template_note'];
echo '<br /><span class="bold"><a href="#" onClick="previewGDPRIntro(); return false;">'.$lang['srv_gdpr_survey_gdpr_1ka_template_preview'].'</a></span>';
@@ -751,7 +919,7 @@ class GDPR{ echo ' <span id="gdpr_data_template_warning" class="italic red" '.(!isset($gdpr_settings['1ka_template']) || $gdpr_settings['1ka_template'] == 1 ? ' style="display:none;"' : '').'>'.$lang['srv_gdpr_survey_gdpr_1ka_template_warning'].'</span>';
echo ' </div>';
- echo ' <br /><br /><br /><br />';
+ echo ' <br /><br /><br /><br />';*/
// Podrobnosti o zbiranju podatkov (popup v uvodu)
/*if($gdpr_settings['about'] == ''){
@@ -764,109 +932,176 @@ class GDPR{ 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:500px; height:200px;" disabled="disabled">'.$about_text.'</textarea> ';*/
- 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 '<p class="semi-bold top16">'.$lang['srv_gdpr_survey_gdpr_about'].':</p>';
+ echo '<p class="top16">'.$lang['srv_gdpr_survey_gdpr_about_note'].'</p>';
+
if($language_slo){
$about_array = self::getGDPRInfoArray($ank_id, $language_id='1');
$about_text = self::getGDPRTextFromArray($about_array, $type='textarea');
-
- echo ' <textarea name="about" id="about" style="width:500px; height:200px;" disabled="disabled">'.$about_text.'</textarea> <span class="italic">'.$admin_languages['1'].'</span>';
- echo ' <br><br><span class="nastavitveSpan1"> </span>';
+
+ echo ' <p class="semi-bold top16">'.$admin_languages['1'].'</p>';
+ echo ' <textarea name="about" class="textarea" id="about" disabled="disabled">'.$about_text.'</textarea>';
}
if($language_eng){
$about_array = self::getGDPRInfoArray($ank_id, $language_id='2');
$about_text = self::getGDPRTextFromArray($about_array, $type='textarea');
-
- echo ' <textarea name="about" id="about" style="width:500px; height:200px;" disabled="disabled">'.$about_text.'</textarea> <span class="italic">'.$admin_languages['2'].'</span>';
+
+ echo ' <p class="semi-bold top16">'.$admin_languages['2'].'</p>';
+ echo ' <textarea name="about" class="textarea" id="about" disabled="disabled">'.$about_text.'</textarea>';
}
- echo '<br /><br />';
-
// Povezava na splosne gdpr nastavitve - ce ni izpolnil osebnih podatkov, je rdec warning
- echo '<a href="'.$site_url.'admin/survey/index.php?a=gdpr" target="_blank"><span class="bold">'.$lang['srv_gdpr_general_settings'].'</span></a>';
if(!self::checkUserSettings())
- echo '<br /><span class="red italic">'.$lang['srv_gdpr_general_settings_warning'].'</span>';
+ echo '<p class="top16">'.$lang['srv_gdpr_general_settings_warninga'].'<a href="'.$site_url.'admin/survey/index.php?a=gdpr" target="_blank">'.$lang['srv_gdpr_general_settings_warningb'].'</a>!</p>';
- echo '<br /><br />';
-
echo '</div>';
echo '</fieldset>';
- echo '<br class="clr" />';
-
-
// Dodatne informacije
- echo '<fieldset id="gdpr_additional_info" class="wide" '.(!$gdpr_show_advanced ? ' style="display:none;"' : '').'>';
- echo '<legend>'.$lang['srv_gdpr_survey_settings'].'</legend>';
-
- echo ' <br />';
-
+ echo '<fieldset id="gdpr_additional_info"'.(!$gdpr_show_advanced ? ' style="display:none;"' : '').'>';
+ echo '<legend>'.$lang['srv_gdpr_general_settings_handling'].'</legend>';
// Cas hranjenja podatkov
- 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 ' <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 '<div class="setting_holder">';
+ echo '<span class="setting_title semi-bold">'.$lang['srv_gdpr_survey_gdpr_expire'].':</span>';
+
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="expire" id="expire_0" '.($gdpr_settings['expire'] == 0 ? ' checked':'').' value="0" onClick="toggleGDPRInfoText(this);">';
+ echo ' <label for="expire_0">'.$lang['srv_gdpr_survey_gdpr_expire_0'].'</label> ';
+ echo '</div>';
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="expire" id="expire_1" '.($gdpr_settings['expire'] != 0 ? ' checked':'').' value="1" onClick="toggleGDPRInfoText(this);">';
+ echo ' <label for="expire_1">'.$lang['srv_gdpr_survey_gdpr_expire_1'].'</label> ';
+ echo '</div>';
+
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>';
+ echo '<div class="setting_item indent">';
+ echo '<p>'.$lang['srv_gdpr_survey_gdpr_expire_1_placeholder'].':</p>';
+ echo '<div class="text_follow">';
+ echo '<input type="text" class="line_text expire text large" name="expire_text_slo" id="expire_text_slo" value="'.$gdpr_settings['expire_text_slo'].'" '.($gdpr_settings['expire'] == 0 ? ' disabled="disabled"' : '').'><p>SLO</p>';
+ echo '</div>';
+ echo '</div>';
}
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 '<div class="setting_item indent">';
+ echo '<p>'.$lang['srv_gdpr_survey_gdpr_expire_1_placeholder'].':</p>';
+ echo '<div class="text_follow">';
+ echo '<input type="text" class="line_text expire text large" name="expire_text_eng" id="expire_text_eng" value="'.$gdpr_settings['expire_text_eng'].'" '.($gdpr_settings['expire'] == 0 ? ' disabled="disabled"' : '').'><p>ENG</p>';
+ echo '</div>';
+ echo '</div>';
}
- echo ' <br /><br />';
-
+ echo '</div>';
// Drugi uporabniki podatkov
- 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 ' <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 '<div class="setting_holder">';
+ echo '<span class="setting_title semi-bold">'.$lang['srv_gdpr_survey_gdpr_other_users'].':</span>';
+
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="other_users" id="other_users_0" '.($gdpr_settings['other_users'] == 0 ? ' checked':'').' value="0" onClick="toggleGDPRInfoText(this);">';
+ echo ' <label for="other_users_0">'.$lang['srv_gdpr_survey_gdpr_other_users_0'].'</label> ';
+ echo '</div>';
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="other_users" id="other_users_1" '.($gdpr_settings['other_users'] != 0 ? ' checked':'').' value="1" onClick="toggleGDPRInfoText(this);">';
+ echo ' <label for="other_users_1">'.$lang['srv_gdpr_survey_gdpr_other_users_1'].'</label> ';
+ echo '</div>';
+
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>';
+ echo '<div class="setting_item indent">';
+ echo '<p>'.$lang['srv_gdpr_survey_gdpr_other_users_1_placeholder'].':</p>';
+ echo '<div class="text_follow">';
+ echo '<input type="text" class="line_text other_users text large" name="other_users_text_slo" id="other_users_text_slo" value="'.$gdpr_settings['other_users_text_slo'].'" '.($gdpr_settings['other_users'] == 0 ? ' disabled="disabled"' : '').'><p>SLO</p>';
+ echo '</div>';
+ echo '</div>';
}
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 '<div class="setting_item indent">';
+ echo '<p>'.$lang['srv_gdpr_survey_gdpr_other_users_1_placeholder'].':</p>';
+ echo '<div class="text_follow">';
+ echo '<input type="text" class="line_text other_users text large" name="other_users_text_eng" id="other_users_text_eng" value="'.$gdpr_settings['other_users_text_eng'].'" '.($gdpr_settings['other_users'] == 0 ? ' disabled="disabled"' : '').'><p>ENG</p>';
+ echo '</div>';
+ echo '</div>';
}
- echo ' <br /><br />';
+ echo '</div>';
// Izvoz v tuje drzave
- 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 ' <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 '<div class="setting_holder">';
+ echo '<span class="setting_title semi-bold">'.$lang['srv_gdpr_survey_gdpr_export'].':</span>';
+
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="export" id="export_0" '.($gdpr_settings['export'] == 0 ? ' checked':'').' value="0" onClick="toggleGDPRInfoText(this);">';
+ echo ' <label for="export_0">'.$lang['srv_gdpr_survey_gdpr_export_0'].'</label> ';
+ echo '</div>';
+ echo '<div class="setting_item">';
+ echo '<input type="radio" name="export" id="export_1" '.($gdpr_settings['export'] != 0 ? ' checked':'').' value="1" onClick="toggleGDPRInfoText(this);">';
+ echo ' <label for="export_1">'.$lang['srv_gdpr_survey_gdpr_export_country'].'</label> ';
+ echo '</div>';
+
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>';
+ echo '<div class="setting_item indent">';
+ echo '<p>'.$lang['srv_gdpr_survey_gdpr_export_country_placeholder'].':</p>';
+ echo '<div class="text_follow">';
+ echo '<input type="text" class="line_text export text large" name="export_country_slo" id="export_country_slo" value="'.$gdpr_settings['export_country_slo'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'><p>SLO</p>';
+ echo '</div>';
+ echo '</div>';
}
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 '<div class="setting_item indent">';
+ echo '<p>'.$lang['srv_gdpr_survey_gdpr_export_country_placeholder'].':</p>';
+ echo '<div class="text_follow">';
+ echo '<input type="text" class="line_text export text large" name="export_country_eng" id="export_country_eng" value="'.$gdpr_settings['export_country_eng'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'><p>ENG</p>';
+ echo '</div>';
+ echo '</div>';
}
- echo ' <br /><br /><span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_export_user'].':</span>';
+ echo '<span class="setting_title semi-bold top8 indent">'.$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 />';
+
+ echo '<div class="setting_item indent">';
+ echo '<p>'.$lang['srv_gdpr_survey_gdpr_export_user_placeholder'].':</p>';
+ echo '<div class="text_follow">';
+ echo '<input type="text" class="line_text export text large" name="export_user_slo" id="export_user_slo" value="'.$gdpr_settings['export_user_slo'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'><p>ENG</p>';
+ echo '</div>';
+ echo '</div>';
}
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 '<div class="setting_item indent">';
+ echo '<p>'.$lang['srv_gdpr_survey_gdpr_export_user_placeholder'].':</p>';
+ echo '<div class="text_follow">';
+ echo '<input type="text" class="line_text export text large" name="export_user_eng" id="export_user_eng" value="'.$gdpr_settings['export_user_eng'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'><p>ENG</p>';
+ echo '</div>';
+ echo '</div>';
}
- echo '<br /><br /><span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_export_legal'].':</span>';
+
+ echo '<span class="setting_title semi-bold top8 indent">'.$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>';
+
+ echo '<div class="setting_item indent">';
+ echo '<p>'.$lang['srv_gdpr_survey_gdpr_export_legal_placeholder'].':</p>';
+ echo '<div class="text_follow">';
+ echo '<input type="text" class="line_text long export text large" name="export_legal_slo" id="export_legal_slo" value="'.$gdpr_settings['export_legal_slo'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'><p>ENG</p>';
+ echo '</div>';
+ echo '</div>';
}
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 '<div class="setting_item indent">';
+ echo '<p>'.$lang['srv_gdpr_survey_gdpr_export_legal_placeholder'].':</p>';
+ echo '<div class="text_follow">';
+ echo '<input type="text" class="line_text long export text large" name="export_legal_eng" id="export_legal_eng" value="'.$gdpr_settings['export_legal_eng'].'" '.($gdpr_settings['export'] == 0 ? ' disabled="disabled"' : '').'><p>ENG</p>';
+ echo '</div>';
+ echo '</div>';
}
- echo ' <br /><br />';
+ echo '</div>';
// Pooblascena oseba za varstvo podatkov
@@ -905,11 +1140,11 @@ class GDPR{ else{
$gdpr_authorized = $gdpr_settings['authorized'];
}
- echo ' <span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_authorized'].':</span>';
- echo ' <input type="text" name="authorized" id="authorized" value="'.$gdpr_authorized.'">';
-
- echo ' <br /><br />';
+ echo '<div class="setting_holder">';
+ echo '<span class="setting_title semi-bold">'.$lang['srv_gdpr_survey_gdpr_authorized'].':</span>';
+ echo ' <input type="text" class="text large" name="authorized" id="authorized" value="'.$gdpr_authorized.'">';
+ echo '</div>';
// Kontaktni email
if($gdpr_settings['contact_email'] == ''){
@@ -928,46 +1163,32 @@ class GDPR{ else{
$gdpr_contact_email = $gdpr_settings['contact_email'];
}
- echo ' <span class="nastavitveSpan1">'.$lang['srv_gdpr_survey_gdpr_contact_email'].':</span>';
- echo ' <input type="text" name="contact_email" id="contact_email" value="'.$gdpr_contact_email.'">';
-
- echo ' <br /><br />';
-
- // Opomba
- echo ' <span class="nastavitveSpan1">'.$lang['note'].':</span>';
- 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 '<div class="setting_holder">';
+ echo '<span class="setting_title semi-bold">'.$lang['srv_gdpr_survey_gdpr_contact_email'].':</span>';
+ echo ' <input type="text" class="text large" name="contact_email" id="contact_email" value="'.$gdpr_contact_email.'">';
+ echo '</div>';
echo '</fieldset>';
// Gumb shrani spremembe
- echo '<br class="clr" />';
- //echo '<span class="floatLeft spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="document.settingsanketa_' . $ank_id . '.submit(); return false;"><span>';
- echo '<span class="floatLeft spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onClick="editGDPRSurvey(\''.$ank_id.'\'); return false;"><span>';
- echo $lang['edit1337'] . '</span></a></div></span>';
- echo '<div class="clr"></div>';
+ echo '<div class="button_holder">';
+ echo '<button class="medium white-blue" onClick="window.location.reload(); return false;">'.$lang['edit1338'].'</button>';
+ echo '<button class="medium blue" onclick="editGDPRSurvey(\''.$ank_id.'\'); return false;">'.$lang['edit1337'].'</button>';
+ echo '</div>';
+
+
+ echo '<div id="gdpr_bottom_wrap">';
- echo '<br /><br />';
-
+ echo '<div id="gdpr_bottom_wrap_left">';
// Export - informacije dane posamezniku
- echo '<fieldset id="gdpr_export_individual" class="wide" '.(!$gdpr_show_advanced ? ' style="display:none;"' : '').'>';
+ echo '<fieldset id="gdpr_export_individual" '.(!$gdpr_show_advanced ? ' style="display:none;"' : '').'>';
echo '<legend>'.$lang['srv_gdpr_survey_gdpr_export_individual'].'</legend>';
- echo ' <br />';
-
- echo '<a href="#" onClick="previewGDPRExport(\'1\'); return false;"><span class="faicon preview"></span>'.$lang['srv_poglejanketo2'].'</a>';
- echo ' <br />';
+ echo '<a class="noline" href="#" onClick="previewGDPRExport(\'1\'); return false;"><span class="faicon preview link-right"></span>'.$lang['srv_poglejanketo2'].'</a>';
// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
$userAccess = UserAccess::getInstance($global_user_id);
@@ -977,69 +1198,60 @@ class GDPR{ }
else{
- 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 '<span class="semi-bold lang">'.$admin_languages['1'].':</span>';
+ echo '<a class="noline lang" 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 '<a class="noline lang" 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 '<span class="semi-bold lang">'.$admin_languages['2'].':</span>';
+ echo '<a class="noline lang" 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 '<a class="noline lang" 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>';
+ echo '</div>'; #left
- echo ' <br />';
+ echo '<div id="gdpr_bottom_wrap_right">';
// Export - evidenca dejavnosti obdelav
- echo '<fieldset id="gdpr_export_activity" class="wide" '.(!$gdpr_show_advanced ? ' style="display:none;"' : '').'>';
+ echo '<fieldset id="gdpr_export_activity" '.(!$gdpr_show_advanced ? ' style="display:none;"' : '').'>';
echo '<legend>'.$lang['srv_gdpr_survey_gdpr_export_activity'].'</legend>';
- echo ' <br />';
-
- echo '<a href="#" onClick="previewGDPRExport(\'2\'); return false;"><span class="faicon preview"></span>'.$lang['srv_poglejanketo2'].'</a>';
- echo ' <br />';
+ echo '<a href="#" class="noline" onClick="previewGDPRExport(\'2\'); return false;"><span class="faicon preview"></span>'.$lang['srv_poglejanketo2'].'</a>';
if(!$userAccess->checkUserAccess($what='gdpr_export')){
$userAccess->displayNoAccess($what='gdpr_export');
}
else{
- 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 '<span class="semi-bold lang">'.$admin_languages['1'].':</span>';
+ echo '<a class="noline lang" 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 '<a class="noline lang" 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 '<span class="semi-bold lang">'.$admin_languages['2'].':</span>';
+ echo '<a class="noline lang" 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 '<a class="noline lang" 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 '</fieldset>';
+
+ echo '</div>'; #right
+ echo '</div>'; #wrap
+
}
// Prikazemo vsebino zavihka gdpr - nastavitve posamezne ankete
@@ -1047,7 +1259,7 @@ class GDPR{ global $site_url;
global $lang;
- echo '<div style="font-style:italic; margin-top:-10px;">';
+ echo '<div style="margin-top:-10px;">';
echo '<p>'.$lang['srv_gdpr_requests_desc'].'</p>';
echo '</div>';
@@ -1058,6 +1270,7 @@ class GDPR{ $request_list_done = self::getUserRequests($ank_id, $status=1);
if(count($request_list) > 0){
+
echo '<table class="gdpr_surveys requests">';
echo '<tr>';
@@ -1106,7 +1319,8 @@ class GDPR{ // Tabela opravljenih zahtevkov
if(count($request_list_done) > 0){
- echo '<br /><span class="requests_table_title">'.$lang['srv_gdpr_requests_done'].'</span>';
+ //echo '<br /><span class="requests_table_title">'.$lang['srv_gdpr_requests_done'].'</span>';
+ echo '<br /><div class="requests_table_title">'.$lang['srv_gdpr_requests_done'].'</div>';
echo '<table class="gdpr_surveys requests" style="margin-top:0;">';
@@ -1155,13 +1369,16 @@ class GDPR{ global $lang;
global $site_url;
+ echo '<fieldset><legend>DPA</legend>';
+
echo '<p>'.$lang['srv_gdpr_dpa_text'].'</p>';
echo '<ul>';
- echo ' <li><a href="'.$site_url.'uploadi/dokumenti/DPA_SLO.pdf">'.$lang['srv_gdpr_dpa_slo'].'</a></li>';
- echo ' <li><a href="'.$site_url.'uploadi/dokumenti/DPA_ANG.pdf">'.$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>'.$lang['srv_gdpr_dpa_info'].'</p>';
+ echo '<p class="top16">'.$lang['srv_gdpr_dpa_info'].'</p>';
+ echo '</fieldset>';
}
@@ -1180,12 +1397,24 @@ class GDPR{ $temp_naslov = array();
$temp_active = array();
+ $count_gdpr = 0;
+ $count_potential_gdpr = 0;
+ $count_no_gdpr = 0;
+
$key = 0;
foreach($surveys as $anketa){
$potential_gdpr = $this->potentialGDPRSurvey($anketa['id']);
$gdpr = $this->isGDPRSurvey($anketa['id']);
+ // Prestejemo ankete v posamezni skupini
+ if($gdpr == '1')
+ $count_gdpr++;
+ elseif($potential_gdpr == '1')
+ $count_potential_gdpr++;
+ else
+ $count_no_gdpr++;
+
$temp_gdpr[$key] = $gdpr;
$temp_gdpr_p[$key] = $potential_gdpr;
$temp_naslov[$key] = $anketa['naslov'];
@@ -1204,7 +1433,13 @@ class GDPR{ array_multisort($temp_gdpr, SORT_DESC, $temp_gdpr_p, SORT_DESC, $temp_active, SORT_DESC, $temp_naslov, SORT_DESC, $survey_list);
- return $survey_list;
+ $survey_count = array(
+ 'gdpr' => $count_gdpr,
+ 'potential_gdpr' => $count_potential_gdpr,
+ 'no_gdpr' => $count_no_gdpr
+ );
+
+ return array($survey_list, $survey_count);
}
// Pridobimo vse zahteve za izbris za userja (za vse ankete ali samo za doloceno anketo)
@@ -1249,13 +1484,38 @@ class GDPR{ global $lang;
$sql = sisplet_query("SELECT * FROM srv_gdpr_user WHERE usr_id='".$global_user_id."'");
- $row = mysqli_fetch_array($sql);
- if($row['country'] == ''){
- $row['country'] = ($lang['id'] == '1') ? 'Slovenija' : 'Slovenia';
+ if(mysqli_num_rows($sql) > 0){
+ $row = mysqli_fetch_array($sql);
+
+ $gdpr_settings = $row;
+
+ if($gdpr_settings['country'] == ''){
+ $gdpr_settings['country'] = ($lang['id'] == '1') ? 'Slovenija' : 'Slovenia';
+ }
+ }
+ else{
+ $gdpr_settings = array(
+ 'usr_id' => '',
+ 'type' => '',
+ 'has_dpo' => '',
+ 'organization' => '',
+ 'organization_maticna' => '',
+ 'organization_davcna' => '',
+ 'dpo_phone' => '',
+ 'dpo_email' => '',
+ 'dpo_lastname' => '',
+ 'dpo_firstname' => '',
+ 'firstname' => '',
+ 'lastname' => '',
+ 'email' => '',
+ 'phone' => '',
+ 'address' => '',
+ 'country' => '',
+ );
}
- return $row;
+ return $gdpr_settings;
}
// Preverimo ce je uporabnik izpolnil gdpr profil
@@ -1266,15 +1526,15 @@ class GDPR{ $sql = sisplet_query("SELECT * FROM srv_gdpr_user WHERE usr_id='".$global_user_id."'");
$row = mysqli_fetch_array($sql);
- if($row['firstname'] == '' || $row['lastname'] == '' || $row['email'] == '')
+ if($row === null || $row['firstname'] == '' || $row['lastname'] == '' || $row['email'] == '')
return false;
// Ce ima dpo so obvezni ime, priimek in posta
- if(($row['type'] == '1' || $row['has_dpo'] == '1') && ($row['dpo_firstname'] == '' || $row['dpo_lastname'] == '' || $row['dpo_email'] == ''))
+ if($row === null || ($row['type'] == '1' || $row['has_dpo'] == '1') && ($row['dpo_firstname'] == '' || $row['dpo_lastname'] == '' || $row['dpo_email'] == ''))
return false;
// Za podjetje sta obvezni ime in maticna
- if($row['type'] == '1' && ($row['organization'] == '' || $row['organization_maticna'] == ''))
+ if($row === null || $row['type'] == '1' && ($row['organization'] == '' || $row['organization_maticna'] == ''))
return false;
return true;
@@ -1287,10 +1547,45 @@ class GDPR{ if(mysqli_num_rows($sql) > 0){
$row = mysqli_fetch_array($sql);
+ $row += array('is_gdpr' => '1');
+
return $row;
}
- else
- return 0;
+ else{
+ $data = array(
+ 'is_gdpr' => '0',
+ '1ka_template' => '0',
+ 'name' => '0',
+ 'email' => '0',
+ 'location' => '0',
+ 'phone' => '0',
+ 'web' => '0',
+ 'other' => '0',
+ 'other_text_slo' => '',
+ 'other_text_eng' => '',
+ 'about' => '',
+ 'expire' => '0',
+ 'expire_text_slo' => '',
+ 'expire_text_eng' => '',
+ 'other_users' => '0',
+ 'other_users_text_slo' => '',
+ 'other_users_text_eng' => '',
+ 'export' => '0',
+ 'export_country_slo' => '',
+ 'export_country_eng' => '',
+ 'export_user_slo' => '',
+ 'export_user_eng' => '',
+ 'export_legal_slo' => '',
+ 'export_legal_eng' => '',
+ 'authorized' => '',
+ 'contact_email' => '',
+ 'note_slo' => '',
+ 'note_eng' => ''
+ );
+
+ return $data;
+ }
+
}
// Vrne text za gdpr preduvod glede na to kaj je oznaceno da se zbira
@@ -1358,20 +1653,20 @@ class GDPR{ $naslov = '<h3 style="margin-top: 0;">'.$lang['srv_gdpr_intro_title'].'</h3>';
$naslov .= '<p>'.$lang['srv_gdpr_intro'].':</p>';
- $naslov .= '<ul>';
+ $naslov .= ' <ul>';
if($user_settings['name'])
- $naslov .= '<li>'.$lang['srv_gdpr_intro_name'].'</li>';
+ $naslov .= ' <li>'.$lang['srv_gdpr_intro_name'].'</li> ';
if($user_settings['email'])
- $naslov .= '<li>'.$lang['srv_gdpr_intro_email'].'</li>';
+ $naslov .= ' <li>'.$lang['srv_gdpr_intro_email'].'</li> ';
if($user_settings['location'])
- $naslov .= '<li>'.$lang['srv_gdpr_intro_location'].'</li>';
+ $naslov .= ' <li>'.$lang['srv_gdpr_intro_location'].'</li> ';
if($user_settings['phone'])
- $naslov .= '<li>'.$lang['srv_gdpr_intro_phone'].'</li>';
+ $naslov .= ' <li>'.$lang['srv_gdpr_intro_phone'].'</li> ';
if($user_settings['web'])
- $naslov .= '<li>'.$lang['srv_gdpr_intro_web'].'</li>';
+ $naslov .= ' <li>'.$lang['srv_gdpr_intro_web'].'</li> ';
if($user_settings['other'])
- $naslov .= '<li>'.$lang['srv_gdpr_intro_other'].' - '.$user_settings['other_text'.$translation].'</li>';
- $naslov .= '</ul>';
+ $naslov .= ' <li>'.$lang['srv_gdpr_intro_other'].' - '.$user_settings['other_text'.$translation].'</li> ';
+ $naslov .= '</ul> ';
$naslov .= '<p>'.$lang['srv_gdpr_intro2'];
$naslov .= ' '.$lang['srv_gdpr_intro3'].'</p>';
@@ -1471,8 +1766,6 @@ class GDPR{ // Poskrbi za vse potrebno ko respondent zahteva izbris oz. vpogled v podatke
public function sendGDPRRequest($request_data){
global $lang;
- global $gdpr_admin_email;
- global $app_settings;
$errors = array();
@@ -1570,10 +1863,10 @@ class GDPR{ else
$note = $request_data['gdpr-note'];
-
+
// Ce imamo vse potrebne podatke posredujemo zahtevo
if(empty($errors)){
-
+
// Zabelezimo zahtevo v bazo
$sql = sisplet_query("INSERT INTO srv_gdpr_requests
(usr_id, ank_id, email, url, datum, text, type)
@@ -1619,7 +1912,7 @@ class GDPR{ $content .= '<p>Prosimo, da <b>v roku enega meseca</b> izvršite zahtevo in o tem obvestite respondenta na zgoraj navedeni elektronski naslov respondenta (<a href="http://eur-lex.europa.eu/legal-content/SL/TXT/?uri=uriserv:OJ.L_.2016.119.01.0001.01.SLV&toc=OJ:L:2016:119:FULL" target="_blank">Člen 19 uredbe GDPR</a>).</p>';
- $content .= '<p>V primeru, da tega po enem mesecu ne boste izvršili, vas bomo ponovno obvestili. Če se zahteva ne izvrši, si pridružujemo pravico, da anketo izbrišemo.</p>';
+ $content .= '<p>V primeru, da tega po enem mesecu ne boste izvršili, vas bomo ponovno obvestili. Če se zahteva ne izvrši, si pridržujemo pravico, da anketo izbrišemo.</p>';
// Podpis
$signature = Common::getEmailSignature();
@@ -1635,7 +1928,7 @@ class GDPR{ //$MA->addRecipients('dusan.rutnik@gorenje.com');
$MA->addRecipients('gdpr@gorenje.com');
}
- elseif(isset($gdpr_admin_email) && $gdpr_admin_email != ''){
+ elseif(AppSettings::getInstance()->getSetting('gdpr_admin_email') !== false){
$MA->addRecipients($gdpr_admin_email);
}
else{
@@ -1644,20 +1937,17 @@ class GDPR{ }
$resultX = $MA->sendMail($content, $subject);
- }
- catch (Exception $e){
- }
+ }
+ catch (Exception $e){
+ }
// Vrnemo vse ok
- if($jezik == '2'){
- $success_text = 'Your request for the deletion, change or insight into your personal information for a particular survey is submitted to
- the author of the survey. The author of the survey must, within a month since you submitted the request, execute your
- request and inform you about it. If the author fails to do so within 30 days, we will delete the survey, including your information.';
- }else {
- $success_text = 'Prošnja za izbris, spremembo ali vpogled do vaših osebnih podatkov iz določene ankete je posredovana avtorju ankete.
- Avtor ankete mora v roku meseca dni od oddane zahteve urediti vašo zahtevo in vas o tem obvestiti.
- Če v roku 30 dni avtor tega ne izvede, bomo anketo izbrisali, vključno z vašimi podatki.';
- }
+ if($jezik == '2'){
+ $success_text = 'Your request for the deletion, change or insight into your personal information for a particular survey is submitted to the author of the survey.<br>The author of the survey must, within a month since you submitted the request, execute your request and inform you about it.<br>If the author fails to do so within 30 days, we will delete the survey, including your information.';
+ }
+ else {
+ $success_text = 'Prošnja za izbris, spremembo ali vpogled do vaših osebnih podatkov iz določene ankete je posredovana avtorju ankete.<br>Avtor ankete mora v roku meseca dni od oddane zahteve urediti vašo zahtevo in vas o tem obvestiti.<br>Če v roku 30 dni avtor tega ne izvede, bomo anketo izbrisali, vključno z vašimi podatki.';
+ }
$response = json_encode(array('success' => $success_text), true);
}
@@ -1687,42 +1977,57 @@ class GDPR{ // Pridobimo id ankete iz url-ja
if($arr[1] == 'a'){
- $data['ank_id'] = $arr[2];
+ $data['hash'] = $arr[2];
+
+ // Dobimo id ankete iz hasha
+ $sql = sisplet_query("SELECT a.id AS ank_id, a.naslov, u.id AS usr_id, u.lang, u.email
+ FROM srv_anketa a, users u
+ WHERE a.hash='".$data['hash']."' AND u.id=a.insert_uid
+ ");
+
+ // Anekta ne obstaja - nepravilen url
+ if(mysqli_num_rows($sql) == 0)
+ return false;
+
+ $row = mysqli_fetch_array($sql);
+
+ $data['url'] = $site_url.'a/'.$data['hash'];
+
+ $data['ank_id'] = $row['ank_id'];
+ $data['title'] = $row['naslov'];
+ $data['usr_id'] = $row['usr_id'];
+ $data['usr_lang'] = $row['lang'];
+ $data['author_email'] = $row['email'];
}
else{
// Preverimo ce imamo mogoce lep url
$nice_url = $arr[1];
- $sqlN = sisplet_query("SELECT ank_id, link FROM srv_nice_links WHERE link='".$nice_url."'");
- if(mysqli_num_rows($sqlN) > 0){
- $rowN = mysqli_fetch_array($sqlN);
- $data['ank_id'] = $rowN['ank_id'];
- }
- else
- return false;
- }
-
- // Nastavimo url ankete
- $data['url'] = $site_url.'a/'.$data['ank_id'];
-
- // Pridobimo avtorja in naslov ankete
- $sql = sisplet_query("SELECT a.naslov, u.id, u.lang, u.email
- FROM srv_anketa a, users u
- WHERE a.id='".$data['ank_id']."' AND u.id=a.insert_uid");
- if(mysqli_num_rows($sql) == 1){
- $row = mysqli_fetch_array($sql);
-
- $data['title'] = $row['naslov'];
- $data['usr_id'] = $row['id'];
+ $sql = sisplet_query("SELECT a.id AS ank_id, a.hash, a.naslov, u.id AS usr_id, u.lang, u.email
+ FROM srv_anketa a, srv_nice_links nl, users u
+ WHERE nl.link='".$nice_url."' AND nl.ank_id=a.id AND u.id=a.insert_uid
+ ");
+
+ // Anekta ne obstaja - nepravilen url
+ if(mysqli_num_rows($sql) == 0)
+ return false;
+
+ $row = mysqli_fetch_array($sql);
+
+ $data['url'] = $site_url.'/'.$nice_url;
+
+ $data['ank_id'] = $row['ank_id'];
+ $data['hash'] = $row['hash'];
+ $data['title'] = $row['naslov'];
+ $data['usr_id'] = $row['usr_id'];
$data['usr_lang'] = $row['lang'];
$data['author_email'] = $row['email'];
}
- else
- return false;
}
else
return false;
+
if(isset($data['ank_id']) && isset($data['usr_id']) && isset($data['title']) && isset($data['url']) && isset($data['author_email']))
return $data;
else
@@ -1762,63 +2067,63 @@ class GDPR{ echo ' <input id="lang_id" name="lang_id" value="'.$lang['id'].'" type="hidden">';
// Email
- echo ' <div class="form_row '.(isset($error['email']) ? ' red' : '').'"><div class="label"><label for="email">'.$lang['srv_gdpr_drupal_field_email'].':</label></div>';
- echo ' <input class="regfield" id="email" name="email" value="'.(isset($posted['email']) && !isset($error['email']) ? $posted['email'] : '').'" placeholder="'.$lang['email'].'" type="text">';
+ echo ' <div class="form_row input_field '.(isset($error['email']) ? ' red' : '').'"><div class="label"><label for="email">'.$lang['srv_gdpr_drupal_field_email'].':</label></div>';
+ echo ' <input class="regfield" id="email" name="email" value="'.(isset($posted['email']) && !isset($error['email']) ? $posted['email'] : '').'" >';
if(isset($error['email']) && $error['email'] != '1')
echo '<span class="spaceLeft">'.$error['email'].'</span>';
echo ' </div>';
// Ime ankete
- echo ' <div class="form_row '.(isset($error['srv-name']) ? ' red' : '').'"><div class="label"><label for="srv-name">'.$lang['srv_gdpr_drupal_field_srv-name'].':</label></div>';
- echo ' <input class="regfield" id="srv-name" name="srv-name" value="'.(isset($posted['srv-name']) && !isset($error['srv-name']) ? $posted['srv-name'] : '').'" placeholder="'.$lang['srv_gdpr_drupal_field_srv-name'].'" type="text">';
+ echo ' <div class="form_row input_field'.(isset($error['srv-name']) ? ' red' : '').'"><div class="label"><label for="srv-name">'.$lang['srv_gdpr_drupal_field_srv-name'].':</label></div>';
+ echo ' <input class="regfield" id="srv-name" name="srv-name" value="'.(isset($posted['srv-name']) && !isset($error['srv-name']) ? $posted['srv-name'] : '').'" >';
if(isset($error['srv-name']) && $error['srv-name'] != '1')
echo '<span class="spaceLeft">'.$error['srv-name'].'</span>';
echo ' </div>';
// URL ankete
- echo ' <div class="form_row '.(isset($error['srv-url']) ? ' red' : '').'"><div class="label"><label for="srv-url">'.$lang['srv_gdpr_drupal_field_srv-url'].':</label></div>';
- echo ' <input class="regfield" id="srv-url" name="srv-url" value="'.(isset($posted['srv-url']) && !isset($error['srv-url']) ? $posted['srv-url'] : '').'" placeholder="'.$lang['srv_gdpr_drupal_field_srv-url'].'" type="text">';
+ echo ' <div class="form_row input_field '.(isset($error['srv-url']) ? ' red' : '').'"><div class="label"><label for="srv-url">'.$lang['srv_gdpr_drupal_field_srv-url'].':</label></div>';
+ echo ' <input class="regfield" id="srv-url" name="srv-url" value="'.(isset($posted['srv-url']) && !isset($error['srv-url']) ? $posted['srv-url'] : '').'" >';
if(isset($error['srv-url']) && $error['srv-url'] != '1')
echo '<span class="spaceLeft">'.$error['srv-url'].'</span>';
echo ' </div>';
- echo ' <br />';
+ // echo ' <br />';
// Tip zahteve
echo ' <p>'.$lang['srv_gdpr_drupal_q1_title'].'</p>';
- echo ' <div class="form_row '.(isset($error['gdpr-action']) ? ' red' : '').'"><label for="gdpr-action_1">';
+ echo ' <div class="form_row zahtevek '.(isset($error['gdpr-action']) ? ' red' : '').'"><label for="gdpr-action_1">';
echo ' <input type="radio" id="gdpr-action_1" name="gdpr-action" value="1" '.(isset($posted['gdpr-action']) && $posted['gdpr-action'] == '1' ? ' checked="checked"' : '').'> '.$lang['srv_gdpr_drupal_q1_answer1'];
echo ' </label></div>';
- echo ' <div class="form_row '.(isset($error['gdpr-action']) ? ' red' : '').'"><label for="gdpr-action_2">';
+ echo ' <div class="form_row zahtevek '.(isset($error['gdpr-action']) ? ' red' : '').'"><label for="gdpr-action_2">';
echo ' <input type="radio" id="gdpr-action_2" name="gdpr-action" value="2" '.(isset($posted['gdpr-action']) && $posted['gdpr-action'] == '2' ? ' checked="checked"' : '').'> '.$lang['srv_gdpr_drupal_q1_answer2'];
echo ' </label></div>';
- echo ' <div class="form_row '.(isset($error['gdpr-action']) ? ' red' : '').'"><label for="gdpr-action_3">';
+ echo ' <div class="form_row zahtevek '.(isset($error['gdpr-action']) ? ' red' : '').'"><label for="gdpr-action_3">';
echo ' <input type="radio" id="gdpr-action_3" name="gdpr-action" value="3" '.(isset($posted['gdpr-action']) && $posted['gdpr-action'] == '3' ? ' checked="checked"' : '').'> '.$lang['srv_gdpr_drupal_q1_answer3'];
echo ' </label></div>';
- echo ' <div class="form_row '.(isset($error['gdpr-action']) ? ' red' : '').'"><label for="gdpr-action_4">';
+ echo ' <div class="form_row zahtevek '.(isset($error['gdpr-action']) ? ' red' : '').'"><label for="gdpr-action_4">';
echo ' <input type="radio" id="gdpr-action_4" name="gdpr-action" value="4" '.(isset($posted['gdpr-action']) && $posted['gdpr-action'] == '4' ? ' checked="checked"' : '').'> '.$lang['srv_gdpr_drupal_q1_answer4'];
echo ' </label></div>';
- echo ' <div class="form_row '.(isset($error['gdpr-action']) ? ' red' : '').'"><label for="gdpr-action_5">';
- echo ' <input type="radio" id="gdpr-action_5" name="gdpr-action" value="5" '.(isset($posted['gdpr-action']) && $posted['gdpr-action'] == '5' ? ' checked="checked"' : '').'> '.$lang['srv_gdpr_drupal_q1_answer5'];
- echo ' </label></div>';
- echo ' <div class="form_row '.(isset($error['gdpr-action']) ? ' red' : '').'"><label for="gdpr-action_6">';
+ // echo ' <div class="form_row zahtevek'.(isset($error['gdpr-action']) ? ' red' : '').'"><label for="gdpr-action_5">';
+ // echo ' <input type="radio" id="gdpr-action_5" name="gdpr-action" value="5" '.(isset($posted['gdpr-action']) && $posted['gdpr-action'] == '5' ? ' checked="checked"' : '').'> '.$lang['srv_gdpr_drupal_q1_answer5'];
+ // echo ' </label></div>';
+ echo ' <div class="form_row zahtevek'.(isset($error['gdpr-action']) ? ' red' : '').'"><label for="gdpr-action_6">';
echo ' <input type="radio" id="gdpr-action_6" name="gdpr-action" value="6" '.(isset($posted['gdpr-action']) && $posted['gdpr-action'] == '6' ? ' checked="checked"' : '').'> '.$lang['srv_gdpr_drupal_q1_answer6'];
echo ' </label></div>';
- echo ' <br />';
+ // echo ' <br />';
// Opomba
echo ' <p '.(isset($error['gdpr-note']) ? ' class="red"' : '').'>'.$lang['srv_gdpr_drupal_q2_note'].'</p>';
+ echo '<p class="opis"> Opis: </p>';
echo ' <textarea id="gdpr-note" name="gdpr-note" value="" '.(isset($error['gdpr-note']) ? ' class="red"' : '').'>'.(isset($posted['gdpr-note']) ? $posted['gdpr-note'] : '').'</textarea>';
- echo ' <br /><br />';
+ // echo ' <br /><br />';
// Poslji prosnjo
echo ' <p>'.$lang['srv_gdpr_drupal_end'].'</p>';
- //echo ' <input name="submit" value="'.$lang['srv_potrdi'].'" class="regfield" type="submit"><br />';
- echo ' <input name="submit" value="'.$lang['srv_potrdi'].'" class="regfield" type="button" onClick="sendGDPRRequest();"><br />';
+ echo ' <input name="submit" value="'.$lang['srv_potrdi2'].'" class="regfield" type="button" onClick="sendGDPRRequest();">';
echo ' </form>';
}
@@ -1886,8 +2191,9 @@ class GDPR{ 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>';
+ //text already included in srv_gdpr_survey_gdpr_evidenca_text7_2, so it can duplicate
+ /* else
+ $result[1]['text'][2] .= ' <strong>'.$lang['srv_gdpr_survey_gdpr_about_text2_5'].'</strong>'; */
// UPORABNIKI OSEBNI PODATKOV
@@ -2146,6 +2452,8 @@ class GDPR{ else
$br = '<br />';
+ $text = '';
+
// Loop po posameznih sklopih
foreach($text_array as $sklop){
@@ -2481,7 +2789,7 @@ class GDPR{ echo '<div id="preview_spremenljivka">';
- echo '<div class="popup_close"><a href="#" onClick="preview_spremenljivka_cancle(); return false;">✕</a></div>';
+ echo '<div class="popup_close"><a href="#" onClick="preview_spremenljivka_cancel(); return false;">✕</a></div>';
echo ' <div class="spremenljivka">';
@@ -2500,7 +2808,7 @@ class GDPR{ echo ' </div>';
// Gumba zapri
- //echo '<div class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="preview_spremenljivka_cancle(); return false;"><span>Zapri</span></a></div>';
+ //echo '<div class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="preview_spremenljivka_cancel(); return false;"><span>Zapri</span></a></div>';
echo '</div>';
}
@@ -2516,9 +2824,9 @@ class GDPR{ $type = $_POST['type'];
- echo '<div id="preview_gdpr_export" class="divPopUp">';
+ echo '<div id="preview_gdpr_export">';
- echo '<div class="popup_close"><a href="#" onClick="preview_spremenljivka_cancle(); return false;">✕</a></div>';
+ echo '<div class="popup_close"><a href="#" onClick="preview_spremenljivka_cancel(); return false;">✕</a></div>';
echo '<div class="content">';
|