From a3e619ac9a30f15f6f97dddd190bfeee020c2bc9 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Fri, 17 Jun 2022 11:41:26 +0200 Subject: [PATCH 1/2] Popravek napake pri posiljanju vabil - odstrani podvojene maile --- .../surveyEmails/class.SurveyInvitationsNew.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php index 3a1d51d39..40c140e51 100644 --- a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php +++ b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php @@ -3906,11 +3906,6 @@ class SurveyInvitationsNew { unset($_SESSION['snd_inv_token'][$this->sid]); session_commit(); - - $dont_send_duplicated = false; - if (isset($_POST['dont_send_duplicated']) && $_POST['dont_send_duplicated'] == 'on') { - $dont_send_duplicated = true; - } $rids = $_POST['rids']; @@ -4209,6 +4204,11 @@ class SurveyInvitationsNew { } } + $dont_send_duplicated = false; + if (isset($_POST['dont_send_duplicated']) && $_POST['dont_send_duplicated'] == 'on') { + $dont_send_duplicated = true; + } + $duplicated = array(); # array za rezultate From 89c32f6548e6969a88db979f81bf2092048c276d Mon Sep 17 00:00:00 2001 From: pero1203 Date: Fri, 17 Jun 2022 11:47:21 +0200 Subject: [PATCH 2/2] Seznam anket - ce ima anketa izklopljene parapodatke, pri datumu zadnjega vnosa pise "ni parapodatkov" --- admin/survey/classes/class.SurveyList.php | 7 ++++++- lang/1.php | 1 + lang/2.php | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php index de0167104..df0584851 100644 --- a/admin/survey/classes/class.SurveyList.php +++ b/admin/survey/classes/class.SurveyList.php @@ -1232,7 +1232,12 @@ class SurveyList { if($anketa['answers'] > 0){ $v_time = substr($anketa['v_time_last'], 0, 8); $v_time = explode('.', $v_time); - echo $v_time[0].'.'.$v_time[1].'.20'.$v_time[2]; + + // Nimamo parapodatkov + if($anketa['v_time_last'] == '00.00.00 0:00') + echo $lang['srv_survey_list_no_paradata']; + else + echo $v_time[0].'.'.$v_time[1].'.20'.$v_time[2]; } else{ echo '/'; diff --git a/lang/1.php b/lang/1.php index 91369cbed..1ebc9af9a 100644 --- a/lang/1.php +++ b/lang/1.php @@ -5213,6 +5213,7 @@ $lang = array ( '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_list_no_paradata' => "Ni parapodatkov", 'srv_survey_finished' => "Vprašalnik zaključen?", 'srv_quick_settings_osnovno' => "Osnovne nastavitve", 'srv_quick_settings_napredno' => "Napredne nastavitve", diff --git a/lang/2.php b/lang/2.php index 29fbe2da8..0696abb50 100644 --- a/lang/2.php +++ b/lang/2.php @@ -5182,6 +5182,7 @@ $lang = array ( '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_no_paradata' => "No paradata", 'srv_survey_finished' => "Finished editing survey?", 'srv_quick_settings_osnovno' => "Basic settings", 'srv_quick_settings_napredno' => "Advanced settings",