From 1e8fbddcbd05790f48594b7877892cd89da7b08e Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sat, 24 Feb 2024 11:06:55 +0000 Subject: [PATCH] Mail queue & tickets - Allow cancelling emails - Adjust wording of ticket scheduling emails --- admin_mail_queue.php | 11 ++++++++--- cron_mail_queue.php | 8 ++++---- post/setting.php | 27 ++++++++++++++++++++++----- post/ticket.php | 22 ++++++++++------------ 4 files changed, 44 insertions(+), 24 deletions(-) diff --git a/admin_mail_queue.php b/admin_mail_queue.php index 041b86711..a06c621dc 100644 --- a/admin_mail_queue.php +++ b/admin_mail_queue.php @@ -133,11 +133,16 @@ - 3 && $email_status == 2) { ?> - - + + 3) { ?> + + + + + + diff --git a/cron_mail_queue.php b/cron_mail_queue.php index f97d17127..c2ce719a2 100644 --- a/cron_mail_queue.php +++ b/cron_mail_queue.php @@ -53,7 +53,7 @@ // Process Mail Queue -// Email Status: +// Email Status: // 0 Queued // 1 Sending // 2 Failed @@ -102,20 +102,20 @@ ); if ($mail !== true) { - // Update Message + // Update Message - Failure mysqli_query($mysqli, "UPDATE email_queue SET email_status = 2, email_failed_at = NOW(), email_attempts = 1 WHERE email_id = $email_id"); mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $email_recipient_logging'"); mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Mail', log_action = 'Error', log_description = 'Failed to send email to $email_recipient_logging regarding $email_subject_logging. $mail'"); } else { - // Update Message + // Update Message - Success mysqli_query($mysqli, "UPDATE email_queue SET email_status = 3, email_sent_at = NOW(), email_attempts = 1 WHERE email_id = $email_id"); } } } } -// +// // Get Mail that failed to send and attempt to send Failed Mail up to 4 times every 30 mins $sql_failed_queue = mysqli_query($mysqli, "SELECT * FROM email_queue WHERE email_status = 2 AND email_attempts < 4 AND email_failed_at < NOW() + INTERVAL 30 MINUTE"); diff --git a/post/setting.php b/post/setting.php index f5b18cf32..5e1c0fcae 100644 --- a/post/setting.php +++ b/post/setting.php @@ -151,7 +151,7 @@ validateCSRFToken($_POST['csrf_token']); validateAdminRole(); - + $test_email = intval($_POST['test_email']); if($test_email == 1) { $email_from = sanitizeInput($config_mail_from_email); @@ -328,7 +328,7 @@ if (isset($_POST['edit_favicon_settings'])) { validateCSRFToken($_POST['csrf_token']); - + validateAdminRole(); // Check to see if a file is attached @@ -451,7 +451,7 @@ if (isset($_POST['edit_ai_settings'])) { validateCSRFToken($_POST['csrf_token']); - + validateAdminRole(); $provider = sanitizeInput($_POST['provider']); @@ -538,10 +538,10 @@ $email_id = intval($_GET['send_failed_mail']); - mysqli_query($mysqli,"UPDATE email_queue SET email_attempts = 3 WHERE email_id = $email_id"); + mysqli_query($mysqli,"UPDATE email_queue SET email_status = 0, email_attempts = 3 WHERE email_id = $email_id"); // Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Email', log_action = 'Send', log_description = '$session_name attempted to force send email queue id: $email_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Email', log_action = 'Send', log_description = '$session_name attempted to force send email queue id: $email_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $email_id"); $_SESSION['alert_message'] = "Email Force Sent, give it a minute to resend"; @@ -549,6 +549,23 @@ } +if (isset($_GET['cancel_mail'])) { + + validateTechRole(); + + $email_id = intval($_GET['cancel_mail']); + + mysqli_query($mysqli,"UPDATE email_queue SET email_status = 2, email_attempts = 99, email_failed_at = NOW() WHERE email_id = $email_id"); + + // Logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Email', log_action = 'Cancel', log_description = '$session_name canceled send email queue id: $email_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $email_id"); + + $_SESSION['alert_message'] = "Email cancelled and marked as failed."; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + if (isset($_GET['download_database'])) { validateCSRFToken($_GET['csrf_token']); diff --git a/post/ticket.php b/post/ticket.php index b278babdf..59e3d969b 100644 --- a/post/ticket.php +++ b/post/ticket.php @@ -1473,10 +1473,10 @@ mysqli_query( $mysqli, "UPDATE tickets SET - ticket_schedule = '$schedule', - ticket_onsite = '$onsite', - ticket_status = 'Scheduled' - WHERE ticket_id = $ticket_id" + ticket_schedule = '$schedule', + ticket_onsite = '$onsite', + ticket_status = 'Scheduled' + WHERE ticket_id = $ticket_id" ); @@ -1499,7 +1499,6 @@ WHERE ticket_id = $ticket_id "); - $row = mysqli_fetch_array($sql); $client_id = intval($row['ticket_client_id']); @@ -1577,7 +1576,7 @@ 'body' => mysqli_escape_string($mysqli, nullable_htmlentities("
Hello,
- Your ticket regarding $ticket_subject has been scheduled for $email_datetime. + The ticket regarding $ticket_subject has been scheduled for $email_datetime.

$ticket_link

@@ -1585,7 +1584,7 @@

Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
- Portal: Access your ticket here + Portal: Access the ticket here

~
@@ -1630,7 +1629,6 @@ header("Location: calendar_events.php"); } - exit; } if (isset($_GET['cancel_ticket_schedule'])) { @@ -1686,7 +1684,7 @@ 'body' => mysqli_escape_string($mysqli, "
Hello, $contact_name
- Your ticket regarding $ticket_subject has been cancelled. + Scheduled work for your ticket regarding $ticket_subject has been cancelled.

Access your ticket here

@@ -1713,7 +1711,7 @@ 'recipient' => $user_email, 'recipient_name' => $user_name, 'subject' => "Ticket Schedule Cancelled - [$ticket_prefix$ticket_number] - $ticket_subject", - 'body' => "Hello, " . $user_name . "

The ticket regarding $ticket_subject has been cancelled.

--------------------------------
$ticket_link
--------------------------------

Please do not reply to this email.

Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Portal: https://$config_base_url/ticket.php?id=$ticket_id

~
$session_company_name
Support Department
$config_ticket_from_email", + 'body' => "Hello, " . $user_name . "

Scheduled work for the ticket regarding $ticket_subject has been cancelled.

--------------------------------
$ticket_link
--------------------------------

Please do not reply to this email.

Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
Portal: https://$config_base_url/ticket.php?id=$ticket_id

~
$session_company_name
Support Department
$config_ticket_from_email", 'cal_str' => $cal_str ] ]; @@ -1731,7 +1729,7 @@ 'body' => mysqli_escape_string($mysqli, nullable_htmlentities("
Hello,
- Your ticket regarding $ticket_subject has been cancelled. + Scheduled work for the ticket regarding $ticket_subject has been cancelled.

$ticket_link

@@ -1739,7 +1737,7 @@

Ticket: $ticket_prefix$ticket_number
Subject: $ticket_subject
- Portal: Access your ticket here + Portal: Access the ticket here

~