From bd87dbcd477066551e5af8ca269c35a1e9248d1b Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Fri, 13 May 2022 12:22:28 +0200
Subject: [PATCH] Redesign - popravki napak - obvescanje

---
 admin/survey/SurveyAdminSettings.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index bae10175d..90a63ac1d 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -3117,8 +3117,10 @@ class SurveyAdminSettings {
 			// respondent - ne prikazemo ce gre za glasovanje oz. volitve
             if($rowS['survey_type'] != 0 && !SurveyInfo::getInstance()->checkSurveyModule('voting')){
 				echo '<div class="setting_item" id="label_alert_finish_respondent">';
-                echo '<input type="checkbox" name="alert_finish_respondent" id="alert_finish_respondent" value="1" onChange="change_alert_respondent(\'finish_respondent\', $(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . ($rowAlert['finish_respondent'] == 1 ? ' checked' : '') . '>';
+                
+                //echo '<input type="checkbox" name="alert_finish_respondent" id="alert_finish_respondent" value="1" onChange="change_alert_respondent(\'finish_respondent\', $(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . ($rowAlert['finish_respondent'] == 1 ? ' checked' : '') . '>';
                 $this->display_alert_label('finish_respondent',($rowAlert['finish_respondent'] == 1));
+                
                 echo '</div>';
 
                 // Ce imamo vec prevodov omogocimo za vsak prevod svoj email
@@ -3130,11 +3132,12 @@ class SurveyAdminSettings {
             if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){
 				echo '<div class="setting_item" id="label_alert_finish_respondent_cms">';
 
-                echo '<input type="checkbox" name="alert_finish_respondent_cms" id="alert_finish_respondent_cms" value="1" onChange="change_alert_respondent(\'finish_respondent_cms\', $(this)); change_alert_instruction($(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . ($rowAlert['finish_respondent_cms'] == 1 ? ' checked' : '') . '>';
+                //echo '<input type="checkbox" name="alert_finish_respondent_cms" id="alert_finish_respondent_cms" value="1" onChange="change_alert_respondent(\'finish_respondent_cms\', $(this)); change_alert_instruction($(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . ($rowAlert['finish_respondent_cms'] == 1 ? ' checked' : '') . '>';
                 $this->display_alert_label('finish_respondent_cms',($rowAlert['finish_respondent_cms'] == 1));
-				echo '</div>';
-
+			
+                echo '</div>';
             }
+
 			//Avtor ankete oz. souredniki
             echo '<div class="setting_item" id="label_alert_finish_author">';
             echo '<input type="checkbox" name="alert_finish_author" id="alert_finish_author" value="1" onChange="change_alert_respondent(\'finish_author\', $(this));return false;"' . ($rowAlert['finish_author'] == 1 ? ' checked' : '') . '>';
@@ -3153,7 +3156,7 @@ class SurveyAdminSettings {
 
             echo '<div class="setting_holder alert_other_emails '.($rowAlert['finish_other'] == 0 ? 'displayNone' : '' ).'" id="alert_holder_finish_other_emails">';
             echo '<label for="alert_finish_other_emails">' . $lang['email_prejemniki_one_per_line'] . ':</label>';
-            echo '<textarea class="alert_other_emails" name="alert_finish_other_emails" id="alert_finish_other_emails">' . $rowAlert['delete_other_emails'] . '</textarea>';
+            echo '<textarea class="alert_other_emails" name="alert_finish_other_emails" id="alert_finish_other_emails">' . $rowAlert['finish_other_emails'] . '</textarea>';
             echo '</div>';
             echo '</div>';
 
@@ -5068,7 +5071,7 @@ class SurveyAdminSettings {
 			case 'finish_respondent_language': 	// respondent ki je zakljucil anketo v drugem jeziku (mu omogocimo nastavljanje custom maila za obvescanje)
 				if ($isChecked) {
 			
-					$p = new Prevajanje($anketa);
+					$p = new Prevajanje($this->anketa);
 					$p->dostop();
 					$jeziki = $p->get_all_translation_langs();
 					if(!empty($jeziki)){
@@ -5128,7 +5131,7 @@ class SurveyAdminSettings {
 							$ime_ok = true;
 						}
 					}
-					echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;"' . (($isChecked) ? ' checked' : '') . '>';
+					echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); $(\'form[name=alertanketa_' . $this->anketa . ']\').submit(); return false;"' . (($isChecked) ? ' checked' : '') . '>';
 					echo '<label for="alert_'.$what.'">'.$lang['srv_alert_respondent'].'</label>';
 						
 					if ($email_ok && $ime_ok) {
@@ -5164,7 +5167,7 @@ class SurveyAdminSettings {
 					// preverimo sistemske nastavitve in spremenljivke ime
 
 				} else { 
-					echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;"' . (($isChecked) ? ' checked' : '') . '>';
+					echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); $(\'form[name=alertanketa_' . $this->anketa . ']\').submit(); return false;"' . (($isChecked) ? ' checked' : '') . '>';
 					echo '<label for="alert_'.$what.'">'.$lang['srv_alert_respondent'].'</label>';
 				}
 				break;
@@ -5172,7 +5175,7 @@ class SurveyAdminSettings {
 			case 'finish_respondent_cms': // respondent prepoznan iz CMS ko je izpolnil anketo
 				
                 //respondent iz cms
-                echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); change_alert_instruction($(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . (($isChecked) ? ' checked' : '') . '>';
+                echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); change_alert_instruction($(this)); $(\'form[name=alertanketa_' . $this->anketa . ']\').submit(); return false;" ' . (($isChecked) ? ' checked' : '') . '>';
 				echo '<label for="alert_finish_respondent_cms">'.$lang['srv_alert_respondent_cms'].'</label>';
 					
 				if ($isChecked) {
@@ -5203,7 +5206,7 @@ class SurveyAdminSettings {
 			case 'delete_author': // obveščanje o izbrisu ankete
 
 				// preberemo nastavitve alertov
-				$sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '$anketa'");
+				$sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '$this->anketa'");
 				if (!$sqlAlert)
 					echo mysqli_error($GLOBALS['connect_db']);
 				
@@ -5211,7 +5214,7 @@ class SurveyAdminSettings {
 					$rowAlert = mysqli_fetch_array($sqlAlert);
 				} 
 				else {
-					SurveyAlert::getInstance()->Init($anketa, $global_user_id);
+					SurveyAlert::getInstance()->Init($this->anketa, $global_user_id);
 					$rowAlert = SurveyAlert::setDefaultAlertBeforeExpire();
 				}