AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-06 05:44:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1043 from itflow-org/email-send-tidy

Browse Source 
Email Send - Tidy
This commit is contained in:
Johnny
2024-09-10 21:25:07 -04:00
committed by GitHub
parent c863b8b033 517e8d42f0
commit e8c27e9234
3 changed files with 70 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
cron_mail_queue.php
View File

@@ -24,11 +24,13 @@ $argv = $_SERVER['argv'];
// Check cron is enabled // Check cron is enabled
if ($config_enable_cron == 0) { if ($config_enable_cron == 0) {
error_log("Mail queue error - Cron is not enabled");
exit("Cron: is not enabled -- Quitting.."); exit("Cron: is not enabled -- Quitting..");
} }
// Check Cron Key // Check Cron Key
if ($argv[1] !== $config_cron_key) { if ($argv[1] !== $config_cron_key) {
error_log("Mail queue error - Invalid cron key supplied");
exit("Cron Key invalid -- Quitting.."); exit("Cron Key invalid -- Quitting..");
} }
@@ -63,8 +65,12 @@ file_put_contents($lock_file_path, "Locked");
// 2 Failed // 2 Failed
// 3 Sent // 3 Sent
/*
* ###############################################################################################################
* Initial email send
* ###############################################################################################################
*/
// Get Mail Queue that has status of Queued and send it to the function sendSingleEmail() located in functions.php // Get Mail Queue that has status of Queued and send it to the function sendSingleEmail() located in functions.php
$sql_queue = mysqli_query($mysqli, "SELECT * FROM email_queue WHERE email_status = 0 AND email_queued_at <= NOW()"); $sql_queue = mysqli_query($mysqli, "SELECT * FROM email_queue WHERE email_status = 0 AND email_queued_at <= NOW()");
if (mysqli_num_rows($sql_queue) > 0) { if (mysqli_num_rows($sql_queue) > 0) {
@@ -80,47 +86,68 @@ if (mysqli_num_rows($sql_queue) > 0) {
$email_sent_at = $row['email_sent_at']; $email_sent_at = $row['email_sent_at'];
$email_ics_str = $row['email_cal_str']; $email_ics_str = $row['email_cal_str'];
// Sanitized Input // First, validate the sender email address
$email_recipient_logging = sanitizeInput($row['email_recipient']); if (filter_var($email_from, FILTER_VALIDATE_EMAIL)) {
$email_subject_logging = sanitizeInput($row['email_subject']);
// Update the status to sending // Sanitized Input
mysqli_query($mysqli, "UPDATE email_queue SET email_status = 1 WHERE email_id = $email_id"); $email_recipient_logging = sanitizeInput($row['email_recipient']);
$email_subject_logging = sanitizeInput($row['email_subject']);
// Verify contact email is valid // Update the status to sending
if (filter_var($email_recipient, FILTER_VALIDATE_EMAIL)) { mysqli_query($mysqli, "UPDATE email_queue SET email_status = 1 WHERE email_id = $email_id");
$mail = sendSingleEmail( // Next, verify recipient email is valid
$config_smtp_host, if (filter_var($email_recipient, FILTER_VALIDATE_EMAIL)) {
$config_smtp_username,
$config_smtp_password,
$config_smtp_encryption,
$config_smtp_port,
$email_from,
$email_from_name,
$email_recipient,
$email_recipient_name,
$email_subject,
$email_content,
$email_ics_str
);
if ($mail !== true) { $mail = sendSingleEmail(
// Update Message - Failure $config_smtp_host,
mysqli_query($mysqli, "UPDATE email_queue SET email_status = 2, email_failed_at = NOW(), email_attempts = 1 WHERE email_id = $email_id"); $config_smtp_username,
$config_smtp_password,
$config_smtp_encryption,
$config_smtp_port,
$email_from,
$email_from_name,
$email_recipient,
$email_recipient_name,
$email_subject,
$email_content,
$email_ics_str
);
mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $email_recipient_logging'"); if ($mail !== true) {
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'"); // 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 = 'Cron-Mail-Queue', notification = 'Failed to send email #$email_id to $email_recipient_logging'");
mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron-Mail-Queue', log_action = 'Error', log_description = 'Failed to send email #$email_id to $email_recipient_logging regarding $email_subject_logging. $mail'");
} else {
// 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");
}
} else { } else {
// Update Message - Success // Recipient email isn't valid, mark as failed and log the error
mysqli_query($mysqli, "UPDATE email_queue SET email_status = 3, email_sent_at = NOW(), email_attempts = 1 WHERE email_id = $email_id"); mysqli_query($mysqli, "UPDATE email_queue SET email_status = 2, email_attempts = 99 WHERE email_id = $email_id");
mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron-Mail-Queue', log_action = 'Error', log_description = 'Failed to send email #$email_id due to invalid recipient address. Email subject was: $email_subject_logging.'");
} }
} else {
error_log("Failed to send email due to invalid sender address (' $email_from ') - check configuration in settings.");
$email_from_logging = sanitizeInput($row['email_from']);
mysqli_query($mysqli, "UPDATE email_queue SET email_status = 2, email_attempts = 99 WHERE email_id = $email_id");
mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron-Mail-Queue', log_action = 'Error', log_description = 'Failed to send email #$email_id due to invalid sender address: $email_from_logging - check configuration in settings.'");
mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email #$email_id due to invalid sender address'");
} }
} }
} }
//
/*
* ###############################################################################################################
* Retries
* ###############################################################################################################
*/
// Get Mail that failed to send and attempt to send Failed Mail up to 4 times every 30 mins // 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"); $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");
@@ -146,7 +173,7 @@ if (mysqli_num_rows($sql_failed_queue) > 0) {
// Update the status to sending before actually sending // Update the status to sending before actually sending
mysqli_query($mysqli, "UPDATE email_queue SET email_status = 1 WHERE email_id = $email_id"); mysqli_query($mysqli, "UPDATE email_queue SET email_status = 1 WHERE email_id = $email_id");
// Verify contact email is valid // Verify recipient email is valid
if (filter_var($email_recipient, FILTER_VALIDATE_EMAIL)) { if (filter_var($email_recipient, FILTER_VALIDATE_EMAIL)) {
$mail = sendSingleEmail( $mail = sendSingleEmail(
@@ -167,9 +194,7 @@ if (mysqli_num_rows($sql_failed_queue) > 0) {
if ($mail !== true) { if ($mail !== true) {
// Update Message // Update Message
mysqli_query($mysqli, "UPDATE email_queue SET email_status = 2, email_failed_at = NOW(), email_attempts = $email_attempts WHERE email_id = $email_id"); mysqli_query($mysqli, "UPDATE email_queue SET email_status = 2, email_failed_at = NOW(), email_attempts = $email_attempts WHERE email_id = $email_id");
mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron-Mail-Queue', log_action = 'Error', log_description = 'Failed to re-send email #$email_id to $email_recipient_logging regarding $email_subject_logging. $mail'");
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 { } else {
// Update Message // Update Message
mysqli_query($mysqli, "UPDATE email_queue SET email_status = 3, email_sent_at = NOW(), email_attempts = $email_attempts WHERE email_id = $email_id"); mysqli_query($mysqli, "UPDATE email_queue SET email_status = 3, email_sent_at = NOW(), email_attempts = $email_attempts WHERE email_id = $email_id");
@@ -178,5 +203,5 @@ if (mysqli_num_rows($sql_failed_queue) > 0) {
} }
} }
// Remove the lock file once mail has finished processing so it doesnt get overun causing possible duplicates // Remove the lock file once mail has finished processing
unlink($lock_file_path); unlink($lock_file_path);

6
functions.php
View File

@@ -480,7 +480,6 @@ function getSSL($full_name)
function strtoAZaz09($string) function strtoAZaz09($string)
{ {
// Gets rid of non-alphanumerics // Gets rid of non-alphanumerics
return preg_replace('/[^A-Za-z0-9_-]/', '', $string); return preg_replace('/[^A-Za-z0-9_-]/', '', $string);
} }
@@ -547,7 +546,6 @@ function sendSingleEmail($config_smtp_host, $config_smtp_username, $config_smtp_
if (empty($config_smtp_username)) { if (empty($config_smtp_username)) {
$smtp_auth = false; $smtp_auth = false;
} else { } else {
$smtp_auth = true; $smtp_auth = true;
} }
@@ -635,7 +633,7 @@ function sendSingleEmail($config_smtp_host, $config_smtp_username, $config_smtp_
} catch (Exception $e) { } catch (Exception $e) {
// If we couldn't send the message return the error, so we can log it in the database (truncated) // If we couldn't send the message return the error, so we can log it in the database (truncated)
error_log("ITFlow - Failed to send email: " . $mail->ErrorInfo); error_log("ITFlow - Failed to send email: " . $mail->ErrorInfo);
return substr("Mailer Error: $mail->ErrorInfo", 0, 150) . "..."; return substr("Mailer Error: $mail->ErrorInfo", 0, 100) . "...";
} }
} }
@@ -1050,7 +1048,7 @@ function addToMailQueue($mysqli, $data) {
$cal_str = ''; $cal_str = '';
if (isset($email['cal_str'])) { if (isset($email['cal_str'])) {
$cal_str = mysqli_escape_string($mysqli,$email['cal_str']); $cal_str = mysqli_escape_string($mysqli, $email['cal_str']);
} }
// Check if 'email_queued_at' is set and not empty // Check if 'email_queued_at' is set and not empty

16
post/setting.php
View File

@@ -124,17 +124,17 @@ if (isset($_POST['edit_mail_from_settings'])) {
validateCSRFToken($_POST['csrf_token']); validateCSRFToken($_POST['csrf_token']);
validateAdminRole(); validateAdminRole();
$config_mail_from_email = sanitizeInput($_POST['config_mail_from_email']); $config_mail_from_email = sanitizeInput(filter_var($_POST['config_mail_from_email'], FILTER_VALIDATE_EMAIL));
$config_mail_from_name = sanitizeInput($_POST['config_mail_from_name']); $config_mail_from_name = sanitizeInput(preg_replace('/[^a-zA-Z0-9\s]/', '', $_POST['config_mail_from_name']));
$config_invoice_from_email = sanitizeInput($_POST['config_invoice_from_email']); $config_invoice_from_email = sanitizeInput(filter_var($_POST['config_invoice_from_email'], FILTER_VALIDATE_EMAIL));
$config_invoice_from_name = sanitizeInput($_POST['config_invoice_from_name']); $config_invoice_from_name = sanitizeInput(preg_replace('/[^a-zA-Z0-9\s]/', '', $_POST['config_invoice_from_name']));
$config_quote_from_email = sanitizeInput($_POST['config_quote_from_email']); $config_quote_from_email = sanitizeInput(filter_var($_POST['config_quote_from_email'], FILTER_VALIDATE_EMAIL));
$config_quote_from_name = sanitizeInput($_POST['config_quote_from_name']); $config_quote_from_name = sanitizeInput(preg_replace('/[^a-zA-Z0-9\s]/', '', $_POST['config_quote_from_name']));
$config_ticket_from_email = sanitizeInput($_POST['config_ticket_from_email']); $config_ticket_from_email = sanitizeInput(filter_var($_POST['config_ticket_from_email'], FILTER_VALIDATE_EMAIL));
$config_ticket_from_name = sanitizeInput($_POST['config_ticket_from_name']); $config_ticket_from_name = sanitizeInput(preg_replace('/[^a-zA-Z0-9\s]/', '', $_POST['config_ticket_from_name']));
mysqli_query($mysqli,"UPDATE settings SET config_mail_from_email = '$config_mail_from_email', config_mail_from_name = '$config_mail_from_name', config_invoice_from_email = '$config_invoice_from_email', config_invoice_from_name = '$config_invoice_from_name', config_quote_from_email = '$config_quote_from_email', config_quote_from_name = '$config_quote_from_name', config_ticket_from_email = '$config_ticket_from_email', config_ticket_from_name = '$config_ticket_from_name' WHERE company_id = 1"); mysqli_query($mysqli,"UPDATE settings SET config_mail_from_email = '$config_mail_from_email', config_mail_from_name = '$config_mail_from_name', config_invoice_from_email = '$config_invoice_from_email', config_invoice_from_name = '$config_invoice_from_name', config_quote_from_email = '$config_quote_from_email', config_quote_from_name = '$config_quote_from_name', config_ticket_from_email = '$config_ticket_from_email', config_ticket_from_name = '$config_ticket_from_name' WHERE company_id = 1");