may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moj profil je viden tudi na AAI (skrita so samo polja za urejanje), popravljen text pri brisanju uporabnika.

Browse Source
This commit is contained in:
pero1203 2021-02-19 06:55:04 +01:00
parent 6c2eb4a4d8
commit d076c005ea
7 changed files with 90 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/survey/SurveyAdmin.php
View File

@ -333,12 +333,10 @@ class SurveyAdmin
$text = (strlen($text) > 25) ? substr($text, 0, 25) . '...' : $text; $text = (strlen($text) > 25) ? substr($text, 0, 25) . '...' : $text;
echo '<div id="xtradiv"><strong class="xtraname">' . $text . ' <span class="faicon after sort_down_arrow"/></strong>'; echo '<div id="xtradiv"><strong class="xtraname">' . $text . ' <span class="faicon after sort_down_arrow"/></strong>';
echo '<div id="xtradivSettings">'; echo '<div id="xtradivSettings">';
// Za Arnes.si skrijemo zavihek moj profil, da ne morejo spremijati gesla
if($site_domain != '1ka.arnes.si') {
echo '<span class="xtraSetting"><a class="xtra" href="' . $site_url . 'admin/survey/index.php?a=nastavitve&m=global_user_myProfile"><span class="faicon user"></span>' . $lang['edit_data'] . '</a></span>'; echo '<span class="xtraSetting"><a class="xtra" href="' . $site_url . 'admin/survey/index.php?a=nastavitve&m=global_user_myProfile"><span class="faicon user"></span>' . $lang['edit_data'] . '</a></span>';
}
// Odjava na nov nacin preko frontend/api // Odjava na nov nacin preko frontend/api
echo '<form name="odjava" method="post" action="'.$site_url.'frontend/api/api.php?action=logout">'; echo '<form name="odjava" method="post" action="'.$site_url.'frontend/api/api.php?action=logout">';

126
admin/survey/SurveyAdminSettings.php
View File

@ -9284,7 +9284,7 @@ class SurveyAdminSettings {
} }
function globalUserMyProfile () { function globalUserMyProfile () {
global $lang, $global_user_id, $admin_type, $site_domain, $site_url, $app_settings; global $lang, $global_user_id, $admin_type, $site_domain, $site_url, $app_settings, $aai_instalacija;
// podatki prijavljenega uporabnika // podatki prijavljenega uporabnika
$sql = sisplet_query("SELECT id, name, surname, email, type, gdpr_agree, last_login FROM users WHERE id = '$global_user_id'"); $sql = sisplet_query("SELECT id, name, surname, email, type, gdpr_agree, last_login FROM users WHERE id = '$global_user_id'");
@ -9366,60 +9366,66 @@ class SurveyAdminSettings {
echo '<br />'; echo '<br />';
echo ' <div class="setting"><span class="setting_title">'.$lang['name'].':</span>'; // AAI nima moznosti spreminjanja imena, priimka, emaila, gesla...
echo ' <input class="text " name="ime" placeholder="Ime" value="'.$row['name'].'" type="text"></div>'; if($aai_instalacija){
echo '<span class="italic">'.$lang['srv_profil_aai_warning'].'</span>';
}
else{
echo ' <div class="setting"><span class="setting_title">'.$lang['name'].':</span>';
echo ' <input class="text " name="ime" placeholder="Ime" value="'.$row['name'].'" type="text"></div>';
echo ' <div class="setting"><span class="setting_title">'.$lang['surname'].' :</span>'; echo ' <div class="setting"><span class="setting_title">'.$lang['surname'].' :</span>';
echo ' <input class="text " name="priimek" placeholder="Priimek" value="'.$row['surname'].'" type="text"></div>'; echo ' <input class="text " name="priimek" placeholder="Priimek" value="'.$row['surname'].'" type="text"></div>';
echo ' <div class="setting"><span class="setting_title">'.$lang['email'].' : <span class="faicon add icon-blue pointer" id="klik-dodaj-email" deluminate_imagetype="png"></span></span>'; echo ' <div class="setting"><span class="setting_title">'.$lang['email'].' : <span class="faicon add icon-blue pointer" id="klik-dodaj-email" deluminate_imagetype="png"></span></span>';
echo ' <input class="text" disabled="disabled" value="'.$row['email'].'" type="text">'; echo ' <input class="text" disabled="disabled" value="'.$row['email'].'" type="text">';
echo ' <input name="email2" value="'.$row['email'].'" type="hidden">'; echo ' <input name="email2" value="'.$row['email'].'" type="hidden">';
echo ' <span style="margin:0 6.5px">&nbsp;</span>'; echo ' <span style="margin:0 6.5px">&nbsp;</span>';
$alternativni_emaili = User::getInstance()->allEmails('brez primarnega');
echo '<label for="active-master" '.(empty($alternativni_emaili) ? 'class="hidden"' : '').'><input class="text" name="active_email" value="master" id="active-master" type="radio" '.(User::getInstance()->primaryEmail() == $row['email'] ? 'checked="checked"' : '').'> '.$lang['login_email_subscription'].'</label>';
if(!empty($alternativni_emaili)){
foreach($alternativni_emaili as $email) {
echo '<br/><span style="width:130px; float:left;">&nbsp;</span>';
echo '<input class="text" disabled="disabled" value="'.$email->email.'" type="text">';
echo '<span style="margin: 0 5px 10px;" onclick="izbrisiAlternativniEmail(\''.$email->id.'\')"><i class="fa fa-times link-sv-moder"></i></span>';
echo '<input class="text" value="'.($email->id).'" name="active_email" type="radio" '.($email->active == 1 ? 'checked="checked"' : '').'> <label for="active-master">'.$lang['login_email_subscription'].'</label>';
}
}
echo '</div><br />';
echo '<div class="dodaj-alternativni-email" style="display: none;">'; $alternativni_emaili = User::getInstance()->allEmails('brez primarnega');
echo '<div class="vnos">';
echo '<span class="setting_title">'.$lang['login_alternative_emails'].' :</span>'; echo '<label for="active-master" '.(empty($alternativni_emaili) ? 'class="hidden"' : '').'><input class="text" name="active_email" value="master" id="active-master" type="radio" '.(User::getInstance()->primaryEmail() == $row['email'] ? 'checked="checked"' : '').'> '.$lang['login_email_subscription'].'</label>';
echo '<input class="text" id="alternativni-email" value="" type="text">'; if(!empty($alternativni_emaili)){
echo '<span style="margin:0 8px">&nbsp;</span>'; foreach($alternativni_emaili as $email) {
echo '<a href="#" onclick="dodajAlternativniEmail()">'.$lang['srv_inv_btn_add_recipients_add'].'</a>'; echo '<br/><span style="width:130px; float:left;">&nbsp;</span>';
echo '<input class="text" disabled="disabled" value="'.$email->email.'" type="text">';
echo '<span style="margin: 0 5px 10px;" onclick="izbrisiAlternativniEmail(\''.$email->id.'\')"><i class="fa fa-times link-sv-moder"></i></span>';
echo '<input class="text" value="'.($email->id).'" name="active_email" type="radio" '.($email->active == 1 ? 'checked="checked"' : '').'> <label for="active-master">'.$lang['login_email_subscription'].'</label>';
}
}
echo '</div><br />';
echo '<div class="dodaj-alternativni-email" style="display: none;">';
echo '<div class="vnos">';
echo '<span class="setting_title">'.$lang['login_alternative_emails'].' :</span>';
echo '<input class="text" id="alternativni-email" value="" type="text">';
echo '<span style="margin:0 8px">&nbsp;</span>';
echo '<a href="#" onclick="dodajAlternativniEmail()">'.$lang['srv_inv_btn_add_recipients_add'].'</a>';
echo '</div>';
echo '<br><div id="alternativno-obvestilo" style="font-style: italic;"></div>';
echo '<br />';
echo '</div>'; echo '</div>';
echo '<br><div id="alternativno-obvestilo" style="font-style: italic;"></div>';
echo '<br />';
echo '</div>';
// Ce je vklopljen modul gorenje, preverimo ce ima se default geslo in izpisemo opozorilo
if (Common::checkModule('gorenje')){
if(SurveyGorenje::checkGorenjePassword())
echo '<p class="red bold">'.$lang['gorenje_password_warning'].'</p>';
}
// Ce je vklopljen modul gorenje, preverimo ce ima se default geslo in izpisemo opozorilo // Obveščanje
if (Common::checkModule('gorenje')){ echo ' <div class="setting"><span class="setting_title">'.$lang['password'].':</span>';
if(SurveyGorenje::checkGorenjePassword()) echo ' <input class="text" name="geslo" placeholder="'.$lang['password'].'" id="p1" value="PRIMERZELODOLGEGAGESLA" onclick="document.getElementById(\'p1\').value=\'\';" type="password"></div>';
echo '<p class="red bold">'.$lang['gorenje_password_warning'].'</p>';
}
// Obveščanje echo ' <div class="setting"><span class="setting_title">'.$lang['again'].':</span>';
echo ' <div class="setting"><span class="setting_title">'.$lang['password'].':</span>'; echo ' <input class="text" name="geslo2" placeholder="'.$lang['password'].'" id="p2" value="PRIMERZELODOLGEGAGESLA" onclick="document.getElementById(\'p2\').value=\'\';" type="password"></div>';
echo ' <input class="text" name="geslo" placeholder="'.$lang['password'].'" id="p1" value="PRIMERZELODOLGEGAGESLA" onclick="document.getElementById(\'p1\').value=\'\';" type="password"></div>';
echo ' <div class="setting"><span class="setting_title">'.$lang['again'].':</span>'; // Prejemanje obvestil
echo ' <input class="text" name="geslo2" placeholder="'.$lang['password'].'" id="p2" value="PRIMERZELODOLGEGAGESLA" onclick="document.getElementById(\'p2\').value=\'\';" type="password"></div>'; $red_border = (isset($_GET['unsubscribe']) && $_GET['unsubscribe'] == '1') ? ' border:2px red solid; padding: 5px 10px;' : '';
echo ' <div class="setting" style="height:auto; float:left; clear:both; margin: 15px 0; '.$red_border.'"><span class="setting_title">'.$lang['srv_gdpr_user_options'].': '.Help::display('srv_gdpr_user_options').'</span>';
echo ' <label for="gdpr-agree-yes"><input type="radio" name="gdpr_agree" id="gdpr-agree-yes" value="1" '.($row['gdpr_agree'] == 1 ? 'checked="checked"' : null).'/>'.$lang['yes'].'</label>';
echo ' <label for="gdpr-agree-no"><input type="radio" name="gdpr_agree" id="gdpr-agree-no" value="0" '.($row['gdpr_agree'] == 0 ? 'checked="checked"' : null).'/>'.$lang['no1'].'</label></div>';
// Prejemanje obvestil // Google 2 FA
$red_border = (isset($_GET['unsubscribe']) && $_GET['unsubscribe'] == '1') ? ' border:2px red solid; padding: 5px 10px;' : '';
echo ' <div class="setting" style="height:auto; float:left; clear:both; margin: 15px 0; '.$red_border.'"><span class="setting_title">'.$lang['srv_gdpr_user_options'].': '.Help::display('srv_gdpr_user_options').'</span>';
echo ' <label for="gdpr-agree-yes"><input type="radio" name="gdpr_agree" id="gdpr-agree-yes" value="1" '.($row['gdpr_agree'] == 1 ? 'checked="checked"' : null).'/>'.$lang['yes'].'</label>';
echo ' <label for="gdpr-agree-no"><input type="radio" name="gdpr_agree" id="gdpr-agree-no" value="0" '.($row['gdpr_agree'] == 0 ? 'checked="checked"' : null).'/>'.$lang['no1'].'</label></div>';
// Google 2 FA
$user_option = User::option($global_user_id, 'google-2fa-secret'); $user_option = User::option($global_user_id, 'google-2fa-secret');
$user_option_validate = User::option($global_user_id, 'google-2fa-validation'); $user_option_validate = User::option($global_user_id, 'google-2fa-validation');
echo ' <div class="setting" style="clear: both;"><span class="setting_title">'.$lang['google_2fa'].': '.Help::display('srv_google_2fa_options').'</span>'; echo ' <div class="setting" style="clear: both;"><span class="setting_title">'.$lang['google_2fa'].': '.Help::display('srv_google_2fa_options').'</span>';
@ -9457,28 +9463,30 @@ class SurveyAdminSettings {
echo '<div id="google-2fa-bvestilo" style="font-style: italic;">'.$lang['google_2fa_user_error_code'].'</div>'; echo '<div id="google-2fa-bvestilo" style="font-style: italic;">'.$lang['google_2fa_user_error_code'].'</div>';
echo '</div>'; echo '</div>';
} }
}
echo ' </fieldset>'; echo ' </fieldset>';
echo ' </form>'; echo ' </form>';
// save gumb
echo ' <div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="save1kaRacunSettings();"><span>'.$lang['edit1337'] . '</span></a></div>';
echo ' <div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange" href="#" onclick="izbrisi1kaRacun();"><span>'.$lang['delete_account'] . '</span></a></div>'; // Save gumb - ce ni AAI
if(!$aai_instalacija){
echo '<span class="clr"></span>'; echo ' <div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="save1kaRacunSettings();"><span>'.$lang['edit1337'] . '</span></a></div>';
// div za prikaz uspešnosti shranjevanja echo ' <div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange" href="#" onclick="izbrisi1kaRacun();"><span>'.$lang['delete_account'] . '</span></a></div>';
if ($_GET['s'] == '1') {
echo '<div id="success_save"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>';
}
echo '<span class="clr"></span>';
echo '<br /><br />'; // div za prikaz uspešnosti shranjevanja
if ($_GET['s'] == '1') {
echo '<div id="success_save"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>';
}
echo '<br /><br />';
}
// Tabela aktivnosti (prijav) // Tabela aktivnosti (prijav)
@ -9512,7 +9520,7 @@ class SurveyAdminSettings {
echo '</fieldset>'; echo '</fieldset>';
UserTrackingClass::init()->userTrackingDisplay(); UserTrackingClass::init()->userTrackingDisplay();
echo '</div>'; echo '</div>';
} }

8
admin/survey/classes/class.SurveyList.php
View File

@ -231,7 +231,7 @@ class SurveyList {
* @desc prikaze zgornjo navigacijo * @desc prikaze zgornjo navigacijo
*/ */
function display_sub_tabs () { function display_sub_tabs () {
global $lang, $global_user_id, $admin_type, $site_domain; global $lang, $global_user_id, $admin_type, $site_domain, $aai_instalacija;
$SLCount = $this->countSurveys(); $SLCount = $this->countSurveys();
@ -451,7 +451,7 @@ class SurveyList {
echo '</li>'; echo '</li>';
} }
#nastavitve uporabnika // nastavitve uporabnika
if($admin_type == 0) if($admin_type == 0)
echo '<li class="space"></li>'; echo '<li class="space"></li>';
@ -463,13 +463,11 @@ class SurveyList {
echo '<li class="space"></li>'; echo '<li class="space"></li>';
// Moj profil - preneseno iz sispleta (sispleta se ne bo uporabljalo vec) // Moj profil
if($site_domain != '1ka.arnes.si') {
echo '<li>'; echo '<li>';
echo '<a class="no-img side-right' . ($tab == 'global_user_myProfile' ? ' active' : '') . '"' . ' href="index.php?a=nastavitve&amp;m=global_user_myProfile" title="' . $lang['edit_data'] . '">'; echo '<a class="no-img side-right' . ($tab == 'global_user_myProfile' ? ' active' : '') . '"' . ' href="index.php?a=nastavitve&amp;m=global_user_myProfile" title="' . $lang['edit_data'] . '">';
echo $lang['edit_data'] . '</a>'; echo $lang['edit_data'] . '</a>';
echo '</li>'; echo '</li>';
}
echo '</ul>'; echo '</ul>';
} }

2
admin/survey/script/dostop.js
View File

@ -534,7 +534,7 @@ function izbrisiNepotrjenegaUporabnika(id) {
function vsiUporabnikiAkcija(id, action) { function vsiUporabnikiAkcija(id, action) {
var action = action || 'delete'; var action = action || 'delete';
if(action == 'delete' && !confirm(lang['srv_survey_list_users_confirm_delete'])){ if(action == 'delete' && !confirm(lang['srv_survey_list_users_confirm_delete_warning'])){
return false; return false;
} }

1
admin/survey/script/js-lang.php
View File

@ -179,6 +179,7 @@ lang('change_account_pass_conformation');
lang('cms_error_password_incorrect'); lang('cms_error_password_incorrect');
lang('password_err_complex'); lang('password_err_complex');
lang('srv_survey_list_users_confirm_delete'); lang('srv_survey_list_users_confirm_delete');
lang('srv_survey_list_users_confirm_delete_warning');
lang('login_alternative_emails_error'); lang('login_alternative_emails_error');
lang('login_alternative_emails_success'); lang('login_alternative_emails_success');
lang('srv_user_exist'); lang('srv_user_exist');

4
lang/1.php
View File

@ -4975,7 +4975,8 @@ $lang = array (
'srv_survey_list_users_registred' => "Registriran od", 'srv_survey_list_users_registred' => "Registriran od",
'srv_survey_list_users_last_login' => "Zadnja prijava", 'srv_survey_list_users_last_login' => "Zadnja prijava",
'srv_survey_list_users_aai' => 'AAI uporabnik', 'srv_survey_list_users_aai' => 'AAI uporabnik',
'srv_survey_list_users_confirm_delete' => 'Ali ste prepričani, da želite izbrisati uporabnika?', 'srv_survey_list_users_confirm_delete' => 'Ali ste prepričani, da želite izbrisati uporabnika?',
'srv_survey_list_users_confirm_delete_warning' => 'Ali ste prepričani, da želite izbrisati uporabnika?\n\nZ brisanjem uporabnika boste uporabniku odvzeli dostop do uporabe vaše aplikacije. Ankete bodo še vedno dostopne drugim urednikom ankete.',
'srv_survey_list_closed' => "Zaključena", 'srv_survey_list_closed' => "Zaključena",
'srv_survey_list_inpreparation' => "V pripravi", 'srv_survey_list_inpreparation' => "V pripravi",
'srv_survey_finished' => "Vprašalnik zaključen?", 'srv_survey_finished' => "Vprašalnik zaključen?",
@ -7331,6 +7332,7 @@ $lang = array (
'srv_login_tracking_date' => "Datum prijave", 'srv_login_tracking_date' => "Datum prijave",
'srv_last_login' => "Zadnja prijava", 'srv_last_login' => "Zadnja prijava",
'ob' => "ob", 'ob' => "ob",
'srv_profil_aai_warning' => '1KA profil je vezan na vaš AAI račun. Vse spremembe urejate v vašem AAI profilu.',
'srv_drag_and_drop_new_look_option' => "Prikaži odgovore v obliki", 'srv_drag_and_drop_new_look_option' => "Prikaži odgovore v obliki",
'srv_drag_and_drop_new_look_option1' => "okvirjev", 'srv_drag_and_drop_new_look_option1' => "okvirjev",
'srv_drag_and_drop_new_look_option2' => "škatel", 'srv_drag_and_drop_new_look_option2' => "škatel",

6
lang/2.php
View File

@ -4944,8 +4944,9 @@ $lang = array (
'srv_survey_list_users_registred' => "Registered on", 'srv_survey_list_users_registred' => "Registered on",
'srv_survey_list_users_last_login' => "Last login", 'srv_survey_list_users_last_login' => "Last login",
'srv_survey_list_users_aai' => 'AAI user', 'srv_survey_list_users_aai' => 'AAI user',
'srv_survey_list_users_confirm_delete' => 'You will delete this user, are you agree?', 'srv_survey_list_users_confirm_delete' => 'You will delete this user, are you agree?',
'srv_survey_list_closed' => "Closed", 'srv_survey_list_users_confirm_delete_warning' => 'You will delete this user, are you agree?\n\nDeleting a user will deprive the user of access to use your application. The surveys will still be available to other survey editors.',
'srv_survey_list_closed' => "Closed",
'srv_survey_list_inpreparation' => "In preparation", 'srv_survey_list_inpreparation' => "In preparation",
'srv_survey_finished' => "Finished editing survey?", 'srv_survey_finished' => "Finished editing survey?",
'srv_quick_settings_osnovno' => "Basic settings", 'srv_quick_settings_osnovno' => "Basic settings",
@ -7213,6 +7214,7 @@ $lang = array (
'srv_login_tracking_date' => "Login date", 'srv_login_tracking_date' => "Login date",
'srv_last_login' => "Last login", 'srv_last_login' => "Last login",
'ob' => "at", 'ob' => "at",
'srv_profil_aai_warning' => '1KA profile is linked to your AAI account. You edit all changes in your AAI profile. ',
'srv_diferencial_trak' => "Show answers on stripe", 'srv_diferencial_trak' => "Show answers on stripe",
'srv_diferencial_trak_starting_num' => "Stripe starts with", 'srv_diferencial_trak_starting_num' => "Stripe starts with",
'srv_drag_and_drop_new_look_option' => "Show answers shaped as", 'srv_drag_and_drop_new_look_option' => "Show answers shaped as",