AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ajax.php
View File

@ -364,7 +364,7 @@ if (isset($_GET['share_generate_link'])) {
]
];
addToMailQueue($mysqli, $data);
addToMailQueue($data);
}

10
cron.php
View File

@ -363,7 +363,7 @@ if (mysqli_num_rows($sql_scheduled_tickets) > 0) {
}
// Add to the mail queue
addToMailQueue($mysqli, $data);
addToMailQueue($data);
// Set the next run date
if ($frequency == "weekly") {
@ -487,7 +487,7 @@ if ($config_send_invoice_reminders == 1) {
<br><br>
Kindly review the invoice details mentioned below.<br><br>Invoice: $invoice_prefix$invoice_number<br>Issue Date: $invoice_date<br>Total: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "<br>Due Date: $invoice_due<br>Over Due By: $day Days<br><br><br>To view your invoice, please click <a href=\'https://$config_base_url/guest/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key\'>here</a>.<br><br><br>--<br>$company_name - Billing<br>$config_invoice_from_email<br>$company_phone";
$mail = addToMailQueue($mysqli, [
$mail = addToMailQueue([
[
'from' => $config_invoice_from_email,
'from_name' => $config_invoice_from_name,
@ -496,7 +496,7 @@ if ($config_send_invoice_reminders == 1) {
'subject' => $subject,
'body' => $body
]
]);
]);
if ($mail === true) {
mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Cron Emailed Overdue Invoice', history_invoice_id = $invoice_id");
@ -619,7 +619,7 @@ while ($row = mysqli_fetch_array($sql_recurring)) {
$subject = "Invoice $invoice_prefix$invoice_number";
$body = "Hello $contact_name,<br><br>An invoice regarding \"$invoice_scope\" has been generated. Please view the details below.<br><br>Invoice: $invoice_prefix$invoice_number<br>Issue Date: $invoice_date<br>Total: " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_currency_code) . "<br>Due Date: $invoice_due<br><br><br>To view your invoice, please click <a href=\'https://$config_base_url/guest/guest_view_invoice.php?invoice_id=$new_invoice_id&url_key=$invoice_url_key\'>here</a>.<br><br><br>--<br>$company_name - Billing<br>$config_invoice_from_email<br>$company_phone";
$mail = addToMailQueue($mysqli, [
$mail = addToMailQueue([
[
'from' => $config_invoice_from_email,
'from_name' => $config_invoice_from_name,
@ -666,7 +666,7 @@ while ($row = mysqli_fetch_array($sql_recurring)) {
]
];
addToMailQueue($mysqli, $data);
addToMailQueue($data);
}
} //End if Autosend is on

6
cron_ticket_email_parser.php
View File

@ -187,7 +187,7 @@ function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date
];
}
addToMailQueue($mysqli, $data);
addToMailQueue($data);
// Custom action/notif handler
customAction('ticket_create', $id);
@ -249,7 +249,7 @@ function addReply($from_email, $date, $subject, $ticket_number, $message, $attac
]
];
addToMailQueue($mysqli, $data);
addToMailQueue($data);
return true;
}
@ -319,7 +319,7 @@ function addReply($from_email, $date, $subject, $ticket_number, $message, $attac
]
];
addToMailQueue($mysqli, $data);
addToMailQueue($data);
}
}

6
functions.php
View File

@ -5,9 +5,7 @@ DEFINE("WORDING_ROLECHECK_FAILED", "You are not permitted to do that!");
// PHP Mailer Libs
require_once "plugins/PHPMailer/src/Exception.php";
require_once "plugins/PHPMailer/src/PHPMailer.php";
require_once "plugins/PHPMailer/src/SMTP.php";
// Initiate PHPMailer
@ -1029,7 +1027,9 @@ function generateReadablePassword($security_level)
return $password;
}
function addToMailQueue($mysqli, $data) {
function addToMailQueue($data) {
global $mysqli;
foreach ($data as $email) {
$from = strval($email['from']);

2
guest/guest_ajax.php
View File

@ -10,9 +10,7 @@ require_once "../config.php";
// Set Timezone
require_once "../inc_set_timezone.php";
require_once "../functions.php";
require_once "../rfc6238.php";

2
guest/guest_footer.php
View File

@ -21,9 +21,7 @@
<script src='../plugins/daterangepicker/daterangepicker.js'></script>
<script src='../plugins/select2/js/select2.min.js'></script>
<script src='../plugins/inputmask/inputmask.min.js'></script>
<script src="../js/app.js"></script>
<script src="../js/confirm_modal.js"></script>
</body>

2
guest/guest_pay_invoice_stripe.php
View File

@ -342,7 +342,7 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent
];
}
$mail = addToMailQueue($mysqli, $data);
$mail = addToMailQueue($data);
// Email logging
mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Emailed Receipt!', history_invoice_id = $invoice_id");

4
guest/guest_post.php
View File

@ -58,7 +58,7 @@ if (isset($_GET['accept_quote'], $_GET['url_key'])) {
'body' => $body,
];
$mail = addToMailQueue($mysqli, $data);
$mail = addToMailQueue($data);
}
$_SESSION['alert_message'] = "Quote Accepted";
@ -119,7 +119,7 @@ if (isset($_GET['decline_quote'], $_GET['url_key'])) {
'body' => $body,
];
$mail = addToMailQueue($mysqli, $data);
$mail = addToMailQueue($data);
}
$_SESSION['alert_type'] = "danger";

4
login.php
View File

@ -185,7 +185,7 @@ if (isset($_POST['login'])) {
'body' => $body
]
];
addToMailQueue($mysqli, $data);
addToMailQueue($data);
}
// Logging
@ -262,7 +262,7 @@ if (isset($_POST['login'])) {
'body' => $body
]
];
$mail = addToMailQueue($mysqli, $data);
$mail = addToMailQueue($data);
}
// HTML feedback for incorrect 2FA code

4
portal/login_reset.php
View File

@ -91,7 +91,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
'body' => $body
]
];
$mail = addToMailQueue($mysqli, $data);
$mail = addToMailQueue($data);
// Error handling
if ($mail !== true) {
@ -147,7 +147,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
]
];
$mail = addToMailQueue($mysqli, $data);
$mail = addToMailQueue($data);
// Error handling
if ($mail !== true) {

6
portal/portal_post.php
View File

@ -60,7 +60,7 @@ if (isset($_POST['add_ticket'])) {
'body' => $email_body,
]
];
addToMailQueue($mysqli, $data);
addToMailQueue($data);
}
// Custom action/notif handler
@ -125,7 +125,7 @@ if (isset($_POST['add_ticket_comment'])) {
]
];
addToMailQueue($mysqli, $data);
addToMailQueue($data);
}
@ -628,7 +628,7 @@ if (isset($_GET['stripe_save_card'])) {
]
];
$mail = addToMailQueue($mysqli, $data);
$mail = addToMailQueue($data);
}

2
post/admin/admin_settings_mail.php
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>";

2
post/admin/admin_user.php
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'");

2
post/user/contact.php
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);

4
post/user/event.php
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);

12
post/user/invoice.php
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

6
post/user/profile.php
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

2
post/user/quote.php
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");

28
post/user/ticket.php
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.";

12
scripts/cron.php
View File

@ -390,7 +390,7 @@ if (mysqli_num_rows($sql_scheduled_tickets) > 0) {
}
// Add to the mail queue
addToMailQueue($mysqli, $data);
addToMailQueue($data);
// Set the next run date
if ($frequency == "weekly") {
@ -514,7 +514,7 @@ if ($config_send_invoice_reminders == 1) {
<br><br>
Kindly review the invoice details mentioned below.<br><br>Invoice: $invoice_prefix$invoice_number<br>Issue Date: $invoice_date<br>Total: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "<br>Due Date: $invoice_due<br>Over Due By: $day Days<br><br><br>To view your invoice, please click <a href=\'https://$config_base_url/guest/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key\'>here</a>.<br><br><br>--<br>$company_name - Billing<br>$config_invoice_from_email<br>$company_phone";
$mail = addToMailQueue($mysqli, [
$mail = addToMailQueue([
[
'from' => $config_invoice_from_email,
'from_name' => $config_invoice_from_name,
@ -523,7 +523,7 @@ if ($config_send_invoice_reminders == 1) {
'subject' => $subject,
'body' => $body
]
]);
]);
if ($mail === true) {
mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Cron Emailed Overdue Invoice', history_invoice_id = $invoice_id");
@ -647,7 +647,7 @@ while ($row = mysqli_fetch_array($sql_recurring)) {
$subject = "Invoice $invoice_prefix$invoice_number";
$body = "Hello $contact_name,<br><br>An invoice regarding \"$invoice_scope\" has been generated. Please view the details below.<br><br>Invoice: $invoice_prefix$invoice_number<br>Issue Date: $invoice_date<br>Total: " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_currency_code) . "<br>Due Date: $invoice_due<br><br><br>To view your invoice, please click <a href=\'https://$config_base_url/guest/guest_view_invoice.php?invoice_id=$new_invoice_id&url_key=$invoice_url_key\'>here</a>.<br><br><br>--<br>$company_name - Billing<br>$config_invoice_from_email<br>$company_phone";
$mail = addToMailQueue($mysqli, [
$mail = addToMailQueue([
[
'from' => $config_invoice_from_email,
'from_name' => $config_invoice_from_name,
@ -694,7 +694,7 @@ while ($row = mysqli_fetch_array($sql_recurring)) {
]
];
addToMailQueue($mysqli, $data);
addToMailQueue($data);
}
} //End if Autosend is on
@ -792,7 +792,7 @@ while ($row = mysqli_fetch_array($sql_recurring)) {
];
}
$mail = addToMailQueue($mysqli, $data);
$mail = addToMailQueue($data);
// Email Logging
$email_id = mysqli_insert_id($mysqli);

6
scripts/cron_ticket_email_parser.php
View File

@ -187,7 +187,7 @@ function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date
];
}
addToMailQueue($mysqli, $data);
addToMailQueue($data);
// Custom action/notif handler
customAction('ticket_create', $id);
@ -249,7 +249,7 @@ function addReply($from_email, $date, $subject, $ticket_number, $message, $attac
]
];
addToMailQueue($mysqli, $data);
addToMailQueue($data);
return true;
}
@ -319,7 +319,7 @@ function addReply($from_email, $date, $subject, $ticket_number, $message, $attac
]
];
addToMailQueue($mysqli, $data);
addToMailQueue($data);
}
}