Merge pull request #1250 from itflow-org/develop

Develop to Master for 25.12 release

.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

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 `<img>` tags into actual image files stored under `/uploads/<module>/<id>/` 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

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) {
@@ -765,4 +766,3 @@ $mysqli->close();
 <?php
 
 require_once "../includes/footer.php";
-

admin/includes/side_nav.php

@@ -18,37 +18,27 @@
                 <li class="nav-item">
                     <a href="/admin/users.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "users.php") {echo "active";} ?>">
                         <i class="nav-icon fas fa-users"></i>
-                        <p>
+                        <p>Users</p>
-                            Users
-                            <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/user/user_add.php"></span>
-                        </p>
                     </a>
                 </li>
                 <li class="nav-item">
                     <a href="/admin/roles.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "roles.php") {echo "active";} ?>">
                         <i class="nav-icon fas fa-user-shield"></i>
-                        <p>
+                        <p>Roles</p>
-                            <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/role/role_add.php"></span>
-                            Roles
-                        </p>
                     </a>
                 </li>
+                <!-- 2025-12-05 JQ - Hide Permission Modules currently just shows modules
                 <li class="nav-item">
                     <a href="/admin/modules.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "modules.php") {echo "active";} ?>">
                         <i class="nav-icon fas fa-puzzle-piece"></i>
-                        <p>
+                        <p>Modules</p>
-                            Modules
-                            <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/module/module_add.php"></span>
-                        </p>
                     </a>
                 </li>
+                -->
                 <li class="nav-item">
                     <a href="/admin/api_keys.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "api_keys.php") {echo "active";} ?>">
                         <i class="nav-icon fas fa-key"></i>
-                        <p>
+                        <p>API Keys</p>
-                            <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/api/api_key_add.php"></span>
-                            API Keys
-                        </p>
                     </a>
                 </li>
                 <li class="nav-header">TAGS & CATEGORIES</li>
@@ -56,38 +46,26 @@
                 <li class="nav-item">
                     <a href="/admin/tag.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'tag.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-tags"></i>
-                        <p>
+                        <p>Tags</p>
-                            <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/tag/tag_add.php"></span>
-                            Tags
-                        </p>
                     </a>
                 </li>
                 <li class="nav-item">
                     <a href="/admin/category.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'category.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-list-ul"></i>
-                        <p>
+                        <p>Categories</p>
-                            <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/category/category_add.php"></span>
-                            Categories
-                        </p>
                     </a>
                 </li>
                 <?php if ($config_module_enable_accounting) { ?>
                     <li class="nav-item">
                         <a href="/admin/tax.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'tax.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-balance-scale"></i>
-                            <p>
+                            <p>Taxes</p>
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/tax/tax_add.php"></span>
-                                Taxes
-                            </p>
                         </a>
                     </li>
                     <li class="nav-item">
                         <a href="/admin/payment_method.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'payment_method.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-hand-holding-usd"></i>
-                            <p>
+                            <p>Payment Methods</p>
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/payment_method/payment_method_add.php"></span>
-                                Payment Methods
-                            </p>
                         </a>
                     </li>
                     <li class="nav-item">
@@ -120,20 +98,14 @@
                     <li class="nav-item">
                         <a href="/admin/ticket_status.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ticket_status.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-info-circle"></i>
-                            <p>
+                            <p>Ticket Statuses</p>
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/ticket_status/ticket_status_add.php"></span>
-                                Ticket Statuses
-                            </p>
                         </a>
                     </li>
                 <?php } ?>
                 <li class="nav-item">
                     <a href="/admin/custom_link.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'custom_link.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-external-link-alt"></i>
-                        <p>
+                        <p>Custom Links</p>
-                            <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/custom_link/custom_link_add.php"></span>
-                            Custom Links
-                        </p>
                     </a>
                 </li>
 
@@ -154,46 +126,31 @@
                     <li class="nav-item">
                         <a href="/admin/project_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['project_template.php', 'project_template_details.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-project-diagram"></i>
-                            <p>
+                            <p>Project Templates</p>
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/project_template/project_template_add.php"></span>
-                                Project Templates
-                            </p>
                         </a>
                     </li>
                     <li class="nav-item">
                         <a href="/admin/ticket_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['ticket_template.php', 'ticket_template_details.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
-                            <p>
+                            <p>Ticket Templates</p>
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/ticket_template/ticket_template_add.php" data-modal-size="lg"></span>
-                                Ticket Templates
-                            </p>
                         </a>
                     </li>
                     <li class="nav-item">
                         <a href="/admin/vendor_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'vendor_template.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-building"></i>
-                            <p>
+                            <p>Vendor Templates</p>
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/vendor_template/vendor_template_add.php"></span>
-                                Vendor Templates
-                            </p>
                         </a>
                     </li>
                     <li class="nav-item">
                         <a href="/admin/software_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'software_template.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-rocket"></i>
-                            <p>
+                            <p>License Templates</p>
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/software_template/software_template_add.php"></span>
-                                License Templates
-                            </p>
                         </a>
                     </li>
                     <li class="nav-item">
                         <a href="/admin/document_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['document_template.php', 'document_template_details.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-file"></i>
-                            <p>
+                            <p>Document Templates</p>
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/document_template/document_template_add.php" data-modal-size="lg"></span>
-                                Document Templates
-                            </p>
                         </a>
                     </li>
                 <?php } ?>

admin/modals/payment_provider/payment_provider_add.php

@@ -59,7 +59,7 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
                 </div>
-                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="threshold" placeholder="1000.00">
+                <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="threshold" placeholder="1000.00">
             </div>
             <small class="form-text text-muted">Will not show as an option at Checkout if invoice amount is above this number, 0 disables the threshold check.</small>
         </div>
@@ -79,7 +79,7 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-percent"></i></span>
                 </div>
-                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="percentage_fee" placeholder="Enter Percentage">
+                <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="percentage_fee" placeholder="Enter Percentage">
             </div>
             <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
         </div>
@@ -90,7 +90,7 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
                 </div>
-                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,3}" name="flat_fee" placeholder="0.030">
+                <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,3}" name="flat_fee" placeholder="0.030">
             </div>
             <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
         </div>

admin/modals/payment_provider/payment_provider_edit.php

@@ -58,7 +58,7 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
                 </div>
-                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="threshold" placeholder="1000.00" value="<?php echo $threshold; ?>">
+                <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="threshold" placeholder="1000.00" value="<?php echo $threshold; ?>">
             </div>
             <small class="form-text text-muted">Will not show as an option at Checkout if above this number</small>
         </div>
@@ -79,7 +79,7 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-percent"></i></span>
                 </div>
-                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="percentage_fee" value="<?php echo $percent_fee; ?>" placeholder="Enter Percentage">
+                <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="percentage_fee" value="<?php echo $percent_fee; ?>" placeholder="Enter Percentage">
             </div>
             <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
         </div>
@@ -90,7 +90,7 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
                 </div>
-                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,3}" name="flat_fee" value="<?php echo $flat_fee; ?>" placeholder="0.030">
+                <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,3}" name="flat_fee" value="<?php echo $flat_fee; ?>" placeholder="0.030">
             </div>
             <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
         </div>

admin/modals/user/user_export.php

@@ -1,6 +1,11 @@
-<div class="modal" id="exportUserModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Users to CSV</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -16,6 +21,6 @@
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

admin/post/document_template.php

@@ -8,12 +8,24 @@ if (isset($_POST['add_document_template'])) {
 
     $name = sanitizeInput($_POST['name']);
     $description = sanitizeInput($_POST['description']);
-    $content = mysqli_real_escape_string($mysqli,$_POST['content']);
 
-    mysqli_query($mysqli,"INSERT INTO document_templates SET document_template_name = '$name', document_template_description = '$description', document_template_content = '$content', document_template_created_by = $session_user_id");
+    mysqli_query($mysqli,"INSERT INTO document_templates SET document_template_name = '$name', document_template_description = '$description', document_template_content = '', document_template_created_by = $session_user_id");
     
     $document_template_id = mysqli_insert_id($mysqli);
 
+    $processed_content = mysqli_escape_string(
+        $mysqli,
+        saveBase64Images(
+            $_POST['content'],
+            $_SERVER['DOCUMENT_ROOT'] . "/uploads/document_templates/",
+            "uploads/document_templates/",
+            $document_template_id
+        )
+    );
+
+    // Document template update content
+    mysqli_query($mysqli,"UPDATE document_templates SET document_template_content = '$processed_content' WHERE document_template_id = $document_template_id");
+
     logAction("Document Template", "Create", "$session_name created document template $name", 0, $document_template_id);
 
     flash_alert("Document template <strong>$name</strong> created");
@@ -27,10 +39,25 @@ if (isset($_POST['edit_document_template'])) {
     $document_template_id = intval($_POST['document_template_id']);
     $name = sanitizeInput($_POST['name']);
     $description = sanitizeInput($_POST['description']);
-    $content = mysqli_real_escape_string($mysqli,$_POST['content']);
+
+    $processed_content = saveBase64Images(
+        $_POST['content'],
+        $_SERVER['DOCUMENT_ROOT'] . "/uploads/document_templates/",
+        "uploads/document_templates/",
+        $document_template_id
+    );
+
+    $processed_content_escaped = mysqli_escape_string($mysqli, $processed_content);
+
+    // CLEAN UP unused images
+    cleanupUnusedImages(
+        $processed_content,
+        $_SERVER['DOCUMENT_ROOT'] . "/uploads/document_templates/" . $document_template_id,
+        "/uploads/document_templates/" . $document_template_id
+    );
 
     // Document edit query
-    mysqli_query($mysqli,"UPDATE document_templates SET document_template_name = '$name', document_template_description = '$description', document_template_content = '$content', document_template_updated_by = $session_user_id WHERE document_template_id = $document_template_id");
+    mysqli_query($mysqli,"UPDATE document_templates SET document_template_name = '$name', document_template_description = '$description', document_template_content = '$processed_content_escaped', document_template_updated_by = $session_user_id WHERE document_template_id = $document_template_id");
 
     logAction("Document Template", "Edit", "$session_name edited document template $name", 0, $document_template_id);
 
@@ -48,6 +75,9 @@ if (isset($_GET['delete_document_template'])) {
 
     mysqli_query($mysqli,"DELETE FROM document_templates WHERE document_template_id = $document_template_id");
 
+    // Delete uploads/document_templates/$document_template_id if exists
+    removeDirectory($_SERVER['DOCUMENT_ROOT'] . "/uploads/document_templates/" . $document_template_id);
+
     logAction("Document Template", "Delete", "$session_name deleted document template $document_template_name");
 
     flash_alert("Document Template <strong>$document_template_name</strong> deleted", 'error');

admin/post/payment_method.php

@@ -10,10 +10,17 @@ if (isset($_POST['add_payment_method'])) {
 
     validateCSRFToken($_POST['csrf_token']);
 
-    $name = sanitizeInput($_POST['name']);
+    $name = cleanInput($_POST['name']);
-    $description = sanitizeInput($_POST['description']);
+    $description = cleanInput($_POST['description']);
 
-    mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = '$name', payment_method_description = '$description'");
+    $query = mysqli_prepare(
+        $mysqli, "INSERT INTO payment_methods
+        SET payment_method_name = ?, payment_method_description = ?"
+    );
+
+    mysqli_stmt_bind_param($query, "ss", $name, $description);
+    
+    mysqli_stmt_execute($query);
 
     logAction("Payment Method", "Create", "$session_name created Payment Method $name");
 
@@ -28,10 +35,19 @@ if (isset($_POST['edit_payment_method'])) {
     validateCSRFToken($_POST['csrf_token']);
     
     $payment_method_id = intval($_POST['payment_method_id']);
-    $name = sanitizeInput($_POST['name']);
+    $name = cleanInput($_POST['name']);
-    $description = sanitizeInput($_POST['description']);
+    $description = cleanInput($_POST['description']);
 
-    mysqli_query($mysqli,"UPDATE payment_methods SET payment_method_name = '$name', payment_method_description = '$description' WHERE payment_method_id = $payment_method_id");
+    $query = mysqli_prepare(
+        $mysqli,
+        "UPDATE payment_methods 
+         SET payment_method_name = ?, payment_method_description = ? 
+         WHERE payment_method_id = ?"
+    );
+
+    mysqli_stmt_bind_param($query, "ssi", $name, $description, $payment_method_id);
+
+    mysqli_stmt_execute($query);
 
     logAction("Payment Method", "Edit", "$session_name edited Payment Method $name");
 

admin/settings_default.php

@@ -214,7 +214,7 @@ require_once "includes/inc_all_admin.php";
                     <div class="input-group-prepend">
                         <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
                     </div>
-                    <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="hourly_rate" value="<?php echo number_format($config_default_hourly_rate, 2, '.', ''); ?>" placeholder="0.00" required>
+                    <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="hourly_rate" value="<?php echo number_format($config_default_hourly_rate, 2, '.', ''); ?>" placeholder="0.00" required>
                 </div>
             </div>
 

admin/users.php

@@ -33,9 +33,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <div class="dropdown-menu">
                     <!--<a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/user/user_invite.php"><i class="fas fa-paper-plane mr-2"></i>Invite User</a>-->
                     <?php if ($num_rows[0] > 1) { ?>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportUserModal"><i class="fa fa-fw fa-download mr-2"></i>Export</a>
+                        <a class="dropdown-item text-dark ajax-modal" href="#"
+                            data-modal-url="modals/user/user_export.php">
+                            <i class="fa fa-fw fa-download mr-2"></i>Export
+                        </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-danger ajax-modal" href="#" data-modal-url="modals/user/user_all_reset_password.php" data-modal-size="lg"><i class="fas fa-skull-crossbones mr-2"></i>IR</a>
+                        <a class="dropdown-item text-danger ajax-modal" href="#"
+                            data-modal-url="modals/user/user_all_reset_password.php"
+                            data-modal-size="lg">
+                            <i class="fas fa-skull-crossbones mr-2"></i>IR
+                        </a>
                     <?php } ?>
                 </div>
             </div>
@@ -235,5 +242,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-require_once "modals/user/user_export.php";
 require_once "../includes/footer.php";

agent/ajax.php

@@ -46,7 +46,7 @@ if (isset($_GET['certificate_fetch_parse_json_details'])) {
 if (isset($_GET['merge_ticket_get_json_details'])) {
     enforceUserPermission('module_support');
 
-    $merge_into_ticket_number = intval($_GET['merge_into_ticket_number']);
+    $merge_into_ticket_number = intval(preg_replace('/[^0-9]/', '', $_GET['merge_into_ticket_number']));
 
     $sql = mysqli_query($mysqli, "SELECT ticket_id, ticket_number, ticket_prefix, ticket_subject, ticket_priority, ticket_status, ticket_status_name, client_name, contact_name FROM tickets
         LEFT JOIN clients ON ticket_client_id = client_id 

agent/asset_details.php

@@ -469,11 +469,15 @@ if (isset($_GET['asset_id'])) {
                                         <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
                                     </button>
                                     <div class="dropdown-menu">
-                                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#bulkAssignNetworkModal">
+                                        <a class="dropdown-item text-dark ajax-modal" href="#"
+                                            data-modal-url="modals/asset/asset_interface_bulk_edit_network.php?client_id=<?= $client_id ?>"
+                                            data-bulk="true">
                                             <i class="fas fa-fw fa-network-wired mr-2"></i>Assign Network
                                         </a>
                                         <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#bulkSetInterfaceTypeModal">
+                                        <a class="dropdown-item text-dark ajax-modal" href="#"
+                                            data-modal-url="modals/asset/asset_interface_bulk_edit_type.php?client_id=<?= $client_id ?>"
+                                            data-bulk="true">
                                             <i class="fas fa-fw fa-ethernet mr-2"></i>Set Type
                                         </a>
                                         <div class="dropdown-divider"></div>
@@ -597,8 +601,6 @@ if (isset($_GET['asset_id'])) {
                                     </tbody>
                                 </table>
                             </div>
-                            <?php require_once "modals/asset/asset_interface_bulk_edit_type.php"; ?>
-                            <?php require_once "modals/asset/asset_interface_bulk_edit_network.php"; ?>
                         </form>
                     </div>
                 </div>

agent/assets.php

@@ -133,9 +133,6 @@ $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
@@ -203,14 +200,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
                     <?php if ($client_url) { ?>
-                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importAssetModal">
+                    <a class="dropdown-item text-dark ajax-modal" href="#"
+                        data-modal-url="modals/asset/asset_import.php?<?= $client_url ?>">
                         <i class="fa fa-fw fa-upload mr-2"></i>Import
                     </a>
                     <div class="dropdown-divider"></div>
                     <?php } ?>
                     <?php if ($num_rows[0] > 0) { ?>
 
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportAssetModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#"
+                            data-modal-url="modals/asset/asset_export.php?<?= $client_url ?>">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     <?php } ?>
@@ -792,8 +791,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/asset/asset_export.php";
-if ($client_url) {
-    require_once "modals/asset/asset_import.php";
-}
 require_once "../includes/footer.php";

agent/certificates.php

@@ -68,7 +68,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <?php if ($num_rows[0] > 0) { ?>
                     <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                     <div class="dropdown-menu">
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportCertificateModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#"\
+                            data-modal-url="modals/certificate/certificate_export.php?<?= $client_url ?>">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     </div>
@@ -299,15 +300,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
             </form>
         </div>
-        <?php require_once "../includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php"; ?>
- ?>
     </div>
 </div>
 
-<?php
-require_once "modals/certificate/certificate_export.php";
-?>
-
 <script src="../js/bulk_actions.js"></script>
 
 <?php require_once "../includes/footer.php";

agent/clients.php

@@ -92,11 +92,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </button>
                     <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                     <div class="dropdown-menu">
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importClientModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#"
+                            data-modal-url="modals/client/client_import.php">
                             <i class="fa fa-fw fa-upload mr-2"></i>Import
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportClientModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#"
+                            data-modal-url="modals/client/client_export.php">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     </div>
@@ -623,6 +625,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/client/client_import.php";
-require_once "modals/client/client_export.php";
 require_once "../includes/footer.php";

agent/contacts.php

@@ -98,12 +98,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     <?php if ($client_url) { ?>
 <!--                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#contactInviteModal"><i class="fas fa-fw fa-paper-plane mr-2"></i>Invite</a>-->
 <!--                    <div class="dropdown-divider"></div>-->
-                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importContactModal">
+                    <a class="dropdown-item text-dark ajax-modal" href="#"
+                        data-modal-url="modals/contact/contact_import.php?<?= $client_url ?>">
                         <i class="fa fa-fw fa-upload mr-2"></i>Import
                     </a>
                     <div class="dropdown-divider"></div>
                     <?php } ?>
-                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportContactModal">
+                    <a class="dropdown-item text-dark ajax-modal" href="#"
+                        data-modal-url="modals/contact/contact_export.php?<?= $client_url ?>">
                         <i class="fa fa-fw fa-download mr-2"></i>Export
                     </a>
                 </div>
@@ -566,10 +568,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-
-require_once "modals/contact/contact_export.php";
-if ($client_url) {
-    //require_once "modals/contact/contact_invite.php";
-    require_once "modals/contact/contact_import.php";
-}
 require_once "../includes/footer.php";

agent/credentials.php

@@ -112,13 +112,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
                     <?php if ($client_url) { ?>
-                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importCredentialModal">
+                    <a class="dropdown-item text-dark ajax-modal" href="#"
+                        data-modal-url="modals/credential/credential_import.php?<?= $client_url ?>">
                         <i class="fa fa-fw fa-upload mr-2"></i>Import
                     </a>
                     <div class="dropdown-divider"></div>
                     <?php } ?>
                     <?php if ($num_rows[0] > 0) { ?>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportCredentialModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#"
+                            data-modal-url="modals/credential/credential_export.php?<?= $client_url ?>">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     <?php } ?>
@@ -528,15 +530,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <!-- Include script to get TOTP code via the login ID -->
 <script src="js/credential_show_otp_via_id.js"></script>
-<!-- Include script to generate readable passwords for login entries -->
-<script src="js/generate_password.js"></script>
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-
-require_once "modals/credential/credential_export.php";
 if ($client_url) {
-    require_once "modals/credential/credential_import.php";
     require_once "modals/share_modal.php";
 }
 require_once "../includes/footer.php";

agent/document_details.php

@@ -51,10 +51,10 @@ $page_title = $row['document_name'];
 
 <ol class="breadcrumb d-print-none">
     <li class="breadcrumb-item">
-        <a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
+        <a href="client_overview.php?client_id=<?= $client_id ?>"><?= $client_name ?></a>
     </li>
     <li class="breadcrumb-item">
-        <a href="documents.php?client_id=<?php echo $client_id; ?>">Documents</a>
+        <a href="files.php?client_id=<?= $client_id ?>">Files</a>
     </li>
     <?php
     // Build the full folder path
@@ -84,7 +84,7 @@ $page_title = $row['document_name'];
         $bread_crumb_folder_name = $folder['folder_name']; // Sanitized before put in array
         ?>
         <li class="breadcrumb-item">
-            <a href="documents.php?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $bread_crumb_folder_id; ?>">
+            <a href="files.php?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $bread_crumb_folder_id; ?>">
                 <i class="fas fa-fw fa-folder-open mr-2"></i><?php echo $bread_crumb_folder_name; ?>
             </a>
         </li>
@@ -104,18 +104,31 @@ $page_title = $row['document_name'];
     <div class="col-md-9">
         <div class="card">
             <div class="card-header bg-dark">
-
-                <h3><?php echo $document_name; ?> <?php if (!empty($document_description)) { ?><span class="h6 text-muted">(<?php echo $document_description; ?>)</span><?php } ?></h3>
-
                 <div class="row">
-                    <div class="col"><strong>Date:</strong> <?php echo date('Y-m-d', strtotime($document_created_at)); ?></div>
+                    <div class="col">
-                    <?php if(!empty($document_created_by_name)){ ?>
+                        <div class="h4 mb-0"><?= $document_name ?></div>
-                    <div class="col"><strong>Prepared By:</strong> <?php echo $document_created_by_name; ?></div>
+                        <?php if ($document_description) { ?>
+                        <div class="text-light"><?= $document_description ?></div>
+                        <?php } ?>
+                    </div>
+                    <div class="col">
+                        <div class="float-right">
+                            <div>
+                                Date:
+                                <strong><?= date('Y-m-d', strtotime($document_created_at)); ?></strong>
+                            </div>
+                            <?php if($document_created_by_name) { ?>
+                            <div>
+                                Prepared By:
+                                <strong><?= $document_created_by_name ?></strong>
+                            </div>
                             <?php } ?>
                         </div>
                     </div>
+                </div>
+            </div>
             <div class="card-body prettyContent">
-                <?php echo $document_content; ?>
+                <?= $document_content ?>
                 <hr>
                 <h4>Documentation Revision History</h4>
 
@@ -151,11 +164,11 @@ $page_title = $row['document_name'];
 
                         ?>
                         <tr>
-                            <td><?php echo $document_version_count; ?></td>
+                            <td><?= $document_version_count ?></td>
-                            <td><?php echo $document_version_created_date; ?></td>
+                            <td><?= $document_version_created_date ?></td>
-                            <td><?php echo $document_version_name; ?></td>
+                            <td><?= $document_version_name ?></td>
-                            <td><?php echo $document_version_description_display; ?></td>
+                            <td><?= $document_version_description_display ?></td>
-                            <td><?php echo $document_version_author; ?></td>
+                            <td><?= $document_version_author ?></td>
                         </tr>
                         <?php
                         $document_version_count++; // Increment the counter
@@ -176,10 +189,10 @@ $page_title = $row['document_name'];
                     <i class="fas fa-fw fa-edit" title="Edit"></i>
                 </button>
                 <button type="button" class="btn btn-secondary mr-1" data-toggle="modal" data-target="#shareModal"
-                    onclick="populateShareModal(<?php echo "$client_id, 'Document', $document_id"; ?>)">
+                    onclick="populateShareModal(<?= "$client_id, 'Document', $document_id"; ?>)">
                     <i class="fas fa-fw fa-share" title="Share"></i>
                 </button>
-                <a class="btn btn-success mr-1" href="post.php?export_document=<?php echo $document_id; ?>"><i class='fas fa-fw fa-file-pdf' title="PDF Export"></i></a>
+                <a class="btn btn-success mr-1" href="post.php?export_document=<?= $document_id ?>"><i class='fas fa-fw fa-file-pdf' title="PDF Export"></i></a>
                 <button type="button" class="btn btn-secondary mr-4" onclick="window.print();"><i class="fas fa-fw fa-print" title="Print"></i></button>
                 <a class="btn btn-warning mr-1 confirm-link" href="post.php?archive_document=<?= $document_id ?>" title="Archive"><i class='fas fa-fw fa-archive'></i></a>
                 <a class="btn btn-danger confirm-link" href="post.php?delete_document=<?= $document_id ?>&from=document_details" title="Delete"><i class='fas fa-fw fa-trash-alt'></i></a>
@@ -189,7 +202,8 @@ $page_title = $row['document_name'];
             <h5 class="mb-3"><i class="fas fa-tags mr-2"></i>Related Items</h5>
             <h6>
                 <i class="fas fa-fw fa-paperclip text-secondary mr-2"></i>Files
-                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkFileToDocumentModal">
+                <button type="button" class="btn btn-link btn-sm ajax-modal"
+                    data-modal-url="modals/document/document_link_file.php?document_id=<?= $document_id ?>">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
@@ -211,9 +225,9 @@ $page_title = $row['document_name'];
 
                 ?>
                 <div class="ml-2">
-                    <a href="files.php?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $folder_id; ?>&q=<?php echo $file_name; ?>" target="_blank"><?php echo $file_name; ?></a>
+                    <a href="files.php?client_id=<?= $client_id ?>&folder_id=<?= $folder_id ?>&q=<?= $file_name ?>" target="_blank"><?= $file_name ?></a>
-                    <a class="confirm-link" href="post.php?unlink_file_from_document&file_id=<?php echo $file_id; ?>&document_id=<?php echo $document_id; ?>">
+                    <a class="confirm-link" href="post.php?unlink_file_from_document&file_id=<?= $file_id ?>&document_id=<?= $document_id ?>">
-                        <i class="fas fa-fw fa-trash-alt text-secondary float-right"></i>
+                        <i class="fas fa-fw fa-unlink text-secondary float-right" title="Unlink File"></i>
                     </a>
                 </div>
                 <?php
@@ -221,7 +235,8 @@ $page_title = $row['document_name'];
                 ?>
             <h6>
                 <i class="fas fa-fw fa-users text-secondary mt-3 mr-2"></i>Contacts
-                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkContactToDocumentModal">
+                <button type="button" class="btn btn-link btn-sm ajax-modal"
+                    data-modal-url="modals/document/document_link_contact.php?document_id=<?= $document_id ?>">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
@@ -247,7 +262,7 @@ $page_title = $row['document_name'];
                         data-modal-url="modals/contact/contact_details.php?id=<?= $contact_id ?>">
                         <?php echo $contact_name; ?></a>
                     <a class="confirm-link float-right" href="post.php?unlink_contact_from_document&contact_id=<?php echo $contact_id; ?>&document_id=<?php echo $document_id; ?>">
-                        <i class="fas fa-fw fa-trash-alt text-secondary"></i>
+                        <i class="fas fa-fw fa-unlink text-secondary" title="Unlink Contact"></i>
                     </a>
                 </div>
                 <?php
@@ -255,7 +270,7 @@ $page_title = $row['document_name'];
                 ?>
             <h6>
                 <i class="fas fa-fw fa-laptop text-secondary mr-2 mt-3"></i>Assets
-                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkAssetToDocumentModal">
+                <button type="button" class="btn btn-link btn-sm ajax-modal" data-modal-url="modals/document/document_link_asset.php?document_id=<?= $document_id ?>">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
@@ -282,7 +297,7 @@ $page_title = $row['document_name'];
                         <?php echo $asset_name; ?>
                     </a>
                     <a class="confirm-link float-right" href="post.php?unlink_asset_from_document&asset_id=<?php echo $asset_id; ?>&document_id=<?php echo $document_id; ?>">
-                        <i class="fas fa-fw fa-trash-alt text-secondary"></i>
+                        <i class="fas fa-fw fa-unlink text-secondary" title="Unlink Asset"></i>
                     </a>
                 </div>
             <?php
@@ -290,7 +305,8 @@ $page_title = $row['document_name'];
             ?>
             <h6>
                 <i class="fas fa-fw fa-cube text-secondary mr-2 mt-3"></i>Licenses
-                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkSoftwareToDocumentModal">
+                <button type="button" class="btn btn-link btn-sm ajax-modal"
+                    data-modal-url="modals/document/document_link_software.php?document_id=<?= $document_id ?>">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
@@ -313,7 +329,7 @@ $page_title = $row['document_name'];
                 <div class="ml-2">
                     <a href="software.php?client_id=<?php echo $client_id; ?>&q=<?php echo $software_name; ?>" target="_blank"><?php echo $software_name; ?></a>
                     <a class="confirm-link float-right" href="post.php?unlink_software_from_document&software_id=<?php echo $software_id; ?>&document_id=<?php echo $document_id; ?>">
-                        <i class="fas fa-fw fa-trash-alt text-secondary"></i>
+                        <i class="fas fa-fw fa-unlink text-secondary" title="Unlink License"></i>
                     </a>
                 </div>
                 <?php
@@ -321,7 +337,8 @@ $page_title = $row['document_name'];
                 ?>
             <h6>
                 <i class="fas fa-fw fa-building text-secondary mr-2 mt-3"></i>Vendors
-                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkVendorToDocumentModal">
+                <button type="button" class="btn btn-link btn-sm ajax-modal"
+                    data-modal-url="modals/document/document_link_vendor.php?document_id=<?= $document_id ?>">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
@@ -346,7 +363,7 @@ $page_title = $row['document_name'];
                         <?php echo $vendor_name; ?>
                     </a>
                     <a class="confirm-link float-right" href="post.php?unlink_vendor_from_document&vendor_id=<?php echo $vendor_id; ?>&document_id=<?php echo $document_id; ?>">
-                        <i class="fas fa-fw fa-trash-alt text-secondary"></i>
+                        <i class="fas fa-fw fa-unlink text-secondary" title="Unlink Vendor"></i>
                     </a>
                 </div>
             <?php
@@ -359,7 +376,8 @@ $page_title = $row['document_name'];
                 <h6><i class="fas fa-handshake mr-2"></i>Portal Collaboration</h6>
                 <div class="mt-1">
                     <i class="fa fa-fw fa-eye<?php if (!$document_client_visible) { echo '-slash'; } ?> text-secondary mr-2"></i>Document is
-                    <a href="#" data-toggle="modal" data-target="#editDocumentClientVisibileModal">
+                    <a class="ajax-modal" href="#"
+                        data-modal-url="modals/document/document_edit_visibility.php?document_id=<?= $document_id ?>">
                         <?php
                         if ($document_client_visible) {
                             echo "<span class='text-bold text-dark'>visible</span>";
@@ -414,11 +432,5 @@ $page_title = $row['document_name'];
 
 <?php
 
-require_once "modals/document/document_link_file.php";
-require_once "modals/document/document_link_contact.php";
-require_once "modals/document/document_link_asset.php";
-require_once "modals/document/document_link_software.php";
-require_once "modals/document/document_link_vendor.php";
-require_once "modals/document/document_edit_visibility.php";
 require_once "modals/share_modal.php";
 require_once "../includes/footer.php";

agent/documents.php

@@ -1,482 +0,0 @@
-<?php
-
-// Default Column Sortby Filter
-$sort = "document_name";
-$order = "ASC";
-
-require_once "includes/inc_all_client.php";
-
-// Perms
-enforceUserPermission('module_support');
-
-// Folder
-if (!empty($_GET['folder_id'])) {
-    $folder = intval($_GET['folder_id']);
-} else {
-    $folder = 0;
-}
-
-// Search query SQL snippet
-if (!empty($q)) {
-    $query_snippet = "AND (MATCH(document_content_raw) AGAINST ('$q') OR document_name LIKE '%$q%')";
-} else {
-    $query_snippet = ""; // empty
-}
-
-//Rebuild URL
-$url_query_strings_sort = http_build_query($get_copy);
-
-// Folder ID
-$get_folder_id = 0;
-if (!empty($_GET['folder_id'])) {
-    $get_folder_id = intval($_GET['folder_id']);
-}
-
-// Set Folder Location Var used when creating folders
-$folder_location = 0;
-
-if ($get_folder_id == 0 && isset($_GET["q"])) {
-    $sql = mysqli_query(
-        $mysqli,
-        "SELECT SQL_CALC_FOUND_ROWS * FROM documents
-        LEFT JOIN users ON document_created_by = user_id
-        WHERE document_client_id = $client_id
-        AND document_archived_at IS NULL
-        $query_snippet
-        ORDER BY $sort $order LIMIT $record_from, $record_to"
-    );
-}else{
-    $sql = mysqli_query(
-        $mysqli,
-        "SELECT SQL_CALC_FOUND_ROWS * FROM documents
-        LEFT JOIN users ON document_created_by = user_id
-        WHERE document_client_id = $client_id
-        AND document_folder_id = $folder
-        AND document_archived_at IS NULL
-        $query_snippet
-        ORDER BY $sort $order LIMIT $record_from, $record_to"
-    );
-}
-
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-// Breadcrumbs
-// Build the full folder path
-$folder_id = $get_folder_id;
-$folder_path = array();
-
-while ($folder_id > 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;
-    }
-}
-
-?>
-
-<div class="card card-dark">
-    <div class="card-header py-2">
-        <h3 class="card-title mt-2">
-            <i class="fa fa-fw fa-folder mr-2"></i>Documents
-        </h3>
-        <div class="card-tools">
-
-            <div class="btn-group">
-                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/document/document_add.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>" data-modal-size="lg">
-                    <i class="fas fa-plus mr-2"></i>New Document
-                </button>
-                <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
-                <div class="dropdown-menu">
-                    <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/folder/folder_add.php?client_id=<?= $client_id ?>&folder_location=0&current_folder_id=<?= $get_folder_id ?>">
-                        <i class="fa fa-fw fa-folder-plus mr-2"></i>New Folder
-                    </a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addDocumentFromTemplateModal">From Template</a>
-                </div>
-            </div>
-
-        </div>
-
-    </div>
-
-    <div class="card-body">
-        <form autocomplete="off">
-            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-            <input type="hidden" name="folder_id" value="<?php echo $get_folder_id; ?>">
-            <div class="row">
-                <div class="col-md-4">
-                    <div class="input-group mb-3 mb-md-0">
-                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search documents in <?php if($get_folder_id == 0) { echo "all folders"; } else { echo "current folder"; } ?>">
-                        <div class="input-group-append">
-                            <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-                        </div>
-
-                    </div>
-                </div>
-                <div class="col-md-8">
-                    <div class="btn-group float-right">
-                        <div class="dropdown ml-2" id="bulkActionButton" hidden>
-                            <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
-                                <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
-                            </button>
-                            <div class="dropdown-menu">
-                                <a class="dropdown-item ajax-modal" href="#"
-                                    data-modal-url="modals/document/document_bulk_move.php?client_id=<?= $client_id ?>"
-                                    data-bulk="true">
-                                    <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
-                                </a>
-                                <div class="dropdown-divider"></div>
-                                <button class="dropdown-item text-danger text-bold"
-                                        type="submit" form="bulkActions" name="bulk_delete_documents">
-                                    <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </form>
-        
-        <hr>
-
-
-        <div class="row">
-            <div class="col-md-3 border-right mb-3">
-                <h4>Folders</h4>
-                <hr>
-                <ul class="nav nav-pills flex-column bg-light">
-                    <li class="nav-item">
-                        <div class="row">
-                            <div class="col-10">
-                                <?php
-                                // Get a count of documents that have no folder
-                                $row = 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_documents = intval($row['num']);
-                                ?>
-                                <a class="nav-link <?php if ($get_folder_id == 0) { echo "active"; } ?>" href="?client_id=<?php echo $client_id; ?>&folder_id=0">
-                                    / <?php if ($num_documents > 0) { echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_documents</span>"; } ?>
-                                </a>
-                            </div>
-                            <div class="col-2">
-                            </div>
-                        </div>
-                    </li>
-                    <?php
-                    // Function to check if a folder is an ancestor of the current folder
-                    function is_ancestor_folder($folder_id, $current_folder_id, $client_id) {
-                        global $mysqli;
-
-                        // Base case: if current_folder_id is 0 or equal to folder_id
-                        if ($current_folder_id == 0) {
-                            return false;
-                        }
-                        if ($current_folder_id == $folder_id) {
-                            return true;
-                        }
-
-                        // Get the parent folder of the current folder
-                        $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']);
-                            // Recursive call to check the parent folder
-                            return is_ancestor_folder($folder_id, $parent_folder_id, $client_id);
-                        } else {
-                            // Folder not found
-                            return false;
-                        }
-                    }
-
-                    // Recursive function to display folders and subfolders
-                    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_location = 0 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']);
-
-                            // Get the number of documents in the folder
-                            $row2 = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_folder_id = $folder_id AND document_archived_at IS NULL"));
-                            $num_documents = intval($row2['num']);
-
-                            // Get the number of 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 '<li class="nav-item">';
-                            echo '<div class="row">';
-                            echo '<div class="col-10">';
-                            echo '<a class="nav-link ';
-                            if ($get_folder_id == $folder_id) { echo "active"; }
-                            echo '" href="?client_id=' . $client_id . '&folder_id=' . $folder_id . '">';
-
-                            // Indentation for subfolders
-                            echo str_repeat('&nbsp;', $indent * 4);
-
-                            // Determine if the folder is open
-                            if ($get_folder_id == $folder_id || is_ancestor_folder($folder_id, $get_folder_id, $client_id)) {
-                                echo '<i class="fas fa-fw fa-folder-open"></i>';
-                            } else {
-                                echo '<i class="fas fa-fw fa-folder"></i>';
-                            }
-
-                            echo ' ' . $folder_name;
-
-                            if ($num_documents > 0) {
-                                echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_documents</span>";
-                            }
-
-                            echo '</a>';
-                            echo '</div>';
-                            echo '<div class="col-2">';
-                            ?>
-                            <div class="dropdown">
-                                <button class="btn btn-sm" type="button" data-toggle="dropdown">
-                                    <i class="fas fa-ellipsis-v"></i>
-                                </button>
-                                <div class="dropdown-menu">
-                                    <a class="dropdown-item ajax-modal" href="#"
-                                        data-modal-url="modals/folder/folder_rename.php?id=<?= $folder_id ?>">
-                                        <i class="fas fa-fw fa-edit mr-2"></i>Rename
-                                    </a>
-                                    <?php
-                                    // Only show delete option if user is admin, folder has no documents, and no subfolders
-                                    if ($session_user_role == 3 && $num_documents == 0 && $subfolder_count == 0) { ?>
-                                        <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_folder=<?php echo $folder_id; ?>">
-                                            <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                        </a>
-                                    <?php } ?>
-                                </div>
-                            </div>
-                            <?php
-                            echo '</div>';
-                            echo '</div>';
-
-                            if ($subfolder_count > 0) {
-                                // Display subfolders
-                                echo '<ul class="nav nav-pills flex-column bg-light">';
-                                display_folders($folder_id, $client_id, $indent + 1);
-                                echo '</ul>';
-                            }
-
-                            echo '</li>';
-                        }
-                    }
-
-                    // Start displaying folders from the root (parent_folder = 0)
-                    display_folders(0, $client_id);
-                    ?>
-                </ul>
-            </div>
-
-            <div class="col-md-9">
-
-                <nav>
-                    <ol class="breadcrumb">
-                        <li class="breadcrumb-item">
-                            <a href="?client_id=<?php echo $client_id; ?>&folder_id=0">
-                                <i class="fas fa-fw fa-folder mr-2"></i>Root
-                            </a>
-                        </li>
-                        <?php
-                        // Output breadcrumb items for each folder in the path
-                        foreach ($folder_path as $folder) {
-                            $bread_crumb_folder_id = $folder['folder_id']; // Already Sanitized before it was pushed into array
-                            $bread_crumb_folder_name = $folder['folder_name']; // Already Sanitized before it was pushed into array
-
-                            ?>
-                            <li class="breadcrumb-item">
-                                <a href="?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $bread_crumb_folder_id; ?>">
-                                    <i class="fas fa-fw fa-folder-open mr-2"></i><?php echo $bread_crumb_folder_name; ?>
-                                </a>
-                            </li>
-                            <?php
-                        }
-                        ?>
-                    </ol>
-                </nav>
-
-                <form id="bulkActions" action="post.php" method="post">
-                    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-
-                    <div class="table-responsive-sm">
-                        <table class="table table-border">
-                            <thead class="thead-light <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-                            <tr>
-                                <td class="bg-light pr-0">
-                                    <div class="form-check">
-                                        <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
-                                    </div>
-                                </td>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_name&order=<?php echo $disp; ?>">
-                                        Name <?php if ($sort == 'document_name') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_created_at&order=<?php echo $disp; ?>">
-                                        Created <?php if ($sort == 'document_created_at') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_updated_at&order=<?php echo $disp; ?>">
-                                        Last Update <?php if ($sort == 'document_updated_at') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                                <th></th>
-                                <th class="text-center">Action</th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            <?php
-
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $document_id = intval($row['document_id']);
-                                $document_name = nullable_htmlentities($row['document_name']);
-                                $document_description = nullable_htmlentities($row['document_description']);
-                                $document_content = nullable_htmlentities($row['document_content']);
-                                $document_created_by_name = nullable_htmlentities($row['user_name']);
-                                $document_created_at = date("m/d/Y",strtotime($row['document_created_at']));
-                                if ($row['document_updated_at']) {
-                                    $document_updated_at_display = date("m/d/Y",strtotime($row['document_updated_at']));
-                                } else {
-                                    $document_updated_at_display = "-";
-                                }
-                                $document_folder_id = intval($row['document_folder_id']);
-
-                                // Check if 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 = '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']);
-                                }
-
-                                ?>
-
-                                <tr>
-                                    <td class="bg-light pr-0">
-                                        <div class="form-check">
-                                            <input class="form-check-input bulk-select" type="checkbox" name="document_ids[]" value="<?php echo $document_id ?>">
-                                        </div>
-                                    </td>
-                                    <td>
-                                        <a href="document_details.php?client_id=<?php echo $client_id; ?>&document_id=<?php echo $document_id; ?>"><i class="fas fa-fw fa-file-alt"></i> <?php echo $document_name; ?></a>
-                                        <div class="text-secondary mt-1"><?php echo $document_description; ?>
-                                    </td>
-                                    <td>
-                                        <?php echo $document_created_at; ?>
-                                        <div class="text-secondary mt-1"><?php echo $document_created_by_name; ?>
-                                    </td>
-                                    <td><?php echo $document_updated_at_display; ?></td>
-                                    <td>
-                                        <?php if (mysqli_num_rows($sql_shared) > 0) { ?>
-                                            <div class="media" title="Expires <?php echo $item_expire_at_human; ?>">
-                                                <i class="fas fa-link mr-2 mt-1"></i>
-                                                <div class="media-body">Shared
-                                                    <br>
-                                                    <small class="text-secondary"><?php echo $item_recipient; ?></small>
-                                                </div>
-                                            </div>
-                                        <?php } ?>
-                                    </td>
-                                    <td>
-                                        <div class="dropdown dropleft text-center">
-                                            <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                                                <i class="fas fa-ellipsis-h"></i>
-                                            </button>
-                                            <div class="dropdown-menu">
-                                                <a class="dropdown-item ajax-modal" href="#"
-                                                    data-modal-size="lg"
-                                                    data-modal-url="modals/document/document_view.php?id=<?= $document_id ?>">
-                                                    <i class="fas fa-fw fa-eye mr-2"></i>Quick View
-                                                </a>
-                                                <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item ajax-modal" href="#"
-                                                    data-modal-size="lg"
-                                                    data-modal-url="modals/document/document_edit.php?id=<?= $document_id ?>">
-                                                    <i class="fas fa-fw fa-pencil-alt mr-2"></i>Edit
-                                                </a>
-                                                <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'Document', $document_id"; ?>)">
-                                                    <i class="fas fa-fw fa-share mr-2"></i>Share
-                                                </a>
-                                                <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item ajax-modal" href="#"
-                                                    data-modal-url="modals/document/document_rename.php?id=<?= $document_id ?>">
-                                                    <i class="fas fa-fw fa-pencil-alt mr-2"></i>Rename
-                                                </a>
-                                                <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item ajax-modal" href="#"
-                                                    data-modal-url="modals/document/document_move.php?id=<?= $document_id ?>">
-                                                    <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
-                                                </a>
-                                                <?php if ($session_user_role == 3) { ?>
-                                                    <div class="dropdown-divider"></div>
-                                                    <a class="dropdown-item text-danger confirm-link" href="post.php?archive_document=<?php echo $document_id; ?>">
-                                                        <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                                    </a>
-                                                    <div class="dropdown-divider"></div>
-                                                    <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_document=<?php echo $document_id; ?>">
-                                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                                    </a>
-                                                <?php } ?>
-                                            </div>
-                                        </div>
-                                    </td>
-                                </tr>
-
-                            <?php
-
-                            }
-
-                            ?>
-
-                            </tbody>
-                        </table>
-                        <br>
-                    </div>
-                </form>
-                <?php require_once "../includes/filter_footer.php"; ?>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script src="../js/bulk_actions.js"></script>
-
-<?php
-require_once "modals/share_modal.php";
-require_once "modals/document/document_add_from_template.php";
-require_once "../includes/footer.php";

agent/domains.php

@@ -80,7 +80,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <?php if ($num_rows[0] > 0) { ?>
                     <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                     <div class="dropdown-menu">
-                            <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportDomainModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#"
+                            data-modal-url="modals/domain/domain_export.php?<?= $client_url ?>">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     </div>
@@ -357,16 +358,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
             </form>
         </div>
-            <?php require_once "../includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php"; ?>
-            ?>
     </div>
 </div>
 
-<?php
-require_once "modals/domain/domain_export.php";
-?>
-
 <script src="../js/bulk_actions.js"></script>
 
 <?php require_once "../includes/footer.php";
-

agent/expenses.php

@@ -67,7 +67,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/expense/expense_add.php" data-modal-size="lg"><i class="fas fa-plus mr-2"></i>New Expense</button>
                     <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                     <div class="dropdown-menu">
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportExpensesModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#"
+                            data-modal-url="modals/expense/expense_export.php">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     </div>
@@ -286,7 +287,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         <tr>
                             <td class="pr-0 bg-light">
                                 <div class="form-check">
-                                    <input class="form-check-input bulk-select" type="checkbox" name="selected_ids[]" value="<?= $expense_id ?>">
+                                    <input class="form-check-input bulk-select" type="checkbox" name="expense_ids[]" value="<?= $expense_id ?>">
                                 </div>
                             </td>
                             <td>
@@ -357,5 +358,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="/js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/expense/expense_export.php";
 require_once "../includes/footer.php";

agent/files.php

@@ -1,12 +1,11 @@
 <?php
 
-// Default Column Sortby Filter
+// Unified sort: "name" is logical field, not DB column
-$sort = "file_name";
+$sort = "name";
 $order = "ASC";
 
 require_once "includes/inc_all_client.php";
 
-
 // Folder
 if (!empty($_GET['folder_id'])) {
     $folder_id = intval($_GET['folder_id']);
@@ -14,119 +13,49 @@ if (!empty($_GET['folder_id'])) {
     $folder_id = 0;
 }
 
-//Rebuild URL
+// Folder ID (used in forms/etc)
-$url_query_strings_sort = http_build_query($get_copy);
+$get_folder_id = $folder_id;
 
-// Folder ID
+// View Mode -- 0 List, 1 Thumbnail (thumbnail = files only)
-$get_folder_id = 0;
-if (!empty($_GET['folder_id'])) {
-    $get_folder_id = intval($_GET['folder_id']);
-}
-
-// View Mode -- 0 List, 1 Thumbnail
 if (!empty($_GET['view'])) {
     $view = intval($_GET['view']);
 } else {
     $view = 0;
 }
 
-if ($view == 1) {
+if (!isset($q)) {
-    $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')";
+    $q = '';
-} else {
-    $query_images = '';
 }
 
-// Set Folder Location Var used when creating folders
+// ---------------------------------------------
-$folder_location = 1;
+// Breadcrumbs: build full folder path
+// ---------------------------------------------
+$folder_path = [];
+$breadcrumb_folder_id = $get_folder_id;
 
-if ($get_folder_id == 0 && isset($_GET["q"])) {
+while ($breadcrumb_folder_id > 0) {
-    $sql = mysqli_query(
+    $sql_folder = mysqli_query($mysqli, "SELECT folder_name, parent_folder FROM folders WHERE folder_id = $breadcrumb_folder_id AND folder_client_id = $client_id");
-        $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 $sort $order 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 $sort $order LIMIT $record_from, $record_to"
-    );
-}
-
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-$num_of_files = mysqli_num_rows($sql);
-
-// Breadcrumbs
-// Build the full folder path
-$folder_id = $get_folder_id;
-$folder_path = array();
-
-while ($folder_id > 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_unshift($folder_path, array('folder_id' => $folder_id, 'folder_name' => $folder_name));
+            'folder_id'   => $breadcrumb_folder_id,
+            'folder_name' => $folder_name
+        ]);
 
-        // Move up to the parent folder
+        $breadcrumb_folder_id = $parent_folder;
-        $folder_id = $parent_folder;
     } else {
-        // If the folder is not found, break the loop
         break;
     }
 }
 
-?>
+// ---------------------------------------------
-
+// Helper: unified folder tree (no folder_location)
-<div class="card card-dark">
+// ---------------------------------------------
-
-    <div class="card-header py-2">
-        <h3 class="card-title mt-2"><i class="fa fa-fw fa-paperclip mr-2"></i>Files</h3>
-
-        <div class="card-tools">
-            <div class="btn-group">
-                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/file/file_upload.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>">
-                    <i class="fas fa-fw fa-cloud-upload-alt mr-2"></i>Upload
-                </button>
-                <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
-                <div class="dropdown-menu">
-                    <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/folder/folder_add.php?client_id=<?= $client_id ?>&folder_location=1&current_folder_id=<?= $get_folder_id ?>">
-                        <i class="fa fa-fw fa-folder-plus mr-2"></i>New Folder
-                    </a>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="card-body">
-        <div class="row">
-            <div class="col-md-3 border-right mb-3">
-                <h4>Folders</h4>
-                <hr>
-                <ul class="nav nav-pills flex-column bg-light">
-                    <li class="nav-item">
-                        <a class="nav-link <?php if ($get_folder_id == 0) { echo "active"; } ?>" href="?client_id=<?php echo $client_id; ?>&folder_id=0">/</a>
-                    </li>
-                    <?php
-                    // Function to check if a folder is an ancestor of the current folder
 function is_ancestor_folder($folder_id, $current_folder_id, $client_id) {
     global $mysqli;
 
-                        // Base case: if current_folder_id is 0 or equal to folder_id
     if ($current_folder_id == 0) {
         return false;
     }
@@ -134,32 +63,34 @@ while ($folder_id > 0) {
         return true;
     }
 
-                        // Get the parent folder of the current folder
     $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']);
-                            // Recursive call to check the parent folder
         return is_ancestor_folder($folder_id, $parent_folder_id, $client_id);
     } else {
-                            // Folder not found
         return false;
     }
 }
 
-                    // Recursive function to display folders and subfolders
 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_location = 1 AND folder_client_id = $client_id ORDER BY folder_name ASC");
+    $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']);
 
-                            // Get the number of files in the folder
+        // Count files in folder
-                            $row2 = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files WHERE file_folder_id = $folder_id AND file_archived_at IS NULL"));
+        $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($row2['num']);
+        $num_files = intval($row_files['num']);
 
-                            // Get the number of subfolders
+        // 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']);
 
@@ -170,10 +101,8 @@ while ($folder_id > 0) {
         if ($get_folder_id == $folder_id) { echo "active"; }
         echo '" href="?client_id=' . $client_id . '&folder_id=' . $folder_id . '">';
 
-                            // Indentation for subfolders
         echo str_repeat('&nbsp;', $indent * 4);
 
-                            // Determine if the folder is open
         if ($get_folder_id == $folder_id || is_ancestor_folder($folder_id, $get_folder_id, $client_id)) {
             echo '<i class="fas fa-fw fa-folder-open"></i>';
         } else {
@@ -182,8 +111,8 @@ while ($folder_id > 0) {
 
         echo ' ' . $folder_name;
 
-                            if ($num_files > 0) {
+        if ($num_total > 0) {
-                                echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_files</span>";
+            echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_total</span>";
         }
 
         echo '</a>';
@@ -200,8 +129,8 @@ while ($folder_id > 0) {
                     <i class="fas fa-fw fa-edit mr-2"></i>Rename
                 </a>
                 <?php
-                                    // Only show delete option if user is admin, folder has no files, and no subfolders
+                // Only show delete if admin and no contents and no subfolders
-                                    if ($session_user_role == 3 && $num_files == 0 && $subfolder_count == 0) { ?>
+                if ($session_user_role == 3 && $num_total == 0 && $subfolder_count == 0) { ?>
                     <div class="dropdown-divider"></div>
                     <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_folder=<?php echo $folder_id; ?>">
                         <i class="fas fa-fw fa-trash mr-2"></i>Delete
@@ -214,7 +143,6 @@ while ($folder_id > 0) {
         echo '</div>';
 
         if ($subfolder_count > 0) {
-                                // Display subfolders
             echo '<ul class="nav nav-pills flex-column bg-light">';
             display_folders($folder_id, $client_id, $indent + 1);
             echo '</ul>';
@@ -224,16 +152,277 @@ while ($folder_id > 0) {
     }
 }
 
-                    // Start displaying folders from the root (parent_folder = 0)
+// ---------------------------------------------
+// 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']);
+
+?>
+
+<div class="card card-dark">
+
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-folder mr-2"></i>Files</h3>
+
+        <div class="card-tools">
+
+            <div class="btn-group">
+                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                    <i class="fas fa-fw fa-plus mr-2"></i>New
+                </button>
+                <div class="dropdown-menu dropdown-menu-right">
+                    <a class="dropdown-item text-dark ajax-modal" href="#"
+                       data-modal-url="modals/file/file_upload.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>">
+                        <i class="fas fa-fw fa-cloud-upload-alt mr-2"></i>Upload File
+                    </a>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item text-dark ajax-modal" href="#"
+                        data-modal-url="modals/document/document_add.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>"
+                        data-modal-size="lg">
+                        <i class="fas fa-fw fa-file-alt mr-2"></i>Document
+                    </a>
+                    <a class="dropdown-item text-dark ajax-modal" href="#"
+                        data-modal-url="modals/document/document_add_from_template.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>">
+                        <i class="fas fa-fw fa-file mr-2"></i>Document from Template
+                    </a>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item text-dark ajax-modal" href="#"
+                       data-modal-url="modals/folder/folder_add.php?client_id=<?= $client_id ?>&current_folder_id=<?= $get_folder_id ?>">
+                        <i class="fa fa-fw fa-folder-plus mr-2"></i>Folder
+                    </a>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="card-body">
+        <div class="row">
+
+            <!-- Folders -->
+            <div class="col-md-3 border-right mb-3">
+                <h4>Folders</h4>
+                <hr>
+                <ul class="nav nav-pills flex-column bg-light">
+                    <li class="nav-item">
+                        <a class="nav-link <?php if ($get_folder_id == 0) { echo "active"; } ?>"
+                           href="?client_id=<?php echo $client_id; ?>&folder_id=0">
+                            / <?php if ($num_root_items > 0) { echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_root_items</span>"; } ?>
+                        </a>
+                    </li>
+                    <?php
+                    // Start folder tree from root
                     display_folders(0, $client_id);
                     ?>
                 </ul>
-                <?php //require_once "modals/folder/folder_add.php"; ?>
             </div>
 
-
+            <!-- Main content -->
             <div class="col-md-9">
 
+                <!-- Search + view toggle -->
                 <form autocomplete="off">
                     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                     <input type="hidden" name="view" value="<?php echo $view; ?>">
@@ -241,7 +430,9 @@ while ($folder_id > 0) {
                     <div class="row">
                         <div class="col-md-5">
                             <div class="input-group mb-3 mb-md-0">
-                                <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search for files in <?php if($get_folder_id == 0) { echo "all folders"; } else { echo "current folder"; } ?>">
+                                <input type="search" class="form-control" name="q"
+                                       value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>"
+                                       placeholder="Search files and documents in <?php echo ($get_folder_id == 0 ? 'all folders' : 'current folder'); ?>">
                                 <div class="input-group-append">
                                     <button class="btn btn-dark"><i class="fa fa-search"></i></button>
                                 </div>
@@ -249,8 +440,8 @@ while ($folder_id > 0) {
                         </div>
                         <div class="col-md-7">
                             <div class="btn-group float-right">
-                                <a href="?<?php echo $url_query_strings_sort; ?>&view=0" class="btn <?php if($view == 0){ echo "btn-primary"; } else { echo "btn-outline-secondary"; } ?>"><i class="fas fa-list-ul"></i></a>
+                                <a href="?<?php echo $url_query_strings_sort; ?>&view=0&folder_id=<?php echo $get_folder_id; ?>" class="btn <?php if($view == 0){ echo "btn-primary"; } else { echo "btn-outline-secondary"; } ?>"><i class="fas fa-list-ul"></i></a>
-                                <a href="?<?php echo $url_query_strings_sort; ?>&view=1" class="btn <?php if($view == 1){ echo "btn-primary"; } else { echo "btn-outline-secondary"; } ?>"><i class="fas fa-th-large"></i></a>
+                                <a href="?<?php echo $url_query_strings_sort; ?>&view=1&folder_id=<?php echo $get_folder_id; ?>" class="btn <?php if($view == 1){ echo "btn-primary"; } else { echo "btn-outline-secondary"; } ?>"><i class="fas fa-th-large"></i></a>
 
                                 <div class="dropdown ml-2" id="bulkActionButton" hidden>
                                     <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
@@ -258,14 +449,14 @@ while ($folder_id > 0) {
                                     </button>
                                     <div class="dropdown-menu">
                                         <a class="dropdown-item ajax-modal" href="#"
-                                            data-modal-url="modals/file/file_bulk_move.php?client_id=<?= $client_id ?>"
+                                           data-modal-url="modals/file/file_bulk_move.php?client_id=<?= $client_id ?>&current_folder_id=<?= $get_folder_id ?>"
                                            data-bulk="true">
-                                            <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
+                                            <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move Files
                                         </a>
                                         <div class="dropdown-divider"></div>
                                         <button class="dropdown-item text-danger text-bold"
                                                 type="submit" form="bulkActions" name="bulk_delete_files">
-                                            <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                            <i class="fas fa-fw fa-trash mr-2"></i>Delete Files
                                         </button>
                                     </div>
                                 </div>
@@ -275,6 +466,7 @@ while ($folder_id > 0) {
                     </div>
                 </form>
 
+                <!-- Breadcrumb -->
                 <nav class="mt-3">
                     <ol class="breadcrumb">
                         <li class="breadcrumb-item">
@@ -282,34 +474,24 @@ while ($folder_id > 0) {
                                 <i class="fas fa-fw fa-folder mr-2"></i>Root
                             </a>
                         </li>
-                        <?php
+                        <?php foreach ($folder_path as $folder) {
-                        // Output breadcrumb items for each folder in the path
+                            $bread_crumb_folder_id   = $folder['folder_id'];
-                        foreach ($folder_path as $folder) {
+                            $bread_crumb_folder_name = $folder['folder_name']; ?>
-                            $bread_crumb_folder_id = $folder['folder_id']; // Already Sanitized before it was pushed into array
-                            $bread_crumb_folder_name = $folder['folder_name']; // Already Sanitized before it was pushed into array
-
-                            ?>
                             <li class="breadcrumb-item">
                                 <a href="?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $bread_crumb_folder_id; ?>">
                                     <i class="fas fa-fw fa-folder-open mr-2"></i><?php echo $bread_crumb_folder_name; ?>
                                 </a>
                             </li>
-                            <?php
+                        <?php } ?>
-                        }
-                        ?>
                     </ol>
                 </nav>
 
                 <hr>
 
-                <?php
+                <?php if ($view == 1) { ?>
-
-                if($view == 1){
-
-                ?>
 
+                    <!-- THUMBNAIL VIEW (files only) -->
                     <div class="row">
-
                         <?php
                         $files = [];
                         while ($row = mysqli_fetch_array($sql)) {
@@ -322,23 +504,20 @@ while ($folder_id > 0) {
                             $file_mime_type     = nullable_htmlentities($row['file_mime_type']);
                             $file_uploaded_by   = nullable_htmlentities($row['user_name']);
 
-                        // Store file data into an array for JS
                             $files[] = [
                                 'id'      => $file_id,
                                 'name'    => $file_name,
                                 'preview' => "../uploads/clients/$client_id/$file_reference_name"
                             ];
-
                             ?>
 
                             <div class="col-xl-2 col-lg-2 col-md-6 col-sm-6 mb-3 text-center">
 
-                            <a href="#" onclick="openModal(<?php echo count($files)-1; ?>)"><!-- passing the index -->
+                                <a href="#" onclick="openModal(<?php echo count($files)-1; ?>)">
                                     <img class="img-thumbnail" src="<?php echo "../uploads/clients/$client_id/$file_reference_name"; ?>" alt="<?php echo $file_reference_name ?>">
                                 </a>
 
                                 <div>
-
                                     <div class="dropdown float-right">
                                         <button class="btn btn-link btn-sm" type="button" data-toggle="dropdown">
                                             <i class="fas fa-ellipsis-v"></i>
@@ -379,24 +558,22 @@ while ($folder_id > 0) {
 
                             <?php
                             require "modals/file/file_view.php";
-
                         }
                         ?>
                         <script>
-                        // Pass PHP array to JavaScript
                             var files = <?php echo json_encode($files); ?>;
-                        var currentIndex = 0; // Keep track of which file is displayed
+                            var currentIndex = 0;
                         </script>
                     </div>
 
                 <?php } else { ?>
 
+                    <!-- LIST VIEW: unified Files + Documents -->
                     <form id="bulkActions" action="post.php" method="post">
                         <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
                         <div class="table-responsive-sm">
                             <table class="table border">
-
                                 <thead class="thead-light <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
                                 <tr>
                                     <td class="bg-light pr-0">
@@ -405,23 +582,23 @@ while ($folder_id > 0) {
                                         </div>
                                     </td>
                                     <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_name&order=<?php echo $disp; ?>">
+                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=name&order=<?php echo $disp; ?>">
-                                        Name <?php if ($sort == 'file_name') { echo $order_icon; } ?>
+                                            Name <?php if ($sort == 'name') { echo $order_icon; } ?>
                                         </a>
                                     </th>
                                     <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_mime_type&order=<?php echo $disp; ?>">
+                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=type&order=<?php echo $disp; ?>">
-                                        Type <?php if ($sort == 'file_mime_type') { echo $order_icon; } ?>
+                                            Type <?php if ($sort == 'type') { echo $order_icon; } ?>
                                         </a>
                                     </th>
                                     <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_size&order=<?php echo $disp; ?>">
+                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=size&order=<?php echo $disp; ?>">
-                                        Size <?php if ($sort == 'file_size') { echo $order_icon; } ?>
+                                            Size <?php if ($sort == 'size') { echo $order_icon; } ?>
                                         </a>
                                     </th>
                                     <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_created_at&order=<?php echo $disp; ?>">
+                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=created&order=<?php echo $disp; ?>">
-                                        Uploaded <?php if ($sort == 'file_created_at') { echo $order_icon; } ?>
+                                            Uploaded <?php if ($sort == 'created') { echo $order_icon; } ?>
                                         </a>
                                     </th>
                                     <th></th>
@@ -430,46 +607,22 @@ while ($folder_id > 0) {
                                 </thead>
 
                                 <tbody>
-
                                 <?php
-                            while ($row = mysqli_fetch_array($sql)) {
+                                foreach ($items as $item) {
-                                $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']);
-                                if ($file_ext == 'pdf') {
-                                    $file_icon = "file-pdf";
-                                } elseif ($file_ext == 'gz' || $file_ext == 'tar' || $file_ext == 'zip' || $file_ext == '7z' || $file_ext == 'rar') {
-                                    $file_icon = "file-archive";
-                                } elseif ($file_ext == 'txt' || $file_ext == 'md') {
-                                    $file_icon = "file-alt";
-                                } elseif ($file_ext == 'msg') {
-                                    $file_icon = "envelope";
-                                } elseif ($file_ext == 'doc' || $file_ext == 'docx' || $file_ext == 'odt') {
-                                    $file_icon = "file-word";
-                                } elseif ($file_ext == 'xls' || $file_ext == 'xlsx' || $file_ext == 'ods') {
-                                    $file_icon = "file-excel";
-                                } elseif ($file_ext == 'pptx' || $file_ext == 'odp') {
-                                    $file_icon = "file-powerpoint";
-                                } elseif ($file_ext == 'mp3' || $file_ext == 'wav' || $file_ext == 'ogg') {
-                                    $file_icon = "file-audio";
-                                } elseif ($file_ext == 'mov' || $file_ext == 'mp4' || $file_ext == 'av1') {
-                                    $file_icon = "file-video";
-                                } elseif ($file_ext == 'jpg' || $file_ext == 'jpeg' || $file_ext == 'png' || $file_ext == 'gif' || $file_ext == 'webp' || $file_ext == 'bmp' || $file_ext == 'tif') {
-                                    $file_icon = "file-image";
-                                } else {
-                                    $file_icon = "file";
-                                }
-                                $file_size = intval($row['file_size']);
-                                $file_size_KB = number_format($file_size / 1024);
-                                $file_mime_type = nullable_htmlentities($row['file_mime_type']);
-                                $file_size = intval($row['file_size']);
-                                $file_uploaded_by = nullable_htmlentities($row['user_name']);
-                                $file_created_at = nullable_htmlentities($row['file_created_at']);
-                                $file_folder_id = intval($row['file_folder_id']);
 
-                                // Check if shared
+                                    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'];
+
+                                        // Shared?
                                         $sql_shared = mysqli_query(
                                             $mysqli,
                                             "SELECT * FROM shared_items
@@ -481,25 +634,13 @@ while ($folder_id > 0) {
                                              AND item_related_id = $file_id
                                              LIMIT 1"
                                         );
-                                $file_shared = (mysqli_num_rows($sql_shared) > 0) ? true : false;
+                                        $file_shared = (mysqli_num_rows($sql_shared) > 0);
                                         if ($file_shared) {
-                                    $row = mysqli_fetch_array($sql_shared);
+                                            $row_shared = mysqli_fetch_array($sql_shared);
-                                    $item_id = intval($row['item_id']);
+                                            $item_recipient       = nullable_htmlentities($row_shared['item_recipient']);
-                                    $item_active = nullable_htmlentities($row['item_active']);
+                                            $item_expire_at_human = timeAgo($row_shared['item_expire_at']);
-                                    $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']);
                                         }
-
                                         ?>
-
                                         <tr>
                                             <td class="bg-light pr-0">
                                                 <div class="form-check">
@@ -577,10 +718,118 @@ while ($folder_id > 0) {
                                         <?php
                                         require "modals/file/file_link_asset.php";
 
+                                    } else {
+                                        // DOCUMENT ROW
+                                        $document_id              = $item['id'];
+                                        $document_name            = $item['name'];
+                                        $document_description     = $item['description'];
+                                        $document_created_by_name = $item['created_by'];
+                                        $document_created_at      = date("m/d/Y", strtotime($item['created_at']));
+
+                                        $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 = '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']);
+                                        }
+                                        ?>
+                                        <tr>
+                                            <td class="bg-light pr-0">
+                                                <div class="form-check">
+                                                    <input class="form-check-input bulk-select" type="checkbox" name="document_ids[]" value="<?php echo $document_id ?>">
+                                                </div>
+                                            </td>
+                                            <td>
+                                                <a href="document_details.php?client_id=<?php echo $client_id; ?>&document_id=<?php echo $document_id; ?>">
+                                                    <div class="media">
+                                                        <i class="fa fa-fw fa-2x fa-file-alt text-dark mr-3"></i>
+                                                        <div class="media-body">
+                                                            <p>
+                                                                <?php echo $document_name; ?>
+                                                                <br>
+                                                                <small class="text-secondary"><?php echo $document_description; ?></small>
+                                                            </p>
+                                                        </div>
+                                                    </div>
+                                                </a>
+                                            </td>
+                                            <td>Document</td>
+                                            <td>-</td>
+                                            <td>
+                                                <?php echo $document_created_at; ?>
+                                                <div class="text-secondary mt-1"><?php echo $document_created_by_name; ?></div>
+                                            </td>
+                                            <td>
+                                                <?php if ($doc_shared) { ?>
+                                                    <div class="media" title="Expires <?php echo $item_expire_at_human; ?>">
+                                                        <i class="fas fa-link mr-2 mt-1"></i>
+                                                        <div class="media-body">Shared
+                                                            <br>
+                                                            <small class="text-secondary"><?php echo $item_recipient; ?></small>
+                                                        </div>
+                                                    </div>
+                                                <?php } ?>
+                                            </td>
+                                            <td>
+                                                <div class="dropdown dropleft text-center">
+                                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                                        <i class="fas fa-ellipsis-h"></i>
+                                                    </button>
+                                                    <div class="dropdown-menu">
+                                                        <a class="dropdown-item ajax-modal" href="#"
+                                                           data-modal-size="lg"
+                                                           data-modal-url="modals/document/document_view.php?id=<?= $document_id ?>">
+                                                            <i class="fas fa-fw fa-eye mr-2"></i>Quick View
+                                                        </a>
+                                                        <div class="dropdown-divider"></div>
+                                                        <a class="dropdown-item ajax-modal" href="#"
+                                                           data-modal-size="lg"
+                                                           data-modal-url="modals/document/document_edit.php?id=<?= $document_id ?>">
+                                                            <i class="fas fa-fw fa-pencil-alt mr-2"></i>Edit
+                                                        </a>
+                                                        <div class="dropdown-divider"></div>
+                                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'Document', $document_id"; ?>)">
+                                                            <i class="fas fa-fw fa-share mr-2"></i>Share
+                                                        </a>
+                                                        <div class="dropdown-divider"></div>
+                                                        <a class="dropdown-item ajax-modal" href="#"
+                                                           data-modal-url="modals/document/document_rename.php?id=<?= $document_id ?>">
+                                                            <i class="fas fa-fw fa-pencil-alt mr-2"></i>Rename
+                                                        </a>
+                                                        <a class="dropdown-item ajax-modal" href="#"
+                                                           data-modal-url="modals/document/document_move.php?id=<?= $document_id ?>">
+                                                            <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
+                                                        </a>
+                                                        <?php if ($session_user_role == 3) { ?>
+                                                            <div class="dropdown-divider"></div>
+                                                            <a class="dropdown-item text-danger confirm-link" href="post.php?archive_document=<?php echo $document_id; ?>">
+                                                                <i class="fas fa-fw fa-archive mr-2"></i>Archive
+                                                            </a>
+                                                            <div class="dropdown-divider"></div>
+                                                            <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_document=<?php echo $document_id; ?>">
+                                                                <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                                            </a>
+                                                        <?php } ?>
+                                                    </div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <?php
+                                    }
                                 }
                                 ?>
                                 </tbody>
-
                             </table>
                         </div>
                     </form>
@@ -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();
 }
 </script>
@@ -622,4 +871,5 @@ function prevFile() {
 <?php
 require_once "modals/share_modal.php";
 require_once "modals/file/file_delete.php";
+//require_once "modals/document/document_add_from_template.php";
 require_once "../includes/footer.php";

agent/files_legacy.php

@@ -0,0 +1,622 @@
+<?php
+
+// Default Column Sortby Filter
+$sort = "file_name";
+$order = "ASC";
+
+require_once "includes/inc_all_client.php";
+
+
+// Folder
+if (!empty($_GET['folder_id'])) {
+    $folder_id = intval($_GET['folder_id']);
+} else {
+    $folder_id = 0;
+}
+
+// Folder ID
+$get_folder_id = 0;
+if (!empty($_GET['folder_id'])) {
+    $get_folder_id = intval($_GET['folder_id']);
+}
+
+// View Mode -- 0 List, 1 Thumbnail
+if (!empty($_GET['view'])) {
+    $view = intval($_GET['view']);
+} else {
+    $view = 0;
+}
+
+if ($view == 1) {
+    $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')";
+} else {
+    $query_images = '';
+}
+
+// Set Folder Location Var used when creating folders
+$folder_location = 1;
+
+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 $sort $order 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 $sort $order LIMIT $record_from, $record_to"
+    );
+}
+
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+
+$num_of_files = mysqli_num_rows($sql);
+
+// Breadcrumbs
+// Build the full folder path
+$folder_id = $get_folder_id;
+$folder_path = array();
+
+while ($folder_id > 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;
+    }
+}
+
+?>
+
+<div class="card card-dark">
+
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-paperclip mr-2"></i>Files</h3>
+
+        <div class="card-tools">
+            <div class="btn-group">
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/file/file_upload.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>">
+                    <i class="fas fa-fw fa-cloud-upload-alt mr-2"></i>Upload
+                </button>
+                <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
+                <div class="dropdown-menu">
+                    <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/folder/folder_add.php?client_id=<?= $client_id ?>&folder_location=1&current_folder_id=<?= $get_folder_id ?>">
+                        <i class="fa fa-fw fa-folder-plus mr-2"></i>New Folder
+                    </a>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="card-body">
+        <div class="row">
+            <div class="col-md-3 border-right mb-3">
+                <h4>Folders</h4>
+                <hr>
+                <ul class="nav nav-pills flex-column bg-light">
+                    <li class="nav-item">
+                        <a class="nav-link <?php if ($get_folder_id == 0) { echo "active"; } ?>" href="?client_id=<?php echo $client_id; ?>&folder_id=0">/</a>
+                    </li>
+                    <?php
+                    // Function to check if a folder is an ancestor of the current folder
+                    function is_ancestor_folder($folder_id, $current_folder_id, $client_id) {
+                        global $mysqli;
+
+                        // Base case: if current_folder_id is 0 or equal to folder_id
+                        if ($current_folder_id == 0) {
+                            return false;
+                        }
+                        if ($current_folder_id == $folder_id) {
+                            return true;
+                        }
+
+                        // Get the parent folder of the current folder
+                        $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']);
+                            // Recursive call to check the parent folder
+                            return is_ancestor_folder($folder_id, $parent_folder_id, $client_id);
+                        } else {
+                            // Folder not found
+                            return false;
+                        }
+                    }
+
+                    // Recursive function to display folders and subfolders
+                    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_location = 1 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']);
+
+                            // Get the number of files in the folder
+                            $row2 = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files WHERE file_folder_id = $folder_id AND file_archived_at IS NULL"));
+                            $num_files = intval($row2['num']);
+
+                            // Get the number of 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 '<li class="nav-item">';
+                            echo '<div class="row">';
+                            echo '<div class="col-10">';
+                            echo '<a class="nav-link ';
+                            if ($get_folder_id == $folder_id) { echo "active"; }
+                            echo '" href="?client_id=' . $client_id . '&folder_id=' . $folder_id . '">';
+
+                            // Indentation for subfolders
+                            echo str_repeat('&nbsp;', $indent * 4);
+
+                            // Determine if the folder is open
+                            if ($get_folder_id == $folder_id || is_ancestor_folder($folder_id, $get_folder_id, $client_id)) {
+                                echo '<i class="fas fa-fw fa-folder-open"></i>';
+                            } else {
+                                echo '<i class="fas fa-fw fa-folder"></i>';
+                            }
+
+                            echo ' ' . $folder_name;
+
+                            if ($num_files > 0) {
+                                echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_files</span>";
+                            }
+
+                            echo '</a>';
+                            echo '</div>';
+                            echo '<div class="col-2">';
+                            ?>
+                            <div class="dropdown">
+                                <button class="btn btn-sm" type="button" data-toggle="dropdown">
+                                    <i class="fas fa-ellipsis-v"></i>
+                                </button>
+                                <div class="dropdown-menu">
+                                    <a class="dropdown-item ajax-modal" href="#"
+                                        data-modal-url="modals/folder/folder_rename.php?id=<?= $folder_id ?>">
+                                        <i class="fas fa-fw fa-edit mr-2"></i>Rename
+                                    </a>
+                                    <?php
+                                    // Only show delete option if user is admin, folder has no files, and no subfolders
+                                    if ($session_user_role == 3 && $num_files == 0 && $subfolder_count == 0) { ?>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_folder=<?php echo $folder_id; ?>">
+                                            <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                        </a>
+                                    <?php } ?>
+                                </div>
+                            </div>
+                            <?php
+                            echo '</div>';
+                            echo '</div>';
+
+                            if ($subfolder_count > 0) {
+                                // Display subfolders
+                                echo '<ul class="nav nav-pills flex-column bg-light">';
+                                display_folders($folder_id, $client_id, $indent + 1);
+                                echo '</ul>';
+                            }
+
+                            echo '</li>';
+                        }
+                    }
+
+                    // Start displaying folders from the root (parent_folder = 0)
+                    display_folders(0, $client_id);
+                    ?>
+                </ul>
+                <?php //require_once "modals/folder/folder_add.php"; ?>
+            </div>
+
+
+            <div class="col-md-9">
+
+                <form autocomplete="off">
+                    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                    <input type="hidden" name="view" value="<?php echo $view; ?>">
+                    <input type="hidden" name="folder_id" value="<?php echo $get_folder_id; ?>">
+                    <div class="row">
+                        <div class="col-md-5">
+                            <div class="input-group mb-3 mb-md-0">
+                                <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search for files in <?php if($get_folder_id == 0) { echo "all folders"; } else { echo "current folder"; } ?>">
+                                <div class="input-group-append">
+                                    <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-7">
+                            <div class="btn-group float-right">
+                                <a href="?<?php echo $url_query_strings_sort; ?>&view=0" class="btn <?php if($view == 0){ echo "btn-primary"; } else { echo "btn-outline-secondary"; } ?>"><i class="fas fa-list-ul"></i></a>
+                                <a href="?<?php echo $url_query_strings_sort; ?>&view=1" class="btn <?php if($view == 1){ echo "btn-primary"; } else { echo "btn-outline-secondary"; } ?>"><i class="fas fa-th-large"></i></a>
+
+                                <div class="dropdown ml-2" id="bulkActionButton" hidden>
+                                    <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
+                                        <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
+                                    </button>
+                                    <div class="dropdown-menu">
+                                        <a class="dropdown-item ajax-modal" href="#"
+                                            data-modal-url="modals/file/file_bulk_move.php?client_id=<?= $client_id ?>"
+                                            data-bulk="true">
+                                            <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
+                                        </a>
+                                        <div class="dropdown-divider"></div>
+                                        <button class="dropdown-item text-danger text-bold"
+                                                type="submit" form="bulkActions" name="bulk_delete_files">
+                                            <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                        </button>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+                    </div>
+                </form>
+
+                <nav class="mt-3">
+                    <ol class="breadcrumb">
+                        <li class="breadcrumb-item">
+                            <a href="?client_id=<?php echo $client_id; ?>&folder_id=0">
+                                <i class="fas fa-fw fa-folder mr-2"></i>Root
+                            </a>
+                        </li>
+                        <?php
+                        // Output breadcrumb items for each folder in the path
+                        foreach ($folder_path as $folder) {
+                            $bread_crumb_folder_id = $folder['folder_id']; // Already Sanitized before it was pushed into array
+                            $bread_crumb_folder_name = $folder['folder_name']; // Already Sanitized before it was pushed into array
+
+                            ?>
+                            <li class="breadcrumb-item">
+                                <a href="?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $bread_crumb_folder_id; ?>">
+                                    <i class="fas fa-fw fa-folder-open mr-2"></i><?php echo $bread_crumb_folder_name; ?>
+                                </a>
+                            </li>
+                            <?php
+                        }
+                        ?>
+                    </ol>
+                </nav>
+
+                <hr>
+
+                <?php
+
+                if($view == 1){
+
+                ?>
+
+                <div class="row">
+
+                    <?php
+                    $files = [];
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $file_id = intval($row['file_id']);
+                        $file_name = nullable_htmlentities($row['file_name']);
+                        $file_reference_name = nullable_htmlentities($row['file_reference_name']);
+                        $file_ext = nullable_htmlentities($row['file_ext']);
+                        $file_size = intval($row['file_size']);
+                        $file_size_KB = number_format($file_size / 1024);
+                        $file_mime_type = nullable_htmlentities($row['file_mime_type']);
+                        $file_uploaded_by = nullable_htmlentities($row['user_name']);
+
+                        // Store file data into an array for JS
+                        $files[] = [
+                            'id' => $file_id,
+                            'name' => $file_name,
+                            'preview' => "../uploads/clients/$client_id/$file_reference_name"
+                        ];
+
+                        ?>
+
+                        <div class="col-xl-2 col-lg-2 col-md-6 col-sm-6 mb-3 text-center">
+
+                            <a href="#" onclick="openModal(<?php echo count($files)-1; ?>)"><!-- passing the index -->
+                                <img class="img-thumbnail" src="<?php echo "../uploads/clients/$client_id/$file_reference_name"; ?>" alt="<?php echo $file_reference_name ?>">
+                            </a>
+
+                            <div>
+
+                                <div class="dropdown float-right">
+                                    <button class="btn btn-link btn-sm" type="button" data-toggle="dropdown">
+                                        <i class="fas fa-ellipsis-v"></i>
+                                    </button>
+                                    <div class="dropdown-menu">
+                                        <a class="dropdown-item" href="<?php echo "../uploads/clients/$client_id/$file_reference_name"; ?>" download="<?php echo $file_name; ?>">
+                                            <i class="fas fa-fw fa-cloud-download-alt mr-2"></i>Download
+                                        </a>
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'File', $file_id"; ?>)">
+                                            <i class="fas fa-fw fa-share mr-2"></i>Share
+                                        </a>
+                                        <a class="dropdown-item ajax-modal" href="#"
+                                            data-modal-url="modals/file/file_rename.php?id=<?= $file_id ?>">
+                                            <i class="fas fa-fw fa-edit mr-2"></i>Rename
+                                        </a>
+                                        <a class="dropdown-item ajax-modal" href="#"
+                                            data-modal-url="modals/file/file_move.php?id=<?= $file_id ?>">
+                                            <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
+                                        </a>
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#linkAssetToFileModal<?php echo $file_id; ?>">
+                                            <i class="fas fa-fw fa-desktop mr-2"></i>Asset
+                                        </a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger confirm-link" href="post.php?archive_file=<?php echo $file_id; ?>">
+                                            <i class="fas fa-fw fa-archive mr-2"></i>Archive
+                                        </a>
+                                        <?php if ($session_user_role == 3) { ?>
+                                            <div class="dropdown-divider"></div>
+                                            <a class="dropdown-item text-danger text-bold" href="#" data-toggle="modal" data-target="#deleteFileModal" onclick="populateFileDeleteModal(<?php echo "$file_id , '$file_name'" ?>)">
+                                                <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                            </a>
+                                        <?php } ?>
+                                    </div>
+                                </div>
+                                <small class="text-secondary"><?php echo $file_name; ?></small>
+                            </div>
+                        </div>
+
+                        <?php
+                        require "modals/file/file_view.php";
+
+                    }
+                    ?>
+                    <script>
+                        // Pass PHP array to JavaScript
+                        var files = <?php echo json_encode($files); ?>;
+                        var currentIndex = 0; // Keep track of which file is displayed
+                    </script>
+                </div>
+
+                <?php } else { ?>
+
+                <form id="bulkActions" action="post.php" method="post">
+                    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+                    <div class="table-responsive-sm">
+                        <table class="table border">
+
+                            <thead class="thead-light <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                            <tr>
+                                <td class="bg-light pr-0">
+                                    <div class="form-check">
+                                        <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
+                                    </div>
+                                </td>
+                                <th>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_name&order=<?php echo $disp; ?>">
+                                        Name <?php if ($sort == 'file_name') { echo $order_icon; } ?>
+                                    </a>
+                                </th>
+                                <th>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_mime_type&order=<?php echo $disp; ?>">
+                                        Type <?php if ($sort == 'file_mime_type') { echo $order_icon; } ?>
+                                    </a>
+                                </th>
+                                <th>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_size&order=<?php echo $disp; ?>">
+                                        Size <?php if ($sort == 'file_size') { echo $order_icon; } ?>
+                                    </a>
+                                </th>
+                                <th>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_created_at&order=<?php echo $disp; ?>">
+                                        Uploaded <?php if ($sort == 'file_created_at') { echo $order_icon; } ?>
+                                    </a>
+                                </th>
+                                <th></th>
+                                <th class="text-center">Action</th>
+                            </tr>
+                            </thead>
+
+                            <tbody>
+
+                            <?php
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $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']);
+                                if ($file_ext == 'pdf') {
+                                    $file_icon = "file-pdf";
+                                } elseif ($file_ext == 'gz' || $file_ext == 'tar' || $file_ext == 'zip' || $file_ext == '7z' || $file_ext == 'rar') {
+                                    $file_icon = "file-archive";
+                                } elseif ($file_ext == 'txt' || $file_ext == 'md') {
+                                    $file_icon = "file-alt";
+                                } elseif ($file_ext == 'msg') {
+                                    $file_icon = "envelope";
+                                } elseif ($file_ext == 'doc' || $file_ext == 'docx' || $file_ext == 'odt') {
+                                    $file_icon = "file-word";
+                                } elseif ($file_ext == 'xls' || $file_ext == 'xlsx' || $file_ext == 'ods') {
+                                    $file_icon = "file-excel";
+                                } elseif ($file_ext == 'pptx' || $file_ext == 'odp') {
+                                    $file_icon = "file-powerpoint";
+                                } elseif ($file_ext == 'mp3' || $file_ext == 'wav' || $file_ext == 'ogg') {
+                                    $file_icon = "file-audio";
+                                } elseif ($file_ext == 'mov' || $file_ext == 'mp4' || $file_ext == 'av1') {
+                                    $file_icon = "file-video";
+                                } elseif ($file_ext == 'jpg' || $file_ext == 'jpeg' || $file_ext == 'png' || $file_ext == 'gif' || $file_ext == 'webp' || $file_ext == 'bmp' || $file_ext == 'tif') {
+                                    $file_icon = "file-image";
+                                } else {
+                                    $file_icon = "file";
+                                }
+                                $file_size = intval($row['file_size']);
+                                $file_size_KB = number_format($file_size / 1024);
+                                $file_mime_type = nullable_htmlentities($row['file_mime_type']);
+                                $file_size = intval($row['file_size']);
+                                $file_uploaded_by = nullable_htmlentities($row['user_name']);
+                                $file_created_at = nullable_htmlentities($row['file_created_at']);
+                                $file_folder_id = intval($row['file_folder_id']);
+
+                                // Check if 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) ? 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']);
+                                }
+
+                                ?>
+
+                                <tr>
+                                    <td class="bg-light pr-0">
+                                        <div class="form-check">
+                                            <input class="form-check-input bulk-select" type="checkbox" name="file_ids[]" value="<?php echo $file_id ?>">
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="<?php echo "../uploads/clients/$client_id/$file_reference_name"; ?>" target="_blank">
+                                            <div class="media">
+                                                <i class="fa fa-fw fa-2x fa-<?php echo $file_icon; ?> text-dark mr-3"></i>
+                                                <div class="media-body">
+                                                    <p>
+                                                        <?php echo basename($file_name); ?>
+                                                        <br>
+                                                        <small class="text-secondary"><?php echo $file_description; ?></small>
+                                                    </p>
+                                                </div>
+                                            </div>
+                                        </a>
+                                    </td>
+                                    <td><?php echo $file_mime_type; ?></td>
+                                    <td><?php echo $file_size_KB; ?> KB</td>
+                                    <td>
+                                        <?php echo $file_created_at; ?>
+                                        <div class="text-secondary mt-1"><?php echo $file_uploaded_by; ?></div>
+                                    </td>
+                                    <td>
+                                        <?php if ($file_shared) { ?>
+                                            <div class="media" title="Expires <?php echo $item_expire_at_human; ?>">
+                                                <i class="fas fa-link mr-2 mt-1"></i>
+                                                <div class="media-body">Shared
+                                                    <br>
+                                                    <small class="text-secondary"><?php echo $item_recipient; ?></small>
+                                                </div>
+                                            </div>
+                                        <?php } ?>
+                                    </td>
+                                    <td>
+                                        <div class="dropdown dropleft text-center">
+                                            <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                                <i class="fas fa-ellipsis-h"></i>
+                                            </button>
+                                            <div class="dropdown-menu">
+                                                <a class="dropdown-item" href="<?php echo "../uploads/clients/$client_id/$file_reference_name"; ?>" download="<?php echo $file_name; ?>">
+                                                    <i class="fas fa-fw fa-cloud-download-alt mr-2"></i>Download
+                                                </a>
+                                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'File', $file_id"; ?>)">
+                                                    <i class="fas fa-fw fa-share mr-2"></i>Share
+                                                </a>
+                                                <a class="dropdown-item ajax-modal" href="#"
+                                                    data-modal-url="modals/file/file_rename.php?id=<?= $file_id ?>">
+                                                    <i class="fas fa-fw fa-edit mr-2"></i>Rename
+                                                </a>
+                                                <a class="dropdown-item ajax-modal" href="#"
+                                                    data-modal-url="modals/file/file_move.php?id=<?= $file_id ?>">
+                                                    <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
+                                                </a>
+                                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#linkAssetToFileModal<?php echo $file_id; ?>">
+                                                    <i class="fas fa-fw fa-desktop mr-2"></i>Asset
+                                                </a>
+                                                <div class="dropdown-divider"></div>
+                                                <a class="dropdown-item text-danger confirm-link" href="post.php?archive_file=<?php echo $file_id; ?>">
+                                                    <i class="fas fa-fw fa-archive mr-2"></i>Archive
+                                                </a>
+                                                <?php if ($session_user_role == 3) { ?>
+                                                    <div class="dropdown-divider"></div>
+                                                    <a class="dropdown-item text-danger text-bold" href="#" data-toggle="modal" data-target="#deleteFileModal" onclick="populateFileDeleteModal(<?php echo "$file_id , '$file_name'" ?>)">
+                                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                                    </a>
+                                                <?php } ?>
+                                            </div>
+                                        </div>
+                                    </td>
+                                </tr>
+                                <?php
+                                require "modals/file/file_link_asset.php";
+
+                            }
+                            ?>
+                            </tbody>
+
+                        </table>
+                    </div>
+                </form>
+
+                <?php } ?>
+
+                <?php require_once "../includes/filter_footer.php"; ?>
+
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+function openModal(index) {
+    currentIndex = index;
+    updateModalContent();
+    $('#viewFileModal').modal('show');
+}
+
+function updateModalContent() {
+    document.getElementById('modalTitle').innerText = files[currentIndex].name;
+    document.getElementById('modalImage').src = files[currentIndex].preview;
+}
+
+function nextFile() {
+    currentIndex = (currentIndex + 1) % files.length; // loop around
+    updateModalContent();
+}
+
+function prevFile() {
+    currentIndex = (currentIndex - 1 + files.length) % files.length; // loop around
+    updateModalContent();
+}
+</script>
+
+<script src="../js/bulk_actions.js"></script>
+
+<?php
+require_once "modals/share_modal.php";
+require_once "modals/file/file_delete.php";
+require_once "../includes/footer.php";

agent/includes/client_side_nav.php

@@ -30,7 +30,6 @@
                         <i class="nav-icon fas fa-address-book"></i>
                         <p>
                             Contacts
-                            <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/contact/contact_add.php?client_id=<?= $client_id ?>"></span>
                             <?php
                             if ($num_contacts > 0) { ?>
                                 <span class="right badge text-light"><?php echo $num_contacts; ?></span>
@@ -44,7 +43,6 @@
                         <i class="nav-icon fas fa-map-marker-alt"></i>
                         <p>
                             Locations
-                            <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/location/location_add.php?client_id=<?= $client_id ?>"></span>
                             <?php
                             if ($num_locations > 0) { ?>
                                 <span class="right badge text-light"><?php echo $num_locations; ?></span>
@@ -61,7 +59,6 @@
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>
                                 Tickets
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/ticket/ticket_add_v2.php?client_id=<?= $client_id ?>" data-modal-size="lg"></span>
                                 <?php
                                 if ($num_active_tickets > 0) { ?>
                                     <span class="right badge <?php if ($num_active_tickets > 0) { ?> badge-danger <?php } ?> text-light"><?php echo $num_active_tickets; ?></span>
@@ -76,7 +73,6 @@
                             <i class="nav-icon fas fa-redo-alt"></i>
                             <p>
                                 Recurring Tickets
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/recurring_ticket/recurring_ticket_add.php?client_id=<?= $client_id ?>" data-modal-size="lg"></span>
                                 <?php
                                 if ($num_recurring_tickets) { ?>
                                     <span class="right badge"><?php echo $num_recurring_tickets; ?></span>
@@ -91,7 +87,6 @@
                             <i class="nav-icon fas fa-project-diagram"></i>
                             <p>
                                 Projects
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/project/project_add.php?client_id=<?= $client_id ?>"></span>
                                 <?php if ($num_active_projects) { ?>
                                     <span class="right badge text-light" data-toggle="tooltip" title="Open Projects"><?php echo $num_active_projects; ?></span>
                                 <?php } ?>
@@ -106,7 +101,6 @@
                         <i class="nav-icon fas fa-building"></i>
                         <p>
                             Vendors
-                            <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/vendor/vendor_add.php?client_id=<?= $client_id ?>"></span>
                             <?php
                             if ($num_vendors > 0) { ?>
                                 <span class="right badge text-light"><?php echo $num_vendors; ?></span>
@@ -138,7 +132,6 @@
                                 <i class="nav-icon fas fa-desktop"></i>
                                 <p>
                                     Assets
-                                    <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/asset/asset_add.php?client_id=<?= $client_id ?>"></span>
                                     <?php
                                     if ($num_assets > 0) { ?>
                                         <span class="right badge text-light"><?php echo $num_assets; ?></span>
@@ -152,7 +145,6 @@
                                 <i class="nav-icon fas fa-cube"></i>
                                 <p>
                                     Licenses
-                                    <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/software/software_add.php?client_id=<?= $client_id ?>"></span>
                                     <?php
                                     if ($num_software > 0) { ?>
                                         <span class="right badge <?php if ($num_software_expiring > 0) { ?> badge-warning text-dark <?php } ?> <?php if ($num_software_expired > 0) { ?> badge-danger <?php } ?> text-white"><?php echo $num_software; ?></span>
@@ -167,7 +159,6 @@
                                     <i class="nav-icon fas fa-key"></i>
                                     <p>
                                         Credentials
-                                        <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/credential/credential_add.php?client_id=<?= $client_id ?>"></span>
                                         <?php
                                         if ($num_credentials > 0) { ?>
                                             <span class="right badge text-light"><?php echo $num_credentials; ?></span>
@@ -182,7 +173,6 @@
                                 <i class="nav-icon fas fa-network-wired"></i>
                                 <p>
                                     Networks
-                                    <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/network/network_add.php?client_id=<?= $client_id ?>"></span>
                                     <?php
                                     if ($num_networks > 0) { ?>
                                         <span class="right badge text-light"><?php echo $num_networks; ?></span>
@@ -196,7 +186,6 @@
                                 <i class="nav-icon fas fa-server"></i>
                                 <p>
                                     Racks
-                                    <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/rack/rack_add.php?client_id=<?= $client_id ?>"></span>
                                     <?php
                                     if ($num_racks > 0) { ?>
                                         <span class="right badge text-light"><?php echo $num_racks; ?></span>
@@ -210,7 +199,6 @@
                                 <i class="nav-icon fas fa-lock"></i>
                                 <p>
                                     Certificates
-                                    <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/certificate/certificate_add.php?client_id=<?= $client_id ?>"></span>
                                     <?php
                                     if ($num_certificates > 0) { ?>
                                         <span class="right badge <?php if ($num_certificates_expiring > 0) { ?> badge-warning text-dark <?php } ?> <?php if ($num_certificates_expired > 0) { ?> badge-danger <?php } ?> text-white"><?php echo $num_certificates; ?></span>
@@ -224,7 +212,6 @@
                                 <i class="nav-icon fas fa-globe"></i>
                                 <p>
                                     Domains
-                                    <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/domain/domain_add.php?client_id=<?= $client_id ?>"></span>
                                     <?php
                                     if ($num_domains > 0) { ?>
                                         <span class="right badge <?php if (isset($num_domains_expiring)) { ?> badge-warning text-dark<?php } ?> <?php if (isset($num_domains_expired)) { ?> badge-danger <?php } ?> text-white"><?php echo $num_domains; ?></span>
@@ -238,7 +225,6 @@
                                 <i class="nav-icon fas fa-stream"></i>
                                 <p>
                                     Services
-                                    <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/service/service_add.php?client_id=<?= $client_id ?>"></span>
                                     <?php
                                     if ($num_services > 0) { ?>
                                         <span class="right badge text-light"><?php echo $num_services; ?></span>
@@ -247,29 +233,14 @@
                             </a>
                         </li>
 
-                        <li class="nav-item">
-                            <a href="/agent/documents.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "documents.php" || basename($_SERVER["PHP_SELF"]) == "document_details.php") { echo "active"; } ?>">
-                                <i class="nav-icon fas fa-folder"></i>
-                                <p>
-                                    Documents
-                                    <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/document/document_add.php?client_id=<?= $client_id ?>" data-modal-size="lg"></span>
-                                    <?php
-                                    if ($num_documents > 0) { ?>
-                                        <span class="right badge text-light"><?php echo $num_documents; ?></span>
-                                    <?php } ?>
-                                </p>
-                            </a>
-                        </li>
-
                     <?php } ?>
 
                     <!-- Allow files even without module_support for things like contracts, etc. ) -->
                     <li class="nav-item">
                         <a href="/agent/files.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "files.php") { echo "active"; } ?>">
-                            <i class="nav-icon fas fa-paperclip"></i>
+                            <i class="nav-icon fas fa-folder"></i>
                             <p>
                                 Files
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/file/file_upload.php?client_id=<?= $client_id ?>"></span>
                                 <?php
                                 if ($num_files > 0) { ?>
                                     <span class="right badge text-light"><?php echo $num_files; ?></span>
@@ -291,7 +262,6 @@
                                 <i class="nav-icon fas fa-file-invoice"></i>
                                 <p>
                                     Invoices
-                                    <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/invoice/invoice_add.php?client_id=<?= $client_id ?>"></span>
                                     <?php
                                     if ($num_invoices > 0) { ?>
                                         <span class="right badge <?php if ($num_invoices_open > 0) { ?> badge-danger <?php } ?> text-light"><?php echo $num_invoices; ?></span>
@@ -305,7 +275,6 @@
                                 <i class="nav-icon fas fa-redo-alt"></i>
                                 <p>
                                     Recurring Invoices
-                                    <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/recurring_invoice/recurring_invoice_add.php?client_id=<?= $client_id ?>"></span>
                                     <?php
                                     if ($num_recurring_invoices) { ?>
                                         <span class="right badge"><?php echo $num_recurring_invoices; ?></span>
@@ -319,7 +288,6 @@
                                 <i class="nav-icon fas fa-comment-dollar"></i>
                                 <p>
                                     Quotes
-                                    <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/quote/quote_add.php?client_id=<?= $client_id ?>"></span>
                                     <?php
                                     if ($num_quotes > 0) { ?>
                                         <span class="right badge text-light"><?php echo $num_quotes; ?></span>
@@ -350,7 +318,6 @@
                             <i class="nav-icon fas fa-route"></i>
                             <p>
                                 Trips
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/trip/trip_add.php?client_id=<?= $client_id ?>"></span>
                                 <?php
                                 if ($num_trips > 0) { ?>
                                     <span class="right badge text-light"><?php echo $num_trips; ?></span>

agent/includes/side_nav.php

@@ -24,7 +24,6 @@
                             <i class="nav-icon fas fa-users"></i>
                             <p>
                                 Clients
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/client/client_add.php"></span>
                                 <?php if ($num_active_clients) { ?>
                                     <span class="right badge text-light" data-toggle="tooltip" title="Active Clients"><?php echo $num_active_clients; ?></span>
                                 <?php } ?>      
@@ -41,7 +40,6 @@
                                 <i class="nav-icon fas fa-life-ring"></i>
                                 <p>
                                     Tickets
-                                    <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/ticket/ticket_add_v2.php" data-modal-size="lg"></span>
                                     <?php if ($num_active_tickets) { ?>
                                         <span class="right badge text-light" data-toggle="tooltip" title="Open Tickets"><?php echo $num_active_tickets; ?></span>
                                     <?php } ?>
@@ -53,7 +51,6 @@
                                 <i class="nav-icon fas fa-redo-alt"></i>
                                 <p>
                                     Recurring Tickets
-                                    <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/recurring_ticket/recurring_ticket_add.php" data-modal-size="lg"></span>
                                     <?php if ($num_recurring_tickets) { ?>
                                         <span class="right badge text-light" data-toggle="tooltip" title="Active Recurring Tickets"><?php echo $num_recurring_tickets; ?></span>
                                     <?php } ?>
@@ -65,7 +62,6 @@
                                 <i class="nav-icon fas fa-project-diagram"></i>
                                 <p>
                                     Projects
-                                    <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/project/project_add.php"></span>
                                     <?php if ($num_active_projects) { ?>
                                         <span class="right badge text-light" data-toggle="tooltip" title="Open Projects"><?php echo $num_active_projects; ?></span>
                                     <?php } ?>
@@ -88,7 +84,6 @@
                             <i class="nav-icon fas fa-comment-dollar"></i>
                             <p>
                                 Quotes
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/quote/quote_add.php"></span>
                                 <?php if ($num_open_quotes) { ?>
                                     <span class="right badge text-light" data-toggle="tooltip" title="Active Quotes"><?php echo $num_open_quotes; ?></span>
                                 <?php } ?>
@@ -100,7 +95,6 @@
                             <i class="nav-icon fas fa-file-invoice"></i>
                             <p>
                                 Invoices
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/invoice/invoice_add.php"></span>
                                 <?php if ($num_open_invoices) { ?>
                                     <span class="right badge text-light" data-toggle="tooltip" title="Open Invoices"><?php echo $num_open_invoices; ?></span>
                                 <?php } ?>
@@ -112,7 +106,6 @@
                             <i class="nav-icon fas fa-redo-alt"></i>
                             <p>
                                 Recurring Invoices
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/recurring_invoice/recurring_invoice_add.php"></span>
                                 <?php if ($num_recurring_invoices) { ?>
                                     <span class="right badge text-light" data-toggle="tooltip" title="Active Recurring Invoices"><?php echo $num_recurring_invoices; ?></span>
                                 <?php } ?>
@@ -123,14 +116,12 @@
                         <a href="/agent/revenues.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "revenues.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-hand-holding-usd"></i>
                             <p>Revenues</p>
-                            <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/revenue/revenue_add.php" data-modal-size="lg"></span>
                         </a>
                     </li>
                     <li class="nav-item">
                         <a href="/agent/products.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "products.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-box-open"></i>
                             <p>Products</p>
-                            <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/product/product_add.php"></span>
                         </a>
                     </li>
                 <?php } ?>
@@ -146,14 +137,12 @@
                         <a href="/agent/vendors.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "vendors.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-building"></i>
                             <p>Vendors</p>
-                            <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/vendor/vendor_add.php"></span>
                         </a>
                     </li>
                     <li class="nav-item">
                         <a href="/agent/expenses.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expenses.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-shopping-cart"></i>
                             <p>Expenses</p>
-                            <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/expense/expense_add.php"></span>
                         </a>
                     </li>
                     <li class="nav-item">
@@ -161,7 +150,6 @@
                             <i class="nav-icon fas fa-redo-alt"></i>
                             <p>
                                 Recurring Expenses
-                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/recurring_expense/recurring_expense_add.php"></span>
                                 <?php if ($num_recurring_expenses) { ?>
                                     <span class="right badge text-light" data-toggle="tooltip" title="Recurring Expenses"><?php echo $num_recurring_expenses; ?></span>
                                 <?php } ?>
@@ -172,21 +160,18 @@
                         <a href="/agent/accounts.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "accounts.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-piggy-bank"></i>
                             <p>Accounts</p>
-                            <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/account/account_add.php"></span>
                         </a>
                     </li>
                     <li class="nav-item">
                         <a href="/agent/transfers.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "transfers.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-exchange-alt"></i>
                             <p>Transfers</p>
-                            <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/transfer/transfer_add.php"></span>
                         </a>
                     </li>
                     <li class="nav-item">
                         <a href="/agent/trips.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "trips.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-route"></i>
                             <p>Trips</p>
-                            <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/agent/modals/trip/trip_add.php"></span>
                         </a>
                     </li>
                 <?php } ?>

agent/invoice.php

@@ -277,7 +277,8 @@ if (isset($_GET['invoice_id'])) {
                                     data-modal-url="modals/invoice/invoice_copy.php?id=<?= $invoice_id ?>">
                                     <i class="fa fa-fw fa-copy text-secondary mr-2"></i>Copy
                                 </a>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addInvoiceRecurringModal<?php echo $invoice_id; ?>">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/invoice/invoice_recurring_add.php?invoice_id=<?= $invoice_id ?>">
                                     <i class="fa fa-fw fa-sync-alt text-secondary mr-2"></i>Recurring
                                 </a>
                                 <div class="dropdown-divider"></div>
@@ -456,10 +457,10 @@ if (isset($_GET['invoice_id'])) {
                                             <textarea class="form-control" rows="2" id="desc" name="description" placeholder="Enter a Description"></textarea>
                                         </td>
                                         <td>
-                                            <input type="text" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" class="form-control" style="text-align: center;" id="qty" name="qty" placeholder="Qty">
+                                            <input type="text" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" class="form-control" style="text-align: center;" id="qty" name="qty" placeholder="Qty">
                                         </td>
                                         <td>
-                                            <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" style="text-align: right;" id="price" name="price" placeholder="Price (<?php echo $invoice_currency_code; ?>)">
+                                            <input type="text" class="form-control" inputmode="decimal" pattern="-?[0-9]*\.?[0-9]{0,2}" style="text-align: right;" id="price" name="price" placeholder="Price (<?php echo $invoice_currency_code; ?>)">
                                         </td>
                                         <td>
                                             <select class="form-control select2" name="tax_id" id="tax" required>
@@ -725,7 +726,6 @@ if (isset($_GET['invoice_id'])) {
         </div>
     <?php
     include_once "modals/invoice/invoice_add_ticket.php";
-    include_once "modals/invoice/invoice_recurring_add.php";
     include_once "modals/invoice/invoice_note.php";
 
 }

agent/invoices.php

@@ -162,10 +162,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <h3 class="card-title mt-2"><i class="fa fa-fw fa-file-invoice mr-2"></i>Invoices</h3>
         <div class="card-tools">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/invoice/invoice_add.php?<?= $client_url ?>"><i class="fas fa-plus mr-2"></i>New Invoice</button>
+                <button type="button" class="btn btn-primary ajax-modal"
+                    data-modal-url="modals/invoice/invoice_add.php?<?= $client_url ?>">
+                    <i class="fas fa-plus mr-2"></i>New Invoice
+                </button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
-                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportInvoicesModal">
+                    <a class="dropdown-item text-dark ajax-modal" href="#"
+                         data-modal-url="modals/invoice/invoice_export.php?<?= $client_url ?>">
                         <i class="fa fa-fw fa-download mr-2"></i>Export
                     </a>
                 </div>
@@ -453,5 +457,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/invoice/invoice_export.php";
 require_once "../includes/footer.php";

agent/locations.php

@@ -84,12 +84,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
-                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importLocationModal">
+                    <a class="dropdown-item text-dark ajax-modal" href="#"
+                        data-modal-url="modals/location/location_import.php?<?= $client_url ?>">
                         <i class="fa fa-fw fa-upload mr-2"></i>Import
                     </a>
                     <?php if ($num_rows[0] > 0) { ?>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportLocationModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#"
+                            data-modal-url="modals/location/location_export.php?<?= $client_url ?>">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     <?php } ?>
@@ -403,7 +405,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-
-require_once "modals/location/location_import.php";
-require_once "modals/location/location_export.php";
 require_once "../includes/footer.php";

agent/modals/account/account_add.php

@@ -32,7 +32,7 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                 </div>
-                <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="opening_balance" placeholder="0.00" required>
+                <input type="text" class="form-control" inputmode="decimal" pattern="-?[0-9]*\.?[0-9]{0,2}" name="opening_balance" placeholder="0.00" required>
             </div>
         </div>
 

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();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($asset_ids as $asset_id) { ?><input type="hidden" name="asset_ids[]" value="<?= $asset_id ?>"><?php } ?>
 
     <div class="modal-body">
 

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();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($asset_ids as $asset_id) { ?><input type="hidden" name="asset_ids[]" value="<?= $asset_id ?>"><?php } ?>
     <div class="modal-body">
 
         <div class="form-group">

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();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($asset_ids as $asset_id) { ?><input type="hidden" name="asset_ids[]" value="<?= $asset_id ?>"><?php } ?>
 
     <div class="modal-body">
 

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();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($asset_ids as $asset_id) { ?><input type="hidden" name="asset_ids[]" value="<?= $asset_id ?>"><?php } ?>
     <div class="modal-body">
 
         <div class="form-group">

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();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($asset_ids as $asset_id) { ?><input type="hidden" name="asset_ids[]" value="<?= $asset_id ?>"><?php } ?>
 
     <div class="modal-body">
         <input type="hidden" name="remove_tags" value="0">

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();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($asset_ids as $asset_id) { ?><input type="hidden" name="asset_ids[]" value="<?= $asset_id ?>"><?php } ?>
     <div class="modal-body">
 
         <div class="form-group">

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'] ?? []);
+$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []);
-$count = count($selected_ids);
+$count = count($asset_ids);
 
 $client_id = intval($_GET['client_id'] ?? 0);
 if ($client_id) {
@@ -25,7 +25,7 @@ ob_start();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($asset_ids as $asset_id) { ?><input type="hidden" name="asset_ids[]" value="<?= $asset_id ?>"><?php } ?>
 
     <div class="modal-body">
 

agent/modals/asset/asset_details.php

@@ -380,7 +380,7 @@ ob_start();
 
                 // Send a POST request to ajax.php as ajax.php with data contact_set_notes=true, contact_id=NUM, notes=NOTES
                 jQuery.post(
-                    "../ajax.php",
+                    "ajax.php",
                     {
                         asset_set_notes: 'TRUE',
                         asset_id: asset_id,

agent/modals/asset/asset_export.php

@@ -1,6 +1,13 @@
-<div class="modal" id="exportAssetModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Assets to CSV</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -8,10 +15,8 @@
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-                <?php if ($client_url) { ?>
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <?php } ?>
 
     <div class="modal-body">
 
@@ -21,6 +26,6 @@
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/asset/asset_import.php

@@ -1,6 +1,13 @@
-<div class="modal" id="importAssetModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-desktop mr-2"></i>Import Assets</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -8,11 +15,9 @@
     </button>
 </div>
 <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
 
-                <?php if ($client_url) { ?>
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <?php } ?>
     <div class="modal-body">
         <p><strong>Format csv file with headings & data:</strong><br>Name, Description, Type, Make, Model, Serial, OS, Purchase Date, Assigned To, Location, Physical Location, Notes</p>
         <hr>
@@ -27,6 +32,6 @@
         <button type="submit" name="import_assets_csv" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Import</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/asset/asset_interface_bulk_edit_network.php

@@ -1,6 +1,19 @@
-<div class="modal" id="bulkAssignNetworkModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+$interface_ids = array_map('intval', $_GET['interface_ids'] ?? []);
+
+$count = count($interface_ids);
+
+ob_start();
+
+?>
+
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($interface_ids as $interface_id) { ?><input type="hidden" name="interface_ids[]" value="<?= $interface_id ?>"><?php } ?>
     <div class="modal-header bg-dark">
         <h5 class="modal-title"><i class="fa fa-fw fa-network-wired mr-2"></i>Bulk Assign Network</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
@@ -46,6 +59,7 @@
         <button type="submit" name="bulk_edit_asset_interface_network" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
-        </div>
+</form>
-    </div>
+
-</div>
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/asset/asset_interface_bulk_edit_type.php

@@ -1,6 +1,20 @@
-<div class="modal" id="bulkSetInterfaceTypeModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+$interface_ids = array_map('intval', $_GET['interface_ids'] ?? []);
+
+$count = count($interface_ids);
+
+ob_start();
+
+?>
+
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($interface_ids as $interface_id) { ?><input type="hidden" name="interface_ids[]" value="<?= $interface_id ?>"><?php } ?>
+
     <div class="modal-header bg-dark">
         <h5 class="modal-title"><i class="fa fa-fw fa-ethernet mr-2"></i>Bulk Set Interface Type</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
@@ -31,6 +45,7 @@
         <button type="submit" name="bulk_edit_asset_interface_type" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
-        </div>
+</form>
-    </div>
+
-</div>
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/asset/asset_link_document.php

@@ -37,15 +37,15 @@ ob_start();
                     <option value="">- Select a Document -</option>
                     <?php
                     $sql_documents_select = mysqli_query($mysqli, "
-                        SELECT documents.document_id, documents.document_name
+                        SELECT documents.document_id, document_name
                         FROM documents
                         LEFT JOIN asset_documents
                             ON documents.document_id = asset_documents.document_id
                             AND asset_documents.asset_id = $asset_id
-                        WHERE documents.document_client_id = $client_id
+                        WHERE document_client_id = $client_id
-                        AND documents.document_archived_at IS NULL
+                        AND document_archived_at IS NULL
                         AND asset_documents.asset_id IS NULL
-                        ORDER BY documents.document_name ASC
+                        ORDER BY document_name ASC
                     ");
                     while ($row = mysqli_fetch_array($sql_documents_select)) {
                         $document_id = intval($row['document_id']);
@@ -67,4 +67,3 @@ ob_start();
 
 <?php
 require_once '../../../includes/modal_footer.php';
-?>

agent/modals/asset/asset_link_file.php

@@ -70,4 +70,3 @@ ob_start();
 
 <?php
 require_once '../../../includes/modal_footer.php';
-?>

agent/modals/certificate/certificate_export.php

@@ -1,6 +1,13 @@
-<div class="modal" id="exportCertificateModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Certificates to CSV</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -8,9 +15,7 @@
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-                <?php if ($client_url) { ?>
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <?php } ?>
     <div class="modal-body">
 
     </div>
@@ -19,6 +24,6 @@
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/client/client_add.php

@@ -324,7 +324,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
                             </div>
-                            <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="rate" placeholder="0.00" value="<?php echo "$config_default_hourly_rate"; ?>">
+                            <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="rate" placeholder="0.00" value="<?php echo "$config_default_hourly_rate"; ?>">
                         </div>
                     </div>
 

agent/modals/client/client_bulk_add_ticket.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$client_ids = array_map('intval', $_GET['client_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($client_ids);
 
 // Generate the HTML form content using output buffering.
 ob_start();
@@ -20,7 +20,7 @@ ob_start();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="client_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($client_ids as $client_id) { ?><input type="hidden" name="client_ids[]" value="<?= $client_id ?>"><?php } ?>
 
     <div class="modal-body">
 

agent/modals/client/client_bulk_assign_tags.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$client_ids = array_map('intval', $_GET['client_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($client_ids);
 
 ob_start();
 
@@ -19,7 +19,7 @@ ob_start();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="client_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($client_ids as $client_id) { ?><input type="hidden" name="client_ids[]" value="<?= $client_id ?>"><?php } ?>
     <input type="hidden" name="bulk_remove_tags" value="0">
 
     <div class="modal-body">

agent/modals/client/client_bulk_edit_hourly_rate.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$client_ids = array_map('intval', $_GET['client_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($client_ids);
 
 ob_start();
 
@@ -19,7 +19,7 @@ ob_start();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="client_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($client_ids as $client_id) { ?><input type="hidden" name="client_ids[]" value="<?= $client_id ?>"><?php } ?>
 
     <div class="modal-body">
 
@@ -29,7 +29,7 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
                 </div>
-                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="bulk_rate" placeholder="0.00" required>
+                <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="bulk_rate" placeholder="0.00" required>
             </div>
         </div>
 

agent/modals/client/client_bulk_edit_industry.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$client_ids = array_map('intval', $_GET['client_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($client_ids);
 
 ob_start();
 
@@ -19,7 +19,7 @@ ob_start();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="client_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($client_ids as $client_id) { ?><input type="hidden" name="client_ids[]" value="<?= $client_id ?>"><?php } ?>
 
     <div class="modal-body">
 

agent/modals/client/client_bulk_edit_referral.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$client_ids = array_map('intval', $_GET['client_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($client_ids);
 
 ob_start();
 
@@ -18,7 +18,7 @@ ob_start();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="client_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($client_ids as $client_id) { ?><input type="hidden" name="client_ids[]" value="<?= $client_id ?>"><?php } ?>
 
     <div class="modal-body">
 

agent/modals/client/client_bulk_email.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$client_ids = array_map('intval', $_GET['client_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($client_ids);
 
 ob_start();
 
@@ -19,7 +19,7 @@ ob_start();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="client_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($client_ids as $client_id) { ?><input type="hidden" name="client_ids[]" value="<?= $client_id ?>"><?php } ?>
 
     <div class="modal-body">
 

agent/modals/client/client_credit_add.php

@@ -42,7 +42,7 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                             </div>
-                            <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" placeholder="0.00" required>
+                            <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" placeholder="0.00" required>
                         </div>
                     </div>
 

agent/modals/client/client_edit.php

@@ -181,7 +181,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
                             </div>
-                            <input type="text" class="form-control" inputmode="numeric"
+                            <input type="text" class="form-control" inputmode="decimal"
                                    pattern="[0-9]*\.?[0-9]{0,2}" name="rate" placeholder="0.00"
                                    value="<?php echo number_format($client_rate, 2, '.', ''); ?>">
                         </div>

agent/modals/client/client_export.php

@@ -1,6 +1,11 @@
-<div class="modal" id="exportClientModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Clients to CSV</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -15,6 +20,6 @@
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/client/client_import.php

@@ -1,6 +1,10 @@
-<div class="modal" id="importClientModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+ob_start();
+
+?>
 <div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-users mr-2"></i>Import Clients</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -23,6 +27,6 @@
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/contact/contact_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'] ?? []);
+$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($contact_ids);
 
 ob_start();
 
@@ -19,7 +19,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="contact_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($contact_ids as $contact_id) { ?><input type="hidden" name="contact_ids[]" value="<?= $contact_id ?>"><?php } ?>
     <div class="modal-body">
 
         <div class="form-group">

agent/modals/contact/contact_bulk_assign_tags.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($contact_ids);
 
 ob_start();
 
@@ -18,7 +18,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="contact_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($contact_ids as $contact_id) { ?><input type="hidden" name="contact_ids[]" value="<?= $contact_id ?>"><?php } ?>
 
     <div class="modal-body">
         <input type="hidden" name="bulk_remove_tags" value="0">

agent/modals/contact/contact_bulk_edit_department.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($contact_ids);
 
 ob_start();
 
@@ -18,7 +18,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="contact_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($contact_ids as $contact_id) { ?><input type="hidden" name="contact_ids[]" value="<?= $contact_id ?>"><?php } ?>
     <div class="modal-body">
 
         <label>Department / Group</label>

agent/modals/contact/contact_bulk_edit_phone.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($contact_ids);
 
 ob_start();
 
@@ -18,7 +18,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="contact_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($contact_ids as $contact_id) { ?><input type="hidden" name="contact_ids[]" value="<?= $contact_id ?>"><?php } ?>
     <div class="modal-body">
 
         <label>Phone</label>

agent/modals/contact/contact_bulk_edit_role.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($contact_ids);
 
 ob_start();
 
@@ -18,7 +18,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="contact_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($contact_ids as $contact_id) { ?><input type="hidden" name="contact_ids[]" value="<?= $contact_id ?>"><?php } ?>
     <input type="hidden" name="bulk_contact_important" value="0">
     <input type="hidden" name="bulk_contact_billing" value="0">
     <input type="hidden" name="bulk_contact_technical" value="0">

agent/modals/contact/contact_bulk_email.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($contact_ids);
 
 ob_start();
 
@@ -18,7 +18,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="contact_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($contact_ids as $contact_id) { ?><input type="hidden" name="contact_ids[]" value="<?= $contact_id ?>"><?php } ?>
     <div class="modal-body">
 
         <label>From Email / Display Name</label>

agent/modals/contact/contact_export.php

@@ -1,6 +1,13 @@
-<div class="modal" id="exportContactModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Contacts to CSV</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -8,9 +15,8 @@
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-                <?php if($client_url) { ?>
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+
-                <?php } ?>
     <div class="modal-body">
 
     </div>
@@ -19,6 +25,6 @@
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/contact/contact_import.php

@@ -1,6 +1,13 @@
-<div class="modal" id="importContactModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-users mr-2"></i>Import Contacts</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -8,9 +15,7 @@
     </button>
 </div>
 <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-                <?php if($client_url) { ?>
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <?php } ?>
     <div class="modal-body">
         <p><strong>Format csv file with headings & data:</strong><br>Name, Title, Department, Email, Phone, Extension, Mobile, Location</p>
         <hr>
@@ -25,6 +30,6 @@
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/credential/credential_bulk_assign_tags.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$credential_ids = array_map('intval', $_GET['credential_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($credential_ids);
 
 ob_start();
 
@@ -18,7 +18,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="credential_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($credential_ids as $credential_id) { ?><input type="hidden" name="credential_ids[]" value="<?= $credential_id ?>"><?php } ?>
     <div class="modal-body">
         <input type="hidden" name="bulk_remove_tags" value="0">
 

agent/modals/credential/credential_export.php

@@ -1,6 +1,13 @@
-<div class="modal" id="exportCredentialModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Credentials to CSV</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -8,9 +15,8 @@
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-                <?php if ($client_url) { ?>
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+
-                <?php } ?>
     <div class="modal-body">
 
     </div>
@@ -19,6 +25,6 @@
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/credential/credential_import.php

@@ -1,6 +1,13 @@
-<div class="modal" id="importCredentialModal" tabindex="-1">
+<?php
-	<div class="modal-dialog">
+
-		<div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
 	<h5 class="modal-title"><i class="fas fa-fw fa-key mr-2"></i>Import Credentials</h5>
 	<button type="button" class="close text-white" data-dismiss="modal">
@@ -8,9 +15,7 @@
 	</button>
 </div>
 <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-				<?php if ($client_url) { ?>
+	<input type="hidden" name="client_id" value="<?= $client_id ?>">
-				<input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-				<?php } ?>
 	<div class="modal-body">
 		<p><strong>Format csv file with headings & data:</strong><br>Name, Description, Username, Password, TOTP, URI</p>
 		<hr>
@@ -25,6 +30,6 @@
 		<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
 	</div>
 </form>
-		</div>
+
-	</div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/document/document_add_from_template.php

@@ -1,6 +1,16 @@
-<div class="modal" id="addDocumentFromTemplateModal" tabindex="-1">
+<?php
-  <div class="modal-dialog">
+
-    <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+$contact_id = intval($_GET['contact_id'] ?? 0);
+$asset_id = intval($_GET['asset_id'] ?? 0);
+intval($_GET['folder_id'] ?? 0);
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>New Document from Template</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -24,13 +34,11 @@
                     while ($row = mysqli_fetch_array($sql_document_templates)) {
                         $document_template_id = intval($row['document_template_id']);
                         $document_template_name = nullable_htmlentities($row['document_template_name']);
-
                     ?>
                         <option value="<?php echo $document_template_id ?>"><?php echo $document_template_name; ?></option>
                     <?php
                     }
                     ?>
-
                 </select>
             </div>
         </div>
@@ -64,17 +72,15 @@
                 <select class="form-control" name="folder">
                     <option value="0">/</option>
                     <?php
-                $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                    $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE 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']);
-
                     ?>
                         <option <?php if (isset($_GET['folder_id']) && $_GET['folder_id'] == $folder_id) echo "selected"; ?> value="<?php echo $folder_id ?>"><?php echo $folder_name; ?></option>
                     <?php
                     }
                     ?>
-
                 </select>
             </div>
         </div>
@@ -82,12 +88,10 @@
     </div>
 
     <div class="modal-footer">
-
         <button type="submit" name="add_document_from_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-
     </div>
 </form>
-    </div>
+
-  </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/document/document_edit.php

@@ -45,7 +45,7 @@ ob_start();
                 <select class="form-control select2" name="folder">
                     <option value="0">/</option>
                     <?php
-                    $sql_folders_select = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = 0 AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                    $sql_folders_select = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
                     while ($row = mysqli_fetch_array($sql_folders_select)) {
                         $folder_id_select = intval($row['folder_id']);
                         $folder_name_select = nullable_htmlentities($row['folder_name']);

agent/modals/document/document_edit_visibility.php

@@ -1,10 +1,26 @@
-<div class="modal" id="editDocumentClientVisibileModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$document_id = intval($_GET['document_id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM documents
+    WHERE document_id = $document_id
+    LIMIT 1
+");
+
+$row = mysqli_fetch_array($sql);
+$document_name = nullable_htmlentities($row['document_name']);
+$document_client_visible = intval($row['document_client_visible']);
+$client_id = intval($row['document_client_id']);
+
+ob_start();
+
+?>
 <div class="modal-header bg-dark">
     <h5 class="modal-title">
         <i class="fa fa-fw fa-handshake mr-2"></i>
-                    Edit Visibility Status for <strong><?php echo "$document_name"; ?></strong>
+        Edit Visibility Status for <strong><?= $document_name ?></strong>
     </h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -12,7 +28,7 @@
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <div class="modal-body">
-                    <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
+        <input type="hidden" name="document_id" value="<?= $document_id ?>">
         <div class="form-group">
             <label>Visibility</label>
             <p>Should this document be visible in the portal to client contacts with the 'Technical' role?</p>
@@ -31,12 +47,11 @@
     </div>
 
     <div class="modal-footer">
-                    <button type="submit" name="toggle_document_visibility" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
+        <button type="submit" name="toggle_document_visibility" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save changes</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 
 </form>
 
-        </div>
+<?php
-    </div>
+require_once '../../../includes/modal_footer.php';
-</div>

agent/modals/document/document_link_asset.php

@@ -1,14 +1,29 @@
-<div class="modal" id="linkAssetToDocumentModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$document_id = intval($_GET['document_id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM documents
+    WHERE document_id = $document_id
+    LIMIT 1
+");
+
+$row = mysqli_fetch_array($sql);
+$document_name = nullable_htmlentities($row['document_name']);
+$client_id = intval($row['document_client_id']);
+
+ob_start();
+
+?>
 <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-desktop mr-2"></i>Link Asset to <strong><?php echo $document_name; ?></strong></h5>
+    <h5 class="modal-title"><i class="fa fa-fw fa-desktop mr-2"></i>Link Asset to <strong><?= $document_name ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
+    <input type="hidden" name="document_id" value="<?= $document_id ?>">
     <div class="modal-body">
 
         <div class="form-group">
@@ -19,26 +34,23 @@
                 <select class="form-control select2" name="asset_id">
                     <option value="">- Select an Asset -</option>
                     <?php
-                                // Check if there are any associated vendors
+                    $sql_assets_select = mysqli_query($mysqli, "
-                                if (!empty($linked_assets)) {
+                        SELECT assets.asset_id, asset_name
-                                    $excluded_asset_ids = implode(",", $linked_assets);
+                        FROM assets
-                                    $exclude_condition = "AND asset_id NOT IN ($excluded_asset_ids)";
+                        LEFT JOIN asset_documents
-                                } else {
+                            ON assets.asset_id = asset_documents.asset_id
-                                    $exclude_condition = "";  // No condition if there are no displayed vendors
+                            AND asset_documents.document_id = $document_id
-                                }
-
-                                $sql_assets_select = mysqli_query($mysqli, "SELECT * FROM assets
                         WHERE asset_client_id = $client_id
                         AND asset_archived_at IS NULL
-                                    $exclude_condition
+                        AND asset_documents.asset_id IS NULL
-                                    ORDER BY asset_name ASC"
+                        ORDER BY asset_name ASC
-                                );
+                    ");
                     while ($row = mysqli_fetch_array($sql_assets_select)) {
                         $asset_id = intval($row['asset_id']);
                         $asset_name = nullable_htmlentities($row['asset_name']);
 
                         ?>
-                                    <option value="<?php echo $asset_id ?>"><?php echo $asset_name; ?></option>
+                        <option value="<?= $asset_id ?>"><?= $asset_name ?></option>
                         <?php
                     }
                     ?>
@@ -52,6 +64,6 @@
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/document/document_link_contact.php

@@ -1,14 +1,30 @@
-<div class="modal" id="linkContactToDocumentModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$document_id = intval($_GET['document_id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM documents
+    WHERE document_id = $document_id
+    LIMIT 1
+");
+
+$row = mysqli_fetch_array($sql);
+$document_name = nullable_htmlentities($row['document_name']);
+$client_id = intval($row['document_client_id']);
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-user mr-2"></i>Link Contact to <strong><?php echo $document_name; ?></strong></h5>
+    <h5 class="modal-title"><i class="fa fa-fw fa-user mr-2"></i>Link Contact to <strong><?= $document_name ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
+    <input type="hidden" name="document_id" value="<?= $document_id ?>">
     <div class="modal-body">
 
         <div class="form-group">
@@ -19,26 +35,23 @@
                 <select class="form-control select2" name="contact_id">
                     <option value="">- Select a Contact -</option>
                     <?php
-                                // Check if there are any associated vendors
+                    $sql_contacts_select = mysqli_query($mysqli, "
-                                if (!empty($linked_contacts)) {
+                        SELECT contacts.contact_id, contact_name
-                                    $excluded_contact_ids = implode(",", $linked_contacts);
+                        FROM contacts
-                                    $exclude_condition = "AND contact_id NOT IN ($excluded_contact_ids)";
+                        LEFT JOIN contact_documents
-                                } else {
+                            ON contacts.contact_id = contact_documents.contact_id
-                                    $exclude_condition = "";  // No condition if there are no displayed vendors
+                            AND contact_documents.document_id = $document_id
-                                }
-
-                                $sql_contacts_select = mysqli_query($mysqli, "SELECT * FROM contacts
                         WHERE contact_client_id = $client_id
                         AND contact_archived_at IS NULL
-                                    $exclude_condition
+                        AND contact_documents.contact_id IS NULL
-                                    ORDER BY contact_name ASC"
+                        ORDER BY contact_name ASC
-                                );
+                    ");
                     while ($row = mysqli_fetch_array($sql_contacts_select)) {
                         $contact_id = intval($row['contact_id']);
                         $contact_name = nullable_htmlentities($row['contact_name']);
 
                         ?>
-                                    <option value="<?php echo $contact_id ?>"><?php echo $contact_name; ?></option>
+                        <option value="<?= $contact_id ?>"><?= $contact_name ?></option>
                         <?php
                     }
                     ?>
@@ -48,10 +61,10 @@
         </div>
     </div>
     <div class="modal-footer">
-                    <button type="submit" name="link_contact_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
+        <button type="submit" name="link_contact_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link Contact</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/document/document_link_file.php

@@ -1,14 +1,30 @@
-<div class="modal" id="linkFileToDocumentModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$document_id = intval($_GET['document_id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM documents
+    WHERE document_id = $document_id
+    LIMIT 1
+");
+
+$row = mysqli_fetch_array($sql);
+$document_name = nullable_htmlentities($row['document_name']);
+$client_id = intval($row['document_client_id']);
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-paperclip mr-2"></i>Link File to <strong><?php echo $document_name; ?></strong></h5>
+    <h5 class="modal-title"><i class="fa fa-fw fa-paperclip mr-2"></i>Link File to <strong><?= $document_name ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
+    <input type="hidden" name="document_id" value="<?= $document_id ?>">
     <div class="modal-body">
 
         <div class="form-group">
@@ -19,9 +35,19 @@
                 <select class="form-control select2" name="file_id">
                     <option value="">- Select a File -</option>
                     <?php
-                                $sql_files_select = mysqli_query($mysqli, "SELECT * FROM files 
+                    $sql_files_select = mysqli_query($mysqli, "
-                                    LEFT JOIN folders ON folder_id = file_folder_id
+                        SELECT files.file_id, file_name, folder_name
-                                    WHERE file_client_id = $client_id ORDER BY folder_name ASC, file_name ASC");
+                        FROM files
+                        LEFT JOIN folders
+                            ON folder_id = file_folder_id
+                        LEFT JOIN document_files
+                            ON files.file_id = document_files.file_id
+                            AND document_files.document_id = $document_id
+                        WHERE file_client_id = $client_id
+                        AND file_archived_at IS NULL
+                        AND document_files.file_id IS NULL
+                        ORDER BY folder_name ASC, file_name ASC
+                    ");
                     while ($row = mysqli_fetch_array($sql_files_select)) {
                         $file_id = intval($row['file_id']);
                         $file_name = nullable_htmlentities($row['file_name']);
@@ -38,10 +64,10 @@
         </div>
     </div>
     <div class="modal-footer">
-                    <button type="submit" name="link_file_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
+        <button type="submit" name="link_file_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link File</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/document/document_link_software.php

@@ -1,14 +1,30 @@
-<div class="modal" id="linkSoftwareToDocumentModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$document_id = intval($_GET['document_id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM documents
+    WHERE document_id = $document_id
+    LIMIT 1
+");
+
+$row = mysqli_fetch_array($sql);
+$document_name = nullable_htmlentities($row['document_name']);
+$client_id = intval($row['document_client_id']);
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-user mr-2"></i>Link Software to <strong><?php echo $document_name; ?></strong></h5>
+    <h5 class="modal-title"><i class="fa fa-fw fa-user mr-2"></i>Link Software to <strong><?= $document_name ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
+    <input type="hidden" name="document_id" value="<?= $document_id ?>">
     <div class="modal-body">
 
         <div class="form-group">
@@ -19,26 +35,24 @@
                 <select class="form-control select2" name="software_id">
                     <option value="">- Select a License -</option>
                     <?php
-                                // Check if there are any associated vendors
+                    $sql_software_select = mysqli_query($mysqli, "
-                                if (!empty($linked_software)) {
+                        SELECT software.software_id, software_name
-                                    $excluded_software_ids = implode(",", $linked_software);
+                        FROM software
-                                    $exclude_condition = "AND software_id NOT IN ($excluded_software_ids)";
+                        LEFT JOIN software_documents
-                                } else {
+                            ON software.software_id = software_documents.software_id
-                                    $exclude_condition = "";  // No condition if there are no displayed vendors
+                            AND software_documents.document_id = $document_id
-                                }
-
-                                $sql_software_select = mysqli_query($mysqli, "SELECT software_id, software_name FROM software
                         WHERE software_client_id = $client_id
                         AND software_archived_at IS NULL
-                                    $exclude_condition
+                        AND software_documents.software_id IS NULL
-                                    ORDER BY software_name ASC"
+                        ORDER BY software_name ASC
-                                );
+                    ");
+
                     while ($row = mysqli_fetch_array($sql_software_select)) {
                         $software_id = intval($row['software_id']);
                         $software_name = nullable_htmlentities($row['software_name']);
 
                         ?>
-                                    <option value="<?php echo $software_id ?>"><?php echo $software_name; ?></option>
+                        <option value="<?= $software_id ?>"><?= $software_name ?></option>
                         <?php
                     }
                     ?>
@@ -48,10 +62,10 @@
         </div>
     </div>
     <div class="modal-footer">
-                    <button type="submit" name="link_software_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
+        <button type="submit" name="link_software_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link License</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/document/document_link_vendor.php

@@ -1,14 +1,30 @@
-<div class="modal" id="linkVendorToDocumentModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$document_id = intval($_GET['document_id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM documents
+    WHERE document_id = $document_id
+    LIMIT 1
+");
+
+$row = mysqli_fetch_array($sql);
+$document_name = nullable_htmlentities($row['document_name']);
+$client_id = intval($row['document_client_id']);
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-building mr-2"></i>Link Vendor to <strong><?php echo $document_name; ?></strong></h5>
+    <h5 class="modal-title"><i class="fa fa-fw fa-building mr-2"></i>Link Vendor to <strong><?= $document_name ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
+    <input type="hidden" name="document_id" value="<?= $document_id ?>">
     <div class="modal-body">
 
         <div class="form-group">
@@ -19,26 +35,23 @@
                 <select class="form-control select2" name="vendor_id">
                     <option value="">- Select a Vendor -</option>
                     <?php
-                                // Check if there are any associated vendors
+                    $sql_vendors_select = mysqli_query($mysqli, "
-                                if (!empty($associated_vendors)) {
+                        SELECT vendors.vendor_id, vendor_name
-                                    $excluded_vendor_ids = implode(",", $associated_vendors);
+                        FROM vendors
-                                    $exclude_condition = "AND vendor_id NOT IN ($excluded_vendor_ids)";
+                        LEFT JOIN vendor_documents
-                                } else {
+                            ON vendors.vendor_id = vendor_documents.vendor_id
-                                    $exclude_condition = "";  // No condition if there are no displayed vendors
+                            AND vendor_documents.document_id = $document_id
-                                }
-
-                                $sql_vendors_select = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors 
                         WHERE vendor_client_id = $client_id
                         AND vendor_archived_at IS NULL
-                                    $exclude_condition
+                        AND vendor_documents.vendor_id IS NULL
-                                    ORDER BY vendor_name ASC"
+                        ORDER BY vendor_name ASC
-                                );
+                    ");
                     while ($row = mysqli_fetch_array($sql_vendors_select)) {
                         $vendor_id = intval($row['vendor_id']);
                         $vendor_name = nullable_htmlentities($row['vendor_name']);
 
                         ?>
-                                    <option value="<?php echo $vendor_id ?>"><?php echo $vendor_name; ?></option>
+                        <option value="<?= $vendor_id ?>"><?= $vendor_name ?></option>
                         <?php
                     }
                     ?>
@@ -48,10 +61,10 @@
         </div>
     </div>
     <div class="modal-footer">
-                    <button type="submit" name="link_vendor_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
+        <button type="submit" name="link_vendor_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link Vendor</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/domain/domain_export.php

@@ -1,6 +1,13 @@
-<div class="modal" id="exportDomainModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Domains to CSV</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -8,9 +15,7 @@
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-                <?php if ($client_url) { ?>
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <?php } ?>
     <div class="modal-body">
 
     </div>
@@ -19,6 +24,6 @@
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/expense/expense_add.php

@@ -33,7 +33,7 @@ ob_start();
                     <div class="input-group-prepend">
                         <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                     </div>
-                    <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" placeholder="0.00" required>
+                    <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" placeholder="0.00" required>
                 </div>
             </div>
         </div>

agent/modals/expense/expense_bulk_delete.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$expense_ids = array_map('intval', $_GET['expense_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($expense_ids);
 
 // Generate the HTML form content using output buffering.
 ob_start();
@@ -13,7 +13,7 @@ ob_start();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?> <input type="hidden" name="expense_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($expense_ids as $expense_id) { ?> <input type="hidden" name="expense_ids[]" value="<?= $expense_id ?>"><?php } ?>
     <div class="modal-body text-center">
 
         <div class="mb-4" style="text-align: center;">

agent/modals/expense/expense_bulk_edit_account.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$expense_ids = array_map('intval', $_GET['expense_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($expense_ids);
 
 // Generate the HTML form content using output buffering.
 ob_start();
@@ -19,7 +19,7 @@ ob_start();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?> <input type="hidden" name="expense_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($expense_ids as $expense_id) { ?> <input type="hidden" name="expense_ids[]" value="<?= $expense_id ?>"><?php } ?>
     <div class="modal-body">
 
         <div class="form-group">

agent/modals/expense/expense_bulk_edit_category.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$expense_ids = array_map('intval', $_GET['expense_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($expense_ids);
 
 // Generate the HTML form content using output buffering.
 ob_start();
@@ -21,8 +21,8 @@ ob_start();
     <div class="modal-body">
         <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
         <?php
-        foreach ($selected_ids as $id) { ?>
+        foreach ($expense_ids as $expense_id) { ?>
-            <input type="hidden" name="expense_ids[]" value="<?= $id ?>">
+            <input type="hidden" name="expense_ids[]" value="<?= $expense_id ?>">
         <?php
         }
         ?>

agent/modals/expense/expense_bulk_edit_client.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$expense_ids = array_map('intval', $_GET['expense_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($expense_ids);
 
 // Generate the HTML form content using output buffering.
 ob_start();
@@ -21,7 +21,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
 
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?> <input type="hidden" name="expense_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($expense_ids as $expense_id) { ?> <input type="hidden" name="expense_ids[]" value="<?= $expense_id ?>"><?php } ?>
 
     <div class="modal-body">
 

agent/modals/expense/expense_copy.php

@@ -50,7 +50,7 @@ ob_start();
                     <div class="input-group-prepend">
                         <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                     </div>
-                    <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($expense_amount, 2, '.', ''); ?>" placeholder="0.00" required>
+                    <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($expense_amount, 2, '.', ''); ?>" placeholder="0.00" required>
                 </div>
             </div>
 
@@ -211,4 +211,3 @@ ob_start();
 require_once '../../../includes/modal_footer.php';
 
 ?>
-

agent/modals/expense/expense_edit.php

@@ -59,7 +59,7 @@ ob_start();
                     <div class="input-group-prepend">
                         <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                     </div>
-                    <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($expense_amount, 2, '.', ''); ?>" placeholder="0.00" required>
+                    <input type="text" class="form-control" inputmode="decimal" pattern="-?[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($expense_amount, 2, '.', ''); ?>" placeholder="0.00" required>
                 </div>
             </div>
 

agent/modals/expense/expense_export.php

@@ -1,6 +1,11 @@
-<div class="modal" id="exportExpensesModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-download mr-2"></i>Exporting Expenses to CSV</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -26,7 +31,7 @@
                         $account_id = intval($row['account_id']);
                         $account_name = nullable_htmlentities($row['account_name']);
                     ?>
-                                    <option <?php if ($account_filter == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
+                        <option <?php if ($account_filter == $account_id) { echo "selected"; } ?> value="<?= $account_id ?>"><?= $account_name ?></option>
                     <?php
                     }
                     ?>
@@ -50,7 +55,7 @@
                         $vendor_id = intval($row['vendor_id']);
                         $vendor_name = nullable_htmlentities($row['vendor_name']);
                     ?>
-                                    <option <?php if ($vendor_filter == $vendor_id) { echo "selected"; } ?> value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
+                        <option <?php if ($vendor_filter == $vendor_id) { echo "selected"; } ?> value="<?= $vendor_id ?>"><?= $vendor_name ?></option>
                     <?php
                     }
                     ?>
@@ -74,7 +79,7 @@
                         $category_id = intval($row['category_id']);
                         $category_name = nullable_htmlentities($row['category_name']);
                     ?>
-                                    <option <?php if ($category_filter == $category_id) { echo "selected"; } ?> value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+                        <option <?php if ($category_filter == $category_id) { echo "selected"; } ?> value="<?= $category_id ?>"><?= $category_name ?></option>
                     <?php
                     }
                     ?>
@@ -89,7 +94,7 @@
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
-                            <input type="date" class="form-control" name="date_from" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
+                <input type="date" class="form-control" name="date_from" max="2999-12-31">
             </div>
         </div>
 
@@ -99,7 +104,7 @@
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
-                            <input type="date" class="form-control" name="date_to" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                <input type="date" class="form-control" name="date_to" max="2999-12-31">
             </div>
         </div>
 
@@ -109,6 +114,6 @@
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/expense/expense_refund.php

@@ -54,7 +54,7 @@ ob_start();
                     <div class="input-group-prepend">
                         <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                     </div>
-                    <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="amount" value="-<?php echo number_format($expense_amount, 2, '.', ''); ?>" placeholder="-0.00" required>
+                    <input type="text" class="form-control" inputmode="decimal" pattern="-?[0-9]*\.?[0-9]{0,2}" name="amount" value="-<?php echo number_format($expense_amount, 2, '.', ''); ?>" placeholder="-0.00" required>
                 </div>
             </div>
         </div>
@@ -89,4 +89,3 @@ ob_start();
 <?php
 
 require_once '../../../includes/modal_footer.php';
-

agent/modals/file/file_bulk_move.php

@@ -2,17 +2,26 @@
 
 require_once '../../../includes/modal_header.php';
 
-$client_id = intval($_GET['client_id']);
+$client_id = intval($_GET['client_id'] ?? 0);
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$current_folder_id = intval($_GET['current_folder_id'] ?? 0);
 
-$count = count($selected_ids);
+// Selected IDs from JS (may be empty arrays)
+$file_ids      = array_map('intval', $_GET['file_ids']      ?? []);
+$document_ids  = array_map('intval', $_GET['document_ids']  ?? []);
+
+$count_files = count($file_ids);
+$count_docs  = count($document_ids);
+$total       = $count_files + $count_docs;
 
 ob_start();
 
 ?>
 
 <div class="modal-header bg-dark">
-    <h5 class="modal-title"><i class="fa fa-fw fa-exchange-alt mr-2"></i>Move <strong><?= $count ?></strong> Files</h5>
+    <h5 class="modal-title">
+        <i class="fa fa-fw fa-exchange-alt mr-2"></i>
+        Move <strong><?= $total ?></strong> Item<?= $total === 1 ? '' : 's' ?>
+    </h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
@@ -20,10 +29,22 @@ ob_start();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="file_ids[]" value="<?= $id ?>"><?php } ?>
+
+    <?php foreach ($file_ids as $id): ?>
+        <input type="hidden" name="file_ids[]" value="<?= $id ?>">
+    <?php endforeach; ?>
+
+    <?php foreach ($document_ids as $id): ?>
+        <input type="hidden" name="document_ids[]" value="<?= $id ?>">
+    <?php endforeach; ?>
 
     <div class="modal-body">
 
+        <p>
+            Files: <strong><?= $count_files ?></strong><br>
+            Documents: <strong><?= $count_docs ?></strong>
+        </p>
+
         <div class="form-group">
             <label>Target Folder</label>
             <div class="input-group">
@@ -33,40 +54,47 @@ ob_start();
                 <select class="form-control select2" name="bulk_folder_id">
                     <option value="0">/</option>
                     <?php
-                        // Fetch all folders for the client
+                    // NOTE: folder_location is gone now, so just use folder_client_id
-                        $sql_all_folders = mysqli_query($mysqli, "SELECT folder_id, folder_name, parent_folder FROM folders WHERE folder_location = 1 AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                    $sql_all_folders = mysqli_query(
-                        $folders = array();
+                        $mysqli,
-
+                        "SELECT folder_id, folder_name, parent_folder
-                        // Build an associative array of folders indexed by folder_id
+                         FROM folders
-                        while ($row = mysqli_fetch_assoc($sql_all_folders)) {
+                         WHERE folder_client_id = $client_id
-                            $folders[$row['folder_id']] = array(
+                         ORDER BY folder_name ASC"
-                                'folder_id' => intval($row['folder_id']),
-                                'folder_name' => nullable_htmlentities($row['folder_name']),
-                                'parent_folder' => intval($row['parent_folder']),
-                                'children' => array()
                     );
+
+                    $folders = [];
+
+                    while ($row = mysqli_fetch_assoc($sql_all_folders)) {
+                        $folders[$row['folder_id']] = [
+                            'folder_id'    => (int)$row['folder_id'],
+                            'folder_name'  => nullable_htmlentities($row['folder_name']),
+                            'parent_folder'=> (int)$row['parent_folder'],
+                            'children'     => []
+                        ];
                     }
 
-                        // Build the folder hierarchy
+                    // Build hierarchy
                     foreach ($folders as $id => &$folder) {
                         if ($folder['parent_folder'] != 0 && isset($folders[$folder['parent_folder']])) {
                             $folders[$folder['parent_folder']]['children'][] = &$folder;
                         }
                     }
-                        unset($folder); // Break the reference
+                    unset($folder);
 
-                        // Prepare a list of root folders
+                    $root_folders = [];
-                        $root_folders = array();
                     foreach ($folders as $id => $folder) {
                         if ($folder['parent_folder'] == 0) {
                             $root_folders[] = $folder;
                         }
                     }
 
-                        // Display the folder options iteratively
+                    // Optional: if you want to default-select current folder, pass it in GET
-                        $stack = array();
+                    $current_folder_id = intval($_GET['current_folder_id'] ?? 0);
+
+                    $stack = [];
                     foreach (array_reverse($root_folders) as $folder) {
-                            $stack[] = array('folder' => $folder, 'level' => 0);
+                        $stack[] = ['folder' => $folder, 'level' => 0];
                     }
 
                     while (!empty($stack)) {
@@ -74,21 +102,15 @@ ob_start();
                         $folder = $node['folder'];
                         $level  = $node['level'];
 
-                            // Indentation for subfolders
                         $indentation = str_repeat('&nbsp;', $level * 4);
 
-                            // Check if this folder is selected
+                        $selected = ($folder['folder_id'] === $current_folder_id) ? 'selected' : '';
-                            $selected = '';
-                            if ($folder['folder_id'] == $get_folder_id) {
-                                $selected = 'selected';
-                            }
 
                         echo "<option value=\"{$folder['folder_id']}\" $selected>$indentation{$folder['folder_name']}</option>";
 
-                            // Add children to the stack
                         if (!empty($folder['children'])) {
-                                foreach (array_reverse($folder['children']) as $child_folder) {
+                            foreach (array_reverse($folder['children']) as $child) {
-                                    $stack[] = array('folder' => $child_folder, 'level' => $level + 1);
+                                $stack[] = ['folder' => $child, 'level' => $level + 1];
                             }
                         }
                     }
@@ -98,9 +120,14 @@ ob_start();
         </div>
 
     </div>
+
     <div class="modal-footer">
-        <button type="submit" name="bulk_move_files" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Move Files</button>
+        <button type="submit" name="bulk_move_files" class="btn btn-primary text-bold">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+            <i class="fa fa-check mr-2"></i>Move Files
+        </button>
+        <button type="button" class="btn btn-light" data-dismiss="modal">
+            <i class="fa fa-times mr-2"></i>Cancel
+        </button>
     </div>
 </form>
 

agent/modals/folder/folder_add.php

@@ -3,7 +3,6 @@
 require_once '../../../includes/modal_header.php';
 
 $client_id = intval($_GET['client_id'] ?? 0);
-$folder_location = intval($_GET['folder_location'] ?? 0);
 $current_folder_id = intval($_GET['current_folder_id'] ?? 0);
 $folder_name = nullable_htmlentities(getFieldByID('folders', $current_folder_id, 'folder_name') ?? '/');
 
@@ -18,7 +17,6 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="client_id" value="<?= $client_id ?>">
-    <input type="hidden" name="folder_location" value="<?= $folder_location ?>">
     <input type="hidden" name="parent_folder" value="<?= $current_folder_id ?>">
     <div class="modal-body">
 

agent/modals/invoice/invoice_add.php

@@ -97,6 +97,16 @@ ob_start();
             </div>
         </div>
 
+        <div class='form-group'>
+            <label>Discount Amount</label>
+            <div class='input-group'>
+                <div class='input-group-prepend'>
+                    <span class='input-group-text'><i class='fa fa-fw fa-dollar-sign'></i></span>
+                </div>
+                <input type='text' class='form-control' inputmode="decimal" pattern="-?[0-9]*\.?[0-9]{0,2}" name='invoice_discount' placeholder='0.00'>
+            </div>
+        </div>
+
     </div>
     <div class="modal-footer">
         <button type="submit" name="add_invoice" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>

agent/modals/invoice/invoice_bulk_edit_category.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$invoice_ids = array_map('intval', $_GET['invoice_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($invoice_ids);
 
 ob_start();
 
@@ -19,7 +19,7 @@ ob_start();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="invoice_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($invoice_ids as $invoice_id) { ?><input type="hidden" name="invoice_ids[]" value="<?= $invoice_id ?>"><?php } ?>
 
     <div class="modal-body">
 

agent/modals/invoice/invoice_edit.php

@@ -91,7 +91,7 @@ ob_start();
                 <div class='input-group-prepend'>
                     <span class='input-group-text'><i class='fa fa-fw fa-dollar-sign'></i></span>
                 </div>
-                <input type='text' class='form-control' inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name='invoice_discount' placeholder='0.00' value="<?php echo number_format($invoice_discount, 2, '.', ''); ?>">
+                <input type='text' class='form-control' inputmode="decimal" pattern="-?[0-9]*\.?[0-9]{0,2}" name='invoice_discount' placeholder='0.00' value="<?php echo number_format($invoice_discount, 2, '.', ''); ?>">
             </div>
         </div>
 

agent/modals/invoice/invoice_export.php

@@ -1,6 +1,13 @@
-<div class="modal" id="exportInvoicesModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-download mr-2"></i>Export Invoices to CSV</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -8,9 +15,7 @@
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-                <?php if (isset($_GET['client_id'])) { ?>
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <?php } ?>
     <div class="modal-body">
 
         <div class="form-group">
@@ -19,7 +24,7 @@
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
-                            <input type="date" class="form-control" name="date_from" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
+                <input type="date" class="form-control" name="date_from" max="2999-12-31">
             </div>
         </div>
 
@@ -29,7 +34,7 @@
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
-                            <input type="date" class="form-control" name="date_to" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                <input type="date" class="form-control" name="date_to" max="2999-12-31">
             </div>
         </div>
 
@@ -39,6 +44,6 @@
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/invoice/invoice_recurring_add.php

@@ -1,16 +1,27 @@
-<div class="modal" id="addInvoiceRecurringModal<?php echo $invoice_id; ?>" tabindex="-1">
+<?php
-  <div class="modal-dialog">
+
-    <div class="modal-content">
+require_once '../../../includes/modal_header.php';
-      <div class="modal-header text-white">
+
-        <h5 class="modal-title"><i class="fas fa-fw fa-copy mr-2"></i>Make <?php echo "$invoice_prefix$invoice_number"; ?> Recurring</h5>
+$invoice_id = intval($_GET['invoice_id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_id = $invoice_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$invoice_prefix = nullable_htmlentities($row['invoice_prefix']);
+$invoice_number = intval($row['invoice_number']);
+
+ob_start();
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-copy mr-2"></i>Invoice <?= "$invoice_prefix$invoice_number" ?> to Recurring Invoice</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+        <span>&times;</span>
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>"> 
+    <input type="hidden" name="invoice_id" value="<?= $invoice_id ?>">
     <div class="modal-body">
-          
         <div class="form-group">
             <label>Frequency <strong class="text-danger">*</strong></label>
             <div class="input-group">
@@ -24,13 +35,12 @@
                 </select>
             </div>
         </div>
-        
     </div>
     <div class="modal-footer">
         <button type="submit" name="add_invoice_recurring" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create Recurring Invoice</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-    </div>
+
-  </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/invoice/item_edit.php

@@ -47,7 +47,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
                         </div>
-                        <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="qty" value="<?php echo number_format($item_quantity, 2); ?>" placeholder="0.00" required>
+                        <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="qty" value="<?php echo number_format($item_quantity, 2); ?>" placeholder="0.00" required>
                     </div>
                 </div>
             </div>
@@ -59,7 +59,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                         </div>
-                        <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="price" value="<?php echo number_format($item_price, 2, '.', ''); ?>" placeholder="0.00" required>
+                        <input type="text" class="form-control" inputmode="decimal" pattern="-?[0-9]*\.?[0-9]{0,2}" name="price" value="<?php echo number_format($item_price, 2, '.', ''); ?>" placeholder="0.00" required>
                     </div>
                 </div>
             </div>

agent/modals/location/location_bulk_assign_tags.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$location_ids = array_map('intval', $_GET['location_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($location_ids);
 
 ob_start();
 
@@ -18,7 +18,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="location_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($location_ids as $location_id) { ?><input type="hidden" name="location_ids[]" value="<?= $location_id ?>"><?php } ?>
     <input type="hidden" name="bulk_remove_tags" value="0">
     <div class="modal-body">
 

agent/modals/location/location_export.php

@@ -1,6 +1,13 @@
-<div class="modal" id="exportLocationModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Locations to CSV</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -8,9 +15,7 @@
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-                <?php if ($client_url) { ?>
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <?php } ?>
     <div class="modal-body">
 
     </div>
@@ -19,6 +24,6 @@
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/location/location_import.php

@@ -1,6 +1,13 @@
-<div class="modal" id="importLocationModal" tabindex="-1">
+<?php
-	<div class="modal-dialog">
+
-		<div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
 	<h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>Import Locations</h5>
 	<button type="button" class="close text-white" data-dismiss="modal">
@@ -8,9 +15,8 @@
 	</button>
 </div>
 <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-				<?php if ($client_url) { ?>
+	<input type="hidden" name="client_id" value="<?= $client_id ?>">
-				<input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+
-				<?php } ?>
 	<div class="modal-body">
 		<p><strong>Format csv file with headings & data:</strong><br>Name, Description, Address, City, State, Postal Code, Phone, Hours</p>
 		<hr>
@@ -18,13 +24,13 @@
 			<input type="file" class="form-control-file" name="file" accept=".csv" required>
 		</div>
 		<hr>
-					<div>Download: <a class="text-bold" href="post.php?download_locations_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
+		<div>Download: <a class="text-bold" href="post.php?download_locations_csv_template=<?= $client_id ?>">sample csv template</a></div>
 	</div>
 	<div class="modal-footer">
 		<button type="submit" name="import_locations_csv" class="btn btn-primary text-bold"><i class="fa fa-upload mr-2"></i>Import</button>
 		<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
 	</div>
 </form>
-		</div>
+
-	</div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/network/network_export.php

@@ -1,6 +1,13 @@
-<div class="modal" id="exportNetworkModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
 <div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Networks to CSV</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -8,9 +15,7 @@
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-                <?php if ($client_url) { ?>
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <?php } ?>
     <div class="modal-body">
 
     </div>
@@ -19,6 +24,6 @@
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
-        </div>
+
-    </div>
+<?php
-</div>
+require_once '../../../includes/modal_footer.php';

agent/modals/payment/invoice_apply_credit.php

@@ -39,7 +39,7 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-wallet"></i></span>
                 </div>
-                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount_credit_applied" value="<?php echo number_format($credit_balance, 2, '.', ''); ?>" placeholder="0.00" required>
+                <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="amount_credit_applied" value="<?php echo number_format($credit_balance, 2, '.', ''); ?>" placeholder="0.00" required>
             </div>
         </div>
 

agent/modals/payment/payment_add.php

@@ -71,7 +71,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                         </div>
-                        <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($balance, 2, '.', ''); ?>" placeholder="0.00" required>
+                        <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($balance, 2, '.', ''); ?>" placeholder="0.00" required>
                     </div>
                 </div>
 

agent/modals/payment/payment_bulk_add.php

@@ -74,7 +74,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                         </div>
-                        <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($balance, 2, '.', ''); ?>" placeholder="0.00" required>
+                        <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($balance, 2, '.', ''); ?>" placeholder="0.00" required>
                     </div>
                 </div>