diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 4e26eba5c..b33a6751e 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -3636,6 +3636,10 @@ class SurveyAdmin $sas = new SurveyAdminSettings(); $sas->globalUserMyProfile(); } + if ($_GET['m'] == 'global_user_ChangeArchive') { + $sas = new SurveyAdminSettings(); + $sas->globalUserChangeArchive(); + } echo ''; } diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index add608a5e..d25358a08 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -10510,6 +10510,24 @@ class SurveyAdminSettings { } } + echo ''; + + echo ''; + } + + function globalUserChangeArchive () { + global $lang, $global_user_id, $admin_type, $site_domain, $site_url; + + // podatki prijavljenega uporabnika + $sql = sisplet_query("SELECT id, name, surname, email, type, gdpr_agree, last_login FROM users WHERE id = '$global_user_id'"); + $row = mysqli_fetch_array($sql); + + echo '
'; + + echo '
' . "\n\r"; + echo ' ' . "\n\r"; + echo ' ' . "\n\r"; + // Tabela aktivnosti (prijav) echo '
'.$lang['srv_login_tracking_title'].''; diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php index 11345ac4e..5a5dd683d 100644 --- a/admin/survey/classes/class.SurveyList.php +++ b/admin/survey/classes/class.SurveyList.php @@ -416,8 +416,23 @@ class SurveyList { echo ''; echo $lang['edit_data'] . ''; echo ''; - + echo ''; + + echo '
'; + + // Arhiv sprememb + echo ''; + + + } #podnavigacija za obvestila if(($_GET['a']=='obvestila')) { diff --git a/admin/survey/classes/tracking/UserTrackingClass.php b/admin/survey/classes/tracking/UserTrackingClass.php index e2608a876..b57d4aae9 100644 --- a/admin/survey/classes/tracking/UserTrackingClass.php +++ b/admin/survey/classes/tracking/UserTrackingClass.php @@ -40,7 +40,7 @@ class UserTrackingClass echo '
'; echo '
'; - echo '' . $lang['srv_survey_archives_tracking'] . ''; + echo '' . $lang['srv_survey_archives_tracking_history'] . ''; // Izvoz v Excel echo '

'.$lang['srv_survey_archives_tracking_last_changes'].'

'; diff --git a/lang/1.php b/lang/1.php index b99185486..7fbaa7961 100644 --- a/lang/1.php +++ b/lang/1.php @@ -4255,6 +4255,8 @@ $lang = array ( "srv_survey_archives_ie_data" => "Vprašalnik in podatki", "srv_survey_archives_ie_data_title" => "Izvoz vprašalnika in podatkov", "srv_survey_archives_tracking" => "Spremembe", + "srv_survey_archives_tracking_history" => "Zgodovina sprememb", + "srv_survey_archives_tracking_archive" => "Arhiv sprememb", "srv_survey_archives_tracking_survey" => "Spremembe vprašalnika", "srv_survey_archives_tracking_survey_text1" => "V spodnji tabeli je navedenih zadnjih 25 sprememb", "srv_survey_archives_tracking_survey_text_appendmerge" => "povezanih z dodajanjem ali združevanjem podatkov", diff --git a/lang/2.php b/lang/2.php index e30ccf069..7649414da 100644 --- a/lang/2.php +++ b/lang/2.php @@ -4235,6 +4235,8 @@ $lang = array ( "srv_survey_archives_ie_data" => "Survey and data", "srv_survey_archives_ie_data_title" => "Survey and data import / export", "srv_survey_archives_tracking" => "Changes", + "srv_survey_archives_tracking_history" => "Change history", + "srv_survey_archives_tracking_archive" => "Change archive", "srv_survey_archives_tracking_survey" => "Survey changes", "srv_survey_archives_tracking_survey_text1" => "The table below shows the last 25 changes", "srv_survey_archives_tracking_survey_text_appendmerge" => "related to adding or merging data",