diff --git a/client_bulk_mail.php b/client_bulk_mail.php index dfcb2f49..c7f43fb8 100644 --- a/client_bulk_mail.php +++ b/client_bulk_mail.php @@ -48,6 +48,15 @@ $sql = mysqli_query($mysqli, "SELECT * FROM contacts +
+
+
+ +
+ +
+
+
diff --git a/cron_mail_queue.php b/cron_mail_queue.php index 5f9933cf..0827c092 100644 --- a/cron_mail_queue.php +++ b/cron_mail_queue.php @@ -61,7 +61,7 @@ file_put_contents($lock_file_path, "Locked"); // 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"); +$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) { while ($row = mysqli_fetch_array($sql_queue)) { diff --git a/functions.php b/functions.php index 39ac0347..9fa0fb5a 100644 --- a/functions.php +++ b/functions.php @@ -938,8 +938,8 @@ function addToMailQueue($mysqli, $data) { $body = strval($email['body']); // Check if 'email_queued_at' is set and not empty - if (isset($email['email_queued_at']) && !empty($email['email_queued_at'])) { - $queued_at = $email['email_queued_at']; + if (isset($email['queued_at']) && !empty($email['queued_at'])) { + $queued_at = $email['queued_at']; } else { // Use the current date and time if 'email_queued_at' is not set or empty $queued_at = date('Y-m-d H:i:s'); diff --git a/post/bulk_mail.php b/post/bulk_mail.php index 3a2eb32d..e0986a5f 100644 --- a/post/bulk_mail.php +++ b/post/bulk_mail.php @@ -12,6 +12,7 @@ if (isset($_POST['send_bulk_mail_now'])) { $mail_from_name = sanitizeInput($_POST['mail_from_name']); $subject = sanitizeInput($_POST['subject']); $body = mysqli_escape_string($mysqli, $_POST['body']); + $queued_at = sanitizeInput($_POST['queued_at']); // Add Emails foreach($_POST['contact'] as $contact_id) { @@ -30,7 +31,8 @@ if (isset($_POST['send_bulk_mail_now'])) { 'recipient' => $contact_email, 'recipient_name' => $contact_name, 'subject' => $subject, - 'body' => $body + 'body' => $body, + 'queued_at' => $queued_at ]; } addToMailQueue($mysqli, $data);