From e6418046aa908eac7c5ea6b8d64d95815c6b6b8c Mon Sep 17 00:00:00 2001
From: wrongecho <32306651+wrongecho@users.noreply.github.com>
Date: Fri, 16 Feb 2024 12:15:55 +0000
Subject: [PATCH 1/3] Fix deleting recurring tickets

---
 post/ticket.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/post/ticket.php b/post/ticket.php
index e006319f..9631f947 100644
--- a/post/ticket.php
+++ b/post/ticket.php
@@ -1374,7 +1374,7 @@ if (isset($_POST['edit_scheduled_ticket']) || isset($_POST['edit_recurring_ticke
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 }
 
-if (isset($_GET['delete_scheduled_ticket']) || isset($_POST['delete_recurring_ticket'])) {
+if (isset($_GET['delete_scheduled_ticket']) || isset($_GET['delete_recurring_ticket'])) {
 
     validateAdminRole();
 
@@ -1766,4 +1766,4 @@ if (isset($_GET['cancel_ticket_schedule'])) {
     $_SESSION['alert_message'] = "Ticket schedule cancelled";
 
     header("Location: " . $_SERVER["HTTP_REFERER"]);
-}
\ No newline at end of file
+}

From 793a4f9c8ea2eb513da14d86607b11235b694a90 Mon Sep 17 00:00:00 2001
From: wrongecho <32306651+wrongecho@users.noreply.github.com>
Date: Fri, 16 Feb 2024 12:18:36 +0000
Subject: [PATCH 2/3] Recurring ticket deletion wording

---
 post/ticket.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/post/ticket.php b/post/ticket.php
index 9631f947..adae0214 100644
--- a/post/ticket.php
+++ b/post/ticket.php
@@ -1374,11 +1374,11 @@ if (isset($_POST['edit_scheduled_ticket']) || isset($_POST['edit_recurring_ticke
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 }
 
-if (isset($_GET['delete_scheduled_ticket']) || isset($_GET['delete_recurring_ticket'])) {
+if (isset($_GET['delete_recurring_ticket'])) {
 
     validateAdminRole();
 
-    $scheduled_ticket_id = intval($_GET['delete_scheduled_ticket']);
+    $scheduled_ticket_id = intval($_GET['delete_recurring_ticket']);
 
     // Get Scheduled Ticket Subject Ticket Prefix, Number and Client ID for logging and alert message
     $sql = mysqli_query($mysqli, "SELECT * FROM scheduled_tickets WHERE scheduled_ticket_id = $scheduled_ticket_id");
@@ -1392,9 +1392,9 @@ if (isset($_GET['delete_scheduled_ticket']) || isset($_GET['delete_recurring_tic
     mysqli_query($mysqli, "DELETE FROM scheduled_tickets WHERE scheduled_ticket_id = $scheduled_ticket_id");
 
     //Logging
-    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Scheduled Ticket', log_action = 'Delete', log_description = '$session_name deleted scheduled ticket for $subject - $frequency', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $scheduled_ticket_id");
+    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Scheduled Ticket', log_action = 'Delete', log_description = '$session_name deleted recurring ticket for $subject - $frequency', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $scheduled_ticket_id");
 
-    $_SESSION['alert_message'] = "Scheduled ticket <strong>$subject - $frequency</strong> deleted";
+    $_SESSION['alert_message'] = "Recurring ticket <strong>$subject - $frequency</strong> deleted";
 
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 }

From ae80bba5ced4b6e25db949ad92b8c4df24b16baf Mon Sep 17 00:00:00 2001
From: wrongecho <32306651+wrongecho@users.noreply.github.com>
Date: Fri, 16 Feb 2024 12:20:49 +0000
Subject: [PATCH 3/3] Deleting recurring tickets - correctly pull
 subject/frequency

---
 post/ticket.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/post/ticket.php b/post/ticket.php
index adae0214..b278babd 100644
--- a/post/ticket.php
+++ b/post/ticket.php
@@ -1383,8 +1383,8 @@ if (isset($_GET['delete_recurring_ticket'])) {
     // Get Scheduled Ticket Subject Ticket Prefix, Number and Client ID for logging and alert message
     $sql = mysqli_query($mysqli, "SELECT * FROM scheduled_tickets WHERE scheduled_ticket_id = $scheduled_ticket_id");
     $row = mysqli_fetch_array($sql);
-    $scheduled_ticket_subject = sanitizeInput($row['scheduled_ticket_subject']);
-    $scheduled_ticket_frequency = sanitizeInput($row['scheduled_ticket_frequency']);
+    $subject = sanitizeInput($row['scheduled_ticket_subject']);
+    $frequency = sanitizeInput($row['scheduled_ticket_frequency']);
 
     $client_id = intval($row['scheduled_ticket_client_id']);