From c6ce1b04246231500e34aace6a28bf5627cb629e Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Fri, 24 Dec 2021 10:13:27 +0100
Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA]=20Urejanje=20-->=20Nastavitve?=
 =?UTF-8?q?=20-->=20Obve=C5=A1=C4=8Danje=20-->=20O=20izbrisu=20ankete=20-?=
 =?UTF-8?q?=20v4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/survey/SurveyAdminSettings.php | 9 ++++-----
 lang/2.php                           | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 4fa18c97d..063f758cb 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -3576,8 +3576,7 @@ class SurveyAdminSettings {
 			echo '<div class="message_instructions">';
 			echo '<p class="bold caps bottom16">'.$lang['srv_alert_instruction1'].'</p>';
 			echo '<p class="bold bottom16">'.$lang['srv_alert_instruction1a'].':</p>';
-			echo '<p class="bottom16">'.$lang['srv_alert_instruction5'].':</p>';
-			echo '<p class="bold">'.$lang['srv_alert_instruction1b'].'</p>'; //@TG7
+			echo '<p class="bottom16">'.$lang['srv_alert_instruction5'].'</p>';
 			echo '</div>';
 			echo '</div>';
 
@@ -5149,12 +5148,12 @@ class SurveyAdminSettings {
 
 				// avtor ankete
 				if($forma) { 
-					echo '<input type="checkbox" name="alert_delete_author" id="alert_delete_author" value="1" onChange="change_alert_respondent(\'delete_author\', $(this));return false;"' . ($rowAlert['delete_author'] == 1 ? ' checked' : '') . '>';
+					echo '<input type="checkbox" name="alert_delete_author" id="alert_delete_author" value="1" onChange="change_alert_respondent(\'delete_author\', $(this));return false;"' . (($rowAlert['delete_author'] == 1 || $isChecked) ? ' checked' : '') . '>';
 					echo '<label for="alert_'.$what.'">'.$lang['srv_alert_author2'].'</label>';
 				}
 				else {
-					//echo $rowAlert['delete_author']; //@TG6
-					echo '<input type="checkbox" name="alert_delete_author" id="alert_delete_author" value="1" onChange="change_alert_respondent(\'delete_author\', $(this));return false;"' . ($rowAlert['delete_author'] == 1 ? ' checked' : '') . '>';
+					//echo $rowAlert['delete_author'];
+					echo '<input type="checkbox" name="alert_delete_author" id="alert_delete_author" value="1" onChange="change_alert_respondent(\'delete_author\', $(this));return false;"' . (($rowAlert['delete_author'] == 1 || $isChecked)? ' checked' : '') . '>';
 					echo '<label for="alert_'.$what.'">'.$lang['srv_alert_author'].'</label>';
 				}
 				if ($isChecked) {
diff --git a/lang/2.php b/lang/2.php
index c583337e8..e5dbb9fdc 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -3594,7 +3594,7 @@ $lang = array (
 	"srv_alert_instruction_available"	=>	"<p class=\"bold\">System variables that are already available in the survey:</p>",
 	"srv_alert_instruction3"		=>	"[SURVEY] => survey name<br/> [DATE] => date<br/> [SITE] => URL of survey<br/><br/></p><p class=\"bold\">Additional system variables from the survey indicate between the two characters #. </p><p>Example:</p><p> if we want to display the answer which the user entered for the system question about email, we will use the #email# <br/></p><p class=\"bold\">System variables that are already available in the survey: </p><p>",
 	"srv_alert_instruction4"		=>	"<p> [SURVEY] => survey name<br/> [DATE] => date<br/> [SITE] => URL of survey<br/> [URL] => URL to editing of survey<br/> [DAYS] => number of days set in the interval<br/><br/></p>",
-	"srv_alert_instruction5"		=>	"<p> [SURVEY] => survey name<br/> [DATE] => date<br/> [SITE] => URL of survey<br/> [URL] => URL to editing of survey<br/><br/></p>",
+	"srv_alert_instruction5"		=>	"[SURVEY] => survey name<br/> [DATE] => date<br/> [SITE] => URL of survey<br/> [URL] => URL to editing of survey",
 	"versions"						=>	"Versions",	
 	"ip_browser_login"				=>	"Login based on browser and IP:",
 	"select_user"					=>	"Select user",