Remove mysqli connection vars when passing mail data to addToMailQueue Function

This commit is contained in:
johnnyq
2025-01-22 20:56:24 -05:00
parent c5c809791a
commit 2c51289d75
21 changed files with 60 additions and 64 deletions

View File

@@ -105,7 +105,7 @@ if (isset($_POST['test_email_smtp'])) {
'body' => $body
]
];
$mail = addToMailQueue($mysqli, $data);
$mail = addToMailQueue($data);
if ($mail === true) {
$_SESSION['alert_message'] = "Test email queued successfully! <a class='text-bold text-light' href='admin_mail_queue.php'>Check Admin > Mail queue</a>";

View File

@@ -81,7 +81,7 @@ if (isset($_POST['add_user'])) {
'body' => $body
]
];
$mail = addToMailQueue($mysqli, $data);
$mail = addToMailQueue($data);
if ($mail !== true) {
mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $email'");

View File

@@ -201,7 +201,7 @@ if (isset($_POST['edit_contact'])) {
'body' => $body,
]
];
addToMailQueue($mysqli, $data);
addToMailQueue($data);
// Get Email ID for reference
$email_id = mysqli_insert_id($mysqli);

View File

@@ -94,7 +94,7 @@ if (isset($_POST['add_event'])) {
'body' => $body
]
];
$mail = addToMailQueue($mysqli, $data);
$mail = addToMailQueue($data);
// Logging for email (success/fail)
if ($mail === true) {
@@ -163,7 +163,7 @@ if (isset($_POST['edit_event'])) {
'body' => $body
]
];
$mail = addToMailQueue($mysqli, $data);
$mail = addToMailQueue($data);
// Logging for email (success/fail)
if ($mail === true) {
logAction("Calendar Event", "Email", "$session_name Emailed modified event $title to $contact_name email $contact_email", $client, $event_id);

View File

@@ -817,7 +817,7 @@ if (isset($_POST['add_payment'])) {
// Add email to queue
if (!empty($email)) {
addToMailQueue($mysqli, $email_data);
addToMailQueue($email_data);
}
// Get Email ID for reference
@@ -852,7 +852,7 @@ if (isset($_POST['add_payment'])) {
// Add email to queue
if (!empty($email)) {
addToMailQueue($mysqli, $email_data);
addToMailQueue($email_data);
}
// Get Email ID for reference
@@ -1031,7 +1031,7 @@ if (isset($_GET['add_payment_stripe'])) {
];
}
$mail = addToMailQueue($mysqli, $data);
$mail = addToMailQueue($data);
// Email Logging
$email_id = mysqli_insert_id($mysqli);
@@ -1326,7 +1326,7 @@ if (isset($_GET['email_invoice'])) {
]
];
addToMailQueue($mysqli, $data);
addToMailQueue($data);
// Get Email ID for reference
$email_id = mysqli_insert_id($mysqli);
@@ -1374,7 +1374,7 @@ if (isset($_GET['email_invoice'])) {
}
addToMailQueue($mysqli, $data);
addToMailQueue($data);
header("Location: " . $_SERVER["HTTP_REFERER"]);
@@ -1563,7 +1563,7 @@ if (isset($_GET['force_recurring'])) {
'body' => $body
]
];
$mail = addToMailQueue($mysqli, $data);
$mail = addToMailQueue($data);
if ($mail === true) {
// Add send history

View File

@@ -47,7 +47,7 @@ if (isset($_POST['edit_your_user_details'])) {
'body' => $body
]
];
$mail = addToMailQueue($mysqli, $data);
$mail = addToMailQueue($data);
}
// Photo
@@ -138,7 +138,7 @@ if (isset($_POST['edit_your_user_password'])) {
'body' => $body
]
];
$mail = addToMailQueue($mysqli, $data);
$mail = addToMailQueue($data);
}
$new_password = password_hash($new_password, PASSWORD_DEFAULT);
@@ -267,7 +267,7 @@ if (isset($_POST['disable_2fa'])){
'body' => $body
]
];
$mail = addToMailQueue($mysqli, $data);
$mail = addToMailQueue($data);
}
// Logging

View File

@@ -502,7 +502,7 @@ if (isset($_GET['email_quote'])) {
'body' => $body,
]
];
addToMailQueue($mysqli, $data);
addToMailQueue($data);
// Update History
mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Emailed Quote', history_quote_id = $quote_id");

View File

@@ -151,7 +151,7 @@ if (isset($_POST['add_ticket'])) {
'body' => $body
];
}
addToMailQueue($mysqli, $data);
addToMailQueue($data);
// END EMAILING
@@ -236,7 +236,7 @@ if (isset($_POST['edit_ticket'])) {
];
}
addToMailQueue($mysqli, $data);
addToMailQueue($data);
}
// Custom action/notif handler
@@ -354,7 +354,7 @@ if (isset($_POST['edit_ticket_contact'])) {
'body' => $body
];
addToMailQueue($mysqli, $data);
addToMailQueue($data);
}
// Custom action/notif handler
@@ -431,7 +431,7 @@ if (isset($_POST['add_ticket_watcher'])) {
];
}
addToMailQueue($mysqli, $data);
addToMailQueue($data);
}
// Logging
@@ -629,7 +629,7 @@ if (isset($_POST['assign_ticket'])) {
'body' => $body,
]
];
addToMailQueue($mysqli, $data);
addToMailQueue($data);
}
}
@@ -772,7 +772,7 @@ if (isset($_POST['bulk_assign_ticket'])) {
'body' => $body,
]
];
addToMailQueue($mysqli, $data);
addToMailQueue($data);
}
}
}
@@ -999,7 +999,7 @@ if (isset($_POST['bulk_resolve_tickets'])) {
'body' => $body
];
}
addToMailQueue($mysqli, $data);
addToMailQueue($data);
} // End Mail IF
} // End Loop
} // End Array Empty Check
@@ -1136,7 +1136,7 @@ if (isset($_POST['bulk_ticket_reply'])) {
'body' => $body
];
}
addToMailQueue($mysqli, $data);
addToMailQueue($data);
} //End Mail IF
// Notification for assigned ticket user
@@ -1452,7 +1452,7 @@ if (isset($_POST['add_ticket_reply'])) {
'body' => $body
];
}
addToMailQueue($mysqli, $data);
addToMailQueue($data);
}
//End Mail IF
@@ -1700,7 +1700,7 @@ if (isset($_GET['resolve_ticket'])) {
'body' => $body
];
}
addToMailQueue($mysqli, $data);
addToMailQueue($data);
}
//End Mail IF
@@ -1794,7 +1794,7 @@ if (isset($_GET['close_ticket'])) {
'body' => $body
];
}
addToMailQueue($mysqli, $data);
addToMailQueue($data);
}
//End Mail IF
@@ -2103,7 +2103,7 @@ if (isset($_GET['force_recurring_ticket'])) {
}
// Add to the mail queue
addToMailQueue($mysqli, $data);
addToMailQueue($data);
// Set the next run date (based on the scheduled date, rather than now, so things keep their schedule)
$dt_old_next_scheduled_date = new DateTime($old_next_scheduled_date);
@@ -2367,7 +2367,7 @@ if (isset($_POST['edit_ticket_schedule'])) {
}
// Send
$response = addToMailQueue($mysqli, $data);
$response = addToMailQueue($data);
// Update ticket reply
$ticket_reply_note = "Ticket scheduled for $email_datetime " . (boolval($onsite) ? '(onsite).' : '(remote).');
@@ -2519,7 +2519,7 @@ if (isset($_GET['cancel_ticket_schedule'])) {
}
// Send email(s)
addToMailQueue($mysqli, $data);
addToMailQueue($data);
// Update ticket reply
$ticket_reply_note = "Ticket schedule cancelled.";