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,165 @@
 
 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
+- Fix broken edit Payment Method.
+- Fix unable to delete Vendor Template.
+- Fix Mail Queue link in flash alert for testing email and sending a quote.
+- Add Show Category Type select if not defined.
+- Add Show Product Type select if not defined.
+- Fix add ticket watcher.
+- Fix if Client isn't assigned to a ticket dont show client view.
+- Fix missing session client id check when paying an invoice from client portal.
+- Update Composer Webklex-IMAP library dependency symfony/http-foundation from 7.3.3 to 7.3.7 to fix security related issues.
+- Add back delete Payment provider the database will handle cascade deletes to saved cards, recurring payments and client payment provider reference.
+- Don't show Client Tickets Breadcrumb if no client is assigned to a ticket.
+- Don't Show Contact or Assignment Tab in edit ticket if no Client is Assigned.
+- Don't Show add contact, asset, vendor, watcher if not client is assigned to a ticket.
+- Don't Show Public Comment & Email if contact email doesn't exist.
+- Fixed IMAP Test whicn now uses RAW TCP Connection instead of the depracated php-imap extension.
+- Fix Broken Link in Ticket Updates via Client Portal to agent.
+
+### Added / Changed
+- [Feature] Added Asset Tags.
+- [Feature] Added Quick Add Links to most side bar navs example quickly add a client from sidebar.
+- Migrate ticket template add to ajax modal.
+- Add TOTP secret to Client Export PDF in Credential section.
+- Add UserID on hover in users listing.
+- Merge ticket now redirects to the new ticket details page.
+- [Feature] Add Pay via saved card under invoice Listings.
+- Ticket Related Side Items UI Cleanup to use btn-tool class. 
+
+## [25.11] Stable
+
+### Deprecation Notice:
+- **Outdated CRON Scripts**: The following scripts are removed.
+  - `/scripts/cron_mail_queue.php`
+  - `/scripts/cron_ticket_email_parser.php`
+  - `/scripts/cron.php`
+  - `/scripts/cron_domain_refresher.php`
+  - `/scripts/cron_certificate_refresher.php`
+  
+  **Action Required**: Transition to the new versions:
+  - `/cron/mail_queue.php`
+  - `/cron/ticket_email_parser.php`
+  - `/cron/cron.php`
+  - `/cron/domain_refresher.php`
+  - `/cron/certificate_refresher.php`
+
+- PHP Extensions php-imap and php-mime-mail-parser are no longer required.
+---
+
+### Fixes
+- **Ticket Listing**: Resolved issue where the “Check All” checkbox was visible even when ticket status wasn’t set. Now hidden for closed tickets only.
+- **Timer Auto-Start**: Show H/M/S placeholders when timer auto-start is disabled.
+- **Ticket Guest URL**: Fixed email not including the ticket guest URL key.
+- **EML Generation**: Resolved issue with EML not being generated in the new ticket parser.
+- **New Ticket Mail Notification**: Included message when notifying the tech of a reply in the new ticket mail parser.
+- **Advanced Filter Collapse**: Added clause to prevent collapse of advanced filters when the “from” date is set to the default (1970-01-01).
+- **Recurring Invoice**: Fixed issue where email was marked as sent but not actually sent when forcing a recurring invoice to an invoice.
+- **CSRF Token**: Fixed issue with deleting recurring ticket from asset details page due to missing CSRF check token.
+- **Vendor Website Link**: Fixed missing `https://` prefix in the vendor website link on the vendor details modal.
+- **Agent Select Box**: Resolved issue where agents sometimes didn’t appear in the agent select boxes.
+- **TinyMCE**: Fixed TinyMCE editor issue on Bulk Create Ticket in Assets.
+- **Ticket Timer**: Fixed ticket timer initialization after reload and when the tab is put to sleep (background tab).
+- **Client Deletion**: Fixed issue with client deletion.
+- **Domain Records**: Added flag for missing SOA record when adding a domain (prevents subdomain creation).
+- **Domain Fetching**: Quits domain record fetching if no SOA record exists (prevents subdomains).
+- **Domain Expiry**: Only show time to expiry when there’s an expiry date set; otherwise, display a dash.
+- **Certificates**: Improved handling of empty date in the agent UI.
+- **Certificates API**: Fixed bug with missing JS to fetch certificate details.
+- **API Updates**:
+  - Clients API: Added support for archiving/un-archiving clients, updating client data, and abbreviation support.
+  - Contacts API: Added archiving/un-archiving and restriction to only allow one primary contact per client.
+  - Mail Queue: Added recipient domain MX validation before sending emails.
+
+---
+
+### Added / Changed
+- **Backup / Restore**: Improved backup and restore by streaming data to disk (to prevent memory issues), setting unlimited timeouts, checking for bad backup contents, and using PHP for DB import instead of shell exec. Added `.htaccess` to prevent PHP execution in `/uploads/` directory.
+- **Ajax Modals**: Migrated all Add and Bulk modals to the new Ajax Modal for improved performance.
+- **Recurring Ticket Sorting**: Default sorting of recurring tickets by `RunDate` instead of subject.
+- **Recurring Ticket Enhancements**:
+  - Added Billable column.
+  - Added bulk actions for setting priority, agent, billable status, and next run dates.
+  - Added filters for category, assigned agent, and billable status.
+  - Added new frequency options: 3-day and biweekly.
+- **Asset Select**: Updated asset select dropdown to separate asset types using opt groups (planned for wider use).
+- **Expiring Domains & Certificates**: Added "30 Day" warning for expiring domains and certificates in the dashboard.
+- **Ticket Search**: Allowed search using both ticket prefix and number.
+- **Recurring Invoice**: Cancel recurring invoices when the associated client is archived.
+- **Credentials Import/Export**: Now includes TOTP secrets when importing/exporting credentials.
+- **Asset Notes Import**: Allowed importing of asset notes.
+- **Ticket View**: Added a "View HTML Code" button in all ticket views for TinyMCE.
+- **Date Range Picker**: Updated all date filters to use the improved DateRangePicker JS.
+- **Bulk Ticket Creation**: Added bulk ticket creation for clients.
+- **Sidebar Updates**: Updated all sidebars to use absolute paths for easier integration with custom code.
+- **Document Actions**: Added Archive and Delete buttons to the Document Details view with improved redirect behavior.
+- **Ticket Template Sorting**: Allowed sorting by task count in ticket templates.
+- **Contact Modal UI**: Updated contact details modal to display contact information at the top.
+- **API & Code Updates**: 
+  - Separated out post files for recurring tickets, invoices, expenses, and payments.
+  - Removed unused budget code.
+- **Invoice Product Autocomplete**: Now allows searching for product codes as well as names.
+- **Client Duplicate Check**: Flags duplicate clients or leads when using the client add modal.
+- **Recurring Invoice Reference**: Added a column to invoices indicating if they were created from a recurring invoice.
+- **Global Search Enhancements**: 
+  - Allowed ticket details to be searchable in global search.
+  - Allowed searching for quotes in global search.
+- **UI/UX Improvements**:
+  - Spruced up the ticket details page UI.
+  - Added contact email validation to flag duplicates or invalid addresses.
+- **API Debugging**: Log API endpoint/URL path for authentication failures to aid in debugging.
+- **Image Upload Optimization**: Removed image optimization from uploads (this will be handled by a cron job in the future).
+- **View Behavior Change**: Updated ticket/invoice/quote views to always be in the Client section, showing client-side navigation and top info bar.
+
+---
+
+### Library Updates:
+- **DataTable**: Bumped from 2.3.3 to 2.3.4.
+- **TinyMCE**: Bumped from 8.0.2 to 8.2.0.
+- **Stripe-PHP**: Bumped from 17.6.0 to 18.1.0.
+- **PHPMailer**: Bumped from 6.10.0 to 7.0.0.
+- **Chart.js**: Bumped from 4.5.0 to 4.5.1.
+
+
+
+
 ## [25.10.1]
 - Deprecation Notice: `/scripts/cron_mail_queue.php` , `/scripts/cron_ticket_email_parser.php` , `/scripts/cron.php` `/scripts/cron_domain_refresher.php`, `/scripts/cron_certificate_refresher.php` are being phased out. Please transition to `/cron/mail_queue.php` , `/cron/ticket_email_parser.php`, `/cron/cron.php`, `/cron/domain_refresher.php`, `/cron/certificate_refresher.php` These older scripts will be removed in the November 25.11 release—update accordingly. 25.10.1 installs have the script already configured.
 

admin/ai_model.php

@@ -16,7 +16,7 @@ $num_rows = mysqli_num_rows($sql);
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-robot mr-2"></i>AI Models</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAIModelModal"><i class="fas fa-plus mr-2"></i>Add Model</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/ai/ai_model_add.php"><i class="fas fa-plus mr-2"></i>Add Model</button>
         </div>
     </div>
     <div class="card-body">
@@ -104,5 +104,4 @@ $num_rows = mysqli_num_rows($sql);
 </div>
 
 <?php
-require_once "modals/ai/ai_model_add.php";
 require_once "../includes/footer.php";

admin/ai_provider.php

@@ -16,7 +16,7 @@ $num_rows = mysqli_num_rows($sql);
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-robot mr-2"></i>AI Providers</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAIProviderModal"><i class="fas fa-plus mr-2"></i>Add Provider</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/ai/ai_provider_add.php"><i class="fas fa-plus mr-2"></i>Add Provider</button>
         </div>
     </div>
     <div class="card-body">
@@ -105,5 +105,4 @@ $num_rows = mysqli_num_rows($sql);
 </div>
 
 <?php
-require_once "modals/ai/ai_provider_add.php";
 require_once "../includes/footer.php";

admin/api_keys.php

@@ -18,159 +18,150 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
-    <div class="card card-dark">
+<div class="card card-dark">
-        <div class="card-header py-2">
+    <div class="card-header py-2">
-            <h3 class="card-title mt-2"><i class="fas fa-fw fa-key mr-2"></i>API Keys</h3>
+        <h3 class="card-title mt-2"><i class="fas fa-fw fa-key mr-2"></i>API Keys</h3>
-            <div class="card-tools">
+        <div class="card-tools">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addApiKeyModal"><i class="fas fa-plus mr-2"></i>Create</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/api/api_key_add.php"><i class="fas fa-plus mr-2"></i>New API Key</button>
-            </div>
-        </div>
-
-        <div class="card-body">
-
-            <form autocomplete="off">
-                <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 keys">
-                            <div class="input-group-append">
-                                <button class="btn btn-primary"><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">
-                                    <button class="dropdown-item text-danger text-bold"
-                                            type="submit" form="bulkActions" name="bulk_delete_api_keys">
-                                        <i class="fas fa-fw fa-trash mr-2"></i>Revoke
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-
-            </form>
-            <hr>
-
-            <div class="table-responsive-sm">
-
-                <form id="bulkActions" action="post.php" method="post">
-                    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-
-                    <table class="table table-striped table-borderless table-hover">
-                        <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-                        <tr>
-                            <td class="pr-0">
-                                <div class="form-check">
-                                    <input class="form-check-input" type="checkbox" onclick="checkAll(this)">
-                                </div>
-                            </td>
-                            <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_name&order=<?php echo $disp; ?>">
-                                    Name <?php if ($sort == 'api_key_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_client_id&order=<?php echo $disp; ?>">
-                                    Client <?php if ($sort == 'api_key_client_id') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_secret&order=<?php echo $disp; ?>">
-                                    Secret <?php if ($sort == 'api_key_secret') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_created_at&order=<?php echo $disp; ?>">
-                                    Created <?php if ($sort == 'api_key_created_at') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_expire&order=<?php echo $disp; ?>">
-                                    Expires <?php if ($sort == 'api_key_expire') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th class="text-center">Action</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <?php
-
-                        while ($row = mysqli_fetch_array($sql)) {
-                            $api_key_id = intval($row['api_key_id']);
-                            $api_key_name = nullable_htmlentities($row['api_key_name']);
-                            $api_key_secret = nullable_htmlentities("************" . substr($row['api_key_secret'], -4));
-                            $api_key_created_at = nullable_htmlentities($row['api_key_created_at']);
-                            $api_key_expire = nullable_htmlentities($row['api_key_expire']);
-                            if ($api_key_expire < date("Y-m-d H:i:s")) {
-                                $api_key_expire = $api_key_expire . " (Expired)";
-                            }
-
-                            if ($row['api_key_client_id'] == 0) {
-                                $api_key_client = "<i>All Clients</i>";
-                            } else {
-                                $api_key_client = nullable_htmlentities($row['client_name']);
-                            }
-
-                            ?>
-                            <tr>
-                                <td class="pr-0">
-                                    <div class="form-check">
-                                        <input class="form-check-input bulk-select" type="checkbox" name="api_key_ids[]" value="<?php echo $api_key_id ?>">
-                                    </div>
-                                </td>
-
-                                <td class="text-bold"><?php echo $api_key_name; ?></td>
-
-                                <td><?php echo $api_key_client; ?></td>
-
-                                <td><?php echo $api_key_secret; ?></td>
-
-                                <td><?php echo $api_key_created_at; ?></td>
-
-                                <td><?php echo $api_key_expire; ?></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 text-danger text-bold confirm-link" href="post.php?delete_api_key=<?php echo $api_key_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                                <i class="fas fa-fw fa-times mr-2"></i>Revoke
-                                            </a>
-                                        </div>
-                                    </div>
-                                </td>
-                            </tr>
-
-                        <?php } ?>
-
-
-                        </tbody>
-                    </table>
-
-                </form>
-
-            </div>
-            <?php require_once "../includes/filter_footer.php";
- ?>
         </div>
     </div>
 
-    <script src="../js/bulk_actions.js"></script>
+    <div class="card-body">
+
+        <form autocomplete="off">
+            <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 keys">
+                        <div class="input-group-append">
+                            <button class="btn btn-primary"><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">
+                                <button class="dropdown-item text-danger text-bold"
+                                        type="submit" form="bulkActions" name="bulk_delete_api_keys">
+                                    <i class="fas fa-fw fa-trash mr-2"></i>Revoke
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+
+        </form>
+        <hr>
+
+        <div class="table-responsive-sm">
+
+            <form id="bulkActions" action="post.php" method="post">
+                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+                <table class="table table-striped table-borderless table-hover">
+                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                    <tr>
+                        <td class="pr-0">
+                            <div class="form-check">
+                                <input class="form-check-input" type="checkbox" onclick="checkAll(this)">
+                            </div>
+                        </td>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_name&order=<?php echo $disp; ?>">
+                                Name <?php if ($sort == 'api_key_name') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_client_id&order=<?php echo $disp; ?>">
+                                Client <?php if ($sort == 'api_key_client_id') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_secret&order=<?php echo $disp; ?>">
+                                Secret <?php if ($sort == 'api_key_secret') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_created_at&order=<?php echo $disp; ?>">
+                                Created <?php if ($sort == 'api_key_created_at') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_expire&order=<?php echo $disp; ?>">
+                                Expires <?php if ($sort == 'api_key_expire') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
+
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $api_key_id = intval($row['api_key_id']);
+                        $api_key_name = nullable_htmlentities($row['api_key_name']);
+                        $api_key_secret = nullable_htmlentities("************" . substr($row['api_key_secret'], -4));
+                        $api_key_created_at = nullable_htmlentities($row['api_key_created_at']);
+                        $api_key_expire = nullable_htmlentities($row['api_key_expire']);
+                        if ($api_key_expire < date("Y-m-d H:i:s")) {
+                            $api_key_expire = $api_key_expire . " (Expired)";
+                        }
+
+                        if ($row['api_key_client_id'] == 0) {
+                            $api_key_client = "<i>All Clients</i>";
+                        } else {
+                            $api_key_client = nullable_htmlentities($row['client_name']);
+                        }
+
+                        ?>
+                        <tr>
+                            <td class="pr-0">
+                                <div class="form-check">
+                                    <input class="form-check-input bulk-select" type="checkbox" name="api_key_ids[]" value="<?php echo $api_key_id ?>">
+                                </div>
+                            </td>
+                            <td class="text-bold"><?php echo $api_key_name; ?></td>
+                            <td><?php echo $api_key_client; ?></td>
+                            <td><?php echo $api_key_secret; ?></td>
+                            <td><?php echo $api_key_created_at; ?></td>
+                            <td><?php echo $api_key_expire; ?></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 text-danger text-bold confirm-link" href="post.php?delete_api_key=<?php echo $api_key_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                            <i class="fas fa-fw fa-times mr-2"></i>Revoke
+                                        </a>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                    <?php } ?>
+
+
+                    </tbody>
+                </table>
+
+            </form>
+
+        </div>
+        <?php require_once "../includes/filter_footer.php"; ?>
+    </div>
+</div>
+
+<script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/api/api_key_add.php";
-
 require_once "../includes/footer.php";
 

admin/contract_template.php

@@ -0,0 +1,125 @@
+<?php
+
+// Default Column Sort by Filter
+$sort = "contract_template_name";
+$order = "ASC";
+
+require_once "includes/inc_all_admin.php";
+
+// Search query
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM contract_templates
+    WHERE contract_template_name LIKE '%$q%' OR contract_template_type LIKE '%$q%' OR contract_template_name LIKE '%$q%'
+    ORDER BY $sort $order LIMIT $record_from, $record_to"
+);
+
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+
+?>
+
+<div class="card card-dark">
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-file-contract mr-2"></i>Contract Templates</h3>
+        <div class="card-tools">
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/contract_template/contract_template_add.php" data-modal-size="lg">
+                <i class="fas fa-plus mr-2"></i>New Template
+            </button>
+        </div>
+    </div>
+    <div class="card-body">
+
+        <form autocomplete="off">
+            <div class="input-group">
+                <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search templates">
+                <div class="input-group-append">
+                    <button class="btn btn-secondary"><i class="fa fa-search"></i></button>
+                </div>
+            </div>
+        </form>
+        <hr>
+
+        <div class="table-responsive-sm">
+            <table class="table table-striped table-borderless table-hover">
+                <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                    <tr>
+                        <th>Template Name</th>
+                        <th>Type</th>
+                        <th>Update Frequency</th>
+                        <th>SLA (L/M/H Response)</th>
+                        <th>SLA (L/M/H Resolution)</th>
+                        <th>Hourly Rate</th>
+                        <th>After Hours Rate</th>
+                        <th>Support Hours</th>
+                        <th>Net Terms</th>
+                        <th>Created</th>
+                        <th>Updated</th>
+                        <th class="text-center">Action</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $id = intval($row['contract_template_id']);
+                            $name = nullable_htmlentities($row['contract_template_name']);
+                            $type = nullable_htmlentities($row['contract_template_type']);
+                            $freq = nullable_htmlentities($row['contract_template_update_frequency']);
+                            $sla_low_resp = nullable_htmlentities($row['sla_low_response_time']);
+                            $sla_med_resp = nullable_htmlentities($row['sla_medium_response_time']);
+                            $sla_high_resp = nullable_htmlentities($row['sla_high_response_time']);
+                            $sla_low_res = nullable_htmlentities($row['sla_low_resolution_time']);
+                            $sla_med_res = nullable_htmlentities($row['sla_medium_resolution_time']);
+                            $sla_high_res = nullable_htmlentities($row['sla_high_resolution_time']);
+                            $hourly_rate = nullable_htmlentities($row['contract_template_hourly_rate']);
+                            $after_hours = nullable_htmlentities($row['contract_template_after_hours_hourly_rate']);
+                            $support_hours = nullable_htmlentities($row['contract_template_support_hours']);
+                            $net_terms = nullable_htmlentities($row['contract_template_net_terms']);
+                            $created = nullable_htmlentities($row['contract_template_created_at']);
+                            $updated = nullable_htmlentities($row['contract_template_updated_at']);
+                    ?>
+                    <tr>
+                        <td>
+                            <a class="text-bold" href="contract_template_details.php?contract_template_id=<?php echo $id; ?>">
+                                <i class="fas fa-fw fa-file-alt text-dark"></i> <?php echo $name; ?>
+                            </a>
+                            <div class="mt-1 text-secondary"><?php echo nullable_htmlentities($row['contract_template_description']); ?></div>
+                        </td>
+                        <td><?php echo $type; ?></td>
+                        <td><?php echo $freq; ?></td>
+                        <td><?php echo "$sla_low_resp / $sla_med_resp / $sla_high_resp"; ?></td>
+                        <td><?php echo "$sla_low_res / $sla_med_res / $sla_high_res"; ?></td>
+                        <td><?php echo $hourly_rate; ?></td>
+                        <td><?php echo $after_hours; ?></td>
+                        <td><?php echo $support_hours; ?></td>
+                        <td><?php echo $net_terms; ?></td>
+                        <td><?php echo $created; ?></td>
+                        <td><?php echo $updated; ?></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="xl"
+                                        data-modal-url="modals/contract_template/contract_template_edit.php?id=<?= $id ?>">
+                                        <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                                    </a>
+                                    <div class="dropdown-divider"></div>
+                                    <a class="dropdown-item text-danger text-bold" href="post.php?delete_contract_template=<?php echo $id; ?>">
+                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                    </a>
+                                </div>
+                            </div>
+                        </td>
+                    </tr>
+                    <?php } ?>
+                </tbody>
+            </table>
+            <br>
+        </div>
+        <?php require_once "../includes/filter_footer.php"; ?>
+    </div>
+</div>
+
+<?php require_once "../includes/footer.php"; ?>

admin/custom_link.php

@@ -21,7 +21,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <div class="card-header py-2">
             <h3 class="card-title mt-2"><i class="fas fa-fw fa-external-link-alt mr-2"></i>Custom Links</h3>
             <div class="card-tools">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addLinkModal"><i class="fas fa-plus mr-2"></i>New Link</button>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/custom_link/custom_link_add.php"><i class="fas fa-plus mr-2"></i>New Link</button>
             </div>
         </div>
 
@@ -145,5 +145,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "modals/custom_link/custom_link_add.php";
 require_once "../includes/footer.php";

admin/database_updates.php

@@ -4033,10 +4033,111 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.6'");
     }
 
-    // if (CURRENT_DATABASE_VERSION == '2.3.5') {
+    if (CURRENT_DATABASE_VERSION == '2.3.6') {
-    //     // Insert queries here required to update to DB version 2.3.5
+        // Create New Contract Templates Table
+        mysqli_query($mysqli, "CREATE TABLE `contract_templates` (
+          `contract_template_id` INT(11) AUTO_INCREMENT PRIMARY KEY,
+          `contract_template_name` VARCHAR(255) NOT NULL,
+          `contract_template_description` TEXT NULL DEFAULT NULL,
+          `contract_template_type` VARCHAR(50) NULL DEFAULT NULL,
+
+          `contract_template_sla_low_response_time` INT(11) NULL DEFAULT NULL,
+          `contract_template_sla_low_resolution_time` INT(11) NULL DEFAULT NULL,
+          `contract_template_sla_medium_response_time` INT(11) NULL DEFAULT NULL,
+          `contract_template_sla_medium_resolution_time` INT(11) NULL DEFAULT NULL,
+          `contract_template_sla_high_response_time` INT(11) NULL DEFAULT NULL,
+          `contract_template_sla_high_resolution_time` INT(11) NULL DEFAULT NULL,
+
+          `contract_template_rate_standard` DECIMAL(10,2) NULL DEFAULT NULL,
+          `contract_template_rate_after_hours` DECIMAL(10,2) NULL DEFAULT NULL,
+
+          `contract_template_net_terms` VARCHAR(50) NULL DEFAULT NULL,
+          `contract_template_support_hours` VARCHAR(100) NULL DEFAULT NULL,
+          `contract_template_renewal_frequency` VARCHAR(50) NULL DEFAULT NULL,
+
+          `contract_template_details` TEXT NULL DEFAULT NULL,
+
+          `contract_template_created_at` DATETIME DEFAULT CURRENT_TIMESTAMP,
+          `contract_template_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP,
+          `contract_template_archived_at` DATETIME NULL DEFAULT NULL
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;");
+
+
+        // Create New Contracts Table
+        mysqli_query($mysqli, "CREATE TABLE `contracts` (
+            `contract_id` INT(11) AUTO_INCREMENT PRIMARY KEY,
+            `contract_name` VARCHAR(255) NOT NULL,
+            `contract_status` VARCHAR(50) NOT NULL,
+            `contract_type` VARCHAR(50) NOT NULL,
+
+            `contract_sla_low_response_time` INT(11) NULL DEFAULT NULL,
+            `contract_sla_low_resolution_time` INT(11) NULL DEFAULT NULL,
+            `contract_sla_medium_response_time` INT(11) NULL DEFAULT NULL,
+            `contract_sla_medium_resolution_time` INT(11) NULL DEFAULT NULL,
+            `contract_sla_high_response_time` INT(11) NULL DEFAULT NULL,
+            `contract_sla_high_resolution_time` INT(11) NULL DEFAULT NULL,
+
+            `contract_details` TEXT NULL DEFAULT NULL,
+
+            `contract_client_id` INT(11) NULL DEFAULT NULL,
+            `contract_client_name` VARCHAR(255) NULL DEFAULT NULL,
+            `contract_client_address` TEXT NULL DEFAULT NULL,
+            `contract_client_email` VARCHAR(255) NULL DEFAULT NULL,
+            `contract_client_phone` VARCHAR(100) NULL DEFAULT NULL,
+
+            `contract_contact_name` VARCHAR(255) NULL DEFAULT NULL,
+            `contract_contact_signature` TEXT NULL DEFAULT NULL,
+            `contract_contact_signature_date` DATETIME NULL DEFAULT NULL,
+
+            `contract_agent_name` VARCHAR(255) NULL DEFAULT NULL,
+            `contract_agent_signature` TEXT NULL DEFAULT NULL,
+            `contract_agent_signature_date` DATETIME NULL DEFAULT NULL,
+
+            `contract_rate_standard` DECIMAL(10,2) NULL DEFAULT NULL,
+            `contract_rate_after_hours` DECIMAL(10,2) NULL DEFAULT NULL,
+
+            `contract_net_terms` VARCHAR(50) NULL DEFAULT NULL,
+            `contract_support_hours` VARCHAR(100) NULL DEFAULT NULL,
+
+            `contract_start_date` DATE NULL DEFAULT NULL,
+            `contract_end_date` DATE NULL DEFAULT NULL,
+            `contract_renewal_frequency` VARCHAR(50) NULL DEFAULT NULL,
+
+            `contract_created_at` DATETIME DEFAULT CURRENT_TIMESTAMP,
+            `contract_updated_at` DATETIME NULL ON UPDATE CURRENT_TIMESTAMP,
+            `contract_archived_at` DATETIME NULL DEFAULT NULL,
+
+            FOREIGN KEY (`contract_client_id`) REFERENCES `clients`(`client_id`)
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;");
+        
+        mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.7'");
+    }
+
+    if (CURRENT_DATABASE_VERSION == '2.3.7') {
+
+        mysqli_query($mysqli, "
+            CREATE TABLE `asset_tags` (
+                `asset_tag_asset_id` INT(11) NOT NULL,
+                `asset_tag_tag_id` INT(11) NOT NULL,
+                PRIMARY KEY (`asset_tag_asset_id`, `asset_tag_tag_id`),
+                CONSTRAINT `fk_asset`
+                    FOREIGN KEY (`asset_tag_asset_id`)
+                    REFERENCES `assets`(`asset_id`)
+                    ON DELETE CASCADE,
+                CONSTRAINT `fk_tag`
+                    FOREIGN KEY (`asset_tag_tag_id`)
+                    REFERENCES `tags`(`tag_id`)
+                    ON DELETE CASCADE
+            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+        ");
+   
+        mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.8'");
+    }
+
+    // if (CURRENT_DATABASE_VERSION == '2.3.8') {
+    //     // Insert queries here required to update to DB version 2.3.9
     //     // Then, update the database to the next sequential version
-    //     mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.6'");
+    //     mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.9'");
     // }
 
 } else {

admin/debug.php

@@ -46,14 +46,13 @@ $systemInfo[] = [
 // Section: PHP Extensions
 $phpExtensions = [];
 $extensions = [
-    'php-mailparse' => 'mailparse',
-    'php-imap' => 'imap',
     'php-mysqli' => 'mysqli',
     'php-intl' => 'intl',
     'php-curl' => 'curl',
     'php-mbstring' => 'mbstring',
     'php-gd' => 'gd',
     'php-zip' => 'zip',
+    'php-xml' => 'xml',
 ];
 
 foreach ($extensions as $name => $ext) {
@@ -684,7 +683,7 @@ $mysqli->close();
                 </tbody>
             </table>
         </div>
-        
+
 
         <!-- Database Structure Comparison Table -->
         <h3 class="mt-3">Database Structure Comparison</h3>
@@ -767,4 +766,3 @@ $mysqli->close();
 <?php
 
 require_once "../includes/footer.php";
-

admin/document_template.php

@@ -22,7 +22,7 @@
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fa fa-fw fa-file mr-2"></i>Document Templates</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDocumentTemplateModal">
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/document_template/document_template_add.php" data-modal-size="xl">
                 <i class="fas fa-plus mr-2"></i>New Template
             </button>
         </div>
@@ -121,38 +121,4 @@
     </div>
 </div>
 
-<?php require_once "modals/document_template/document_template_add.php"; ?>
+<?php require_once "../includes/footer.php";
-<?php require_once "../includes/footer.php"; ?>
-
-<script>
-$(document).ready(function(){
-
-    $('#generateAIContent').on('click', function(){
-        var prompt = $('#aiPrompt').val().trim();
-        if(prompt === '') {
-            alert('Please enter a prompt.');
-            return;
-        }
-
-        $('#generateAIContent').prop('disabled', true).html('<i class="fa fa-spinner fa-spin"></i> Generating...');
-
-        $.ajax({
-            url: 'post.php?ai_create_document_template', // The PHP script that calls the OpenAI API
-            method: 'POST',
-            data: { prompt: prompt },
-            dataType: 'html',
-            success: function(response) {
-                // Assuming you have exactly one TinyMCE instance on the page
-                // and it's targeting the .tinymce textarea:
-                tinymce.activeEditor.setContent(response);
-            },
-            error: function() {
-                alert('Error generating content. Please try again.');
-            },
-            complete: function() {
-                $('#generateAIContent').prop('disabled', false).html('<i class="fa fa-fw fa-magic mr-1"></i>Generate with AI');
-            }
-        });
-    });
-});
-</script>

admin/document_template_details.php

@@ -15,7 +15,13 @@ if (isset($_GET['document_template_id'])) {
     $document_template_id = intval($_GET['document_template_id']);
 }
 
-$sql_document = mysqli_query($mysqli, "SELECT * FROM document_templates WHERE document_template_id = $document_template_id");
+$sql_document = mysqli_query($mysqli, "SELECT * FROM document_templates WHERE document_template_id = $document_template_id LIMIT 1");
+
+if (mysqli_num_rows($sql_document) == 0) {
+    echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1><a class='btn btn-lg btn-secondary mt-3' href='javascript:history.back()'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>";
+    require_once "../includes/footer.php";
+    exit();
+}
 
 $row = mysqli_fetch_array($sql_document);
 

admin/includes/side_nav.php

@@ -27,12 +27,14 @@
                         <p>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>Modules</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>
@@ -91,7 +93,7 @@
                             <p>AI Models</p>
                         </a>
                     </li>
-                
+
                 <?php if ($config_module_enable_ticketing) { ?>
                     <li class="nav-item">
                         <a href="/admin/ticket_status.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ticket_status.php' ? 'active' : ''); ?>">
@@ -110,6 +112,17 @@
                 <?php if ($config_module_enable_itdoc) { ?>
                     <li class="nav-header">TEMPLATES</li>
 
+                    <!-- 2025-11-16 JQ - Hide Contracts not yet ready
+                    <li class="nav-item">
+                        <a href="/admin/contract_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'contract_template.php' ? 'active' : ''); ?>">
+                            <i class="nav-icon fas fa-file-contract"></i>
+                            <p>
+                                <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/contract_template/contract_template_add.php" data-modal-size="lg"></span>
+                                Contract Templates
+                            </p>
+                        </a>
+                    </li>
+                    -->
                     <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>
@@ -285,7 +298,7 @@
                 </li>
 
                 <?php
-                $sql_custom_links = mysqli_query($mysqli, "SELECT * FROM custom_links 
+                $sql_custom_links = mysqli_query($mysqli, "SELECT * FROM custom_links
                     WHERE custom_link_location = 4 AND custom_link_archived_at IS NULL
                     ORDER BY custom_link_order ASC, custom_link_name ASC"
                 );

admin/modals/ai/ai_model_add.php

@@ -1,73 +1,77 @@
-<div class="form-group">
+<?php
-    <div class="modal" id="addAIModelModal" tabindex="-1">
+
-    <div class="modal-dialog">
+require_once '../../../includes/modal_header.php';
-        <div class="modal-content">
+
-            <div class="modal-header bg-dark">
+ob_start();
-                <h5 class="modal-title"><i class="fa fa-fw fa-robot mr-2"></i>Add AI Model</h5>
+
-                <button type="button" class="close text-white" data-dismiss="modal">
+?>
-                    <span>&times;</span>
+
-                </button>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-robot mr-2"></i>Add AI Model</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="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Provider <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-robot"></i></span>
+                </div>
+                <select class="form-control select2" name="provider" required>
+                    <option value="">- Select an AI Provider -</option>
+                    <?php
+                        $sql_ai_providers = mysqli_query($mysqli, "SELECT * FROM ai_providers");
+                        while ($row = mysqli_fetch_array($sql_ai_providers)) {
+                            $ai_provider_id = intval($row['ai_provider_id']);
+                            $ai_provider_name = nullable_htmlentities($row['ai_provider_name']);
+
+                        ?>
+                        <option value="<?php echo $ai_provider_id; ?>"><?php echo $ai_provider_name; ?></option>
+                    <?php } ?>
+                </select>
             </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-
-                <div class="modal-body">
-
-                    <div class="form-group">
-                        <label>Provider <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-robot"></i></span>
-                            </div>
-                            <select class="form-control select2" name="provider" required>
-                                <option value="">- Select an AI Provider -</option>
-                                <?php
-                                    $sql_ai_providers = mysqli_query($mysqli, "SELECT * FROM ai_providers");
-                                    while ($row = mysqli_fetch_array($sql_ai_providers)) {
-                                        $ai_provider_id = intval($row['ai_provider_id']);
-                                        $ai_provider_name = nullable_htmlentities($row['ai_provider_name']);
-
-                                    ?>
-                                    <option value="<?php echo $ai_provider_id; ?>"><?php echo $ai_provider_name; ?></option>
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Model Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-robot"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="model" placeholder="ex gpt-4">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Use Case <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-th-list"></i></span>
-                            </div>
-                            <select class="form-control select2" name="use_case">
-                                <option>General</option>
-                                <option>Tickets</option>
-                                <option>Documentation</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <textarea class="form-control" rows="8" name="prompt" placeholder="Enter a model prompt:"></textarea>
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_ai_model" 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 class="form-group">
+            <label>Model Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-robot"></i></span>
+                </div>
+                <input type="text" class="form-control" name="model" placeholder="ex gpt-4">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Use Case <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-th-list"></i></span>
+                </div>
+                <select class="form-control select2" name="use_case">
+                    <option>General</option>
+                    <option>Tickets</option>
+                    <option>Documentation</option>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <textarea class="form-control" rows="8" name="prompt" placeholder="Enter a model prompt:"></textarea>
+        </div>
+
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_ai_model" 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>
+
+<?php
+require_once '../../../includes/modal_footer.php';

admin/modals/ai/ai_provider_add.php

@@ -1,54 +1,58 @@
-<div class="form-group">
+<?php
-    <div class="modal" id="addAIProviderModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-robot mr-2"></i>New AI Provider</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="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-                <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
+ob_start();
-                        <label>Provider Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-robot"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="provider" placeholder="ex OpenAI">
-                        </div>
-                    </div>
 
-                    <div class="form-group">
+?>
-                        <label>URL <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                            </div>
-                            <input type="url" class="form-control" name="url" placeholder="ex https://ai.company.ext/api">
-                        </div>
-                    </div>
 
-                    <div class="form-group">
+<div class="modal-header bg-dark">
-                        <label>API Key</label>
+    <h5 class="modal-title"><i class="fa fa-fw fa-robot mr-2"></i>New AI Provider</h5>
-                        <div class="input-group">
+    <button type="button" class="close text-white" data-dismiss="modal">
-                            <div class="input-group-prepend">
+        <span>&times;</span>
-                                <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+    </button>
-                            </div>
-                            <input type="text" class="form-control" name="api_key" placeholder="Enter API key here">
-                        </div>
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_ai_provider" 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>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Provider Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-robot"></i></span>
+                </div>
+                <input type="text" class="form-control" name="provider" placeholder="ex OpenAI">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>URL <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                </div>
+                <input type="url" class="form-control" name="url" placeholder="ex https://ai.company.ext/api">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>API Key</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                </div>
+                <input type="text" class="form-control" name="api_key" placeholder="Enter API key here">
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_ai_provider" 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>
+
+<?php
+require_once '../../../includes/modal_footer.php';

admin/modals/api/api_key_add.php

@@ -1,121 +1,124 @@
 <?php
+
+require_once '../../../includes/modal_header.php';
+
 $key = randomString(156);
 $decryptPW = randomString(160);
+
+ob_start();
 ?>
-<div class="modal" id="addApiKeyModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-key mr-2"></i>New Key</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <div class="modal-body">
 
-                    <ul class="nav nav-pills nav-justified mb-3">
+<div class="modal-header bg-dark">
-                        <li class="nav-item">
+    <h5 class="modal-title"><i class="fas fa-fw fa-key mr-2"></i>New Key</h5>
-                            <a class="nav-link active" data-toggle="pill" href="#pills-api-details">Details</a>
+    <button type="button" class="close text-white" data-dismiss="modal">
-                        </li>
+        <span>&times;</span>
-                        <li class="nav-item">
+    </button>
-                            <a class="nav-link" data-toggle="pill" href="#pills-api-keys">Keys</a>
-                        </li>
-                    </ul>
-                    <hr>
-
-                    <div class="tab-content">
-
-                        <div class="tab-pane fade show active" id="pills-api-details">
-                            <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                            <input type="hidden" name="key" value="<?php echo $key ?>">
-                            <input type="hidden" name="password" value="<?php echo $decryptPW ?>">
-
-                            <div class="form-group">
-                                <label>Name <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-sticky-note"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Key Name" maxlength="255" required autofocus>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Expiration Date <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <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="expire" min="<?php echo date('Y-m-d')?>" max="2999-12-31" required>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Client Access <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="client" required>
-                                        <option value="0"> ALL CLIENTS </option>
-                                        <?php
-                                        $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $client_id = intval($row['client_id']);
-                                            $client_name = nullable_htmlentities($row['client_name']); ?>
-                                            <option value="<?php echo $client_id; ?>"><?php echo "$client_name  (Client ID: $client_id)"; ?></option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-api-keys">
-                            <div class="form-group">
-                                <label>API Key <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" value="<?php echo $key ?>" required disabled>
-                                    <div class="input-group-append">
-                                        <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $key; ?>"><i class="fa fa-fw fa-copy"></i></button>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Login credential decryption password <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-unlock-alt"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" value="<?php echo $decryptPW ?>" required disabled>
-                                    <div class="input-group-append">
-                                        <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $decryptPW; ?>"><i class="fa fa-fw fa-copy"></i></button>
-                                    </div>
-                                </div>
-                            </div>
-                            <br>
-                            <div class="form-group">
-                                <label>I have made a copy of the key(s)<strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <input type="checkbox" name="ack" value="1" required>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                    </div>
-
-                    </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_api_key" 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="fas fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <div class="modal-body">
+
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-api-details">Details</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-api-keys">Keys</a>
+            </li>
+        </ul>
+        <hr>
+
+        <div class="tab-content">
+
+            <div class="tab-pane fade show active" id="pills-api-details">
+                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+                <input type="hidden" name="key" value="<?php echo $key ?>">
+                <input type="hidden" name="password" value="<?php echo $decryptPW ?>">
+
+                <div class="form-group">
+                    <label>Name <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-sticky-note"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="name" placeholder="Key Name" maxlength="255" required autofocus>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Expiration Date <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <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="expire" min="<?php echo date('Y-m-d')?>" max="2999-12-31" required>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Client Access <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                        </div>
+                        <select class="form-control select2" name="client" required>
+                            <option value="0"> ALL CLIENTS </option>
+                            <?php
+                            $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $client_id = intval($row['client_id']);
+                                $client_name = nullable_htmlentities($row['client_name']); ?>
+                                <option value="<?php echo $client_id; ?>"><?php echo "$client_name  (Client ID: $client_id)"; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="tab-pane fade" id="pills-api-keys">
+                <div class="form-group">
+                    <label>API Key <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                        </div>
+                        <input type="text" class="form-control" value="<?php echo $key ?>" required disabled>
+                        <div class="input-group-append">
+                            <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $key; ?>"><i class="fa fa-fw fa-copy"></i></button>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Login credential decryption password <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-unlock-alt"></i></span>
+                        </div>
+                        <input type="text" class="form-control" value="<?php echo $decryptPW ?>" required disabled>
+                        <div class="input-group-append">
+                            <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $decryptPW; ?>"><i class="fa fa-fw fa-copy"></i></button>
+                        </div>
+                    </div>
+                </div>
+                <br>
+                <div class="form-group">
+                    <label>I have made a copy of the key(s)<strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <input type="checkbox" name="ack" value="1" required>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+        </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_api_key" 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="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

admin/modals/category/category_add.php

@@ -2,7 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$category = nullable_htmlentities($_GET['category']);
+$category = nullable_htmlentities($_GET['category'] ?? '');
+
+$category_types_array = ['Expense', 'Income', 'Referral', 'Ticket'];
 
 ?>
 
@@ -13,10 +15,30 @@ $category = nullable_htmlentities($_GET['category']);
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-    <input type="hidden" name="type" value="<?php echo ($category); ?>">
 
     <div class="modal-body">
 
+        <?php if ($category) { ?>
+        <input type="hidden" name="type" value="<?= $category ?>">
+        <?php } else { ?>
+
+        <div class="form-group">
+            <label>Type <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                </div>
+                <select class="form-control select2" name="type" required>
+                    <option value="">- Select Type -</option>
+                    <?php foreach ($category_types_array as $type_select) { ?>
+                        <option><?= $type_select ?></option>
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+        <?php } ?>
+
         <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
             <div class="input-group">
@@ -39,7 +61,7 @@ $category = nullable_htmlentities($_GET['category']);
 
     </div>
     <div class="modal-footer">
-        <button type="submit" name="add_category" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="submit" name="add_category" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create Category</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>

admin/modals/contract_template/contract_template_add.php

@@ -0,0 +1,221 @@
+<?php
+require_once '../../../includes/modal_header.php';
+
+
+$contract_types_array = ['Fully Managed', 'Partialy Managed', 'Break/Fix'];
+$renewal_frequency_array = ['Manual', 'Annually', '2 Year', '3 Year', '5 Year', '7 Year'];
+
+ob_start();
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-file-contract mr-2"></i>New Contract Template</h5>
+    <button type="button" class="close text-white" data-dismiss="modal"><span>&times;</span></button>
+</div>
+
+<!-- Tabs Navigation -->
+<ul class="modal-header nav nav-pills nav-justified">
+    <li class="nav-item">
+        <a class="nav-link active" id="general-tab" data-toggle="tab" href="#general" role="tab">General Info</a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" id="sla-tab" data-toggle="tab" href="#sla" role="tab">SLA</a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" id="rates-tab" data-toggle="tab" href="#rates" role="tab">Rates & Support</a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" id="details-tab" data-toggle="tab" href="#details" role="tab">Details</a>
+    </li>
+</ul>
+
+<form action="post.php" method="post" autocomplete="off">
+    <div class="modal-body">
+        <div class="tab-content" id="contractTemplateTabContent">
+
+            <!-- General Info Tab -->
+            <div class="tab-pane fade show active" id="general" role="tabpanel">
+                <div class="form-group">
+                    <label>Template Name <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-file-contract"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="name" placeholder="Contract Template Name" maxlength="200" required autofocus>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Template Description <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-align-left"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description"
+                        placeholder="Contract Template Description" maxlength="200" required>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Contract Type <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                        </div>
+                        <select class="form-control select2" name="type" required>
+                            <option value="">- Select Type -</option>
+                            <?php foreach ($contract_types_array as $type) { ?>
+                                <option><?= $type ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Renewal Frequency</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-sync-alt"></i></span>
+                        </div>
+                        <select class="form-control select2" name="renewal_frequency">
+                            <option value="">- Select Frequency -</option>
+                            <?php foreach ($renewal_frequency_array as $renewal_frequency) { ?>
+                                <option><?= $renewal_frequency ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <!-- SLA Tab -->
+            <div class="tab-pane fade" id="sla" role="tabpanel">
+                <div class="form-row">
+                    <div class="form-group col-md-6">
+                        <label>Low Priority Response (hrs)</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+                            </div>
+                            <input type="number" class="form-control" name="sla_low_response_time" placeholder="e.g., 24">
+                        </div>
+                    </div>
+                    <div class="form-group col-md-6">
+                        <label>Low Priority Resolution (hrs)</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-hourglass-half"></i></span>
+                            </div>
+                            <input type="number" class="form-control" name="sla_low_resolution_time" placeholder="e.g., 48">
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-row">
+                    <div class="form-group col-md-6">
+                        <label>Medium Priority Response (hrs)</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+                            </div>
+                            <input type="number" class="form-control" name="sla_medium_response_time" placeholder="e.g., 12">
+                        </div>
+                    </div>
+                    <div class="form-group col-md-6">
+                        <label>Medium Priority Resolution (hrs)</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-hourglass-half"></i></span>
+                            </div>
+                            <input type="number" class="form-control" name="sla_medium_resolution_time" placeholder="e.g., 24">
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-row">
+                    <div class="form-group col-md-6">
+                        <label>High Priority Response (hrs)</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-bolt"></i></span>
+                            </div>
+                            <input type="number" class="form-control" name="sla_high_response_time" placeholder="e.g., 1">
+                        </div>
+                    </div>
+                    <div class="form-group col-md-6">
+                        <label>High Priority Resolution (hrs)</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-stopwatch"></i></span>
+                            </div>
+                            <input type="number" class="form-control" name="sla_high_resolution_time" placeholder="e.g., 4">
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Rates & Support Tab -->
+            <div class="tab-pane fade" id="rates" role="tabpanel">
+                <div class="form-group">
+                    <label>Standard Hourly Rate</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" name="rate_standard" placeholder="e.g., 100">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>After Hours Hourly Rate</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-moon"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="rate_after_hours" placeholder="e.g., 150">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Support Hours</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="support_hours" placeholder="e.g., Mon-Fri 9am-5pm">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Net Terms</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-file-invoice-dollar"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="net_terms" placeholder="e.g., Net 30">
+                    </div>
+                </div>
+            </div>
+
+            <!-- Details Tab -->
+            <div class="tab-pane fade" id="details" role="tabpanel">
+                <div class="form-group">
+                    <textarea class="form-control tinymce" rows="6" name="details" placeholder="Enter Contract Details"></textarea>
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="add_contract_template" class="btn btn-primary text-bold">
+            <i class="fa fa-check mr-2"></i>Create Template
+        </button>
+        <button type="button" class="btn btn-light" data-dismiss="modal">
+            <i class="fa fa-times mr-2"></i>Cancel
+        </button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
+?>

admin/modals/contract_template/contract_template_edit.php

@@ -0,0 +1,265 @@
+<?php
+require_once '../../../includes/modal_header.php';
+
+$contract_template_id = intval($_GET['id']);
+
+$contract_types_array = ['Fully Managed', 'Partialy Managed', 'Break/Fix'];
+$update_frequency_array = ['Manual', 'Annually', '2 Year', '3 Year', '5 Year', '7 Year'];
+
+// Fetch existing template
+$sql = mysqli_query($mysqli, "SELECT * FROM contract_templates WHERE contract_template_id = $contract_template_id LIMIT 1");
+$row = mysqli_fetch_array($sql);
+
+// Assign locals
+$name          = nullable_htmlentities($row['contract_template_name']);
+$description   = nullable_htmlentities($row['contract_template_description']);
+$type          = nullable_htmlentities($row['contract_template_type']);
+$renewal_frequency = nullable_htmlentities($row['contract_template_renewal_frequency']);
+$sla_low_resp  = intval($row['contract_template_sla_low_response_time']);
+$sla_med_resp  = intval($row['contract_template_sla_medium_response_time']);
+$sla_high_resp = intval($row['contract_template_sla_high_response_time']);
+$sla_low_res   = intval($row['contract_template_sla_low_resolution_time']);
+$sla_med_res   = intval($row['contract_template_sla_medium_resolution_time']);
+$sla_high_res  = intval($row['contract_template_sla_high_resolution_time']);
+$hourly_rate   = intval($row['contract_template_rate_standard']);
+$after_hours   = intval($row['contract_template_rate_after_hours']);
+$support_hours = nullable_htmlentities($row['contract_template_support_hours']);
+$net_terms     = intval($row['contract_template_net_terms']);
+$details       = nullable_htmlentities($row['contract_template_details']);
+
+ob_start();
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-file-contract mr-2"></i>Edit Contract Template</h5>
+    <button type="button" class="close text-white" data-dismiss="modal"><span>&times;</span></button>
+</div>
+
+<!-- Tabs Navigation -->
+<ul class="modal-header nav nav-pills nav-justified">
+    <li class="nav-item">
+        <a class="nav-link active" id="general-tab" data-toggle="tab" href="#general" role="tab">General Info</a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" id="sla-tab" data-toggle="tab" href="#sla" role="tab">SLA</a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" id="rates-tab" data-toggle="tab" href="#rates" role="tab">Rates & Support</a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" id="details-tab" data-toggle="tab" href="#details" role="tab">Details</a>
+    </li>
+</ul>
+
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="contract_template_id" value="<?php echo $contract_template_id; ?>">
+
+    <div class="modal-body">
+        <div class="tab-content" id="contractTemplateTabContent">
+
+            <!-- General Info Tab -->
+            <div class="tab-pane fade show active" id="general" role="tabpanel">
+                <div class="form-group">
+                    <label>Template Name <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-file-contract"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="name"
+                            placeholder="Contract Template Name" maxlength="200" required autofocus
+                            value="<?= $name ?>">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Template Description <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-align-left"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description"
+                            placeholder="Contract Template Description" maxlength="200" required
+                            value="<?= $description ?>">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Contract Type <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                        </div>
+                        <select class="form-control select2" name="type" required>
+                            <option value="">- Select Type -</option>
+                            <?php foreach ($contract_types_array as $type_select) { ?>
+                                <option <?php if ($type == $type_select) { echo "selected"; } ?>><?= $type_select ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Renewal Frequency</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-sync-alt"></i></span>
+                        </div>
+                        <select class="form-control select2" name="renewal_frequency">
+                            <option value="">- Select Frequency -</option>
+                            <?php foreach ($renewal_frequency_array as $renewal_frequency_select) { ?>
+                                <option <?php if ($renewal_frequency == $renewal_frequency_select) { echo "selected"; } ?>><?= $renewal_frequency_select ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <!-- SLA Tab -->
+            <div class="tab-pane fade" id="sla" role="tabpanel">
+                <div class="form-row">
+                    <div class="form-group col-md-6">
+                        <label>Low Priority Response (hrs)</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+                            </div>
+                            <input type="number" class="form-control" name="sla_low_response_time" placeholder="e.g., 24"
+                                value="<?= $sla_low_resp ?>">
+                        </div>
+                    </div>
+                    <div class="form-group col-md-6">
+                        <label>Low Priority Resolution (hrs)</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-hourglass-half"></i></span>
+                            </div>
+                            <input type="number" class="form-control" name="sla_low_resolution_time" placeholder="e.g., 48"
+                                value="<?= $sla_low_res ?>">
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-row">
+                    <div class="form-group col-md-6">
+                        <label>Medium Priority Response (hrs)</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+                            </div>
+                            <input type="number" class="form-control" name="sla_medium_response_time" placeholder="e.g., 12"
+                                value="<?= $sla_med_resp ?>">
+                        </div>
+                    </div>
+                    <div class="form-group col-md-6">
+                        <label>Medium Priority Resolution (hrs)</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-hourglass-half"></i></span>
+                            </div>
+                            <input type="number" class="form-control" name="sla_medium_resolution_time" placeholder="e.g., 24"
+                                value="<?= $sla_med_res ?>">
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-row">
+                    <div class="form-group col-md-6">
+                        <label>High Priority Response (hrs)</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-bolt"></i></span>
+                            </div>
+                            <input type="number" class="form-control" name="sla_high_response_time" placeholder="e.g., 1"
+                                value="<?= $sla_high_resp ?>">
+                        </div>
+                    </div>
+                    <div class="form-group col-md-6">
+                        <label>High Priority Resolution (hrs)</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-stopwatch"></i></span>
+                            </div>
+                            <input type="number" class="form-control" name="sla_high_resolution_time" placeholder="e.g., 4"
+                                value="<?= $sla_high_res ?>">
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Rates & Support Tab -->
+            <div class="tab-pane fade" id="rates" role="tabpanel">
+                <div class="form-group">
+                    <label>Standard Hourly Rate</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" name="rate_standard" placeholder="e.g., 100"
+                            value="<?= $rate_standard ?>">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>After Hours Hourly Rate</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-moon"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="rate_after_hours" placeholder="e.g., 150"
+                            value="<?= $rate_after_hours ?>">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Support Hours</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="support_hours" placeholder="e.g., Mon-Fri 9am-5pm"
+                            value="<?= $support_hours ?>">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Net Terms</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-file-invoice-dollar"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="net_terms" placeholder="e.g., Net 30"
+                            value="<?= $net_terms ?>">
+                    </div>
+                </div>
+            </div>
+
+            <!-- Details Tab -->
+            <div class="tab-pane fade" id="details" role="tabpanel">
+                <div class="form-group">
+                    <label>Contract Details</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-align-left"></i></span>
+                        </div>
+                        <textarea class="form-control tinymce" rows="6" name="details"
+                            placeholder="Enter Contract Details"><?= $details ?></textarea>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="edit_contract_template" 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>
+
+<?php
+require_once '../../../includes/modal_footer.php';
+?>

admin/modals/custom_link/custom_link_add.php

@@ -1,83 +1,88 @@
-<div class="modal" id="addLinkModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-external-link-alt mr-2"></i>New Custom Link</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
 
-                <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
+ob_start();
-                        <label>Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-list-ul"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Link name" maxlength="200" required autofocus>
-                        </div>
-                    </div>
 
-                    <div class="form-group">
+?>
-                        <label>Order</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-sort-numeric-down"></i></span>
-                            </div>
-                            <input type="number" class="form-control" name="order" placeholder="Leave blank for no order">
-                        </div>
-                    </div>
 
-                    <div class="form-group">
+<div class="modal-header bg-dark">
-                        <label>URI <strong class="text-danger">*</strong></label> / <span class="text-secondary">Open New Tab</span>
+    <h5 class="modal-title"><i class="fas fa-fw fa-external-link-alt mr-2"></i>New Custom Link</h5>
-                        <div class="input-group">
+    <button type="button" class="close text-white" data-dismiss="modal">
-                            <div class="input-group-prepend">
+        <span>&times;</span>
-                                <span class="input-group-text"><i class="fa fa-fw fa-external-link-alt"></i></span>
+    </button>
-                            </div>
-                            <input type="text" class="form-control" name="uri" placeholder="Enter Link" maxlength="500" required>
-                            <div class="input-group-append">
-                                <div class="input-group-text">
-                                    <input type="checkbox" name="new_tab" value="1">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Icon</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-image"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="icon" placeholder="Icon ex handshake" maxlength="200">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Location <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-home"></i></span>
-                            </div>
-                            <select class="form-control select2" name="location" required>
-                                <option value="1">Main Side Nav</option>
-                                <option value="2">Top Nav (Icon Required)</option>
-                                <option value="3">Client Portal Nav</option>
-                                <option value="4">Admin Nav</option>
-                                <option value="5">Reports Nav</option>
-                            </select>
-                        </div>
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_custom_link" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</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>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-list-ul"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Link name" maxlength="200" required autofocus>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Order</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-sort-numeric-down"></i></span>
+                </div>
+                <input type="number" class="form-control" name="order" placeholder="Leave blank for no order">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>URI <strong class="text-danger">*</strong></label> / <span class="text-secondary">Open New Tab</span>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-external-link-alt"></i></span>
+                </div>
+                <input type="text" class="form-control" name="uri" placeholder="Enter Link" maxlength="500" required>
+                <div class="input-group-append">
+                    <div class="input-group-text">
+                        <input type="checkbox" name="new_tab" value="1">
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Icon</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-image"></i></span>
+                </div>
+                <input type="text" class="form-control" name="icon" placeholder="Icon ex handshake" maxlength="200">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Location <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-home"></i></span>
+                </div>
+                <select class="form-control select2" name="location" required>
+                    <option value="1">Main Side Nav</option>
+                    <option value="2">Top Nav (Icon Required)</option>
+                    <option value="3">Client Portal Nav</option>
+                    <option value="4">Admin Nav</option>
+                    <option value="5">Reports Nav</option>
+                </select>
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_custom_link" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

admin/modals/document_template/document_template_add.php

@@ -1,49 +1,87 @@
-<div class="modal" id="addDocumentTemplateModal" tabindex="-1">
+<?php
-    <div class="modal-dialog modal-xl">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>Creating Document Template</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <div class="modal-body">
 
-                    <div class="form-group">
+require_once '../../../includes/modal_header.php';
-                        <input type="text" class="form-control" name="name" placeholder="Template name" maxlength="200">
-                    </div>
 
-                    <div class="form-group">
+ob_start();
-                        <label>Enter a prompt for the type of IT documentation you want to generate:</label>
-                        <div class="input-group mb-3">
-                            <input type="text" class="form-control" id="aiPrompt" placeholder="e.g. 'A network troubleshooting guide for junior technicians'">
-                            <div class="input-group-append">
-                                <button class="btn btn-info" type="button" id="generateAIContent">
-                                    <i class="fa fa-fw fa-magic mr-1"></i>Generate with AI
-                                </button>
-                            </div>
-                        </div>
-                    </div>
 
-                    <!-- TinyMCE Content -->
+?>
-                    <div class="form-group">
-                        <textarea class="form-control tinymce" name="content"></textarea>
-                    </div>
 
-                    <div class="form-group">
+<div class="modal-header bg-dark">
-                        <input type="text" class="form-control" name="description" placeholder="Enter a short summary">
+    <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>Creating Document Template</h5>
-                    </div>
+    <button type="button" class="close text-white" data-dismiss="modal">
-                
+        <span>&times;</span>
-                </div>
+    </button>
-
-                <div class="modal-footer">
-
-                    <button type="submit" name="add_document_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>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <input type="text" class="form-control" name="name" placeholder="Template name" maxlength="200">
+        </div>
+
+        <div class="form-group">
+            <label>Enter a prompt for the type of IT documentation you want to generate:</label>
+            <div class="input-group mb-3">
+                <input type="text" class="form-control" id="aiPrompt" placeholder="e.g. 'A network troubleshooting guide for junior technicians'">
+                <div class="input-group-append">
+                    <button class="btn btn-info" type="button" id="generateAIContent">
+                        <i class="fa fa-fw fa-magic mr-1"></i>Generate with AI
+                    </button>
+                </div>
+            </div>
+        </div>
+
+        <!-- TinyMCE Content -->
+        <div class="form-group">
+            <textarea class="form-control tinymce" name="content"></textarea>
+        </div>
+
+        <div class="form-group">
+            <input type="text" class="form-control" name="description" placeholder="Enter a short summary">
+        </div>
+    
+    </div>
+
+    <div class="modal-footer">
+
+        <button type="submit" name="add_document_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>
+
+<script>
+$(document).ready(function(){
+
+    $('#generateAIContent').on('click', function(){
+        var prompt = $('#aiPrompt').val().trim();
+        if(prompt === '') {
+            alert('Please enter a prompt.');
+            return;
+        }
+
+        $('#generateAIContent').prop('disabled', true).html('<i class="fa fa-spinner fa-spin"></i> Generating...');
+
+        $.ajax({
+            url: '/agent/ajax.php?ai_create_document_template', // The PHP script that calls the OpenAI API
+            method: 'POST',
+            data: { prompt: prompt },
+            dataType: 'html',
+            success: function(response) {
+                // Assuming you have exactly one TinyMCE instance on the page
+                // and it's targeting the .tinymce textarea:
+                tinymce.activeEditor.setContent(response);
+            },
+            error: function() {
+                alert('Error generating content. Please try again.');
+            },
+            complete: function() {
+                $('#generateAIContent').prop('disabled', false).html('<i class="fa fa-fw fa-magic mr-1"></i>Generate with AI');
+            }
+        });
+    });
+});
+</script>
+
+<?php
+require_once '../../../includes/modal_footer.php';

admin/modals/payment_method/payment_method_add.php

@@ -1,37 +1,42 @@
-<div class="modal" id="addPaymentMethodModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Creating: <strong>Payment Method</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="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-                <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
+ob_start();
-                        <label>Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Payment method name" maxlength="200" required autofocus>
-                        </div>
-                    </div>
 
-                    <div class="form-group">
+?>
-                        <textarea class="form-control" rows="3" name="description" placeholder="Enter a description..."></textarea>
-                    </div>
 
-                </div>
+<div class="modal-header bg-dark">
-                <div class="modal-footer">
+    <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Creating: <strong>Payment Method</strong></h5>
-                    <button type="submit" name="add_payment_method" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+    <button type="button" class="close text-white" data-dismiss="modal">
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+        <span>&times;</span>
-                </div>
+    </button>
-            </form>
-        </div>
-    </div>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Payment method name" maxlength="200" required autofocus>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <textarea class="form-control" rows="3" name="description" placeholder="Enter a description..."></textarea>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_payment_method" 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>
+
+<?php
+require_once '../../../includes/modal_footer.php';

admin/modals/payment_method/payment_method_edit.php

@@ -22,7 +22,7 @@ ob_start();
 </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="payment_method_id" value="<?= $payment_method_id ?>">
     <div class="modal-body">
 
         <div class="form-group">

admin/modals/payment_provider/payment_provider_add.php

@@ -1,103 +1,106 @@
-<div class="form-group">
+<?php
-    <div class="modal" id="addPaymentProviderModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Add Payment Provider</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="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-                <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                    <div class="alert alert-info">
+ob_start();
-                        An income account named after the provider will always be created and used for income of paid invoices.<br>
-                        If "Enable Expense" option is enabled, a matching vendor will also be automatically created for expense tracking. Additionally, an expense category named "Payment Processing" will be created.
-                    </div>
 
-                    <div class="form-group">
+?>
-                        <label>Provider <strong class="text-danger">*</strong></label>
+<div class="modal-header bg-dark">
-                        <div class="input-group">
+    <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Add Payment Provider</h5>
-                            <div class="input-group-prepend">
+    <button type="button" class="close text-white" data-dismiss="modal">
-                                <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
+        <span>&times;</span>
-                            </div>
+    </button>
-                            <select class="form-control select2" name="provider">
-                                <option>Stripe</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Publishable key <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="public_key" placeholder="Publishable API Key (pk_...)">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Secret key <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="private_key" placeholder="Secret API Key (sk_...)">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Threshold</label>
-                        <div class="input-group">
-                            <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">
-                        </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>
-
-                    <hr>
-
-                    <div class="form-group">
-                        <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" name="enable_expense" checked value="1" id="enableExpenseSwitch">
-                            <label class="custom-control-label" for="enableExpenseSwitch">Enable Expense</label>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Percentage Fee to expense</label>
-                        <div class="input-group">
-                            <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">
-                        </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>
-
-                    <div class="form-group">
-                        <label>Flat Fee to expense</label>
-                        <div class="input-group">
-                            <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">
-                        </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>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_payment_provider" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Add</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>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+    <div class="modal-body">
+
+        <div class="alert alert-info">
+            An income account named after the provider will always be created and used for income of paid invoices.<br>
+            If "Enable Expense" option is enabled, a matching vendor will also be automatically created for expense tracking. Additionally, an expense category named "Payment Processing" will be created.
+        </div>
+
+        <div class="form-group">
+            <label>Provider <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
+                </div>
+                <select class="form-control select2" name="provider">
+                    <option>Stripe</option>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Publishable key <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                </div>
+                <input type="text" class="form-control" name="public_key" placeholder="Publishable API Key (pk_...)">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Secret key <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                </div>
+                <input type="text" class="form-control" name="private_key" placeholder="Secret API Key (sk_...)">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Threshold</label>
+            <div class="input-group">
+                <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="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>
+
+        <hr>
+
+        <div class="form-group">
+            <div class="custom-control custom-switch">
+                <input type="checkbox" class="custom-control-input" name="enable_expense" checked value="1" id="enableExpenseSwitch">
+                <label class="custom-control-label" for="enableExpenseSwitch">Enable Expense</label>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Percentage Fee to expense</label>
+            <div class="input-group">
+                <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="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>
+
+        <div class="form-group">
+            <label>Flat Fee to expense</label>
+            <div class="input-group">
+                <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="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>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_payment_provider" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Add</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

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/project_template/project_template_add.php

@@ -1,41 +1,45 @@
-<div class="modal" id="addProjectTemplateModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-project-diagram mr-2"></i>Creating Project Template</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
 
-                <div class="modal-body">
+require_once '../../../includes/modal_header.php';
-                    <div class="form-group">
-                        <label>Project Template Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Project Template Name" maxlength="255" required autofocus>
-                        </div>
-                    </div>
 
-                    <div class="form-group">
+ob_start();
-                        <label>Description</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="description" placeholder="Description">
-                        </div>
-                    </div>
 
-                </div>
+?>
-                <div class="modal-footer">
+<div class="modal-header bg-dark">
-                    <button type="submit" name="add_project_template" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+    <h5 class="modal-title"><i class="fas fa-fw fa-project-diagram mr-2"></i>Creating Project Template</h5>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    <button type="button" class="close text-white" data-dismiss="modal">
-                </div>
+        <span>&times;</span>
-            </form>
+    </button>
-        </div>
-    </div>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+
+    <div class="modal-body">
+        <div class="form-group">
+            <label>Project Template Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Project Template Name" maxlength="255" required autofocus>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Description</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                </div>
+                <input type="text" class="form-control" name="description" placeholder="Description">
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_project_template" class="btn btn-primary text-bold"><i class="fas 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>
+
+<?php
+require_once '../../../includes/modal_footer.php';

admin/modals/project_template/project_template_edit.php

@@ -1,44 +1,56 @@
-<div class="modal" id="editProjectTemplateModal<?php echo $project_template_id; ?>" tabindex="-1">
+<?php
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-project-diagram mr-2"></i>Editing Project Template: <strong><?php echo $project_template_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="project_template_id" value="<?php echo $project_template_id; ?>">
 
-                <div class="modal-body">
+require_once '../../../includes/modal_header.php';
-                    <div class="form-group">
-                        <label>Project Template Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Project Template Name" maxlength="255" value="<?php echo $project_template_name; ?>" required autofocus>
-                        </div>
-                    </div>
 
-                    <div class="form-group">
+$project_template_id = intval($_GET['project_template_id']);
-                        <label>Description</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="description" placeholder="Description" value="<?php echo $project_template_description; ?>">
-                        </div>
-                    </div>
 
-                </div>
+$sql = mysqli_query($mysqli, "SELECT * FROM project_templates WHERE project_template_id = $project_template_id LIMIT 1");
-                
+$row = mysqli_fetch_array($sql);
-                <div class="modal-footer">
+$project_template_name = nullable_htmlentities($row['project_template_name']);
-                    <button type="submit" name="edit_project_template" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+$project_template_description = nullable_htmlentities($row['project_template_description']);
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+
-                </div>
+ob_start();
-            
+
-            </form>
+?>
-        </div>
+
-    </div>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-project-diagram mr-2"></i>Editing Project Template: <strong><?php echo $project_template_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="project_template_id" value="<?php echo $project_template_id; ?>">
+
+    <div class="modal-body">
+        <div class="form-group">
+            <label>Project Template Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Project Template Name" maxlength="255" value="<?php echo $project_template_name; ?>" required autofocus>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Description</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                </div>
+                <input type="text" class="form-control" name="description" placeholder="Description" value="<?php echo $project_template_description; ?>">
+            </div>
+        </div>
+
+    </div>
+    
+    <div class="modal-footer">
+        <button type="submit" name="edit_project_template" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

admin/modals/project_template/project_template_ticket_template_add.php

@@ -1,64 +1,71 @@
-<div class="modal" id="addProjectTemplateTicketTemplateModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>Adding Ticket Template</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="project_template_id" value="<?php echo $project_template_id; ?>">
-                <div class="modal-body">
 
-                    <div class="form-group">
+require_once '../../../includes/modal_header.php';
-                        <label>Ticket Template <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-life-ring"></i></span>
-                            </div>
-                            <select class="form-control select2" name="ticket_template_id" required>
-                                <option value="">- Select a Ticket Template -</option>
-                                <?php
 
-                                $sql_ticket_templates_select = mysqli_query($mysqli, "SELECT ticket_template_id, ticket_template_name FROM ticket_templates
+$project_template_id = intval($_GET['project_template_id']);
-                                    WHERE ticket_template_id NOT IN (
-                                        SELECT ticket_template_id FROM project_template_ticket_templates
-                                        WHERE project_template_id = $project_template_id
-                                    )
-                                    AND ticket_template_archived_at IS NULL
-                                    ORDER BY ticket_template_name ASC"
-                                );
-                                while ($row = mysqli_fetch_array($sql_ticket_templates_select)) {
-                                    $ticket_template_id_select = intval($row['ticket_template_id']);
-                                    $ticket_template_name_select = nullable_htmlentities($row['ticket_template_name']);
-                                    ?>
-                                    <option value="<?php echo $ticket_template_id_select; ?>"><?php echo $ticket_template_name_select; ?></option>
-                                    <?php
-                                }
 
-                                ?>
+ob_start();
-                            </select>
-                        </div>
-                    </div>
 
-                    <div class="form-group">
+?>
-                        <label>Order</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-sort-numeric-down"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="order" value="1">
-                        </div>
-                    </div>
 
-                </div>
+<div class="modal-header bg-dark">
-
+    <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>Adding Ticket Template</h5>
-                <div class="modal-footer">
+    <button type="button" class="close text-white" data-dismiss="modal">
-                    <button type="submit" name="add_ticket_template_to_project_template" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Add</button>
+        <span>&times;</span>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </button>
-                </div>
-            </form>
-        </div>
-    </div>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="project_template_id" value="<?php echo $project_template_id; ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Ticket Template <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-life-ring"></i></span>
+                </div>
+                <select class="form-control select2" name="ticket_template_id" required>
+                    <option value="">- Select a Ticket Template -</option>
+                    <?php
+
+                    $sql_ticket_templates_select = mysqli_query($mysqli, "SELECT ticket_template_id, ticket_template_name FROM ticket_templates
+                        WHERE ticket_template_id NOT IN (
+                            SELECT ticket_template_id FROM project_template_ticket_templates
+                            WHERE project_template_id = $project_template_id
+                        )
+                        AND ticket_template_archived_at IS NULL
+                        ORDER BY ticket_template_name ASC"
+                    );
+                    while ($row = mysqli_fetch_array($sql_ticket_templates_select)) {
+                        $ticket_template_id_select = intval($row['ticket_template_id']);
+                        $ticket_template_name_select = nullable_htmlentities($row['ticket_template_name']);
+                        ?>
+                        <option value="<?php echo $ticket_template_id_select; ?>"><?php echo $ticket_template_name_select; ?></option>
+                        <?php
+                    }
+
+                    ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Order</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-sort-numeric-down"></i></span>
+                </div>
+                <input type="text" class="form-control" name="order" value="1">
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="add_ticket_template_to_project_template" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Add</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

admin/modals/role/role_add.php

@@ -1,58 +1,62 @@
-<div class="modal" id="addRoleModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-user-shield mr-2"></i>Add new role</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </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'] ?>">
-                <div class="modal-body">
-                    <div class="tab-content">
 
-                        <div class="form-group">
+require_once '../../../includes/modal_header.php';
-                            <label>Name <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
-                                </div>
-                                <input type="text" class="form-control" name="role_name" placeholder="Role Name" maxlength="200" required>
-                            </div>
-                        </div>
 
-                        <div class="form-group">
+ob_start();
-                            <label>Description <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-chevron-right"></i></span>
-                                </div>
-                                <input type="text" class="form-control" name="role_description" placeholder="Role Description" maxlength="200" required>
-                            </div>
-                        </div>
 
-                        <div class="form-group">
+?>
-                            <label>Admin Access <strong class="text-danger">*</strong></label>
+<div class="modal-header bg-dark">
-                            <div class="input-group">
+    <h5 class="modal-title"><i class="fas fa-fw fa-user-shield mr-2"></i>New Role</h5>
-                                <div class="input-group-prepend">
+    <button type="button" class="close text-white" data-dismiss="modal">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-tools"></i></span>
+        <span>&times;</span>
-                                </div>
+    </button>
-                                <select class="form-control select2" name="role_is_admin" required>
-                                    <option value="0">No - edit after creation to set permissions</option>
-                                    <option value="1">Yes - this role should have full admin access</option>
-                                </select>
-                            </div>
-                        </div>
-
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_role" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</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>
 </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'] ?>">
+    <div class="modal-body">
+        <div class="tab-content">
+
+            <div class="form-group">
+                <label>Name <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
+                    </div>
+                    <input type="text" class="form-control" name="role_name" placeholder="Role Name" maxlength="200" required>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label>Description <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-chevron-right"></i></span>
+                    </div>
+                    <input type="text" class="form-control" name="role_description" placeholder="Role Description" maxlength="200" required>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label>Admin Access <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-tools"></i></span>
+                    </div>
+                    <select class="form-control select2" name="role_is_admin" required>
+                        <option value="0">No - edit after creation to set permissions</option>
+                        <option value="1">Yes - this role should have full admin access</option>
+                    </select>
+                </div>
+            </div>
+
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_role" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

admin/modals/software_template/software_template_add.php

@@ -1,83 +1,88 @@
-<div class="modal" id="addSoftwareTemplateModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-cube mr-2"></i>New License Template</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <div class="modal-body">
 
-                    <div class="form-group">
+require_once '../../../includes/modal_header.php';
-                        <label>Template Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Software name" maxlength="200" required autofocus>
-                        </div>
-                    </div>
 
-                    <div class="form-group">
+ob_start();
-                        <label>Version</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="version" placeholder="Software version" maxlength="200">
-                        </div>
-                    </div>
 
-                    <div class="form-group">
+?>
-                        <label>Description</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="description" placeholder="Short description">
-                        </div>
-                    </div>
 
-                    <div class="form-group">
+<div class="modal-header bg-dark">
-                        <label>Type <strong class="text-danger">*</strong></label>
+    <h5 class="modal-title"><i class="fa fa-fw fa-cube mr-2"></i>New License Template</h5>
-                        <div class="input-group">
+    <button type="button" class="close text-white" data-dismiss="modal">
-                            <div class="input-group-prepend">
+        <span>&times;</span>
-                                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+    </button>
-                            </div>
-                            <select class="form-control select2" name="type" required>
-                                <option value="">- Type -</option>
-                                <?php foreach($software_types_array as $software_type) { ?>
-                                    <option><?php echo $software_type; ?></option>
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>License Type</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-                            </div>
-                            <select class="form-control select2" name="license_type">
-                                <option value="">- Select a License Type -</option>
-                                <?php foreach($license_types_array as $license_type) { ?>
-                                    <option><?php echo $license_type; ?></option>
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_software_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>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Template Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Software name" maxlength="200" required autofocus>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Version</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                </div>
+                <input type="text" class="form-control" name="version" placeholder="Software version" maxlength="200">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Description</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                </div>
+                <input type="text" class="form-control" name="description" placeholder="Short description">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Type <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                </div>
+                <select class="form-control select2" name="type" required>
+                    <option value="">- Type -</option>
+                    <?php foreach($software_types_array as $software_type) { ?>
+                        <option><?php echo $software_type; ?></option>
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>License Type</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                </div>
+                <select class="form-control select2" name="license_type">
+                    <option value="">- Select a License Type -</option>
+                    <?php foreach($license_types_array as $license_type) { ?>
+                        <option><?php echo $license_type; ?></option>
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+        <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_software_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>
+
+<?php
+require_once '../../../includes/modal_footer.php';

admin/modals/tag/tag_add.php

@@ -15,8 +15,11 @@ if (isset($_GET['type'])) {
         $type_display = "Contact";
     } elseif ($type === 4) {
         $type_display = "Credential";
+    } elseif ($type === 5) {
+        $type_display = "Asset";
     }
 }
+ob_start();
 
 ?>
 
@@ -57,6 +60,7 @@ if (isset($_GET['type'])) {
                     <option value="2">Location Tag</option>
                     <option value="3">Contact Tag</option>
                     <option value="4">Credential Tag</option>
+                    <option value="5">Asset Tag</option>
                 </select>
             </div>
         </div>
@@ -85,7 +89,7 @@ if (isset($_GET['type'])) {
 
     </div>
     <div class="modal-footer">
-        <button type="submit" name="add_tag" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+        <button type="submit" name="add_tag" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create Tag</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>

admin/modals/tag/tag_edit.php

@@ -12,11 +12,24 @@ $tag_type = intval($row['tag_type']);
 $tag_color = nullable_htmlentities($row['tag_color']);
 $tag_icon = nullable_htmlentities($row['tag_icon']);
 
-// Generate the HTML form content using output buffering.
+if ($tag_type == 1) {
+    $tag_type_display = "Client";
+} elseif ( $tag_type == 2) {
+    $tag_type_display = "Location";
+} elseif ( $tag_type == 3) {
+    $tag_type_display = "Contact";
+} elseif ( $tag_type == 4) {
+    $tag_type_display = "Credential";
+ } elseif ( $tag_type == 5) {
+    $tag_type_display = "Asset";
+} else {
+    $tag_type_display = "Unknown";
+}
+
 ob_start();
 ?>
 <div class="modal-header bg-dark">
-    <h5 class="modal-title"><i class="fas fa-fw fa-tag mr-2"></i>Editing tag: <strong><?php echo $tag_name; ?></strong></h5>
+    <h5 class="modal-title"><i class="fas fa-fw fa-tag mr-2"></i><?= $tag_type_display ?> Tag: <strong><?php echo $tag_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
@@ -35,22 +48,6 @@ ob_start();
             </div>
         </div>
 
-        <div class="form-group">
-            <label>Type <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-                <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-th"></i></span>
-                </div>
-                <select class="form-control select2" name="type" required>
-                    <option value="">- Type -</option>
-                    <option value="1" <?php if ($tag_type == 1) { echo "selected"; } ?>>Client Tag</option>
-                    <option value="2" <?php if ($tag_type == 2) { echo "selected"; } ?>>Location Tag</option>
-                    <option value="3" <?php if ($tag_type == 3) { echo "selected"; } ?>>Contact Tag</option>
-                    <option value="4" <?php if ($tag_type == 4) { echo "selected"; } ?>>Credential Tag</option>
-                </select>
-            </div>
-        </div>
-
         <div class="form-group">
             <label>Color <strong class="text-danger">*</strong></label>
             <div class="input-group">
@@ -73,7 +70,7 @@ ob_start();
 
     </div>
     <div class="modal-footer">
-        <button type="submit" name="edit_tag" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
+        <button type="submit" name="edit_tag" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save changes</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>

admin/modals/tax/tax_add.php

@@ -1,30 +1,35 @@
-<div class="modal" id="addTaxModal" tabindex="-1">
+<?php
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header bg-dark">
-        <h5 class="modal-title"><i class="fas fa-fw fa-balance-scale mr-2"></i>New Tax</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-        <div class="modal-body">
+require_once '../../../includes/modal_header.php';
-          <div class="form-group">
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-balance-scale mr-2"></i>New Tax</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span aria-hidden="true">&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+    <div class="modal-body">
+        <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
             <input type="text" class="form-control" name="name" placeholder="Tax name" maxlength="200" required autofocus>
-          </div>
+        </div>
-          <div class="form-group">
+        <div class="form-group">
             <label>Percent <strong class="text-danger">*</strong></label>
             <input type="number" min="0" step="any" class="form-control col-md-4" name="percent">
-          </div>
         </div>
-        <div class="modal-footer">
-          <button type="submit" name="add_tax" 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="fas fa-times mr-2"></i>Cancel</button>
-        </div>
-      </form>
     </div>
-  </div>
+    <div class="modal-footer">
-</div>
+        <button type="submit" name="add_tax" 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="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

admin/modals/ticket_status/ticket_status_add.php

@@ -1,42 +1,43 @@
-<div class="modal" id="addTicketStatusModal" tabindex="-1">
+<?php
-  <div class="modal-dialog">
+require_once '../../../includes/modal_header.php';
-    <div class="modal-content">
+ob_start();
-      <div class="modal-header bg-dark">
+?>
-        <h5 class="modal-title"><i class="fas fa-fw fa-info-circle mr-2"></i>New Ticket Status</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
 
-        <div class="modal-body">
+<div class="modal-header bg-dark">
-          
+    <h5 class="modal-title"><i class="fas fa-fw fa-info-circle mr-2"></i>New Ticket Status</h5>
-          <div class="form-group">
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+
+    <div class="modal-body">
+        <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
             <div class="input-group">
-              <div class="input-group-prepend">
+                <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-info-circle"></i></span>
+                    <span class="input-group-text"><i class="fa fa-fw fa-info-circle"></i></span>
-              </div>
+                </div>
-              <input type="text" class="form-control" name="name" placeholder="Ticket Status name" maxlength="200" required autofocus>
+                <input type="text" class="form-control" name="name" placeholder="Ticket Status name" maxlength="200" required autofocus>
             </div>
-          </div>
+        </div>
 
-          <div class="form-group">
+        <div class="form-group">
             <label>Color <strong class="text-danger">*</strong></label>
             <div class="input-group">
-              <div class="input-group-prepend">
+                <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-paint-brush"></i></span>
+                    <span class="input-group-text"><i class="fa fa-fw fa-paint-brush"></i></span>
-              </div>
+                </div>
-              <input type="color" class="form-control col-3" name="color" required>
+                <input type="color" class="form-control col-3" name="color" required>
             </div>
-          </div>
-        
         </div>
-        <div class="modal-footer">
+
-          <button type="submit" name="add_ticket_status" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</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>
+    <div class="modal-footer">
-</div>
+        <button type="submit" name="add_ticket_status" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

admin/modals/ticket_template/ticket_template_add.php

@@ -1,75 +1,79 @@
-<div class="modal" id="addTicketTemplateModal" tabindex="-1">
+<?php
-    <div class="modal-dialog modal-lg">
+
-        <div class="modal-content">
+require_once '../../../includes/modal_header.php';
-            <div class="modal-header bg-dark">
+
-                <h5 class="modal-title"><i class="fa fa-fw fa-life-ring mr-2"></i>Creating Ticket Template</h5>
+ob_start();
-                <button type="button" class="close text-white" data-dismiss="modal">
+
-                    <span>&times;</span>
+?>
-                </button>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-life-ring mr-2"></i>New Ticket Template</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Template Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-life-ring"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Template name" maxlength="200" required autofocus>
             </div>
-            <form action="post.php" method="post" autocomplete="off">
+        </div>
-                <div class="modal-body">
 
-                    <div class="form-group">
+        <div class="form-group">
-                        <label>Template Name <strong class="text-danger">*</strong></label>
+            <label>Subject</label>
-                        <div class="input-group">
+            <div class="input-group">
-                            <div class="input-group-prepend">
+                <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-life-ring"></i></span>
+                    <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Template name" maxlength="200" required autofocus>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Subject</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="subject" placeholder="Subject" maxlength="500">
-                        </div>
-                    </div>
-
-                   <div class="form-group">
-                        <textarea class="form-control tinymceTicket" name="details"></textarea>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Description</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="description" placeholder="Short description">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Add it to a Project Template?</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
-                            </div>
-                            <select class="form-control select2" name="project_template">
-                                <option value="0">- No -</option>
-                                <?php
-
-                                $sql_project_templates = mysqli_query($mysqli, "SELECT * FROM project_templates WHERE project_template_archived_at IS NULL ORDER BY project_template_name ASC");
-                                while ($row = mysqli_fetch_array($sql_project_templates)) {
-                                    $project_template_id_select = intval($row['project_template_id']);
-                                    $project_template_name_select = nullable_htmlentities($row['project_template_name']); ?>
-                                    <option value="<?php echo $project_template_id_select; ?>"><?php echo $project_template_name_select; ?></option>
-
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
                 </div>
-                <div class="modal-footer">
+                <input type="text" class="form-control" name="subject" placeholder="Subject" maxlength="500">
-                    <button type="submit" name="add_ticket_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+            </div>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+        </div>
+
+       <div class="form-group">
+            <textarea class="form-control tinymceTicket" name="details"></textarea>
+        </div>
+
+        <div class="form-group">
+            <label>Description</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
                 </div>
-            </form>
+                <input type="text" class="form-control" name="description" placeholder="Short description">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Add it to a Project Template?</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
+                </div>
+                <select class="form-control select2" name="project_template">
+                    <option value="0">- No -</option>
+                    <?php
+
+                    $sql_project_templates = mysqli_query($mysqli, "SELECT * FROM project_templates WHERE project_template_archived_at IS NULL ORDER BY project_template_name ASC");
+                    while ($row = mysqli_fetch_array($sql_project_templates)) {
+                        $project_template_id_select = intval($row['project_template_id']);
+                        $project_template_name_select = nullable_htmlentities($row['project_template_name']); ?>
+                        <option value="<?php echo $project_template_id_select; ?>"><?php echo $project_template_name_select; ?></option>
+
+                    <?php } ?>
+                </select>
+            </div>
         </div>
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_ticket_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create Template</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

admin/modals/user/user_add.php

@@ -1,156 +1,176 @@
-<div class="modal" id="addUserModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-user-plus mr-2"></i>New User</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </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'] ?>">
-                <div class="modal-body">
 
-                    <ul class="nav nav-pills nav-justified mb-3">
+require_once '../../../includes/modal_header.php';
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-user-details">Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-user-access">Restrict Access</a>
-                        </li>
-                    </ul>
 
-                    <hr>
+ob_start();
 
-                    <div class="tab-content">
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-user-plus mr-2"></i>New User</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </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'] ?>">
+    <div class="modal-body">
 
-                        <div class="tab-pane fade show active" id="pills-user-details">
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-user-details">Details</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-user-access">Restrict Access</a>
+            </li>
+        </ul>
 
-                            <div class="form-group">
+        <hr>
-                                <label>Name <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Full Name" maxlength="200" required autofocus>
-                                </div>
-                            </div>
 
-                            <div class="form-group">
+        <div class="tab-content">
-                                <label>Email <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
-                                    </div>
-                                    <input type="email" class="form-control" name="email" placeholder="Email Address" maxlength="200" required>
-                                </div>
-                            </div>
 
-                            <div class="form-group">
+            <div class="tab-pane fade show active" id="pills-user-details">
-                                <label>Password <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
-                                    </div>
-                                    <input type="password" class="form-control" data-toggle="password" name="password" id="password" placeholder="Enter a Password" autocomplete="new-password" minlength="8" required>
-                                    <div class="input-group-append">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-                                    </div>
-                                    <div class="input-group-append">
-                                        <span class="btn btn-default"><i class="fa fa-fw fa-question" onclick="generatePassword()"></i></span>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Role <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="role" required>
-                                        <option value="">- Role -</option>
-                                        <?php
-                                            $sql_user_roles = mysqli_query($mysqli, "SELECT * FROM user_roles WHERE role_archived_at IS NULL");
-                                            while ($row = mysqli_fetch_array($sql_user_roles)) {
-                                                $role_id = intval($row['role_id']);
-                                                $role_name = nullable_htmlentities($row['role_name']);
-
-                                            ?>
-                                            <option value="<?php echo $role_id; ?>"><?php echo $role_name; ?></option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Avatar</label>
-                                <input type="file" class="form-control-file" accept="image/*" name="file">
-                            </div>
-
-                            <div class="form-group" <?php if(empty($config_smtp_host)) { echo "hidden"; } ?>>
-                                <div class="custom-control custom-checkbox">
-                                    <input class="custom-control-input" type="checkbox" id="sendEmailCheckBox" name="send_email" value="" checked>
-                                    <label for="sendEmailCheckBox" class="custom-control-label">
-                                        Send user e-mail with login details?
-                                    </label>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <div class="custom-control custom-checkbox">
-                                    <input class="custom-control-input" type="checkbox" id="forceMFACheckBox" name="force_mfa" value=1>
-                                    <label for="forceMFACheckBox" class="custom-control-label">
-                                        Force MFA
-                                    </label>
-                                </div>
-                            </div>
 
+                <div class="form-group">
+                    <label>Name <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                         </div>
+                        <input type="text" class="form-control" name="name" placeholder="Full Name" maxlength="200" required autofocus>
+                    </div>
+                </div>
 
-                        <div class="tab-pane fade" id="pills-user-access">
+                <div class="form-group">
+                    <label>Email <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                        </div>
+                        <input type="email" class="form-control" name="email" placeholder="Email Address" maxlength="200" required>
+                    </div>
+                </div>
 
-                            <div class="alert alert-info">
+                <div class="form-group">
-                                Check boxes to authorize user client access. No boxes grant full client access. Admin users are unaffected.
+                    <label>Password <strong class="text-danger">*</strong></label>
-                            </div>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
+                        </div>
+                        <input type="password" class="form-control" data-toggle="password" name="password" id="password" placeholder="Enter a Password" autocomplete="new-password" minlength="8" required>
+                        <div class="input-group-append">
+                            <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                        </div>
+                        <div class="input-group-append">
+                            <span class="btn btn-default"><i class="fa fa-fw fa-question" onclick="generatePassword()"></i></span>
+                        </div>
+                    </div>
+                </div>
 
-                            <ul class="list-group">
+                <div class="form-group">
-                                <li class="list-group-item bg-dark">
+                    <label>Role <strong class="text-danger">*</strong></label>
-                                    <div class="form-check">
+                    <div class="input-group">
-                                        <input type="checkbox" class="form-check-input" onclick="this.closest('.tab-pane').querySelectorAll('.client-checkbox').forEach(checkbox => checkbox.checked = this.checked);">
+                        <div class="input-group-prepend">
-                                        <label class="form-check-label ml-3"><strong>Restrict Access to Clients</strong></label>
+                            <span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
-                                    </div>
+                        </div>
-                                </li>
+                        <select class="form-control select2" name="role" required>
-
+                            <option value="">- Role -</option>
-                                <?php
+                            <?php
-
+                                $sql_user_roles = mysqli_query($mysqli, "SELECT * FROM user_roles WHERE role_archived_at IS NULL");
-                                $sql_client_select = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
+                                while ($row = mysqli_fetch_array($sql_user_roles)) {
-                                while ($row = mysqli_fetch_array($sql_client_select)) {
+                                    $role_id = intval($row['role_id']);
-                                    $client_id = intval($row['client_id']);
+                                    $role_name = nullable_htmlentities($row['role_name']);
-                                    $client_name = nullable_htmlentities($row['client_name']);
 
                                 ?>
-                                <li class="list-group-item">
+                                <option value="<?php echo $role_id; ?>"><?php echo $role_name; ?></option>
-                                    <div class="form-check">
+                            <?php } ?>
-                                        <input type="checkbox" class="form-check-input client-checkbox" name="clients[]" value="<?php echo $client_id; ?>">
+                        </select>
-                                        <label class="form-check-label ml-3"><?php echo $client_name; ?></label>
-                                    </div>
-                                </li>
-
-                                <?php } ?>
-
-                            </ul>
-
-                        </div>
-
                     </div>
+                </div>
 
+                <div class="form-group">
+                    <label>Avatar</label>
+                    <input type="file" class="form-control-file" accept="image/*" name="file">
                 </div>
-                <div class="modal-footer">
+
-                    <button type="submit" name="add_user" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+                <div class="form-group" <?php if(empty($config_smtp_host)) { echo "hidden"; } ?>>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+                    <div class="custom-control custom-checkbox">
+                        <input class="custom-control-input" type="checkbox" id="sendEmailCheckBox" name="send_email" value="" checked>
+                        <label for="sendEmailCheckBox" class="custom-control-label">
+                            Send user e-mail with login details?
+                        </label>
+                    </div>
                 </div>
-            </form>
+
+                <div class="form-group">
+                    <div class="custom-control custom-checkbox">
+                        <input class="custom-control-input" type="checkbox" id="forceMFACheckBox" name="force_mfa" value=1>
+                        <label for="forceMFACheckBox" class="custom-control-label">
+                            Force MFA
+                        </label>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-user-access">
+
+                <div class="alert alert-info">
+                    Check boxes to authorize user client access. No boxes grant full client access. Admin users are unaffected.
+                </div>
+
+                <ul class="list-group">
+                    <li class="list-group-item bg-dark">
+                        <div class="form-check">
+                            <input type="checkbox" class="form-check-input" onclick="this.closest('.tab-pane').querySelectorAll('.client-checkbox').forEach(checkbox => checkbox.checked = this.checked);">
+                            <label class="form-check-label ml-3"><strong>Restrict Access to Clients</strong></label>
+                        </div>
+                    </li>
+
+                    <?php
+
+                    $sql_client_select = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
+                    while ($row = mysqli_fetch_array($sql_client_select)) {
+                        $client_id = intval($row['client_id']);
+                        $client_name = nullable_htmlentities($row['client_name']);
+
+                    ?>
+                    <li class="list-group-item">
+                        <div class="form-check">
+                            <input type="checkbox" class="form-check-input client-checkbox" name="clients[]" value="<?php echo $client_id; ?>">
+                            <label class="form-check-label ml-3"><?php echo $client_name; ?></label>
+                        </div>
+                    </li>
+
+                    <?php } ?>
+
+                </ul>
+
+            </div>
+
         </div>
+
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_user" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<script>
+
+function generatePassword() {
+    jQuery.get(
+        "/agent/ajax.php", {
+            get_readable_pass: 'true'
+        },
+        function(data) {
+            const password = JSON.parse(data);
+            document.getElementById("password").value = password;
+        }
+    );
+}
+
+</script>
+
+<?php
+require_once "../../../includes/modal_footer.php";

admin/modals/user/user_all_reset_password.php

@@ -1,31 +1,35 @@
-<div class="modal" id="resetAllUserPassModal" tabindex="-1">
+<?php
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-body">
-                <div class="mb-4" style="text-align: center;">
-                    <i class="far fas fa-10x fa-skull-crossbones text-danger mb-3 mt-3"></i>
-                    <h2>Incident Response: Agent Password Reset</h2>
-                    <br>
-                    <div class="alert alert-danger" role="alert">
-                        <b>This is a potentially destructive function.<br>It is intended to be used as part of a potential security incident.</b>
-                    </div>
-                    <h6 class="mb-4 text-secondary"><b>All ITFlow agent passwords will be reset and shown to you </b><i>(except yours - change yours first!)</i>.<br/><br/>You should communicate temporary passwords to agents out of band (e.g. via a phone call) and require they are changed ASAP.</h6>
-                    <form action="post.php" method="POST">
-                        <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                        <div class="row col-7 offset-4">
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <input type="password" class="form-control" placeholder="Enter your account password to continue" name="admin_password" required>
-                                </div>
-                            </div>
-                        </div>
-                        <br>
-                        <button class="btn btn-danger" type="submit" name="ir_reset_user_password"><i class="fas fa-fw fa-key mr-2"></i>Reset passwords</button>
-                    </form>
-                </div>
-                <button type="button" class="btn btn-outline-secondary btn-lg px-5 mr-4" data-dismiss="modal">Cancel</button>
 
-            </div>
+require_once '../../../includes/modal_header.php';
+
+ob_start();
+
+?>
+<div class="modal-body">
+    <div class="mb-4" style="text-align: center;">
+        <i class="far fas fa-10x fa-skull-crossbones text-danger mb-3 mt-3"></i>
+        <h2>Incident Response: Agent Password Reset</h2>
+        <br>
+        <div class="alert alert-danger" role="alert">
+            <b>This is a potentially destructive function.<br>It is intended to be used as part of a potential security incident.</b>
         </div>
+        <h6 class="mb-4 text-secondary"><b>All ITFlow agent passwords will be reset and shown to you </b><i>(except yours - change yours first!)</i>.<br/><br/>You should communicate temporary passwords to agents out of band (e.g. via a phone call) and require they are changed ASAP.</h6>
+        <form action="post.php" method="POST">
+            <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+            <div class="row col-7 offset-4">
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <input type="password" class="form-control" placeholder="Enter your account password to continue" name="admin_password" required>
+                    </div>
+                </div>
+            </div>
+            <br>
+            <button class="btn btn-danger" type="submit" name="ir_reset_user_password"><i class="fas fa-fw fa-key mr-2"></i>Reset passwords</button>
+        </form>
     </div>
+    <button type="button" class="btn btn-outline-secondary btn-lg px-5 mr-4" data-dismiss="modal">Cancel</button>
+
 </div>
+
+<?php
+require_once "../../../includes/modal_footer.php";

admin/modals/user/user_edit.php

@@ -94,11 +94,14 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                         </div>
-                        <input type="password" class="form-control" data-toggle="password" name="new_password"
+                        <input type="password" class="form-control" data-toggle="password" name="new_password" id="password"
                                placeholder="Leave Blank For No Password Change" autocomplete="new-password">
                         <div class="input-group-append">
                             <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
                         </div>
+                        <div class="input-group-append">
+                            <span class="btn btn-default"><i class="fa fa-fw fa-question" onclick="generatePassword()"></i></span>
+                        </div>
                     </div>
                 </div>
 
@@ -200,5 +203,23 @@ ob_start();
     </div>
 </form>
 
+<script>
+
+function generatePassword() {
+    // Send a GET request to ajax.php as ajax.php?get_readable_pass=true
+    jQuery.get(
+        "/agent/ajax.php", {
+            get_readable_pass: 'true'
+        },
+        function(data) {
+            //If we get a response from post.php, parse it as JSON
+            const password = JSON.parse(data);
+            document.getElementById("password").value = password;
+        }
+    );
+}
+
+</script>
+
 <?php
 require_once "../../../includes/modal_footer.php";

admin/modals/user/user_export.php

@@ -1,21 +1,26 @@
-<div class="modal" id="exportUserModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <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">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <div class="modal-body">
 
-                </div>
+require_once '../../../includes/modal_header.php';
-                <div class="modal-footer">
+
-                    <button type="submit" name="export_users_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
+ob_start();
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+
-                </div>
+?>
-            </form>
+
-        </div>
+<div class="modal-header bg-dark">
-    </div>
+    <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">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <div class="modal-body">
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="export_users_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

admin/modals/user/user_invite.php

@@ -1,45 +1,49 @@
-<div class="modal" id="userInviteModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-user-plus"></i>Invite User</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </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'] ?>">
-                <div class="modal-body">
 
-                    <div class="form-group">
+require_once '../../../includes/modal_header.php';
-                        <label>Email <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
-                            </div>
-                            <input type="email" class="form-control" name="email" placeholder="Email Address" maxlength="200" required>
-                        </div>
-                    </div>
 
-                    <div class="form-group">
+ob_start();
-                        <label>Role <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
-                            </div>
-                            <select class="form-control select2" name="role" required>
-                                <option value="">- Role -</option>
-                                <!-- //TODO: Pull from roles -->
-                            </select>
-                        </div>
-                    </div>
 
-                </div>
+?>
-                <div class="modal-footer">
+<div class="modal-header bg-dark">
-                    <button type="submit" name="invite_user" class="btn btn-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>Send Invite</button>
+    <h5 class="modal-title"><i class="fas fa-fw fa-user-plus"></i>Invite User</h5>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    <button type="button" class="close text-white" data-dismiss="modal">
-                </div>
+        <span>&times;</span>
-            </form>
+    </button>
-        </div>
-    </div>
 </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'] ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Email <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                </div>
+                <input type="email" class="form-control" name="email" placeholder="Email Address" maxlength="200" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Role <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
+                </div>
+                <select class="form-control select2" name="role" required>
+                    <option value="">- Role -</option>
+                    <!-- //TODO: Pull from roles -->
+                </select>
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="invite_user" class="btn btn-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>Send Invite</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once "../../../includes/modal_footer.php";

admin/modals/vendor_template/vendor_template_add.php

@@ -1,168 +1,171 @@
-<div class="modal" id="addVendorTemplateModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-building mr-2"></i>New Vendor Template</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="client_id" value="<?php if (isset($_GET['client_id'])) { echo $client_id; } else { echo 0; } ?>">
+require_once '../../../includes/modal_header.php';
 
-                <div class="modal-body">
+ob_start();
 
-                    <ul class="nav nav-pills nav-justified mb-3">
+?>
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-support">Support</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
-                        </li>
-                    </ul>
 
-                    <hr>
+<div class="modal-header bg-dark">
-
+    <h5 class="modal-title"><i class="fas fa-fw fa-building mr-2"></i>New Vendor Template</h5>
-                    <div class="tab-content">
+    <button type="button" class="close text-white" data-dismiss="modal">
-
+        <span>&times;</span>
-                        <div class="tab-pane fade show active" id="pills-details">
+    </button>
-
-                            <div class="form-group">
-                                <label>Vendor Name <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Vendor Name" maxlength="200" required autofocus>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Description</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="description" placeholder="Description" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Account Number</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-fingerprint"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="account_number" placeholder="Account number" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Account Manager</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="contact_name" placeholder="Account manager's name" maxlength="200">
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-support">
-
-                            <label>Support Phone / <span class="text-secondary">Extension</span></label>
-                            <div class="form-row">
-                                <div class="col-9">
-                                    <div class="form-group">
-                                        <div class="input-group">
-                                            <div class="input-group-prepend">
-                                                <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                            </div>
-                                            <input type="tel" class="form-control col-2" name="phone_country_code" placeholder="+" maxlength="4">
-                                            <input type="tel" class="form-control" name="phone" placeholder="Phone Number" maxlength="200">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-3">
-                                    <div class="form-group">
-                                        <input type="text" class="form-control" name="extension" placeholder="ext." maxlength="200">
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Support Hours</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="hours" placeholder="Support Hours" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Support Email</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
-                                    </div>
-                                    <input type="email" class="form-control" name="email" placeholder="Support Email" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Support Website URL</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="website" placeholder="Do not include http(s)://" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Pin/Code</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="code" placeholder="Access Code or Pin" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>SLA</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-handshake"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="sla" placeholder="SLA Response Time" maxlength="200">
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-notes">
-
-                            <div class="form-group">
-                                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
-                            </div>
-
-                        </div>
-
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_vendor_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create Template</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>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+
+    <div class="modal-body">
+
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-support">Support</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
+            </li>
+        </ul>
+
+        <hr>
+
+        <div class="tab-content">
+
+            <div class="tab-pane fade show active" id="pills-details">
+
+                <div class="form-group">
+                    <label>Vendor Name <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="name" placeholder="Vendor Name" maxlength="200" required autofocus>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description" placeholder="Description" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Account Number</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-fingerprint"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="account_number" placeholder="Account number" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Account Manager</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="contact_name" placeholder="Account manager's name" maxlength="200">
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-support">
+
+                <label>Support Phone / <span class="text-secondary">Extension</span></label>
+                <div class="form-row">
+                    <div class="col-9">
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                </div>
+                                <input type="tel" class="form-control col-2" name="phone_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control" name="phone" placeholder="Phone Number" maxlength="200">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-3">
+                        <div class="form-group">
+                            <input type="text" class="form-control" name="extension" placeholder="ext." maxlength="200">
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Support Hours</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="hours" placeholder="Support Hours" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Support Email</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                        </div>
+                        <input type="email" class="form-control" name="email" placeholder="Support Email" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Support Website URL</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="website" placeholder="Do not include http(s)://" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Pin/Code</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="code" placeholder="Access Code or Pin" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>SLA</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-handshake"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="sla" placeholder="SLA Response Time" maxlength="200">
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-notes">
+
+                <div class="form-group">
+                    <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
+                </div>
+
+            </div>
+
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_vendor_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create Template</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

admin/payment_method.php

@@ -16,7 +16,7 @@ $num_rows = mysqli_num_rows($sql);
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-credit-card mr-2"></i>Payment Methods</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addPaymentMethodModal"><i class="fas fa-plus mr-2"></i>Add Payment Method</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/payment_method/payment_method_add.php"><i class="fas fa-plus mr-2"></i>Add Payment Method</button>
         </div>
     </div>
     <div class="card-body">
@@ -98,5 +98,4 @@ $num_rows = mysqli_num_rows($sql);
 </div>
 
 <?php
-require_once "modals/payment_method/payment_method_add.php";
 require_once "../includes/footer.php";

admin/payment_provider.php

@@ -21,7 +21,7 @@ $num_rows = mysqli_num_rows($sql);
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-credit-card mr-2"></i>Payment Providers</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addPaymentProviderModal"><i class="fas fa-plus mr-2"></i>Add Provider</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/payment_provider/payment_provider_add.php"><i class="fas fa-plus mr-2"></i>Add Provider</button>
         </div>
     </div>
     <div class="card-body">
@@ -106,12 +106,14 @@ $num_rows = mysqli_num_rows($sql);
                                         <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                     </a>
                                     <div class="dropdown-divider"></div>
-<!--                                    <a class="dropdown-item text-danger confirm-link" href="post.php?disable_payment_provider=--><?php //echo $provider_id; ?><!--&csrf_token=--><?php //echo $_SESSION['csrf_token'] ?><!--">-->
+                                    <a class="dropdown-item text-danger confirm-link" href="post.php?delete_payment_provider=<?= $provider_id ?>&csrf_token=<?= $_SESSION['csrf_token'] ?>">
-<!--                                        <i class="fas fa-fw fa-thumbs-down mr-2"></i>Disable-->
+                                        <i class="fas fa-fw fa-trash mr-2"></i><strong>Delete Provider and</strong>
-<!--                                    </a>-->
+                                        <ul class="text-xs">
-<!--                                    <a class="dropdown-item text-danger confirm-link" href="post.php?delete_payment_provider=--><?php //echo $provider_id; ?><!--&csrf_token=--><?php //echo $_SESSION['csrf_token'] ?><!--">-->
+                                            <li>Related Recurring Payments</li>
-<!--                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete-->
+                                            <li>Related Saved cards</li>
-<!--                                    </a>-->
+                                            <li>Client Provider Relations</li>
+                                        </ul>
+                                    </a>
                                 </div>
                             </div>
                         </td>
@@ -135,5 +137,4 @@ $num_rows = mysqli_num_rows($sql);
 </div>
 
 <?php
-require_once "modals/payment_provider/payment_provider_add.php";
 require_once "../includes/footer.php";

admin/post.php

@@ -36,7 +36,4 @@ if (isset($session_is_admin) && $session_is_admin) {
 require_once "../post/logout.php";
 
 // TODO: Find a home for these
-
-require_once "../post/ai.php";
 require_once "../post/misc.php";
-

admin/post/contract_template.php

@@ -0,0 +1,157 @@
+<?php
+
+/*
+ * ITFlow - GET/POST request handler for Contract Templates
+ */
+
+defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
+
+if (isset($_POST['add_contract_template'])) {
+
+    // Sanitize text inputs
+    $name = sanitizeInput($_POST['name']);
+    $description = sanitizeInput($_POST['description']);
+    $type = sanitizeInput($_POST['type']);
+    $renewal_frequency = sanitizeInput($_POST['renewal_frequency']);
+    $support_hours = sanitizeInput($_POST['support_hours']);
+    $details = mysqli_escape_string($mysqli, $_POST['details']);
+
+    // Numeric fields cast to integer
+    $sla_low_resp = intval($_POST['sla_low_response_time']);
+    $sla_med_resp = intval($_POST['sla_medium_response_time']);
+    $sla_high_resp = intval($_POST['sla_high_response_time']);
+    $sla_low_res = intval($_POST['sla_low_resolution_time']);
+    $sla_med_res = intval($_POST['sla_medium_resolution_time']);
+    $sla_high_res = intval($_POST['sla_high_resolution_time']);
+    $rate_standard = intval($_POST['rate_standard']);
+    $rate_after_hours = intval($_POST['hourly_rate_after_hours']);
+    $net_terms = intval($_POST['net_terms']);
+
+    // Insert into database (numbers not quoted)
+    mysqli_query($mysqli, "
+        INSERT INTO contract_templates SET
+        contract_template_name = '$name',
+        contract_template_description = '$description',
+        contract_template_details = '$details',
+        contract_template_type = '$type',
+        contract_template_renewal_frequency = '$renewal_frequency',
+        contract_template_sla_low_response_time = $sla_low_resp,
+        contract_template_sla_medium_response_time = $sla_med_resp,
+        contract_template_sla_high_response_time = $sla_high_resp,
+        contract_template_sla_low_resolution_time = $sla_low_res,
+        contract_template_sla_medium_resolution_time = $sla_med_res,
+        contract_template_sla_high_resolution_time = $sla_high_res,
+        contract_template_rate_standard = $rate_standard,
+        contract_template_rate_after_hours = $rate_after_hours,
+        contract_template_support_hours = '$support_hours',
+        contract_template_net_terms = $net_terms
+    ");
+
+    $contract_template_id = mysqli_insert_id($mysqli);
+
+    // Log action
+    logAction("Contract Template", "Create", "$session_name created contract template $name", 0, $contract_template_id);
+
+    // Flash message
+    flash_alert("Contract Template <strong>$name</strong> created");
+
+    // Redirect back
+    redirect();
+}
+
+if (isset($_POST['edit_contract_template'])) {
+
+    $contract_template_id = intval($_POST['contract_template_id']);
+    $name            = sanitizeInput($_POST['name']);
+    $description     = sanitizeInput($_POST['description']);
+    $type            = sanitizeInput($_POST['type']);
+    $renewal_frequency= sanitizeInput($_POST['renewal_frequency']);
+    $support_hours   = sanitizeInput($_POST['support_hours']);
+    $details         = mysqli_escape_string($mysqli, $_POST['details']);
+    $sla_low_resp  = intval($_POST['sla_low_response_time']);
+    $sla_med_resp  = intval($_POST['sla_medium_response_time']);
+    $sla_high_resp = intval($_POST['sla_high_response_time']);
+    $sla_low_res   = intval($_POST['sla_low_resolution_time']);
+    $sla_med_res   = intval($_POST['sla_medium_resolution_time']);
+    $sla_high_res  = intval($_POST['sla_high_resolution_time']);
+    $rate_standard   = intval($_POST['rate_standard']);
+    $rate_after_hours = intval($_POST['rate_after_hours']);
+    $net_terms     = intval($_POST['net_terms']);
+
+    mysqli_query($mysqli, "
+        UPDATE contract_templates SET
+            contract_template_name = '$name',
+            contract_template_description = '$description',
+            contract_template_details = '$details',
+            contract_template_type = '$type',
+            contract_template_renewal_frequency = '$renewal_frequency',
+            contract_template_sla_low_response_time = $sla_low_resp,
+            contract_template_sla_medium_response_time = $sla_med_resp,
+            contract_template_sla_high_response_time = $sla_high_resp,
+            contract_template_sla_low_resolution_time = $sla_low_res,
+            contract_template_sla_medium_resolution_time = $sla_med_res,
+            contract_template_sla_high_resolution_time = $sla_high_res,
+            contract_template_rate_standard = $rate_standard,
+            contract_template_rate_after_hours = $rate_after_hours,
+            contract_template_support_hours = '$support_hours',
+            contract_template_net_terms = $net_terms
+        WHERE contract_template_id = $contract_template_id
+    ");
+
+    // Log action
+    logAction("Contract Template", "Update", "$session_name updated contract template $name", 0, $contract_template_id);
+
+    // Flash + redirect
+    flash_alert("Contract Template <strong>$name</strong> updated");
+    redirect();
+}
+
+if (isset($_GET['archive_contract_template'])) {
+    $contract_template_id = intval($_GET['archive_contract_template']);
+
+    $name = getFieldById('contract_templates', $contract_template_id, 'contract_template_name');
+
+    mysqli_query($mysqli, "
+        UPDATE contract_templates SET contract_template_archived_at = NOW()
+        WHERE contract_template_id = $contract_template_id
+        LIMIT 1
+    ");
+
+    logAction("Contract Template", "Archive", "$session_name archived contract template $name", 0, $contract_template_id);
+    flash_alert("Contract Template <strong>$name</strong> archived", "danger");
+    redirect();
+}
+
+if (isset($_GET['restore_contract_template'])) {
+    $contract_template_id = intval($_GET['restore_contract_template']);
+
+    $name = getFieldById('contract_templates', $contract_template_id, 'contract_template_name');
+
+    mysqli_query($mysqli, "
+        UPDATE contract_templates SET contract_template_archived_at = NULL
+        WHERE contract_template_id = $contract_template_id
+        LIMIT 1
+    ");
+
+    logAction("Contract Template", "Restore", "$session_name restored contract template $name", 0, $contract_template_id);
+    flash_alert("Contract Template <strong>$name</strong> restored");
+    redirect();
+}
+
+if (isset($_GET['delete_contract_template'])) {
+    $contract_template_id = intval($_GET['delete_contract_template']);
+
+    $name = getFieldById('contract_templates', $contract_template_id, 'contract_template_name');
+
+    mysqli_query($mysqli, "
+        DELETE FROM contract_templates
+        WHERE contract_template_id = $contract_template_id
+        LIMIT 1
+    ");
+
+    logAction("Contract Template", "Delete", "$session_name deleted contract template $name", 0, $contract_template_id);
+    flash_alert("Contract Template <strong>$name</strong> deleted", "danger");
+    redirect();
+}
+
+?>

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");
 
@@ -26,12 +33,21 @@ if (isset($_POST['add_payment_method'])) {
 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/post/payment_provider.php

@@ -101,6 +101,11 @@ if (isset($_GET['delete_payment_provider'])) {
     
     $provider_id = intval($_GET['delete_payment_provider']);
 
+    // When deleted it cascades deletes
+    // all Recurring paymentes related to payment provider
+    // Delete all Saved Cards related
+    // Delete Client Payment Provider Releation
+
     $provider_name = sanitizeInput(getFieldById('payment_providers', $provider_id, 'provider_name'));
 
     // Delete provider

admin/post/saved_payment_method.php

@@ -42,7 +42,7 @@ if (isset($_GET['delete_saved_payment'])) {
 
         try {
             // Initialize stripe
-            require_once 'plugins/stripe-php/init.php';
+            require_once '../plugins/stripe-php/init.php';
             $stripe = new \Stripe\StripeClient($private_key);
 
             // Detach PM
@@ -56,7 +56,7 @@ if (isset($_GET['delete_saved_payment'])) {
 
     }
 
-    // Remove payment method from ITFlow
+    // Remove payment method from ITFlow. This will also cascade delete related recurring payments setup
     mysqli_query($mysqli, "DELETE FROM client_saved_payment_methods WHERE saved_payment_id = $saved_payment_id");
 
     // SQL Cascade delete will Remove All Associated Auto Payment Methods on recurring invoices in the recurring payments table.

admin/post/settings_mail.php

@@ -150,7 +150,7 @@ if (isset($_POST['test_email_smtp'])) {
     $mail = addToMailQueue($data);
 
     if ($mail === true) {
-        flash_alert("Test email queued! <a class='text-bold text-light' href='admin_mail_queue.php'>Check Admin > Mail queue</a>");
+        flash_alert("Test email queued! <a class='text-bold text-light' href='mail_queue.php'>Check Admin > Mail queue</a>");
     } else {
         flash_alert("Failed to add test mail to queue", 'error');
     }
@@ -160,27 +160,128 @@ if (isset($_POST['test_email_smtp'])) {
 }
 
 if (isset($_POST['test_email_imap'])) {
-    
+
     validateCSRFToken($_POST['csrf_token']);
 
-    // Setup your IMAP connection parameters
+    $host       = $config_imap_host;
-    $hostname = "{" . $config_imap_host . ":" . $config_imap_port . "/" . $config_imap_encryption . "/novalidate-cert}INBOX";
+    $port       = (int) $config_imap_port;
-    $username = $config_imap_username;
+    $encryption = strtolower(trim($config_imap_encryption)); // e.g. "ssl", "tls", "none"
-    $password = $config_imap_password;
+    $username   = $config_imap_username;
+    $password   = $config_imap_password;
+
+    // Build remote socket (implicit SSL vs plain TCP)
+    $transport = 'tcp';
+    if ($encryption === 'ssl') {
+        $transport = 'ssl';
+    }
+
+    $remote_socket = $transport . '://' . $host . ':' . $port;
+
+    // Stream context (you can tighten these if you want strict validation)
+    $contextOptions = [];
+    if (in_array($encryption, ['ssl', 'tls'], true)) {
+        $contextOptions['ssl'] = [
+            'verify_peer'       => false,
+            'verify_peer_name'  => false,
+            'allow_self_signed' => true,
+        ];
+    }
+
+    $context = stream_context_create($contextOptions);
 
     try {
-        $inbox = @imap_open($hostname, $username, $password);
+        $errno  = 0;
+        $errstr = '';
 
-        if ($inbox) {
+        // 10-second timeout, adjust as needed
-            imap_close($inbox);
+        $fp = @stream_socket_client(
+            $remote_socket,
+            $errno,
+            $errstr,
+            10,
+            STREAM_CLIENT_CONNECT,
+            $context
+        );
+
+        if (!$fp) {
+            throw new Exception("Could not connect to IMAP server: [$errno] $errstr");
+        }
+
+        stream_set_timeout($fp, 10);
+
+        // Read server greeting (IMAP servers send something like: * OK Dovecot ready)
+        $greeting = fgets($fp, 1024);
+        if ($greeting === false || strpos($greeting, '* OK') !== 0) {
+            fclose($fp);
+            throw new Exception("Invalid IMAP greeting: " . trim((string) $greeting));
+        }
+
+        // If you really want STARTTLS for "tls" (port 143), you can do it here
+        if ($encryption === 'tls' && stripos($greeting, 'STARTTLS') !== false) {
+            // Request STARTTLS
+            fwrite($fp, "A0001 STARTTLS\r\n");
+            $line = fgets($fp, 1024);
+            if ($line === false || stripos($line, 'A0001 OK') !== 0) {
+                fclose($fp);
+                throw new Exception("STARTTLS failed: " . trim((string) $line));
+            }
+
+            // Enable crypto on the stream
+            if (!stream_socket_enable_crypto($fp, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
+                fclose($fp);
+                throw new Exception("Unable to enable TLS encryption on IMAP connection.");
+            }
+        }
+
+        // --- Do LOGIN command ---
+        $tag = 'A0002';
+
+        // Simple quoting; this may fail with some special chars in username/password.
+        $loginCmd = sprintf(
+            "%s LOGIN \"%s\" \"%s\"\r\n",
+            $tag,
+            addcslashes($username, "\\\""),
+            addcslashes($password, "\\\"")
+        );
+
+        fwrite($fp, $loginCmd);
+
+        $success   = false;
+        $errorLine = '';
+
+        while (!feof($fp)) {
+            $line = fgets($fp, 2048);
+            if ($line === false) {
+                break;
+            }
+
+            // Look for tagged response for our LOGIN
+            if (strpos($line, $tag . ' ') === 0) {
+                if (stripos($line, $tag . ' OK') === 0) {
+                    $success = true;
+                } else {
+                    $errorLine = trim($line);
+                }
+                break;
+            }
+        }
+
+        // Always logout / close
+        fwrite($fp, "A0003 LOGOUT\r\n");
+        fclose($fp);
+
+        if ($success) {
             flash_alert("Connected successfully");
         } else {
-            throw new Exception(imap_last_error());
+            if (!$errorLine) {
+                $errorLine = 'Unknown IMAP authentication error';
+            }
+            throw new Exception($errorLine);
         }
+
     } catch (Exception $e) {
-        flash_alert("<strong>IMAP connection failed:</strong> " . $e->getMessage(), 'error');
+        flash_alert("<strong>IMAP connection failed:</strong> " . htmlspecialchars($e->getMessage()), 'error');
     }
 
     redirect();
-
 }

admin/post/tag.php

@@ -28,7 +28,7 @@ if (isset($_POST['edit_tag'])) {
 
     $tag_id = intval($_POST['tag_id']);
 
-    mysqli_query($mysqli,"UPDATE tags SET tag_name = '$name', tag_type = $type, tag_color = '$color', tag_icon = '$icon' WHERE tag_id = $tag_id");
+    mysqli_query($mysqli,"UPDATE tags SET tag_name = '$name', tag_color = '$color', tag_icon = '$icon' WHERE tag_id = $tag_id");
 
     logAction("Tag", "Edit", "$session_name edited tag $name", 0, $tag_id);
 

admin/project_template.php

@@ -22,7 +22,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-project-diagram mr-2"></i>Project Templates</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addProjectTemplateModal"><i class="fas fa-plus mr-2"></i>New Project Template</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/project_template/project_template_add.php"><i class="fas fa-plus mr-2"></i>New Project Template</button>
         </div>
     </div>
     <div class="card-body">
@@ -87,7 +87,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     ?>
                     <tr>
                         <td>
-                            <a class="text-dark" href="#" data-toggle="modal" data-target="#editProjectTemplateModal<?php echo $project_template_id; ?>">
+                            <a class="text-dark ajax-modal" href="#" data-modal-url="modals/project_template/project_template_edit.php?project_template_id=<?= $project_template_id ?>">
                                 <div class="media">
                                     <i class="fa fa-fw fa-2x fa-project-diagram mr-3"></i>
                                     <div class="media-body">
@@ -109,7 +109,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fas fa-ellipsis-h"></i>
                                 </button>
                                 <div class="dropdown-menu">
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editProjectTemplateModal<?php echo $project_template_id; ?>">
+                                    <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/project_template/project_template_edit.php?project_template_id=<?= $project_template_id ?>">
                                         <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                     </a>
                                     <?php if($session_user_role == 3) { ?>
@@ -123,10 +123,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </td>
                     </tr>
 
-                    <?php
+                <?php
-
+                
-                    require "modals/project_template/project_template_edit.php";
-
                 }
 
                 ?>
@@ -134,12 +132,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </tbody>
             </table>
         </div>
-        <?php require_once "../includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php"; ?>
- ?>
     </div>
 </div>
 
 <?php
-require_once "modals/project_template/project_template_add.php";
-
 require_once "../includes/footer.php";

admin/project_template_details.php

@@ -13,9 +13,9 @@ if (isset($_GET['project_template_id'])) {
     );
 
     if (mysqli_num_rows($sql_project_templates) == 0) {
-        echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1><a class='btn btn-lg btn-secondary mt-3' href='admin_project_template.php'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>";
+        echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1><a class='btn btn-lg btn-secondary mt-3' href='javascript:history.back()'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>";
 
-        include_once "footer.php";
+        require_once "../includes/footer.php";
         exit;
     }
 
@@ -91,7 +91,7 @@ if (isset($_GET['project_template_id'])) {
 
         <div class="col-sm-2">
             <div class="btn-group float-right">
-                <button type="button" class="btn btn-primary btn-sm" href="#" data-toggle="modal" data-target="#addProjectTemplateTicketTemplateModal">
+                <button type="button" class="btn btn-primary btn-sm ajax-modal" href="#" data-modal-url="modals/project_template/project_template_ticket_template_add.php?project_template_id=<?= $project_template_id ?>">
                     <i class="fas fa-fw fa-plus mr-2"></i>Add Ticket Template
                 </button>
                 <div class="dropdown dropleft text-center ml-3">
@@ -99,7 +99,7 @@ if (isset($_GET['project_template_id'])) {
                         <i class="fas fa-fw fa-ellipsis-v"></i>
                     </button>
                     <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editProjectTemplateModal<?php echo $project_template_id; ?>">
+                        <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/project_template/project_template_edit.php?project_template_id=<?= $project_template_id ?>">
                             <i class="fas fa-fw fa-edit mr-2"></i>Edit Template
                         </a>
                         <?php if ($session_user_role == 3) { ?>
@@ -221,9 +221,6 @@ if (isset($_GET['project_template_id'])) {
 
 <?php
 
-require_once "modals/project_template/project_template_edit.php";
-require_once "modals/project_template/project_template_ticket_template_add.php";
-
 }
 
 require_once "../includes/footer.php";

admin/roles.php

@@ -24,7 +24,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <h3 class="card-title mt-2"><i class="fas fa-fw fa-user-shield mr-2"></i>Roles</h3>
             <div class="card-tools">
                 <div class="btn-group">
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRoleModal">
+                    <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/role/role_add.php">
                         <i class="fas fa-fw fa-user-plus mr-2"></i>New Role
                     </button>
                 </div>
@@ -143,6 +143,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-
-require_once "modals/role/role_add.php";
 require_once "../includes/footer.php";

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/software_template.php

@@ -21,7 +21,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-cube mr-2"></i>License Templates</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addSoftwareTemplateModal"><i class="fas fa-plus mr-2"></i>New License Template</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/software_template/software_template_add.php"><i class="fas fa-plus mr-2"></i>New License Template</button>
         </div>
     </div>
     <div class="card-body">
@@ -127,5 +127,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-require_once "modals/software_template/software_template_add.php";
 require_once "../includes/footer.php";

admin/tag.php

@@ -6,10 +6,31 @@ $order = "ASC";
 
 require_once "includes/inc_all_admin.php";
 
+if (isset($_GET['type'])) {
+    $type_filter = intval($_GET['type']);
+} else {
+    $type_filter = 1;
+}
+
+if ($type_filter == 1) {
+    $tag_type_display = "Client";
+} elseif ( $type_filter == 2) {
+    $tag_type_display = "Location";
+} elseif ( $type_filter == 3) {
+    $tag_type_display = "Contact";
+} elseif ( $type_filter == 4) {
+    $tag_type_display = "Credential";
+ } elseif ( $type_filter == 5) {
+    $tag_type_display = "Asset";
+} else {
+    $tag_type_display = "Unknown";
+}
+
 $sql = mysqli_query(
     $mysqli,
     "SELECT SQL_CALC_FOUND_ROWS * FROM tags
     WHERE tag_name LIKE '%$q%'
+    AND tag_type = $type_filter
     ORDER BY $sort $order LIMIT $record_from, $record_to"
 );
 
@@ -19,9 +40,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
     <div class="card card-dark">
         <div class="card-header py-2">
-            <h3 class="card-title mt-2"><i class="fas fa-fw fa-tags mr-2"></i>Tags</h3>
+            <h3 class="card-title mt-2"><i class="fas fa-fw fa-tags mr-2"></i><?= $tag_type_display ?> Tags</h3>
             <div class="card-tools">
-                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/tag/tag_add.php"><i class="fas fa-plus mr-2"></i>New Tag</button>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/tag/tag_add.php?type=<?= $type_filter ?>"><i class="fas fa-plus mr-2"></i>New <?= $tag_type_display ?> Tag</button>
             </div>
         </div>
 
@@ -30,7 +51,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <div class="col-sm-4 mb-2">
                     <form autocomplete="off">
                         <div class="input-group">
-                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Tags">
+                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search <?= $tag_type_display ?> Tags">
                             <div class="input-group-append">
                                 <button class="btn btn-primary"><i class="fa fa-search"></i></button>
                             </div>
@@ -38,6 +59,45 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </form>
                 </div>
                 <div class="col-sm-8">
+                    <div class="btn-group float-right">
+                        <a href="?type=1"
+                            class="btn <?php if ($type_filter == 1) {
+                                echo 'btn-primary';
+                            } else {
+                                echo 'btn-default';
+                            } ?>">Client</a>
+                        <a href="?type=2"
+                            class="btn <?php if ($type_filter == 2) {
+                                echo 'btn-primary';
+                            } else {
+                                echo 'btn-default';
+                            } ?>">Location</a>
+                        <a href="?type=3"
+                            class="btn <?php if ($type_filter == 3) {
+                                echo 'btn-primary';
+                            } else {
+                                echo 'btn-default';
+                            } ?>">Contact</a>
+                        <a href="?type=4"
+                           class="btn <?php if ($type_filter == 4) {
+                               echo 'btn-primary';
+                           } else {
+                               echo 'btn-default';
+                           } ?>">Credential</a>
+                        <a href="?type=5"
+                           class="btn <?php if ($type_filter == 5) {
+                               echo 'btn-primary';
+                           } else {
+                               echo 'btn-default';
+                           } ?>">Asset</a>
+                        <a href="?<?= $url_query_strings_sort ?>&archived=1"
+                            class="btn <?php if (isset($_GET['archived'])) {
+                                echo 'btn-primary';
+                            } else {
+                                echo 'btn-default';
+                            } ?>"><i
+                                class="fas fa-fw fa-archive mr-2"></i>Archived</a>
+                    </div>
                 </div>
             </div>
 
@@ -51,11 +111,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 Name <?php if ($sort == 'tag_name') { echo $order_icon; } ?>
                             </a>
                         </th>
-                        <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=tag_type&order=<?php echo $disp; ?>">
-                                Type <?php if ($sort == 'tag_type') { echo $order_icon; } ?>
-                            </a>
-                        </th>
                         <th class="text-center">Action</th>
                     </tr>
                     </thead>
@@ -65,18 +120,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     while ($row = mysqli_fetch_array($sql)) {
                         $tag_id = intval($row['tag_id']);
                         $tag_name = nullable_htmlentities($row['tag_name']);
-                        $tag_type = intval($row['tag_type']);
-                        if ( $tag_type == 1) {
-                            $tag_type_display = "Client Tag";
-                        } elseif ( $tag_type == 2) {
-                            $tag_type_display = "Location Tag";
-                        } elseif ( $tag_type == 3) {
-                            $tag_type_display = "Contact Tag";
-                        } elseif ( $tag_type == 4) {
-                            $tag_type_display = "Credential Tag";
-                        } else {
-                            $tag_type_display = "Unknown Tag";
-                        }
                         $tag_color = nullable_htmlentities($row['tag_color']);
                         $tag_icon = nullable_htmlentities($row['tag_icon']);
 
@@ -88,7 +131,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <span class='badge text-light p-2 mr-1' style="background-color: <?php echo $tag_color; ?>"><i class="fa fa-fw fa-<?php echo $tag_icon; ?> mr-2"></i><?php echo $tag_name; ?></span>
                                 </a>
                             </td>
-                            <td><?php echo $tag_type_display; ?></td>
                             <td>
                                 <div class="dropdown dropleft text-center">
                                     <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
@@ -117,8 +159,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "../includes/filter_footer.php";
+            <?php require_once "../includes/filter_footer.php"; ?>
- ?>
         </div>
     </div>
 

admin/tax.php

@@ -17,84 +17,83 @@ $num_rows = mysqli_num_rows($sql);
 
 ?>
 
-    <div class="card card-dark">
+<div class="card card-dark">
-        <div class="card-header py-2">
+    <div class="card-header py-2">
-            <h3 class="card-title mt-2"><i class="fas fa-fw fa-balance-scale mr-2"></i>Taxes</h3>
+        <h3 class="card-title mt-2"><i class="fas fa-fw fa-balance-scale mr-2"></i>Taxes</h3>
-            <div class="card-tools">
+        <div class="card-tools">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTaxModal"><i class="fas fa-plus mr-2"></i>New Tax</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/tax/tax_add.php"><i class="fas fa-plus mr-2"></i>New Tax</button>
-            </div>
-        </div>
-        <div class="card-body">
-            <div class="table-responsive-sm">
-                <table class="table table-striped table-borderless table-hover">
-                    <thead class="text-dark <?php if ($num_rows == 0) { echo "d-none"; } ?>">
-                    <tr>
-                        <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=tax_name&order=<?php echo $disp; ?>">
-                                Name <?php if ($sort == 'tax_name') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=tax_percent&order=<?php echo $disp; ?>">
-                                Percent <?php if ($sort == 'tax_percent') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th class="text-center">Action</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <?php
-
-                    while ($row = mysqli_fetch_array($sql)) {
-                        $tax_id = intval($row['tax_id']);
-                        $tax_name = nullable_htmlentities($row['tax_name']);
-                        $tax_percent = floatval($row['tax_percent']);
-
-                        ?>
-                        <tr>
-                            <td>
-                                <a class="text-dark text-bold ajax-modal" href="#"
-                                    data-modal-url="modals/tax/tax_edit.php?id=<?= $tax_id ?>">
-                                    <?php echo $tax_name; ?>
-                                </a>
-                            </td>
-                            <td><?php echo "$tax_percent%"; ?></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-url="modals/tax/tax_edit.php?id=<?= $tax_id ?>">
-                                            <i class="fas fa-fw fa-edit mr-2"></i>Edit
-                                        </a>
-                                        <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item text-danger confirm-link" href="post.php?archive_tax=<?php echo $tax_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                            <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                        </a>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-
-                        <?php
-
-                    }
-
-                    if ($num_rows == 0) {
-                        echo "<h3 class='text-secondary mt-3' style='text-align: center'>No Records Here</h3>";
-                    }
-
-                    ?>
-
-                    </tbody>
-                </table>
-
-            </div>
         </div>
     </div>
+    <div class="card-body">
+        <div class="table-responsive-sm">
+            <table class="table table-striped table-borderless table-hover">
+                <thead class="text-dark <?php if ($num_rows == 0) { echo "d-none"; } ?>">
+                <tr>
+                    <th>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=tax_name&order=<?php echo $disp; ?>">
+                            Name <?php if ($sort == 'tax_name') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=tax_percent&order=<?php echo $disp; ?>">
+                            Percent <?php if ($sort == 'tax_percent') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th class="text-center">Action</th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php
+
+                while ($row = mysqli_fetch_array($sql)) {
+                    $tax_id = intval($row['tax_id']);
+                    $tax_name = nullable_htmlentities($row['tax_name']);
+                    $tax_percent = floatval($row['tax_percent']);
+
+                    ?>
+                    <tr>
+                        <td>
+                            <a class="text-dark text-bold ajax-modal" href="#"
+                                data-modal-url="modals/tax/tax_edit.php?id=<?= $tax_id ?>">
+                                <?php echo $tax_name; ?>
+                            </a>
+                        </td>
+                        <td><?php echo "$tax_percent%"; ?></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-url="modals/tax/tax_edit.php?id=<?= $tax_id ?>">
+                                        <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                                    </a>
+                                    <div class="dropdown-divider"></div>
+                                    <a class="dropdown-item text-danger confirm-link" href="post.php?archive_tax=<?php echo $tax_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                        <i class="fas fa-fw fa-archive mr-2"></i>Archive
+                                    </a>
+                                </div>
+                            </div>
+                        </td>
+                    </tr>
+
+                    <?php
+
+                }
+
+                if ($num_rows == 0) {
+                    echo "<h3 class='text-secondary mt-3' style='text-align: center'>No Records Here</h3>";
+                }
+
+                ?>
+
+                </tbody>
+            </table>
+
+        </div>
+    </div>
+</div>
 
 <?php
-require_once "modals/tax/tax_add.php";
 require_once "../includes/footer.php";

admin/ticket_status.php

@@ -21,7 +21,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-info-circle mr-2"></i>Tickets Statuses</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketStatusModal"><i class="fas fa-plus mr-2"></i>New Ticket Status</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/ticket_status/ticket_status_add.php"><i class="fas fa-plus mr-2"></i>New Ticket Status</button>
         </div>
     </div>
 
@@ -120,13 +120,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </tbody>
             </table>
         </div>
-        <?php require_once "../includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php"; ?>
-?>
     </div>
 </div>
 
 <?php
-require_once "modals/ticket_status/ticket_status_add.php";
-
 require_once "../includes/footer.php";
-

admin/ticket_template.php

@@ -27,7 +27,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-life-ring mr-2"></i>Ticket Templates</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketTemplateModal"><i class="fas fa-plus mr-2"></i>New Ticket Template</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/ticket_template/ticket_template_add.php" data-modal-size="lg"><i class="fas fa-plus mr-2"></i>New Ticket Template</button>
         </div>
     </div>
     <div class="card-body">
@@ -120,5 +120,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-require_once "modals/ticket_template/ticket_template_add.php";
 require_once "../includes/footer.php";

admin/ticket_template_details.php

@@ -15,9 +15,15 @@ if (isset($_GET['ticket_template_id'])) {
     $ticket_template_id = intval($_GET['ticket_template_id']);
 }
 
-$sql_ticket_templates = mysqli_query($mysqli, "SELECT * FROM ticket_templates WHERE ticket_template_id = $ticket_template_id");
+$sql_ticket_template = mysqli_query($mysqli, "SELECT * FROM ticket_templates WHERE ticket_template_id = $ticket_template_id LIMIT 1");
 
-$row = mysqli_fetch_array($sql_ticket_templates);
+if (mysqli_num_rows($sql_ticket_template) == 0) {
+    echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1><a class='btn btn-lg btn-secondary mt-3' href='javascript:history.back()'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>";
+    require_once "../includes/footer.php";
+    exit();
+}
+
+$row = mysqli_fetch_array($sql_ticket_template);
 
 $ticket_template_name = nullable_htmlentities($row['ticket_template_name']);
 $ticket_template_description = nullable_htmlentities($row['ticket_template_description']);

admin/users.php

@@ -26,16 +26,23 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-users mr-2"></i>Users</h3>
         <div class="card-tools">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addUserModal">
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/user/user_add.php">
                     <i class="fas fa-fw fa-user-plus mr-2"></i>New User
                 </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="#userInviteModal"><i class="fas fa-paper-plane mr-2"></i>Invite User</a>-->
+                    <!--<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" href="#" data-toggle="modal" data-target="#resetAllUserPassModal"><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>
@@ -54,7 +61,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </div>
                 <div class="col-md-8">
                     <div class="btn-group float-right">
-                        <a href="?archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>" 
+                        <a href="?archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>"
                             class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"; } ?>">
                             <i class="fa fa-fw fa-archive mr-2"></i>Archived
                         </a>
@@ -156,7 +163,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     ?>
                     <tr>
                         <td class="text-center">
-                            <a href="#" 
+                            <a href="#" title="UserID: <?= $user_id ?>"
                                 <?php if ($user_id !== $session_user_id) { // Prevent modifying self ?>
                                 class="ajax-modal"
                                 data-modal-url="modals/user/user_edit.php?id=<?= $user_id ?>"
@@ -233,15 +240,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
  ?>
     </div>
 </div>
-<script>
-    function generatePassword() {
-        document.getElementById("password").value = "<?php echo randomString() ?>"
-    }
-</script>
 
 <?php
-require_once "modals/user/user_add.php";
+require_once "../includes/footer.php";
-require_once "modals/user/user_invite.php";
-require_once "modals/user/user_export.php";
-require_once "modals/user/user_all_reset_password.php";
-require_once "../includes/footer.php";

admin/vendor_template.php

@@ -16,153 +16,151 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
-    <div class="card card-dark">
+<div class="card card-dark">
-        <div class="card-header py-2">
+    <div class="card-header py-2">
-            <h3 class="card-title mt-2">
+        <h3 class="card-title mt-2">
-                <i class="fas fa-fw fa-building mr-2"></i>Vendor Templates
+            <i class="fas fa-fw fa-building mr-2"></i>Vendor Templates
-            </h3>
+        </h3>
-            <div class="card-tools">
+        <div class="card-tools">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addVendorTemplateModal">
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/vendor_template/vendor_template_add.php">
-                    <i class="fas fa-plus mr-2"></i>New Vendor Template
+                <i class="fas fa-plus mr-2"></i>New Vendor Template
-                </button>
+            </button>
-            </div>
-        </div>
-        <div class="card-body">
-            <form autocomplete="off">
-                <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 Vendors Templates">
-                            <div class="input-group-append">
-                                <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-            </form>
-            <hr>
-            <div class="table-responsive">
-                <table class="table table-striped table-borderless table-hover">
-                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-                    <tr>
-                        <th>
-                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=vendor_template_name&order=<?php echo $disp; ?>">
-                                Vendor <?php if ($sort == 'vendor_template_name') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>
-                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=vendor_template_description&order=<?php echo $disp; ?>">
-                                Description <?php if ($sort == 'vendor_template_description') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>Contact</th>
-                        <th class="text-center">Action</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <?php
-
-                    while ($row = mysqli_fetch_array($sql)) {
-                        $vendor_template_id = intval($row['vendor_template_id']);
-                        $vendor_template_name = nullable_htmlentities($row['vendor_template_name']);
-                        $vendor_template_description = nullable_htmlentities($row['vendor_template_description']);
-                        if (empty($vendor_template_description)) {
-                            $vendor_template_description_display = "-";
-                        } else {
-                            $vendor_template_description_display = $vendor_template_description;
-                        }
-                        $vendor_template_account_number = nullable_htmlentities($row['vendor_template_account_number']);
-                        $vendor_template_contact_name = nullable_htmlentities($row['vendor_template_contact_name']);
-                        if (empty($vendor_template_contact_name)) {
-                            $vendor_template_contact_name_display = "-";
-                        } else {
-                            $vendor_template_contact_name_display = $vendor_template_contact_name;
-                        }
-                        $vendor_template_phone = formatPhoneNumber($row['vendor_template_phone']);
-                        $vendor_template_extension = nullable_htmlentities($row['vendor_template_extension']);
-                        $vendor_template_email = nullable_htmlentities($row['vendor_template_email']);
-                        $vendor_template_website = nullable_htmlentities($row['vendor_template_website']);
-                        $vendor_template_hours = nullable_htmlentities($row['vendor_template_hours']);
-                        $vendor_template_sla = nullable_htmlentities($row['vendor_template_sla']);
-                        $vendor_template_code = nullable_htmlentities($row['vendor_template_code']);
-                        $vendor_template_notes = nullable_htmlentities($row['vendor_template_notes']);
-
-                        ?>
-                        <tr>
-                            <th>
-                                <a class="text-dark ajax-modal" href="#"
-                                    data-modal-url="modals/vendor_template/vendor_template_edit.php?id=<?= $vendor_template_id ?>">
-                                    <i class="fa fa-fw fa-building text-secondary mr-2"></i><?php echo $vendor_template_name; ?>
-                                </a>
-                                <?php
-                                if (!empty($vendor_template_account_number)) {
-                                    ?>
-                                    <br>
-                                    <small class="text-secondary"><?php echo $vendor_template_account_number; ?></small>
-                                    <?php
-                                }
-                                ?>
-                            </th>
-                            <td><?php echo $vendor_template_description_display; ?></td>
-                            <td>
-                                <?php
-                                if (!empty($vendor_template_contact_name)) {
-                                    ?>
-                                    <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><?php echo $vendor_template_contact_name_display; ?>
-                                    <br>
-                                    <?php
-                                } else {
-                                    echo $vendor_template_contact_name_display;
-                                }
-
-                                if (!empty($vendor_template_phone)) { ?>
-                                    <i class="fa fa-fw fa-phone text-secondary mr-2 mb-2"></i><?php echo $vendor_template_phone; ?>
-                                    <br>
-                                <?php }
-
-                                if (!empty($vendor_template_email)) { ?>
-                                    <i class="fa fa-fw fa-envelope text-secondary mr-2 mb-2"></i><?php echo $vendor_template_email; ?>
-                                    <br>
-                                <?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-url="modals/vendor_template/vendor_template_edit.php?id=<?= $vendor_template_id ?>">
-                                            <i class="fas fa-fw fa-edit mr-2"></i>Edit
-                                        </a>
-                                        <?php if ($session_user_role == 3) { ?>
-                                            <div class="dropdown-divider"></div>
-                                            <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_vendor=<?php echo $vendor_template_id; ?>">
-                                                <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                            </a>
-                                        <?php } ?>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-
-                        <?php
-
-                    }
-
-                    ?>
-
-                    </tbody>
-                </table>
-            </div>
-            <?php require_once "../includes/filter_footer.php";
- ?>
         </div>
     </div>
+    <div class="card-body">
+        <form autocomplete="off">
+            <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 Vendors Templates">
+                        <div class="input-group-append">
+                            <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </form>
+        <hr>
+        <div class="table-responsive">
+            <table class="table table-striped table-borderless table-hover">
+                <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                <tr>
+                    <th>
+                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=vendor_template_name&order=<?php echo $disp; ?>">
+                            Vendor <?php if ($sort == 'vendor_template_name') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=vendor_template_description&order=<?php echo $disp; ?>">
+                            Description <?php if ($sort == 'vendor_template_description') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>Contact</th>
+                    <th class="text-center">Action</th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php
+
+                while ($row = mysqli_fetch_array($sql)) {
+                    $vendor_template_id = intval($row['vendor_template_id']);
+                    $vendor_template_name = nullable_htmlentities($row['vendor_template_name']);
+                    $vendor_template_description = nullable_htmlentities($row['vendor_template_description']);
+                    if (empty($vendor_template_description)) {
+                        $vendor_template_description_display = "-";
+                    } else {
+                        $vendor_template_description_display = $vendor_template_description;
+                    }
+                    $vendor_template_account_number = nullable_htmlentities($row['vendor_template_account_number']);
+                    $vendor_template_contact_name = nullable_htmlentities($row['vendor_template_contact_name']);
+                    if (empty($vendor_template_contact_name)) {
+                        $vendor_template_contact_name_display = "-";
+                    } else {
+                        $vendor_template_contact_name_display = $vendor_template_contact_name;
+                    }
+                    $vendor_template_phone = formatPhoneNumber($row['vendor_template_phone']);
+                    $vendor_template_extension = nullable_htmlentities($row['vendor_template_extension']);
+                    $vendor_template_email = nullable_htmlentities($row['vendor_template_email']);
+                    $vendor_template_website = nullable_htmlentities($row['vendor_template_website']);
+                    $vendor_template_hours = nullable_htmlentities($row['vendor_template_hours']);
+                    $vendor_template_sla = nullable_htmlentities($row['vendor_template_sla']);
+                    $vendor_template_code = nullable_htmlentities($row['vendor_template_code']);
+                    $vendor_template_notes = nullable_htmlentities($row['vendor_template_notes']);
+
+                    ?>
+                    <tr>
+                        <th>
+                            <a class="text-dark ajax-modal" href="#"
+                                data-modal-url="modals/vendor_template/vendor_template_edit.php?id=<?= $vendor_template_id ?>">
+                                <i class="fa fa-fw fa-building text-secondary mr-2"></i><?php echo $vendor_template_name; ?>
+                            </a>
+                            <?php
+                            if (!empty($vendor_template_account_number)) {
+                                ?>
+                                <br>
+                                <small class="text-secondary"><?php echo $vendor_template_account_number; ?></small>
+                                <?php
+                            }
+                            ?>
+                        </th>
+                        <td><?php echo $vendor_template_description_display; ?></td>
+                        <td>
+                            <?php
+                            if (!empty($vendor_template_contact_name)) {
+                                ?>
+                                <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><?php echo $vendor_template_contact_name_display; ?>
+                                <br>
+                                <?php
+                            } else {
+                                echo $vendor_template_contact_name_display;
+                            }
+
+                            if (!empty($vendor_template_phone)) { ?>
+                                <i class="fa fa-fw fa-phone text-secondary mr-2 mb-2"></i><?php echo $vendor_template_phone; ?>
+                                <br>
+                            <?php }
+
+                            if (!empty($vendor_template_email)) { ?>
+                                <i class="fa fa-fw fa-envelope text-secondary mr-2 mb-2"></i><?php echo $vendor_template_email; ?>
+                                <br>
+                            <?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-url="modals/vendor_template/vendor_template_edit.php?id=<?= $vendor_template_id ?>">
+                                        <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                                    </a>
+                                    <?php if ($session_user_role == 3) { ?>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_vendor_template=<?= $vendor_template_id ?>">
+                                            <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                        </a>
+                                    <?php } ?>
+                                </div>
+                            </div>
+                        </td>
+                    </tr>
+
+                    <?php
+
+                }
+
+                ?>
+
+                </tbody>
+            </table>
+        </div>
+        <?php require_once "../includes/filter_footer.php"; ?>
+    </div>
+</div>
 
 <?php
-require_once "modals/vendor_template/vendor_template_add.php";
 require_once "../includes/footer.php";

agent/accounts.php

@@ -25,7 +25,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <div class="card-header py-2">
             <h3 class="card-title mt-2"><i class="fa fa-fw fa-piggy-bank mr-2"></i>Accounts</h3>
             <div class="card-tools">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAccountModal"><i class="fas fa-plus mr-2"></i>New Account</button>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/account/account_add.php"><i class="fas fa-plus mr-2"></i>New Account</button>
             </div>
         </div>
         <div class="card-body">
@@ -123,6 +123,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-
-require_once "modals/account/account_add.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 
@@ -432,7 +432,7 @@ if (isset($_GET['get_totp_token_via_id'])) {
 }
 
 if (isset($_GET['get_readable_pass'])) {
-    echo json_encode(GenerateReadablePassword(4));
+    echo json_encode(GenerateReadablePassword(1));
 }
 
 /*
@@ -698,4 +698,297 @@ if (isset($_GET['client_duplicate_check'])) {
     }
 
     echo json_encode($response);
-}
+}
+
+if (isset($_GET['contact_email_check'])) {
+    enforceUserPermission('module_client', 2);
+
+    $email = sanitizeInput($_GET['email']);
+    $domain = sanitizeInput(substr($_GET['email'], strpos($_GET['email'], '@') + 1));
+
+    $response['message'] = ""; // default
+
+    if (strlen($email) >= 3) {
+
+        // 1. Duplicate check
+        $sql_contacts = mysqli_query($mysqli, "SELECT contact_email FROM contacts WHERE contact_email = '$email' LIMIT 1");
+        if (mysqli_num_rows($sql_contacts) > 0) {
+            while ($row = mysqli_fetch_array($sql_contacts)) {
+                $response['message'] = "<i class='fas fa-fw fa-copy mr-2'></i> Potential duplicate: <i>" . nullable_htmlentities($row['contact_email']) . "</i> already exists.";
+            }
+        }
+
+        // 2. MX record check
+        if (!checkdnsrr($domain, 'MX')) {
+            $response['message'] = "<i class='fas fa-fw fa-exclamation-triangle mr-2'></i> E-mail domain invalid.";
+        }
+
+    }
+
+    echo json_encode($response);
+}
+
+if (isset($_GET['ai_reword'])) {
+
+    header('Content-Type: application/json');
+
+    $sql = mysqli_query($mysqli, "SELECT * FROM ai_models LEFT JOIN ai_providers ON ai_model_ai_provider_id = ai_provider_id WHERE ai_model_use_case = 'General' LIMIT 1");
+
+    $row = mysqli_fetch_array($sql);
+    $model_name = $row['ai_model_name'];
+    $promptText = $row['ai_model_prompt'];
+    $url = $row['ai_provider_api_url'];
+    $key = $row['ai_provider_api_key'];
+
+    // Collecting the input data from the AJAX request.
+    $inputJSON = file_get_contents('php://input');
+    $input = json_decode($inputJSON, TRUE); // Convert JSON into array.
+
+    $userText = $input['text'];
+
+    // Preparing the data for the OpenAI Chat API request.
+    $data = [
+        "model" => "$model_name", // Specify the model
+        "messages" => [
+            ["role" => "system", "content" => $promptText],
+            ["role" => "user", "content" => $userText],
+        ],
+        "temperature" => 0.5
+    ];
+
+    // Initialize cURL session to the OpenAI Chat API.
+    $ch = curl_init("$url");
+
+    // Set cURL options for the request.
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data));
+    curl_setopt($ch, CURLOPT_HTTPHEADER, [
+        'Content-Type: application/json',
+        'Authorization: Bearer ' . $key,
+    ]);
+
+    // Execute the cURL session and capture the response.
+    $response = curl_exec($ch);
+    curl_close($ch);
+
+    // Decode the JSON response.
+    $responseData = json_decode($response, true);
+
+    // Check if the response contains the expected data and return it.
+    if (isset($responseData['choices'][0]['message']['content'])) {
+        // Get the response content.
+        $content = $responseData['choices'][0]['message']['content'];
+
+        // Clean any leading "html" word or other unwanted text at the beginning.
+        $content = preg_replace('/^html/i', '', $content);  // Remove any occurrence of 'html' at the start
+
+        // Clean the response content to remove backticks or code block markers.
+        $cleanedContent = str_replace('```', '', $content); // Remove backticks if they exist.
+
+        // Trim any leading/trailing whitespace.
+        $cleanedContent = trim($cleanedContent);
+
+        // Return the cleaned response.
+        echo json_encode(['rewordedText' => $cleanedContent]);
+    } else {
+        // Handle errors or unexpected response structure.
+        echo json_encode(['rewordedText' => 'Failed to get a response from the AI API.']);
+    }
+
+}
+
+if (isset($_GET['ai_create_document_template'])) {
+    // get_ai_document_template.php
+
+    header('Content-Type: text/html; charset=UTF-8');
+
+    $sql = mysqli_query($mysqli, "SELECT * FROM ai_models LEFT JOIN ai_providers ON ai_model_ai_provider_id = ai_provider_id WHERE ai_model_use_case = 'General' LIMIT 1");
+
+    $row = mysqli_fetch_array($sql);
+    $model_name = $row['ai_model_name'];
+    $url = $row['ai_provider_api_url'];
+    $key = $row['ai_provider_api_key'];
+
+    $prompt = $_POST['prompt'] ?? '';
+
+    // Basic validation
+    if(empty($prompt)){
+        echo "No prompt provided.";
+        exit;
+    }
+
+    // Prepare prompt
+    $system_message = "You are a helpful IT documentation assistant. You will create a well-structured HTML template for IT documentation based on a given prompt. Include headings, subheadings, bullet points, and possibly tables for clarity. No Lorem Ipsum, use realistic placeholders and professional language.";
+    $user_message = "Create an HTML formatted IT documentation template based on the following request:\n\n\"$prompt\"\n\nThe template should be structured, professional, and useful for IT staff. Include relevant sections, instructions, prerequisites, and best practices.";
+
+    $post_data = [
+        "model" => "$model_name",
+        "messages" => [
+            ["role" => "system", "content" => $system_message],
+            ["role" => "user", "content" => $user_message]
+        ],
+        "temperature" => 0.5
+    ];
+
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_URL, $url);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_HTTPHEADER, [
+        'Content-Type: application/json',
+        'Authorization: Bearer ' . $key
+    ]);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($post_data));
+
+    $response = curl_exec($ch);
+    if (curl_errno($ch)) {
+        echo "Error: " . curl_error($ch);
+        exit;
+    }
+    curl_close($ch);
+
+    $response_data = json_decode($response, true);
+    $template = $response_data['choices'][0]['message']['content'] ?? "<p>No content returned from AI.</p>";
+
+    // Print the generated HTML template directly
+    echo $template;
+}
+
+if (isset($_GET['ai_ticket_summary'])) {
+
+    header('Content-Type: text/html; charset=UTF-8');
+
+    $sql = mysqli_query($mysqli, "SELECT * FROM ai_models LEFT JOIN ai_providers ON ai_model_ai_provider_id = ai_provider_id WHERE ai_model_use_case = 'General' LIMIT 1");
+
+    $row = mysqli_fetch_array($sql);
+    $model_name = $row['ai_model_name'];
+    $url = $row['ai_provider_api_url'];
+    $key = $row['ai_provider_api_key'];
+
+    // Retrieve the ticket_id from POST
+    $ticket_id = intval($_POST['ticket_id']);
+
+    // Query the database for ticket details
+    $sql = mysqli_query($mysqli, "
+        SELECT ticket_subject, ticket_details, ticket_source, ticket_priority, ticket_status_name, category_name
+        FROM tickets
+        LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
+        LEFT JOIN categories ON ticket_category = category_id
+        WHERE ticket_id = $ticket_id
+        LIMIT 1
+    ");
+    $row = mysqli_fetch_assoc($sql);
+    $ticket_subject = $row['ticket_subject'];
+    $ticket_details = strip_tags($row['ticket_details']); // strip HTML for cleaner prompt
+    $ticket_status = $row['ticket_status_name'];
+    $ticket_category = $row['category_name'];
+    $ticket_source = $row['ticket_source'];
+    $ticket_priority = $row['ticket_priority'];
+
+    // Get ticket replies
+    $sql_replies = mysqli_query($mysqli, "
+        SELECT ticket_reply, ticket_reply_type, user_name
+        FROM ticket_replies
+        LEFT JOIN users ON ticket_reply_by = user_id
+        WHERE ticket_reply_ticket_id = $ticket_id
+        AND ticket_reply_archived_at IS NULL
+        ORDER BY ticket_reply_id ASC
+    ");
+
+    $all_replies_text = "";
+    while ($reply = mysqli_fetch_assoc($sql_replies)) {
+        $reply_type = $reply['ticket_reply_type'];
+        $reply_text = strip_tags($reply['ticket_reply']);
+        $reply_by = $reply['user_name'];
+        $all_replies_text .= "\nReply Type: $reply_type Reply By: $reply_by: Reply Text: $reply_text";
+    }
+
+    $prompt = "
+    Summarize the following IT support ticket and its responses in a concise, clear, and professional manner. 
+    The summary should include:
+
+    1. Main Issue: What was the problem reported by the user?
+    2. Actions Taken: What steps were taken to address the issue?
+    3. Resolution or Next Steps: Was the issue resolved or is it ongoing?
+
+    Please ensure:
+    - If there are multiple issues, summarize each separately.
+    - Urgency: If the ticket or replies express urgency or escalation, highlight it.
+    - Attachments: If mentioned in the ticket, note any relevant attachments or files.
+    - Avoid extra explanations or unnecessary information.
+
+    Ticket Data:
+    - Ticket Source: $ticket_source
+    - Current Ticket Status: $ticket_status
+    - Ticket Priority: $ticket_priority
+    - Ticket Category: $ticket_category
+    - Ticket Subject: $ticket_subject
+    - Ticket Details: $ticket_details
+    - Replies:
+    $all_replies_text
+
+    Formatting instructions:
+    - Use valid HTML tags only.
+    - Use <h3> for section headers (Main Issue, Actions Taken, Resolution).
+    - Use <ul><li> for bullet points under each section.
+    - Do NOT wrap the output in ```html or any other code fences.
+    - Do NOT include <html>, <head>, or <body>.
+    - Output only the summary content in pure HTML.
+    If any part of the ticket or replies is unclear or ambiguous, mention it in the summary and suggest if further clarification is needed.
+    ";
+
+    // Prepare the POST data
+    $post_data = [
+        "model" => "$model_name",
+        "messages" => [
+            ["role" => "system", "content" => "Your task is to summarize IT support tickets with clear, concise details."],
+            ["role" => "user", "content" => $prompt]
+        ],
+        "temperature" => 0.3
+    ];
+
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_URL, $url);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_HTTPHEADER, [
+        'Content-Type: application/json',
+        'Authorization: Bearer ' . $key
+    ]);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($post_data));
+
+    $response = curl_exec($ch);
+    if (curl_errno($ch)) {
+        echo "Error: " . curl_error($ch);
+        exit;
+    }
+    curl_close($ch);
+
+    $response_data = json_decode($response, true);
+    $summary = $response_data['choices'][0]['message']['content'] ?? "No summary available.";
+
+
+    echo $summary; // nl2br to convert newlines to <br>, htmlspecialchars to prevent XSS
+}
+
+// Stops people trying to use sub-domains in the domains tracker
+if (isset($_GET['apex_domain_check'])) {
+    enforceUserPermission('module_support', 2);
+
+    $domain = sanitizeInput($_GET['domain']);
+
+    $response['message'] = ""; // default
+
+    if (strlen($domain) >= 4) {
+
+        // SOA record check
+        //  This isn't 100%, as sub-domains can have their own SOA but will capture 99%
+        if (!checkdnsrr($domain, 'SOA')) {
+            $response['message'] = "<i class='fas fa-fw fa-exclamation-triangle mr-2'></i> Domain name is invalid.";
+        }
+
+    }
+
+    echo json_encode($response);
+}

agent/asset_details.php

@@ -4,7 +4,7 @@
 if (isset($_GET['client_id'])) {
     require_once "includes/inc_all_client.php";
     $client_query = "AND asset_client_id = $client_id";
-    $client_url = "AND client_id=$client_id&";
+    $client_url = "client_id=$client_id&";
 } else {
     require_once "includes/inc_client_overview_all.php";
     $client_query = '';
@@ -15,8 +15,8 @@ if (isset($_GET['asset_id'])) {
     $asset_id = intval($_GET['asset_id']);
 
     $sql = mysqli_query($mysqli, "SELECT * FROM assets
-        LEFT JOIN clients ON client_id = asset_client_id 
+        LEFT JOIN clients ON client_id = asset_client_id
-        LEFT JOIN contacts ON asset_contact_id = contact_id 
+        LEFT JOIN contacts ON asset_contact_id = contact_id
         LEFT JOIN locations ON asset_location_id = location_id
         LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1
         WHERE asset_id = $asset_id
@@ -101,7 +101,7 @@ if (isset($_GET['asset_id'])) {
         $ticket_count = mysqli_num_rows($sql_related_tickets);
 
         // Related Recurring Tickets Query
-        $sql_related_recurring_tickets = mysqli_query($mysqli, "SELECT recurring_tickets.* FROM recurring_tickets 
+        $sql_related_recurring_tickets = mysqli_query($mysqli, "SELECT recurring_tickets.* FROM recurring_tickets
             LEFT JOIN recurring_ticket_assets ON recurring_tickets.recurring_ticket_id = recurring_ticket_assets.recurring_ticket_id
             WHERE recurring_ticket_asset_id = $asset_id OR recurring_ticket_assets.asset_id = $asset_id
             GROUP BY recurring_tickets.recurring_ticket_id
@@ -110,17 +110,39 @@ if (isset($_GET['asset_id'])) {
         $recurring_ticket_count = mysqli_num_rows($sql_related_recurring_tickets);
 
         // Related Documents
-        $sql_related_documents = mysqli_query($mysqli, "SELECT * FROM asset_documents 
+        $sql_related_documents = mysqli_query($mysqli, "SELECT * FROM asset_documents
             LEFT JOIN documents ON asset_documents.document_id = documents.document_id
-            WHERE asset_documents.asset_id = $asset_id 
+            WHERE asset_documents.asset_id = $asset_id
-            AND document_archived_at IS NULL 
+            AND document_archived_at IS NULL
             ORDER BY document_name DESC"
         );
         $document_count = mysqli_num_rows($sql_related_documents);
 
+        // Tags - many to many relationship
+        $asset_tag_name_display_array = array();
+        $asset_tag_id_array = array();
+        $sql_asset_tags = mysqli_query($mysqli, "SELECT * FROM asset_tags LEFT JOIN tags ON asset_tag_tag_id = tag_id WHERE asset_tag_asset_id = $asset_id ORDER BY tag_name ASC");
+        while ($row = mysqli_fetch_array($sql_asset_tags)) {
+
+            $asset_tag_id = intval($row['tag_id']);
+            $asset_tag_name = nullable_htmlentities($row['tag_name']);
+            $asset_tag_color = nullable_htmlentities($row['tag_color']);
+            if (empty($asset_tag_color)) {
+                $asset_tag_color = "dark";
+            }
+            $asset_tag_icon = nullable_htmlentities($row['tag_icon']);
+            if (empty($asset_tag_icon)) {
+                $asset_tag_icon = "tag";
+            }
+
+            $asset_tag_id_array[] = $asset_tag_id;
+            $asset_tag_name_display_array[] = "<a href='client_assets.php?client_id=$client_id&q=$asset_tag_name'><span class='badge text-light p-1 mr-1' style='background-color: $asset_tag_color;'><i class='fa fa-fw fa-$asset_tag_icon mr-2'></i>$asset_tag_name</span></a>";
+        }
+        $asset_tags_display = implode('', $asset_tag_name_display_array);
+
         // Network Interfaces
         $sql_related_interfaces = mysqli_query($mysqli, "
-            SELECT 
+            SELECT
                 ai.interface_id,
                 ai.interface_name,
                 ai.interface_description,
@@ -151,7 +173,7 @@ if (isset($_GET['asset_id'])) {
               )
             LEFT JOIN assets AS connected_assets
               ON connected_assets.asset_id = connected_interfaces.interface_asset_id
-            WHERE 
+            WHERE
                 ai.interface_asset_id = $asset_id
                 AND ai.interface_archived_at IS NULL
             ORDER BY ai.interface_name ASC
@@ -160,7 +182,7 @@ if (isset($_GET['asset_id'])) {
         $interface_count = mysqli_num_rows($sql_related_interfaces);
 
         // Related Files
-        $sql_related_files = mysqli_query($mysqli, "SELECT * FROM asset_files 
+        $sql_related_files = mysqli_query($mysqli, "SELECT * FROM asset_files
             LEFT JOIN files ON asset_files.file_id = files.file_id
             WHERE asset_files.asset_id = $asset_id
             AND file_archived_at IS NULL
@@ -182,7 +204,7 @@ if (isset($_GET['asset_id'])) {
         // Related Documents
         $sql_related_documents = mysqli_query($mysqli, "SELECT * FROM asset_documents, documents
             LEFT JOIN users ON document_created_by = user_id
-            WHERE asset_documents.asset_id = $asset_id 
+            WHERE asset_documents.asset_id = $asset_id
             AND asset_documents.document_id = documents.document_id
             AND document_archived_at IS NULL
             ORDER BY document_name ASC"
@@ -192,7 +214,7 @@ if (isset($_GET['asset_id'])) {
 
         // Related Credentials Query
         $sql_related_credentials = mysqli_query($mysqli, "
-            SELECT 
+            SELECT
                 credentials.credential_id AS credential_id,
                 credentials.credential_name,
                 credentials.credential_description,
@@ -217,8 +239,8 @@ if (isset($_GET['asset_id'])) {
         // Related Software Query
         $sql_related_software = mysqli_query(
             $mysqli,
-            "SELECT * FROM software_assets 
+            "SELECT * FROM software_assets
-            LEFT JOIN software ON software_assets.software_id = software.software_id 
+            LEFT JOIN software ON software_assets.software_id = software.software_id
             WHERE software_assets.asset_id = $asset_id
             AND software_archived_at IS NULL
             ORDER BY software_name DESC"
@@ -228,7 +250,7 @@ if (isset($_GET['asset_id'])) {
 
         // Linked Services
         $sql_linked_services = mysqli_query($mysqli, "SELECT * FROM service_assets, services
-            WHERE service_assets.asset_id = $asset_id 
+            WHERE service_assets.asset_id = $asset_id
             AND service_assets.service_id = services.service_id
             ORDER BY service_name ASC"
         );
@@ -257,8 +279,13 @@ if (isset($_GET['asset_id'])) {
                         <?php } ?>
                     </div>
                     <div class="card-body">
+                        <?php if ($asset_tags_display) { ?>
+                            <div>
+                                <?= $asset_tags_display ?>
+                            </div>
+                        <?php } ?>
                         <?php if ($asset_type) { ?>
-                            <div><i class="fa fa-fw fa-tag text-secondary mr-3"></i><?= $asset_type; ?></div>
+                            <div class="mt-1"><i class="fa fa-fw fa-tag text-secondary mr-3"></i><?= $asset_type; ?></div>
                         <?php }
                         if ($asset_make) { ?>
                             <div class="mt-2"><i class="fa fa-fw fa-circle text-secondary mr-3"></i><?= "$asset_make $asset_model"; ?></div>
@@ -361,23 +388,23 @@ if (isset($_GET['asset_id'])) {
                     <div class="dropdown dropleft mr-2">
                         <button type="button" class="btn btn-primary" data-toggle="dropdown"><i class="fas fa-plus mr-2"></i>New</button>
                         <div class="dropdown-menu">
-                            <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addTicketModal">
+                            <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/ticket/ticket_add.php?<?= $client_url ?>&asset_id=<?= $asset_id ?>" data-modal-size="lg">
                                 <i class="fa fa-fw fa-life-ring mr-2"></i>New Ticket
                             </a>
                             <div class="dropdown-divider"></div>
-                            <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addRecurringTicketModal">
+                            <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/recurring_ticket/recurring_ticket_add.php?<?= $client_url ?>&asset_id=<?= $asset_id ?>" data-modal-size="lg">
                                 <i class="fa fa-fw fa-recycle mr-2"></i>New Recurring Ticket
                             </a>
                             <div class="dropdown-divider"></div>
-                            <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addCredentialModal">
+                            <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/credential/credential_add.php?<?= $client_url ?>asset_id=<?= $asset_id ?>">
                                 <i class="fa fa-fw fa-key mr-2"></i>New Credential
                             </a>
                             <div class="dropdown-divider"></div>
-                            <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addDocumentModal">
+                            <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/document/document_add.php?<?= $client_url ?>&asset_id=<?= $asset_id ?>" data-modal-size="lg">
                                 <i class="fa fa-fw fa-file-alt mr-2"></i>New Document
                             </a>
                             <div class="dropdown-divider"></div>
-                            <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#uploadFilesModal">
+                            <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/file/file_upload.php?<?= $client_url ?>&asset_id=<?= $asset_id ?>">
                                 <i class="fa fa-fw fa-upload mr-2"></i>Upload file(s)
                             </a>
                         </div>
@@ -419,7 +446,7 @@ if (isset($_GET['asset_id'])) {
                         <h3 class="card-title mt-2"><i class="fa fa-fw fa-ethernet mr-2"></i>Interfaces</h3>
                         <div class="card-tools">
                             <div class="btn-group">
-                                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAssetInterfaceModal">
+                                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/asset/asset_interface_add.php?&asset_id=<?= $asset_id ?>">
                                     <i class="fas fa-plus mr-2"></i>New Interface
                                 </button>
                                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
@@ -442,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>
@@ -570,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>
@@ -1220,16 +1249,9 @@ if (isset($_GET['asset_id'])) {
     <script src="../js/bulk_actions.js"></script>
 
     <?php
-
-    require_once "modals/asset/asset_interface_add.php";
     require_once "modals/asset/asset_interface_multiple_add.php";
     require_once "modals/asset/asset_interface_import.php";
     require_once "modals/asset/asset_interface_export.php";
-    require_once "modals/ticket/ticket_add.php";
-    require_once "modals/recurring_ticket/recurring_ticket_add.php";
-    require_once "modals/credential/credential_add.php";
-    require_once "modals/document/document_add.php";
-    require_once "modals/file/file_upload.php";
 
 }
 

agent/assets.php

@@ -78,9 +78,21 @@ if ($client_url && isset($_GET['location']) && !empty($_GET['location'])) {
     $location_filter = 0;
 }
 
+// Tags Filter
+if (isset($_GET['tags']) && is_array($_GET['tags']) && !empty($_GET['tags'])) {
+    // Sanitize each element of the tags array
+    $sanitizedTags = array_map('intval', $_GET['tags']);
+    // Convert the sanitized tags into a comma-separated string
+    $tag_filter = implode(",", $sanitizedTags);
+    $tag_query = "AND tag_id IN ($tag_filter)";
+} else {
+    $tag_filter = 0;
+    $tag_query = '';
+}
+
 //Get Asset Counts
 $row = mysqli_fetch_assoc(mysqli_query($mysqli, "
-    SELECT 
+    SELECT
         COUNT(*) AS all_count,
         SUM(CASE WHEN asset_type IN ('laptop', 'desktop') THEN 1 ELSE 0 END) AS workstation_count,
         SUM(CASE WHEN asset_type = 'server' THEN 1 ELSE 0 END) AS server_count,
@@ -90,12 +102,16 @@ $row = mysqli_fetch_assoc(mysqli_query($mysqli, "
     FROM (
         SELECT assets.* FROM assets
         LEFT JOIN clients ON client_id = asset_client_id
-        LEFT JOIN contacts ON asset_contact_id = contact_id 
+        LEFT JOIN contacts ON asset_contact_id = contact_id
-        LEFT JOIN locations ON asset_location_id = location_id 
+        LEFT JOIN locations ON asset_location_id = location_id
         LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1
+        LEFT JOIN asset_tags ON asset_tag_asset_id = asset_id
+        LEFT JOIN tags ON tag_id = asset_tag_tag_id
         WHERE $archive_query
+        $tag_query
         $access_permission_query
         $client_query
+        GROUP BY asset_id
     ) AS filtered_assets;
 "));
 
@@ -117,23 +133,23 @@ $network_count = intval($row['network_count']);
 //Other Count
 $other_count = intval($row['other_count']);
 
-//Rebuild URL
-$url_query_strings_sort = http_build_query($get_copy);
-
 $sql = mysqli_query(
     $mysqli,
     "SELECT SQL_CALC_FOUND_ROWS * FROM assets
     LEFT JOIN clients ON asset_client_id = client_id
-    LEFT JOIN contacts ON asset_contact_id = contact_id 
+    LEFT JOIN contacts ON asset_contact_id = contact_id
-    LEFT JOIN locations ON asset_location_id = location_id 
+    LEFT JOIN locations ON asset_location_id = location_id
     LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1
+    LEFT JOIN asset_tags ON asset_tag_asset_id = asset_id
+    LEFT JOIN tags ON tag_id = asset_tag_tag_id
     WHERE $archive_query
-    AND (asset_name LIKE '%$q%' OR asset_description LIKE '%$q%' OR asset_type LIKE '%$q%' OR interface_ip LIKE '%$q%' OR interface_ipv6 LIKE '%$q%' OR interface_mac LIKE '%$q%' OR asset_make LIKE '%$q%' OR asset_model LIKE '%$q%' OR asset_serial LIKE '%$q%' OR asset_os LIKE '%$q%' OR contact_name LIKE '%$q%' OR location_name LIKE '%$q%' OR client_name LIKE '%$q%')
+    $tag_query
+    AND (asset_name LIKE '%$q%' OR asset_description LIKE '%$q%' OR asset_type LIKE '%$q%' OR interface_ip LIKE '%$q%' OR interface_ipv6 LIKE '%$q%' OR interface_mac LIKE '%$q%' OR asset_make LIKE '%$q%' OR asset_model LIKE '%$q%' OR asset_serial LIKE '%$q%' OR asset_os LIKE '%$q%' OR contact_name LIKE '%$q%' OR location_name LIKE '%$q%' OR client_name LIKE '%$q%' OR tag_name LIKE '%$q%')
     AND ($type_query)
     $access_permission_query
     $location_query
     $client_query
-
+    GROUP BY asset_id
     ORDER BY $sort $order LIMIT $record_from, $record_to"
 );
 
@@ -184,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 } ?>
@@ -226,7 +244,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $sql_locations_filter = mysqli_query($mysqli, "
                                 SELECT DISTINCT location_id, location_name
                                 FROM locations
-                                WHERE location_client_id = $client_id 
+                                WHERE location_client_id = $client_id
                                 AND ( EXISTS (SELECT 1 FROM assets WHERE asset_location_id = location_id  AND $archive_query) OR location_id = $location_filter)
                                 ORDER BY location_name ASC
                             ");
@@ -250,7 +268,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             <?php
                             $sql_clients_filter = mysqli_query($mysqli, "
-                                SELECT DISTINCT client_id, client_name 
+                                SELECT DISTINCT client_id, client_name
                                 FROM clients
                                 JOIN assets ON asset_client_id = client_id
                                 WHERE $archive_query
@@ -270,7 +288,32 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </div>
                 </div>
                 <?php } ?>
-                <div class="col-md-3">
+                <div class="col-md-2">
+                    <div class="input-group mb-3 mb-md-0">
+                        <select onchange="this.form.submit()" class="form-control select2" name="tags[]" data-placeholder="- Select Tags -" multiple>
+
+                            <?php
+                            $sql_tags_filter = mysqli_query($mysqli, "
+                                SELECT tag_id, tag_name
+                                FROM tags
+                                LEFT JOIN asset_tags ON asset_tag_tag_id = tag_id
+                                LEFT JOIN assets ON asset_tag_asset_id = asset_id
+                                WHERE tag_type = 5
+                                $client_query OR tag_id IN ($tag_filter)
+                                GROUP BY tag_id
+                                HAVING COUNT(asset_tag_asset_id) > 0 OR tag_id IN ($tag_filter)
+                            ");
+                            while ($row = mysqli_fetch_array($sql_tags_filter)) {
+                                $tag_id = intval($row['tag_id']);
+                                $tag_name = nullable_htmlentities($row['tag_name']); ?>
+
+                                <option value="<?php echo $tag_id ?>" <?php if (isset($_GET['tags']) && in_array($tag_id, $_GET['tags'])) { echo 'selected'; } ?>> <?php echo $tag_name ?> </option>
+
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+                <div class="col-md-2">
                     <div class="form-group">
                         <select onchange="this.form.submit()" class="form-control select2" name="show_column[]" data-placeholder="- Show Additional Columns -" multiple>
                             <option
@@ -291,7 +334,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </select>
                     </div>
                 </div>
-                <div class="col-md-3">
+                <div class="col-md-2">
                     <div class="btn-group float-right">
                         <a href="?<?php echo $client_url; ?>&archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>"
                             class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"; } ?>">
@@ -303,27 +346,47 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             </button>
                             <div class="dropdown-menu">
                                 <?php if ($client_url) { ?>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignContactModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_assign_contact.php?<?= $client_url ?>"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-user mr-2"></i>Assign Contact
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignLocationModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_assign_location.php?<?= $client_url ?>"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-map-marker-alt mr-2"></i>Assign Location
                                 </a>
+                                <div class="dropdown-divider"></div>
                                 <?php } ?>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignPhysicalLocationModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_assign_tags.php"
+                                    data-bulk="true">
+                                    <i class="fas fa-fw fa-tags mr-2"></i>Assign Tags
+                                </a>
+                                <div class="dropdown-divider"></div>
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_assign_physical_location.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-map-marker-alt mr-2"></i>Set Physical Location
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditStatusModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_edit_status.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-info mr-2"></i>Set Status
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAddTicketModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_add_ticket.php"
+                                    data-modal-size="lg"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-life-ring mr-2"></i>Create Tickets
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkTransferAssetClientModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_transfer_client.php?<?= $client_url ?>"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-arrow-right mr-2"></i>Transfer to Client
                                 </a>
                                 <?php if ($archived) { ?>
@@ -402,7 +465,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     IP <?php if ($sort == 'interface_ip') { echo $order_icon; } ?>
                                 </a>
                             </th>
-                        <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Mac_Address', $_GET['show_column'])) { ?> 
+                        <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Mac_Address', $_GET['show_column'])) { ?>
                             <th>
                                 <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=interface_mac&order=<?php echo $disp; ?>">
                                     MAC Address <?php if ($sort == 'interface_mac') { echo $order_icon; } ?>
@@ -544,7 +607,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         }
                         $contact_name = nullable_htmlentities($row['contact_name']);
                         if ($contact_name) {
-                            $contact_name_display = "<a class='ajax-modal' href='#' data-modal-url='modals/contact/contact_details.php?id=$asset_contact_id' data-modal-size='lg'>$contact_name $contact_archive_display</a>";    
+                            $contact_name_display = "<a class='ajax-modal' href='#' data-modal-url='modals/contact/contact_details.php?id=$asset_contact_id' data-modal-size='lg'>$contact_name $contact_archive_display</a>";
                         } else {
                             $contact_name_display = "-";
                         }
@@ -563,20 +626,48 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         $sql_credentials = mysqli_query($mysqli, "SELECT * FROM credentials WHERE credential_asset_id = $asset_id");
                         $credential_count = mysqli_num_rows($sql_credentials);
 
+                        // Tags
+                        $asset_tag_name_display_array = array();
+                        $asset_tag_id_array = array();
+                        $sql_asset_tags = mysqli_query($mysqli, "SELECT * FROM asset_tags LEFT JOIN tags ON asset_tag_tag_id = tag_id WHERE asset_tag_asset_id = $asset_id ORDER BY tag_name ASC");
+                        while ($row = mysqli_fetch_array($sql_asset_tags)) {
+
+                            $asset_tag_id = intval($row['tag_id']);
+                            $asset_tag_name = nullable_htmlentities($row['tag_name']);
+                            $asset_tag_color = nullable_htmlentities($row['tag_color']);
+                            if (empty($asset_tag_color)) {
+                                $asset_tag_color = "dark";
+                            }
+                            $asset_tag_icon = nullable_htmlentities($row['tag_icon']);
+                            if (empty($asset_tag_icon)) {
+                                $asset_tag_icon = "tag";
+                            }
+
+                            $asset_tag_id_array[] = $asset_tag_id;
+                            $asset_tag_name_display_array[] = "<a href='assets.php?$client_url tags[]=$asset_tag_id'><span class='badge text-light p-1 mr-1' style='background-color: $asset_tag_color;'><i class='fa fa-fw fa-$asset_tag_icon mr-2'></i>$asset_tag_name</span></a>";
+                        }
+                        $asset_tags_display = implode('', $asset_tag_name_display_array);
+
                         ?>
                         <tr>
                             <td class="pr-0 bg-light">
                                 <div class="form-check">
-                                    <input class="form-check-input bulk-select" type="checkbox" name="asset_ids[]" value="<?php echo $asset_id ?>">
+                                    <input class="form-check-input bulk-select" type="checkbox" name="asset_ids[]" value="<?= $asset_id ?>">
                                 </div>
                             </td>
                             <td>
-                                <a class="text-dark" href="asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>">
+                                <a class="text-dark" href="asset_details.php?client_id=<?= $client_id ?>&asset_id=<?= $asset_id ?>">
                                     <div class="media">
-                                        <i class="fa fa-fw fa-2x fa-<?php echo $device_icon; ?> mr-3 mt-1"></i>
+                                        <i class="fa fa-fw fa-2x fa-<?= $device_icon ?> mr-3 mt-1"></i>
                                         <div class="media-body">
-                                            <div><?php echo $asset_name; ?></div>
+                                            <div><?= $asset_name ?></div>
-                                            <div><small class="text-secondary"><?php echo $asset_description; ?></small></div>
+                                            <div><small class="text-secondary"><?= $asset_description ?></small></div>
+                                            <?php
+                                            if ($asset_tags_display) { ?>
+                                                <div class="mt-1">
+                                                    <?= $asset_tags_display ?>
+                                                </div>
+                                            <?php } ?>
                                         </div>
                                     </div>
                                 </a>
@@ -692,16 +783,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php
-            if ($client_url) {
-                require_once "modals/asset/asset_bulk_assign_contact.php";  
-                require_once "modals/asset/asset_bulk_assign_location.php";
-            }
-            ?>
-            <?php require_once "modals/asset/asset_bulk_assign_physical_location.php"; ?>
-            <?php require_once "modals/asset/asset_bulk_transfer_client.php"; ?>
-            <?php require_once "modals/asset/asset_bulk_edit_status.php"; ?>
-            <?php require_once "modals/asset/asset_bulk_add_ticket.php"; ?>
         </form>
         <?php require_once "../includes/filter_footer.php"; ?>
     </div>
@@ -710,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/calendar.php

@@ -33,7 +33,7 @@ if (isset($_GET['calendar_id'])) {
             <div class="card-header py-2">
                 <h3 class="card-title mt-1">Calendars</h3>
                 <div class="card-tools">
-                    <button type="button" class="btn btn-dark btn-sm" data-toggle="modal" data-target="#addCalendarModal"><i class="fas fa-plus"></i></button>
+                    <button type="button" class="btn btn-dark btn-sm ajax-modal" data-modal-url="modals/calendar/calendar_add.php"><i class="fas fa-plus"></i></button>
                 </div>
             </div>
             <div class="card-body">
@@ -82,8 +82,6 @@ if (isset($_GET['calendar_id'])) {
 <?php
 
 require_once "modals/calendar/calendar_event_add.php";
-require_once "modals/calendar/calendar_add.php";
-
 
 //loop through IDs and create a modal for each
 $sql = mysqli_query($mysqli, "SELECT * FROM calendar_events LEFT JOIN calendars ON event_calendar_id = calendar_id $client_event_query");

agent/certificates.php

@@ -64,11 +64,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-lock mr-2"></i>Certificates</h3>
         <div class="card-tools">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCertificateModal"><i class="fas fa-plus mr-2"></i>New Certificate</button>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/certificate/certificate_add.php?<?= $client_url ?>"><i class="fas fa-plus mr-2"></i>New Certificate</button>
                 <?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>
@@ -78,7 +79,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
     <div class="card-body">
         <form autocomplete="off">
-            <?php if ($client_url) { ?> 
+            <?php if ($client_url) { ?>
             <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
             <?php } ?>
             <input type="hidden" name="archived" value="<?php echo $archived; ?>">
@@ -103,7 +104,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             <?php
                             $sql_clients_filter = mysqli_query($mysqli, "
-                                SELECT DISTINCT client_id, client_name 
+                                SELECT DISTINCT client_id, client_name
                                 FROM clients
                                 JOIN certificates ON certificate_client_id = client_id
                                 WHERE $archive_query
@@ -126,7 +127,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                 <div class="col-md-6">
                     <div class="btn-group float-right">
-                        <a href="?<?php echo $client_url; ?>archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>" 
+                        <a href="?<?php echo $client_url; ?>archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>"
                             class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"; } ?>">
                             <i class="fa fa-fw fa-archive mr-2"></i>Archived
                         </a>
@@ -249,8 +250,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             <td><?php echo $certificate_issued_by; ?></td>
 
                             <td>
-                                <div><?php echo $certificate_expire; ?></div>
+                                <div><?php echo $certificate_expire ?: '-'; ?></div>
-                                <div><small><?php echo $certificate_expire_ago; ?></small></div>
+                                <?php if (!empty($certificate_expire)) { ?>
+                                    <div><small><?php echo $certificate_expire_ago; ?></small></div>
+                                <?php } ?>
                             </td>
                             <?php if (!$client_url) { ?>
                             <td><a href="certificates.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
@@ -281,7 +284,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                                 <i class="fas fa-fw fa-archive mr-2"></i>Archive
                                             </a>
                                             <?php } ?>
-                                            
+
                                         <?php } ?>
                                     </div>
                                 </div>
@@ -297,17 +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_add.php";
-require_once "modals/certificate/certificate_export.php";
-?>
-
 <script src="../js/bulk_actions.js"></script>
-<script src="js/certificate_fetch_ssl.js"></script>
 
-<?php require_once "../includes/footer.php";
+<?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>
@@ -128,7 +130,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </div>
 
                         <div class="btn-group">
-                            <a href="?<?php echo $url_query_strings_sort ?>&archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>" 
+                            <a href="?<?php echo $url_query_strings_sort ?>&archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>"
                                 class="btn btn-<?php if ($archived == 1) { echo "primary"; } else { echo "default"; } ?>">
                                 <i class="fa fa-fw fa-archive mr-2"></i>Archived
                             </a>
@@ -137,27 +139,41 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fas fa-fw fa-layer-group"></i><span class="d-none d-sm-inline ml-2">Action</span> (<span id="selectedCount">0</span>)
                                 </button>
                                 <div class="dropdown-menu">
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAddTicketModal">
+                                   <a class="dropdown-item ajax-modal" href="#"
+                                        data-modal-url="modals/client/client_bulk_add_ticket.php"
+                                        data-modal-size="lg"
+                                        data-bulk="true">
                                         <i class="fas fa-fw fa-life-ring mr-2"></i>Open Tickets
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditHourlyRateModal">
+                                    <a class="dropdown-item ajax-modal" href="#"
+                                        data-modal-url="modals/client/client_bulk_edit_hourly_rate.php"
+                                        data-bulk="true">
                                         <i class="fas fa-fw fa-clock mr-2"></i>Set Hourly Rate
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditIndustryModal">
+                                    <a class="dropdown-item ajax-modal" href="#"
+                                        data-modal-url="modals/client/client_bulk_edit_industry.php"
+                                        data-bulk="true">
                                         <i class="fas fa-fw fa-briefcase mr-2"></i>Set Industry
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditReferralModal">
+                                    <a class="dropdown-item ajax-modal" href="#"
+                                        data-modal-url="modals/client/client_bulk_edit_referral.php"
+                                        data-bulk="true">
                                         <i class="fas fa-fw fa-link mr-2"></i>Set Referral
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignTagsModal">
+                                    <a class="dropdown-item ajax-modal" href="#"
+                                        data-modal-url="modals/client/client_bulk_assign_tags.php"
+                                        data-bulk="true">
                                         <i class="fas fa-fw fa-tags mr-2"></i>Assign Tags
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkSendEmailModal">
+                                    <a class="dropdown-item ajax-modal" href="#"
+                                        data-modal-url="modals/client/client_bulk_email.php"
+                                        data-modal-size="lg"
+                                        data-bulk="true">
                                         <i class="fas fa-fw fa-paper-plane mr-2"></i>Send Email
                                     </a>
                                     <?php if ($archived) { ?>
@@ -179,15 +195,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </div>
                 </div>
             </div>
-            <div 
+            <div
-                class="collapse 
+                class="collapse
-                    <?php 
+                    <?php
                     if (isset($_GET['dtf']) && $_GET['dtf'] !== '1970-01-01'
                         || $industry_filter
                         || $referral_filter
                         || (isset($_GET['tags']) && is_array($_GET['tags']))
                     )
-                    { echo "show"; } 
+                    { echo "show"; }
                     ?>
                 "
                 id="advancedFilter"
@@ -206,10 +222,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         <div class="form-group">
                             <label>Tag</label>
                             <select onchange="this.form.submit()" class="form-control select2" name="tags[]" data-placeholder="- Select Tags -" multiple>
-                                <?php 
+                                <?php
                                 $sql_tags_filter = mysqli_query($mysqli, "
                                     SELECT tags.tag_id, tags.tag_name
-                                    FROM tags 
+                                    FROM tags
                                     LEFT JOIN client_tags ON client_tags.tag_id = tags.tag_id
                                     WHERE tag_type = 1
                                     GROUP BY tags.tag_id
@@ -267,8 +283,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             </div>
         </form>
     </div>
-    
+
-    <form id="bulkActions" action="post.php" method="post" enctype="multipart/form-data">
+    <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-hover mb-0 text-nowrap">
@@ -350,11 +366,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     }
 
                     // Counts
-                    
+
                     // Contact Count
                     $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL"));
                     $contact_count = $row['num'];
-                    if ($contact_count) { 
+                    if ($contact_count) {
                         $contact_count_display = "<a href='contacts.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-dark p-2' title='Contacts ($contact_count)'><i class='fas fa-fw fa-users mr-2'></i>$contact_count</a>";
                     } else {
                         $contact_count_display = '';
@@ -363,34 +379,34 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     // Vendors Count
                     $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_client_id = $client_id AND vendor_archived_at IS NULL"));
                     $vendor_count = $row['num'];
-                    if ($vendor_count) { 
+                    if ($vendor_count) {
                         $vendor_count_display = "<a href='vendors.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-dark p-2' title='Vendors ($vendor_count)'><i class='fas fa-fw fa-building mr-2'></i>$vendor_count</a>";
                     } else {
                         $vendor_count_display = '';
                     }
-                    
+
                     // Asset Count
                     $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL"));
                     $asset_count = $row['num'];
-                    if ($asset_count) { 
+                    if ($asset_count) {
                         $asset_count_display = "<a href='assets.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Assets ($asset_count)'><i class='fas fa-fw fa-desktop mr-2'></i>$asset_count</a>";
                     } else {
                         $asset_count_display = '';
                     }
-                    
+
                     // Credential Count
                     $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_client_id = $client_id AND credential_archived_at IS NULL"));
                     $credential_count = $row['num'];
-                    if ($credential_count) { 
+                    if ($credential_count) {
                         $credential_count_display = "<a href='credentials.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Credentials ($credential_count)'><i class='fas fa-fw fa-key mr-2'></i>$credential_count</a>";
                     } else {
                         $credential_count_display = '';
                     }
-                    
+
                     // Software Count
                     $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_client_id = $client_id AND software_archived_at IS NULL"));
                     $software_count = $row['num'];
-                    if ($software_count) { 
+                    if ($software_count) {
                         $software_count_display = "<a href='software.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Licenses ($software_count)'><i class='fas fa-fw fa-cube mr-2'></i>$software_count</a>";
                     } else {
                         $software_count_display = '';
@@ -399,7 +415,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     // Ticket Count
                     $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_client_id = $client_id AND ticket_archived_at IS NULL"));
                     $ticket_count = $row['num'];
-                    if ($ticket_count) { 
+                    if ($ticket_count) {
                         $ticket_count_display = "<a href='tickets.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Tickets ($ticket_count)'><i class='fas fa-fw fa-life-ring mr-2'></i>$ticket_count</a>";
                     } else {
                         $ticket_count_display = '';
@@ -504,10 +520,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             }
 
                             if (!empty($contact_name)) { ?>
-                                <div class="text-bold">   
+                                <div class="text-bold">
                                     <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><a class="ajax-modal" href="#"
                                         data-modal-url="modals/contact/contact_details.php?client_id=<?= $client_id ?>&id=<?= $contact_id ?>" data-modal-size="lg"><?= $contact_name; ?>
-                                        
+
                                      </a>
                                 </div>
                             <?php } else {
@@ -600,23 +616,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </tbody>
             </table>
         </div>
-        <?php 
-            require_once "modals/client/client_bulk_edit_industry.php";
-            require_once "modals/client/client_bulk_edit_referral.php";
-            require_once "modals/client/client_bulk_edit_hourly_rate.php";
-            require_once "modals/client/client_bulk_assign_tags.php";
-            require_once "modals/client/client_bulk_add_ticket.php"; 
-            require_once "modals/client/client_bulk_email.php";
-        ?>
     </form>
      <!-- Ends Card Body -->
     <?php require_once "../includes/filter_footer.php"; ?>
-    
+
 </div> <!-- End Card -->
 
 <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/contact_details.php

@@ -20,8 +20,15 @@ if (isset($_GET['contact_id'])) {
         LEFT JOIN users ON user_id = contact_user_id
         WHERE contact_id = $contact_id
         $client_query
+        LIMIT 1
     ");
 
+    if (mysqli_num_rows($sql) == 0) {
+        echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1><a class='btn btn-lg btn-secondary mt-3' href='javascript:history.back()'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>";
+        require_once "../includes/footer.php";
+        exit();
+    }
+
     $row = mysqli_fetch_array($sql);
     $client_id = intval($row['client_id']);
     $client_name = nullable_htmlentities($row['client_name']);
@@ -57,7 +64,14 @@ if (isset($_GET['contact_id'])) {
     }
 
     // Related Assets Query - 1 to 1 relationship
-    $sql_related_assets = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1 WHERE asset_contact_id = $contact_id ORDER BY asset_name DESC");
+    $sql_related_assets = mysqli_query($mysqli, "SELECT * FROM assets
+        LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1
+        LEFT JOIN asset_tags ON asset_tag_asset_id = asset_id
+        LEFT JOIN tags ON tag_id = asset_tag_tag_id
+        WHERE asset_contact_id = $contact_id
+        GROUP BY asset_id
+        ORDER BY asset_name ASC"
+    );
     $asset_count = mysqli_num_rows($sql_related_assets);
 
     // Linked Software Licenses
@@ -83,7 +97,7 @@ if (isset($_GET['contact_id'])) {
         LEFT JOIN tags ON tags.tag_id = credential_tags.tag_id
         WHERE credential_contact_id = $contact_id
         GROUP BY credentials.credential_id
-        ORDER BY credential_name DESC
+        ORDER BY credential_name ASC
     ");
     $credential_count = mysqli_num_rows($sql_related_credentials);
 
@@ -255,11 +269,11 @@ if (isset($_GET['contact_id'])) {
                 <div class="dropdown dropleft mr-2">
                     <button type="button" class="btn btn-primary" data-toggle="dropdown"><i class="fas fa-plus mr-2"></i>New</button>
                     <div class="dropdown-menu">
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addTicketModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/ticket/ticket_add.php?<?= $client_url ?>&contact_id=<?= $contact_id ?>" data-modal-size="lg">
                             <i class="fa fa-fw fa-life-ring mr-2"></i>New Ticket
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addRecurringTicketModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/recurring_ticket/recurring_ticket_add.php?<?= $client_url ?>&contact_id=<?= $contact_id ?>" data-modal-size="lg">
                             <i class="fa fa-fw fa-recycle mr-2"></i>New Recurring Ticket
                         </a>
                         <div class="dropdown-divider"></div>
@@ -267,15 +281,15 @@ if (isset($_GET['contact_id'])) {
                             <i class="fa fa-fw fa-desktop mr-2"></i>New Asset
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addCredentialModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/credential/credential_add.php?<?= $client_url ?>&contact_id=<?= $contact_id ?>">
                             <i class="fa fa-fw fa-key mr-2"></i>New Credential
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addDocumentModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/document/document_add.php?<?= $client_url ?>&contact_id=<?= $contact_id ?>" data-modal-size="lg">
                             <i class="fa fa-fw fa-file-alt mr-2"></i>New Document
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#uploadFilesModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/file/file_upload.php?<?= $client_url ?>&contact_id=<?= $contact_id ?>">
                             <i class="fa fa-fw fa-upload mr-2"></i>Upload file(s)
                         </a>
                         <div class="dropdown-divider"></div>
@@ -394,6 +408,28 @@ if (isset($_GET['contact_id'])) {
                                 $asset_created_at = nullable_htmlentities($row['asset_created_at']);
                                 $device_icon = getAssetIcon($asset_type);
 
+                                // Tags
+                                $asset_tag_name_display_array = array();
+                                $asset_tag_id_array = array();
+                                $sql_asset_tags = mysqli_query($mysqli, "SELECT * FROM asset_tags LEFT JOIN tags ON asset_tag_tag_id = tag_id WHERE asset_tag_asset_id = $asset_id ORDER BY tag_name ASC");
+                                while ($row = mysqli_fetch_array($sql_asset_tags)) {
+
+                                    $asset_tag_id = intval($row['tag_id']);
+                                    $asset_tag_name = nullable_htmlentities($row['tag_name']);
+                                    $asset_tag_color = nullable_htmlentities($row['tag_color']);
+                                    if (empty($asset_tag_color)) {
+                                        $asset_tag_color = "dark";
+                                    }
+                                    $asset_tag_icon = nullable_htmlentities($row['tag_icon']);
+                                    if (empty($asset_tag_icon)) {
+                                        $asset_tag_icon = "tag";
+                                    }
+
+                                    $asset_tag_id_array[] = $asset_tag_id;
+                                    $asset_tag_name_display_array[] = "<a href='assets.php?$client_url tags[]=$asset_tag_id'><span class='badge text-light p-1 mr-1' style='background-color: $asset_tag_color;'><i class='fa fa-fw fa-$asset_tag_icon mr-2'></i>$asset_tag_name</span></a>";
+                                }
+                                $asset_tags_display = implode('', $asset_tag_name_display_array);
+
                                 ?>
                                 <tr>
                                     <th>
@@ -406,6 +442,12 @@ if (isset($_GET['contact_id'])) {
                                         <div class="mt-0">
                                             <small class="text-muted"><?php echo $asset_description; ?></small>
                                         </div>
+                                        <?php
+                                        if ($asset_tags_display) { ?>
+                                            <div class="mt-1">
+                                                <?= $asset_tags_display ?>
+                                            </div>
+                                        <?php } ?>
                                     </th>
                                     <td><?php echo $asset_type; ?></td>
                                     <td>
@@ -1172,11 +1214,4 @@ if (isset($_GET['contact_id'])) {
     <script src="js/credential_show_otp_via_id.js"></script>
 
 <?php
-
-require_once "modals/ticket/ticket_add.php";
-require_once "modals/recurring_ticket/recurring_ticket_add.php";
-require_once "modals/credential/credential_add.php";
-require_once "modals/document/document_add.php";
-require_once "modals/file/file_upload.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>
@@ -112,7 +114,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
     <div class="card-body">
         <form autocomplete="off">
-            <?php if ($client_url) { ?> 
+            <?php if ($client_url) { ?>
             <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
             <?php } ?>
             <input type="hidden" name="archived" value="<?php echo $archived; ?>">
@@ -134,7 +136,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             <?php
                             $sql_tags_filter = mysqli_query($mysqli, "
                                 SELECT tags.tag_id, tags.tag_name
-                                FROM tags 
+                                FROM tags
                                 LEFT JOIN contact_tags ON contact_tags.tag_id = tags.tag_id
                                 LEFT JOIN contacts ON contact_tags.contact_id = contacts.contact_id
                                 WHERE tag_type = 3
@@ -163,7 +165,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $sql_locations_filter = mysqli_query($mysqli, "
                                 SELECT DISTINCT location_id, location_name
                                 FROM locations
-                                WHERE location_client_id = $client_id 
+                                WHERE location_client_id = $client_id
                                 AND ( EXISTS (SELECT 1 FROM contacts WHERE contact_location_id = location_id  AND $archive_query) OR location_id = $location_filter)
                                 ORDER BY location_name ASC
                             ");
@@ -187,7 +189,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             <?php
                             $sql_clients_filter = mysqli_query($mysqli, "
-                                SELECT DISTINCT client_id, client_name 
+                                SELECT DISTINCT client_id, client_name
                                 FROM clients
                                 JOIN contacts ON contact_client_id = client_id
                                 WHERE $archive_query
@@ -210,7 +212,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                 <div class="col-md-3">
                     <div class="btn-group float-right">
-                        <a href="?<?php echo $client_url; ?>archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>" 
+                        <a href="?<?php echo $client_url; ?>archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>"
                             class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"; } ?>">
                             <i class="fa fa-fw fa-archive mr-2"></i>Archived
                         </a>
@@ -219,29 +221,42 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
                             </button>
                             <div class="dropdown-menu">
-                                <?php if ($client_url) { ?> 
+                                <?php if ($client_url) { ?>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignLocationModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/contact/contact_bulk_assign_location.php?<?= $client_url ?>"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-map-marker-alt mr-2"></i>Assign Location
                                 </a>
                                 <div class="dropdown-divider"></div>
                                 <?php } ?>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditPhoneModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/contact/contact_bulk_edit_phone.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-phone-alt mr-2"></i>Set Phone Number
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditDepartmentModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/contact/contact_bulk_edit_department.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-users mr-2"></i>Set Department
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditRoleModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/contact/contact_bulk_edit_role.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-user-shield mr-2"></i>Set Roles
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignTagsModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/contact/contact_bulk_assign_tags.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-tags mr-2"></i>Assign Tags
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkSendEmailModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/contact/contact_bulk_email.php"
+                                    data-modal-size="lg"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-paper-plane mr-2"></i>Send Email
                                 </a>
                                 <?php if ($archived) { ?>
@@ -384,7 +399,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         $contact_user_id = intval($row['contact_user_id']);
                         if ($contact_user_id) {
                             $user_exists_display = "<span class='badge badge-pill badge-dark p-1' title='User: $auth_method'><i class='fas fa-fw fa-user'></i></span>";
-                        } else { 
+                        } else {
                             $user_exists_display = "";
                         }
 
@@ -393,25 +408,25 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         // Asset Count
                         $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_contact_id = $contact_id AND asset_archived_at IS NULL"));
                         $asset_count = $row['num'];
-                        if ($asset_count) { 
+                        if ($asset_count) {
                             $asset_count_display = "<a href='contact_details.php?client_id=$client_id&contact_id=$contact_id#assets' class='mr-2 mb-1 badge badge-pill badge-dark p-2' title='Assets ($asset_count)'><i class='fas fa-fw fa-desktop mr-2'></i>$asset_count</a>";
                         } else {
                             $asset_count_display = '';
                         }
-                        
+
                         // Credential Count
                         $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_contact_id = $contact_id AND credential_archived_at IS NULL"));
                         $credential_count = $row['num'];
-                        if ($credential_count) { 
+                        if ($credential_count) {
                             $credential_count_display = "<a href='contact_details.php?client_id=$client_id&contact_id=$contact_id#credentials' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Credentials ($credential_count)'><i class='fas fa-fw fa-key mr-2'></i>$credential_count</a>";
                         } else {
                             $credential_count_display = '';
                         }
-                        
+
                         // Software Count
                         $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software, software_contacts WHERE software.software_id = software_contacts.software_id AND software_contacts.contact_id = $contact_id AND software_archived_at IS NULL"));
                         $software_count = $row['num'];
-                        if ($software_count) { 
+                        if ($software_count) {
                             $software_count_display = "<a href='contact_details.php?client_id=$client_id&contact_id=$contact_id#software' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Licenses ($software_count)'><i class='fas fa-fw fa-cube mr-2'></i>$software_count</a>";
                         } else {
                             $software_count_display = '';
@@ -420,7 +435,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         // Ticket Count
                         $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_contact_id = $contact_id AND ticket_archived_at IS NULL"));
                         $ticket_count = $row['num'];
-                        if ($ticket_count) { 
+                        if ($ticket_count) {
                             $ticket_count_display = "<a href='contact_details.php?client_id=$client_id&contact_id=$contact_id#tickets' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Tickets ($ticket_count)'><i class='fas fa-fw fa-life-ring mr-2'></i>$ticket_count</a>";
                         } else {
                             $ticket_count_display = '';
@@ -478,11 +493,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                                 <div class="mt-1">
                                                     <?php echo $contact_tags_display; ?>
                                                 </div>
-                                            <?php } ?>   
+                                            <?php } ?>
                                         </div>
                                     </div>
                                 </a>
-                                
+
                             </td>
                             <td><?php echo $contact_department; ?></td>
                             <td><?php echo $contact_info_display; ?></td>
@@ -545,25 +560,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php if ($client_url) { require_once "modals/contact/contact_bulk_assign_location.php"; } ?>
-            <?php require_once "modals/contact/contact_bulk_edit_phone.php"; ?>
-            <?php require_once "modals/contact/contact_bulk_edit_department.php"; ?>
-            <?php require_once "modals/contact/contact_bulk_edit_role.php"; ?>
-            <?php require_once "modals/contact/contact_bulk_assign_tags.php"; ?>
-            <?php require_once "modals/contact/contact_bulk_email.php"; ?>
         </form>
-        <?php require_once "../includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php"; ?>
-?>
     </div>
 </div>
 
 <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

@@ -106,19 +106,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <div class="card-tools">
             <?php if (lookupUserPermission("module_credential") >= 2) { ?>
                 <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCredentialModal" <?php if (!isset($_COOKIE['user_encryption_session_key'])) { echo "disabled"; } ?>>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/credential/credential_add.php?<?= $client_url ?>" <?php if (!isset($_COOKIE['user_encryption_session_key'])) { echo "disabled"; } ?>>
                     <i class="fas fa-plus mr-2"></i>New Credential
                 </button>
                 <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 } ?>
@@ -151,7 +153,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             <?php
                             $sql_tags_filter = mysqli_query($mysqli, "
                                 SELECT tags.tag_id, tags.tag_name
-                                FROM tags 
+                                FROM tags
                                 LEFT JOIN credential_tags ON credential_tags.tag_id = tags.tag_id
                                 LEFT JOIN credentials ON credential_tags.credential_id = credentials.credential_id
                                 WHERE tag_type = 4
@@ -169,7 +171,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </select>
                     </div>
                 </div>
-                
+
                 <?php if ($client_url) { ?>
                 <div class="col-md-2">
                     <div class="input-group mb-3 mb-md-0">
@@ -198,7 +200,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             <?php
                             $sql_clients_filter = mysqli_query($mysqli, "
-                                SELECT DISTINCT client_id, client_name 
+                                SELECT DISTINCT client_id, client_name
                                 FROM clients
                                 JOIN credentials ON credential_client_id = client_id
                                 WHERE $archive_query
@@ -241,7 +243,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                 </button>
                                 <?php } else { ?>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignTagsModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/credential/credential_bulk_assign_tags.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-tags mr-2"></i>Assign Tags
                                 </a>
                                     <div class="dropdown-divider"></div>
@@ -355,7 +359,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             }
                             $credential_tags_display = implode('', $credential_tag_name_display_array);
 
-                            if ($credential_contact_id) { 
+                            if ($credential_contact_id) {
                                 $credential_contact_display = "<a href='#' class='mr-2 mb-1 badge badge-pill badge-dark p-2 ajax-modal' title='$contact_name'
                                     data-modal-size='lg'
                                     data-modal-url='modals/contact/contact_details.php?id=$credential_contact_id'>
@@ -364,7 +368,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 $credential_contact_display = '';
                             }
 
-                            if ($credential_asset_id) { 
+                            if ($credential_asset_id) {
                                 $credential_asset_display = "<a href='#' class='mr-2 mb-1 badge badge-pill badge-secondary p-2 ajax-modal' title='$asset_name' data-toggle=''
                                     data-modal-size='lg'
                                     data-modal-url='modals/asset/asset_details.php?id=$credential_asset_id'>
@@ -519,25 +523,17 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "modals/credential/credential_bulk_assign_tags.php"; ?>
         </form>
-        <?php require_once "../includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php"; ?>
-        ?>
     </div>
 </div>
 
 <!-- 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_add.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/dashboard.php

@@ -729,13 +729,22 @@ if ($user_config_dashboard_technical_enable == 1) {
                                     $client_name = nullable_htmlentities($row['client_name']);
                                     $contact_id = intval($row['ticket_contact_id']);
                                     $contact_name = nullable_htmlentities($row['contact_name']);
+                                    if ($client_id) {
+                                        $has_client = "&client_id=$client_id";
+                                    } else {
+                                        $has_client = "";
+                                    }
 
                                     $ticket_priority_color = $ticket_priority == "High" ? "danger" : ($ticket_priority == "Medium" ? "warning" : "info");
                                     $contact_display = empty($contact_name) ? "-" : "<a href='contact_details.php?client_id=$client_id&contact_id=$contact_id'>$contact_name</a>";
                                 ?>
                                     <tr class="<?php echo empty($ticket_updated_at) ? 'text-bold' : ''; ?>">
-                                        <td><a class="text-dark" href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo "$ticket_prefix$ticket_number"; ?></a></td>
+                                        <td>
-                                        <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
+                                            <a class="text-dark" 
+                                                href="ticket.php?ticket_id=<?= "$ticket_id$has_client" ?>"><?= "$ticket_prefix$ticket_number" ?>   
+                                            </a>
+                                        </td>
+                                        <td><a href="ticket.php?ticket_id=<?= "$ticket_id$has_client" ?>"><?= $ticket_subject ?></a></td>
                                         <td><a href="tickets.php?client_id=<?php echo $client_id; ?>"><strong><?php echo $client_name; ?></strong></a></td>
                                         <td><?php echo $contact_display; ?></td>
                                         <td><span class='p-2 badge badge-pill badge-<?php echo $ticket_priority_color; ?>'><?php echo $ticket_priority; ?></span></td>

agent/document_details.php

@@ -17,12 +17,19 @@ if (isset($_GET['document_id'])) {
 
 $folder_location = 0;
 
-$sql_document = mysqli_query($mysqli, "SELECT * FROM documents 
+$sql_document = mysqli_query($mysqli, "SELECT * FROM documents
     LEFT JOIN folders ON document_folder_id = folder_id
     LEFT JOIN users ON document_created_by = user_id
-    WHERE document_client_id = $client_id AND document_id = $document_id"
+    WHERE document_client_id = $client_id AND document_id = $document_id
+    LIMIT 1"
 );
 
+if (mysqli_num_rows($sql_document) == 0) {
+    echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1><a class='btn btn-lg btn-secondary mt-3' href='javascript:history.back()'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>";
+    require_once "../includes/footer.php";
+    exit();
+}
+
 $row = mysqli_fetch_array($sql_document);
 
 $folder_name = nullable_htmlentities($row['folder_name']);
@@ -44,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
@@ -77,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>
@@ -85,9 +92,9 @@ $page_title = $row['document_name'];
     }
     ?>
     <li class="breadcrumb-item active">
-        <i class="fas fa-file"></i> <?php echo $document_name; ?> 
+        <i class="fas fa-file"></i> <?php echo $document_name; ?>
-        <?php if (!empty($document_archived_at)) { 
+        <?php if (!empty($document_archived_at)) {
-            echo "<span class='text-danger ml-2'>(ARCHIVED on $document_archived_at)</span>"; 
+            echo "<span class='text-danger ml-2'>(ARCHIVED on $document_archived_at)</span>";
         } ?>
     </li>
 </ol>
@@ -97,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) { ?>
-                    <?php } ?>
+                        <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>
 
@@ -144,15 +164,15 @@ $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 
+                        <?php
                         $document_version_count++; // Increment the counter
-                        } 
+                        }
                         ?>
                     </tbody>
                 </table>
@@ -169,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>
@@ -182,13 +202,14 @@ $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>
             <?php
             $sql_files = mysqli_query($mysqli, "SELECT * FROM files, document_files
-                WHERE document_files.file_id = files.file_id 
+                WHERE document_files.file_id = files.file_id
                 AND document_files.document_id = $document_id
                 ORDER BY file_name ASC"
             );
@@ -204,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
@@ -214,13 +235,14 @@ $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>
             <?php
             $sql_contacts = mysqli_query($mysqli, "SELECT contacts.contact_id, contact_name FROM contacts, contact_documents
-                WHERE contacts.contact_id = contact_documents.contact_id 
+                WHERE contacts.contact_id = contact_documents.contact_id
                 AND contact_documents.document_id = $document_id
                 ORDER BY contact_name ASC"
             );
@@ -240,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
@@ -248,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>
@@ -275,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
@@ -283,13 +305,14 @@ $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>
             <?php
             $sql_software = mysqli_query($mysqli, "SELECT software.software_id, software_name FROM software, software_documents
-                WHERE software.software_id = software_documents.software_id 
+                WHERE software.software_id = software_documents.software_id
                 AND software_documents.document_id = $document_id
                 ORDER BY software_name ASC"
             );
@@ -306,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
@@ -314,13 +337,14 @@ $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>
             <?php
             $sql_vendors = mysqli_query($mysqli, "SELECT vendors.vendor_id, vendor_name FROM vendors, vendor_documents
-                WHERE vendors.vendor_id = vendor_documents.vendor_id 
+                WHERE vendors.vendor_id = vendor_documents.vendor_id
                 AND vendor_documents.document_id = $document_id
                 ORDER BY vendor_name ASC"
             );
@@ -336,10 +360,10 @@ $page_title = $row['document_name'];
                 ?>
                 <div class="ml-2">
                     <a class="ajax-modal" href="#" data-modal-url="modals/vendor/vendor_details.php?id=<?= $vendor_id ?>">
-                        <?php echo $vendor_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
@@ -352,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>";
@@ -407,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,484 +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" data-toggle="modal" data-target="#addDocumentModal">
-                    <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" href="#" data-toggle="modal" data-target="#createFolderModal">
-                        <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" href="#" data-toggle="modal" data-target="#bulkMoveDocumentModal">
-                                    <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>
-                <?php require_once "modals/folder/folder_add.php"; ?>
-            </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>
-                    <?php require_once "modals/document/document_bulk_move.php"; ?>
-                </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.php";
-require_once "modals/document/document_add_from_template.php";
-require_once "../includes/footer.php";

agent/domains.php

@@ -71,301 +71,297 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
-    <div class="card card-dark">
+<div class="card card-dark">
-        <div class="card-header py-2">
+    <div class="card-header py-2">
-            <h3 class="card-title mt-2"><i class="fa fa-fw fa-globe mr-2"></i>Domains</h3>
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-globe mr-2"></i>Domains</h3>
-            <div class="card-tools">
+        <div class="card-tools">
-                <div class="btn-group">
+            <div class="btn-group">
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDomainModal"><i class="fas fa-plus mr-2"></i>New Domain</button>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/domain/domain_add.php?<?= $client_url ?>"><i class="fas fa-plus mr-2"></i>New Domain</button>
-                    <?php if ($num_rows[0] > 0) { ?>
+                <?php if ($num_rows[0] > 0) { ?>
-                        <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
+                    <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
-                        <div class="dropdown-menu">
+                    <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="#"
-                                <i class="fa fa-fw fa-download mr-2"></i>Export
+                            data-modal-url="modals/domain/domain_export.php?<?= $client_url ?>">
-                            </a>
+                            <i class="fa fa-fw fa-download mr-2"></i>Export
-                        </div>
+                        </a>
-                    <?php } ?>
+                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="card-body">
-            <form autocomplete="off">
-                <?php if ($client_url) { ?>
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
-                <input type="hidden" name="archived" value="<?php echo $archived; ?>">
-                <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 Domains">
-                            <div class="input-group-append">
-                                <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-                            </div>
-                        </div>
-                    </div>
-
-                    <?php if ($client_url) { ?>
-                    <div class="col-md-2"></div>
-                    <?php } else { ?>
-                    <div class="col-md-2">
-                        <div class="input-group mb-3 mb-md-0">
-                            <select class="form-control select2" name="client" onchange="this.form.submit()">
-                                <option value="" <?php if ($client == "") { echo "selected"; } ?>>- All Clients -</option>
-
-                                <?php
-                                    $sql_clients_filter = mysqli_query($mysqli, "
-                                    SELECT DISTINCT client_id, client_name 
-                                    FROM clients
-                                    JOIN domains ON domain_client_id = client_id
-                                    WHERE $archive_query
-                                    $access_permission_query
-                                    ORDER BY client_name ASC
-                                ");
-                                while ($row = mysqli_fetch_array($sql_clients_filter)) {
-                                    $client_id = intval($row['client_id']);
-                                    $client_name = nullable_htmlentities($row['client_name']);
-                                ?>
-                                    <option <?php if ($client == $client_id) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
-                                <?php
-                                }
-                                ?>
-
-                            </select>
-                        </div>
-                    </div>
-                    <?php } ?>
-
-                    <div class="col-md-6">
-                        <div class="btn-group float-right">
-                            <a href="?<?php echo $client_url; ?>archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>"
-                                class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"; } ?>">
-                                <i class="fa fa-fw fa-archive mr-2"></i>Archived
-                            </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">
-                                    <?php if ($archived) { ?>
-                                    <button class="dropdown-item text-info"
-                                        type="submit" form="bulkActions" name="bulk_unarchive_domains">
-                                        <i class="fas fa-fw fa-redo mr-2"></i>Unarchive
-                                    </button>
-                                    <div class="dropdown-divider"></div>
-                                    <button class="dropdown-item text-danger text-bold"
-                                        type="submit" form="bulkActions" name="bulk_delete_domains">
-                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                    </button>
-                                    <?php } else { ?>
-                                    <button class="dropdown-item text-danger confirm-link"
-                                        type="submit" form="bulkActions" name="bulk_archive_domains">
-                                        <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                    </button>
-                                    <?php } ?>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-            </form>
-            <hr>
-            <div class="table-responsive-sm">
-
-                <form id="bulkActions" action="post.php" method="post">
-                    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                    <?php if ($client_url) { ?>
-                    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                    <?php } ?>
-                    <table class="table table-striped table-borderless table-hover">
-                        <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?> text-nowrap">
-                        <tr>
-                            <td class="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=domain_name&order=<?php echo $disp; ?>">
-                                    Domain <?php if ($sort == 'domain_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=registrar_name&order=<?php echo $disp; ?>">
-                                    Registrar <?php if ($sort == 'registrar_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=webhost_name&order=<?php echo $disp; ?>">
-                                    Web Host <?php if ($sort == 'webhost_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=dnshost_name&order=<?php echo $disp; ?>">
-                                    DNS Host <?php if ($sort == 'dnshost_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=mailhost_name&order=<?php echo $disp; ?>">
-                                    Mail Host <?php if ($sort == 'mailhost_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=domain_expire&order=<?php echo $disp; ?>">
-                                    Expires <?php if ($sort == 'domain_expire') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <?php if (!$client_url) { ?>
-                            <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
-                                    Client <?php if ($sort == 'client_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <?php } ?>
-                            <th class="text-center">Action</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <?php
-
-                        while ($row = mysqli_fetch_array($sql)) {
-                            $domain_id = intval($row['domain_id']);
-                            $domain_name = nullable_htmlentities($row['domain_name']);
-                            $domain_description = nullable_htmlentities($row['domain_description']);
-                            $domain_expire = nullable_htmlentities($row['domain_expire']);
-                            $domain_expire_ago = timeAgo($domain_expire);
-                            // Convert the expiry date to a timestamp
-                            $domain_expire_timestamp = strtotime($row['domain_expire'] ?? '');
-                            $current_timestamp = time(); // Get current timestamp
-
-                            // Calculate the difference in days
-                            $days_until_expiry = ($domain_expire_timestamp - $current_timestamp) / (60 * 60 * 24);
-
-                            // Determine the class based on the number of days until expiry
-                            if ($days_until_expiry <= 0) {
-                                $tr_class = "table-secondary";
-                            } elseif ($days_until_expiry <= 14) {
-                                $tr_class = "table-danger";
-                            } elseif ($days_until_expiry <= 90) {
-                                $tr_class = "table-warning";
-                            } else {
-                                $tr_class = '';
-                            }
-                            $domain_registrar_id = intval($row['registrar_id']);
-                            $domain_webhost_id = intval($row['webhost_id']);
-                            $domain_dnshost_id = intval($row['dnshost_id']);
-                            $domain_mailhost_id = intval($row['mailhost_id']);
-                            $domain_registrar_name = nullable_htmlentities($row['registrar_name']);
-                            $domain_webhost_name = nullable_htmlentities($row['webhost_name']);
-                            $domain_dnshost_name = nullable_htmlentities($row['dnshost_name']);
-                            $domain_mailhost_name = nullable_htmlentities($row['mailhost_name']);
-                            $domain_created_at = nullable_htmlentities($row['domain_created_at']);
-                            $domain_archived_at = nullable_htmlentities($row['domain_archived_at']);
-                            $client_id = intval($row['domain_client_id']);
-                            $client_name = nullable_htmlentities($row['client_name']);
-                            // Add - if empty on the table
-                            $domain_registrar_name_display = $domain_registrar_name ? "
-                                <a class='ajax-modal' href='#' data-modal-url='modals/vendor/vendor_details.php?id=$domain_registrar_id'>
-                                    $domain_registrar_name
-                                </a>" : "-";
-                            $domain_webhost_name_display = $domain_webhost_name ? "
-                                <a class='ajax-modal' href='#' data-modal-url='modals/vendor/vendor_details.php?id=$domain_webhost_id'>
-                                    $domain_webhost_name
-                                </a>" : "-";
-                            $domain_dnshost_name_display = $domain_dnshost_name ? "
-                                <a class='ajax-modal' href='#' data-modal-url='modals/vendor/vendor_details.php?id=$domain_dnshost_id'>
-                                    $domain_dnshost_name
-                                </a>" : "-";
-                            $domain_mailhost_name_display = $domain_mailhost_name ? "
-                                <a class='ajax-modal' href='#' data-modal-url='modals/vendor/vendor_details.php?id=$domain_mailhost_id'>
-                                    $domain_mailhost_name
-                                </a>" : "-";
-
-                            ?>
-                            <tr class="<?php echo $tr_class; ?>">
-                                <td class="pr-0">
-                                    <div class="form-check">
-                                        <input class="form-check-input bulk-select" type="checkbox" name="domain_ids[]" value="<?php echo $domain_id ?>">
-                                    </div>
-                                </td>
-                                <td class="">
-                                    <a class="text-dark ajax-modal" href="#"
-                                        data-modal-size="lg"
-                                        data-modal-url="modals/domain/domain_edit.php?<?= $client_url ?>&id=<?= $domain_id ?>">
-                                        <div class="media">
-                                            <i class="fa fa-fw fa-2x fa-globe mr-3"></i>
-                                            <div class="media-body">
-                                                <div><?php echo $domain_name; ?></div>
-                                                <div><small class="text-secondary"><?php echo $domain_description; ?></small></div>
-                                            </div>
-                                        </div>
-                                    </a>
-                                </td>
-                                <td><?php echo $domain_registrar_name_display; ?></td>
-                                <td><?php echo $domain_webhost_name_display; ?></td>
-                                <td><?php echo $domain_dnshost_name_display; ?></td>
-                                <td><?php echo $domain_mailhost_name_display; ?></td>
-                                <td>
-                                    <div><?php echo $domain_expire; ?></div>
-                                    <div><small><?php echo $domain_expire_ago; ?></small></div>
-                                </td>
-                                <?php if (!$client_url) { ?>
-                                <td><a href="domains.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
-                                <?php } ?>
-                                <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/domain/domain_edit.php?<?= $client_url ?>&id=<?= $domain_id ?>">
-                                                <i class="fas fa-fw fa-edit mr-2"></i>Edit
-                                            </a>
-                                            <?php if ($session_user_role == 3) { ?>
-                                                <?php if ($domain_archived_at) { ?>
-                                                <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item text-info confirm-link" href="post.php?unarchive_domain=<?php echo $domain_id; ?>">
-                                                    <i class="fas fa-fw fa-redo mr-2"></i>Unarchive
-                                                </a>
-                                                <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_domain=<?php echo $domain_id; ?>">
-                                                    <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                                </a>
-                                                <?php } else { ?>
-                                                <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item text-danger confirm-link" href="post.php?archive_domain=<?php echo $domain_id; ?>">
-                                                    <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                                </a>
-                                                <?php } ?>
-                                            <?php } ?>
-                                        </div>
-                                    </div>
-                                </td>
-                            </tr>
-
-                            <?php
-                        }
-                        ?>
-
-                        </tbody>
-                    </table>
-
-                </form>
             </div>
-            <?php require_once "../includes/filter_footer.php";
-            ?>
         </div>
     </div>
 
-<?php
+    <div class="card-body">
-require_once "modals/domain/domain_add.php";
+        <form autocomplete="off">
-require_once "modals/domain/domain_export.php";
+            <?php if ($client_url) { ?>
-?>
+            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+            <?php } ?>
+            <input type="hidden" name="archived" value="<?php echo $archived; ?>">
+            <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 Domains">
+                        <div class="input-group-append">
+                            <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+                        </div>
+                    </div>
+                </div>
+
+                <?php if ($client_url) { ?>
+                <div class="col-md-2"></div>
+                <?php } else { ?>
+                <div class="col-md-2">
+                    <div class="input-group mb-3 mb-md-0">
+                        <select class="form-control select2" name="client" onchange="this.form.submit()">
+                            <option value="" <?php if ($client == "") { echo "selected"; } ?>>- All Clients -</option>
+
+                            <?php
+                                $sql_clients_filter = mysqli_query($mysqli, "
+                                SELECT DISTINCT client_id, client_name
+                                FROM clients
+                                JOIN domains ON domain_client_id = client_id
+                                WHERE $archive_query
+                                $access_permission_query
+                                ORDER BY client_name ASC
+                            ");
+                            while ($row = mysqli_fetch_array($sql_clients_filter)) {
+                                $client_id = intval($row['client_id']);
+                                $client_name = nullable_htmlentities($row['client_name']);
+                            ?>
+                                <option <?php if ($client == $client_id) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+                            <?php
+                            }
+                            ?>
+
+                        </select>
+                    </div>
+                </div>
+                <?php } ?>
+
+                <div class="col-md-6">
+                    <div class="btn-group float-right">
+                        <a href="?<?php echo $client_url; ?>archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>"
+                            class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"; } ?>">
+                            <i class="fa fa-fw fa-archive mr-2"></i>Archived
+                        </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">
+                                <?php if ($archived) { ?>
+                                <button class="dropdown-item text-info"
+                                    type="submit" form="bulkActions" name="bulk_unarchive_domains">
+                                    <i class="fas fa-fw fa-redo mr-2"></i>Unarchive
+                                </button>
+                                <div class="dropdown-divider"></div>
+                                <button class="dropdown-item text-danger text-bold"
+                                    type="submit" form="bulkActions" name="bulk_delete_domains">
+                                    <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                </button>
+                                <?php } else { ?>
+                                <button class="dropdown-item text-danger confirm-link"
+                                    type="submit" form="bulkActions" name="bulk_archive_domains">
+                                    <i class="fas fa-fw fa-archive mr-2"></i>Archive
+                                </button>
+                                <?php } ?>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </form>
+        <hr>
+        <div class="table-responsive-sm">
+
+            <form id="bulkActions" action="post.php" method="post">
+                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+                <?php if ($client_url) { ?>
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } ?>
+                <table class="table table-striped table-borderless table-hover">
+                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?> text-nowrap">
+                    <tr>
+                        <td class="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=domain_name&order=<?php echo $disp; ?>">
+                                Domain <?php if ($sort == 'domain_name') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=registrar_name&order=<?php echo $disp; ?>">
+                                Registrar <?php if ($sort == 'registrar_name') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=webhost_name&order=<?php echo $disp; ?>">
+                                Web Host <?php if ($sort == 'webhost_name') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=dnshost_name&order=<?php echo $disp; ?>">
+                                DNS Host <?php if ($sort == 'dnshost_name') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=mailhost_name&order=<?php echo $disp; ?>">
+                                Mail Host <?php if ($sort == 'mailhost_name') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=domain_expire&order=<?php echo $disp; ?>">
+                                Expires <?php if ($sort == 'domain_expire') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <?php if (!$client_url) { ?>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
+                                Client <?php if ($sort == 'client_name') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <?php } ?>
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
+
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $domain_id = intval($row['domain_id']);
+                        $domain_name = nullable_htmlentities($row['domain_name']);
+                        $domain_description = nullable_htmlentities($row['domain_description']);
+                        $domain_expire = nullable_htmlentities($row['domain_expire']);
+                        $domain_expire_ago = timeAgo($domain_expire);
+                        // Convert the expiry date to a timestamp
+                        $domain_expire_timestamp = strtotime($row['domain_expire'] ?? '');
+                        $current_timestamp = time(); // Get current timestamp
+
+                        // Calculate the difference in days
+                        $days_until_expiry = ($domain_expire_timestamp - $current_timestamp) / (60 * 60 * 24);
+
+                        // Determine the class based on the number of days until expiry
+                        if ($days_until_expiry <= 0) {
+                            $tr_class = "table-secondary";
+                        } elseif ($days_until_expiry <= 14) {
+                            $tr_class = "table-danger";
+                        } elseif ($days_until_expiry <= 90) {
+                            $tr_class = "table-warning";
+                        } else {
+                            $tr_class = '';
+                        }
+                        $domain_registrar_id = intval($row['registrar_id']);
+                        $domain_webhost_id = intval($row['webhost_id']);
+                        $domain_dnshost_id = intval($row['dnshost_id']);
+                        $domain_mailhost_id = intval($row['mailhost_id']);
+                        $domain_registrar_name = nullable_htmlentities($row['registrar_name']);
+                        $domain_webhost_name = nullable_htmlentities($row['webhost_name']);
+                        $domain_dnshost_name = nullable_htmlentities($row['dnshost_name']);
+                        $domain_mailhost_name = nullable_htmlentities($row['mailhost_name']);
+                        $domain_created_at = nullable_htmlentities($row['domain_created_at']);
+                        $domain_archived_at = nullable_htmlentities($row['domain_archived_at']);
+                        $client_id = intval($row['domain_client_id']);
+                        $client_name = nullable_htmlentities($row['client_name']);
+                        // Add - if empty on the table
+                        $domain_registrar_name_display = $domain_registrar_name ? "
+                            <a class='ajax-modal' href='#' data-modal-url='modals/vendor/vendor_details.php?id=$domain_registrar_id'>
+                                $domain_registrar_name
+                            </a>" : "-";
+                        $domain_webhost_name_display = $domain_webhost_name ? "
+                            <a class='ajax-modal' href='#' data-modal-url='modals/vendor/vendor_details.php?id=$domain_webhost_id'>
+                                $domain_webhost_name
+                            </a>" : "-";
+                        $domain_dnshost_name_display = $domain_dnshost_name ? "
+                            <a class='ajax-modal' href='#' data-modal-url='modals/vendor/vendor_details.php?id=$domain_dnshost_id'>
+                                $domain_dnshost_name
+                            </a>" : "-";
+                        $domain_mailhost_name_display = $domain_mailhost_name ? "
+                            <a class='ajax-modal' href='#' data-modal-url='modals/vendor/vendor_details.php?id=$domain_mailhost_id'>
+                                $domain_mailhost_name
+                            </a>" : "-";
+
+                        ?>
+                        <tr class="<?php echo $tr_class; ?>">
+                            <td class="pr-0">
+                                <div class="form-check">
+                                    <input class="form-check-input bulk-select" type="checkbox" name="domain_ids[]" value="<?php echo $domain_id ?>">
+                                </div>
+                            </td>
+                            <td class="">
+                                <a class="text-dark ajax-modal" href="#"
+                                    data-modal-size="lg"
+                                    data-modal-url="modals/domain/domain_edit.php?<?= $client_url ?>&id=<?= $domain_id ?>">
+                                    <div class="media">
+                                        <i class="fa fa-fw fa-2x fa-globe mr-3"></i>
+                                        <div class="media-body">
+                                            <div><?php echo $domain_name; ?></div>
+                                            <div><small class="text-secondary"><?php echo $domain_description; ?></small></div>
+                                        </div>
+                                    </div>
+                                </a>
+                            </td>
+                            <td><?php echo $domain_registrar_name_display; ?></td>
+                            <td><?php echo $domain_webhost_name_display; ?></td>
+                            <td><?php echo $domain_dnshost_name_display; ?></td>
+                            <td><?php echo $domain_mailhost_name_display; ?></td>
+                            <td>
+                                <div><?php echo $domain_expire ?: '-'; ?></div>
+                                <?php if (!empty($domain_expire)) { ?>
+                                    <div><small><?php echo $domain_expire_ago; ?></small></div>
+                                <?php } ?>
+                            </td>
+                            <?php if (!$client_url) { ?>
+                            <td><a href="domains.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
+                            <?php } ?>
+                            <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/domain/domain_edit.php?<?= $client_url ?>&id=<?= $domain_id ?>">
+                                            <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                                        </a>
+                                        <?php if ($session_user_role == 3) { ?>
+                                            <?php if ($domain_archived_at) { ?>
+                                            <div class="dropdown-divider"></div>
+                                            <a class="dropdown-item text-info confirm-link" href="post.php?unarchive_domain=<?php echo $domain_id; ?>">
+                                                <i class="fas fa-fw fa-redo mr-2"></i>Unarchive
+                                            </a>
+                                            <div class="dropdown-divider"></div>
+                                            <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_domain=<?php echo $domain_id; ?>">
+                                                <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                            </a>
+                                            <?php } else { ?>
+                                            <div class="dropdown-divider"></div>
+                                            <a class="dropdown-item text-danger confirm-link" href="post.php?archive_domain=<?php echo $domain_id; ?>">
+                                                <i class="fas fa-fw fa-archive mr-2"></i>Archive
+                                            </a>
+                                            <?php } ?>
+                                        <?php } ?>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                        <?php
+                    }
+                    ?>
+
+                    </tbody>
+                </table>
+
+            </form>
+        </div>
+        <?php require_once "../includes/filter_footer.php"; ?>
+    </div>
+</div>
 
 <script src="../js/bulk_actions.js"></script>
 
 <?php require_once "../includes/footer.php";
-

agent/expenses.php

@@ -64,10 +64,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <h3 class="card-title mt-2"><i class="fas fa-fw fa-shopping-cart mr-2"></i>Expenses</h3>
             <div class="card-tools">
                 <div class="btn-group">
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addExpenseModal"><i class="fas fa-plus mr-2"></i>New Expense</button>
+                    <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>
@@ -94,23 +95,30 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <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" href="#" data-toggle="modal" data-target="#bulkEditCategoryModal">
+                                    <a class="dropdown-item ajax-modal" href="#"
+                                        data-modal-url="modals/expense/expense_bulk_edit_category.php"
+                                        data-bulk="true">
                                         <i class="fas fa-fw fa-list mr-2"></i>Set Category
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditAccountModal">
+                                    <a class="dropdown-item ajax-modal" href="#"
+                                        data-modal-url="modals/expense/expense_bulk_edit_account.php"
+                                        data-bulk="true">
                                         <i class="fas fa-fw fa-piggy-bank mr-2"></i>Set Account
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditClientModal">
+                                    <a class="dropdown-item ajax-modal" href="#"
+                                        data-modal-url="modals/expense/expense_bulk_edit_client.php"
+                                        data-bulk="true">
                                         <i class="fas fa-fw fa-user mr-2"></i>Set Client
                                     </a>
                                     <?php if ($session_user_role == 3) { ?>
                                     <div class="dropdown-divider"></div>
-                                    <button class="dropdown-item text-danger text-bold"
+                                    <a class="dropdown-item text-danger text-bold ajax-modal" href="#"
-                                            type="submit" form="bulkActions" name="bulk_delete_expenses">
+                                        data-modal-url="modals/expense/expense_bulk_delete.php"
+                                        data-bulk="true">
                                         <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                    </button>
+                                    </a>
                                     <?php } ?>
                                 </div>
                             </div>
@@ -136,7 +144,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                                     <?php
                                     $sql_vendors_filter = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors WHERE EXISTS (SELECT 1 FROM expenses WHERE expense_vendor_id = vendor_id) ORDER BY vendor_name ASC");
-                                    
+
                                     while ($row = mysqli_fetch_array($sql_vendors_filter)) {
                                         $vendor_id = intval($row['vendor_id']);
                                         $vendor_name = nullable_htmlentities($row['vendor_name']);
@@ -193,171 +201,161 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </div>
             </form>
             <hr>
-            <form id="bulkActions" action="post.php" method="post" enctype="multipart/form-data">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-                <div class="table-responsive-sm">
+            <div class="table-responsive-sm">
-                    <table class="table table-striped table-borderless table-hover">
+                <table class="table table-striped table-borderless table-hover">
-                        <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-                        <tr>
+                    <tr>
-                            <td class="bg-light pr-0">
+                        <td class="bg-light pr-0">
-                                <div class="form-check">
+                            <div class="form-check">
-                                    <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
+                                <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
-                                </div>
+                            </div>
-                            </td>
+                        </td>
-                            <th>
+                        <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=expense_date&order=<?php echo $disp; ?>">
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=expense_date&order=<?php echo $disp; ?>">
-                                    Date <?php if ($sort == 'expense_date') { echo $order_icon; } ?>
+                                Date <?php if ($sort == 'expense_date') { echo $order_icon; } ?>
-                                </a>
+                            </a>
-                            </th>
+                        </th>
-                            <th>
+                        <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=category_name&order=<?php echo $disp; ?>">
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=category_name&order=<?php echo $disp; ?>">
-                                    Category <?php if ($sort == 'category_name') { echo $order_icon; } ?>
+                                Category <?php if ($sort == 'category_name') { echo $order_icon; } ?>
-                                </a>
+                            </a>
-                                /
+                            /
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=expense_description&order=<?php echo $disp; ?>">
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=expense_description&order=<?php echo $disp; ?>">
-                                    Description <?php if ($sort == 'expense_description') { echo $order_icon; } ?>
+                                Description <?php if ($sort == 'expense_description') { echo $order_icon; } ?>
-                                </a>
+                            </a>
-                            </th>
+                        </th>
-                            <th>
+                        <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=vendor_name&order=<?php echo $disp; ?>">
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=vendor_name&order=<?php echo $disp; ?>">
-                                    Vendor <?php if ($sort == 'vendor_name') { echo $order_icon; } ?>
+                                Vendor <?php if ($sort == 'vendor_name') { echo $order_icon; } ?>
-                                </a>
+                            </a>
-                            </th>
+                        </th>
-                            <th class="text-right">
+                        <th class="text-right">
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=expense_amount&order=<?php echo $disp; ?>">
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=expense_amount&order=<?php echo $disp; ?>">
-                                    Amount <?php if ($sort == 'expense_amount') { echo $order_icon; } ?>
+                                Amount <?php if ($sort == 'expense_amount') { echo $order_icon; } ?>
-                                </a>
+                            </a>
-                            </th>
+                        </th>
-                            <th>
+                        <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=account_name&order=<?php echo $disp; ?>">
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=account_name&order=<?php echo $disp; ?>">
-                                    Account <?php if ($sort == 'account_name') { echo $order_icon; } ?>
+                                Account <?php if ($sort == 'account_name') { echo $order_icon; } ?>
-                                </a>
+                            </a>
-                            </th>
+                        </th>
-                            <th>
+                        <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
-                                    Client <?php if ($sort == 'client_name') { echo $order_icon; } ?>
+                                Client <?php if ($sort == 'client_name') { echo $order_icon; } ?>
-                                </a>
+                            </a>
-                            </th>
+                        </th>
-                            <th class="text-center">Action</th>
+                        <th class="text-center">Action</th>
-                        </tr>
+                    </tr>
-                        </thead>
+                    </thead>
-                        <tbody>
+                    <tbody>
-                        <?php
+                    <?php
 
-                        while ($row = mysqli_fetch_array($sql)) {
+                    while ($row = mysqli_fetch_array($sql)) {
-                            $expense_id = intval($row['expense_id']);
+                        $expense_id = intval($row['expense_id']);
-                            $expense_date = nullable_htmlentities($row['expense_date']);
+                        $expense_date = nullable_htmlentities($row['expense_date']);
-                            $expense_amount = floatval($row['expense_amount']);
+                        $expense_amount = floatval($row['expense_amount']);
-                            $expense_currency_code = nullable_htmlentities($row['expense_currency_code']);
+                        $expense_currency_code = nullable_htmlentities($row['expense_currency_code']);
-                            $expense_description = nullable_htmlentities($row['expense_description']);
+                        $expense_description = nullable_htmlentities($row['expense_description']);
-                            $expense_receipt = nullable_htmlentities($row['expense_receipt']);
+                        $expense_receipt = nullable_htmlentities($row['expense_receipt']);
-                            $expense_reference = nullable_htmlentities($row['expense_reference']);
+                        $expense_reference = nullable_htmlentities($row['expense_reference']);
-                            $expense_created_at = nullable_htmlentities($row['expense_created_at']);
+                        $expense_created_at = nullable_htmlentities($row['expense_created_at']);
-                            $expense_vendor_id = intval($row['expense_vendor_id']);
+                        $expense_vendor_id = intval($row['expense_vendor_id']);
-                            $vendor_name = nullable_htmlentities($row['vendor_name']);
+                        $vendor_name = nullable_htmlentities($row['vendor_name']);
-                            $expense_category_id = intval($row['expense_category_id']);
+                        $expense_category_id = intval($row['expense_category_id']);
-                            $category_name = nullable_htmlentities($row['category_name']);
+                        $category_name = nullable_htmlentities($row['category_name']);
-                            $account_name = nullable_htmlentities($row['account_name']);
+                        $account_name = nullable_htmlentities($row['account_name']);
-                            $expense_account_id = intval($row['expense_account_id']);
+                        $expense_account_id = intval($row['expense_account_id']);
-                            $client_name = nullable_htmlentities($row['client_name']);
+                        $client_name = nullable_htmlentities($row['client_name']);
-                            if(empty($client_name)) {
+                        if(empty($client_name)) {
-                                $client_name_display = "-";
+                            $client_name_display = "-";
-                            } else {
+                        } else {
-                                $client_name_display = $client_name;
+                            $client_name_display = $client_name;
-                            }
-                            $expense_client_id = intval($row['expense_client_id']);
-
-                            if (empty($expense_receipt)) {
-                                $receipt_attached = "";
-                            } else {
-                                $path_info = pathinfo($expense_receipt);
-                                $ext = $path_info['extension'];
-                                $receipt_attached = "<a class='text-secondary mr-2' target='_blank' href='../uploads/expenses/$expense_receipt' download='$expense_date-$vendor_name-$category_name-$expense_id.$ext'><i class='fa fa-file'></i></a>";
-                            }
-
-                            ?>
-
-                            <tr>
-                                <td class="pr-0 bg-light">
-                                    <div class="form-check">
-                                        <input class="form-check-input bulk-select" type="checkbox" name="expense_ids[]" value="<?php echo $expense_id ?>">
-                                    </div>
-                                </td>
-                                <td>
-                                    <?php echo $receipt_attached; ?>
-                                    <a class="text-dark ajax-modal" href="#" title="Created: <?php echo $expense_created_at; ?>"
-                                        data-modal-size="lg"
-                                        data-modal-url="modals/expense/expense_edit.php?id=<?= $expense_id ?>">
-                                        <?php echo $expense_date; ?>
-                                    </a>
-                                </td>
-                                <td>
-                                    <?php echo $category_name; ?>
-                                    <div class="text-secondary"><small><?php echo truncate($expense_description, 60); ?></small></div>
-                                </td>
-                                <td><?php echo $vendor_name; ?></td>
-                                <td class="text-bold text-right"><?php echo numfmt_format_currency($currency_format, $expense_amount, $expense_currency_code); ?></td>
-                                <td><?php echo $account_name; ?></td>
-                                <td><?php echo $client_name_display; ?></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">
-                                            <?php
-                                            if (!empty($expense_receipt)) { ?>
-                                                <a class="dropdown-item" href="<?php echo "../uploads/expenses/$expense_receipt"; ?>" download="<?php echo "$expense_date-$vendor_name-$category_name-$expense_id.pdf"; ?>">
-                                                    <i class="fas fa-fw fa-download mr-2"></i>Download
-                                                </a>
-                                                <div class="dropdown-divider"></div>
-                                            <?php } ?>
-                                            <a class="dropdown-item ajax-modal" href="#"
-                                                data-modal-size="lg"
-                                                data-modal-url="modals/expense/expense_edit.php?id=<?= $expense_id ?>">
-                                                <i class="fas fa-fw fa-edit mr-2"></i>Edit
-                                            </a>
-                                            <a class="dropdown-item ajax-modal" href="#"
-                                                data-modal-size="lg"
-                                                data-modal-url="modals/expense/expense_copy.php?id=<?= $expense_id ?>">
-                                                <i class="fas fa-fw fa-copy mr-2"></i>Copy
-                                            </a>
-                                            <div class="dropdown-divider"></div>
-                                            <a class="dropdown-item ajax-modal" href="#"
-                                                data-modal-size="lg"
-                                                data-modal-url="modals/expense/expense_refund.php?id=<?= $expense_id ?>">
-                                                <i class="fas fa-fw fa-undo-alt mr-2"></i>Refund
-                                            </a>
-                                            <div class="dropdown-divider"></div>
-                                            <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_expense=<?php echo $expense_id; ?>">
-                                                <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                            </a>
-                                        </div>
-                                    </div>
-                                </td>
-                            </tr>
-
-                            <?php
                         }
+                        $expense_client_id = intval($row['expense_client_id']);
+
+                        if (empty($expense_receipt)) {
+                            $receipt_attached = "";
+                        } else {
+                            $path_info = pathinfo($expense_receipt);
+                            $ext = $path_info['extension'];
+                            $receipt_attached = "<a class='text-secondary mr-2' target='_blank' href='../uploads/expenses/$expense_receipt' download='$expense_date-$vendor_name-$category_name-$expense_id.$ext'><i class='fa fa-file'></i></a>";
+                        }
+
                         ?>
 
-                        </tbody>
+                        <tr>
-                    </table>
+                            <td class="pr-0 bg-light">
-                </div>
+                                <div class="form-check">
-                <?php require_once "modals/expense/expense_bulk_edit_category.php"; ?>
+                                    <input class="form-check-input bulk-select" type="checkbox" name="expense_ids[]" value="<?= $expense_id ?>">
-                <?php require_once "modals/expense/expense_bulk_edit_account.php"; ?>
+                                </div>
-                <?php require_once "modals/expense/expense_bulk_edit_client.php"; ?>
+                            </td>
-            </form>
+                            <td>
-            <?php require_once "../includes/filter_footer.php";
+                                <?php echo $receipt_attached; ?>
- ?>
+                                <a class="text-dark ajax-modal" href="#" title="Created: <?php echo $expense_created_at; ?>"
+                                    data-modal-size="lg"
+                                    data-modal-url="modals/expense/expense_edit.php?id=<?= $expense_id ?>">
+                                    <?php echo $expense_date; ?>
+                                </a>
+                            </td>
+                            <td>
+                                <?php echo $category_name; ?>
+                                <div class="text-secondary"><small><?php echo truncate($expense_description, 60); ?></small></div>
+                            </td>
+                            <td><?php echo $vendor_name; ?></td>
+                            <td class="text-bold text-right"><?php echo numfmt_format_currency($currency_format, $expense_amount, $expense_currency_code); ?></td>
+                            <td><?php echo $account_name; ?></td>
+                            <td><?php echo $client_name_display; ?></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">
+                                        <?php
+                                        if (!empty($expense_receipt)) { ?>
+                                            <a class="dropdown-item" href="<?php echo "../uploads/expenses/$expense_receipt"; ?>" download="<?php echo "$expense_date-$vendor_name-$category_name-$expense_id.pdf"; ?>">
+                                                <i class="fas fa-fw fa-download mr-2"></i>Download
+                                            </a>
+                                            <div class="dropdown-divider"></div>
+                                        <?php } ?>
+                                        <a class="dropdown-item ajax-modal" href="#"
+                                            data-modal-size="lg"
+                                            data-modal-url="modals/expense/expense_edit.php?id=<?= $expense_id ?>">
+                                            <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                                        </a>
+                                        <a class="dropdown-item ajax-modal" href="#"
+                                            data-modal-size="lg"
+                                            data-modal-url="modals/expense/expense_copy.php?id=<?= $expense_id ?>">
+                                            <i class="fas fa-fw fa-copy mr-2"></i>Copy
+                                        </a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item ajax-modal" href="#"
+                                            data-modal-size="lg"
+                                            data-modal-url="modals/expense/expense_refund.php?id=<?= $expense_id ?>">
+                                            <i class="fas fa-fw fa-undo-alt mr-2"></i>Refund
+                                        </a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_expense=<?php echo $expense_id; ?>">
+                                            <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                        </a>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                        <?php
+                    }
+                    ?>
+
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once "../includes/filter_footer.php"; ?>
         </div>
     </div>
 
-<script src="../js/bulk_actions.js"></script>
+<script src="/js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/expense/expense_add.php";
-require_once "modals/expense/expense_export.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/global_search.php

@@ -109,11 +109,20 @@ if (isset($_GET['query'])) {
         ORDER BY credential_id DESC LIMIT 5"
     );
 
+    $sql_quotes = mysqli_query($mysqli, "SELECT * FROM quotes
+        LEFT JOIN clients ON quote_client_id = client_id
+        LEFT JOIN categories ON quote_category_id = category_id
+        WHERE quote_archived_at IS NULL
+            AND (CONCAT(quote_prefix,quote_number) LIKE '%$query%' OR quote_number LIKE '%$query%' OR quote_scope LIKE '%$query%')
+            $access_permission_query
+        ORDER BY quote_number DESC LIMIT 5"
+    );
+
     $sql_invoices = mysqli_query($mysqli, "SELECT * FROM invoices
         LEFT JOIN clients ON invoice_client_id = client_id
         LEFT JOIN categories ON invoice_category_id = category_id
         WHERE invoice_archived_at IS NULL
-            AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$query%' OR invoice_scope LIKE '%$query%')
+            AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$query%' OR invoice_number LIKE '%$query%' OR invoice_scope LIKE '%$query%')
             $access_permission_query
         ORDER BY invoice_number DESC LIMIT 5"
     );
@@ -509,10 +518,10 @@ if (isset($_GET['query'])) {
 
                                 ?>
                                 <tr>
-                                    <td><a href="ticket.php?ticket_id=<?php echo $ticket_id ?>"><?php echo $ticket_prefix . $ticket_number; ?></a></td>
+                                    <td><a href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?= $ticket_id ?>"><?= $ticket_prefix . $ticket_number ?></a></td>
-                                    <td><?php echo $ticket_subject; ?></td>
+                                    <td><?= $ticket_subject ?></td>
-                                    <td><?php echo $ticket_status_name; ?></td>
+                                    <td><?= $ticket_status_name ?></td>
-                                    <td><a href="tickets.php?client_id=<?php echo $client_id ?>"><?php echo $client_name; ?></a></td>
+                                    <td><a href="tickets.php?client_id=<?= $client_id ?>"><?= $client_name ?></a></td>
                                 </tr>
 
                             <?php } ?>
@@ -628,6 +637,57 @@ if (isset($_GET['query'])) {
 
         <?php } ?>
 
+        <?php if (mysqli_num_rows($sql_quotes) > 0) { ?>
+
+            <!-- Contacts-->
+
+            <div class="col-sm-6">
+                <div class="card card-dark mb-3">
+                    <div class="card-header">
+                        <h6 class="card-title"><i class="fas fa-fw fa-file-invoice mr-2"></i>Quotes</h6>
+                    </div>
+                    <div class="card-body">
+                        <table class="table table-striped table-borderless">
+                            <thead>
+                            <tr>
+                                <th>Number</th>
+                                <th>Status</th>
+                                <th>Amount</th>
+                                <th>Client</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <?php
+
+                            while ($row = mysqli_fetch_array($sql_quotes)) {
+                                $quote_id = intval($row['quote_id']);
+                                $quote_prefix = nullable_htmlentities($row['quote_prefix']);
+                                $quote_number = intval($row['quote_number']);
+                                $quote_amount = floatval($row['quote_amount']);
+                                $quote_currency_code = nullable_htmlentities($row['quote_currency_code']);
+                                $quote_status = nullable_htmlentities($row['quote_status']);
+                                $client_id = intval($row['client_id']);
+                                $client_name = nullable_htmlentities($row['client_name']);
+
+                                ?>
+                                <tr>
+                                    <td><a href="quote.php?client_id=<?= $client_id ?>&quote_id=<?php echo $quote_id; ?>"><?php echo "$quote_prefix$quote_number"; ?></a></td>
+                                    <td><?php echo $quote_status; ?></td>
+                                    <td><?php echo numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code); ?></td>
+                                    <td><a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
+                                </tr>
+
+                            <?php } ?>
+
+
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+
+        <?php } ?>
+
         <?php if (mysqli_num_rows($sql_invoices) > 0) { ?>
 
             <!-- Contacts-->
@@ -662,7 +722,7 @@ if (isset($_GET['query'])) {
 
                                 ?>
                                 <tr>
-                                    <td><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
+                                    <td><a href="invoice.php?client_id=<?= $client_id ?>&invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
                                     <td><?php echo $invoice_status; ?></td>
                                     <td><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
                                     <td><a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
@@ -807,7 +867,7 @@ if (isset($_GET['query'])) {
                                         <?php echo "$client_name - $ticket_prefix$ticket_number - $ticket_subject"; ?>
                                     </h3>
                                     <div class="card-tools">
-                                        <a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>" target="_blank">Open <i class="fa fa-fw fa-external-link-alt"></i></a>
+                                        <a href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?= $ticket_id ?>" target="_blank">Open <i class="fa fa-fw fa-external-link-alt"></i></a>
                                     </div>
                                 </div>
                                 <div class="card-body prettyContent">

agent/includes/client_overview_side_nav.php

@@ -53,6 +53,7 @@ $num_software = $row['num'];
                             <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"></span>
                                 <?php
                                 if ($num_contacts > 0) { ?>
                                     <span class="right badge text-light"><?php echo $num_contacts; ?></span>
@@ -65,6 +66,7 @@ $num_software = $row['num'];
                             <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"></span>
                                 <?php
                                 if ($num_locations > 0) { ?>
                                     <span class="right badge text-light"><?php echo $num_locations; ?></span>
@@ -77,6 +79,7 @@ $num_software = $row['num'];
                             <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"></span>
                                 <?php
                                 if ($num_assets > 0) { ?>
                                     <span class="right badge text-light"><?php echo $num_assets; ?></span>
@@ -89,6 +92,7 @@ $num_software = $row['num'];
                             <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"></span>
                                 <?php
                                 if ($num_software > 0) { ?>
                                     <span class="right badge text-light"><?php echo $num_software; ?></span>
@@ -101,6 +105,7 @@ $num_software = $row['num'];
                             <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"></span>
                                 <?php
                                 if ($num_credentials > 0) { ?>
                                     <span class="right badge text-light"><?php echo $num_credentials; ?></span>
@@ -113,6 +118,7 @@ $num_software = $row['num'];
                             <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"></span>
                                 <?php
                                 if ($num_networks > 0) { ?>
                                     <span class="right badge text-light"><?php echo $num_networks; ?></span>
@@ -125,6 +131,7 @@ $num_software = $row['num'];
                             <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"></span>
                                 <?php
                                 if ($num_certificates > 0) { ?>
                                     <span class="right badge text-light"><?php echo $num_certificates; ?></span>
@@ -137,6 +144,7 @@ $num_software = $row['num'];
                             <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"></span>
                                 <?php
                                 if ($num_domains > 0) { ?>
                                     <span class="right badge text-light"><?php echo $num_domains; ?></span>
@@ -149,6 +157,7 @@ $num_software = $row['num'];
                             <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"></span>
                                 <?php
                                 if ($num_services > 0) { ?>
                                     <span class="right badge text-light"><?php echo $num_services; ?></span>

agent/includes/client_side_nav.php

@@ -199,7 +199,6 @@
                                 <i class="nav-icon fas fa-lock"></i>
                                 <p>
                                     Certificates
-
                                     <?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>
@@ -213,7 +212,6 @@
                                 <i class="nav-icon fas fa-globe"></i>
                                 <p>
                                     Domains
-
                                     <?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>
@@ -235,25 +233,12 @@
                             </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
-                                    <?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
                                 <?php

agent/includes/inc_all_client.php

@@ -29,15 +29,16 @@ if (isset($_GET['client_id'])) {
     $sql = mysqli_query(
         $mysqli,
         "SELECT * FROM clients
-        LEFT JOIN locations ON clients.client_id = locations.location_client_id AND location_primary = 1
+        LEFT JOIN locations ON client_id = location_client_id AND location_primary = 1
-        LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1
+        LEFT JOIN contacts ON client_id = contact_client_id AND contact_primary = 1
         WHERE client_id = $client_id"
     );
 
     if (mysqli_num_rows($sql) == 0) {
         require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/header.php';
 
-        echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1></center>";
+        echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1><a class='btn btn-lg btn-secondary mt-3' href='javascript:history.back()'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>";
+        exit;
     } else {
 
         $row = mysqli_fetch_array($sql);

agent/includes/side_nav.php

@@ -23,10 +23,10 @@
                         <a href="/agent/clients.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "clients.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-users"></i>
                             <p>
-                              Clients
+                                Clients
-                              <?php if ($num_active_clients) { ?>
+                                <?php if ($num_active_clients) { ?>
-                                      <span class="right badge text-light" data-toggle="tooltip" title="Active Clients"><?php echo $num_active_clients; ?></span>
+                                    <span class="right badge text-light" data-toggle="tooltip" title="Active Clients"><?php echo $num_active_clients; ?></span>
-                              <?php } ?>
+                                <?php } ?>      
                             </p>
                         </a>
                     </li>

agent/invoice.php

@@ -18,8 +18,8 @@ if (isset($_GET['invoice_id'])) {
         $mysqli,
         "SELECT * FROM invoices
         LEFT JOIN clients ON invoice_client_id = client_id
-        LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1
+        LEFT JOIN contacts ON client_id = contact_client_id AND contact_primary = 1
-        LEFT JOIN locations ON clients.client_id = locations.location_client_id AND location_primary = 1
+        LEFT JOIN locations ON client_id = location_client_id AND location_primary = 1
         WHERE invoice_id = $invoice_id
         $access_permission_query
         LIMIT 1"
@@ -162,7 +162,7 @@ if (isset($_GET['invoice_id'])) {
 
     //Product autocomplete
     $products_sql = mysqli_query($mysqli, "
-        SELECT 
+        SELECT
             CONCAT(product_code, ' - ', product_name) AS label,
             product_name,
             product_code,
@@ -190,7 +190,7 @@ if (isset($_GET['invoice_id'])) {
     // Saved Payment Methods
     $sql_saved_payment_methods = mysqli_query($mysqli, "
         SELECT * FROM client_saved_payment_methods
-        LEFT JOIN payment_providers 
+        LEFT JOIN payment_providers
             ON client_saved_payment_methods.saved_payment_provider_id = payment_providers.payment_provider_id
         WHERE saved_payment_client_id = $client_id
         AND payment_provider_active = 1;
@@ -199,21 +199,12 @@ if (isset($_GET['invoice_id'])) {
     ?>
 
     <ol class="breadcrumb d-print-none">
-        <?php if (isset($_GET['client_id'])) { ?>
         <li class="breadcrumb-item">
-            <a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
+            <a href="invoices.php">All Invoices</a>
         </li>
         <li class="breadcrumb-item">
-            <a href="invoices.php?client_id=<?php echo $client_id; ?>">Invoices</a>
+            <a href="invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?> Invoices</a>
         </li>
-        <?php } else { ?>
-        <li class="breadcrumb-item">
-            <a href="invoices.php">Invoices</a>
-        </li>
-        <li class="breadcrumb-item">
-            <a href="invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
-        </li>
-        <?php } ?>
         <li class="breadcrumb-item active"><?php echo "$invoice_prefix$invoice_number"; ?></li>
         <?php if (isset($invoice_overdue)) { ?>
             <span class="p-2 ml-2 badge badge-danger"><?php echo $invoice_overdue; ?></span>
@@ -254,7 +245,7 @@ if (isset($_GET['invoice_id'])) {
                                     <?php if (mysqli_num_rows($sql_saved_payment_methods) > 0 && ($invoice_status === 'Sent' || $invoice_status === 'Viewed')) { ?>
                                     <button type="button" class="btn btn-success dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                                     <div class="dropdown-menu">
-                                        <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/payment/payment_saved_method_add.php?id=<?= $invoice_id ?>"><i class="fas fa-fw fa-wallet mr-2"></i>Pay with Saved Card</a>                                    
+                                        <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/payment/payment_saved_method_add.php?id=<?= $invoice_id ?>"><i class="fas fa-fw fa-wallet mr-2"></i>Pay with Saved Card</a>
                                     </div>
                                     <?php } ?>
 
@@ -286,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>
@@ -465,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>
@@ -734,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" data-toggle="modal" data-target="#addInvoiceModal"><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>
@@ -217,13 +221,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
                             </button>
                             <div class="dropdown-menu">
-                                <?php if ($client_url && $balance > 0) { ?> 
+                                <?php if ($client_url && $balance > 0) { ?>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addBulkPaymentModal">
+                                    <a class="dropdown-item ajax-modal" href="#"
+                                        data-modal-url="modals/payment/payment_bulk_add.php?<?= $client_url ?>">
                                         <i class="fa fa-credit-card mr-2"></i>Batch Payment
                                     </a>
                                     <div class="dropdown-divider"></div>
                                 <?php } ?>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditCategoryModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/invoice/invoice_bulk_edit_category.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-list-ul mr-2"></i>Set Category
                                 </a>
                             </div>
@@ -246,7 +253,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             </div>
         </form>
         <hr>
-        <form id="bulkActions" action="post.php" method="post" enctype="multipart/form-data">
+        <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-striped table-borderless table-hover">
@@ -341,8 +348,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $recurring_invoice_display = "-";
                         }
 
-                        
-
                         $now = time();
 
                         if (($invoice_status == "Sent" || $invoice_status == "Partial" || $invoice_status == "Viewed") && strtotime($invoice_due) + 86400 < $now) {
@@ -353,6 +358,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         $invoice_badge_color = getInvoiceBadgeColor($invoice_status);
 
+                        // Saved Payment Methods
+                        $sql_saved_payment_methods = mysqli_query($mysqli, "
+                            SELECT * FROM client_saved_payment_methods
+                            LEFT JOIN payment_providers
+                                ON client_saved_payment_methods.saved_payment_provider_id = payment_providers.payment_provider_id
+                            WHERE saved_payment_client_id = $client_id
+                            AND payment_provider_active = 1;
+                        ");
+
                         ?>
 
                         <tr>
@@ -362,7 +376,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 </div>
                             </td>
                             <td class="text-bold">
-                                <a href="invoice.php?<?php echo $client_url; ?>invoice_id=<?php echo $invoice_id; ?>">
+                                <a href="invoice.php?client_id=<?= $client_id ?>&invoice_id=<?= $invoice_id ?>">
                                 <?php echo "$invoice_prefix$invoice_number"; ?>
                                 </a>
                             </td>
@@ -392,10 +406,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                                 <i class="fa fa-fw fa-credit-card mr-2"></i>Add Payment
                                             </a>
                                             <div class="dropdown-divider"></div>
-                                            <?php if ($invoice_status !== 'Partial' && $config_stripe_enable && $stripe_id && $stripe_pm) { ?>
+                                            <?php if (mysqli_num_rows($sql_saved_payment_methods) > 0 && ($invoice_status === 'Sent' || $invoice_status === 'Viewed')) { ?>
-                                                <a class="dropdown-item confirm-link" href="post.php?add_payment_stripe&invoice_id=<?php echo $invoice_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token']; ?>">
+                                                <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/payment/payment_saved_method_add.php?id=<?= $invoice_id ?>"><i class="fas fa-fw fa-wallet mr-2"></i>Pay with Saved Card</a>
-                                                    <i class="fa fa-fw fa-credit-card mr-2"></i>Pay via saved card
-                                                </a>
                                                 <div class="dropdown-divider"></div>
                                             <?php } ?>
                                         <?php } ?>
@@ -437,17 +449,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "modals/invoice/invoice_bulk_edit_category.php"; ?>
         </form>
-        <?php require_once "../includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php"; ?>
-?>
     </div>
 </div>
 
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/invoice/invoice_add.php";
-if ($client_url) { require_once "modals/payment/payment_bulk_add.php"; }
-require_once "modals/invoice/invoice_export.php";
 require_once "../includes/footer.php";

agent/js/ticket_change_client.js

@@ -1,94 +1,55 @@
-/*
+$(document).ready(function() {
- *   LISTENERS
- */
 
-// Modal loaded listener - populate client select
+    // Function to load contacts for a given client
-const changeClientModalLoad = document.getElementById('clientChangeTicketModalLoad');
+    function loadContacts(clientId) {
-changeClientModalLoad.addEventListener('click', function() {
+        if (!clientId) return;
-    populateChangeClientModal_Clients();
-})
 
-// Client selected listener - populate contact select
+        var $contactSelect = $('#contact_select');
-//  We seem to have to use jQuery to listen for events, as the client input is a select2 component?
+        $contactSelect.html('<option value="">Loading...</option>');
-const clientSelectDropdown = document.getElementById("changeClientSelect");
-$(clientSelectDropdown).on('select2:select', function (e) {
-    let client_id = $(this).find(':selected').val();
-    populateChangeClientModal_Contacts(client_id);
-});
 
-
+        $.ajax({
-/*
+            url: 'ajax.php',
- *   FUNCTIONS
+            type: 'GET',
- */
+            dataType: 'json',
-
+            data: {
-// Populate client list function
+                get_client_contacts: 1,
-function populateChangeClientModal_Clients() {
+                client_id: clientId
-
+            },
-    // Get current client ID
+            success: function(response) {
-    let current_client_id = document.getElementById("client_id").value;
+                $contactSelect.empty();
-
+                if (response.contacts && response.contacts.length > 0) {
-    // Send a GET request to ajax.php as ajax.php?get_active_clients=true
+                    $contactSelect.append('<option value="">Select a contact</option>');
-    jQuery.get(
+                    $.each(response.contacts, function(i, contact) {
-        "ajax.php",
+                        $contactSelect.append(
-        {get_active_clients: 'true'},
+                            $('<option>', { 
-        function(data) {
+                                value: contact.contact_id,
-
+                                text: contact.contact_name
-            // If we get a response from ajax.php, parse it as JSON
+                            })
-            const response = JSON.parse(data);
+                        );
-
+                    });
-            // Access the data for clients (multiple)
+                } else {
-            const clients = response.clients;
+                    $contactSelect.append('<option value="">No contacts found</option>');
-
-            // Client dropdown already defined in listeners as clientSelectDropdown
-
-            // Clear dropdown
-            let i, L = clientSelectDropdown.options.length - 1;
-            for (i = L; i >= 0; i--) {
-                clientSelectDropdown.remove(i);
-            }
-            clientSelectDropdown[clientSelectDropdown.length] = new Option('- Client -', '0');
-
-            // Populate dropdown
-            clients.forEach(client => {
-                if (parseInt(current_client_id) !== parseInt(client.client_id)) {
-                    // Show clients returned (excluding the current client ID - we can't change a ticket client to itself)
-                    clientSelectDropdown[clientSelectDropdown.length] = new Option(client.client_name, client.client_id);
                 }
-            });
 
-        }
+                // Refresh Select2
-    );
+                if ($.fn.select2) {
-}
+                    $contactSelect.trigger('change.select2');
-
+                }
-// Populate client contact function (after a client is selected)
+            },
-function populateChangeClientModal_Contacts(client_id) {
+            error: function(xhr, status, error) {
-    // Send a GET request to ajax.php as ajax.php?get_client_contacts=true&client_id=NUM
+                console.error('AJAX Error:', error);
-    jQuery.get(
+                $contactSelect.html('<option value="">Failed to load contacts</option>');
-        "ajax.php",
-        {get_client_contacts: 'true', client_id: client_id},
-        function(data) {
-
-            // If we get a response from ajax.php, parse it as JSON
-            const response = JSON.parse(data);
-
-            // Access the data for contacts (multiple)
-            const contacts = response.contacts;
-
-            // Contacts dropdown
-            const contactSelectDropdown = document.getElementById("changeContactSelect");
-
-            // Clear Category dropdown
-            let i, L = contactSelectDropdown.options.length - 1;
-            for (i = L; i >= 0; i--) {
-                contactSelectDropdown.remove(i);
             }
-            contactSelectDropdown[contactSelectDropdown.length] = new Option('- Contact -', '0');
+        });
+    }
 
-            // Populate dropdown
+    // Load contacts for the currently selected client when modal opens
-            contacts.forEach(contact => {
+    var initialClientId = $('#client_select').val();
-                contactSelectDropdown[contactSelectDropdown.length] = new Option(contact.contact_name, contact.contact_id);
+    loadContacts(initialClientId);
-            });
 
-        }
+    // Load contacts when client changes
-    );
+    $('#client_select').on('change', function() {
-}
+        var clientId = $(this).val();
+        loadContacts(clientId);
+    });
+});

agent/js/ticket_time_tracking.js

@@ -1,6 +1,5 @@
 (function() {
     document.addEventListener("DOMContentLoaded", function() {
-        // Initialize variables
         var timerInterval = null;
         var ticketID = getCurrentTicketID();
         var elapsedSecs = getElapsedSeconds();
@@ -22,6 +21,10 @@
             return pausedTime + timeSinceStart;
         }
 
+        function pad(val) {
+            return val < 10 ? "0" + val : val;
+        }
+
         function displayTime() {
 
             // Show hrs, mins, sec input placeholders if auto-start is off
@@ -38,17 +41,21 @@
             let minutes = Math.floor(totalSeconds / 60);
             let seconds = totalSeconds % 60;
 
-            document.getElementById("hours").value = pad(hours);
+            let hoursEl = document.getElementById("hours");
-            document.getElementById("minutes").value = pad(minutes);
+            let minutesEl = document.getElementById("minutes");
-            document.getElementById("seconds").value = pad(seconds);
+            let secondsEl = document.getElementById("seconds");
-        }
 
-        function pad(val) {
+            if (hoursEl && minutesEl && secondsEl) {
-            return val < 10 ? "0" + val : val;
+                hoursEl.value = pad(hours);
+                minutesEl.value = pad(minutes);
+                secondsEl.value = pad(seconds);
+            } else {
+                console.warn("Timer input elements not found");
+            }
         }
 
         function countTime() {
-            elapsedSecs++;
+            elapsedSecs = getElapsedSeconds();
             displayTime();
         }
 
@@ -57,7 +64,8 @@
                 localStorage.setItem(getLocalStorageKey("startTime"), Date.now().toString());
             }
             timerInterval = setInterval(countTime, 1000);
-            document.getElementById("startStopTimer").innerHTML = "<i class='fas fa-pause'></i>";
+            let btn = document.getElementById("startStopTimer");
+            if (btn) btn.innerHTML = "<i class='fas fa-pause'></i>";
             localStorage.setItem("ticket-timer-running-" + ticketID, "true");
         }
 
@@ -69,7 +77,8 @@
             let currentElapsed = getElapsedSeconds();
             localStorage.setItem(getLocalStorageKey("pausedTime"), currentElapsed.toString());
             localStorage.removeItem(getLocalStorageKey("startTime"));
-            document.getElementById("startStopTimer").innerHTML = "<i class='fas fa-play'></i>";
+            let btn = document.getElementById("startStopTimer");
+            if (btn) btn.innerHTML = "<i class='fas fa-play'></i>";
             localStorage.setItem("ticket-timer-running-" + ticketID, "false");
         }
 
@@ -86,7 +95,8 @@
                 elapsedSecs = 0;
                 clearTimeStorage();
                 displayTime();
-                document.getElementById("startStopTimer").innerHTML = "<i class='fas fa-play'></i>";
+                let btn = document.getElementById("startStopTimer");
+                if (btn) btn.innerHTML = "<i class='fas fa-play'></i>";
             }
             localStorage.setItem("ticket-timer-running-" + ticketID, "false");
         }
@@ -97,7 +107,8 @@
             elapsedSecs = 0;
             clearTimeStorage();
             displayTime();
-            document.getElementById("startStopTimer").innerHTML = "<i class='fas fa-play'></i>";
+            let btn = document.getElementById("startStopTimer");
+            if (btn) btn.innerHTML = "<i class='fas fa-play'></i>";
         }
 
         function handleInputFocus() {
@@ -105,9 +116,9 @@
         }
 
         function updateTimeFromInput() {
-            const hours = parseInt(document.getElementById("hours").value, 10) || 0;
+            const hours = parseInt(document.getElementById("hours")?.value, 10) || 0;
-            const minutes = parseInt(document.getElementById("minutes").value, 10) || 0;
+            const minutes = parseInt(document.getElementById("minutes")?.value, 10) || 0;
-            const seconds = parseInt(document.getElementById("seconds").value, 10) || 0;
+            const seconds = parseInt(document.getElementById("seconds")?.value, 10) || 0;
             elapsedSecs = (hours * 3600) + (minutes * 60) + seconds;
 
             if (!timerInterval) {
@@ -120,61 +131,93 @@
         }
 
         function checkStatusAndPauseTimer() {
-            var status = document.querySelector('select[name="status"]').value;
+            var statusEl = document.querySelector('select[name="status"]');
-            if (status.includes("Pending") || status.includes("Close")) {
+            if (statusEl) {
-                pauseTimer();
+                var status = statusEl.value;
+                if (status.includes("Pending") || status.includes("Close")) {
+                    pauseTimer();
+                }
             }
         }
 
-        // Attach input listeners
+        // Update on tab visibility change to handle background sleep
-        document.getElementById("hours").addEventListener('change', updateTimeFromInput);
+        document.addEventListener('visibilitychange', function() {
-        document.getElementById("minutes").addEventListener('change', updateTimeFromInput);
+            if (!document.hidden) {
-        document.getElementById("seconds").addEventListener('change', updateTimeFromInput);
+                elapsedSecs = getElapsedSeconds();
-
+                displayTime();
-        document.getElementById("hours").addEventListener('focus', handleInputFocus);
-        document.getElementById("minutes").addEventListener('focus', handleInputFocus);
-        document.getElementById("seconds").addEventListener('focus', handleInputFocus);
-
-        document.querySelector('select[name="status"]').addEventListener('change', checkStatusAndPauseTimer);
-
-        document.getElementById("startStopTimer").addEventListener('click', function() {
-            if (timerInterval === null) {
-                startTimer();
-            } else {
-                pauseTimer();
             }
         });
 
-        document.getElementById("resetTimer").addEventListener('click', function() {
+        // Attach input listeners with null checks
-            resetTimer();
+        const hoursEl = document.getElementById("hours");
-        });
+        if (hoursEl) {
+            hoursEl.addEventListener('change', updateTimeFromInput);
+            hoursEl.addEventListener('focus', handleInputFocus);
+        }
 
-        document.getElementById("ticket_add_reply").addEventListener('click', function() {
+        const minutesEl = document.getElementById("minutes");
-            setTimeout(forceResetTimer, 100);
+        if (minutesEl) {
-        });
+            minutesEl.addEventListener('change', updateTimeFromInput);
+            minutesEl.addEventListener('focus', handleInputFocus);
+        }
 
-        document.getElementById("ticket_close").addEventListener('click', function() {
+        const secondsEl = document.getElementById("seconds");
-            setTimeout(clearTimeStorage, 100);
+        if (secondsEl) {
-        });
+            secondsEl.addEventListener('change', updateTimeFromInput);
+            secondsEl.addEventListener('focus', handleInputFocus);
+        }
+
+        const statusEl = document.querySelector('select[name="status"]');
+        if (statusEl) {
+            statusEl.addEventListener('change', checkStatusAndPauseTimer);
+        }
+
+        const startStopBtn = document.getElementById("startStopTimer");
+        if (startStopBtn) {
+            startStopBtn.addEventListener('click', function() {
+                if (timerInterval === null) {
+                    startTimer();
+                } else {
+                    pauseTimer();
+                }
+            });
+        }
+
+        const resetBtn = document.getElementById("resetTimer");
+        if (resetBtn) {
+            resetBtn.addEventListener('click', function() {
+                resetTimer();
+            });
+        }
+
+        const addReplyBtn = document.getElementById("ticket_add_reply");
+        if (addReplyBtn) {
+            addReplyBtn.addEventListener('click', function() {
+                setTimeout(forceResetTimer, 100);
+            });
+        }
+
+        const closeBtn = document.getElementById("ticket_close");
+        if (closeBtn) {
+            closeBtn.addEventListener('click', function() {
+                setTimeout(clearTimeStorage, 100);
+            });
+        }
 
         // Final initialization logic
         try {
             displayTime();
 
-            // If no timer state, respect ticketAutoStart
             if (!localStorage.getItem(getLocalStorageKey("startTime")) && !localStorage.getItem(getLocalStorageKey("pausedTime"))) {
-                if (ticketAutoStart === 1) {
+                if (typeof ticketAutoStart !== "undefined" && ticketAutoStart === 1) {
                     startTimer();
                 } else {
                     pauseTimer();
                 }
-            }
+            } else if (localStorage.getItem(getLocalStorageKey("startTime"))) {
-            // If timer already running, resume it
-            else if (localStorage.getItem(getLocalStorageKey("startTime"))) {
                 startTimer();
             }
 
-            // Check and pause timer if status is pending
             checkStatusAndPauseTimer();
 
         } catch (error) {

agent/locations.php

@@ -79,17 +79,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <h3 class="card-title mt-2"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>Locations</h3>
         <div class="card-tools">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addLocationModal">
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/location/location_add.php?<?= $client_url ?>">
                     <i class="fas fa-plus mr-2"></i>New Location
                 </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 } ?>
@@ -119,8 +121,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         <select onchange="this.form.submit()" class="form-control select2" name="tags[]" data-placeholder="- Select Tags -" multiple>
                             <?php
                             $sql_tags_filter = mysqli_query($mysqli, "
-                                SELECT tags.tag_id, tags.tag_name, tag_type 
+                                SELECT tags.tag_id, tags.tag_name, tag_type
-                                FROM tags 
+                                FROM tags
                                 LEFT JOIN location_tags ON location_tags.tag_id = tags.tag_id
                                 LEFT JOIN locations ON location_tags.location_id = locations.location_id
                                 WHERE tag_type = 2
@@ -148,7 +150,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             <?php
                             $sql_clients_filter = mysqli_query($mysqli, "
-                                SELECT DISTINCT client_id, client_name 
+                                SELECT DISTINCT client_id, client_name
                                 FROM clients
                                 JOIN locations ON location_client_id = client_id
                                 WHERE $archive_query
@@ -180,7 +182,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <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" href="#" data-toggle="modal" data-target="#bulkAssignTagsModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/location/location_bulk_assign_tags.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-tags mr-2"></i>Assign Tags
                                 </a>
                                 <?php if ($archived) { ?>
@@ -393,18 +397,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "modals/location/location_bulk_assign_tags.php"; ?>
         </form>
-        <?php require_once "../includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php"; ?>
- ?>
     </div>
 </div>
 
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-
-require_once "modals/location/location_add.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

@@ -1,63 +1,67 @@
-<div class="modal" id="addAccountModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-piggy-bank mr-2"></i>New Account</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="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-                <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
+ob_start();
-                        <label>Account Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Account name" maxlength="200" required autofocus>
-                        </div>
-                    </div>
 
-                    <div class="form-group">
+?>
-                        <label>Opening Balance <strong class="text-danger">*</strong></label>
+<div class="modal-header bg-dark">
-                        <div class="input-group">
+    <h5 class="modal-title"><i class="fa fa-fw fa-piggy-bank mr-2"></i>New Account</h5>
-                            <div class="input-group-prepend">
+    <button type="button" class="close text-white" data-dismiss="modal">
-                                <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
+        <span>&times;</span>
-                            </div>
+    </button>
-                            <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="opening_balance" placeholder="0.00" required>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Currency <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
-                            </div>
-                            <select class="form-control select2" name="currency_code" required>
-                                <option value="">- Currency -</option>
-                                <?php foreach ($currencies_array as $currency_code => $currency_name) { ?>
-                                    <option <?php if ($session_company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Notes</label>
-                        <textarea class="form-control" rows="5" placeholder="Enter some notes" name="notes"></textarea>
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_account" 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>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Account Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Account name" maxlength="200" required autofocus>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Opening Balance <strong class="text-danger">*</strong></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="opening_balance" placeholder="0.00" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Currency <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
+                </div>
+                <select class="form-control select2" name="currency_code" required>
+                    <option value="">- Currency -</option>
+                    <?php foreach ($currencies_array as $currency_code => $currency_name) { ?>
+                        <option <?php if ($session_company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Notes</label>
+            <textarea class="form-control" rows="5" placeholder="Enter some notes" name="notes"></textarea>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_account" 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>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/asset/asset_add.php

@@ -27,6 +27,8 @@ if ($os_sql && mysqli_num_rows($os_sql) > 0) {
     $json_os = json_encode($os_arr);
 }
 
+$sql_tags_select = mysqli_query($mysqli, "SELECT tag_id, tag_name FROM tags WHERE tag_type = 5 ORDER BY tag_name ASC");
+
 ob_start();
 
 ?>
@@ -465,6 +467,33 @@ ob_start();
                     <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
                 </div>
 
+                <div class="form-group">
+                    <label>Tags</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
+                        </div>
+                        <select class="form-control select2" name="tags[]" data-placeholder="Add some tags" multiple>
+                            <?php
+
+                            while ($row = mysqli_fetch_array($sql_tags_select)) {
+                                $tag_id = intval($row['tag_id']);
+                                $tag_name = nullable_htmlentities($row['tag_name']);
+                                ?>
+                                <option value="<?= $tag_id ?>"><?= $tag_name ?></option>
+                            <?php } ?>
+
+                        </select>
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary ajax-modal" type="button"
+                                data-modal-url="../admin/modals/tag/tag_add.php?type=5">
+                                <i class="fas fa-plus"></i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
+
             </div>
 
         </div>

agent/modals/asset/asset_bulk_add_ticket.php

@@ -1,134 +1,147 @@
-<div class="modal" id="bulkAddTicketModal" tabindex="-1">
+<?php
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>Creating Tickets for Assets</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            
-            <div class="modal-body">
 
-                <div class="form-group">
+require_once '../../../includes/modal_header.php';
-                    <label>Subject <strong class="text-danger">*</strong></label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="bulk_subject" placeholder="Asset Name will be prepended to Subject" maxlength="200">
-                    </div>
-                </div>
 
-                <div class="form-group">
+$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []);
-                    <textarea class="form-control tinymceTicket" id="textInput" name="bulk_details"></textarea>
-                </div>
 
-                <div class="row">
+$count = count($asset_ids);
-                                
-                    <div class="col">
-                        <div class="form-group">
-                            <label>Priority <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
-                                </div>
-                                <select class="form-control select2" name="bulk_priority">
-                                    <option>Low</option>
-                                    <option>Medium</option>
-                                    <option>High</option>
-                                </select>
-                            </div>
-                        </div>
-                    </div>
 
-                    <div class="col">
+ob_start();
-                        <div class="form-group">
-                            <label>Category</label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
-                                </div>
-                                <select class="form-control select2" name="bulk_category">
-                                    <option value="0">- Not Categorized -</option>
-                                    <?php
-                                    $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                                    while ($row = mysqli_fetch_array($sql_categories)) {
-                                        $category_id = intval($row['category_id']);
-                                        $category_name = nullable_htmlentities($row['category_name']);
 
-                                        ?>
+?>
-                                        <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-                                    <?php } ?>
 
-                                </select>
+<div class="modal-header bg-dark">
-                            </div>
+    <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>Create Tickets for <strong><?= $count ?></strong> Assets</h5>
-                        </div>
+    <button type="button" class="close text-white" data-dismiss="modal">
-                    </div>
+        <span>&times;</span>
-
+    </button>
-                </div>
-
-                <div class="form-group">
-                    <label>Assign to</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_assigned_to">
-                            <option value="0">Not Assigned</option>
-                            <?php
-
-                            $sql = mysqli_query(
-                                $mysqli,
-                                "SELECT user_id, user_name FROM users
-                                WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
-                            );
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $user_id = intval($row['user_id']);
-                                $user_name = nullable_htmlentities($row['user_name']); ?>
-                                <option <?php if ($session_user_id == $user_id) { echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Project</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_project">
-                            <option value="0">- None -</option>
-                            <?php
-
-                            $sql_projects = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_completed_at IS NULL AND project_archived_at IS NULL ORDER BY project_name ASC");
-                            while ($row = mysqli_fetch_array($sql_projects)) {
-                                $project_id_select = intval($row['project_id']);
-                                $project_name_select = nullable_htmlentities($row['project_name']); ?>
-                                <option value="<?php echo $project_id_select; ?>"><?php echo $project_name_select; ?></option>
-
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
-                <?php if ($config_module_enable_accounting) { ?>
-                <div class="form-group">
-                    <div class="custom-control custom-switch">
-                        <input type="checkbox" class="custom-control-input" name="bulk_billable" <?php if ($config_ticket_default_billable == 1) { echo "checked"; } ?> value="1" id="billableSwitch">
-                        <label class="custom-control-label" for="billableSwitch">Billable</label>
-                    </div>
-                </div>
-                <?php } ?>
-
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_add_asset_ticket" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-            </div>
-            
-        </div>
-    </div>
 </div>
+
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <?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">
+            <label>Subject <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                </div>
+                <input type="text" class="form-control" name="bulk_subject" placeholder="Asset Name will be prepended to Subject" maxlength="200" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <textarea class="form-control tinymceTicket" id="textInput" name="bulk_details"></textarea>
+        </div>
+
+        <div class="row">
+
+            <div class="col">
+                <div class="form-group">
+                    <label>Priority <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
+                        </div>
+                        <select class="form-control select2" name="bulk_priority" required>
+                            <option>Low</option>
+                            <option>Medium</option>
+                            <option>High</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col">
+                <div class="form-group">
+                    <label>Category</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
+                        </div>
+                        <select class="form-control select2" name="bulk_category">
+                            <option value="0">- Not Categorized -</option>
+                            <?php
+                            $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                            while ($row = mysqli_fetch_array($sql_categories)) {
+                                $category_id = intval($row['category_id']);
+                                $category_name = nullable_htmlentities($row['category_name']);
+
+                                ?>
+                                <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+        <div class="form-group">
+            <label>Assign to</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
+                </div>
+                <select class="form-control select2" name="bulk_assigned_to">
+                    <option value="0">Not Assigned</option>
+                    <?php
+
+                    $sql = mysqli_query(
+                        $mysqli,
+                        "SELECT user_id, user_name FROM users
+                        WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
+                    );
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $user_id = intval($row['user_id']);
+                        $user_name = nullable_htmlentities($row['user_name']); ?>
+                        <option <?php if ($session_user_id == $user_id) { echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Project</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
+                </div>
+                <select class="form-control select2" name="bulk_project">
+                    <option value="0">- None -</option>
+                    <?php
+
+                    $sql_projects = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_completed_at IS NULL AND project_archived_at IS NULL ORDER BY project_name ASC");
+                    while ($row = mysqli_fetch_array($sql_projects)) {
+                        $project_id_select = intval($row['project_id']);
+                        $project_name_select = nullable_htmlentities($row['project_name']); ?>
+                        <option value="<?php echo $project_id_select; ?>"><?php echo $project_name_select; ?></option>
+
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+        <?php if ($config_module_enable_accounting) { ?>
+        <div class="form-group">
+            <div class="custom-control custom-switch">
+                <input type="checkbox" class="custom-control-input" name="bulk_billable" <?php if ($config_ticket_default_billable == 1) { echo "checked"; } ?> value="1" id="billableSwitch">
+                <label class="custom-control-label" for="billableSwitch">Billable</label>
+            </div>
+        </div>
+        <?php } ?>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_add_asset_ticket" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create Tickets</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/asset/asset_bulk_assign_contact.php

@@ -1,44 +1,58 @@
-<div class="modal" id="bulkAssignContactModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-user-check mr-2"></i>Bulk Assign Contact</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
 
-            <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group">
+$client_id = intval($_GET['client_id']);
-                    <label>Assign To</label>
+$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []);
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_contact_id">
-                            <option value="">- Contact -</option>
-                            <?php
 
-                            $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
+$count = count($asset_ids);
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $contact_id = intval($row['contact_id']);
-                                $contact_name = nullable_htmlentities($row['contact_name']);
-                                ?>
-                                <option value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?></option>
 
-                            <?php } ?>
+ob_start();
 
-                        </select>
+?>
-                    </div>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-user-check mr-2"></i>Assign Contact to <strong><?= $count ?></strong> Assets</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="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <?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">
+            <label>Contact</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                 </div>
+                <select class="form-control select2" name="bulk_contact_id">
+                    <option value="">- Contact -</option>
+                    <?php
 
-            </div>
+                    $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $contact_id = intval($row['contact_id']);
+                        $contact_name = nullable_htmlentities($row['contact_name']);
+                        ?>
+                        <option value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?></option>
 
-            <div class="modal-footer">
+                    <?php } ?>
-                <button type="submit" name="bulk_assign_asset_contact" 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>
+                </select>
             </div>
         </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_assign_asset_contact" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign Contact</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/asset/asset_bulk_assign_location.php

@@ -1,43 +1,58 @@
-<div class="modal" id="bulkAssignLocationModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>Bulk Assign Location</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
 
-            <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group">
+$client_id = intval($_GET['client_id']);
-                    <label>Location</label>
+$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []);
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_location_id">
-                            <option value="">- Location -</option>
-                            <?php
 
-                            $sql = mysqli_query($mysqli, "SELECT location_id, location_name FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
+$count = count($asset_ids);
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $location_id = intval($row['location_id']);
-                                $location_name = nullable_htmlentities($row['location_name']);
-                            ?>
-                                <option value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
-                            <?php } ?>
 
-                        </select>
+ob_start();
-                    </div>
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>Assign Location to <strong><?= $count ?></strong> Assets</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="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <?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">
+            <label>Location</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                 </div>
+                <select class="form-control select2" name="bulk_location_id">
+                    <option value="">- Location -</option>
+                    <?php
 
-            </div>
+                    $sql = mysqli_query($mysqli, "SELECT location_id, location_name FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $location_id = intval($row['location_id']);
+                        $location_name = nullable_htmlentities($row['location_name']);
+                    ?>
+                        <option value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
+                    <?php } ?>
 
-            <div class="modal-footer">
+                </select>
-                <button type="submit" name="bulk_assign_asset_location" 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>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_assign_asset_location" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign Location</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/asset/asset_bulk_assign_physical_location.php

@@ -1,31 +1,43 @@
-<div class="modal" id="bulkAssignPhysicalLocationModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>Bulk Set Physical Location</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
 
-            <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group">
+$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []);
-                    <label>Physical Location</label>
+
-                    <div class="input-group">
+$count = count($asset_ids);
-                        <div class="input-group-prepend">
+
-                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+ob_start();
-                        </div>
+
-                        <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B" maxlength="200">
+?>
-                    </div>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>Set Physical Location for <strong><?= $count ?></strong> Assets</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="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <?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">
+            <label>Physical Location</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                 </div>
-
+                <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B" maxlength="200">
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_assign_asset_physical_location" 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>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_assign_asset_physical_location" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set Physical Location</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/asset/asset_bulk_assign_tags.php

@@ -0,0 +1,61 @@
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []);
+
+$count = count($asset_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-tags mr-2"></i>Assign Tags for <strong><?= $count ?></strong> Assets</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="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <?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">
+
+        <div class="form-group form-check">
+            <input type="checkbox" class="form-check-input" name="remove_tags" value="1">
+            <label class="form-check-label text-danger">Remove Existing Tags</label>
+        </div>
+
+        <div class="form-group">
+            <label>Tags</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
+                </div>
+                <select class="form-control select2" name="tags[]" data-placeholder="Add some tags" multiple>
+                    <?php
+
+                    $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 5 ORDER BY tag_name ASC");
+                    while ($row = mysqli_fetch_array($sql_tags_select)) {
+                        $tag_id_select = intval($row['tag_id']);
+                        $tag_name_select = nullable_htmlentities($row['tag_name']);
+                        ?>
+                        <option value="<?php echo $tag_id_select; ?>"><?php echo $tag_name_select; ?></option>
+                    <?php } ?>
+
+                </select>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_assign_asset_tags" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign Tags</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/asset/asset_bulk_edit_status.php

@@ -1,36 +1,49 @@
-<div class="modal" id="bulkEditStatusModal" tabindex="-1">
+<?php
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-info mr-2"></i>Bulk Edit Status</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
 
-            <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group">
+$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []);
-                    <label>Status</label>
+
-                    <div class="input-group">
+$count = count($asset_ids);
-                        <div class="input-group-prepend">
+
-                            <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
+ob_start();
-                        </div>
+
-                        <select class="form-control select2" name="bulk_status">
+?>
-                            <option value="">- Status -</option>
+
-                            <?php foreach($asset_status_array as $asset_status) { ?>
+<div class="modal-header bg-dark">
-                                <option><?php echo $asset_status; ?></option>
+    <h5 class="modal-title"><i class="fa fa-fw fa-info mr-2"></i>Set Status for <strong><?= $count ?></strong> Assets</h5>
-                            <?php } ?>
+    <button type="button" class="close text-white" data-dismiss="modal">
-                        </select>
+        <span>&times;</span>
-                    </div>
+    </button>
+</div>
+
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <?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">
+            <label>Status</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
                 </div>
-
+                <select class="form-control select2" name="bulk_status">
-            </div>
+                    <option value="">- Status -</option>
-
+                    <?php foreach($asset_status_array as $asset_status) { ?>
-            <div class="modal-footer">
+                        <option><?php echo $asset_status; ?></option>
-                <button type="submit" name="bulk_edit_asset_status" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set</button>
+                    <?php } ?>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </select>
             </div>
         </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_asset_status" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set Status</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/asset/asset_bulk_transfer_client.php

@@ -1,56 +1,68 @@
-<?php 
+<?php
-if ($client_url) {
+
+require_once '../../../includes/modal_header.php';
+
+$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []);
+$count = count($asset_ids);
+
+$client_id = intval($_GET['client_id'] ?? 0);
+if ($client_id) {
     $client_select_query = "AND client_id != $client_id";
 } else {
     $client_select_query = '';
 }
+
+ob_start();
+
 ?>
 
-<div class="modal" id="bulkTransferAssetClientModal" tabindex="-1">
+<div class="modal-header bg-dark">
-    <div class="modal-dialog">
+    <h5 class="modal-title"><i class="fa fa-fw fa-exchange-alt mr-2"></i>Transfer <strong><?= $count ?></strong> Asset(s) to Client</h5>
-        <div class="modal-content">
+    <button type="button" class="close text-white" data-dismiss="modal">
-            <div class="modal-header bg-dark">
+        <span>&times;</span>
-                <h5 class="modal-title"><i class="fa fa-fw fa-exchange mr-2"></i>Transferring Asset(s)</h5>
+    </button>
-                <button type="button" class="close text-white" data-dismiss="modal">
+</div>
-                    <span>&times;</span>
-                </button>
-            </div>
 
-            <div class="modal-body">
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($asset_ids as $asset_id) { ?><input type="hidden" name="asset_ids[]" value="<?= $asset_id ?>"><?php } ?>
 
-                <div class="form-group">
+    <div class="modal-body">
-                    <label>New Client <strong class="text-danger">*</strong></label>
+
-                    <div class="input-group">
+        <div class="form-group">
-                        <div class="input-group-prepend">
+            <label>Client <strong class="text-danger">*</strong></label>
-                            <span class="input-group-text"><i class="fa fa-fw fa-users"></i></span>
+            <div class="input-group">
-                        </div>
+                <div class="input-group-prepend">
-                        <select class="form-control select2" name="bulk_client_id">
+                    <span class="input-group-text"><i class="fa fa-fw fa-users"></i></span>
-                            <option value="">- Select Client -</option>
-                            <?php
-                                $clients_sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $client_select_query");
-                        
-                                while ($row = mysqli_fetch_array($clients_sql)) {
-                                    $client_id_select = intval($row["client_id"]);
-                                    $client_name_select = nullable_htmlentities($row["client_name"]);
-                                ?>
-                                <option value='<?php echo $client_id_select; ?>'><?php echo $client_name_select; ?></option>
-                                <?php
-                                }
-                            ?>
-                        </select>
-                    </div>
                 </div>
+                <select class="form-control select2" name="bulk_client_id">
+                    <option value="">- Select Client -</option>
+                    <?php
+                        $clients_sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $client_select_query");
 
-                <div class="alert alert-dark" role="alert">
+                        while ($row = mysqli_fetch_array($clients_sql)) {
-                    <i>The current asset will be archived and content copied to a new asset.</i>
+                            $client_id_select = intval($row["client_id"]);
-                </div>
+                            $client_name_select = nullable_htmlentities($row["client_name"]);
-
+                        ?>
-            </div>
+                        <option value='<?php echo $client_id_select; ?>'><?php echo $client_name_select; ?></option>
-
+                        <?php
-            <div class="modal-footer">
+                        }
-                <button type="submit" name="bulk_transfer_client_asset" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Transfer</button>
+                    ?>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </select>
             </div>
         </div>
+
+        <div class="alert alert-dark" role="alert">
+            <i>The current asset will be archived and content copied to a new asset.</i>
+        </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_transfer_client_asset" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Transfer to Client</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/asset/asset_details.php

@@ -70,6 +70,28 @@ if ($location_archived_at) {
     $location_name_display = $location_name;
 }
 
+// Tags - many to many relationship
+$asset_tag_name_display_array = array();
+$asset_tag_id_array = array();
+$sql_asset_tags = mysqli_query($mysqli, "SELECT * FROM asset_tags LEFT JOIN tags ON asset_tag_tag_id = tag_id WHERE asset_tag_asset_id = $asset_id ORDER BY tag_name ASC");
+while ($row = mysqli_fetch_array($sql_asset_tags)) {
+
+    $asset_tag_id = intval($row['tag_id']);
+    $asset_tag_name = nullable_htmlentities($row['tag_name']);
+    $asset_tag_color = nullable_htmlentities($row['tag_color']);
+    if (empty($asset_tag_color)) {
+        $asset_tag_color = "dark";
+    }
+    $asset_tag_icon = nullable_htmlentities($row['tag_icon']);
+    if (empty($asset_tag_icon)) {
+        $asset_tag_icon = "tag";
+    }
+
+    $asset_tag_id_array[] = $asset_tag_id;
+    $asset_tag_name_display_array[] = "<a href='client_assets.php?client_id=$client_id&q=$asset_tag_name'><span class='badge text-light p-1 mr-1' style='background-color: $asset_tag_color;'><i class='fa fa-fw fa-$asset_tag_icon mr-2'></i>$asset_tag_name</span></a>";
+}
+$asset_tags_display = implode('', $asset_tag_name_display_array);
+
 // Network Interfaces
 $sql_related_interfaces = mysqli_query($mysqli, "
     SELECT 
@@ -262,8 +284,13 @@ ob_start();
                     <?php } ?>
                 </div>
                 <div class="card-body">
+                    <?php if ($asset_tags_display) { ?>
+                        <div>
+                            <?= $asset_tags_display ?>
+                        </div>
+                    <?php } ?>   
                     <?php if ($asset_type) { ?>
-                        <div><i class="fa fa-fw fa-tag text-secondary mr-2"></i><?php echo $asset_type; ?></div>
+                        <div class="mt-1"><i class="fa fa-fw fa-tag text-secondary mr-2"></i><?php echo $asset_type; ?></div>
                     <?php }
                     if ($asset_make) { ?>
                         <div class="mt-2"><i class="fa fa-fw fa-circle text-secondary mr-2"></i><?php echo "$asset_make $asset_model"; ?></div>
@@ -353,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_edit.php

@@ -50,7 +50,14 @@ $sql_asset_history = mysqli_query($mysqli, "SELECT * FROM asset_history
     DESC LIMIT 10"
 );
 
-// Generate the HTML form content using output buffering.
+// Tags
+$asset_tag_id_array = array();
+$sql_asset_tags = mysqli_query($mysqli, "SELECT asset_tag_tag_id FROM asset_tags WHERE asset_tag_asset_id = $asset_id");
+while ($row = mysqli_fetch_array($sql_asset_tags)) {
+    $asset_tag_tag_id = intval($row['asset_tag_tag_id']);
+    $asset_tag_id_array[] = $asset_tag_tag_id;
+}
+
 ob_start();
 ?>
 
@@ -462,6 +469,33 @@ ob_start();
                     <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?= $asset_notes ?></textarea>
                 </div>
 
+                <div class="form-group">
+                    <label>Tags</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
+                        </div>
+                        <select class="form-control select2" name="tags[]" data-placeholder="Add some tags" multiple>
+                            <?php
+
+                            $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 5 ORDER BY tag_name ASC");
+                            while ($row = mysqli_fetch_array($sql_tags_select)) {
+                                $tag_id_select = intval($row['tag_id']);
+                                $tag_name_select = nullable_htmlentities($row['tag_name']);
+                                ?>
+                                <option value="<?= $tag_id_select ?>" <?php if (in_array($tag_id_select, $asset_tag_id_array)) { echo "selected"; } ?>><?php echo $tag_name_select; ?></option>
+                            <?php } ?>
+
+                        </select>
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary ajax-modal" type="button"
+                                data-modal-url="../admin/modals/tag/tag_add.php?type=5">
+                                <i class="fas fa-plus"></i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
                 <p class="text-muted text-right">Asset ID: <?= $asset_id ?></p>
 
             </div>