From b8a1b54ff9236305c393ee328181b72dd290a71a Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Thu, 19 Nov 2020 12:18:05 +0100
Subject: [PATCH] Vabila - popravek belezenja v arhiv, ce je v textu znak quote

---
 .../classes/class.SurveyInvitationsNew.php    | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/admin/survey/classes/class.SurveyInvitationsNew.php b/admin/survey/classes/class.SurveyInvitationsNew.php
index 4ae70995c..74ea91701 100644
--- a/admin/survey/classes/class.SurveyInvitationsNew.php
+++ b/admin/survey/classes/class.SurveyInvitationsNew.php
@@ -3781,9 +3781,9 @@ class SurveyInvitationsNew {
 				$sql_query_all 	 = sisplet_query($sql_string_all);
 				list($count_all) = mysqli_fetch_row($sql_query_all);
 
-				$arvhive_naslov = 'mailing_'.date("d.m.Y").', '.date("H:i:s");
-				$sqlString = "INSERT INTO srv_invitations_archive (id, ank_id, date_send, subject_text,body_text,uid,comment,naslov,rec_in_db)"
-				." VALUES (NULL , '$this->sid', '$date_sent', '$subject_text', '$body_text', '$global_user_id','$comment','$arvhive_naslov','$count_all')";
+				$archive_naslov = 'mailing_'.date("d.m.Y").', '.date("H:i:s");
+				$sqlString = "INSERT INTO srv_invitations_archive (id, ank_id, date_send, subject_text, body_text, uid, comment, naslov, rec_in_db)"
+				." VALUES (NULL , '$this->sid', '$date_sent', '".addslashes($subject_text)."', '".addslashes($body_text)."', '$global_user_id','$comment','$archive_naslov','$count_all')";
 				$sqlQuery = sisplet_query($sqlString);
 
 				$arch_id = mysqli_insert_id($GLOBALS['connect_db']);
@@ -4146,7 +4146,7 @@ class SurveyInvitationsNew {
 				list($count_all) = mysqli_fetch_row($sql_query_all);
 
 				$date_sent = date ("Y-m-d H:i:s");		
-				$arvhive_naslov = 'mailing_'.date("d.m.Y").', '.date("H:i:s");
+				$archive_naslov = 'mailing_'.date("d.m.Y").', '.date("H:i:s");
 				
 				// Naslov in body
 				//$subject_text = $lang['srv_inv_message_noemailing_subject'];
@@ -4167,7 +4167,7 @@ class SurveyInvitationsNew {
 				
 				// Vstavimo podatke v arhiv
 				$sqlString = "INSERT INTO srv_invitations_archive (id, ank_id, date_send, subject_text, body_text, tip, uid, comment, naslov, rec_in_db)"
-				." VALUES (NULL , '$this->sid', '$date_sent', '$subject_text', '$body_text', '$noMail_type', '$global_user_id', '$comment', '$arvhive_naslov', '$count_all')";
+				." VALUES (NULL , '$this->sid', '$date_sent', '".addslashes($subject_text)."', '".addslashes($body_text)."', '$noMail_type', '$global_user_id', '$comment', '$archive_naslov', '$count_all')";
 				$sqlQuery = sisplet_query($sqlString);
 
 				$arch_id = mysqli_insert_id($GLOBALS['connect_db']);
@@ -5925,33 +5925,31 @@ class SurveyInvitationsNew {
 
 		# updejtamo userja da mu je bilo poslano
 		if ( count($send_ok_ids) > 0) {
-			$sqlString = "UPDATE srv_invitations_recipients SET sent = '1', date_sent = '".$date_sent."' WHERE id IN (".implode(',',$send_ok_ids).")";
+            
+            $sqlString = "UPDATE srv_invitations_recipients SET sent = '1', date_sent = '".$date_sent."' WHERE id IN (".implode(',',$send_ok_ids).")";
 			$sqlQuery = sisplet_query($sqlString);
-			if (!$sqlQuery) {
+            
+            if (!$sqlQuery) {
 				$error = mysqli_error($GLOBALS['connect_db']);
-			}
+            }
+            
 			$sqlString = "UPDATE srv_invitations_recipients SET last_status = '1' WHERE id IN (".implode(',',$send_ok_ids).") AND last_status IN ('0','2')";
 			$sqlQuery = sisplet_query($sqlString);
-			if (!$sqlQuery) {
+            
+            if (!$sqlQuery) {
 				$error = mysqli_error($GLOBALS['connect_db']);
 			}
-
 		}
 
-		# updejtamo še tabelo arhivov
-		#$sqlString = "INSERT INTO srv_invitations_archive (id, ank_id, date_send, subject_text,body_text,cnt_succsess,cnt_error)"
-		#." VALUES (NULL , '$this->sid', '$date_sent', '$subject_text', '$body_text','".count($send_ok_ids)."','".count($send_error_ids)."')";
-		#$sqlQuery = sisplet_query($sqlString);
-
-		#$arch_id = mysqli_insert_id($GLOBALS['connect_db']);
-
 		$msg = array($lang['srv_inv_activate_respondents']. count($send_ok_ids));
-		if (count($send_error_ids) > 0) {
+        
+        if (count($send_error_ids) > 0) {
 			print_r("<pre>");
 			print_r($lang['srv_inv_error0']);
 			print_r($send_error_ids);
 			print_r("</pre>");
-		}
+        }
+        
 		# popravimo timestamp za regeneracijo dashboarda
 		Common::getInstance()->Init($anketa);
 		Common::getInstance()->updateEditStamp();