New Assets
@@ -625,7 +625,7 @@ if ($user_config_dashboard_technical_enable == 1) {Expiring Domains
@@ -699,7 +699,7 @@ if ($user_config_dashboard_technical_enable == 1) { $contact_name = nullable_htmlentities($row['contact_name']); $ticket_priority_color = $ticket_priority == "High" ? "danger" : ($ticket_priority == "Medium" ? "warning" : "info"); - $contact_display = empty($contact_name) ? "-" : "$contact_name"; + $contact_display = empty($contact_name) ? "-" : "$contact_name"; ?>API Keys
-Bulk Mail
- -ALL Contacts
+ +Contacts diff --git a/modals/client_contact_add_modal.php b/modals/contact_add_modal.php similarity index 100% rename from modals/client_contact_add_modal.php rename to modals/contact_add_modal.php diff --git a/modals/client_contact_archive_modal.php b/modals/contact_archive_modal.php similarity index 100% rename from modals/client_contact_archive_modal.php rename to modals/contact_archive_modal.php diff --git a/modals/client_contact_bulk_assign_location_modal.php b/modals/contact_bulk_assign_location_modal.php similarity index 100% rename from modals/client_contact_bulk_assign_location_modal.php rename to modals/contact_bulk_assign_location_modal.php diff --git a/modals/client_contact_bulk_assign_tags_modal.php b/modals/contact_bulk_assign_tags_modal.php similarity index 100% rename from modals/client_contact_bulk_assign_tags_modal.php rename to modals/contact_bulk_assign_tags_modal.php diff --git a/modals/client_contact_bulk_edit_department_modal.php b/modals/contact_bulk_edit_department_modal.php similarity index 100% rename from modals/client_contact_bulk_edit_department_modal.php rename to modals/contact_bulk_edit_department_modal.php diff --git a/modals/client_contact_bulk_edit_phone_modal.php b/modals/contact_bulk_edit_phone_modal.php similarity index 100% rename from modals/client_contact_bulk_edit_phone_modal.php rename to modals/contact_bulk_edit_phone_modal.php diff --git a/modals/client_contact_bulk_edit_role_modal.php b/modals/contact_bulk_edit_role_modal.php similarity index 100% rename from modals/client_contact_bulk_edit_role_modal.php rename to modals/contact_bulk_edit_role_modal.php diff --git a/modals/client_contact_bulk_email_modal.php b/modals/contact_bulk_email_modal.php similarity index 100% rename from modals/client_contact_bulk_email_modal.php rename to modals/contact_bulk_email_modal.php diff --git a/modals/client_contact_create_note_modal.php b/modals/contact_create_note_modal.php similarity index 100% rename from modals/client_contact_create_note_modal.php rename to modals/contact_create_note_modal.php diff --git a/modals/client_contact_export_modal.php b/modals/contact_export_modal.php similarity index 80% rename from modals/client_contact_export_modal.php rename to modals/contact_export_modal.php index 87efd742..aff19968 100644 --- a/modals/client_contact_export_modal.php +++ b/modals/contact_export_modal.php @@ -8,12 +8,14 @@
diff --git a/modals/client_contact_import_modal.php b/modals/contact_import_modal.php similarity index 81% rename from modals/client_contact_import_modal.php rename to modals/contact_import_modal.php index bc567b60..d126d4f4 100644 --- a/modals/client_contact_import_modal.php +++ b/modals/contact_import_modal.php @@ -8,7 +8,9 @@ diff --git a/modals/client_contact_invite_modal.php b/modals/contact_invite_modal.php similarity index 100% rename from modals/client_contact_invite_modal.php rename to modals/contact_invite_modal.php diff --git a/post/admin/admin_bulk_mail.php b/post/admin/admin_bulk_mail.php deleted file mode 100644 index 841ab020..00000000 --- a/post/admin/admin_bulk_mail.php +++ /dev/null @@ -1,54 +0,0 @@ - $mail_from, - 'from_name' => $mail_from_name, - 'recipient' => $contact_email, - 'recipient_name' => $contact_name, - 'subject' => $subject, - 'body' => $body, - 'queued_at' => $queued_at - ]; - } - addToMailQueue($data); - - // Logging - logAction("Bulk Mail", "Send", "$session_name sent $count messages via bulk mail"); - - $_SESSION['alert_message'] = "$count messages queued"; - - } - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} \ No newline at end of file diff --git a/post/user/contact.php b/post/user/contact.php index 4815bba4..de63f95d 100644 --- a/post/user/contact.php +++ b/post/user/contact.php @@ -534,6 +534,52 @@ if (isset($_POST['bulk_assign_contact_tags'])) { } +if (isset($_POST['send_bulk_mail_now'])) { + + if (isset($_POST['contact_ids'])) { + + $count = count($_POST['contact_ids']); + + $mail_from = sanitizeInput($_POST['mail_from']); + $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_ids'] as $contact_id) { + $contact_id = intval($contact_id); + + $sql = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_id = $contact_id"); + $row = mysqli_fetch_array($sql); + $contact_name = sanitizeInput($row['contact_name']); + $contact_email = sanitizeInput($row['contact_email']); + $client_id = intval($row['contact_client_id']); + + // Queue Mail + $data[] = [ + 'from' => $mail_from, + 'from_name' => $mail_from_name, + 'recipient' => $contact_email, + 'recipient_name' => $contact_name, + 'subject' => $subject, + 'body' => $body, + 'queued_at' => $queued_at + ]; + } + addToMailQueue($data); + + // Logging + logAction("Bulk Mail", "Send", "$session_name sent $count messages via bulk mail"); + + $_SESSION['alert_message'] = "$count messages queued"; + + } + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + if (isset($_POST['bulk_archive_contacts'])) { enforceUserPermission('module_client', 2); @@ -1177,25 +1223,24 @@ if (isset($_GET['unlink_contact_from_file'])) { } -if (isset($_POST['export_client_contacts_csv'])) { +if (isset($_POST['export_contacts_csv'])) { enforceUserPermission('module_client'); - $client_id = intval($_POST['client_id']); - - //get records from database - $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); - - $client_name = $row['client_name']; + if (isset($_POST['client_id'])) { + $client_id = intval($_POST['client_id']); + $client_query = "AND contact_client_id = $client_id"; + } else { + $client_query = ''; + } //Contacts - $sql = mysqli_query($mysqli,"SELECT * FROM contacts LEFT JOIN locations ON location_id = contact_location_id WHERE contact_client_id = $client_id AND contact_archived_at IS NULL ORDER BY contact_name ASC"); + $sql = mysqli_query($mysqli,"SELECT * FROM contacts LEFT JOIN locations ON location_id = contact_location_id WHERE contact_archived_at IS NULL $client_query ORDER BY contact_name ASC"); $num_rows = mysqli_num_rows($sql); if ($num_rows > 0) { $delimiter = ","; - $filename = strtoAZaz09($client_name) . "-Contacts-" . date('Y-m-d') . ".csv"; + $filename = "Contacts-" . date('Y-m-d') . ".csv"; //create a file pointer $f = fopen('php://memory', 'w'); @@ -1223,13 +1268,13 @@ if (isset($_POST['export_client_contacts_csv'])) { } //Logging - logAction("Contact", "Export", "$session_name exported $num_rows contact(s) to a CSV file", $client_id); + logAction("Contact", "Export", "$session_name exported $num_rows contact(s) to a CSV file"); exit; } -if (isset($_POST["import_client_contacts_csv"])) { +if (isset($_POST["import_contacts_csv"])) { enforceUserPermission('module_client', 2); @@ -1332,17 +1377,9 @@ if (isset($_POST["import_client_contacts_csv"])) { } } -if (isset($_GET['download_client_contacts_csv_template'])) { - $client_id = intval($_GET['download_client_contacts_csv_template']); - - //get records from database - $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); - - $client_name = $row['client_name']; - +if (isset($_GET['download_contacts_csv_template'])) { $delimiter = ","; - $filename = strtoAZaz09($client_name) . "-Contacts-Template.csv"; + $filename = "Contacts-Template.csv"; //create a file pointer $f = fopen('php://memory', 'w'); diff --git a/scripts/cron.php b/scripts/cron.php index 590d782d..a2f0c9ca 100644 --- a/scripts/cron.php +++ b/scripts/cron.php @@ -198,7 +198,7 @@ if ($config_enable_alert_domain_expire == 1) { $client_id = intval($row['client_id']); $client_name = sanitizeInput($row['client_name']); - appNotify("Domain Expiring", "Domain $domain_name for $client_name will expire in $day Days on $domain_expire", "client_domains.php?client_id=$client_id", $client_id); + appNotify("Domain Expiring", "Domain $domain_name for $client_name will expire in $day Days on $domain_expire", "domains.php?client_id=$client_id", $client_id); } @@ -258,7 +258,7 @@ foreach ($warranty_alert_array as $day) { $client_id = intval($row['client_id']); $client_name = sanitizeInput($row['client_name']); - appNotify("Asset Warranty Expiring", "Asset $asset_name warranty for $client_name will expire in $day Days on $asset_warranty_expire", "client_assets.php?client_id=$client_id", $client_id); + appNotify("Asset Warranty Expiring", "Asset $asset_name warranty for $client_name will expire in $day Days on $asset_warranty_expire", "assets.php?client_id=$client_id", $client_id); }