If login key is set and it is not provided show Client Email instead of just Email for placeholder

.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,7 +2,85 @@
 
 This file documents all notable changes made to ITFlow.
 
-## [25.11] Changelog
+## [25.12.1] Maint Release
+
+### Major Changes
+- Unified the Client/Agent Login and process (Note only Client Users can Reset passwords from the login page, does not apply to agent users).
+
+### Bug Fixes
+- Fix Payment Provider not adding an account.
+- Fix New ticket button in contact details in the related tickets section.
+
+### New Features & Updates
+- You can now Set Payment Provider income/expense account, expense vendor and expense category upond creation or editing.
+- Moved Saved Payment Provider Methods away from admin side nav to the count link within Payment Providers page.
+- Moved AI Models from the admin side nav to the model count link within AI Providers.
+- Add Favicon Reset.
+
+## [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.
@@ -256,7 +334,7 @@ We will provide example code with directory structure for each custom directory
 ---
 
 ### Fixed
-- Several security vulnerabilities patched.
+- Several security vulnerabilities patched (with thanks to www.helx.io).
 - Ticket status is no longer updated when scheduling.
 - Client Portal: Tech contacts can no longer edit their own details.
 - Fixed overlapping logo issue in Invoice/Quote PDF exports.

SECURITY.md

@@ -13,7 +13,7 @@ We operate a rolling release model. Any bug fixes will be released into latest v
 
 | Version | Supported          |
 |---------| ------------------ |
-| 25.05   | :white_check_mark: |
+| 25.12   | :white_check_mark: |
 
 ## Reporting a Vulnerability via GitHub Security Advisories
 

admin/ai_model.php

@@ -12,6 +12,16 @@ $num_rows = mysqli_num_rows($sql);
 
 ?>
 
+<ol class="breadcrumb d-print-none">
+    <li class="breadcrumb-item">
+        <a href="/admin">Admin</a>
+    </li>
+    <li class="breadcrumb-item">
+        <a href="ai_provider.php">AI Providers</a>
+    </li>
+    <li class="breadcrumb-item active">AI Models</li>
+</ol>
+
 <div class="card card-dark">
     <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>

admin/ai_provider.php

@@ -39,7 +39,7 @@ $num_rows = mysqli_num_rows($sql);
                             Key <?php if ($sort == 'ai_provider_api_key') { echo $order_icon; } ?>
                         </a>
                     </th>
-                    <th>
+                    <th class="text-center">
                         <a class="text-dark">Models</a>
                     </th>
                     <th class="text-center">Action</th>
@@ -67,7 +67,8 @@ $num_rows = mysqli_num_rows($sql);
                         </td>
                         <td><?php echo $url; ?></td>
                         <td><?php echo $key; ?></td>
-                        <td><?php echo $ai_model_count; ?></td>
+                        <td class="text-center">
+                            <a class="badge badge-dark badge-pill p-2" href="ai_model.php"><?= $ai_model_count ?></a>
                         <td>
                             <div class="dropdown dropleft text-center">
                                 <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">

admin/database_updates.php

@@ -4059,9 +4059,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
 
           `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,
-
-          `company_id` INT(11) NOT NULL
+          `contract_template_archived_at` DATETIME NULL DEFAULT NULL
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;");
 
 
@@ -4115,10 +4113,31 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.7'");
     }
 
-    // if (CURRENT_DATABASE_VERSION == '2.3.7') {
-    //     // Insert queries here required to update to DB version 2.3.8
+    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.8'");
+    //     mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.9'");
     // }
 
 } else {

admin/debug.php

@@ -52,6 +52,7 @@ $extensions = [
     'php-mbstring' => 'mbstring',
     'php-gd' => 'gd',
     'php-zip' => 'zip',
+    'php-xml' => 'xml',
 ];
 
 foreach ($extensions as $name => $ext) {
@@ -682,7 +683,7 @@ $mysqli->close();
                 </tbody>
             </table>
         </div>
-        
+
 
         <!-- Database Structure Comparison Table -->
         <h3 class="mt-3">Database Structure Comparison</h3>
@@ -765,4 +766,3 @@ $mysqli->close();
 <?php
 
 require_once "../includes/footer.php";
-

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>
@@ -67,31 +69,21 @@
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="/admin/payment_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'payment_provider.php' ? 'active' : ''); ?>">
+                        <a href="/admin/payment_provider.php"
+                           class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['payment_provider.php', 'saved_payment_method.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon far fa-credit-card"></i>
                             <p>Payment Providers</p>
                         </a>
                     </li>
-                    <li class="nav-item">
-                        <a href="/admin/saved_payment_method.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'saved_payment_method.php' ? 'active' : ''); ?>">
-                            <i class="nav-icon far fa-credit-card"></i>
-                            <p>Saved Payments</p>
-                        </a>
-                    </li>
                 <?php } ?>
                     <li class="nav-item">
-                        <a href="/admin/ai_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ai_provider.php' ? 'active' : ''); ?>">
+                        <a href="/admin/ai_provider.php"
+                        class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['ai_provider.php', 'ai_model.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-robot"></i>
                             <p>AI Providers</p>
                         </a>
                     </li>
-                    <li class="nav-item">
-                        <a href="/admin/ai_model.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ai_model.php' ? 'active' : ''); ?>">
-                            <i class="nav-icon fas fa-robot"></i>
-                            <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,12 +102,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_templates.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'contract_templates.php' ? 'active' : ''); ?>">
+                        <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>Contract Templates</p>
+                            <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>
@@ -291,7 +288,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/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

@@ -1,15 +1,18 @@
 <?php
 require_once '../../../includes/modal_header.php';
-ob_start();
+
 
 $contract_types_array = ['Fully Managed', 'Partialy Managed', 'Break/Fix'];
-$update_frequency_array = ['Manual', 'Annually', '2 Year', '3 Year', '5 Year', '7 Year'];
+$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">
@@ -25,37 +28,62 @@ $update_frequency_array = ['Manual', 'Annually', '2 Year', '3 Year', '5 Year', '
         <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>
-                    <input type="text" class="form-control" name="contract_template_name" placeholder="Contract Template Name" maxlength="200" required autofocus>
+                    <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>
-                    <select class="form-control select2" name="contract_template_type" required>
-                        <option value="">- Select Type -</option>
-                        <?php foreach ($contract_types_array as $type) { ?>
-                            <option><?php echo $type; ?></option>
-                        <?php } ?>
-                    </select>
+                    <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>Update Frequency</label>
-                    <select class="form-control select2" name="contract_template_update_frequency">
-                        <option value="">- Select Frequency -</option>
-                        <?php foreach ($update_frequency_array as $freq) { ?>
-                            <option><?php echo $freq; ?></option>
-                        <?php } ?>
-                    </select>
+                    <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>
 
@@ -64,33 +92,63 @@ $update_frequency_array = ['Manual', 'Annually', '2 Year', '3 Year', '5 Year', '
                 <div class="form-row">
                     <div class="form-group col-md-6">
                         <label>Low Priority Response (hrs)</label>
-                        <input type="number" class="form-control" name="sla_low_response_time" placeholder="e.g., 24">
+                        <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>
-                        <input type="number" class="form-control" name="sla_low_resolution_time" placeholder="e.g., 48">
+                        <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>
-                        <input type="number" class="form-control" name="sla_medium_response_time" placeholder="e.g., 12">
+                        <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>
-                        <input type="number" class="form-control" name="sla_medium_resolution_time" placeholder="e.g., 24">
+                        <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>
-                        <input type="number" class="form-control" name="sla_high_response_time" placeholder="e.g., 1">
+                        <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>
-                        <input type="number" class="form-control" name="sla_high_resolution_time" placeholder="e.g., 4">
+                        <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>
@@ -99,29 +157,49 @@ $update_frequency_array = ['Manual', 'Annually', '2 Year', '3 Year', '5 Year', '
             <div class="tab-pane fade" id="rates" role="tabpanel">
                 <div class="form-group">
                     <label>Standard Hourly Rate</label>
-                    <input type="text" class="form-control" name="contract_template_hourly_rate" placeholder="e.g., 100">
+                    <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>
-                    <input type="text" class="form-control" name="contract_template_after_hours_hourly_rate" placeholder="e.g., 150">
+                    <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>
-                    <input type="text" class="form-control" name="contract_template_support_hours" placeholder="e.g., Mon-Fri 9am-5pm">
+                    <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>
-                    <input type="text" class="form-control" name="contract_template_net_terms" placeholder="e.g., Net 30">
+                    <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="contract_template_details" placeholder="Enter Contract Details"></textarea>
+                    <textarea class="form-control tinymce" rows="6" name="details" placeholder="Enter Contract Details"></textarea>
                 </div>
             </div>
 
@@ -129,8 +207,12 @@ $update_frequency_array = ['Manual', 'Annually', '2 Year', '3 Year', '5 Year', '
     </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>
+        <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>
 

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/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

@@ -16,85 +16,182 @@ ob_start();
 
     <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 class="alert alert-info text-center">
+            <h6>Before Adding a Payment Provider!</h6>
+            We recommend you add an <strong>Account</strong> and <strong>Vendor</strong> based off the Provider name before continuing eg <strong>Stripe</strong>
         </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="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>
+        <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-expense">Expense</a>
+            </li>
+        </ul>
 
         <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="tab-content">
 
-        <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 class="tab-pane fade show active" id="pills-details">
+
+                <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>
-                <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 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>
-                <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 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>Income / Expense Account <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>
+                        <select class="form-control select2" name="account" required>
+                            <option value="">- Select an Account -</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT account_id, account_name FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $account_id = intval($row['account_id']);
+                                $account_name = nullable_htmlentities($row['account_name']);
+                                ?>
+                                <option <?php if ($account_name === 'Stripe') { echo "selected"; } ?> value="<?= $account_id ?>"><?= $account_name ?></option>
+
+                                <?php
+                            }
+                            ?>
+                        </select>
+                    </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>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-expense">
+
+                <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>Payment Provider Vendor <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>
+                        <select class="form-control select2" name="expense_vendor" required>
+                            <option value="0">Expense Disabled</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors WHERE vendor_client_id = 0 AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $vendor_id = intval($row['vendor_id']);
+                                $vendor_name = nullable_htmlentities($row['vendor_name']);
+                                ?>
+                                <option <?php if ($vendor_name === 'Stripe') { echo "selected"; } ?> value="<?= $vendor_id ?>"><?= $vendor_name ?></option>
+
+                                <?php
+                            }
+                            ?>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Expense Category <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="expense_category" required>
+                            <option value="">- Select a Category -</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Expense' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $category_id = intval($row['category_id']);
+                                $category_name = nullable_htmlentities($row['category_name']);
+                                ?>
+                                <option <?php if ($category_name === 'Processing Fee') { echo "selected"; } ?> value="<?= $category_id ?>"><?= $category_name ?></option>
+
+                                <?php
+                            }
+                            ?>
+                        </select>
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary ajax-modal" type="button"
+                                data-modal-url="../admin/modals/category/category_add.php?category=Expense">
+                                <i class="fas fa-plus"></i>
+                            </button>
+                        </div>
+                    </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>
     </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>

admin/modals/payment_provider/payment_provider_edit.php

@@ -10,10 +10,10 @@ $row = mysqli_fetch_array($sql);
 $provider_name = nullable_htmlentities($row['payment_provider_name']);
 $public_key = nullable_htmlentities($row['payment_provider_public_key']);
 $private_key = nullable_htmlentities($row['payment_provider_private_key']);
-$account_id = nullable_htmlentities($row['payment_provider_account']);
+$account_id = intval($row['payment_provider_account']);
 $threshold = floatval($row['payment_provider_threshold']);
-$vendor_id = nullable_htmlentities($row['payment_provider_expense_vendor']);
-$category_id = nullable_htmlentities($row['payment_provider_expense_category']);
+$vendor_id = intval($row['payment_provider_expense_vendor']);
+$category_id = intval($row['payment_provider_expense_category']);
 $percent_fee = floatval($row['payment_provider_expense_percentage_fee']) * 100;
 $flat_fee = floatval($row['payment_provider_expense_flat_fee']);
 
@@ -21,80 +21,170 @@ $flat_fee = floatval($row['payment_provider_expense_flat_fee']);
 ob_start();
 ?>
 <div class="modal-header bg-dark">
-    <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Editing: <strong><?php echo $provider_name; ?></strong></h5>
+    <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Editing: <strong><?= $provider_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="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-    <input type="hidden" name="provider_id" value="<?php echo $provider_id; ?>">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <input type="hidden" name="provider_id" value="<?= $provider_id ?>">
 
     <div class="modal-body">
 
-        <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_...)" value="<?php echo $public_key; ?>">
-            </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_...)" value="<?php echo $private_key; ?>">
-            </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" 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>
+        <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-expense">Expense</a>
+            </li>
+        </ul>
 
         <hr>
 
-        <div class="form-group">
-            <div class="custom-control custom-switch">
-                <input type="checkbox" class="custom-control-input" name="enable_expense" <?php if ($vendor_id) { echo "checked";  } ?> value="1" id="enableEditExpenseSwitch">
-                <label class="custom-control-label" for="enableEditExpenseSwitch">Enable Expense</label>
-            </div>
-            <small>(Category: Payment Processing -- Vendor: <?php echo $provider_name; ?></small>
-        </div>
+        <div class="tab-content">
 
-        <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 class="tab-pane fade show active" id="pills-details">
+
+                <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_...)" value="<?= $public_key ?>">
+                    </div>
                 </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">
-            </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 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_...)" value="<?= $private_key ?>">
+                    </div>
                 </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">
-            </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>Income / Expense Account <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>
+                        <select class="form-control select2" name="account" required>
+                            <option value="">- Select an Account -</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT account_id, account_name FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $account_id_select = intval($row['account_id']);
+                                $account_name = nullable_htmlentities($row['account_name']);
+                                ?>
+                                <option <?php if ($account_id === $account_id_select) { echo "selected"; } ?> value="<?= $account_id_select ?>"><?= $account_name ?></option>
+
+                                <?php
+                            }
+                            ?>
+                        </select>
+                    </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" 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>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-expense">
+
+                <div class="form-group">
+                    <label>Payment Provider Vendor <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>
+                        <select class="form-control select2" name="expense_vendor" required>
+                            <option value="0">Expense Disabled</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors WHERE vendor_client_id = 0 AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $vendor_id_select = intval($row['vendor_id']);
+                                $vendor_name = nullable_htmlentities($row['vendor_name']);
+                                ?>
+                                <option <?php if ($vendor_id === $vendor_id_select) { echo "selected"; } ?>
+                                    value="<?= $vendor_id_select ?>"><?= $vendor_name ?>
+                                </option>
+
+                                <?php
+                            }
+                            ?>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Expense Category <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="expense_category" required>
+                            <option value="">- Select a Category -</option>
+                            <?php
+
+                            $sql_category = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Expense' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                            while ($row = mysqli_fetch_array($sql_category)) {
+                                $category_id_select = intval($row['category_id']);
+                                $category_name = nullable_htmlentities($row['category_name']);
+                                ?>
+                                <option <?php if ($category_id === $category_id_select) { echo "selected"; } ?> value="<?= $category_id_select ?>"><?= $category_name ?></option>
+
+                                <?php
+                            }
+                            ?>
+                        </select>
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary ajax-modal" type="button"
+                                data-modal-url="../admin/modals/category/category_add.php?category=Expense">
+                                <i class="fas fa-plus"></i>
+                            </button>
+                        </div>
+                    </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" 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>
+
+                <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" 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>
+            </div>
+        </div>
     </div>
     <div class="modal-footer">
         <button type="submit" name="edit_payment_provider" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>

admin/modals/tag/tag_add.php

@@ -15,6 +15,8 @@ if (isset($_GET['type'])) {
         $type_display = "Contact";
     } elseif ($type === 4) {
         $type_display = "Credential";
+    } elseif ($type === 5) {
+        $type_display = "Asset";
     }
 }
 ob_start();
@@ -58,6 +60,7 @@ ob_start();
                     <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>
@@ -86,7 +89,7 @@ ob_start();
 
     </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/ticket_template/ticket_template_add.php

@@ -1,75 +1,79 @@
-<div class="modal" id="addTicketTemplateModal" tabindex="-1">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <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>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+ob_start();
+
+?>
+<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 class="modal-body">
+        </div>
 
-                    <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>
-                    </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 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>
-                <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</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                <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>
-            </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_export.php

@@ -1,21 +1,26 @@
-<div class="modal" id="exportUserModal" 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-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">
+<?php
 
-                </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>
-        </div>
-    </div>
+require_once '../../../includes/modal_header.php';
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Users to CSV</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <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/payment_provider.php

@@ -6,10 +6,10 @@ $order = "ASC";
 
 require_once "includes/inc_all_admin.php";
 
-$sql = mysqli_query($mysqli, "SELECT * FROM payment_providers 
+$sql = mysqli_query($mysqli, "SELECT * FROM payment_providers
     LEFT JOIN accounts ON payment_provider_account = account_id
     LEFT JOIN vendors ON payment_provider_expense_vendor = vendor_id
-    LEFT JOIN categories ON payment_provider_expense_category = category_id 
+    LEFT JOIN categories ON payment_provider_expense_category = category_id
     ORDER BY $sort $order"
 );
 
@@ -57,7 +57,7 @@ $num_rows = mysqli_num_rows($sql);
                     <th>
                         <a class="text-dark">Expensed Fee</a>
                     </th>
-                    <th>
+                    <th class="text-center">
                         <a class="text-dark">Saved Payment Methods</a>
                     </th>
                     <th class="text-center">Action</th>
@@ -72,7 +72,7 @@ $num_rows = mysqli_num_rows($sql);
                     $provider_description = nullable_htmlentities($row['payment_provider_description']);
                     $account_name = nullable_htmlentities($row['account_name']);
                     $threshold = floatval($row['payment_provider_threshold']);
-                    $vendor_name = nullable_htmlentities($row['vendor_name']);
+                    $vendor_name = nullable_htmlentities($row['vendor_name'] ?? "Expense Disabled");
                     $category = nullable_htmlentities($row['category_name']);
                     $percent_fee = floatval($row['payment_provider_expense_percentage_fee']) * 100;
                     $flat_fee = floatval($row['payment_provider_expense_flat_fee']);
@@ -94,7 +94,9 @@ $num_rows = mysqli_num_rows($sql);
                         <td><?php echo $vendor_name; ?></td>
                         <td><?php echo $category; ?></td>
                         <td><?php echo $percent_fee; ?>% + <?php echo numfmt_format_currency($currency_format, $flat_fee, $session_company_currency); ?></td>
-                        <td><?php echo $saved_payment_count; ?></td>
+                        <td class="text-center">
+                            <a class="badge badge-dark badge-pill p-2" href="saved_payment_method.php"><?= $saved_payment_count ?></a>
+                        </td>
                         <td>
                             <div class="dropdown dropleft text-center">
                                 <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
@@ -106,12 +108,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'] ?><!--">-->
-<!--                                        <i class="fas fa-fw fa-thumbs-down mr-2"></i>Disable-->
-<!--                                    </a>-->
-<!--                                    <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'] ?><!--">-->
-<!--                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete-->
-<!--                                    </a>-->
+                                    <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-trash mr-2"></i><strong>Delete Provider and</strong>
+                                        <ul class="text-xs">
+                                            <li>Related Recurring Payments</li>
+                                            <li>Related Saved cards</li>
+                                            <li>Client Provider Relations</li>
+                                        </ul>
+                                    </a>
                                 </div>
                             </div>
                         </td>

admin/post/ai_model.php

@@ -49,7 +49,7 @@ if (isset($_POST['edit_ai_model'])) {
 if (isset($_GET['delete_ai_model'])) {
 
     validateCSRFToken($_GET['csrf_token']);
-    
+
     $model_id = intval($_GET['delete_ai_model']);
 
     $model_name = sanitizeInput(getFieldById('ai_models', $model_id, 'ai_model_name'));

admin/post/contract_template.php

@@ -9,11 +9,12 @@ defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
 if (isset($_POST['add_contract_template'])) {
 
     // Sanitize text inputs
-    $name = sanitizeInput($_POST['contract_template_name']);
-    $type = sanitizeInput($_POST['contract_template_type']);
-    $update_frequency = sanitizeInput($_POST['contract_template_update_frequency']);
-    $support_hours = sanitizeInput($_POST['contract_template_support_hours']);
-    $details = mysql_escape_string($mysqli, $_POST['contract_template_details']);
+    $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']);
@@ -22,9 +23,9 @@ if (isset($_POST['add_contract_template'])) {
     $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']);
-    $hourly_rate = intval($_POST['contract_template_hourly_rate']);
-    $after_hours_rate = intval($_POST['contract_template_after_hours_hourly_rate']);
-    $net_terms = intval($_POST['contract_template_net_terms']);
+    $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, "
@@ -33,19 +34,17 @@ if (isset($_POST['add_contract_template'])) {
         contract_template_description = '$description',
         contract_template_details = '$details',
         contract_template_type = '$type',
-        contract_template_update_frequency = '$update_frequency',
-        sla_low_response_time = $sla_low_resp,
-        sla_medium_response_time = $sla_med_resp,
-        sla_high_response_time = $sla_high_resp,
-        sla_low_resolution_time = $sla_low_res,
-        sla_medium_resolution_time = $sla_med_res,
-        sla_high_resolution_time = $sla_high_res,
-        contract_template_hourly_rate = $hourly_rate,
-        contract_template_after_hours_hourly_rate = $after_hours_rate,
+        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_created_by = $session_user_id,
-        contract_template_created_at = NOW()
+        contract_template_net_terms = $net_terms
     ");
 
     $contract_template_id = mysqli_insert_id($mysqli);
@@ -60,4 +59,99 @@ if (isset($_POST['add_contract_template'])) {
     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']);
-    $description = sanitizeInput($_POST['description']);
+    $name = cleanInput($_POST['name']);
+    $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']);
-    $description = sanitizeInput($_POST['description']);
+    $name = cleanInput($_POST['name']);
+    $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

@@ -14,53 +14,20 @@ if (isset($_POST['add_payment_provider'])) {
     $public_key = sanitizeInput($_POST['public_key']);
     $private_key = sanitizeInput($_POST['private_key']);
     $threshold = floatval($_POST['threshold']);
-    $enable_expense = intval($_POST['enable_expense'] ?? 0);
+    $account = intval($_POST['account']);
+    $expense_vendor = intval($_POST['expense_vendor']) ?? 0;
+    $expense_category = intval($_POST['expense_category']) ?? 0;
     $percentage_fee = floatval($_POST['percentage_fee']) / 100 ?? 0;
     $flat_fee = floatval($_POST['flat_fee']) ?? 0;
 
     // Check to ensure provider isn't added twice
-    $sql = "SELECT 1 FROM payment_providers WHERE payment_provider_name = '$provider' LIMIT 1";
-    $result = mysqli_query($mysqli, $sql);
-    if (mysqli_num_rows($result) > 0) {
+    $sql = mysqli_query($mysqli, "SELECT 1 FROM payment_providers WHERE payment_provider_name = '$provider' LIMIT 1");
+    if (mysqli_num_rows($sql) > 0) {
         flash_alert("Payment Provider <strong>$provider</strong> already exists", 'error');
         redirect();
     }
 
-    // Check for Stripe Account, if not create it
-    $sql_account = mysqli_query($mysqli,"SELECT account_id FROM accounts WHERE account_name = '$provider' AND account_archived_at IS NULL LIMIT 1");
-    if (mysqli_num_rows($sql_account) == 0) {
-        $account_id = mysqli_insert_id($mysqli);
-    } else {
-        $row = mysqli_fetch_array($sql_account);
-        $account_id = intval($row['account_id']);
-    }
-
-    // Expense defaults
-    $category_id = 0;
-    $vendor_id = 0;
-
-    if ($enable_expense) {
-        // Category
-        $sql_category = mysqli_query($mysqli,"SELECT category_id FROM categories WHERE category_name = 'Payment Processing' AND category_type = 'Expense' AND category_archived_at IS NULL LIMIT 1");
-        if (mysqli_num_rows($sql_category) == 0) {
-            mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Processing Fee', category_type = 'Payment Processing', category_color = 'gray'");
-            $category_id = mysqli_insert_id($mysqli);
-        } else {
-            $row = mysqli_fetch_array($sql_category);
-            $category_id = intval($row['category_id']);
-        }
-        // Vendor
-        $sql_vendor = mysqli_query($mysqli,"SELECT vendor_id FROM vendors WHERE vendor_name = '$provider' AND vendor_client_id = 0 AND vendor_archived_at IS NULL LIMIT 1");
-        if (mysqli_num_rows($sql_vendor) == 0) {
-            mysqli_query($mysqli,"INSERT INTO vendors SET vendor_name = '$provider', vendor_description = 'Payment Processor Provider', vendor_client_id = 0");
-            $vendor_id = mysqli_insert_id($mysqli);
-        } else {
-            $row = mysqli_fetch_array($sql_vendor);
-            $vendor_id = intval($row['vendor_id']);
-        }
-    }
-
-    mysqli_query($mysqli,"INSERT INTO payment_providers SET payment_provider_name = '$provider', payment_provider_public_key = '$public_key', payment_provider_private_key = '$private_key', payment_provider_threshold = $threshold, payment_provider_account = $account_id, payment_provider_expense_vendor = $vendor_id, payment_provider_expense_category = $category_id, payment_provider_expense_percentage_fee = $percentage_fee, payment_provider_expense_flat_fee = $flat_fee");
+    mysqli_query($mysqli,"INSERT INTO payment_providers SET payment_provider_name = '$provider', payment_provider_public_key = '$public_key', payment_provider_private_key = '$private_key', payment_provider_threshold = $threshold, payment_provider_account = $account, payment_provider_expense_vendor = $expense_vendor, payment_provider_expense_category = $expense_category, payment_provider_expense_percentage_fee = $percentage_fee, payment_provider_expense_flat_fee = $flat_fee");
 
     $provider_id = mysqli_insert_id($mysqli);
 
@@ -81,11 +48,13 @@ if (isset($_POST['edit_payment_provider'])) {
     $public_key = sanitizeInput($_POST['public_key']);
     $private_key = sanitizeInput($_POST['private_key']);
     $threshold = floatval($_POST['threshold']);
-    $enable_expense = intval($_POST['enable_expense'] ?? 0);
+    $account = intval($_POST['account']);
+    $expense_vendor = intval($_POST['expense_vendor']) ?? 0;
+    $expense_category = intval($_POST['expense_category']) ?? 0;
     $percentage_fee = floatval($_POST['percentage_fee']) / 100;
     $flat_fee = floatval($_POST['flat_fee']);
 
-    mysqli_query($mysqli,"UPDATE payment_providers SET payment_provider_public_key = '$public_key', payment_provider_private_key = '$private_key', payment_provider_threshold = $threshold, payment_provider_expense_percentage_fee = $percentage_fee, payment_provider_expense_flat_fee = $flat_fee WHERE payment_provider_id = $provider_id");
+    mysqli_query($mysqli,"UPDATE payment_providers SET payment_provider_public_key = '$public_key', payment_provider_private_key = '$private_key', payment_provider_threshold = $threshold, payment_provider_account = $account, payment_provider_expense_vendor = $expense_vendor, payment_provider_expense_category = $expense_category, payment_provider_expense_percentage_fee = $percentage_fee, payment_provider_expense_flat_fee = $flat_fee WHERE payment_provider_id = $provider_id");
 
     logAction("Payment Provider", "Edit", "$session_name edited Payment Provider $provider");
 
@@ -98,9 +67,14 @@ if (isset($_POST['edit_payment_provider'])) {
 if (isset($_GET['delete_payment_provider'])) {
 
     validateCSRFToken($_GET['csrf_token']);
-    
+
     $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
-    $hostname = "{" . $config_imap_host . ":" . $config_imap_port . "/" . $config_imap_encryption . "/novalidate-cert}INBOX";
-    $username = $config_imap_username;
-    $password = $config_imap_password;
+    $host       = $config_imap_host;
+    $port       = (int) $config_imap_port;
+    $encryption = strtolower(trim($config_imap_encryption)); // e.g. "ssl", "tls", "none"
+    $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) {
-            imap_close($inbox);
+        // 10-second timeout, adjust as needed
+        $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/settings_theme.php

@@ -49,3 +49,17 @@ if (isset($_POST['edit_favicon_settings'])) {
     redirect();
 
 }
+
+if (isset($_GET['reset_favicon'])) {
+
+    if (file_exists("../uploads/favicon.ico")) {
+        unlink("../uploads/favicon.ico");
+    }
+
+    logAction("Settings", "Edit", "$session_name reset Favicon");
+
+    flash_alert("Favicon reset", '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/saved_payment_method.php

@@ -13,18 +13,18 @@ $sql = mysqli_query($mysqli, "
         clients.client_name,
         client_payment_provider.payment_provider_client
     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
-    LEFT JOIN clients 
+    LEFT JOIN clients
         ON client_saved_payment_methods.saved_payment_client_id = clients.client_id
     LEFT JOIN client_payment_provider
         ON client_payment_provider.client_id = client_saved_payment_methods.saved_payment_client_id
         AND client_payment_provider.payment_provider_id = client_saved_payment_methods.saved_payment_provider_id
-    WHERE 
-        client_name LIKE '%$q%' 
-        OR payment_provider_name LIKE '%$q%' 
-        OR saved_payment_description LIKE '%$q%' 
-        OR payment_provider_client LIKE '%$q%' 
+    WHERE
+        client_name LIKE '%$q%'
+        OR payment_provider_name LIKE '%$q%'
+        OR saved_payment_description LIKE '%$q%'
+        OR payment_provider_client LIKE '%$q%'
         OR saved_payment_provider_method LIKE '%$q%'
     ORDER BY $sort $order
 ");
@@ -33,6 +33,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
+<ol class="breadcrumb d-print-none">
+    <li class="breadcrumb-item">
+        <a href="/admin">Admin</a>
+    </li>
+    <li class="breadcrumb-item">
+        <a href="payment_provider.php">Payment Providers</a>
+    </li>
+    <li class="breadcrumb-item active">Saved Payment Methods (Stripe)</li>
+</ol>
+
 <div class="card card-dark">
     <div class="card-header">
         <h3 class="card-title"><i class="fas fa-fw fa-credit-card mr-2"></i>Saved Payment Methods</h3>
@@ -107,8 +117,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                     ?>
                     <tr>
-                        <td><?php echo $client_name; ?> (<?php echo $client_id; ?>)</td>
-                        <td><?php echo $provider_name; ?> (<?php echo $provider_id; ?>)</td>
+                        <td>
+                            <?= $client_name ?>
+                            <br>
+                            <small class="text-secondary">ID: <?= $client_id ?></small>
+                        </td>
+                        <td>
+                            <?= $provider_name ?>
+                            <br>
+                            <small class="text-secondary">ID: <?= $provider_id ?></small>
+                        </td>
                         <td><?php echo $saved_payment_description; ?></td>
                         <td><?php echo $provider_client; ?></td>
                         <td><?php echo $provider_payment_method; ?></td>

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

@@ -57,11 +57,12 @@ require_once "includes/inc_all_admin.php";
                 <hr>
 
                 <button type="submit" name="edit_favicon_settings" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Upload Icon</button>
-
+                <?php if(file_exists("../uploads/favicon.ico")) { ?>
+                <a href="post.php?reset_favicon" class="btn btn-outline-danger"><i class="fas fa-redo-alt mr-2"></i>Reset Favicon</a>
+                <?php } ?>
             </form>
         </div>
     </div>
 
 <?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/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/users.php

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

admin/vendor_template.php

@@ -140,7 +140,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     </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; ?>">
+                                        <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 } ?>

agent/ajax.php

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

agent/asset_details.php

@@ -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 contacts ON asset_contact_id = contact_id 
+        LEFT JOIN clients ON client_id = asset_client_id
+        LEFT JOIN contacts ON asset_contact_id = contact_id
         LEFT JOIN locations ON asset_location_id = location_id
         LEFT JOIN 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 
-            AND document_archived_at IS NULL 
+            WHERE asset_documents.asset_id = $asset_id
+            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 
-            LEFT JOIN software ON software_assets.software_id = software.software_id 
+            "SELECT * FROM software_assets
+            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>
@@ -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>

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 locations ON asset_location_id = location_id 
+        LEFT JOIN contacts ON asset_contact_id = contact_id
+        LEFT JOIN locations ON asset_location_id = location_id
         LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1
+        LEFT JOIN asset_tags ON asset_tag_asset_id = asset_id
+        LEFT JOIN tags ON tag_id = asset_tag_tag_id
         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 locations ON asset_location_id = location_id 
+    LEFT JOIN contacts ON asset_contact_id = contact_id
+    LEFT JOIN locations ON asset_location_id = location_id
     LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1
+    LEFT JOIN asset_tags ON asset_tag_asset_id = asset_id
+    LEFT JOIN tags ON tag_id = asset_tag_tag_id
     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"; } ?>">
@@ -314,7 +357,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     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 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">
@@ -415,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; } ?>
@@ -557,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 = "-";
                         }
@@ -576,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><small class="text-secondary"><?php echo $asset_description; ?></small></div>
+                                            <div><?= $asset_name ?></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>
@@ -713,8 +791,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/asset/asset_export.php";
-if ($client_url) {
-    require_once "modals/asset/asset_import.php";
-}
 require_once "../includes/footer.php";

agent/certificates.php

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

agent/clients.php

@@ -92,11 +92,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </button>
                     <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                     <div class="dropdown-menu">
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importClientModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#"
+                            data-modal-url="modals/client/client_import.php">
                             <i class="fa fa-fw fa-upload mr-2"></i>Import
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportClientModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#"
+                            data-modal-url="modals/client/client_export.php">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     </div>
@@ -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,38 +139,38 @@ $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 ajax-modal" href="#" 
+                                   <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 ajax-modal" href="#" 
+                                    <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 ajax-modal" href="#" 
+                                    <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 ajax-modal" href="#" 
+                                    <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 ajax-modal" href="#" 
+                                    <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 ajax-modal" href="#" 
+                                    <a class="dropdown-item ajax-modal" href="#"
                                         data-modal-url="modals/client/client_bulk_email.php"
                                         data-modal-size="lg"
                                         data-bulk="true">
@@ -193,15 +195,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </div>
                 </div>
             </div>
-            <div 
-                class="collapse 
-                    <?php 
+            <div
+                class="collapse
+                    <?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"
@@ -220,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
@@ -281,7 +283,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             </div>
         </form>
     </div>
-    
+
     <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">
@@ -364,11 +366,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     }
 
                     // Counts
-                    
+
                     // Contact Count
                     $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL"));
                     $contact_count = $row['num'];
-                    if ($contact_count) { 
+                    if ($contact_count) {
                         $contact_count_display = "<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 = '';
@@ -377,34 +379,34 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     // Vendors Count
                     $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_client_id = $client_id AND vendor_archived_at IS NULL"));
                     $vendor_count = $row['num'];
-                    if ($vendor_count) { 
+                    if ($vendor_count) {
                         $vendor_count_display = "<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 = '';
@@ -413,7 +415,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     // Ticket Count
                     $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_client_id = $client_id AND ticket_archived_at IS NULL"));
                     $ticket_count = $row['num'];
-                    if ($ticket_count) { 
+                    if ($ticket_count) {
                         $ticket_count_display = "<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 = '';
@@ -518,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 {
@@ -617,12 +619,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </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

@@ -14,7 +14,7 @@ if (isset($_GET['client_id'])) {
 if (isset($_GET['contact_id'])) {
     $contact_id = intval($_GET['contact_id']);
 
-    $sql = mysqli_query($mysqli, "SELECT * FROM contacts 
+    $sql = mysqli_query($mysqli, "SELECT * FROM contacts
         LEFT JOIN clients ON client_id = contact_client_id
         LEFT JOIN locations ON location_id = contact_location_id
         LEFT JOIN users ON user_id = contact_user_id
@@ -64,12 +64,19 @@ 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
     $sql_linked_software = mysqli_query($mysqli, "SELECT * FROM software_contacts, software
-        WHERE software_contacts.contact_id = $contact_id 
+        WHERE software_contacts.contact_id = $contact_id
         AND software_contacts.software_id = software.software_id
         AND software_archived_at IS NULL
         ORDER BY software_name ASC"
@@ -90,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);
 
@@ -102,7 +109,7 @@ if (isset($_GET['contact_id'])) {
     $ticket_count = mysqli_num_rows($sql_related_tickets);
 
     // Related Recurring Tickets Query
-    $sql_related_recurring_tickets = mysqli_query($mysqli, "SELECT * FROM recurring_tickets 
+    $sql_related_recurring_tickets = mysqli_query($mysqli, "SELECT * FROM recurring_tickets
         WHERE recurring_ticket_contact_id = $contact_id
         ORDER BY recurring_ticket_next_run DESC"
     );
@@ -137,7 +144,7 @@ if (isset($_GET['contact_id'])) {
 
      // Linked Services
     $sql_linked_services = mysqli_query($mysqli, "SELECT * FROM service_contacts, services
-        WHERE service_contacts.contact_id = $contact_id 
+        WHERE service_contacts.contact_id = $contact_id
         AND service_contacts.service_id = services.service_id
         ORDER BY service_name ASC"
     );
@@ -148,7 +155,7 @@ if (isset($_GET['contact_id'])) {
     // Linked Documents
     $sql_linked_documents = mysqli_query($mysqli, "SELECT * FROM contact_documents, documents
         LEFT JOIN users ON document_created_by = user_id
-        WHERE contact_documents.contact_id = $contact_id 
+        WHERE contact_documents.contact_id = $contact_id
         AND contact_documents.document_id = documents.document_id
         AND document_archived_at IS NULL
         ORDER BY document_name ASC"
@@ -159,7 +166,7 @@ if (isset($_GET['contact_id'])) {
 
     // Linked Files
     $sql_linked_files = mysqli_query($mysqli, "SELECT * FROM contact_files, files
-        WHERE contact_files.contact_id = $contact_id 
+        WHERE contact_files.contact_id = $contact_id
         AND contact_files.file_id = files.file_id
         AND file_archived_at IS NULL
         ORDER BY file_name ASC"
@@ -401,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>
@@ -413,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>
@@ -438,8 +473,8 @@ if (isset($_GET['contact_id'])) {
                                                     <i class="fas fa-fw fa-copy mr-2"></i>Copy
                                                 </a>
                                                 <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item" 
-                                                    href="post.php?unlink_asset_from_contact&contact_id=<?php echo $contact_id; ?>&asset_id=<?php echo $asset_id; ?>" 
+                                                <a class="dropdown-item"
+                                                    href="post.php?unlink_asset_from_contact&contact_id=<?php echo $contact_id; ?>&asset_id=<?php echo $asset_id; ?>"
                                                     class="btn btn-secondary btn-sm" title="Unlink">
                                                     <i class="fas fa-fw fa-unlink mr-2"></i>Unlink
                                                 </a>
@@ -578,8 +613,8 @@ if (isset($_GET['contact_id'])) {
                                                     <i class="fas fa-fw fa-share-alt mr-2"></i>Share
                                                 </a>
                                                 <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item" 
-                                                    href="post.php?unlink_credential_from_contact&contact_id=<?php echo $contact_id; ?>&credential_id=<?php echo $credential_id; ?>" 
+                                                <a class="dropdown-item"
+                                                    href="post.php?unlink_credential_from_contact&contact_id=<?php echo $contact_id; ?>&credential_id=<?php echo $credential_id; ?>"
                                                     class="btn btn-secondary btn-sm" title="Unlink">
                                                     <i class="fas fa-fw fa-unlink mr-2"></i>Unlink
                                                 </a>
@@ -762,7 +797,9 @@ if (isset($_GET['contact_id'])) {
                 <div class="card-header py-2">
                     <h3 class="card-title mt-2"><i class="fa fa-fw fa-life-ring mr-2"></i>Related Tickets</h3>
                     <div class="card-tools">
-                        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketModal">
+                        <button type="button" class="btn btn-primary ajax-modal"
+                            data-modal-url="modals/ticket/ticket_add.php?<?= $client_url ?>&contact_id=<?= $contact_id ?>"
+                            data-modal-size="lg">
                             <i class="fas fa-plus mr-2"></i>New Ticket
                         </button>
                     </div>
@@ -1036,7 +1073,7 @@ if (isset($_GET['contact_id'])) {
                     </div>
                 </div>
             </div>
-                
+
             <div class="card card-dark <?php if ($note_count == 0) { echo "d-none"; } ?>">
                 <div class="card-header py-2">
                     <h3 class="card-title mt-2"><i class="fa fa-fw fa-sticky-note mr-2"></i>Notes</h3>

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,7 +221,7 @@ $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 ajax-modal" href="#"
                                     data-modal-url="modals/contact/contact_bulk_assign_location.php?<?= $client_url ?>"
                                     data-bulk="true">
@@ -397,7 +399,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         $contact_user_id = intval($row['contact_user_id']);
                         if ($contact_user_id) {
                             $user_exists_display = "<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 = "";
                         }
 
@@ -406,25 +408,25 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         // Asset Count
                         $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_contact_id = $contact_id AND asset_archived_at IS NULL"));
                         $asset_count = $row['num'];
-                        if ($asset_count) { 
+                        if ($asset_count) {
                             $asset_count_display = "<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 = '';
@@ -433,7 +435,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         // Ticket Count
                         $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_contact_id = $contact_id AND ticket_archived_at IS NULL"));
                         $ticket_count = $row['num'];
-                        if ($ticket_count) { 
+                        if ($ticket_count) {
                             $ticket_count_display = "<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 = '';
@@ -491,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>
@@ -566,10 +568,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-
-require_once "modals/contact/contact_export.php";
-if ($client_url) {
-    //require_once "modals/contact/contact_invite.php";
-    require_once "modals/contact/contact_import.php";
-}
 require_once "../includes/footer.php";

agent/credentials.php

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

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

agent/documents.php

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

agent/domains.php

@@ -71,302 +71,297 @@ $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-globe mr-2"></i>Domains</h3>
-            <div class="card-tools">
-                <div class="btn-group">
-                    <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) { ?>
-                        <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
-                        <div class="dropdown-menu">
-                            <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportDomainModal">
-                                <i class="fa fa-fw fa-download mr-2"></i>Export
-                            </a>
-                        </div>
-                    <?php } ?>
-                </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; ?>">
+<div class="card card-dark">
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-globe mr-2"></i>Domains</h3>
+        <div class="card-tools">
+            <div class="btn-group">
+                <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) { ?>
+                    <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/domain/domain_export.php?<?= $client_url ?>">
+                            <i class="fa fa-fw fa-download mr-2"></i>Export
+                        </a>
+                    </div>
                 <?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>
 
-<?php
-require_once "modals/domain/domain_export.php";
-?>
+    <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>
+                                <?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

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

agent/files_legacy.php

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

agent/includes/client_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,8 +29,8 @@ 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 contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1
+        LEFT JOIN locations ON client_id = location_client_id AND location_primary = 1
+        LEFT JOIN contacts ON client_id = contact_client_id AND contact_primary = 1
         WHERE client_id = $client_id"
     );
 

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

agent/invoices.php

@@ -162,10 +162,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <h3 class="card-title mt-2"><i class="fa fa-fw fa-file-invoice mr-2"></i>Invoices</h3>
         <div class="card-tools">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/invoice/invoice_add.php?<?= $client_url ?>"><i class="fas fa-plus mr-2"></i>New Invoice</button>
+                <button type="button" class="btn btn-primary ajax-modal"
+                    data-modal-url="modals/invoice/invoice_add.php?<?= $client_url ?>">
+                    <i class="fas fa-plus mr-2"></i>New Invoice
+                </button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
-                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportInvoicesModal">
+                    <a class="dropdown-item text-dark ajax-modal" href="#"
+                         data-modal-url="modals/invoice/invoice_export.php?<?= $client_url ?>">
                         <i class="fa fa-fw fa-download mr-2"></i>Export
                     </a>
                 </div>
@@ -217,7 +221,7 @@ $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 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
@@ -344,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) {
@@ -356,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>
@@ -395,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) { ?>
-                                                <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']; ?>">
-                                                    <i class="fa fa-fw fa-credit-card mr-2"></i>Pay via saved card
-                                                </a>
+                                            <?php if (mysqli_num_rows($sql_saved_payment_methods) > 0 && ($invoice_status === 'Sent' || $invoice_status === 'Viewed')) { ?>
+                                                <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 class="dropdown-divider"></div>
                                             <?php } ?>
                                         <?php } ?>
@@ -448,5 +457,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/invoice/invoice_export.php";
 require_once "../includes/footer.php";

agent/locations.php

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

agent/modals/account/account_add.php

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

agent/modals/asset/asset_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

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []);
 
-$count = count($selected_ids);
+$count = count($asset_ids);
 
 ob_start();
 
@@ -19,7 +19,7 @@ ob_start();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $id ?>"><?php } ?>
+    <?php foreach ($asset_ids as $asset_id) { ?><input type="hidden" name="asset_ids[]" value="<?= $asset_id ?>"><?php } ?>
 
     <div class="modal-body">
 
@@ -38,7 +38,7 @@ ob_start();
         </div>
 
         <div class="row">
-                        
+
             <div class="col">
                 <div class="form-group">
                     <label>Priority <strong class="text-danger">*</strong></label>

agent/modals/asset/asset_bulk_assign_contact.php

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

agent/modals/asset/asset_bulk_assign_location.php

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

agent/modals/asset/asset_bulk_assign_physical_location.php

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

agent/modals/asset/asset_bulk_assign_tags.php

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

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

agent/modals/asset/asset_bulk_transfer_client.php

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

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>

agent/modals/asset/asset_export.php

@@ -1,26 +1,31 @@
-<div class="modal" id="exportAssetModal" 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-download mr-2"></i>Export Assets 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">
-                <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 } ?>
+<?php
 
-                <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="export_assets_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>
-        </div>
-    </div>
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Assets to CSV</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
+
+    <div class="modal-body">
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="export_assets_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';

agent/modals/asset/asset_import.php

@@ -1,32 +1,37 @@
-<div class="modal" id="importAssetModal" 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-desktop mr-2"></i>Import Assets</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'] ?>">
-                
-                <?php if ($client_url) { ?>
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <?php } ?>
-                <div class="modal-body">
-                    <p><strong>Format csv file with headings & data:</strong><br>Name, Description, Type, Make, Model, Serial, OS, Purchase Date, Assigned To, Location, Physical Location, Notes</p>
-                    <hr>
-                    <div class="form-group my-4">
-                        <input type="file" class="form-control-file" name="file" accept=".csv" required>
-                    </div>
-                    <hr>
-                    <div>Download <a href="post.php?download_assets_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
-                    <small class="text-muted">Note: Purchase date must be in the format YYYY-MM-DD. Spreadsheet tools may automatically reformat dates.</small>
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="import_assets_csv" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Import</button>
-                </div>
-            </form>
-        </div>
-    </div>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-desktop mr-2"></i>Import Assets</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
+
+    <div class="modal-body">
+        <p><strong>Format csv file with headings & data:</strong><br>Name, Description, Type, Make, Model, Serial, OS, Purchase Date, Assigned To, Location, Physical Location, Notes</p>
+        <hr>
+        <div class="form-group my-4">
+            <input type="file" class="form-control-file" name="file" accept=".csv" required>
+        </div>
+        <hr>
+        <div>Download <a href="post.php?download_assets_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
+        <small class="text-muted">Note: Purchase date must be in the format YYYY-MM-DD. Spreadsheet tools may automatically reformat dates.</small>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="import_assets_csv" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Import</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/asset/asset_interface_add.php

@@ -78,11 +78,11 @@ ob_start();
                         <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" 
+                        <input
+                            type="text"
+                            class="form-control"
                             name="description"
-                            placeholder="Short Description" 
+                            placeholder="Short Description"
                             maxlength="200"
                         >
                     </div>

agent/modals/asset/asset_interface_bulk_edit_network.php

@@ -1,51 +1,65 @@
-<div class="modal" id="bulkAssignNetworkModal" 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-network-wired mr-2"></i>Bulk Assign Network</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                <!-- Network -->
-                <div class="form-group">
-                    <label>Network</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_network">
-                            <option value="">- Select a Network -</option>
-                            <?php
-                            $sql_network_select = mysqli_query($mysqli, "
-                                SELECT network_id, network_name, network
-                                FROM networks
-                                WHERE network_archived_at IS NULL
-                                  AND network_client_id = $client_id
-                                ORDER BY network_name ASC
-                            ");
-                            while ($net_row = mysqli_fetch_array($sql_network_select)) {
-                                $network_id_select   = intval($net_row['network_id']);
-                                $network_name_select = nullable_htmlentities($net_row['network_name']);
-                                $network_select = nullable_htmlentities($net_row['network']);
-                                ?>
-                                <option value="<?php echo $network_id_select; ?>"><?php echo "$network_name_select - $network_select"; ?></option>
-                            <?php
-                            }
-                            ?>
-                        </select>
-                    </div>
+$client_id = intval($_GET['client_id'] ?? 0);
+$interface_ids = array_map('intval', $_GET['interface_ids'] ?? []);
+
+$count = count($interface_ids);
+
+ob_start();
+
+?>
+
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($interface_ids as $interface_id) { ?><input type="hidden" name="interface_ids[]" value="<?= $interface_id ?>"><?php } ?>
+    <div class="modal-header bg-dark">
+        <h5 class="modal-title"><i class="fa fa-fw fa-network-wired mr-2"></i>Bulk Assign Network</h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+            <span>&times;</span>
+        </button>
+    </div>
+
+    <div class="modal-body">
+
+        <!-- Network -->
+        <div class="form-group">
+            <label>Network</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
                 </div>
-
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_edit_asset_interface_network" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                <select class="form-control select2" name="bulk_network">
+                    <option value="">- Select a Network -</option>
+                    <?php
+                    $sql_network_select = mysqli_query($mysqli, "
+                        SELECT network_id, network_name, network
+                        FROM networks
+                        WHERE network_archived_at IS NULL
+                            AND network_client_id = $client_id
+                        ORDER BY network_name ASC
+                    ");
+                    while ($net_row = mysqli_fetch_array($sql_network_select)) {
+                        $network_id_select   = intval($net_row['network_id']);
+                        $network_name_select = nullable_htmlentities($net_row['network_name']);
+                        $network_select = nullable_htmlentities($net_row['network']);
+                        ?>
+                        <option value="<?php echo $network_id_select; ?>"><?php echo "$network_name_select - $network_select"; ?></option>
+                    <?php
+                    }
+                    ?>
+                </select>
             </div>
         </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_asset_interface_network" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/asset/asset_interface_bulk_edit_type.php

@@ -1,36 +1,51 @@
-<div class="modal" id="bulkSetInterfaceTypeModal" 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-ethernet mr-2"></i>Bulk Set Interface Type</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group">
-                    <label>Interface Type</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_type">
-                            <option value="">- Select a Type -</option>
-                            <?php foreach($interface_types_array as $interface_type_select) { ?>
-                                <option><?php echo $interface_type_select; ?></option>
-                            <?php } ?>
-                        </select>
-                    </div>
+$client_id = intval($_GET['client_id'] ?? 0);
+$interface_ids = array_map('intval', $_GET['interface_ids'] ?? []);
+
+$count = count($interface_ids);
+
+ob_start();
+
+?>
+
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($interface_ids as $interface_id) { ?><input type="hidden" name="interface_ids[]" value="<?= $interface_id ?>"><?php } ?>
+
+    <div class="modal-header bg-dark">
+        <h5 class="modal-title"><i class="fa fa-fw fa-ethernet mr-2"></i>Bulk Set Interface Type</h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+            <span>&times;</span>
+        </button>
+    </div>
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Interface Type</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                 </div>
-
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_edit_asset_interface_type" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                <select class="form-control select2" name="bulk_type">
+                    <option value="">- Select a Type -</option>
+                    <?php foreach($interface_types_array as $interface_type_select) { ?>
+                        <option><?php echo $interface_type_select; ?></option>
+                    <?php } ?>
+                </select>
             </div>
         </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_asset_interface_type" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/asset/asset_link_document.php

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

agent/modals/asset/asset_link_file.php

@@ -48,7 +48,7 @@ ob_start();
                         AND asset_files.asset_id IS NULL
                         ORDER BY folders.folder_name ASC, files.file_name ASC
                     ");
-                    
+
                     while ($row = mysqli_fetch_array($sql_files_select)) {
                         $file_id = intval($row['file_id']);
                         $file_name = nullable_htmlentities($row['file_name']);
@@ -70,4 +70,3 @@ ob_start();
 
 <?php
 require_once '../../../includes/modal_footer.php';
-?>

agent/modals/certificate/certificate_export.php

@@ -1,24 +1,29 @@
-<div class="modal" id="exportCertificateModal" 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-download mr-2"></i>Export Certificates 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">
-                <?php if ($client_url) { ?>
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <?php } ?>
-                <div class="modal-body">
+<?php
 
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="export_certificates_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>
-        </div>
-    </div>
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Certificates to CSV</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
+    <div class="modal-body">
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="export_certificates_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';

agent/modals/client/client_add.php

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

agent/modals/client/client_bulk_add_ticket.php

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

agent/modals/client/client_bulk_assign_tags.php

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

agent/modals/client/client_bulk_edit_hourly_rate.php

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

agent/modals/client/client_bulk_edit_industry.php

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

agent/modals/client/client_bulk_edit_referral.php

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

agent/modals/client/client_bulk_email.php

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

agent/modals/client/client_credit_add.php

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

agent/modals/client/client_edit.php

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

agent/modals/client/client_export.php

@@ -1,20 +1,25 @@
-<div class="modal" id="exportClientModal" 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-download mr-2"></i>Export Clients 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_clients_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>
-        </div>
-    </div>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Clients to CSV</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <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_clients_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';

agent/modals/client/client_import.php

@@ -1,28 +1,32 @@
-<div class="modal" id="importClientModal" 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-users mr-2"></i>Import Clients</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">
-                <div class="modal-body">
-                    <p><strong>Importing Multiple Contacts:</strong><br>When importing a client, only one contact (which will become the primary contact) and one location (which will become the primary location) can be added initially. To add additional contacts, you will need to click into each client, navigate to the Contacts section, and import multiple contacts individually for each client.</p>
-                    <p><strong>Format csv file with headings & data:</strong><br>Client Name, Industry, Referral, Website, Primary Location Name, Location Phone, Location Address, City, State, Postal Code, Country, Primary Contact Name, Title, Contact Phone, Extension, Contact Mobile, Contact Email, Hourly Rate, Currency, Payment Terms, Tax ID, Abbreviation</p>
-                    <hr>
-                    <div class="form-group my-4">
-                        <input type="file" class="form-control-file" name="file" accept=".csv" required>
-                    </div>
-                    <hr>
-                    <div>Download: <a class="text-bold" href="post.php?download_clients_csv_template">sample csv template</a></div>
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="import_clients_csv" class="btn btn-primary text-strong"><i class="fas fa-upload mr-2"></i>Import</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+ob_start();
+
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-users mr-2"></i>Import Clients</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+    <div class="modal-body">
+        <p><strong>Importing Multiple Contacts:</strong><br>When importing a client, only one contact (which will become the primary contact) and one location (which will become the primary location) can be added initially. To add additional contacts, you will need to click into each client, navigate to the Contacts section, and import multiple contacts individually for each client.</p>
+        <p><strong>Format csv file with headings & data:</strong><br>Client Name, Industry, Referral, Website, Primary Location Name, Location Phone, Location Address, City, State, Postal Code, Country, Primary Contact Name, Title, Contact Phone, Extension, Contact Mobile, Contact Email, Hourly Rate, Currency, Payment Terms, Tax ID, Abbreviation</p>
+        <hr>
+        <div class="form-group my-4">
+            <input type="file" class="form-control-file" name="file" accept=".csv" required>
+        </div>
+        <hr>
+        <div>Download: <a class="text-bold" href="post.php?download_clients_csv_template">sample csv template</a></div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="import_clients_csv" class="btn btn-primary text-strong"><i class="fas fa-upload mr-2"></i>Import</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/contact/contact_bulk_assign_location.php

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

agent/modals/contact/contact_bulk_assign_tags.php

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

agent/modals/contact/contact_bulk_edit_department.php

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

agent/modals/contact/contact_bulk_edit_phone.php

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

agent/modals/contact/contact_bulk_edit_role.php

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

agent/modals/contact/contact_bulk_email.php

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

agent/modals/contact/contact_details.php

@@ -51,7 +51,14 @@ $auth_method = nullable_htmlentities($row['user_auth_method']);
 $contact_client_id = intval($row['contact_client_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
@@ -77,7 +84,7 @@ $sql_related_credentials = mysqli_query($mysqli, "
     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);
 
@@ -376,6 +383,27 @@ ob_start();
                         $asset_notes = nullable_htmlentities($row['asset_notes']);
                         $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>
@@ -389,6 +417,12 @@ ob_start();
                                 <div class="mt-0">
                                     <small class="text-muted"><?= $asset_description ?></small>
                                 </div>
+                                <?php
+                                if ($asset_tags_display) { ?>
+                                    <div class="mt-1">
+                                        <?= $asset_tags_display ?>
+                                    </div>
+                                <?php } ?>
                             </th>
                             <td><?= $asset_type ?></td>
                             <td>

agent/modals/contact/contact_export.php

@@ -1,24 +1,30 @@
-<div class="modal" id="exportContactModal" 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-download mr-2"></i>Export Contacts 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">
-                <?php if($client_url) { ?>
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <?php } ?>
-                <div class="modal-body">
+<?php
 
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="export_contacts_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>
-        </div>
-    </div>
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Contacts to CSV</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
+
+    <div class="modal-body">
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="export_contacts_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';

agent/modals/contact/contact_import.php

@@ -1,30 +1,35 @@
-<div class="modal" id="importContactModal" 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-users mr-2"></i>Import Contacts</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">
-                <?php if($client_url) { ?>
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <?php } ?>
-                <div class="modal-body">
-                    <p><strong>Format csv file with headings & data:</strong><br>Name, Title, Department, Email, Phone, Extension, Mobile, Location</p>
-                    <hr>
-                    <div class="form-group my-4">
-                        <input type="file" class="form-control-file" name="file" accept=".csv" required>
-                    </div>
-                    <hr>
-                    <div>Download: <a class="text-bold" href="post.php?download_contacts_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="import_contacts_csv" class="btn btn-primary text-strong"><i class="fas fa-upload mr-2"></i>Import</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-users mr-2"></i>Import Contacts</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
+    <div class="modal-body">
+        <p><strong>Format csv file with headings & data:</strong><br>Name, Title, Department, Email, Phone, Extension, Mobile, Location</p>
+        <hr>
+        <div class="form-group my-4">
+            <input type="file" class="form-control-file" name="file" accept=".csv" required>
+        </div>
+        <hr>
+        <div>Download: <a class="text-bold" href="post.php?download_contacts_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="import_contacts_csv" class="btn btn-primary text-strong"><i class="fas fa-upload mr-2"></i>Import</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/credential/credential_bulk_assign_tags.php

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

agent/modals/credential/credential_export.php

@@ -1,24 +1,30 @@
-<div class="modal" id="exportCredentialModal" 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-download mr-2"></i>Export Credentials 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">
-                <?php if ($client_url) { ?>
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <?php } ?>
-                <div class="modal-body">
+<?php
 
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="export_credentials_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>
-        </div>
-    </div>
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Credentials to CSV</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
+
+    <div class="modal-body">
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="export_credentials_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';

agent/modals/credential/credential_import.php

@@ -1,30 +1,35 @@
-<div class="modal" id="importCredentialModal" 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>Import Credentials</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">
-				<?php if ($client_url) { ?>
-				<input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-				<?php } ?>
-				<div class="modal-body">
-					<p><strong>Format csv file with headings & data:</strong><br>Name, Description, Username, Password, TOTP, URI</p>
-					<hr>
-					<div class="form-group my-4">
-						<input type="file" class="form-control-file" name="file" accept=".csv" required>
-					</div>
-					<hr>
-					<div>Download <a class="text-bold" href="post.php?download_credentials_csv_template">sample csv template</a></div>
-				</div>
-				<div class="modal-footer">
-					<button type="submit" name="import_credentials_csv" class="btn btn-primary"><i class="fa fa-upload mr-2"></i>Import</button>
-					<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-				</div>
-			</form>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+	<h5 class="modal-title"><i class="fas fa-fw fa-key mr-2"></i>Import Credentials</h5>
+	<button type="button" class="close text-white" data-dismiss="modal">
+		<span>&times;</span>
+	</button>
+</div>
+<form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+	<input type="hidden" name="client_id" value="<?= $client_id ?>">
+	<div class="modal-body">
+		<p><strong>Format csv file with headings & data:</strong><br>Name, Description, Username, Password, TOTP, URI</p>
+		<hr>
+		<div class="form-group my-4">
+			<input type="file" class="form-control-file" name="file" accept=".csv" required>
 		</div>
+		<hr>
+		<div>Download <a class="text-bold" href="post.php?download_credentials_csv_template">sample csv template</a></div>
 	</div>
-</div>
+	<div class="modal-footer">
+		<button type="submit" name="import_credentials_csv" class="btn btn-primary"><i class="fa fa-upload mr-2"></i>Import</button>
+		<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+	</div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';