diff --git a/.gitignore b/.gitignore index c70c3cf8..1dc7ee4b 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ xcustom/* !xcustom/readme.php post/xcustom !post/xcustom/readme.php +.zed diff --git a/CHANGELOG.md b/CHANGELOG.md index 385e5534..3ac2462b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,31 +2,78 @@ This file documents all notable changes made to ITFlow. +## [25.02.3] + +### Fixed +- Fixed notifications being reversed as dismissed notifications. + +## [25.02.2] + +### Fixed +- Corrected some edit modals not showing notes correctly. +- Bugfix: When exporting to CSV, the first asset wasn't being shown. +- Fix broken create / edit credentials. +- Fixed missing Notificatons link. +- Fixed a few dead links. +- Fixed Overdue count also counting Non-Billable Invoices. +- Fix Edit Client Notes. + +### Added / Changed +- Implemented SSL certificate history tracking. +- Added Inactive / Active Filter to Recurring Invoices. +- Merged Dismissed notifications and notification in one. +- Added Link Button to addd / edit Document WYSIWYG. +- Added Physical location to the asset export / import. + +## [25.02.1] +### Fixed +- Resolved broken links in the client overview, project and client listings, and rack details. +- Corrected asset transfer functionality to clients. +- Fixed the ticket scheduling redirect. +- Corrected the ticket link in the Scheduled Ticket Agent Notification email. +- Addressed issues with credentials and ticket actions in the Contact Detail Modal. +- Fixed text wrapping in notifications. +- Adjusted notifications so that they are sorted with the newest first. +- Fixed drag-and-drop functionality for tickets in the Kanban view on mobile devices. +- Resolved a weird issue with TinyMCE that prevented using links referencing your ITFlow instance url. +- Corrected image orientation issues during upload and the preview optimization process. + +### Added / Changed +- Introduced entity link indicator icons and counts in the contacts and credentials section. +- Implemented a fade animation for the new AJAX modal. +- Removed the Client Overview Expire Day Select and replaced it with simplified 1, 7, or 45-day options. +- Added the ability to link and unlink entities within asset details. +- Introduced quick tag/category creation across the app. +- Added a Vendor Quick Details Modal. +- Enabled vendor linking and added a License Purchase Reference in the Software Licenses section. +- Added download original, optimized and thumbnail option for images. +- Added Paid status to the top corner of Invoice PDFs. + ## [25.02] ### Fixed -- Migrated several reports to the new permissions/roles system -- Resolved issue with empty task box showing for closed/resolved tickets -- Corrected ticket priority sorting -- Cloned asset interfaces when transferring assets between clients +- Migrated several reports to the new permissions/roles system. +- Resolved issue with empty task box showing for closed/resolved tickets. +- Corrected ticket priority sorting. +- Cloned asset interfaces when transferring assets between clients. ### Added / Changed - Restored max number of records per page option back to 500 since we dont have repeating modals. -- Bulk Categorize Tickets feature -- Renamed "Interface port" to "Interface Description." "Interface Name" should now refer to port name and/or number -- Changed "Transfer Asset to Client" from a single action to a bulk action -- Updated Filter Footer UI to show "Showing x to x of x records" instead of just the total records +- Bulk Categorize Tickets feature. +- Renamed "Interface port" to "Interface Description." "Interface Name" should now refer to port name and/or number. +- Changed "Transfer Asset to Client" from a single action to a bulk action. +- Updated Filter Footer UI to show "Showing x to x of x records" instead of just the total records. - Added Client Overview section to view client assets, contacts, licenses, credentials, etc. -- Introduced Quick Peek for asset details, contact information, and document viewing throughout the ITFlow App, all made possible by AJAX -- Enabled Simple Drag-and-Drop Ordering for Invoices, Recurring Invoices, Quotes, Ticket Tasks, and Ticket Template Tasks -- Added new Ticket View options: Kanban and Simple View -- Migrated all repeating modals to the new AJAX modal function for faster loading times and quicker development -- Allowed clients to upload PDF documents to accepted quotes -- Client Portal now shows ticket category -- Custom links can now be added to the Client Portal navbar +- Introduced Quick Peek for asset details, contact information, and document viewing throughout the ITFlow App, all made possible by AJAX. +- Enabled Simple Drag-and-Drop Ordering for Invoices, Recurring Invoices, Quotes, Ticket Tasks, and Ticket Template Tasks. +- Added new Ticket View options: Kanban and Simple View. +- Migrated all repeating modals to the new AJAX modal function for faster loading times and quicker development. +- Allowed clients to upload PDF documents to accepted quotes. +- Client Portal now shows ticket category. +- Custom links can now be added to the Client Portal navbar. - Lots of little tweaks to UI, performance, bugs, etc. ### Breaking Changes -- Cron scripts have officially been moved to the /scripts folder and are no longer in the root directory; they must be updated to function properly +- Cron scripts have officially been moved to the /scripts folder and are no longer in the root directory; they must be updated to function properly. ## [25.01.3] ### Fixed diff --git a/admin_settings_notification.php b/admin_settings_notification.php index 1abc0982..930c9bd3 100644 --- a/admin_settings_notification.php +++ b/admin_settings_notification.php @@ -37,7 +37,7 @@ require_once "includes/inc_all_admin.php";
Domain Expiration Notice
- (This setting triggers a notification when a domain is approaching its expiration date, specifically at 1, 7, 14, 30 and 90 days prior to expiry.) + (This setting triggers a notification when a domain is approaching its expiration date, specifically at 1, 7 and 45 days prior to expiry.) @@ -54,7 +54,7 @@ require_once "includes/inc_all_admin.php";
Certificate Expiration Notice
- (This setting triggers a notification when a certificate is approaching its expiration date, specifically at 1, 7, 14, 30 and 90 days prior to expiry.) + (This setting triggers a notification when a certificate is approaching its expiration date, specifically at 1, 7, 14 and 21 days prior to expiry.) @@ -67,7 +67,7 @@ require_once "includes/inc_all_admin.php";
Asset Warranty Expiration Notice
- (This setting triggers a notification when an asset is approaching its expiration date, specifically at 1, 7, 14, 30 and 90 days prior to expiry.) + (This setting triggers a notification when an asset is approaching its expiration date, specifically at 1, 7 and 45 days prior to expiry.) diff --git a/ajax/ajax_asset_details.php b/ajax/ajax_asset_details.php index 20ef5c29..21ff47a2 100644 --- a/ajax/ajax_asset_details.php +++ b/ajax/ajax_asset_details.php @@ -121,9 +121,7 @@ $sql_related_credentials = mysqli_query($mysqli, " logins.login_note, logins.login_important, logins.login_contact_id, - logins.login_vendor_id, - logins.login_asset_id, - logins.login_software_id + logins.login_asset_id FROM logins LEFT JOIN login_tags ON login_tags.login_id = logins.login_id LEFT JOIN tags ON tags.tag_id = login_tags.tag_id @@ -474,9 +472,7 @@ ob_start(); $login_note = nullable_htmlentities($row['login_note']); $login_important = intval($row['login_important']); $login_contact_id = intval($row['login_contact_id']); - $login_vendor_id = intval($row['login_vendor_id']); $login_asset_id = intval($row['login_asset_id']); - $login_software_id = intval($row['login_software_id']); // Tags $login_tag_name_display_array = array(); @@ -852,7 +848,11 @@ ob_start();
- More Details + More Details + + Edit +
diff --git a/ajax/ajax_category_add.php b/ajax/ajax_category_add.php new file mode 100644 index 00000000..a5b7481d --- /dev/null +++ b/ajax/ajax_category_add.php @@ -0,0 +1,43 @@ + + +
+
New Category
+ +
+
+ + +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+ + +
+
+ + @@ -41,6 +45,9 @@ ob_start();
  • Notes
    • +
  • + History +
    • @@ -77,7 +84,7 @@ ob_start(); + +
    +
    + + + + + + + + + + + + + + + + + + + +
    DateFieldBeforeAfter
    +
    diff --git a/ajax/ajax_client_edit.php b/ajax/ajax_client_edit.php index d30f53fd..77439c4e 100644 --- a/ajax/ajax_client_edit.php +++ b/ajax/ajax_client_edit.php @@ -125,6 +125,14 @@ ob_start(); } ?> +
    + +
    @@ -157,6 +165,15 @@ ob_start(); +
    + +
    @@ -234,9 +251,7 @@ ob_start();
    - +
    diff --git a/ajax/ajax_contact_details.php b/ajax/ajax_contact_details.php index e081abb3..67cdeac1 100644 --- a/ajax/ajax_contact_details.php +++ b/ajax/ajax_contact_details.php @@ -402,7 +402,7 @@ ob_start(); -
    +
    @@ -446,9 +446,7 @@ ob_start(); $login_note = nullable_htmlentities($row['login_note']); $login_important = intval($row['login_important']); $login_contact_id = intval($row['login_contact_id']); - $login_vendor_id = intval($row['login_vendor_id']); $login_asset_id = intval($row['login_asset_id']); - $login_software_id = intval($row['login_software_id']); // Tags $login_tag_name_display_array = array(); @@ -499,7 +497,7 @@ ob_start(); -
    +
    @@ -848,7 +846,13 @@ ob_start();
    - More Details + + More Details + + + Edit +
    diff --git a/ajax/ajax_contact_edit.php b/ajax/ajax_contact_edit.php index 99ea1823..768a6081 100644 --- a/ajax/ajax_contact_edit.php +++ b/ajax/ajax_contact_edit.php @@ -311,6 +311,15 @@ ob_start(); +
    + +
    diff --git a/ajax/ajax_credential_edit.php b/ajax/ajax_credential_edit.php index 1bbd9b29..c6b50da8 100644 --- a/ajax/ajax_credential_edit.php +++ b/ajax/ajax_credential_edit.php @@ -21,9 +21,7 @@ $login_created_at = nullable_htmlentities($row['login_created_at']); $login_archived_at = nullable_htmlentities($row['login_archived_at']); $login_important = intval($row['login_important']); $login_contact_id = intval($row['login_contact_id']); -$login_vendor_id = intval($row['login_vendor_id']); $login_asset_id = intval($row['login_asset_id']); -$login_software_id = intval($row['login_software_id']); // Tags $login_tag_id_array = array(); @@ -189,28 +187,6 @@ ob_start(); -
    - -
    -
    - -
    - -
    -
    -
    @@ -240,28 +216,6 @@ ob_start();
    -
    - -
    -
    - -
    - -
    -
    -
    @@ -288,6 +242,15 @@ ob_start(); +
    + +
    diff --git a/ajax/ajax_credential_view.php b/ajax/ajax_credential_view.php new file mode 100644 index 00000000..96dfd392 --- /dev/null +++ b/ajax/ajax_credential_view.php @@ -0,0 +1,94 @@ +Hover.."; +} +$login_note = nullable_htmlentities($row['login_note']); +$login_created_at = nullable_htmlentities($row['login_created_at']); + +// Generate the HTML form content using output buffering. +ob_start(); +?> + +
    +
    + +
    +
    +
    +
    +
    + +
    + +
    + + +
    +
    +
    Vendor Details
    +
    +
    +
    Account Number:
    +
    Hours:
    +
    SLA:
    +
    +
    +
    Code:
    +
    Website: ' . $website . '' : 'Not Available'; ?>
    +
    +
    +
    +
    + + +
    +
    +
    Contact Information
    +
    +
    +
    Contact Name:
    +
    Phone:
    +
    +
    +
    Email: ' . $email . '' : 'Not Available'; ?>
    +
    +
    +
    +
    + + +
    +
    +
    Notes
    +
    + +
    +
    +
    + +
    + + + +
    - +
    @@ -176,7 +181,12 @@ ob_start(); ?>
    - +
    diff --git a/ajax/ajax_invoice_edit.php b/ajax/ajax_invoice_edit.php index 87530848..d6a804f3 100644 --- a/ajax/ajax_invoice_edit.php +++ b/ajax/ajax_invoice_edit.php @@ -77,7 +77,12 @@ ob_start(); ?>
    - +
    diff --git a/ajax/ajax_location_edit.php b/ajax/ajax_location_edit.php index da39bb38..e97ba887 100644 --- a/ajax/ajax_location_edit.php +++ b/ajax/ajax_location_edit.php @@ -254,6 +254,15 @@ ob_start(); +
    + +
    diff --git a/ajax/ajax_notifications.php b/ajax/ajax_notifications.php index 1dd53356..dbb7e701 100644 --- a/ajax/ajax_notifications.php +++ b/ajax/ajax_notifications.php @@ -1,11 +1,13 @@ - + $notification_id = intval($row["notification_id"]); + $notification_type = nullable_htmlentities($row["notification_type"]); + $notification_details = nullable_htmlentities($row["notification"]); + $notification_action = nullable_htmlentities( + $row["notification_action"] + ); + $notification_timestamp_formated = date( + "M d g:ia", + strtotime($row["notification_timestamp"]) + ); + $notification_client_id = intval($row["notification_client_id"]); + if (empty($notification_action)) { + $notification_action = "#"; + } + ?> -
    @@ -46,14 +53,11 @@ ob_start();
    - +     - +

    No Notifications

    @@ -62,11 +66,17 @@ ob_start();
    - + + " class="btn btn-primary"> Dismiss all + + See all Notifications + - + See Dismissed Notifications @@ -75,5 +85,4 @@ ob_start();
    -
    - +
    diff --git a/ajax/ajax_quote_edit.php b/ajax/ajax_quote_edit.php index a94f392f..51c7c8bd 100644 --- a/ajax/ajax_quote_edit.php +++ b/ajax/ajax_quote_edit.php @@ -73,7 +73,12 @@ ob_start();
    - +
    diff --git a/ajax/ajax_recurring_expense_edit.php b/ajax/ajax_recurring_expense_edit.php index 7d461ce6..3b857d01 100644 --- a/ajax/ajax_recurring_expense_edit.php +++ b/ajax/ajax_recurring_expense_edit.php @@ -214,7 +214,12 @@ ob_start(); ?>
    - +
    diff --git a/ajax/ajax_recurring_invoice_edit.php b/ajax/ajax_recurring_invoice_edit.php index 7d454b20..e0ab9d56 100644 --- a/ajax/ajax_recurring_invoice_edit.php +++ b/ajax/ajax_recurring_invoice_edit.php @@ -88,7 +88,12 @@ ob_start(); ?>
    - +
    diff --git a/ajax/ajax_revenue_edit.php b/ajax/ajax_revenue_edit.php index 11998bdd..593bb6ff 100644 --- a/ajax/ajax_revenue_edit.php +++ b/ajax/ajax_revenue_edit.php @@ -125,7 +125,12 @@ ob_start(); ?>
    - +
    diff --git a/ajax/ajax_service_details.php b/ajax/ajax_service_details.php index 46bf9f1a..22c9f011 100644 --- a/ajax/ajax_service_details.php +++ b/ajax/ajax_service_details.php @@ -275,7 +275,16 @@ ob_start(); @@ -379,7 +388,15 @@ ob_start(); mysqli_data_seek($sql_docs, 0); while ($row = mysqli_fetch_array($sql_docs)) { - echo "
  • $row[document_name]
    • "; + $document_id = intval($row['document_id']); + $document_name = nullable_htmlentities($row['document_name']); + echo "
  • + $document_name + +
    • "; } ?> diff --git a/ajax/ajax_software_edit.php b/ajax/ajax_software_edit.php index d9a06b1d..7aa7d523 100644 --- a/ajax/ajax_software_edit.php +++ b/ajax/ajax_software_edit.php @@ -14,10 +14,12 @@ $software_type = nullable_htmlentities($row['software_type']); $software_license_type = nullable_htmlentities($row['software_license_type']); $software_key = nullable_htmlentities($row['software_key']); $software_seats = nullable_htmlentities($row['software_seats']); +$software_purchase_reference = nullable_htmlentities($row['software_purchase_reference']); $software_purchase = nullable_htmlentities($row['software_purchase']); $software_expire = nullable_htmlentities($row['software_expire']); $software_notes = nullable_htmlentities($row['software_notes']); $software_created_at = nullable_htmlentities($row['software_created_at']); +$software_vendor_id = intval($row['software_vendor_id']); $client_id = intval($row['software_client_id']); $seat_count = 0; @@ -107,6 +109,28 @@ ob_start(); +
    + +
    +
    + +
    + +
    +
    +
    @@ -160,6 +184,16 @@ ob_start();
    +
    + +
    +
    + +
    + +
    +
    +
    diff --git a/ajax/ajax_tag_add.php b/ajax/ajax_tag_add.php new file mode 100644 index 00000000..05ef73fa --- /dev/null +++ b/ajax/ajax_tag_add.php @@ -0,0 +1,49 @@ + + + + + + + +
    +
    New Tag
    + +
    +
    + +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + + +
    + + + +
    + +
    diff --git a/ajax/ajax_vendor_details.php b/ajax/ajax_vendor_details.php new file mode 100644 index 00000000..eac971fe --- /dev/null +++ b/ajax/ajax_vendor_details.php @@ -0,0 +1,89 @@ + + +
    +
    + +
    +
    +
    +
    +
    + +
    + +
    + + +
    +
    +
    Vendor Details
    +
    +
    +
    Account Number:
    +
    Hours:
    +
    SLA:
    +
    +
    +
    Code:
    +
    Website: ' . $website . '' : 'Not Available'; ?>
    +
    +
    +
    +
    + + +
    +
    +
    Contact Information
    +
    +
    +
    Contact Name:
    +
    Phone:
    +
    +
    +
    Email: ' . $email . '' : 'Not Available'; ?>
    +
    +
    +
    +
    + + +
    +
    +
    Notes
    +
    + +
    +
    +
    + +
    + +
    @@ -357,28 +365,24 @@ if (isset($_GET['asset_id'])) {
    - - Asset (WIP) - -
    - License (WIP) + License
    - Credential (WIP) + Credential
    - Service (WIP) + Service
    - Document (WIP) + Document
    - File (WIP) + File @@ -460,6 +464,7 @@ if (isset($_GET['asset_id'])) { // Show either "-" or "AssetName - Port" if ($connected_asset_name) { $connected_to_display = " @@ -561,9 +566,7 @@ if (isset($_GET['asset_id'])) { $login_note = nullable_htmlentities($row['login_note']); $login_important = intval($row['login_important']); $login_contact_id = intval($row['login_contact_id']); - $login_vendor_id = intval($row['login_vendor_id']); $login_asset_id = intval($row['login_asset_id']); - $login_software_id = intval($row['login_software_id']); // Tags $login_tag_name_display_array = array(); @@ -622,6 +625,10 @@ if (isset($_GET['asset_id'])) { )"> Share +
    + + Unlink +
    @@ -659,6 +666,7 @@ if (isset($_GET['asset_id'])) {
    + @@ -701,6 +709,8 @@ if (isset($_GET['asset_id'])) { } $contact_licenses = implode(',', $contact_licenses_array); + $linked_software[] = $software_id; + ?> + - + @@ -861,10 +874,16 @@ if (isset($_GET['asset_id'])) { $file_icon = "file"; } $file_created_at = nullable_htmlentities($row['file_created_at']); + + $linked_files[] = $file_id; + ?> + +
    "> +
    +

    Linked Services

    +
    + +
    +
    +
    +
    +
    Type License Type SeatsAction
    @@ -715,6 +725,9 @@ if (isset($_GET['asset_id'])) { + +
    Name UploadedAction
    " target="_blank" >$file_description"; ?> + +
    + + + + + + + + + + + + + + + + + + + + + +
    ServiceCategoryImportanceAction
    +
    +
    +     		+ +
    +
    +
    +
    + @@ -1101,4 +1178,11 @@ require_once "modals/asset_interface_import_modal.php"; require_once "modals/asset_interface_export_modal.php"; require_once "modals/ticket_add_modal.php"; require_once "modals/recurring_ticket_add_modal.php"; + +require_once "modals/asset_link_software_modal.php"; +require_once "modals/asset_link_credential_modal.php"; +require_once "modals/asset_link_service_modal.php"; +require_once "modals/asset_link_document_modal.php"; +require_once "modals/asset_link_file_modal.php"; + require_once "includes/footer.php"; diff --git a/client_document_details.php b/client_document_details.php index ce3d29ba..6a534232 100644 --- a/client_document_details.php +++ b/client_document_details.php @@ -340,7 +340,12 @@ $page_title = $row['document_name']; ?>
    - + + + diff --git a/client_files.php b/client_files.php index 3898c829..549f7bcf 100644 --- a/client_files.php +++ b/client_files.php @@ -345,7 +345,7 @@ while ($folder_id > 0) {
    - " alt=""> + " alt="">
    @@ -356,8 +356,18 @@ while ($folder_id > 0) {
    " download=""> - Download + Download Original + + " download="preview_"> + Download Optimized + + + + " download="thumbnail_"> + Download Thumbnail + + )"> Share @@ -563,8 +573,18 @@ while ($folder_id > 0) {
    " download=""> - Download + Download Original + + " download="preview_"> + Download Optimized + + + + " download="thumbnail_"> + Download Thumbnail + + )"> Share diff --git a/client_overview.php b/client_overview.php index e90f8c6c..ead88b74 100644 --- a/client_overview.php +++ b/client_overview.php @@ -2,8 +2,6 @@ require_once "includes/inc_all_client.php"; -// Get expiration days from select box -$expiration_days = isset($_GET['expiration_days']) ? intval($_GET['expiration_days']) : 90; $sql_recent_activities = mysqli_query( $mysqli, @@ -61,13 +59,14 @@ $sql_stale_tickets = mysqli_query( $mysqli, "SELECT * FROM tickets WHERE ticket_client_id = $client_id - AND ticket_updated_at < CURRENT_DATE - INTERVAL 3 DAY + AND ticket_updated_at < CURRENT_DATE - INTERVAL 7 DAY AND ticket_resolved_At IS NULL AND ticket_closed_at IS NULL - ORDER BY ticket_updated_at ASC - LIMIT 5" + ORDER BY ticket_updated_at ASC" ); +// 8 - 45 Day Warning + // Get Domains Expiring $sql_domains_expiring = mysqli_query( $mysqli, @@ -76,9 +75,8 @@ $sql_domains_expiring = mysqli_query( AND domain_expire IS NOT NULL AND domain_archived_at IS NULL AND domain_expire > CURRENT_DATE - AND domain_expire < CURRENT_DATE + INTERVAL $expiration_days DAY - ORDER BY domain_expire ASC - LIMIT 5" + AND domain_expire < CURRENT_DATE + INTERVAL 45 DAY + ORDER BY domain_expire ASC" ); // Get Certificates Expiring @@ -89,9 +87,8 @@ $sql_certificates_expiring = mysqli_query( AND certificate_expire IS NOT NULL AND certificate_archived_at IS NULL AND certificate_expire > CURRENT_DATE - AND certificate_expire < CURRENT_DATE + INTERVAL $expiration_days DAY - ORDER BY certificate_expire ASC - LIMIT 5" + AND certificate_expire < CURRENT_DATE + INTERVAL 45 DAY + ORDER BY certificate_expire ASC" ); // Get Licenses Expiring @@ -102,9 +99,8 @@ $sql_licenses_expiring = mysqli_query( AND software_expire IS NOT NULL AND software_archived_at IS NULL AND software_expire > CURRENT_DATE - AND software_expire < CURRENT_DATE + INTERVAL $expiration_days DAY - ORDER BY software_expire ASC - LIMIT 5" + AND software_expire < CURRENT_DATE + INTERVAL 45 DAY + ORDER BY software_expire ASC" ); // Get Asset Warranties Expiring @@ -115,9 +111,8 @@ $sql_asset_warranties_expiring = mysqli_query( AND asset_warranty_expire IS NOT NULL AND asset_archived_at IS NULL AND asset_warranty_expire > CURRENT_DATE - AND asset_warranty_expire < CURRENT_DATE + INTERVAL $expiration_days DAY - ORDER BY asset_warranty_expire ASC - LIMIT 5" + AND asset_warranty_expire < CURRENT_DATE + INTERVAL 45 DAY + ORDER BY asset_warranty_expire ASC" ); // Get Assets Retiring 7 Year @@ -127,10 +122,9 @@ $sql_asset_retire = mysqli_query( WHERE asset_client_id = $client_id AND asset_install_date IS NOT NULL AND asset_archived_at IS NULL - AND asset_install_date + INTERVAL 7 YEAR > CURRENT_DATE -- Not yet expired - AND asset_install_date + INTERVAL 7 YEAR <= CURRENT_DATE + INTERVAL $expiration_days DAY - ORDER BY asset_install_date ASC - LIMIT 5" + AND asset_install_date + INTERVAL 7 YEAR > CURRENT_DATE + AND asset_install_date + INTERVAL 7 YEAR <= CURRENT_DATE + INTERVAL 45 DAY + ORDER BY asset_install_date ASC" ); /* @@ -145,8 +139,7 @@ $sql_domains_expired = mysqli_query( AND domain_expire IS NOT NULL AND domain_archived_at IS NULL AND domain_expire < CURRENT_DATE - ORDER BY domain_expire ASC - LIMIT 5" + ORDER BY domain_expire ASC" ); // Get Certificates Expired @@ -157,8 +150,7 @@ $sql_certificates_expired = mysqli_query( AND certificate_expire IS NOT NULL AND certificate_archived_at IS NULL AND certificate_expire < CURRENT_DATE - ORDER BY certificate_expire ASC - LIMIT 5" + ORDER BY certificate_expire ASC" ); // Get Licenses Expired @@ -169,8 +161,7 @@ $sql_licenses_expired = mysqli_query( AND software_expire IS NOT NULL AND software_archived_at IS NULL AND software_expire < CURRENT_DATE - ORDER BY software_expire ASC - LIMIT 5" + ORDER BY software_expire ASC" ); // Get Asset Warranties Expired @@ -181,8 +172,7 @@ $sql_asset_warranties_expired = mysqli_query( AND asset_warranty_expire IS NOT NULL AND asset_archived_at IS NULL AND asset_warranty_expire < CURRENT_DATE - ORDER BY asset_warranty_expire ASC - LIMIT 5" + ORDER BY asset_warranty_expire ASC" ); // Get Retired Assets @@ -193,8 +183,7 @@ $sql_asset_retired = mysqli_query( AND asset_install_date IS NOT NULL AND asset_archived_at IS NULL AND asset_install_date + INTERVAL 7 YEAR < CURRENT_DATE -- Assets retired (installed more than 7 years ago) - ORDER BY asset_install_date ASC - LIMIT 5" + ORDER BY asset_install_date ASC" ); @@ -353,17 +342,7 @@ $sql_asset_retired = mysqli_query(
    -
    Upcoming Expirations
    -
    -
    - - -
    -
    +
    Expiring in the Next 45 Days
    @@ -378,8 +357,8 @@ $sql_asset_retired = mysqli_query( ?>

    - - -- + Domain: + -- ()

    - - -- + Certificate: + -- ()

    - - -- + Asset Warranty: + -- ()

    @@ -434,8 +413,8 @@ $sql_asset_retired = mysqli_query( ?>

    - - -- + Asset Retire: + -- ()

    - - -- + License: + -- ()

    - - -- + Domain: + -- ()

    - - -- + Certificate: + -- ()

    - + Asset Warranty: - -- + -- ()

    @@ -552,8 +531,8 @@ $sql_asset_retired = mysqli_query( ?>

    - - -- + Asset Retire: + -- ()

    - - -- + Software: + -- ()

    - diff --git a/clients.php b/clients.php index bbd5293a..a4d742c0 100644 --- a/clients.php +++ b/clients.php @@ -185,8 +185,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    - + +
    + +
    + +
    @@ -398,7 +408,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); if (!empty($contact_name)) { ?>
    - + + + +
    -
    -
    -

    Contacts

    -
    -
    - - -
    - Invite -
    - - Import - -
    - - Export - -
    +
    +
    +

    Contacts

    +
    +
    + + +
    + Invite +
    + + Import + +
    + + Export +
    -
    -
    - - - - -
    +
    +
    + + + + + +
    -
    -
    - -
    - -
    +
    +
    + +
    +
    - -
    -
    - -
    -
    - - -
    -
    - -
    -
    - -
    -
    - -
    -
    - - -
    -
    - "> - Archived - - -
    -
    -
    - -
    -
    - -
    - - "> - - - - - - - - +
    +
    +
    - - - - +
    + +
    + + - while ($row = mysqli_fetch_array($sql)) { - $client_id = intval($row['client_id']); - $client_name = nullable_htmlentities($row['client_name']); - $contact_id = intval($row['contact_id']); - $contact_name = nullable_htmlentities($row['contact_name']); - $contact_title = nullable_htmlentities($row['contact_title']); - if (empty($contact_title)) { - $contact_title_display = ""; - } else { - $contact_title_display = "$contact_title"; - } - $contact_department = nullable_htmlentities($row['contact_department']); - if (empty($contact_department)) { - $contact_department_display = "-"; - } else { - $contact_department_display = $contact_department; - } - $contact_extension = nullable_htmlentities($row['contact_extension']); - if (empty($contact_extension)) { - $contact_extension_display = ""; - } else { - $contact_extension_display = "x$contact_extension"; - } - $contact_phone = formatPhoneNumber($row['contact_phone']); - if (empty($contact_phone)) { - $contact_phone_display = ""; - } else { - $contact_phone_display = ""; - } - - $contact_mobile = formatPhoneNumber($row['contact_mobile']); - if (empty($contact_mobile)) { - $contact_mobile_display = ""; - } else { - $contact_mobile_display = "
    $contact_mobile
    "; - } - $contact_email = nullable_htmlentities($row['contact_email']); - if (empty($contact_email)) { - $contact_email_display = ""; - } else { - $contact_email_display = "
    $contact_email
    "; - } - $contact_info_display = "$contact_phone_display $contact_mobile_display $contact_email_display"; - if (empty($contact_info_display)) { - $contact_info_display = "-"; - } - $contact_pin = nullable_htmlentities($row['contact_pin']); - $contact_photo = nullable_htmlentities($row['contact_photo']); - $contact_initials = initials($contact_name); - $contact_notes = nullable_htmlentities($row['contact_notes']); - $contact_primary = intval($row['contact_primary']); - $contact_important = intval($row['contact_important']); - $contact_billing = intval($row['contact_billing']); - $contact_technical = intval($row['contact_technical']); - $contact_created_at = nullable_htmlentities($row['contact_created_at']); - $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); - if ($contact_primary == 1) { - $contact_primary_display = "Primary Contact"; - } else { - $contact_primary_display = false; - } - $contact_location_id = intval($row['contact_location_id']); - $location_name = nullable_htmlentities($row['location_name']); - if (empty($location_name)) { - $location_name = "-"; - } - $location_archived_at = nullable_htmlentities($row['location_archived_at']); - if ($location_archived_at) { - $location_name_display = "
    $location_name
    "; - } else { - $location_name_display = $location_name; - } - $auth_method = nullable_htmlentities($row['user_auth_method']); - $contact_user_id = intval($row['contact_user_id']); - - // Related Assets Query - $sql_related_assets = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_contact_id = $contact_id ORDER BY asset_id DESC"); - $asset_count = mysqli_num_rows($sql_related_assets); - - // Related Logins Query - $sql_related_logins = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_contact_id = $contact_id ORDER BY login_id DESC"); - $login_count = mysqli_num_rows($sql_related_logins); - - // Related Software Query - $sql_related_software = mysqli_query($mysqli, "SELECT * FROM software, software_contacts WHERE software.software_id = software_contacts.software_id AND software_contacts.contact_id = $contact_id ORDER BY software.software_id DESC"); - $software_count = mysqli_num_rows($sql_related_software); - - // Related Tickets Query - $sql_related_tickets = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_contact_id = $contact_id ORDER BY ticket_id DESC"); - $ticket_count = mysqli_num_rows($sql_related_tickets); - - // Tags - $contact_tag_name_display_array = array(); - $contact_tag_id_array = array(); - $sql_contact_tags = mysqli_query($mysqli, "SELECT * FROM contact_tags LEFT JOIN tags ON contact_tags.tag_id = tags.tag_id WHERE contact_id = $contact_id ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_array($sql_contact_tags)) { - - $contact_tag_id = intval($row['tag_id']); - $contact_tag_name = nullable_htmlentities($row['tag_name']); - $contact_tag_color = nullable_htmlentities($row['tag_color']); - if (empty($contact_tag_color)) { - $contact_tag_color = "dark"; - } - $contact_tag_icon = nullable_htmlentities($row['tag_icon']); - if (empty($contact_tag_icon)) { - $contact_tag_icon = "tag"; - } - - $contact_tag_id_array[] = $contact_tag_id; - $contact_tag_name_display_array[] = "$contact_tag_name"; - } - $contact_tags_display = implode('', $contact_tag_name_display_array); - - ?> - - - - - - - - - - - + +
    +
    + +
    +
    + +
    +
    + +
    +
    + + +
    +
    + "> + Archived + + +
    +
    + + + +
    + + + +
    +
    -
    - -
    -     		- - Name - - - - Department - - Contact - - Location - - - - Client - - Action
    -
    - -
    -     		- -
    - - - "> - - - - - - - - -
    -
    ">
    - -
    - -
    - -
    - -
    -
    -     - -     		-
    - -
    - - Details - - - Make Note - - - Edit - - - -
    - - Unarchive - - -
    - - Archive - -
    - - Anonymize & Archive - - - - -
    - - Delete - - - -
    -
    -
    + "> + + + + + + + + + + + + + + + $contact_title"; + } + $contact_department = getFallBack(nullable_htmlentities($row['contact_department'])); + $contact_extension = nullable_htmlentities($row['contact_extension']); + if (empty($contact_extension)) { + $contact_extension_display = ""; + } else { + $contact_extension_display = "x$contact_extension"; + } + $contact_phone = formatPhoneNumber($row['contact_phone']); + if (empty($contact_phone)) { + $contact_phone_display = ""; + } else { + $contact_phone_display = ""; } - ?> + $contact_mobile = formatPhoneNumber($row['contact_mobile']); + if (empty($contact_mobile)) { + $contact_mobile_display = ""; + } else { + $contact_mobile_display = "
    $contact_mobile
    "; + } + $contact_email = nullable_htmlentities($row['contact_email']); + if (empty($contact_email)) { + $contact_email_display = ""; + } else { + $contact_email_display = "
    $contact_email
    "; + } + $contact_info_display = "$contact_phone_display $contact_mobile_display $contact_email_display"; + if (empty($contact_info_display)) { + $contact_info_display = "-"; + } + $contact_pin = nullable_htmlentities($row['contact_pin']); + $contact_photo = nullable_htmlentities($row['contact_photo']); + $contact_initials = initials($contact_name); + $contact_notes = nullable_htmlentities($row['contact_notes']); + $contact_primary = intval($row['contact_primary']); + $contact_important = intval($row['contact_important']); + $contact_billing = intval($row['contact_billing']); + $contact_technical = intval($row['contact_technical']); + $contact_created_at = nullable_htmlentities($row['contact_created_at']); + $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); + if ($contact_primary == 1) { + $contact_primary_display = "Primary Contact"; + } else { + $contact_primary_display = false; + } + $contact_location_id = intval($row['contact_location_id']); + $location_name = nullable_htmlentities($row['location_name']); + if (empty($location_name)) { + $location_name = "N/A"; + } + $location_archived_at = nullable_htmlentities($row['location_archived_at']); + if ($location_archived_at) { + $location_name_display = "
    $location_name
    "; + } else { + $location_name_display = $location_name; + } + $auth_method = nullable_htmlentities($row['user_auth_method']); + $contact_user_id = intval($row['contact_user_id']); - -
    +
    + +
    +     		+ + Name + + + + Department + + Contact + + Location + + + + Client + + Action
    -
    - - - - - - - - $asset_count"; + } else { + $asset_count_display = ''; + } + + // Related Logins Query + $sql_related_logins = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_contact_id = $contact_id ORDER BY login_id DESC"); + $login_count = mysqli_num_rows($sql_related_logins); + if ($login_count) { + $login_count_display = "$login_count"; + } else { + $login_count_display = ''; + } + + // Related Software Query + $sql_related_software = mysqli_query($mysqli, "SELECT * FROM software, software_contacts WHERE software.software_id = software_contacts.software_id AND software_contacts.contact_id = $contact_id"); + $software_count = mysqli_num_rows($sql_related_software); + if ($software_count) { + $software_count_display = "$software_count"; + } else { + $software_count_display = ''; + } + + // Related Tickets Query + $sql_related_tickets = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_contact_id = $contact_id"); + $ticket_count = mysqli_num_rows($sql_related_tickets); + if ($ticket_count) { + $ticket_count_display = "$ticket_count"; + } else { + $software_count_display = ''; + } + + // Related Documents Query + $sql_related_documents = mysqli_query($mysqli, "SELECT * FROM documents, contact_documents WHERE documents.document_id = contact_documents.document_id AND contact_documents.contact_id = $contact_id"); + $document_count = mysqli_num_rows($sql_related_documents); + if ($document_count) { + $document_count_display = "$document_count"; + } else { + $document_count_display = ''; + } + + // Tags + $contact_tag_name_display_array = array(); + $contact_tag_id_array = array(); + $sql_contact_tags = mysqli_query($mysqli, "SELECT * FROM contact_tags LEFT JOIN tags ON contact_tags.tag_id = tags.tag_id WHERE contact_id = $contact_id ORDER BY tag_name ASC"); + while ($row = mysqli_fetch_array($sql_contact_tags)) { + + $contact_tag_id = intval($row['tag_id']); + $contact_tag_name = nullable_htmlentities($row['tag_name']); + $contact_tag_color = nullable_htmlentities($row['tag_color']); + if (empty($contact_tag_color)) { + $contact_tag_color = "dark"; + } + $contact_tag_icon = nullable_htmlentities($row['tag_icon']); + if (empty($contact_tag_icon)) { + $contact_tag_icon = "tag"; + } + + $contact_tag_id_array[] = $contact_tag_id; + $contact_tag_name_display_array[] = "$contact_tag_name"; + } + $contact_tags_display = implode('', $contact_tag_name_display_array); + + ?> + + +
    + +
    + + + +
    + + + "> + + + + + + + + +
    +
    ">
    + +
    + +
    + +
    + +
    +
    +     + + + + + + + + + + + + +
    + +
    + + Details + + + Make Note + + + Edit + + + +
    + + Unarchive + + +
    + + Archive + +
    + + Anonymize & Archive + + + + +
    + + Delete + + + +
    +
    + + + + + + + +
    + + + + + + + + -
    +