diff --git a/.gitignore b/.gitignore index 751f2adf..7d06cba2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,16 @@ config.php uploads/favicon.ico uploads/clients/* !uploads/clients/index.php +uploads/custom/* +!uploads/custom/index.php +uploads/documents/* +!uploads/documents/index.php +uploads/document_templates/* +!uploads/document_templates/index.php uploads/expenses/* !uploads/expenses/index.php +uploads/recurring_tickets/* +!uploads/recurring_tickets/index.php uploads/settings/* !uploads/settings/index.php uploads/users/* @@ -14,6 +22,8 @@ uploads/tmp/* !uploads/tmp/index.php uploads/tickets/* !uploads/tickets/index.php +uploads/ticket_templates/* +!uploads/ticket_templates/index.php .idea/* plugins/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/HTML/* !plugins/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/HTML/.gitkeep diff --git a/CHANGELOG.md b/CHANGELOG.md index d8af4496..9b9d93cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,39 @@ This file documents all notable changes made to ITFlow. +## [25.12] Stable Release + +### Breaking Changes ### +- For Existing installs: **php-xml** extension needs to be installed for document creation and editing, new install script does this for you as of Dec 6th 2025. To install php-xml: `sudo apt install php-xml` + +### Major Changes +- Consolidated "Files" and "Documents" into a single section called **Files**. + +### Bug Fixes +- Resolved issue with updating asset notes in asset details. +- Fixed problem with bulk ticket merging. +- Corrected issue where decimal inputs (e.g., price, cost) weren’t displaying on iPhones in certain forms. +- Added CSV escaping to the sample export data in areas where a sample CSV template is provided. +- Fix a race condition where dupe tickets, invoices, recurring invoices, recurring tickets, quotes will be created using the same number if created in parallel espcecially when using the API. + +### New Features & Updates +- Introduced automatic subject-based ticket merging/reply detection. Now, if an email comes from a known contact or domain and the subject matches 95% of a ticket opened in the last 7 days, it will be merged automatically. +- Added `cleanInput` function to sanitize data before inserting it into the database when using MySQLi prepared statements. +- Migrated client post functionality to use MySQLi prepared statements. +- Updated payment method post functionality to use MySQLi prepared statements. +- Implemented `saveBase64Images()` to convert base64-encoded `` tags into actual image files stored under `/uploads///` with secure filenames. Added wrapper functions, and updated document creation to use processed image paths. +- For new documents and document templates, images are now stored in `/uploads/documents/$document_id` instead of being stored as base64 in the database, using the `saveBase64Images()` function. +- UI/UX improvements made to the document details page. +- Removed sidebar quick-add options. +- Created new folders in the uploads directory: `documents`, `document_templates`, and `recurring_tickets`. +- Reworked the bulk action function to pass the name arrays, instead of a generic `selected_ids` array. This allows multiple bulk name arrays to be passed at once, currently used for the new file-document merge. +- Big task: Converted the remaining modals to use the new `ajax-modal` system, enabling more flexible flow expansion going forward. +- Mail queue: Added a `--no-mx-validation` flag to bypass recipient domain MX validation. +- Bump PHPMailer from 7.0.0 to 7.0.1. +- Bump stripe-php from 18.1.0 to 19.0.0. +- Bump TCPDF from 6.10.0 to 6.10.1. +- Bump TinyMCE from 8.2.0 to 8.2.2. + ## [25.11.1] Maint Release ### Fixes diff --git a/admin/debug.php b/admin/debug.php index f40f7881..c59c1532 100644 --- a/admin/debug.php +++ b/admin/debug.php @@ -52,6 +52,7 @@ $extensions = [ 'php-mbstring' => 'mbstring', 'php-gd' => 'gd', 'php-zip' => 'zip', + 'php-xml' => 'xml', ]; foreach ($extensions as $name => $ext) { @@ -682,7 +683,7 @@ $mysqli->close(); - +

Database Structure Comparison

@@ -765,4 +766,3 @@ $mysqli->close(); "> -

- Users - -

+

Users
  • "> -

    - - Roles -

    +

    Roles
    • +
  • "> -

    - - API Keys -

    +

    API Keys
  • TAGS & CATEGORIES
    • @@ -56,38 +46,26 @@
  • -

    - - Tags -

    +

    Tags
  • -

    - - Categories -

    +

    Categories
  • -

    - - Taxes -

    +

    Taxes
  • -

    - - Payment Methods -

    +

    Payment Methods
  • @@ -115,25 +93,19 @@

    AI Models

    • - +
  • -

    - - Ticket Statuses -

    +

    Ticket Statuses
  • -

    - - Custom Links -

    +

    Custom Links
    • @@ -154,46 +126,31 @@
  • -

    - - Project Templates -

    +

    Project Templates
  • -

    - - Ticket Templates -

    +

    Ticket Templates
  • -

    - - Vendor Templates -

    +

    Vendor Templates
  • -

    - - License Templates -

    +

    License Templates
  • -

    - - Document Templates -

    +

    Document Templates
    • @@ -341,7 +298,7 @@ - + Will not show as an option at Checkout if invoice amount is above this number, 0 disables the threshold check. @@ -79,7 +79,7 @@ ob_start();
    - + See here for the latest Stripe Fees. @@ -90,7 +90,7 @@ ob_start();
    - + See here for the latest Stripe Fees. diff --git a/admin/modals/payment_provider/payment_provider_edit.php b/admin/modals/payment_provider/payment_provider_edit.php index f5e65cb6..154a6074 100644 --- a/admin/modals/payment_provider/payment_provider_edit.php +++ b/admin/modals/payment_provider/payment_provider_edit.php @@ -58,7 +58,7 @@ ob_start();
    - + Will not show as an option at Checkout if above this number @@ -79,7 +79,7 @@ ob_start();
    - + See here for the latest Stripe Fees. @@ -90,7 +90,7 @@ ob_start();
    - + See here for the latest Stripe Fees. diff --git a/admin/modals/user/user_export.php b/admin/modals/user/user_export.php index b0aa26e2..fc4ead57 100644 --- a/admin/modals/user/user_export.php +++ b/admin/modals/user/user_export.php @@ -1,21 +1,26 @@ - diff --git a/admin/users.php b/admin/users.php index 185ec602..f6370c16 100644 --- a/admin/users.php +++ b/admin/users.php @@ -33,9 +33,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    1) { ?> - Export + + Export +
    - IR + + IR +
    @@ -54,7 +61,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - "> Archived @@ -235,5 +242,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    Bulk Action (0)
    - + Assign Network
    - + Set Type
    @@ -597,8 +601,6 @@ if (isset($_GET['asset_id'])) {
    - - diff --git a/agent/assets.php b/agent/assets.php index 237ed926..43d76c3d 100644 --- a/agent/assets.php +++ b/agent/assets.php @@ -92,7 +92,7 @@ if (isset($_GET['tags']) && is_array($_GET['tags']) && !empty($_GET['tags'])) { //Get Asset Counts $row = mysqli_fetch_assoc(mysqli_query($mysqli, " - SELECT + SELECT COUNT(*) AS all_count, SUM(CASE WHEN asset_type IN ('laptop', 'desktop') THEN 1 ELSE 0 END) AS workstation_count, SUM(CASE WHEN asset_type = 'server' THEN 1 ELSE 0 END) AS server_count, @@ -102,8 +102,8 @@ $row = mysqli_fetch_assoc(mysqli_query($mysqli, " FROM ( SELECT assets.* FROM assets LEFT JOIN clients ON client_id = asset_client_id - LEFT JOIN contacts ON asset_contact_id = contact_id - LEFT JOIN locations ON asset_location_id = location_id + LEFT JOIN contacts ON asset_contact_id = contact_id + LEFT JOIN locations ON asset_location_id = location_id LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1 LEFT JOIN asset_tags ON asset_tag_asset_id = asset_id LEFT JOIN tags ON tag_id = asset_tag_tag_id @@ -133,15 +133,12 @@ $network_count = intval($row['network_count']); //Other Count $other_count = intval($row['other_count']); -//Rebuild URL -$url_query_strings_sort = http_build_query($get_copy); - $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM assets LEFT JOIN clients ON asset_client_id = client_id - LEFT JOIN contacts ON asset_contact_id = contact_id - LEFT JOIN locations ON asset_location_id = location_id + LEFT JOIN contacts ON asset_contact_id = contact_id + LEFT JOIN locations ON asset_location_id = location_id LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1 LEFT JOIN asset_tags ON asset_tag_asset_id = asset_id LEFT JOIN tags ON tag_id = asset_tag_tag_id @@ -203,14 +200,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + Import
    0) { ?> - + Export @@ -245,7 +244,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $sql_locations_filter = mysqli_query($mysqli, " SELECT DISTINCT location_id, location_name FROM locations - WHERE location_client_id = $client_id + WHERE location_client_id = $client_id AND ( EXISTS (SELECT 1 FROM assets WHERE asset_location_id = location_id AND $archive_query) OR location_id = $location_filter) ORDER BY location_name ASC "); @@ -269,7 +268,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + MAC Address @@ -608,7 +607,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } $contact_name = nullable_htmlentities($row['contact_name']); if ($contact_name) { - $contact_name_display = "$contact_name $contact_archive_display"; + $contact_name_display = "$contact_name $contact_archive_display"; } else { $contact_name_display = "-"; } @@ -668,7 +667,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    @@ -792,8 +791,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); 0) { ?>
    - + Export
    @@ -78,7 +79,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + @@ -103,7 +104,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - "> Archived @@ -283,7 +284,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Archive - +
    @@ -299,15 +300,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + - -
    - + Import
    - + Export
    @@ -128,7 +130,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - "> Archived @@ -137,38 +139,38 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Action (0)
    - Open Tickets
    - Set Hourly Rate
    - Set Industry
    - Set Referral
    - Assign Tags
    - @@ -193,15 +195,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    " id="advancedFilter" @@ -220,10 +222,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    @@ -364,11 +366,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } // Counts - + // Contact Count $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL")); $contact_count = $row['num']; - if ($contact_count) { + if ($contact_count) { $contact_count_display = "$contact_count"; } else { $contact_count_display = ''; @@ -377,34 +379,34 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); // Vendors Count $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_client_id = $client_id AND vendor_archived_at IS NULL")); $vendor_count = $row['num']; - if ($vendor_count) { + if ($vendor_count) { $vendor_count_display = "$vendor_count"; } else { $vendor_count_display = ''; } - + // Asset Count $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL")); $asset_count = $row['num']; - if ($asset_count) { + if ($asset_count) { $asset_count_display = "$asset_count"; } else { $asset_count_display = ''; } - + // Credential Count $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_client_id = $client_id AND credential_archived_at IS NULL")); $credential_count = $row['num']; - if ($credential_count) { + if ($credential_count) { $credential_count_display = "$credential_count"; } else { $credential_count_display = ''; } - + // Software Count $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_client_id = $client_id AND software_archived_at IS NULL")); $software_count = $row['num']; - if ($software_count) { + if ($software_count) { $software_count_display = "$software_count"; } else { $software_count_display = ''; @@ -413,7 +415,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); // Ticket Count $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_client_id = $client_id AND ticket_archived_at IS NULL")); $ticket_count = $row['num']; - if ($ticket_count) { + if ($ticket_count) { $ticket_count_display = "$ticket_count"; } else { $ticket_count_display = ''; @@ -518,10 +520,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } if (!empty($contact_name)) { ?> -
    +
    - +
    - +
    - + Import
    - + Export
    @@ -112,7 +114,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + @@ -134,7 +136,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - "> Archived @@ -219,7 +221,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Bulk Action (0)
    - + @@ -397,7 +399,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $contact_user_id = intval($row['contact_user_id']); if ($contact_user_id) { $user_exists_display = ""; - } else { + } else { $user_exists_display = ""; } @@ -406,25 +408,25 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); // Asset Count $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_contact_id = $contact_id AND asset_archived_at IS NULL")); $asset_count = $row['num']; - if ($asset_count) { + if ($asset_count) { $asset_count_display = "$asset_count"; } else { $asset_count_display = ''; } - + // Credential Count $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_contact_id = $contact_id AND credential_archived_at IS NULL")); $credential_count = $row['num']; - if ($credential_count) { + if ($credential_count) { $credential_count_display = "$credential_count"; } else { $credential_count_display = ''; } - + // Software Count $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software, software_contacts WHERE software.software_id = software_contacts.software_id AND software_contacts.contact_id = $contact_id AND software_archived_at IS NULL")); $software_count = $row['num']; - if ($software_count) { + if ($software_count) { $software_count_display = "$software_count"; } else { $software_count_display = ''; @@ -433,7 +435,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); // Ticket Count $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_contact_id = $contact_id AND ticket_archived_at IS NULL")); $ticket_count = $row['num']; - if ($ticket_count) { + if ($ticket_count) { $ticket_count_display = "$ticket_count"; } else { $ticket_count_display = ''; @@ -491,11 +493,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    - + @@ -566,10 +568,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - + Import
    0) { ?> - + Export @@ -151,7 +153,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    @@ -198,7 +200,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -366,7 +368,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $credential_contact_display = ''; } - if ($credential_asset_id) { + if ($credential_asset_id) { $credential_asset_display = " @@ -528,15 +530,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - -
  • - +
  • - Documents + Files
  • - +
    • @@ -92,9 +92,9 @@ $page_title = $row['document_name']; } ?>
  • - - (ARCHIVED on $document_archived_at)"; + + (ARCHIVED on $document_archived_at)"; } ?>
    • @@ -104,18 +104,31 @@ $page_title = $row['document_name'];
    - -

    ()

    -
    -
    Date:
    - -
    Prepared By:
    - +
    +
    + +
    + +
    +
    +
    +
    + Date: + +
    + +
    + Prepared By: + +
    + +
    +
    - +

    Documentation Revision History

    @@ -151,15 +164,15 @@ $page_title = $row['document_name']; ?> - - - - - + + + + + - @@ -176,10 +189,10 @@ $page_title = $row['document_name']; - + @@ -189,13 +202,14 @@ $page_title = $row['document_name'];
    Related Items
    Files -
    - - - + + +
    Contacts -
    "> - +
    Assets -
    @@ -282,7 +297,7 @@ $page_title = $row['document_name']; - +
    Licenses -
    - +
    Vendors -
    - + - +
    Portal Collaboration
    Document is - + visible"; @@ -414,11 +432,5 @@ $page_title = $row['document_name']; 0) { - $sql_folder = mysqli_query($mysqli, "SELECT folder_name, parent_folder FROM folders WHERE folder_id = $folder_id"); - if ($row_folder = mysqli_fetch_assoc($sql_folder)) { - $folder_name = nullable_htmlentities($row_folder['folder_name']); - $parent_folder = intval($row_folder['parent_folder']); - - // Prepend the folder to the beginning of the array - array_unshift($folder_path, array('folder_id' => $folder_id, 'folder_name' => $folder_name)); - - // Move up to the parent folder - $folder_id = $parent_folder; - } else { - // If the folder is not found, break the loop - break; - } -} - -?> - -
    -
    -

    - Documents -

    -
    - -
    - - -
    - - New Folder - -
    - From Template -
    -
    - -
    - -
    - -
    - - - -
    -
    -
    - "> -
    - -
    - -
    -
    -
    -
    - -
    -
    -
    - - -
    - - -
    -
    -

    Folders

    -
    - -
    - -
    - - - -
    - - -
    - - "> - - - - - - - - - - - NOW() - AND item_type = 'Document' - AND item_related_id = $document_id - LIMIT 1" - ); - $row = mysqli_fetch_array($sql_shared); - if($row) { - $item_id = intval($row['item_id']); - $item_active = nullable_htmlentities($row['item_active']); - $item_key = nullable_htmlentities($row['item_key']); - $item_type = nullable_htmlentities($row['item_type']); - $item_related_id = intval($row['item_related_id']); - $item_note = nullable_htmlentities($row['item_note']); - $item_recipient = nullable_htmlentities($row['item_recipient']); - $item_views = nullable_htmlentities($row['item_views']); - $item_view_limit = nullable_htmlentities($row['item_view_limit']); - $item_created_at = nullable_htmlentities($row['item_created_at']); - $item_expire_at = nullable_htmlentities($row['item_expire_at']); - $item_expire_at_human = timeAgo($row['item_expire_at']); - } - - ?> - - - - - - - - - - - - - -
    -
    - -
    -     		- - Name - - - - Created - - - - Last Update - - Action
    -
    - -
    -     		- -
    -
    		- -
    -
    		- 0) { ?> -
    - -
    Shared -
    - -
    -
    - -     		-
    - -
    - - Quick View - -
    - - Edit - -
    - )"> - Share - -
    - - Rename - -
    - - Move - - -
    - - Archive - -
    - - Delete - - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - - - - -
    -
    -

    Domains

    -
    -
    - - 0) { ?> - -
    - - Export - -
    - -
    -
    -
    - -
    -
    - - +
    +
    +

    Domains

    +
    +
    + + 0) { ?> + +
    + + Export + +
    - -
    -
    -
    - -
    - -
    -
    -
    - - -
    - -
    -
    - -
    -
    - - -
    -
    - "> - Archived - - -
    -
    - -
    - -
    -
    - -
    - - - - - - text-nowrap"> - - - - - - - - - - - - - - - - - $domain_registrar_name - " : "-"; - $domain_webhost_name_display = $domain_webhost_name ? " - - $domain_webhost_name - " : "-"; - $domain_dnshost_name_display = $domain_dnshost_name ? " - - $domain_dnshost_name - " : "-"; - $domain_mailhost_name_display = $domain_mailhost_name ? " - - $domain_mailhost_name - " : "-"; - - ?> - - - - - - - - - - - - - - - - - -
    -
    - -
    -     		- - Domain - - - - Registrar - - - - Web Host - - - - DNS Host - - - - Mail Host - - - - Expires - - - - Client - - Action
    -
    - -
    -     		- -
    - -
    -
    -
    -
    -
    -     -     		-
    - -
    - -     		-
    - -
    - - Edit - - - -
    - - Unarchive - -
    - - Delete - - -
    - - Archive - - - -
    -
    -
    - -
    -
    - +
    +
    + + + + +
    +
    +
    + +
    + +
    +
    +
    + + +
    + +
    +
    + +
    +
    + + +
    +
    + "> + Archived + + +
    +
    + +
    +
    +
    +
    + +
    + + + + + + text-nowrap"> + + + + + + + + + + + + + + + + + $domain_registrar_name + " : "-"; + $domain_webhost_name_display = $domain_webhost_name ? " + + $domain_webhost_name + " : "-"; + $domain_dnshost_name_display = $domain_dnshost_name ? " + + $domain_dnshost_name + " : "-"; + $domain_mailhost_name_display = $domain_mailhost_name ? " + + $domain_mailhost_name + " : "-"; + + ?> + + + + + + + + + + + + + + + + + +
    +
    + +
    +     		+ + Domain + + + + Registrar + + + + Web Host + + + + DNS Host + + + + Mail Host + + + + Expires + + + + Client + + Action
    +
    + +
    +     		+ +
    + +
    +
    +
    +
    +
    +     +     		+
    + +
    + +     		+
    + +
    + + Edit + + + +
    + + Unarchive + +
    + + Delete + + +
    + + Archive + + + +
    +
    +
    + +
    +
    + +
    +
    New Expense
    - + Export
    @@ -94,26 +95,26 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Bulk Action (0)
    - Set Category
    - Set Account
    - Set Client
    - Delete @@ -143,7 +144,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    @@ -357,5 +358,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); 0) { - $sql_folder = mysqli_query($mysqli, "SELECT folder_name, parent_folder FROM folders WHERE folder_id = $folder_id"); +while ($breadcrumb_folder_id > 0) { + $sql_folder = mysqli_query($mysqli, "SELECT folder_name, parent_folder FROM folders WHERE folder_id = $breadcrumb_folder_id AND folder_client_id = $client_id"); if ($row_folder = mysqli_fetch_assoc($sql_folder)) { $folder_name = nullable_htmlentities($row_folder['folder_name']); $parent_folder = intval($row_folder['parent_folder']); - // Prepend the folder to the beginning of the array - array_unshift($folder_path, array('folder_id' => $folder_id, 'folder_name' => $folder_name)); + array_unshift($folder_path, [ + 'folder_id' => $breadcrumb_folder_id, + 'folder_name' => $folder_name + ]); - // Move up to the parent folder - $folder_id = $parent_folder; + $breadcrumb_folder_id = $parent_folder; } else { - // If the folder is not found, break the loop break; } } +// --------------------------------------------- +// Helper: unified folder tree (no folder_location) +// --------------------------------------------- +function is_ancestor_folder($folder_id, $current_folder_id, $client_id) { + global $mysqli; + + if ($current_folder_id == 0) { + return false; + } + if ($current_folder_id == $folder_id) { + return true; + } + + $result = mysqli_query($mysqli, "SELECT parent_folder FROM folders WHERE folder_id = $current_folder_id AND folder_client_id = $client_id"); + if ($row = mysqli_fetch_assoc($result)) { + $parent_folder_id = intval($row['parent_folder']); + return is_ancestor_folder($folder_id, $parent_folder_id, $client_id); + } else { + return false; + } +} + +function display_folders($parent_folder_id, $client_id, $indent = 0) { + global $mysqli, $get_folder_id, $session_user_role; + + $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_client_id = $client_id ORDER BY folder_name ASC"); + while ($row = mysqli_fetch_array($sql_folders)) { + $folder_id = intval($row['folder_id']); + $folder_name = nullable_htmlentities($row['folder_name']); + + // Count files in folder + $row_files = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files WHERE file_folder_id = $folder_id AND file_client_id = $client_id AND file_archived_at IS NULL")); + $num_files = intval($row_files['num']); + + // Count documents in folder + $row_docs = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_folder_id = $folder_id AND document_client_id = $client_id AND document_archived_at IS NULL")); + $num_docs = intval($row_docs['num']); + + $num_total = $num_files + $num_docs; + + // Count subfolders + $subfolder_result = mysqli_query($mysqli, "SELECT COUNT(*) AS count FROM folders WHERE parent_folder = $folder_id AND folder_client_id = $client_id"); + $subfolder_count = intval(mysqli_fetch_assoc($subfolder_result)['count']); + + echo '
  • '; + echo '
    '; + echo '
    '; + echo ''; + + echo str_repeat(' ', $indent * 4); + + if ($get_folder_id == $folder_id || is_ancestor_folder($folder_id, $get_folder_id, $client_id)) { + echo ''; + } else { + echo ''; + } + + echo ' ' . $folder_name; + + if ($num_total > 0) { + echo "$num_total"; + } + + echo ''; + echo '
    '; + echo '
    '; + ?> +
    + +
    + + Rename + + +
    + + Delete + + +
    +
    + '; + echo '
    '; + + if ($subfolder_count > 0) { + echo '
      '; + display_folders($folder_id, $client_id, $indent + 1); + echo '
    '; + } + + echo '
    • '; + } +} + +// --------------------------------------------- +// DATA LOAD +// view=1 (thumbs) uses original files-only query +// view=0 (list) loads ALL files+documents, merges, sorts in PHP +// --------------------------------------------- + +$items = []; +$num_rows = [0]; + +if ($view == 1) { + + // Thumbnail view - only image files, similar to original behavior + $query_images = "AND (file_ext LIKE 'JPG' OR file_ext LIKE 'jpg' OR file_ext LIKE 'JPEG' OR file_ext LIKE 'jpeg' OR file_ext LIKE 'png' OR file_ext LIKE 'PNG' OR file_ext LIKE 'webp' OR file_ext LIKE 'WEBP')"; + + if ($get_folder_id == 0 && isset($_GET["q"])) { + $sql = mysqli_query( + $mysqli, + "SELECT SQL_CALC_FOUND_ROWS * FROM files + LEFT JOIN users ON file_created_by = user_id + WHERE file_client_id = $client_id + AND file_archived_at IS NULL + AND (file_name LIKE '%$q%' OR file_ext LIKE '%$q%' OR file_description LIKE '%$q%') + $query_images + ORDER BY file_name ASC + LIMIT $record_from, $record_to" + ); + } else { + $sql = mysqli_query( + $mysqli, + "SELECT SQL_CALC_FOUND_ROWS * FROM files + LEFT JOIN users ON file_created_by = user_id + WHERE file_client_id = $client_id + AND file_folder_id = $folder_id + AND file_archived_at IS NULL + AND (file_name LIKE '%$q%' OR file_ext LIKE '%$q%' OR file_description LIKE '%$q%') + $query_images + ORDER BY file_name ASC + LIMIT $record_from, $record_to" + ); + } + + $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + +} else { + + // -------- LIST VIEW: build unified items[] -------- + + // Folder filter + if ($get_folder_id == 0 && isset($_GET["q"])) { + $file_folder_snippet = ""; // search across all folders + $doc_folder_snippet = ""; + } else { + $file_folder_snippet = "AND file_folder_id = $folder_id"; + $doc_folder_snippet = "AND document_folder_id = $folder_id"; + } + + // Search filters + $safe_q = mysqli_real_escape_string($mysqli, $q); + + $file_search_snippet = ""; + if (!empty($q)) { + $file_search_snippet = "AND (file_name LIKE '%$safe_q%' OR file_ext LIKE '%$safe_q%' OR file_description LIKE '%$safe_q%')"; + } + + $doc_search_snippet = ""; + if (!empty($q)) { + $doc_search_snippet = "AND (MATCH(document_content_raw) AGAINST ('$safe_q') OR document_name LIKE '%$safe_q%')"; + } + + // Files query (NO limit - we'll paginate in PHP) + $sql_files = mysqli_query( + $mysqli, + "SELECT files.*, users.user_name + FROM files + LEFT JOIN users ON file_created_by = user_id + WHERE file_client_id = $client_id + AND file_archived_at IS NULL + $file_folder_snippet + $file_search_snippet" + ); + + // Documents query (NO limit - paginate in PHP) + $sql_documents = mysqli_query( + $mysqli, + "SELECT documents.*, users.user_name + FROM documents + LEFT JOIN users ON document_created_by = user_id + WHERE document_client_id = $client_id + AND document_archived_at IS NULL + $doc_folder_snippet + $doc_search_snippet" + ); + + // Normalize FILES into $items + while ($row = mysqli_fetch_assoc($sql_files)) { + $file_id = intval($row['file_id']); + $file_name = nullable_htmlentities($row['file_name']); + $file_description = nullable_htmlentities($row['file_description']); + $file_reference_name= nullable_htmlentities($row['file_reference_name']); + $file_ext = nullable_htmlentities($row['file_ext']); + $file_size = intval($row['file_size']); + $file_mime_type = nullable_htmlentities($row['file_mime_type']); + $file_uploaded_by = nullable_htmlentities($row['user_name']); + $file_created_at = nullable_htmlentities($row['file_created_at']); + + // determine icon + if ($file_ext == 'pdf') { + $file_icon = "file-pdf"; + } elseif (in_array($file_ext, ['gz','tar','zip','7z','rar'])) { + $file_icon = "file-archive"; + } elseif (in_array($file_ext, ['txt','md'])) { + $file_icon = "file-alt"; + } elseif ($file_ext == 'msg') { + $file_icon = "envelope"; + } elseif (in_array($file_ext, ['doc','docx','odt'])) { + $file_icon = "file-word"; + } elseif (in_array($file_ext, ['xls','xlsx','ods'])) { + $file_icon = "file-excel"; + } elseif (in_array($file_ext, ['pptx','odp'])) { + $file_icon = "file-powerpoint"; + } elseif (in_array($file_ext, ['mp3','wav','ogg'])) { + $file_icon = "file-audio"; + } elseif (in_array($file_ext, ['mov','mp4','av1'])) { + $file_icon = "file-video"; + } elseif (in_array($file_ext, ['jpg','jpeg','png','gif','webp','bmp','tif'])) { + $file_icon = "file-image"; + } else { + $file_icon = "file"; + } + + $items[] = [ + 'kind' => 'file', + 'id' => $file_id, + 'name' => $file_name, + 'description' => $file_description, + 'reference_name' => $file_reference_name, + 'icon' => $file_icon, + 'mime' => $file_mime_type, + 'size' => $file_size, + 'created_at' => $file_created_at, + 'created_by' => $file_uploaded_by, + ]; + } + + // Normalize DOCUMENTS into $items + while ($row = mysqli_fetch_assoc($sql_documents)) { + $document_id = intval($row['document_id']); + $document_name = nullable_htmlentities($row['document_name']); + $document_description = nullable_htmlentities($row['document_description']); + $document_created_by_name = nullable_htmlentities($row['user_name']); + $document_created_at = $row['document_created_at']; + + $items[] = [ + 'kind' => 'document', + 'id' => $document_id, + 'name' => $document_name, + 'description' => $document_description, + 'mime' => 'Document', + 'size' => null, + 'created_at' => $document_created_at, + 'created_by' => $document_created_by_name, + ]; + } + + // Sort combined items + $sort = isset($_GET['sort']) ? $_GET['sort'] : 'name'; + $order = isset($_GET['order']) ? $_GET['order'] : 'ASC'; + + usort($items, function($a, $b) use ($sort, $order) { + $direction = ($order === 'DESC') ? -1 : 1; + + if ($sort == 'created') { + $valA = strtotime($a['created_at']); + $valB = strtotime($b['created_at']); + } elseif ($sort == 'type') { + $valA = strtolower($a['mime']); + $valB = strtolower($b['mime']); + } elseif ($sort == 'size') { + $valA = (int)($a['size'] ?? 0); + $valB = (int)($b['size'] ?? 0); + } else { + // default: name + $valA = strtolower($a['name']); + $valB = strtolower($b['name']); + } + + if ($valA == $valB) { + return 0; + } + + return ($valA < $valB) ? -1 * $direction : 1 * $direction; + }); + + // Total items (for pagination footer) + $total_items = count($items); + $num_rows = [$total_items]; + + // Apply pagination slice + $items = array_slice($items, $record_from, $record_to); +} + +// --------------------------------------------- +// Root folder count (for "/" badge) +// --------------------------------------------- +$row_root_files = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files WHERE file_folder_id = 0 AND file_client_id = $client_id AND file_archived_at IS NULL")); +$row_root_docs = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_folder_id = 0 AND document_client_id = $client_id AND document_archived_at IS NULL")); +$num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num']); + ?>
    -

    Files

    +

    Files

    +
    - - -
    - - New Folder +
    + + Upload File + +
    + + Document + + + Document from Template + +
    + + Folder
    @@ -114,126 +400,29 @@ while ($folder_id > 0) {
    + +

    Folders

    -
    - +
    +
    @@ -241,7 +430,9 @@ while ($folder_id > 0) {
    - "> +
    @@ -249,8 +440,8 @@ while ($folder_id > 0) {
    - "> - "> + "> + "> @@ -275,6 +466,7 @@ while ($folder_id > 0) {
    +
    - - -
    - - $file_id, - 'name' => $file_name, - 'preview' => "../uploads/clients/$client_id/$file_reference_name" - ]; - - ?> - -
    - - - " alt=""> - - - -
    + + +
    - -
    + $files[] = [ + 'id' => $file_id, + 'name' => $file_name, + 'preview' => "../uploads/clients/$client_id/$file_reference_name" + ]; + ?> + +
    + + + " alt=""> + + + +
    + + + +
    -
    - - -
    - - - "> - - - - - - - - - - - - - - NOW() - AND item_type = 'File' - AND item_related_id = $file_id - LIMIT 1" - ); - $file_shared = (mysqli_num_rows($sql_shared) > 0) ? true : false; - if ($file_shared) { - $row = mysqli_fetch_array($sql_shared); - $item_id = intval($row['item_id']); - $item_active = nullable_htmlentities($row['item_active']); - $item_key = nullable_htmlentities($row['item_key']); - $item_type = nullable_htmlentities($row['item_type']); - $item_related_id = intval($row['item_related_id']); - $item_note = nullable_htmlentities($row['item_note']); - $item_recipient = nullable_htmlentities($row['item_recipient']); - $item_views = nullable_htmlentities($row['item_views']); - $item_view_limit = nullable_htmlentities($row['item_view_limit']); - $item_created_at = nullable_htmlentities($row['item_created_at']); - $item_expire_at = nullable_htmlentities($row['item_expire_at']); - $item_expire_at_human = timeAgo($row['item_expire_at']); - } - - ?> + + + +
    +
    -
    - -
    -     		- - Name - - - - Type - - - - Size - - - - Uploaded - - Action
    + "> - - - - - + + + + + + + + + - + if ($item['kind'] === 'file') { + $file_id = $item['id']; + $file_name = $item['name']; + $file_description = $item['description']; + $file_reference_name= $item['reference_name']; + $file_icon = $item['icon']; + $file_size = $item['size']; + $file_size_KB = $file_size ? number_format($file_size / 1024) : 0; + $file_mime_type = $item['mime']; + $file_uploaded_by = $item['created_by']; + $file_created_at = $item['created_at']; -
    - +
    		- " target="_blank"> -
    - -
    -

    - -
    - -

    -
    -
    +     		+ + Name - - KB - -
    -     		- -
    - -
    Shared -
    - -
    -
    - -     		-
    - -
    - " download=""> - Download - - )"> - Share - - - Rename - - - Move - - - Asset - -
    - - Archive - - -
    - )"> - Delete - - -
    -
    -     		+ + Type + + + + Size + + + + Uploaded + + Action
    -
    -
    + // Shared? + $sql_shared = mysqli_query( + $mysqli, + "SELECT * FROM shared_items + WHERE item_client_id = $client_id + AND item_active = 1 + AND item_views != item_view_limit + AND item_expire_at > NOW() + AND item_type = 'File' + AND item_related_id = $file_id + LIMIT 1" + ); + $file_shared = (mysqli_num_rows($sql_shared) > 0); + if ($file_shared) { + $row_shared = mysqli_fetch_array($sql_shared); + $item_recipient = nullable_htmlentities($row_shared['item_recipient']); + $item_expire_at_human = timeAgo($row_shared['item_expire_at']); + } + ?> + + +
    + +
    + + + " target="_blank"> +
    + +
    +

    + +
    + +

    +
    +
    +     + + + KB + + +
    + + + +
    + +
    Shared +
    + +
    +
    + + + +
    + +
    + " download=""> + Download + + )"> + Share + + + Rename + + + Move + + + Asset + +
    + + Archive + + +
    + )"> + Delete + + +
    +
    + + + NOW() + AND item_type = 'Document' + AND item_related_id = $document_id + LIMIT 1" + ); + $doc_shared = (mysqli_num_rows($sql_shared) > 0); + if ($doc_shared) { + $row_shared = mysqli_fetch_array($sql_shared); + $item_recipient = nullable_htmlentities($row_shared['item_recipient']); + $item_expire_at_human = timeAgo($row_shared['item_expire_at']); + } + ?> + + +
    + +
    + + + +
    + +
    +

    + +
    + +

    +
    +
    +     + + Document + - + + +
    + + + +
    + +
    Shared +
    + +
    +
    + + + +
    + +
    + + Quick View + +
    + + Edit + +
    + )"> + Share + +
    + + Rename + + + Move + + +
    + + Archive + +
    + + Delete + + +
    +
    + + + + + +
    + @@ -607,12 +856,12 @@ function updateModalContent() { } function nextFile() { - currentIndex = (currentIndex + 1) % files.length; // loop around + currentIndex = (currentIndex + 1) % files.length; updateModalContent(); } function prevFile() { - currentIndex = (currentIndex - 1 + files.length) % files.length; // loop around + currentIndex = (currentIndex - 1 + files.length) % files.length; updateModalContent(); } @@ -622,4 +871,5 @@ function prevFile() { 0) { + $sql_folder = mysqli_query($mysqli, "SELECT folder_name, parent_folder FROM folders WHERE folder_id = $folder_id"); + if ($row_folder = mysqli_fetch_assoc($sql_folder)) { + $folder_name = nullable_htmlentities($row_folder['folder_name']); + $parent_folder = intval($row_folder['parent_folder']); + + // Prepend the folder to the beginning of the array + array_unshift($folder_path, array('folder_id' => $folder_id, 'folder_name' => $folder_name)); + + // Move up to the parent folder + $folder_id = $parent_folder; + } else { + // If the folder is not found, break the loop + break; + } +} + +?> + +
    + +
    +

    Files

    + +
    +
    + + +
    + + New Folder + +
    +
    +
    +
    + +
    +
    +
    +

    Folders

    +
    + + +
    + + +
    + +
    + + + +
    +
    +
    + "> +
    + +
    +
    +
    +
    +
    + "> + "> + + + +
    +
    +
    +
    + + + +
    + + + +
    + + $file_id, + 'name' => $file_name, + 'preview' => "../uploads/clients/$client_id/$file_reference_name" + ]; + + ?> + +
    + + + " alt=""> + + + +
    + + + +
    + + + +
    + + +
    + + + "> + + + + + + + + + + + + + + NOW() + AND item_type = 'File' + AND item_related_id = $file_id + LIMIT 1" + ); + $file_shared = (mysqli_num_rows($sql_shared) > 0) ? true : false; + if ($file_shared) { + $row = mysqli_fetch_array($sql_shared); + $item_id = intval($row['item_id']); + $item_active = nullable_htmlentities($row['item_active']); + $item_key = nullable_htmlentities($row['item_key']); + $item_type = nullable_htmlentities($row['item_type']); + $item_related_id = intval($row['item_related_id']); + $item_note = nullable_htmlentities($row['item_note']); + $item_recipient = nullable_htmlentities($row['item_recipient']); + $item_views = nullable_htmlentities($row['item_views']); + $item_view_limit = nullable_htmlentities($row['item_view_limit']); + $item_created_at = nullable_htmlentities($row['item_created_at']); + $item_expire_at = nullable_htmlentities($row['item_expire_at']); + $item_expire_at_human = timeAgo($row['item_expire_at']); + } + + ?> + + + + + + + + + + + + + +
    +
    + +
    +     		+ + Name + + + + Type + + + + Size + + + + Uploaded + + Action
    +
    + +
    +     		+ " target="_blank"> +
    + +
    +

    + +
    + +

    +
    +
    +     +     		KB + +
    +     		+ +
    + +
    Shared +
    + +
    +
    + +     		+
    + +
    + " download=""> + Download + + )"> + Share + + + Rename + + + Move + + + Asset + +
    + + Archive + + +
    + )"> + Delete + + +
    +
    +
    +
    +
    + + + + + +
    +
    +
    +
    + + + + + +

    Contacts - 0) { ?> @@ -44,7 +43,6 @@

    Locations - 0) { ?> @@ -61,7 +59,6 @@

    Tickets - 0) { ?> @@ -76,7 +73,6 @@

    Recurring Tickets - @@ -91,7 +87,6 @@

    Projects - @@ -106,7 +101,6 @@

    Vendors - 0) { ?> @@ -138,7 +132,6 @@

    Assets - 0) { ?> @@ -152,7 +145,6 @@

    Licenses - 0) { ?> @@ -167,7 +159,6 @@

    Credentials - 0) { ?> @@ -182,7 +173,6 @@

    Networks - 0) { ?> @@ -196,7 +186,6 @@

    Racks - 0) { ?> @@ -210,7 +199,6 @@

    Certificates - 0) { ?> @@ -224,7 +212,6 @@

    Domains - 0) { ?> @@ -238,7 +225,6 @@

    Services - 0) { ?> @@ -247,29 +233,14 @@ -

  • - "> - -

    - Documents - - 0) { ?> - - -

    -     -
    • -
  • "> - +

    Files - 0) { ?> @@ -291,7 +262,6 @@

    Invoices - 0) { ?> @@ -305,7 +275,6 @@

    Recurring Invoices - @@ -319,7 +288,6 @@

    Quotes - 0) { ?> @@ -350,7 +318,6 @@

    Trips - 0) { ?> diff --git a/agent/includes/side_nav.php b/agent/includes/side_nav.php index 10f97da8..b5aa7dce 100644 --- a/agent/includes/side_nav.php +++ b/agent/includes/side_nav.php @@ -24,7 +24,6 @@

    Clients - @@ -41,7 +40,6 @@

    Tickets - @@ -53,7 +51,6 @@

    Recurring Tickets - @@ -65,7 +62,6 @@

    Projects - @@ -88,7 +84,6 @@

    Quotes - @@ -100,7 +95,6 @@

    Invoices - @@ -112,7 +106,6 @@

    Recurring Invoices - @@ -123,14 +116,12 @@ ">

    Revenues

    -
  • ">

    Products

    -
    • @@ -146,14 +137,12 @@ ">

    Vendors

    -
  • ">

    Expenses

    -
  • @@ -161,7 +150,6 @@

    Recurring Expenses - @@ -172,21 +160,18 @@ ">

    Accounts

    -
  • ">

    Transfers

    -
  • ">

    Trips

    -
    • diff --git a/agent/invoice.php b/agent/invoice.php index 710c04d6..d6826bba 100644 --- a/agent/invoice.php +++ b/agent/invoice.php @@ -162,7 +162,7 @@ if (isset($_GET['invoice_id'])) { //Product autocomplete $products_sql = mysqli_query($mysqli, " - SELECT + SELECT CONCAT(product_code, ' - ', product_name) AS label, product_name, product_code, @@ -190,7 +190,7 @@ if (isset($_GET['invoice_id'])) { // Saved Payment Methods $sql_saved_payment_methods = mysqli_query($mysqli, " SELECT * FROM client_saved_payment_methods - LEFT JOIN payment_providers + LEFT JOIN payment_providers ON client_saved_payment_methods.saved_payment_provider_id = payment_providers.payment_provider_id WHERE saved_payment_client_id = $client_id AND payment_provider_active = 1; @@ -245,7 +245,7 @@ if (isset($_GET['invoice_id'])) { 0 && ($invoice_status === 'Sent' || $invoice_status === 'Viewed')) { ?>
    - Pay with Saved Card + Pay with Saved Card
    @@ -277,7 +277,8 @@ if (isset($_GET['invoice_id'])) { data-modal-url="modals/invoice/invoice_copy.php?id="> Copy - + Recurring
    @@ -456,10 +457,10 @@ if (isset($_GET['invoice_id'])) { - + - +
    - +
    diff --git a/agent/modals/asset/asset_bulk_add_ticket.php b/agent/modals/asset/asset_bulk_add_ticket.php index 876b725d..a1b4595a 100644 --- a/agent/modals/asset/asset_bulk_add_ticket.php +++ b/agent/modals/asset/asset_bulk_add_ticket.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []); -$count = count($selected_ids); +$count = count($asset_ids); ob_start(); @@ -19,7 +19,7 @@ ob_start();
    - +
    @@ -38,7 +38,7 @@ ob_start();
    - +
    diff --git a/agent/modals/asset/asset_bulk_assign_contact.php b/agent/modals/asset/asset_bulk_assign_contact.php index e292ae62..c9a82560 100644 --- a/agent/modals/asset/asset_bulk_assign_contact.php +++ b/agent/modals/asset/asset_bulk_assign_contact.php @@ -3,9 +3,9 @@ require_once '../../../includes/modal_header.php'; $client_id = intval($_GET['client_id']); -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []); -$count = count($selected_ids); +$count = count($asset_ids); ob_start(); @@ -20,7 +20,7 @@ ob_start(); - +
    diff --git a/agent/modals/asset/asset_bulk_assign_location.php b/agent/modals/asset/asset_bulk_assign_location.php index 114b462b..d7d96839 100644 --- a/agent/modals/asset/asset_bulk_assign_location.php +++ b/agent/modals/asset/asset_bulk_assign_location.php @@ -3,9 +3,9 @@ require_once '../../../includes/modal_header.php'; $client_id = intval($_GET['client_id']); -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []); -$count = count($selected_ids); +$count = count($asset_ids); ob_start(); @@ -20,7 +20,7 @@ ob_start(); - +
    diff --git a/agent/modals/asset/asset_bulk_assign_physical_location.php b/agent/modals/asset/asset_bulk_assign_physical_location.php index feb87400..42a649a4 100644 --- a/agent/modals/asset/asset_bulk_assign_physical_location.php +++ b/agent/modals/asset/asset_bulk_assign_physical_location.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []); -$count = count($selected_ids); +$count = count($asset_ids); ob_start(); @@ -18,7 +18,7 @@ ob_start();
    - +
    diff --git a/agent/modals/asset/asset_bulk_assign_tags.php b/agent/modals/asset/asset_bulk_assign_tags.php index e5bd8341..8c81ef98 100644 --- a/agent/modals/asset/asset_bulk_assign_tags.php +++ b/agent/modals/asset/asset_bulk_assign_tags.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []); -$count = count($selected_ids); +$count = count($asset_ids); ob_start(); @@ -18,7 +18,7 @@ ob_start();
    - +
    diff --git a/agent/modals/asset/asset_bulk_edit_status.php b/agent/modals/asset/asset_bulk_edit_status.php index c80ff202..2e6407f6 100644 --- a/agent/modals/asset/asset_bulk_edit_status.php +++ b/agent/modals/asset/asset_bulk_edit_status.php @@ -2,9 +2,9 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); +$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []); -$count = count($selected_ids); +$count = count($asset_ids); ob_start(); @@ -19,7 +19,7 @@ ob_start(); - +
    diff --git a/agent/modals/asset/asset_bulk_transfer_client.php b/agent/modals/asset/asset_bulk_transfer_client.php index 33c93a82..f22c9d41 100644 --- a/agent/modals/asset/asset_bulk_transfer_client.php +++ b/agent/modals/asset/asset_bulk_transfer_client.php @@ -2,8 +2,8 @@ require_once '../../../includes/modal_header.php'; -$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []); -$count = count($selected_ids); +$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []); +$count = count($asset_ids); $client_id = intval($_GET['client_id'] ?? 0); if ($client_id) { @@ -25,7 +25,7 @@ ob_start(); - +
    @@ -39,7 +39,7 @@ ob_start(); -
    -
    -
    -
    Export Assets to CSV
    - -
    - - - - - + +require_once '../../../includes/modal_header.php'; -
    -
    - - -
    - -
    -
    +$client_id = intval($_GET['client_id'] ?? 0); + +ob_start(); + +?> + +
    +
    Export Assets to CSV
    +
    +
    + + + +
    + +
    +
    + + +
    +
    + + -
    -
    -
    -
    Import Assets
    - -
    -
    - - - - - -
    -

    Format csv file with headings & data:
    Name, Description, Type, Make, Model, Serial, OS, Purchase Date, Assigned To, Location, Physical Location, Notes

    -
    -
    - -
    -
    - - Note: Purchase date must be in the format YYYY-MM-DD. Spreadsheet tools may automatically reformat dates. -
    -
    - -
    -
    -
    -
    + + +
    +
    Import Assets
    +
    +
    + + + +
    +

    Format csv file with headings & data:
    Name, Description, Type, Make, Model, Serial, OS, Purchase Date, Assigned To, Location, Physical Location, Notes

    +
    +
    + +
    +
    + + Note: Purchase date must be in the format YYYY-MM-DD. Spreadsheet tools may automatically reformat dates. +
    +
    + +
    +
    + +
    -
    diff --git a/agent/modals/asset/asset_interface_bulk_edit_network.php b/agent/modals/asset/asset_interface_bulk_edit_network.php index f041a6f6..5d9ca5d7 100644 --- a/agent/modals/asset/asset_interface_bulk_edit_network.php +++ b/agent/modals/asset/asset_interface_bulk_edit_network.php @@ -1,51 +1,65 @@ -