ThaMunsta/itflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Mail Array causing duplicate sending

Browse Source
This commit is contained in:
johnnyq
2024-01-20 13:33:54 -05:00
parent b942bf0e18
commit 5f3b08a543
1 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
post/ticket.php
View File

@@ -99,17 +99,16 @@ if (isset($_POST['add_ticket'])) {
// Email Ticket Contact // Email Ticket Contact
// Queue Mail // Queue Mail
$data = [ $data = [];
[
'from' => $config_ticket_from_email, $data[] = [
'from_name' => $config_ticket_from_name, 'from' => $config_ticket_from_email,
'recipient' => $contact_email, 'from_name' => $config_ticket_from_name,
'recipient_name' => $contact_name, 'recipient' => $contact_email,
'subject' => $subject, 'recipient_name' => $contact_name,
'body' => $body 'subject' => $subject,
] 'body' => $body
]; ];
addToMailQueue($mysqli, $data);
// Also Email all the watchers // Also Email all the watchers
$sql_watchers = mysqli_query($mysqli, "SELECT watcher_email FROM ticket_watchers WHERE watcher_ticket_id = $ticket_id"); $sql_watchers = mysqli_query($mysqli, "SELECT watcher_email FROM ticket_watchers WHERE watcher_ticket_id = $ticket_id");
@@ -118,18 +117,17 @@ if (isset($_POST['add_ticket'])) {
$watcher_email = sanitizeInput($row['watcher_email']); $watcher_email = sanitizeInput($row['watcher_email']);
// Queue Mail // Queue Mail
$data = [ $data[] = [
[ 'from' => $config_ticket_from_email,
'from' => $config_ticket_from_email, 'from_name' => $config_ticket_from_name,
'from_name' => $config_ticket_from_name, 'recipient' => $watcher_email,
'recipient' => $watcher_email, 'recipient_name' => $watcher_email,
'recipient_name' => $watcher_email, 'subject' => $subject,
'subject' => $subject, 'body' => $body
'body' => $body
]
]; ];
addToMailQueue($mysqli, $data);
} }
addToMailQueue($mysqli, $data);
} }
} }
@@ -568,7 +566,6 @@ if (isset($_POST['add_ticket_reply'])) {
'subject' => $subject, 'subject' => $subject,
'body' => $body 'body' => $body
]; ];
addToMailQueue($mysqli, $data);
// Also Email all the watchers // Also Email all the watchers
$sql_watchers = mysqli_query($mysqli, "SELECT watcher_email FROM ticket_watchers WHERE watcher_ticket_id = $ticket_id"); $sql_watchers = mysqli_query($mysqli, "SELECT watcher_email FROM ticket_watchers WHERE watcher_ticket_id = $ticket_id");
@@ -585,8 +582,9 @@ if (isset($_POST['add_ticket_reply'])) {
'subject' => $subject, 'subject' => $subject,
'body' => $body 'body' => $body
]; ];
addToMailQueue($mysqli, $data);
} }
addToMailQueue($mysqli, $data);
} }
} }
//End Mail IF //End Mail IF
@@ -792,7 +790,6 @@ if (isset($_GET['close_ticket'])) {
'subject' => $subject, 'subject' => $subject,
'body' => $body 'body' => $body
]; ];
addToMailQueue($mysqli, $data);
// Also Email all the watchers // Also Email all the watchers
$sql_watchers = mysqli_query($mysqli, "SELECT watcher_email FROM ticket_watchers WHERE watcher_ticket_id = $ticket_id"); $sql_watchers = mysqli_query($mysqli, "SELECT watcher_email FROM ticket_watchers WHERE watcher_ticket_id = $ticket_id");
@@ -809,9 +806,8 @@ if (isset($_GET['close_ticket'])) {
'subject' => $subject, 'subject' => $subject,
'body' => $body 'body' => $body
]; ];
addToMailQueue($mysqli, $data);
} }
addToMailQueue($mysqli, $data);
} }
} }