From 92ef31d861319f86ab7e78289e085cb91d5eb0cd Mon Sep 17 00:00:00 2001
From: wrongecho <marcus@itflow.org>
Date: Tue, 28 Jan 2025 12:31:09 +0000
Subject: [PATCH] Bulk mail - only show active clients

Bulk mail shouldn't show archived clients
---
 admin_bulk_mail.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin_bulk_mail.php b/admin_bulk_mail.php
index 8ede4dd8..0d68f27f 100644
--- a/admin_bulk_mail.php
+++ b/admin_bulk_mail.php
@@ -4,7 +4,8 @@ require_once "includes/inc_all_admin.php";
 
 $sql = mysqli_query($mysqli, "SELECT * FROM contacts
     LEFT JOIN clients ON client_id = contact_client_id
-    WHERE contact_archived_at IS NULL
+    WHERE client_archived_at IS NULL
+    AND contact_archived_at IS NULL
     AND contact_email != ''
     AND (contact_primary = 1 OR
     contact_important = 1 OR
@@ -22,7 +23,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM contacts
         <h3 class="card-title mt-2 mb-2"><i class="fa fa-fw fa-envelope-open mr-2"></i>Bulk Mail</h3>
         <div class="card-tools">
             <button id="bulkActionButton" hidden class="btn btn-primary" type="submit" form='bulkActions' name="send_bulk_mail_now">
-                <i class="fas fa-fw fa-paper-plane mr-2"></i>Send Now (<span id="selectedCount">0</span>)
+                <i class="fas fa-fw fa-paper-plane mr-2"></i>Send (<span id="selectedCount">0</span>)
             </button>
         </div>
     </div>