Moj profil je viden tudi na AAI (skrita so samo polja za urejanje), popravljen text pri brisanju uporabnika.
This commit is contained in:
pero1203
parent
6c2eb4a4d8
commit
d076c005ea
@ -335,10 +335,8 @@ class SurveyAdmin
|
||||
|
||||
echo '<div id="xtradiv"><strong class="xtraname">' . $text . ' <span class="faicon after sort_down_arrow"/></strong>';
|
||||
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>';
|
||||
}
|
||||
|
||||
// Odjava na nov nacin preko frontend/api
|
||||
echo '<form name="odjava" method="post" action="'.$site_url.'frontend/api/api.php?action=logout">';
|
||||
|
||||
@ -9284,7 +9284,7 @@ class SurveyAdminSettings {
|
||||
}
|
||||
|
||||
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
|
||||
$sql = sisplet_query("SELECT id, name, surname, email, type, gdpr_agree, last_login FROM users WHERE id = '$global_user_id'");
|
||||
@ -9366,6 +9366,11 @@ class SurveyAdminSettings {
|
||||
|
||||
echo '<br />';
|
||||
|
||||
// AAI nima moznosti spreminjanja imena, priimka, emaila, gesla...
|
||||
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>';
|
||||
|
||||
@ -9376,7 +9381,9 @@ class SurveyAdminSettings {
|
||||
echo ' <input class="text" disabled="disabled" value="'.$row['email'].'" type="text">';
|
||||
echo ' <input name="email2" value="'.$row['email'].'" type="hidden">';
|
||||
echo ' <span style="margin:0 6.5px"> </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) {
|
||||
@ -9399,7 +9406,6 @@ class SurveyAdminSettings {
|
||||
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())
|
||||
@ -9457,14 +9463,16 @@ class SurveyAdminSettings {
|
||||
echo '<div id="google-2fa-bvestilo" style="font-style: italic;">'.$lang['google_2fa_user_error_code'].'</div>';
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
echo ' </fieldset>';
|
||||
|
||||
echo ' </form>';
|
||||
|
||||
// save gumb
|
||||
|
||||
// Save gumb - ce ni AAI
|
||||
if(!$aai_instalacija){
|
||||
|
||||
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>';
|
||||
@ -9477,8 +9485,8 @@ class SurveyAdminSettings {
|
||||
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>';
|
||||
}
|
||||
|
||||
|
||||
echo '<br /><br />';
|
||||
}
|
||||
|
||||
|
||||
// Tabela aktivnosti (prijav)
|
||||
|
||||
@ -231,7 +231,7 @@ class SurveyList {
|
||||
* @desc prikaze zgornjo navigacijo
|
||||
*/
|
||||
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();
|
||||
|
||||
@ -451,7 +451,7 @@ class SurveyList {
|
||||
echo '</li>';
|
||||
}
|
||||
|
||||
#nastavitve uporabnika
|
||||
// nastavitve uporabnika
|
||||
if($admin_type == 0)
|
||||
echo '<li class="space"></li>';
|
||||
|
||||
@ -463,13 +463,11 @@ class SurveyList {
|
||||
|
||||
echo '<li class="space"></li>';
|
||||
|
||||
// Moj profil - preneseno iz sispleta (sispleta se ne bo uporabljalo vec)
|
||||
if($site_domain != '1ka.arnes.si') {
|
||||
// Moj profil
|
||||
echo '<li>';
|
||||
echo '<a class="no-img side-right' . ($tab == 'global_user_myProfile' ? ' active' : '') . '"' . ' href="index.php?a=nastavitve&m=global_user_myProfile" title="' . $lang['edit_data'] . '">';
|
||||
echo $lang['edit_data'] . '</a>';
|
||||
echo '</li>';
|
||||
}
|
||||
|
||||
echo '</ul>';
|
||||
}
|
||||
|
||||
@ -534,7 +534,7 @@ function izbrisiNepotrjenegaUporabnika(id) {
|
||||
function vsiUporabnikiAkcija(id, action) {
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
@ -179,6 +179,7 @@ lang('change_account_pass_conformation');
|
||||
lang('cms_error_password_incorrect');
|
||||
lang('password_err_complex');
|
||||
lang('srv_survey_list_users_confirm_delete');
|
||||
lang('srv_survey_list_users_confirm_delete_warning');
|
||||
lang('login_alternative_emails_error');
|
||||
lang('login_alternative_emails_success');
|
||||
lang('srv_user_exist');
|
||||
|
||||
@ -4976,6 +4976,7 @@ $lang = array (
|
||||
'srv_survey_list_users_last_login' => "Zadnja prijava",
|
||||
'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_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_inpreparation' => "V pripravi",
|
||||
'srv_survey_finished' => "Vprašalnik zaključen?",
|
||||
@ -7331,6 +7332,7 @@ $lang = array (
|
||||
'srv_login_tracking_date' => "Datum prijave",
|
||||
'srv_last_login' => "Zadnja prijava",
|
||||
'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_option1' => "okvirjev",
|
||||
'srv_drag_and_drop_new_look_option2' => "škatel",
|
||||
|
||||
@ -4945,6 +4945,7 @@ $lang = array (
|
||||
'srv_survey_list_users_last_login' => "Last login",
|
||||
'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_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_finished' => "Finished editing survey?",
|
||||
@ -7213,6 +7214,7 @@ $lang = array (
|
||||
'srv_login_tracking_date' => "Login date",
|
||||
'srv_last_login' => "Last login",
|
||||
'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_starting_num' => "Stripe starts with",
|
||||
'srv_drag_and_drop_new_look_option' => "Show answers shaped as",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user