From d76d405d5a17046f5ae53677fbcb4cc23320ff27 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 20 Feb 2025 00:38:40 -0500 Subject: [PATCH] Make contacts global view compatible, remove bulk mail from admin as this is in contacts bulk actions, updated links, tidy --- admin_bulk_mail.php | 153 ------------------ client_document_details.php | 2 +- client_overview.php | 10 +- ...contact_details.php => contact_details.php | 48 ++++-- client_contacts.php => contacts.php | 110 ++++++++++--- dashboard.php | 6 +- global_search.php | 4 +- includes/admin_side_nav.php | 7 - includes/client_overview_side_nav.php | 6 + includes/client_side_nav.php | 2 +- ...ct_add_modal.php => contact_add_modal.php} | 0 ...ve_modal.php => contact_archive_modal.php} | 0 ...=> contact_bulk_assign_location_modal.php} | 0 ...php => contact_bulk_assign_tags_modal.php} | 0 ...=> contact_bulk_edit_department_modal.php} | 0 ....php => contact_bulk_edit_phone_modal.php} | 0 ...l.php => contact_bulk_edit_role_modal.php} | 0 ...modal.php => contact_bulk_email_modal.php} | 0 ...odal.php => contact_create_note_modal.php} | 0 ...ort_modal.php => contact_export_modal.php} | 4 +- ...ort_modal.php => contact_import_modal.php} | 6 +- ...ite_modal.php => contact_invite_modal.php} | 0 post/admin/admin_bulk_mail.php | 54 ------- post/user/contact.php | 81 +++++++--- scripts/cron.php | 4 +- 25 files changed, 210 insertions(+), 287 deletions(-) delete mode 100644 admin_bulk_mail.php rename client_contact_details.php => contact_details.php (96%) rename client_contacts.php => contacts.php (86%) rename modals/{client_contact_add_modal.php => contact_add_modal.php} (100%) rename modals/{client_contact_archive_modal.php => contact_archive_modal.php} (100%) rename modals/{client_contact_bulk_assign_location_modal.php => contact_bulk_assign_location_modal.php} (100%) rename modals/{client_contact_bulk_assign_tags_modal.php => contact_bulk_assign_tags_modal.php} (100%) rename modals/{client_contact_bulk_edit_department_modal.php => contact_bulk_edit_department_modal.php} (100%) rename modals/{client_contact_bulk_edit_phone_modal.php => contact_bulk_edit_phone_modal.php} (100%) rename modals/{client_contact_bulk_edit_role_modal.php => contact_bulk_edit_role_modal.php} (100%) rename modals/{client_contact_bulk_email_modal.php => contact_bulk_email_modal.php} (100%) rename modals/{client_contact_create_note_modal.php => contact_create_note_modal.php} (100%) rename modals/{client_contact_export_modal.php => contact_export_modal.php} (80%) rename modals/{client_contact_import_modal.php => contact_import_modal.php} (81%) rename modals/{client_contact_invite_modal.php => contact_invite_modal.php} (100%) delete mode 100644 post/admin/admin_bulk_mail.php diff --git a/admin_bulk_mail.php b/admin_bulk_mail.php deleted file mode 100644 index 0d68f27f..00000000 --- a/admin_bulk_mail.php +++ /dev/null @@ -1,153 +0,0 @@ - - - -
-
-

Bulk Mail

-
- -
-
-
-
- - -
- -
- -
Email Message
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
-
-
- -
- -
-
- -
- -
- -
Select Contacts
-
-
-
- - - - - - - - - - - - - - - - - - - - - - -
-
- -
- 		ClientNameTitleEmail
-
- -
- 		- - - -
-
- -
- -
- -
- -
-
-
- - - - -
- + diff --git a/client_overview.php b/client_overview.php index 61e955bb..22c9fa2c 100644 --- a/client_overview.php +++ b/client_overview.php @@ -241,7 +241,7 @@ $sql_asset_retired = mysqli_query( ?> - +
@@ -410,7 +410,7 @@ $sql_asset_retired = mysqli_query( ?>

- + --

@@ -430,7 +430,7 @@ $sql_asset_retired = mysqli_query( ?>

- + --

@@ -528,7 +528,7 @@ $sql_asset_retired = mysqli_query( ?>

- + --

@@ -548,7 +548,7 @@ $sql_asset_retired = mysqli_query( ?>

- + --

diff --git a/client_contact_details.php b/contact_details.php similarity index 96% rename from client_contact_details.php rename to contact_details.php index 59e519d1..95dd3e2a 100644 --- a/client_contact_details.php +++ b/contact_details.php @@ -1,18 +1,30 @@ - + +
@@ -516,7 +533,11 @@ if (isset($_GET['contact_id'])) { - + @@ -680,7 +701,15 @@ if (isset($_GET['contact_id'])) { ?> - + + + + + @@ -690,8 +719,11 @@ if (isset($_GET['contact_id'])) {
- + Edit
@@ -1140,7 +1172,6 @@ if (isset($_GET['contact_id'])) { }); - @@ -1155,6 +1186,5 @@ require_once "modals/client_contact_link_document_modal.php"; require_once "modals/client_contact_link_file_modal.php"; require_once "modals/recurring_ticket_add_modal.php"; -require_once "modals/recurring_ticket_edit_modal.php"; require_once "includes/footer.php"; diff --git a/client_contacts.php b/contacts.php similarity index 86% rename from client_contacts.php rename to contacts.php index 33d0edb0..1baf2383 100644 --- a/client_contacts.php +++ b/contacts.php @@ -4,7 +4,16 @@ $sort = "contact_name"; $order = "ASC"; -require_once "includes/inc_all_client.php"; +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND contact_client_id = $client_id"; + $client_url = "client_id=$client_id&"; +} else { + require_once "includes/inc_client_overview_all.php"; + $client_query = ''; + $client_url = ''; +} // Tags Filter if (isset($_GET['tags']) && is_array($_GET['tags']) && !empty($_GET['tags'])) { @@ -22,20 +31,35 @@ if (isset($_GET['tags']) && is_array($_GET['tags']) && !empty($_GET['tags'])) { $tag_query = ''; } -// Location Filter -if (isset($_GET['location']) & !empty($_GET['location'])) { - $location_query = 'AND (contact_location_id = ' . intval($_GET['location']) . ')'; - $location_filter = intval($_GET['location']); -} else { - // Default - any - $location_query = ''; - $location_filter = ''; +if (!$client_url) { + // Client Filter + if (isset($_GET['client']) & !empty($_GET['client'])) { + $client_query = 'AND (contact_client_id = ' . intval($_GET['client']) . ')'; + $client = intval($_GET['client']); + } else { + // Default - any + $client_query = ''; + $client = ''; + } +} + +if ($client_url) { + // Location Filter + if (isset($_GET['location']) & !empty($_GET['location'])) { + $location_query = 'AND (contact_location_id = ' . intval($_GET['location']) . ')'; + $location_filter = intval($_GET['location']); + } else { + // Default - any + $location_query = ''; + $location_filter = ''; + } } //Rebuild URL //$url_query_strings_sort = http_build_query($get_copy); -$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS contacts.*, locations.*, users.*, GROUP_CONCAT(tags.tag_name) FROM contacts +$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS contacts.*, clients.*, locations.*, users.*, GROUP_CONCAT(tags.tag_name) FROM contacts + LEFT JOIN clients ON client_id = contact_client_id LEFT JOIN locations ON location_id = contact_location_id LEFT JOIN users ON user_id = contact_user_id LEFT JOIN contact_tags ON contact_tags.contact_id = contacts.contact_id @@ -43,7 +67,7 @@ $sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS contacts.*, locations.* WHERE contact_$archive_query $tag_query AND (contact_name LIKE '%$q%' OR contact_title LIKE '%$q%' OR location_name LIKE '%$q%' OR contact_email LIKE '%$q%' OR contact_department LIKE '%$q%' OR contact_phone LIKE '%$phone_query%' OR contact_extension LIKE '%$q%' OR contact_mobile LIKE '%$phone_query%' OR tag_name LIKE '%$q%') - AND contact_client_id = $client_id + $client_query $location_query GROUP BY contact_id ORDER BY contact_primary DESC, contact_important DESC, $sort $order LIMIT $record_from, $record_to" @@ -78,7 +102,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+ +
@@ -107,6 +133,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+
+ +
+
+ +
+
+
- "> Archived @@ -215,6 +263,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Location + + + + Client + + + Action @@ -222,6 +277,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $contact_tag_name"; + $contact_tag_name_display_array[] = "$contact_tag_name"; } $contact_tags_display = implode('', $contact_tag_name_display_array); @@ -340,7 +397,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +
@@ -371,13 +428,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + +
- + Details
- - - - - - + + + + + + @@ -482,8 +542,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- +

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"; ?> diff --git a/global_search.php b/global_search.php index 59b1c126..be3c1693 100644 --- a/global_search.php +++ b/global_search.php @@ -228,7 +228,7 @@ if (isset($_GET['query'])) { ?> - +
@@ -728,7 +728,7 @@ if (isset($_GET['query'])) { if (empty($contact_name)) { $contact_name_display = "-"; }else{ - $contact_name_display = "$contact_name"; + $contact_name_display = "$contact_name"; } $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); if (empty($contact_archived_at)) { diff --git a/includes/admin_side_nav.php b/includes/admin_side_nav.php index 5abe20c8..02e83152 100644 --- a/includes/admin_side_nav.php +++ b/includes/admin_side_nav.php @@ -33,13 +33,6 @@

API Keys

-
  • - "> - -

    Bulk Mail

    -     -
    • -
  • TAGS & CATEGORIES
  • diff --git a/includes/client_overview_side_nav.php b/includes/client_overview_side_nav.php index ff9c5ae6..b48bf9b9 100644 --- a/includes/client_overview_side_nav.php +++ b/includes/client_overview_side_nav.php @@ -18,6 +18,12 @@
  • OVERVIEWS
    • = 1) { ?> +
  • + "> + +

    ALL Contacts

    +     +
  • "> diff --git a/includes/client_side_nav.php b/includes/client_side_nav.php index 2e9e6210..2667e168 100644 --- a/includes/client_side_nav.php +++ b/includes/client_side_nav.php @@ -26,7 +26,7 @@
  • - "> + ">

    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 @@
    + +

    Format csv file with headings & data:
    Name, Title, Department, Email, Phone, Extension, Mobile, Location

    @@ -16,10 +18,10 @@
    -     +
    - +
    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); }