Merge pull request #1246 from itflow-org/develop

Develop to Master for Release

.gitignore

@@ -4,16 +4,8 @@ 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/*
@@ -22,8 +14,6 @@ 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,85 +2,7 @@
 
 This file documents all notable changes made to ITFlow.
 
-## [25.12.1] Maint Release
+## [25.11] Changelog
-
-### 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.
@@ -334,7 +256,7 @@ We will provide example code with directory structure for each custom directory
 ---
 
 ### Fixed
-- Several security vulnerabilities patched (with thanks to www.helx.io).
+- Several security vulnerabilities patched.
 - 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.

README.md

@@ -16,7 +16,7 @@
     <br />
     <a href="https://demo.itflow.org"><strong>View demo</strong></a>
     <br />
-    Username: <b>demo@demo.com</b> | Password: <b>demo</b>
+    Username: <b>demo@demo</b> | Password: <b>demo</b>
     <br />
     <br />
     <a href="https://itflow.org/#about">About</a>

SECURITY.md

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

admin/ai_model.php

@@ -12,16 +12,6 @@ $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 class="text-center">
+                    <th>
                         <a class="text-dark">Models</a>
                     </th>
                     <th class="text-center">Action</th>
@@ -67,8 +67,7 @@ $num_rows = mysqli_num_rows($sql);
                         </td>
                         <td><?php echo $url; ?></td>
                         <td><?php echo $key; ?></td>
-                        <td class="text-center">
+                        <td><?php echo $ai_model_count; ?></td>
-                            <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,7 +4059,9 @@ 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
+          `contract_template_archived_at` DATETIME NULL DEFAULT NULL,
+
+          `company_id` INT(11) NOT NULL
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;");
 
 
@@ -4113,51 +4115,10 @@ 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') {
+    // if (CURRENT_DATABASE_VERSION == '2.3.7') {
-
+    //     // Insert queries here required to update to DB version 2.3.8
-        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') {
-
-         mysqli_query($mysqli, "
-            CREATE TABLE `task_approvals` (
-              `approval_id` int(11) NOT NULL AUTO_INCREMENT,
-              `approval_scope` enum('client','internal') NOT NULL,
-              `approval_type` enum('any','technical','billing','specific') NOT NULL,
-              `approval_required_user_id` int(11) DEFAULT NULL,
-              `approval_status` enum('pending','approved','declined') NOT NULL,
-              `approval_created_by` int(11) NOT NULL,
-              `approval_approved_by` varchar(255) DEFAULT NULL,
-              `approval_url_key` varchar(200) NOT NULL,
-              `approval_task_id` int(11) NOT NULL,
-              PRIMARY KEY (`approval_id`)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-        ");
-
-         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.9'");
-     }
-
-    // if (CURRENT_DATABASE_VERSION == '2.3.9') {
-    //     // Insert queries here required to update to DB version 2.4.0
     //     // Then, update the database to the next sequential version
-    //     mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.4.0'");
+    //     mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.8'");
     // }
 
 } else {

admin/debug.php

@@ -52,7 +52,6 @@ $extensions = [
     'php-mbstring' => 'mbstring',
     'php-gd' => 'gd',
     'php-zip' => 'zip',
-    'php-xml' => 'xml',
 ];
 
 foreach ($extensions as $name => $ext) {
@@ -766,3 +765,4 @@ $mysqli->close();
 <?php
 
 require_once "../includes/footer.php";
+

admin/includes/side_nav.php

@@ -27,14 +27,12 @@
                         <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>
@@ -69,20 +67,30 @@
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="/admin/payment_provider.php"
+                        <a href="/admin/payment_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'payment_provider.php' ? 'active' : ''); ?>">
-                           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"
+                        <a href="/admin/ai_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ai_provider.php' ? 'active' : ''); ?>">
-                        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">
@@ -102,17 +110,12 @@
                 <?php if ($config_module_enable_itdoc) { ?>
                     <li class="nav-header">TEMPLATES</li>
 
-                    <!-- 2025-11-16 JQ - Hide Contracts not yet ready
                     <li class="nav-item">
-                        <a href="/admin/contract_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'contract_template.php' ? 'active' : ''); ?>">
+                        <a href="/admin/contract_templates.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'contract_templates.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-file-contract"></i>
-                            <p>
+                            <p>Contract Templates</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>

admin/modals/api/api_key_add.php

@@ -2,8 +2,8 @@
 
 require_once '../../../includes/modal_header.php';
 
-$key = randomString(32);
+$key = randomString(156);
-$decryptPW = randomString(32);
+$decryptPW = randomString(160);
 
 ob_start();
 ?>

admin/modals/category/category_add.php

@@ -2,9 +2,7 @@
 
 require_once '../../../includes/modal_header.php';
 
-$category = nullable_htmlentities($_GET['category'] ?? '');
+$category = nullable_htmlentities($_GET['category']);
-
-$category_types_array = ['Expense', 'Income', 'Referral', 'Ticket'];
 
 ?>
 
@@ -15,30 +13,10 @@ $category_types_array = ['Expense', 'Income', 'Referral', 'Ticket'];
     </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">
@@ -61,7 +39,7 @@ $category_types_array = ['Expense', 'Income', 'Referral', 'Ticket'];
 
     </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 Category</button>
+        <button type="submit" name="add_category" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>

admin/modals/contract_template/contract_template_add.php

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

@@ -1,265 +0,0 @@
-<?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,26 +16,11 @@ ob_start();
 
     <div class="modal-body">
 
-        <div class="alert alert-info text-center">
+        <div class="alert alert-info">
-            <h6>Before Adding a Payment Provider!</h6>
+            An income account named after the provider will always be created and used for income of paid invoices.<br>
-            We recommend you add an <strong>Account</strong> and <strong>Vendor</strong> based off the Provider name before continuing eg <strong>Stripe</strong>
+            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>
 
-        <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="tab-content">
-
-            <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">
@@ -68,44 +53,18 @@ ob_start();
             </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">
+                <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>
 
-            </div>
+        <hr>
-
-            <div class="tab-pane fade" id="pills-expense">
 
         <div class="form-group">
             <div class="custom-control custom-switch">
@@ -114,67 +73,13 @@ ob_start();
             </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">
+                <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>
@@ -185,14 +90,12 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
                 </div>
-                        <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,3}" name="flat_fee" placeholder="0.030">
+                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,3}" name="flat_fee" placeholder="0.030">
             </div>
             <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
         </div>
 
     </div>
-        </div>
-    </div>
     <div class="modal-footer">
         <button type="submit" name="add_payment_provider" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Add</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>

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 = intval($row['payment_provider_account']);
+$account_id = nullable_htmlentities($row['payment_provider_account']);
 $threshold = floatval($row['payment_provider_threshold']);
-$vendor_id = intval($row['payment_provider_expense_vendor']);
+$vendor_id = nullable_htmlentities($row['payment_provider_expense_vendor']);
-$category_id = intval($row['payment_provider_expense_category']);
+$category_id = nullable_htmlentities($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,39 +21,24 @@ $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><?= $provider_name ?></strong></h5>
+    <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Editing: <strong><?php echo $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="<?= $_SESSION['csrf_token'] ?>">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-    <input type="hidden" name="provider_id" value="<?= $provider_id ?>">
+    <input type="hidden" name="provider_id" value="<?php echo $provider_id; ?>">
 
     <div class="modal-body">
 
-        <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-                <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" data-toggle="pill" href="#pills-expense">Expense</a>
-            </li>
-        </ul>
-
-        <hr>
-
-        <div class="tab-content">
-
-            <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 ?>">
+                <input type="text" class="form-control" name="public_key" placeholder="Publishable API Key (pk_...)" value="<?php echo $public_key; ?>">
             </div>
         </div>
 
@@ -63,31 +48,7 @@ ob_start();
                 <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 ?>">
+                <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>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>
 
@@ -97,69 +58,19 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
                 </div>
-                        <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="threshold" placeholder="1000.00" value="<?php echo $threshold; ?>">
+                <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>
 
-            </div>
+        <hr>
-
-            <div class="tab-pane fade" id="pills-expense">
 
         <div class="form-group">
-                    <label>Payment Provider Vendor <strong class="text-danger">*</strong></label>
+            <div class="custom-control custom-switch">
-                    <div class="input-group">
+                <input type="checkbox" class="custom-control-input" name="enable_expense" <?php if ($vendor_id) { echo "checked";  } ?> value="1" id="enableEditExpenseSwitch">
-                        <div class="input-group-prepend">
+                <label class="custom-control-label" for="enableEditExpenseSwitch">Enable Expense</label>
-                            <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>
+            <small>(Category: Payment Processing -- Vendor: <?php echo $provider_name; ?></small>
         </div>
 
         <div class="form-group">
@@ -168,7 +79,7 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-percent"></i></span>
                 </div>
-                        <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="percentage_fee" value="<?php echo $percent_fee; ?>" placeholder="Enter Percentage">
+                <input type="text" class="form-control" inputmode="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>
@@ -179,12 +90,11 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
                 </div>
-                        <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,3}" name="flat_fee" value="<?php echo $flat_fee; ?>" placeholder="0.030">
+                <input type="text" class="form-control" inputmode="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>
+
-        </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,8 +15,6 @@ if (isset($_GET['type'])) {
         $type_display = "Contact";
     } elseif ($type === 4) {
         $type_display = "Credential";
-    } elseif ($type === 5) {
-        $type_display = "Asset";
     }
 }
 ob_start();
@@ -60,7 +58,6 @@ 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>
@@ -89,7 +86,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 Tag</button>
+        <button type="submit" name="add_tag" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>

admin/modals/tag/tag_edit.php

@@ -12,24 +12,11 @@ $tag_type = intval($row['tag_type']);
 $tag_color = nullable_htmlentities($row['tag_color']);
 $tag_icon = nullable_htmlentities($row['tag_icon']);
 
-if ($tag_type == 1) {
+// Generate the HTML form content using output buffering.
-    $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><?= $tag_type_display ?> Tag: <strong><?php echo $tag_name; ?></strong></h5>
+    <h5 class="modal-title"><i class="fas fa-fw fa-tag mr-2"></i>Editing tag: <strong><?php echo $tag_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
@@ -48,6 +35,22 @@ 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">
@@ -70,7 +73,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 changes</button>
+        <button type="submit" name="edit_tag" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>

admin/modals/ticket_template/ticket_template_add.php

@@ -1,12 +1,8 @@
-<?php
+<div class="modal" id="addTicketTemplateModal" tabindex="-1">
-
+    <div class="modal-dialog modal-lg">
-require_once '../../../includes/modal_header.php';
+        <div class="modal-content">
-
-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>
+                <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>
@@ -70,10 +66,10 @@ ob_start();
                     </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="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>
                 </div>
             </form>
-
+        </div>
-<?php
+    </div>
-require_once '../../../includes/modal_footer.php';
+</div>

admin/modals/user/user_export.php

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

admin/payment_provider.php

@@ -57,7 +57,7 @@ $num_rows = mysqli_num_rows($sql);
                     <th>
                         <a class="text-dark">Expensed Fee</a>
                     </th>
-                    <th class="text-center">
+                    <th>
                         <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'] ?? "Expense Disabled");
+                    $vendor_name = nullable_htmlentities($row['vendor_name']);
                     $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,9 +94,7 @@ $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 class="text-center">
+                        <td><?php echo $saved_payment_count; ?></td>
-                            <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">
@@ -108,14 +106,12 @@ $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?delete_payment_provider=<?= $provider_id ?>&csrf_token=<?= $_SESSION['csrf_token'] ?>">
+<!--                                    <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-trash mr-2"></i><strong>Delete Provider and</strong>
+<!--                                        <i class="fas fa-fw fa-thumbs-down mr-2"></i>Disable-->
-                                        <ul class="text-xs">
+<!--                                    </a>-->
-                                            <li>Related Recurring Payments</li>
+<!--                                    <a class="dropdown-item text-danger confirm-link" href="post.php?delete_payment_provider=--><?php //echo $provider_id; ?><!--&csrf_token=--><?php //echo $_SESSION['csrf_token'] ?><!--">-->
-                                            <li>Related Saved cards</li>
+<!--                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete-->
-                                            <li>Client Provider Relations</li>
+<!--                                    </a>-->
-                                        </ul>
-                                    </a>
                                 </div>
                             </div>
                         </td>

admin/post/contract_template.php

@@ -9,12 +9,11 @@ defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
 if (isset($_POST['add_contract_template'])) {
 
     // Sanitize text inputs
-    $name = sanitizeInput($_POST['name']);
+    $name = sanitizeInput($_POST['contract_template_name']);
-    $description = sanitizeInput($_POST['description']);
+    $type = sanitizeInput($_POST['contract_template_type']);
-    $type = sanitizeInput($_POST['type']);
+    $update_frequency = sanitizeInput($_POST['contract_template_update_frequency']);
-    $renewal_frequency = sanitizeInput($_POST['renewal_frequency']);
+    $support_hours = sanitizeInput($_POST['contract_template_support_hours']);
-    $support_hours = sanitizeInput($_POST['support_hours']);
+    $details = mysql_escape_string($mysqli, $_POST['contract_template_details']);
-    $details = mysqli_escape_string($mysqli, $_POST['details']);
 
     // Numeric fields cast to integer
     $sla_low_resp = intval($_POST['sla_low_response_time']);
@@ -23,9 +22,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']);
-    $rate_standard = intval($_POST['rate_standard']);
+    $hourly_rate = intval($_POST['contract_template_hourly_rate']);
-    $rate_after_hours = intval($_POST['hourly_rate_after_hours']);
+    $after_hours_rate = intval($_POST['contract_template_after_hours_hourly_rate']);
-    $net_terms = intval($_POST['net_terms']);
+    $net_terms = intval($_POST['contract_template_net_terms']);
 
     // Insert into database (numbers not quoted)
     mysqli_query($mysqli, "
@@ -34,17 +33,19 @@ if (isset($_POST['add_contract_template'])) {
         contract_template_description = '$description',
         contract_template_details = '$details',
         contract_template_type = '$type',
-        contract_template_renewal_frequency = '$renewal_frequency',
+        contract_template_update_frequency = '$update_frequency',
-        contract_template_sla_low_response_time = $sla_low_resp,
+        sla_low_response_time = $sla_low_resp,
-        contract_template_sla_medium_response_time = $sla_med_resp,
+        sla_medium_response_time = $sla_med_resp,
-        contract_template_sla_high_response_time = $sla_high_resp,
+        sla_high_response_time = $sla_high_resp,
-        contract_template_sla_low_resolution_time = $sla_low_res,
+        sla_low_resolution_time = $sla_low_res,
-        contract_template_sla_medium_resolution_time = $sla_med_res,
+        sla_medium_resolution_time = $sla_med_res,
-        contract_template_sla_high_resolution_time = $sla_high_res,
+        sla_high_resolution_time = $sla_high_res,
-        contract_template_rate_standard = $rate_standard,
+        contract_template_hourly_rate = $hourly_rate,
-        contract_template_rate_after_hours = $rate_after_hours,
+        contract_template_after_hours_hourly_rate = $after_hours_rate,
         contract_template_support_hours = '$support_hours',
-        contract_template_net_terms = $net_terms
+        contract_template_net_terms = $net_terms,
+        contract_template_created_by = $session_user_id,
+        contract_template_created_at = NOW()
     ");
 
     $contract_template_id = mysqli_insert_id($mysqli);
@@ -59,99 +60,4 @@ 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,24 +8,12 @@ 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 = '', 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 = '$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");
@@ -39,25 +27,10 @@ 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 = '$processed_content_escaped', 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 = '$content', 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);
 
@@ -75,9 +48,6 @@ 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,17 +10,10 @@ if (isset($_POST['add_payment_method'])) {
 
     validateCSRFToken($_POST['csrf_token']);
 
-    $name = cleanInput($_POST['name']);
+    $name = sanitizeInput($_POST['name']);
-    $description = cleanInput($_POST['description']);
+    $description = sanitizeInput($_POST['description']);
 
-    $query = mysqli_prepare(
+    mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = '$name', payment_method_description = '$description'");
-        $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");
 
@@ -35,19 +28,10 @@ if (isset($_POST['edit_payment_method'])) {
     validateCSRFToken($_POST['csrf_token']);
 
     $payment_method_id = intval($_POST['payment_method_id']);
-    $name = cleanInput($_POST['name']);
+    $name = sanitizeInput($_POST['name']);
-    $description = cleanInput($_POST['description']);
+    $description = sanitizeInput($_POST['description']);
 
-    $query = mysqli_prepare(
+    mysqli_query($mysqli,"UPDATE payment_methods SET payment_method_name = '$name', payment_method_description = '$description' WHERE payment_method_id = $payment_method_id");
-        $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,20 +14,53 @@ if (isset($_POST['add_payment_provider'])) {
     $public_key = sanitizeInput($_POST['public_key']);
     $private_key = sanitizeInput($_POST['private_key']);
     $threshold = floatval($_POST['threshold']);
-    $account = intval($_POST['account']);
+    $enable_expense = intval($_POST['enable_expense'] ?? 0);
-    $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 = mysqli_query($mysqli, "SELECT 1 FROM payment_providers WHERE payment_provider_name = '$provider' LIMIT 1");
+    $sql = "SELECT 1 FROM payment_providers WHERE payment_provider_name = '$provider' LIMIT 1";
-    if (mysqli_num_rows($sql) > 0) {
+    $result = mysqli_query($mysqli, $sql);
+    if (mysqli_num_rows($result) > 0) {
         flash_alert("Payment Provider <strong>$provider</strong> already exists", 'error');
         redirect();
     }
 
-    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");
+    // 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");
 
     $provider_id = mysqli_insert_id($mysqli);
 
@@ -48,13 +81,11 @@ if (isset($_POST['edit_payment_provider'])) {
     $public_key = sanitizeInput($_POST['public_key']);
     $private_key = sanitizeInput($_POST['private_key']);
     $threshold = floatval($_POST['threshold']);
-    $account = intval($_POST['account']);
+    $enable_expense = intval($_POST['enable_expense'] ?? 0);
-    $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_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");
+    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");
 
     logAction("Payment Provider", "Edit", "$session_name edited Payment Provider $provider");
 
@@ -70,11 +101,6 @@ if (isset($_GET['delete_payment_provider'])) {
     
     $provider_id = intval($_GET['delete_payment_provider']);
 
-    // When deleted it cascades deletes
-    // all Recurring paymentes related to payment provider
-    // Delete all Saved Cards related
-    // Delete Client Payment Provider Releation
-
     $provider_name = sanitizeInput(getFieldById('payment_providers', $provider_id, 'provider_name'));
 
     // Delete provider

admin/post/saved_payment_method.php

@@ -42,7 +42,7 @@ if (isset($_GET['delete_saved_payment'])) {
 
         try {
             // Initialize stripe
-            require_once '../plugins/stripe-php/init.php';
+            require_once 'plugins/stripe-php/init.php';
             $stripe = new \Stripe\StripeClient($private_key);
 
             // Detach PM
@@ -56,7 +56,7 @@ if (isset($_GET['delete_saved_payment'])) {
 
     }
 
-    // Remove payment method from ITFlow. This will also cascade delete related recurring payments setup
+    // Remove payment method from ITFlow
     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='mail_queue.php'>Check Admin > Mail queue</a>");
+        flash_alert("Test email queued! <a class='text-bold text-light' href='admin_mail_queue.php'>Check Admin > Mail queue</a>");
     } else {
         flash_alert("Failed to add test mail to queue", 'error');
     }
@@ -163,125 +163,24 @@ if (isset($_POST['test_email_imap'])) {
     
     validateCSRFToken($_POST['csrf_token']);
 
-    $host       = $config_imap_host;
+    // Setup your IMAP connection parameters
-    $port       = (int) $config_imap_port;
+    $hostname = "{" . $config_imap_host . ":" . $config_imap_port . "/" . $config_imap_encryption . "/novalidate-cert}INBOX";
-    $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 {
-        $errno  = 0;
+        $inbox = @imap_open($hostname, $username, $password);
-        $errstr = '';
 
-        // 10-second timeout, adjust as needed
+        if ($inbox) {
-        $fp = @stream_socket_client(
+            imap_close($inbox);
-            $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 {
-            if (!$errorLine) {
+            throw new Exception(imap_last_error());
-                $errorLine = 'Unknown IMAP authentication error';
         }
-            throw new Exception($errorLine);
-        }
-
     } catch (Exception $e) {
-        flash_alert("<strong>IMAP connection failed:</strong> " . htmlspecialchars($e->getMessage()), 'error');
+        flash_alert("<strong>IMAP connection failed:</strong> " . $e->getMessage(), 'error');
     }
 
     redirect();
+
 }

admin/post/settings_theme.php

@@ -49,17 +49,3 @@ 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_color = '$color', tag_icon = '$icon' WHERE tag_id = $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");
 
     logAction("Tag", "Edit", "$session_name edited tag $name", 0, $tag_id);
 

admin/saved_payment_method.php

@@ -33,16 +33,6 @@ $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>
@@ -117,16 +107,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                     ?>
                     <tr>
-                        <td>
+                        <td><?php echo $client_name; ?> (<?php echo $client_id; ?>)</td>
-                            <?= $client_name ?>
+                        <td><?php echo $provider_name; ?> (<?php echo $provider_id; ?>)</td>
-                            <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="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>
+                    <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>
                 </div>
             </div>
 

admin/settings_theme.php

@@ -57,12 +57,11 @@ 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,31 +6,10 @@ $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"
 );
 
@@ -40,9 +19,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><?= $tag_type_display ?> Tags</h3>
+            <h3 class="card-title mt-2"><i class="fas fa-fw fa-tags mr-2"></i>Tags</h3>
             <div class="card-tools">
-                <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>
+                <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>
             </div>
         </div>
 
@@ -51,7 +30,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 <?= $tag_type_display ?> Tags">
+                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Tags">
                             <div class="input-group-append">
                                 <button class="btn btn-primary"><i class="fa fa-search"></i></button>
                             </div>
@@ -59,45 +38,6 @@ $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>
 
@@ -111,6 +51,11 @@ $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>
@@ -120,6 +65,18 @@ $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']);
 
@@ -131,6 +88,7 @@ $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">
@@ -159,7 +117,8 @@ $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 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>
+            <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>
         </div>
     </div>
     <div class="card-body">
@@ -120,4 +120,5 @@ $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,16 +33,9 @@ $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 ajax-modal" href="#"
+                        <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>
-                            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="#"
+                        <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>
-                            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>
@@ -163,7 +156,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     ?>
                     <tr>
                         <td class="text-center">
-                            <a href="#" title="UserID: <?= $user_id ?>"
+                            <a href="#" 
                                 <?php if ($user_id !== $session_user_id) { // Prevent modifying self ?>
                                 class="ajax-modal"
                                 data-modal-url="modals/user/user_edit.php?id=<?= $user_id ?>"
@@ -242,4 +235,5 @@ $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_template=<?= $vendor_template_id ?>">
+                                        <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_vendor=<?php echo $vendor_template_id; ?>">
                                             <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                         </a>
                                     <?php } ?>

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(preg_replace('/[^0-9]/', '', $_GET['merge_into_ticket_number']));
+    $merge_into_ticket_number = intval($_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 
@@ -195,7 +195,7 @@ if (isset($_GET['share_generate_link'])) {
         $item_expires_friendly = "1 month";
     }
 
-    $item_key = randomString(32);
+    $item_key = randomString(156);
 
     if ($item_type == "Document") {
         $row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT document_name FROM documents WHERE document_id = $item_id AND document_client_id = $client_id LIMIT 1"));
@@ -992,23 +992,3 @@ if (isset($_GET['apex_domain_check'])) {
 
     echo json_encode($response);
 }
-
-// Get internal users/techs
-if (isset($_GET['get_internal_users'])) {
-    enforceUserPermission('module_support');
-
-    $sql = mysqli_query(
-        $mysqli,
-        "SELECT user_id, user_name
-         FROM users
-         WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL
-         ORDER BY user_name"
-    );
-
-    while ($row = mysqli_fetch_assoc($sql)) {
-        $response['users'][] = $row;
-    }
-
-    echo json_encode($response);
-    exit;
-}

agent/asset_details.php

@@ -118,28 +118,6 @@ if (isset($_GET['asset_id'])) {
         );
         $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 
@@ -279,13 +257,8 @@ 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 class="mt-1"><i class="fa fa-fw fa-tag text-secondary mr-3"></i><?= $asset_type; ?></div>
+                            <div><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>
@@ -469,15 +442,11 @@ 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 ajax-modal" href="#"
+                                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#bulkAssignNetworkModal">
-                                            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 ajax-modal" href="#"
+                                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#bulkSetInterfaceTypeModal">
-                                            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>
@@ -601,6 +570,8 @@ 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,18 +78,6 @@ 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 
@@ -105,13 +93,9 @@ $row = mysqli_fetch_assoc(mysqli_query($mysqli, "
         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;
 "));
 
@@ -133,6 +117,9 @@ $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
@@ -140,16 +127,13 @@ $sql = mysqli_query(
     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
+    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%')
-    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"
 );
 
@@ -200,16 +184,14 @@ $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 ajax-modal" href="#"
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importAssetModal">
-                        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 ajax-modal" href="#"
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportAssetModal">
-                            data-modal-url="modals/asset/asset_export.php?<?= $client_url ?>">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     <?php } ?>
@@ -288,32 +270,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </div>
                 </div>
                 <?php } ?>
-                <div class="col-md-2">
+                <div class="col-md-3">
-                    <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
@@ -334,7 +291,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </select>
                     </div>
                 </div>
-                <div class="col-md-2">
+                <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; } ?>"
                             class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"; } ?>">
@@ -357,14 +314,7 @@ $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">
@@ -626,48 +576,20 @@ $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="<?= $asset_id ?>">
+                                    <input class="form-check-input bulk-select" type="checkbox" name="asset_ids[]" value="<?php echo $asset_id ?>">
                                 </div>
                             </td>
                             <td>
-                                <a class="text-dark" href="asset_details.php?client_id=<?= $client_id ?>&asset_id=<?= $asset_id ?>">
+                                <a class="text-dark" href="asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>">
                                     <div class="media">
-                                        <i class="fa fa-fw fa-2x fa-<?= $device_icon ?> mr-3 mt-1"></i>
+                                        <i class="fa fa-fw fa-2x fa-<?php echo $device_icon; ?> mr-3 mt-1"></i>
                                         <div class="media-body">
-                                            <div><?= $asset_name ?></div>
+                                            <div><?php echo $asset_name; ?></div>
-                                            <div><small class="text-secondary"><?= $asset_description ?></small></div>
+                                            <div><small class="text-secondary"><?php echo $asset_description; ?></small></div>
-                                            <?php
-                                            if ($asset_tags_display) { ?>
-                                                <div class="mt-1">
-                                                    <?= $asset_tags_display ?>
-                                                </div>
-                                            <?php } ?>
                                         </div>
                                     </div>
                                 </a>
@@ -791,4 +713,8 @@ $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/blank.php

@@ -0,0 +1,72 @@
+<?php require_once "includes/inc_all.php"; ?>
+
+    <!-- Breadcrumbs-->
+    <ol class="breadcrumb">
+        <li class="breadcrumb-item">
+            <a href="index.html">Dashboard</a>
+        </li>
+        <li class="breadcrumb-item active">Blank Page</li>
+    </ol>
+
+    <!-- Page Content -->
+    <h1>Blank Page</h1>
+    <hr>
+    <p>This is a great starting point for new custom pages.</p>
+    <h1><?php echo $session_user_role; ?></h1>
+    <?php validateAdminRole(); ?>
+
+<?php
+
+$start_date = date('Y') . "-10-10";
+
+echo "<H1>$start_date</H1>";
+
+echo "<H2>User Agent</H2>";
+echo getUserAgent();
+
+
+?>
+    <br>
+
+    <input type="tel" name="phone" id="phone">
+
+     <div class="form-group">
+                  <label>Minimal</label>
+                  <select class="form-control select2 select2-hidden-accessible" style="width: 100%;" data-select2-id="1" tabindex="-1" aria-hidden="true">
+                    <option selected="selected" data-select2-id="3">Alabama</option>
+                    <option data-select2-id="35">Alaska</option>
+                    <option data-select2-id="36">California</option>
+                    <option data-select2-id="37">Delaware</option>
+                    <option data-select2-id="38">Tennessee</option>
+                    <option data-select2-id="39">Texas</option>
+                    <option data-select2-id="40">Washington</option>
+                  </select><span class="select2 select2-container select2-container--default select2-container--below" dir="ltr" data-select2-id="2" style="width: 100%;"><span class="selection"><span class="select2-selection select2-selection--single" role="combobox" aria-haspopup="true" aria-expanded="false" tabindex="0" aria-disabled="false" aria-labelledby="select2-nbex-container"><span class="select2-selection__rendered" id="select2-nbex-container" role="textbox" aria-readonly="true" title="Alabama">Alabama</span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span></span></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>
+                </div>
+
+    <dl>
+        <dt>Requester</dt>
+        <dd>Sam Adams</dd>
+
+        <dt>Created</dt>
+        <dd><time datetime="2024-04-11T17:52:30+00:00" title="2024-04-11 13:52" data-datetime="calendar">Today at 13:52</time></dd>
+
+        <dt>Last activity</dt>
+        <dd><time datetime="2024-04-11T18:08:55+00:00" title="2024-04-11 14:08" data-datetime="calendar">Today at 14:08</time></dd>
+    </dl>
+
+    <?php echo randomString(100); ?>
+    <br>
+    <textarea class="tinymceTest"></textarea>
+
+    <textarea class="tinymce"></textarea>
+
+    <textarea class="tinymceTicket"></textarea>
+<?php
+// show the current Date and Time
+$date_time = date('Y-m-d H:i:s');
+echo "Current Date and Time: <strong>$date_time</strong>";
+?>
+
+<script>toastr.success('Have Fun Wozz!!')</script>
+
+<?php require_once "../includes/footer.php";

agent/certificates.php

@@ -68,8 +68,7 @@ $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 ajax-modal" href="#"\
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportCertificateModal">
-                            data-modal-url="modals/certificate/certificate_export.php?<?= $client_url ?>">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     </div>
@@ -300,10 +299,15 @@ $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,13 +92,11 @@ $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 ajax-modal" href="#"
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importClientModal">
-                            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 ajax-modal" href="#"
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportClientModal">
-                            data-modal-url="modals/client/client_export.php">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     </div>
@@ -286,7 +284,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     
     <form id="bulkActions" action="post.php" method="post">
         <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-        <div class="table-responsive">
+        <div class="table-responsive-sm">
             <table class="table table-hover mb-0 text-nowrap">
                 <thead class="<?php if ($num_rows[0] == 0) { echo "d-none"; } ?> bg-light">
                 <tr>
@@ -625,4 +623,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="../js/bulk_actions.js"></script>
 
 <?php
+require_once "modals/client/client_import.php";
+require_once "modals/client/client_export.php";
 require_once "../includes/footer.php";

agent/contact_details.php

@@ -64,14 +64,7 @@ if (isset($_GET['contact_id'])) {
     }
 
     // Related Assets Query - 1 to 1 relationship
-    $sql_related_assets = mysqli_query($mysqli, "SELECT * FROM assets
+    $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");
-        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
@@ -97,7 +90,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 ASC
+        ORDER BY credential_name DESC
     ");
     $credential_count = mysqli_num_rows($sql_related_credentials);
 
@@ -408,28 +401,6 @@ 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>
@@ -442,12 +413,6 @@ 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>
@@ -797,9 +762,7 @@ 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 ajax-modal"
+                        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketModal">
-                            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>

agent/contacts.php

@@ -98,14 +98,12 @@ $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 ajax-modal" href="#"
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importContactModal">
-                        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 ajax-modal" href="#"
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportContactModal">
-                        data-modal-url="modals/contact/contact_export.php?<?= $client_url ?>">
                         <i class="fa fa-fw fa-download mr-2"></i>Export
                     </a>
                 </div>
@@ -568,4 +566,10 @@ $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,15 +112,13 @@ $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 ajax-modal" href="#"
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importCredentialModal">
-                        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 ajax-modal" href="#"
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportCredentialModal">
-                            data-modal-url="modals/credential/credential_export.php?<?= $client_url ?>">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     <?php } ?>
@@ -530,10 +528,15 @@ $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,22 +729,13 @@ 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>
+                                        <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>
-                                            <a class="text-dark" 
+                                        <td><a href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
-                                                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

@@ -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=<?= $client_id ?>"><?= $client_name ?></a>
+        <a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
     </li>
     <li class="breadcrumb-item">
-        <a href="files.php?client_id=<?= $client_id ?>">Files</a>
+        <a href="documents.php?client_id=<?php echo $client_id; ?>">Documents</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="files.php?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $bread_crumb_folder_id; ?>">
+            <a href="documents.php?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $bread_crumb_folder_id; ?>">
                 <i class="fas fa-fw fa-folder-open mr-2"></i><?php echo $bread_crumb_folder_name; ?>
             </a>
         </li>
@@ -104,31 +104,18 @@ $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">
+                    <div class="col"><strong>Date:</strong> <?php echo date('Y-m-d', strtotime($document_created_at)); ?></div>
-                        <div class="h4 mb-0"><?= $document_name ?></div>
+                    <?php if(!empty($document_created_by_name)){ ?>
-                        <?php if ($document_description) { ?>
+                    <div class="col"><strong>Prepared By:</strong> <?php echo $document_created_by_name; ?></div>
-                        <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">
-                <?= $document_content ?>
+                <?php echo $document_content; ?>
                 <hr>
                 <h4>Documentation Revision History</h4>
 
@@ -164,11 +151,11 @@ $page_title = $row['document_name'];
 
                         ?>
                         <tr>
-                            <td><?= $document_version_count ?></td>
+                            <td><?php echo $document_version_count; ?></td>
-                            <td><?= $document_version_created_date ?></td>
+                            <td><?php echo $document_version_created_date; ?></td>
-                            <td><?= $document_version_name ?></td>
+                            <td><?php echo $document_version_name; ?></td>
-                            <td><?= $document_version_description_display ?></td>
+                            <td><?php echo $document_version_description_display; ?></td>
-                            <td><?= $document_version_author ?></td>
+                            <td><?php echo $document_version_author; ?></td>
                         </tr>
                         <?php 
                         $document_version_count++; // Increment the counter
@@ -189,10 +176,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(<?= "$client_id, 'Document', $document_id"; ?>)">
+                    onclick="populateShareModal(<?php echo "$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=<?= $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=<?php echo $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>
@@ -202,8 +189,7 @@ $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 ajax-modal"
+                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkFileToDocumentModal">
-                    data-modal-url="modals/document/document_link_file.php?document_id=<?= $document_id ?>">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
@@ -225,9 +211,9 @@ $page_title = $row['document_name'];
 
                 ?>
                 <div class="ml-2">
-                    <a href="files.php?client_id=<?= $client_id ?>&folder_id=<?= $folder_id ?>&q=<?= $file_name ?>" target="_blank"><?= $file_name ?></a>
+                    <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=<?= $file_id ?>&document_id=<?= $document_id ?>">
+                    <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-unlink text-secondary float-right" title="Unlink File"></i>
+                        <i class="fas fa-fw fa-trash-alt text-secondary float-right"></i>
                     </a>
                 </div>
                 <?php
@@ -235,8 +221,7 @@ $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 ajax-modal"
+                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkContactToDocumentModal">
-                    data-modal-url="modals/document/document_link_contact.php?document_id=<?= $document_id ?>">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
@@ -262,7 +247,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-unlink text-secondary" title="Unlink Contact"></i>
+                        <i class="fas fa-fw fa-trash-alt text-secondary"></i>
                     </a>
                 </div>
                 <?php
@@ -270,7 +255,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 ajax-modal" data-modal-url="modals/document/document_link_asset.php?document_id=<?= $document_id ?>">
+                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkAssetToDocumentModal">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
@@ -297,7 +282,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-unlink text-secondary" title="Unlink Asset"></i>
+                        <i class="fas fa-fw fa-trash-alt text-secondary"></i>
                     </a>
                 </div>
             <?php
@@ -305,8 +290,7 @@ $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 ajax-modal"
+                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkSoftwareToDocumentModal">
-                    data-modal-url="modals/document/document_link_software.php?document_id=<?= $document_id ?>">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
@@ -329,7 +313,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-unlink text-secondary" title="Unlink License"></i>
+                        <i class="fas fa-fw fa-trash-alt text-secondary"></i>
                     </a>
                 </div>
                 <?php
@@ -337,8 +321,7 @@ $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 ajax-modal"
+                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkVendorToDocumentModal">
-                    data-modal-url="modals/document/document_link_vendor.php?document_id=<?= $document_id ?>">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
@@ -363,7 +346,7 @@ $page_title = $row['document_name'];
                         <?php echo $vendor_name; ?>        
                     </a>
                     <a class="confirm-link float-right" href="post.php?unlink_vendor_from_document&vendor_id=<?php echo $vendor_id; ?>&document_id=<?php echo $document_id; ?>">
-                        <i class="fas fa-fw fa-unlink text-secondary" title="Unlink Vendor"></i>
+                        <i class="fas fa-fw fa-trash-alt text-secondary"></i>
                     </a>
                 </div>
             <?php
@@ -376,8 +359,7 @@ $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 class="ajax-modal" href="#"
+                    <a href="#" data-toggle="modal" data-target="#editDocumentClientVisibileModal">
-                        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>";
@@ -432,5 +414,11 @@ $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

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

agent/domains.php

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

agent/expenses.php

@@ -67,8 +67,7 @@ $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 ajax-modal" href="#"
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportExpensesModal">
-                            data-modal-url="modals/expense/expense_export.php">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     </div>
@@ -287,7 +286,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="expense_ids[]" value="<?= $expense_id ?>">
+                                    <input class="form-check-input bulk-select" type="checkbox" name="selected_ids[]" value="<?= $expense_id ?>">
                                 </div>
                             </td>
                             <td>
@@ -358,4 +357,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="/js/bulk_actions.js"></script>
 
 <?php
+require_once "modals/expense/expense_export.php";
 require_once "../includes/footer.php";

agent/files.php

@@ -1,11 +1,12 @@
 <?php
 
-// Unified sort: "name" is logical field, not DB column
+// Default Column Sortby Filter
-$sort = "name";
+$sort = "file_name";
 $order = "ASC";
 
 require_once "includes/inc_all_client.php";
 
+
 // Folder
 if (!empty($_GET['folder_id'])) {
     $folder_id = intval($_GET['folder_id']);
@@ -13,49 +14,119 @@ if (!empty($_GET['folder_id'])) {
     $folder_id = 0;
 }
 
-// Folder ID (used in forms/etc)
+//Rebuild URL
-$get_folder_id = $folder_id;
+$url_query_strings_sort = http_build_query($get_copy);
 
-// View Mode -- 0 List, 1 Thumbnail (thumbnail = files only)
+// 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 (!isset($q)) {
+if ($view == 1) {
-    $q = '';
+    $query_images = "AND (file_ext LIKE 'JPG' OR file_ext LIKE 'jpg' OR file_ext LIKE 'JPEG' OR file_ext LIKE 'jpeg' OR file_ext LIKE 'png' OR file_ext LIKE 'PNG' OR file_ext LIKE 'webp' OR file_ext LIKE 'WEBP')";
+} else {
+    $query_images = '';
 }
 
-// ---------------------------------------------
+// Set Folder Location Var used when creating folders
-// Breadcrumbs: build full folder path
+$folder_location = 1;
-// ---------------------------------------------
-$folder_path = [];
-$breadcrumb_folder_id = $get_folder_id;
 
-while ($breadcrumb_folder_id > 0) {
+if ($get_folder_id == 0 && isset($_GET["q"])) {
-    $sql_folder = mysqli_query($mysqli, "SELECT folder_name, parent_folder FROM folders WHERE folder_id = $breadcrumb_folder_id AND folder_client_id = $client_id");
+    $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']);
 
-        array_unshift($folder_path, [
+        // Prepend the folder to the beginning of the array
-            'folder_id'   => $breadcrumb_folder_id,
+        array_unshift($folder_path, array('folder_id' => $folder_id, 'folder_name' => $folder_name));
-            'folder_name' => $folder_name
-        ]);
 
-        $breadcrumb_folder_id = $parent_folder;
+        // Move up to the parent folder
+        $folder_id = $parent_folder;
     } else {
+        // If the folder is not found, break the loop
         break;
     }
 }
 
-// ---------------------------------------------
+?>
-// Helper: unified folder tree (no folder_location)
+
-// ---------------------------------------------
+<div class="card card-dark">
+
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-paperclip mr-2"></i>Files</h3>
+
+        <div class="card-tools">
+            <div class="btn-group">
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/file/file_upload.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>">
+                    <i class="fas fa-fw fa-cloud-upload-alt mr-2"></i>Upload
+                </button>
+                <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
+                <div class="dropdown-menu">
+                    <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/folder/folder_add.php?client_id=<?= $client_id ?>&folder_location=1&current_folder_id=<?= $get_folder_id ?>">
+                        <i class="fa fa-fw fa-folder-plus mr-2"></i>New Folder
+                    </a>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="card-body">
+        <div class="row">
+            <div class="col-md-3 border-right mb-3">
+                <h4>Folders</h4>
+                <hr>
+                <ul class="nav nav-pills flex-column bg-light">
+                    <li class="nav-item">
+                        <a class="nav-link <?php if ($get_folder_id == 0) { echo "active"; } ?>" href="?client_id=<?php echo $client_id; ?>&folder_id=0">/</a>
+                    </li>
+                    <?php
+                    // Function to check if a folder is an ancestor of the current folder
                     function is_ancestor_folder($folder_id, $current_folder_id, $client_id) {
                         global $mysqli;
 
+                        // Base case: if current_folder_id is 0 or equal to folder_id
                         if ($current_folder_id == 0) {
                             return false;
                         }
@@ -63,34 +134,32 @@ function is_ancestor_folder($folder_id, $current_folder_id, $client_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_client_id = $client_id ORDER BY folder_name ASC");
+                        $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_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']);
 
-        // Count files in folder
+                            // Get the number of files in the folder
-        $row_files = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files WHERE file_folder_id = $folder_id AND file_client_id = $client_id AND file_archived_at IS NULL"));
+                            $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($row_files['num']);
+                            $num_files = intval($row2['num']);
 
-        // Count documents in folder
+                            // Get the number of subfolders
-        $row_docs = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_folder_id = $folder_id AND document_client_id = $client_id AND document_archived_at IS NULL"));
-        $num_docs = intval($row_docs['num']);
-
-        $num_total = $num_files + $num_docs;
-
-        // Count subfolders
                             $subfolder_result = mysqli_query($mysqli, "SELECT COUNT(*) AS count FROM folders WHERE parent_folder = $folder_id AND folder_client_id = $client_id");
                             $subfolder_count = intval(mysqli_fetch_assoc($subfolder_result)['count']);
 
@@ -101,8 +170,10 @@ function display_folders($parent_folder_id, $client_id, $indent = 0) {
                             if ($get_folder_id == $folder_id) { echo "active"; }
                             echo '" href="?client_id=' . $client_id . '&folder_id=' . $folder_id . '">';
 
+                            // Indentation for subfolders
                             echo str_repeat('&nbsp;', $indent * 4);
 
+                            // Determine if the folder is open
                             if ($get_folder_id == $folder_id || is_ancestor_folder($folder_id, $get_folder_id, $client_id)) {
                                 echo '<i class="fas fa-fw fa-folder-open"></i>';
                             } else {
@@ -111,8 +182,8 @@ function display_folders($parent_folder_id, $client_id, $indent = 0) {
 
                             echo ' ' . $folder_name;
 
-        if ($num_total > 0) {
+                            if ($num_files > 0) {
-            echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_total</span>";
+                                echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_files</span>";
                             }
 
                             echo '</a>';
@@ -129,8 +200,8 @@ function display_folders($parent_folder_id, $client_id, $indent = 0) {
                                         <i class="fas fa-fw fa-edit mr-2"></i>Rename
                                     </a>
                                     <?php
-                // Only show delete if admin and no contents and no subfolders
+                                    // Only show delete option if user is admin, folder has no files, and no subfolders
-                if ($session_user_role == 3 && $num_total == 0 && $subfolder_count == 0) { ?>
+                                    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
@@ -143,6 +214,7 @@ function display_folders($parent_folder_id, $client_id, $indent = 0) {
                             echo '</div>';
 
                             if ($subfolder_count > 0) {
+                                // Display subfolders
                                 echo '<ul class="nav nav-pills flex-column bg-light">';
                                 display_folders($folder_id, $client_id, $indent + 1);
                                 echo '</ul>';
@@ -152,277 +224,16 @@ function display_folders($parent_folder_id, $client_id, $indent = 0) {
                         }
                     }
 
-// ---------------------------------------------
+                    // Start displaying folders from the root (parent_folder = 0)
-// DATA LOAD
-// view=1 (thumbs) uses original files-only query
-// view=0 (list) loads ALL files+documents, merges, sorts in PHP
-// ---------------------------------------------
-
-$items = [];
-$num_rows = [0];
-
-if ($view == 1) {
-
-    // Thumbnail view - only image files, similar to original behavior
-    $query_images = "AND (file_ext LIKE 'JPG' OR file_ext LIKE 'jpg' OR file_ext LIKE 'JPEG' OR file_ext LIKE 'jpeg' OR file_ext LIKE 'png' OR file_ext LIKE 'PNG' OR file_ext LIKE 'webp' OR file_ext LIKE 'WEBP')";
-
-    if ($get_folder_id == 0 && isset($_GET["q"])) {
-        $sql = mysqli_query(
-            $mysqli,
-            "SELECT SQL_CALC_FOUND_ROWS * FROM files
-             LEFT JOIN users ON file_created_by = user_id
-             WHERE file_client_id = $client_id
-             AND file_archived_at IS NULL
-             AND (file_name LIKE '%$q%' OR file_ext LIKE '%$q%' OR file_description LIKE '%$q%')
-             $query_images
-             ORDER BY file_name ASC
-             LIMIT $record_from, $record_to"
-        );
-    } else {
-        $sql = mysqli_query(
-            $mysqli,
-            "SELECT SQL_CALC_FOUND_ROWS * FROM files
-             LEFT JOIN users ON file_created_by = user_id
-             WHERE file_client_id = $client_id
-             AND file_folder_id = $folder_id
-             AND file_archived_at IS NULL
-             AND (file_name LIKE '%$q%' OR file_ext LIKE '%$q%' OR file_description LIKE '%$q%')
-             $query_images
-             ORDER BY file_name ASC
-             LIMIT $record_from, $record_to"
-        );
-    }
-
-    $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-} else {
-
-    // -------- LIST VIEW: build unified items[] --------
-
-    // Folder filter
-    if ($get_folder_id == 0 && isset($_GET["q"])) {
-        $file_folder_snippet = "";         // search across all folders
-        $doc_folder_snippet  = "";
-    } else {
-        $file_folder_snippet = "AND file_folder_id = $folder_id";
-        $doc_folder_snippet  = "AND document_folder_id = $folder_id";
-    }
-
-    // Search filters
-    $safe_q = mysqli_real_escape_string($mysqli, $q);
-
-    $file_search_snippet = "";
-    if (!empty($q)) {
-        $file_search_snippet = "AND (file_name LIKE '%$safe_q%' OR file_ext LIKE '%$safe_q%' OR file_description LIKE '%$safe_q%')";
-    }
-
-    $doc_search_snippet = "";
-    if (!empty($q)) {
-        $doc_search_snippet = "AND (MATCH(document_content_raw) AGAINST ('$safe_q') OR document_name LIKE '%$safe_q%')";
-    }
-
-    // Files query (NO limit - we'll paginate in PHP)
-    $sql_files = mysqli_query(
-        $mysqli,
-        "SELECT files.*, users.user_name
-         FROM files
-         LEFT JOIN users ON file_created_by = user_id
-         WHERE file_client_id = $client_id
-         AND file_archived_at IS NULL
-         $file_folder_snippet
-         $file_search_snippet"
-    );
-
-    // Documents query (NO limit - paginate in PHP)
-    $sql_documents = mysqli_query(
-        $mysqli,
-        "SELECT documents.*, users.user_name
-         FROM documents
-         LEFT JOIN users ON document_created_by = user_id
-         WHERE document_client_id = $client_id
-         AND document_archived_at IS NULL
-         $doc_folder_snippet
-         $doc_search_snippet"
-    );
-
-    // Normalize FILES into $items
-    while ($row = mysqli_fetch_assoc($sql_files)) {
-        $file_id            = intval($row['file_id']);
-        $file_name          = nullable_htmlentities($row['file_name']);
-        $file_description   = nullable_htmlentities($row['file_description']);
-        $file_reference_name= nullable_htmlentities($row['file_reference_name']);
-        $file_ext           = nullable_htmlentities($row['file_ext']);
-        $file_size          = intval($row['file_size']);
-        $file_mime_type     = nullable_htmlentities($row['file_mime_type']);
-        $file_uploaded_by   = nullable_htmlentities($row['user_name']);
-        $file_created_at    = nullable_htmlentities($row['file_created_at']);
-
-        // determine icon
-        if ($file_ext == 'pdf') {
-            $file_icon = "file-pdf";
-        } elseif (in_array($file_ext, ['gz','tar','zip','7z','rar'])) {
-            $file_icon = "file-archive";
-        } elseif (in_array($file_ext, ['txt','md'])) {
-            $file_icon = "file-alt";
-        } elseif ($file_ext == 'msg') {
-            $file_icon = "envelope";
-        } elseif (in_array($file_ext, ['doc','docx','odt'])) {
-            $file_icon = "file-word";
-        } elseif (in_array($file_ext, ['xls','xlsx','ods'])) {
-            $file_icon = "file-excel";
-        } elseif (in_array($file_ext, ['pptx','odp'])) {
-            $file_icon = "file-powerpoint";
-        } elseif (in_array($file_ext, ['mp3','wav','ogg'])) {
-            $file_icon = "file-audio";
-        } elseif (in_array($file_ext, ['mov','mp4','av1'])) {
-            $file_icon = "file-video";
-        } elseif (in_array($file_ext, ['jpg','jpeg','png','gif','webp','bmp','tif'])) {
-            $file_icon = "file-image";
-        } else {
-            $file_icon = "file";
-        }
-
-        $items[] = [
-            'kind'              => 'file',
-            'id'                => $file_id,
-            'name'              => $file_name,
-            'description'       => $file_description,
-            'reference_name'    => $file_reference_name,
-            'icon'              => $file_icon,
-            'mime'              => $file_mime_type,
-            'size'              => $file_size,
-            'created_at'        => $file_created_at,
-            'created_by'        => $file_uploaded_by,
-        ];
-    }
-
-    // Normalize DOCUMENTS into $items
-    while ($row = mysqli_fetch_assoc($sql_documents)) {
-        $document_id              = intval($row['document_id']);
-        $document_name            = nullable_htmlentities($row['document_name']);
-        $document_description     = nullable_htmlentities($row['document_description']);
-        $document_created_by_name = nullable_htmlentities($row['user_name']);
-        $document_created_at      = $row['document_created_at'];
-
-        $items[] = [
-            'kind'              => 'document',
-            'id'                => $document_id,
-            'name'              => $document_name,
-            'description'       => $document_description,
-            'mime'              => 'Document',
-            'size'              => null,
-            'created_at'        => $document_created_at,
-            'created_by'        => $document_created_by_name,
-        ];
-    }
-
-    // Sort combined items
-    $sort = isset($_GET['sort']) ? $_GET['sort'] : 'name';
-    $order = isset($_GET['order']) ? $_GET['order'] : 'ASC';
-
-    usort($items, function($a, $b) use ($sort, $order) {
-        $direction = ($order === 'DESC') ? -1 : 1;
-
-        if ($sort == 'created') {
-            $valA = strtotime($a['created_at']);
-            $valB = strtotime($b['created_at']);
-        } elseif ($sort == 'type') {
-            $valA = strtolower($a['mime']);
-            $valB = strtolower($b['mime']);
-        } elseif ($sort == 'size') {
-            $valA = (int)($a['size'] ?? 0);
-            $valB = (int)($b['size'] ?? 0);
-        } else {
-            // default: name
-            $valA = strtolower($a['name']);
-            $valB = strtolower($b['name']);
-        }
-
-        if ($valA == $valB) {
-            return 0;
-        }
-
-        return ($valA < $valB) ? -1 * $direction : 1 * $direction;
-    });
-
-    // Total items (for pagination footer)
-    $total_items = count($items);
-    $num_rows = [$total_items];
-
-    // Apply pagination slice
-    $items = array_slice($items, $record_from, $record_to);
-}
-
-// ---------------------------------------------
-// Root folder count (for "/" badge)
-// ---------------------------------------------
-$row_root_files = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files WHERE file_folder_id = 0 AND file_client_id = $client_id AND file_archived_at IS NULL"));
-$row_root_docs  = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_folder_id = 0 AND document_client_id = $client_id AND document_archived_at IS NULL"));
-$num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num']);
-
-?>
-
-<div class="card card-dark">
-
-    <div class="card-header py-2">
-        <h3 class="card-title mt-2"><i class="fa fa-fw fa-folder mr-2"></i>Files</h3>
-
-        <div class="card-tools">
-
-            <div class="btn-group">
-                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
-                    <i class="fas fa-fw fa-plus mr-2"></i>New
-                </button>
-                <div class="dropdown-menu dropdown-menu-right">
-                    <a class="dropdown-item text-dark ajax-modal" href="#"
-                       data-modal-url="modals/file/file_upload.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>">
-                        <i class="fas fa-fw fa-cloud-upload-alt mr-2"></i>Upload File
-                    </a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item text-dark ajax-modal" href="#"
-                        data-modal-url="modals/document/document_add.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>"
-                        data-modal-size="lg">
-                        <i class="fas fa-fw fa-file-alt mr-2"></i>Document
-                    </a>
-                    <a class="dropdown-item text-dark ajax-modal" href="#"
-                        data-modal-url="modals/document/document_add_from_template.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>">
-                        <i class="fas fa-fw fa-file mr-2"></i>Document from Template
-                    </a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item text-dark ajax-modal" href="#"
-                       data-modal-url="modals/folder/folder_add.php?client_id=<?= $client_id ?>&current_folder_id=<?= $get_folder_id ?>">
-                        <i class="fa fa-fw fa-folder-plus mr-2"></i>Folder
-                    </a>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="card-body">
-        <div class="row">
-
-            <!-- Folders -->
-            <div class="col-md-3 border-right mb-3">
-                <h4>Folders</h4>
-                <hr>
-                <ul class="nav nav-pills flex-column bg-light">
-                    <li class="nav-item">
-                        <a class="nav-link <?php if ($get_folder_id == 0) { echo "active"; } ?>"
-                           href="?client_id=<?php echo $client_id; ?>&folder_id=0">
-                            / <?php if ($num_root_items > 0) { echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_root_items</span>"; } ?>
-                        </a>
-                    </li>
-                    <?php
-                    // Start folder tree from root
                     display_folders(0, $client_id);
                     ?>
                 </ul>
+                <?php //require_once "modals/folder/folder_add.php"; ?>
             </div>
 
-            <!-- Main content -->
+
             <div class="col-md-9">
 
-                <!-- Search + view toggle -->
                 <form autocomplete="off">
                     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                     <input type="hidden" name="view" value="<?php echo $view; ?>">
@@ -430,9 +241,7 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
                     <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"
+                                <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"; } ?>">
-                                       value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>"
-                                       placeholder="Search files and documents in <?php echo ($get_folder_id == 0 ? 'all folders' : 'current folder'); ?>">
                                 <div class="input-group-append">
                                     <button class="btn btn-dark"><i class="fa fa-search"></i></button>
                                 </div>
@@ -440,8 +249,8 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
                         </div>
                         <div class="col-md-7">
                             <div class="btn-group float-right">
-                                <a href="?<?php echo $url_query_strings_sort; ?>&view=0&folder_id=<?php echo $get_folder_id; ?>" class="btn <?php if($view == 0){ echo "btn-primary"; } else { echo "btn-outline-secondary"; } ?>"><i class="fas fa-list-ul"></i></a>
+                                <a href="?<?php echo $url_query_strings_sort; ?>&view=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&folder_id=<?php echo $get_folder_id; ?>" class="btn <?php if($view == 1){ echo "btn-primary"; } else { echo "btn-outline-secondary"; } ?>"><i class="fas fa-th-large"></i></a>
+                                <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">
@@ -449,14 +258,14 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
                                     </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 ?>&current_folder_id=<?= $get_folder_id ?>"
+                                            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 Files
+                                            <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 Files
+                                            <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                         </button>
                                     </div>
                                 </div>
@@ -466,7 +275,6 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
                     </div>
                 </form>
 
-                <!-- Breadcrumb -->
                 <nav class="mt-3">
                     <ol class="breadcrumb">
                         <li class="breadcrumb-item">
@@ -474,24 +282,34 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
                                 <i class="fas fa-fw fa-folder mr-2"></i>Root
                             </a>
                         </li>
-                        <?php foreach ($folder_path as $folder) {
+                        <?php
-                            $bread_crumb_folder_id   = $folder['folder_id'];
+                        // Output breadcrumb items for each folder in the path
-                            $bread_crumb_folder_name = $folder['folder_name']; ?>
+                        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 } ?>
+                            <?php
+                        }
+                        ?>
                     </ol>
                 </nav>
 
                 <hr>
 
-                <?php if ($view == 1) { ?>
+                <?php
+
+                if($view == 1){
+
+                ?>
 
-                    <!-- THUMBNAIL VIEW (files only) -->
                 <div class="row">
+
                     <?php
                     $files = [];
                     while ($row = mysqli_fetch_array($sql)) {
@@ -504,20 +322,23 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
                         $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; ?>)">
+                            <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>
@@ -558,22 +379,24 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
 
                         <?php
                         require "modals/file/file_view.php";
+
                     }
                     ?>
                     <script>
+                        // Pass PHP array to JavaScript
                         var files = <?php echo json_encode($files); ?>;
-                            var currentIndex = 0;
+                        var currentIndex = 0; // Keep track of which file is displayed
                     </script>
                 </div>
 
                 <?php } else { ?>
 
-                    <!-- LIST VIEW: unified Files + Documents -->
                 <form id="bulkActions" action="post.php" method="post">
                     <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
                     <div class="table-responsive-sm">
                         <table class="table border">
+
                             <thead class="thead-light <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
                             <tr>
                                 <td class="bg-light pr-0">
@@ -582,23 +405,23 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
                                     </div>
                                 </td>
                                 <th>
-                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=name&order=<?php echo $disp; ?>">
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_name&order=<?php echo $disp; ?>">
-                                            Name <?php if ($sort == 'name') { echo $order_icon; } ?>
+                                        Name <?php if ($sort == 'file_name') { echo $order_icon; } ?>
                                     </a>
                                 </th>
                                 <th>
-                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=type&order=<?php echo $disp; ?>">
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_mime_type&order=<?php echo $disp; ?>">
-                                            Type <?php if ($sort == 'type') { echo $order_icon; } ?>
+                                        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=size&order=<?php echo $disp; ?>">
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_size&order=<?php echo $disp; ?>">
-                                            Size <?php if ($sort == 'size') { echo $order_icon; } ?>
+                                        Size <?php if ($sort == 'file_size') { echo $order_icon; } ?>
                                     </a>
                                 </th>
                                 <th>
-                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=created&order=<?php echo $disp; ?>">
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_created_at&order=<?php echo $disp; ?>">
-                                            Uploaded <?php if ($sort == 'created') { echo $order_icon; } ?>
+                                        Uploaded <?php if ($sort == 'file_created_at') { echo $order_icon; } ?>
                                     </a>
                                 </th>
                                 <th></th>
@@ -607,22 +430,46 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
                             </thead>
 
                             <tbody>
+
                             <?php
-                                foreach ($items as $item) {
+                            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']);
 
-                                    if ($item['kind'] === 'file') {
+                                // Check if shared
-                                        $file_id            = $item['id'];
-                                        $file_name          = $item['name'];
-                                        $file_description   = $item['description'];
-                                        $file_reference_name= $item['reference_name'];
-                                        $file_icon          = $item['icon'];
-                                        $file_size          = $item['size'];
-                                        $file_size_KB       = $file_size ? number_format($file_size / 1024) : 0;
-                                        $file_mime_type     = $item['mime'];
-                                        $file_uploaded_by   = $item['created_by'];
-                                        $file_created_at    = $item['created_at'];
-
-                                        // Shared?
                                 $sql_shared = mysqli_query(
                                     $mysqli,
                                     "SELECT * FROM shared_items
@@ -634,13 +481,25 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
                                     AND item_related_id = $file_id
                                     LIMIT 1"
                                 );
-                                        $file_shared = (mysqli_num_rows($sql_shared) > 0);
+                                $file_shared = (mysqli_num_rows($sql_shared) > 0) ? true : false;
                                 if ($file_shared) {
-                                            $row_shared = mysqli_fetch_array($sql_shared);
+                                    $row = mysqli_fetch_array($sql_shared);
-                                            $item_recipient       = nullable_htmlentities($row_shared['item_recipient']);
+                                    $item_id = intval($row['item_id']);
-                                            $item_expire_at_human = timeAgo($row_shared['item_expire_at']);
+                                    $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">
@@ -718,118 +577,10 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
                                 <?php
                                 require "modals/file/file_link_asset.php";
 
-                                    } else {
-                                        // DOCUMENT ROW
-                                        $document_id              = $item['id'];
-                                        $document_name            = $item['name'];
-                                        $document_description     = $item['description'];
-                                        $document_created_by_name = $item['created_by'];
-                                        $document_created_at      = date("m/d/Y", strtotime($item['created_at']));
-
-                                        $sql_shared = mysqli_query(
-                                            $mysqli,
-                                            "SELECT * FROM shared_items
-                                             WHERE item_client_id = $client_id
-                                             AND item_active = 1
-                                             AND item_views != item_view_limit
-                                             AND item_expire_at > NOW()
-                                             AND item_type = 'Document'
-                                             AND item_related_id = $document_id
-                                             LIMIT 1"
-                                        );
-                                        $doc_shared = (mysqli_num_rows($sql_shared) > 0);
-                                        if ($doc_shared) {
-                                            $row_shared = mysqli_fetch_array($sql_shared);
-                                            $item_recipient       = nullable_htmlentities($row_shared['item_recipient']);
-                                            $item_expire_at_human = timeAgo($row_shared['item_expire_at']);
-                                        }
-                                        ?>
-                                        <tr>
-                                            <td class="bg-light pr-0">
-                                                <div class="form-check">
-                                                    <input class="form-check-input bulk-select" type="checkbox" name="document_ids[]" value="<?php echo $document_id ?>">
-                                                </div>
-                                            </td>
-                                            <td>
-                                                <a href="document_details.php?client_id=<?php echo $client_id; ?>&document_id=<?php echo $document_id; ?>">
-                                                    <div class="media">
-                                                        <i class="fa fa-fw fa-2x fa-file-alt text-dark mr-3"></i>
-                                                        <div class="media-body">
-                                                            <p>
-                                                                <?php echo $document_name; ?>
-                                                                <br>
-                                                                <small class="text-secondary"><?php echo $document_description; ?></small>
-                                                            </p>
-                                                        </div>
-                                                    </div>
-                                                </a>
-                                            </td>
-                                            <td>Document</td>
-                                            <td>-</td>
-                                            <td>
-                                                <?php echo $document_created_at; ?>
-                                                <div class="text-secondary mt-1"><?php echo $document_created_by_name; ?></div>
-                                            </td>
-                                            <td>
-                                                <?php if ($doc_shared) { ?>
-                                                    <div class="media" title="Expires <?php echo $item_expire_at_human; ?>">
-                                                        <i class="fas fa-link mr-2 mt-1"></i>
-                                                        <div class="media-body">Shared
-                                                            <br>
-                                                            <small class="text-secondary"><?php echo $item_recipient; ?></small>
-                                                        </div>
-                                                    </div>
-                                                <?php } ?>
-                                            </td>
-                                            <td>
-                                                <div class="dropdown dropleft text-center">
-                                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                                                        <i class="fas fa-ellipsis-h"></i>
-                                                    </button>
-                                                    <div class="dropdown-menu">
-                                                        <a class="dropdown-item ajax-modal" href="#"
-                                                           data-modal-size="lg"
-                                                           data-modal-url="modals/document/document_view.php?id=<?= $document_id ?>">
-                                                            <i class="fas fa-fw fa-eye mr-2"></i>Quick View
-                                                        </a>
-                                                        <div class="dropdown-divider"></div>
-                                                        <a class="dropdown-item ajax-modal" href="#"
-                                                           data-modal-size="lg"
-                                                           data-modal-url="modals/document/document_edit.php?id=<?= $document_id ?>">
-                                                            <i class="fas fa-fw fa-pencil-alt mr-2"></i>Edit
-                                                        </a>
-                                                        <div class="dropdown-divider"></div>
-                                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'Document', $document_id"; ?>)">
-                                                            <i class="fas fa-fw fa-share mr-2"></i>Share
-                                                        </a>
-                                                        <div class="dropdown-divider"></div>
-                                                        <a class="dropdown-item ajax-modal" href="#"
-                                                           data-modal-url="modals/document/document_rename.php?id=<?= $document_id ?>">
-                                                            <i class="fas fa-fw fa-pencil-alt mr-2"></i>Rename
-                                                        </a>
-                                                        <a class="dropdown-item ajax-modal" href="#"
-                                                           data-modal-url="modals/document/document_move.php?id=<?= $document_id ?>">
-                                                            <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
-                                                        </a>
-                                                        <?php if ($session_user_role == 3) { ?>
-                                                            <div class="dropdown-divider"></div>
-                                                            <a class="dropdown-item text-danger confirm-link" href="post.php?archive_document=<?php echo $document_id; ?>">
-                                                                <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                                            </a>
-                                                            <div class="dropdown-divider"></div>
-                                                            <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_document=<?php echo $document_id; ?>">
-                                                                <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                                            </a>
-                                                        <?php } ?>
-                                                    </div>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                        <?php
-                                    }
                             }
                             ?>
                             </tbody>
+
                         </table>
                     </div>
                 </form>
@@ -856,12 +607,12 @@ function updateModalContent() {
 }
 
 function nextFile() {
-    currentIndex = (currentIndex + 1) % files.length;
+    currentIndex = (currentIndex + 1) % files.length; // loop around
     updateModalContent();
 }
 
 function prevFile() {
-    currentIndex = (currentIndex - 1 + files.length) % files.length;
+    currentIndex = (currentIndex - 1 + files.length) % files.length; // loop around
     updateModalContent();
 }
 </script>
@@ -871,5 +622,4 @@ function prevFile() {
 <?php
 require_once "modals/share_modal.php";
 require_once "modals/file/file_delete.php";
-//require_once "modals/document/document_add_from_template.php";
 require_once "../includes/footer.php";

agent/files_legacy.php

@@ -1,622 +0,0 @@
-<?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,7 +53,6 @@ $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>
@@ -66,7 +65,6 @@ $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>
@@ -79,7 +77,6 @@ $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>
@@ -92,7 +89,6 @@ $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>
@@ -105,7 +101,6 @@ $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>
@@ -118,7 +113,6 @@ $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>
@@ -131,7 +125,6 @@ $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>
@@ -144,7 +137,6 @@ $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>
@@ -157,7 +149,6 @@ $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,6 +199,7 @@
                                 <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>
@@ -212,6 +213,7 @@
                                 <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>
@@ -233,12 +235,25 @@
                             </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-folder"></i>
+                            <i class="nav-icon fas fa-paperclip"></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 client_id = location_client_id AND location_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 contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1
         WHERE client_id = $client_id"
     );
 

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 client_id = contact_client_id AND contact_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 locations ON clients.client_id = locations.location_client_id AND location_primary = 1
         WHERE invoice_id = $invoice_id
         $access_permission_query
         LIMIT 1"
@@ -277,8 +277,7 @@ 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 ajax-modal" href="#"
+                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addInvoiceRecurringModal<?php echo $invoice_id; ?>">
-                                    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>
@@ -457,10 +456,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="decimal" pattern="[0-9]*\.?[0-9]{0,2}" class="form-control" style="text-align: center;" id="qty" name="qty" placeholder="Qty">
+                                            <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">
                                         </td>
                                         <td>
-                                            <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; ?>)">
+                                            <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; ?>)">
                                         </td>
                                         <td>
                                             <select class="form-control select2" name="tax_id" id="tax" required>
@@ -726,6 +725,7 @@ 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,14 +162,10 @@ $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"
+                <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>
-                    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 ajax-modal" href="#"
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportInvoicesModal">
-                         data-modal-url="modals/invoice/invoice_export.php?<?= $client_url ?>">
                         <i class="fa fa-fw fa-download mr-2"></i>Export
                     </a>
                 </div>
@@ -348,6 +344,8 @@ $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) {
@@ -358,15 +356,6 @@ $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>
@@ -406,8 +395,10 @@ $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 (mysqli_num_rows($sql_saved_payment_methods) > 0 && ($invoice_status === 'Sent' || $invoice_status === 'Viewed')) { ?>
+                                            <?php if ($invoice_status !== 'Partial' && $config_stripe_enable && $stripe_id && $stripe_pm) { ?>
-                                                <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 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>
                                                 <div class="dropdown-divider"></div>
                                             <?php } ?>
                                         <?php } ?>
@@ -457,4 +448,5 @@ $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,14 +84,12 @@ $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 ajax-modal" href="#"
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importLocationModal">
-                        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 ajax-modal" href="#"
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportLocationModal">
-                            data-modal-url="modals/location/location_export.php?<?= $client_url ?>">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     <?php } ?>
@@ -405,4 +403,7 @@ $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="decimal" pattern="-?[0-9]*\.?[0-9]{0,2}" name="opening_balance" placeholder="0.00" required>
+                <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="opening_balance" placeholder="0.00" required>
             </div>
         </div>
 

agent/modals/asset/asset_add.php

@@ -27,8 +27,6 @@ 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();
 
 ?>
@@ -467,33 +465,6 @@ 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';
 
-$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-$count = count($asset_ids);
+$count = count($selected_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 ($asset_ids as $asset_id) { ?><input type="hidden" name="asset_ids[]" value="<?= $asset_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $id ?>"><?php } ?>
 
     <div class="modal-body">
 

agent/modals/asset/asset_bulk_assign_contact.php

@@ -3,9 +3,9 @@
 require_once '../../../includes/modal_header.php';
 
 $client_id = intval($_GET['client_id']);
-$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-$count = count($asset_ids);
+$count = count($selected_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 ($asset_ids as $asset_id) { ?><input type="hidden" name="asset_ids[]" value="<?= $asset_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $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']);
-$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-$count = count($asset_ids);
+$count = count($selected_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 ($asset_ids as $asset_id) { ?><input type="hidden" name="asset_ids[]" value="<?= $asset_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $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';
 
-$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-$count = count($asset_ids);
+$count = count($selected_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 ($asset_ids as $asset_id) { ?><input type="hidden" name="asset_ids[]" value="<?= $asset_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $id ?>"><?php } ?>
     <div class="modal-body">
 
         <div class="form-group">

agent/modals/asset/asset_bulk_assign_tags.php

@@ -1,61 +0,0 @@
-<?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';
 
-$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-$count = count($asset_ids);
+$count = count($selected_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 ($asset_ids as $asset_id) { ?><input type="hidden" name="asset_ids[]" value="<?= $asset_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $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';
 
-$asset_ids = array_map('intval', $_GET['asset_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
-$count = count($asset_ids);
+$count = count($selected_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 ($asset_ids as $asset_id) { ?><input type="hidden" name="asset_ids[]" value="<?= $asset_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $id ?>"><?php } ?>
 
     <div class="modal-body">
 

agent/modals/asset/asset_details.php

@@ -70,28 +70,6 @@ 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 
@@ -284,13 +262,8 @@ ob_start();
                     <?php } ?>
                 </div>
                 <div class="card-body">
-                    <?php if ($asset_tags_display) { ?>
-                        <div>
-                            <?= $asset_tags_display ?>
-                        </div>
-                    <?php } ?>   
                     <?php if ($asset_type) { ?>
-                        <div class="mt-1"><i class="fa fa-fw fa-tag text-secondary mr-2"></i><?php echo $asset_type; ?></div>
+                        <div><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>
@@ -380,7 +353,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,14 +50,7 @@ $sql_asset_history = mysqli_query($mysqli, "SELECT * FROM asset_history
     DESC LIMIT 10"
 );
 
-// Tags
+// Generate the HTML form content using output buffering.
-$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();
 ?>
 
@@ -469,33 +462,6 @@ 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,13 +1,6 @@
-<?php
+<div class="modal" id="exportAssetModal" tabindex="-1">
-
+    <div class="modal-dialog">
-require_once '../../../includes/modal_header.php';
+        <div class="modal-content">
-
-$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">
@@ -15,8 +8,10 @@ ob_start();
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
-    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-    <input type="hidden" name="client_id" value="<?= $client_id ?>">
+                <?php if ($client_url) { ?>
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } ?>
 
                 <div class="modal-body">
 
@@ -26,6 +21,6 @@ ob_start();
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
             </form>
-
+        </div>
-<?php
+    </div>
-require_once '../../../includes/modal_footer.php';
+</div>

agent/modals/asset/asset_import.php

@@ -1,13 +1,6 @@
-<?php
+<div class="modal" id="importAssetModal" tabindex="-1">
-
+    <div class="modal-dialog">
-require_once '../../../includes/modal_header.php';
+        <div class="modal-content">
-
-$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">
@@ -15,9 +8,11 @@ ob_start();
                 </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="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-    <input type="hidden" name="client_id" value="<?= $client_id ?>">
                 
+                <?php if ($client_url) { ?>
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } ?>
                 <div class="modal-body">
                     <p><strong>Format csv file with headings & data:</strong><br>Name, Description, Type, Make, Model, Serial, OS, Purchase Date, Assigned To, Location, Physical Location, Notes</p>
                     <hr>
@@ -32,6 +27,6 @@ ob_start();
                     <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>
-<?php
+    </div>
-require_once '../../../includes/modal_footer.php';
+</div>

agent/modals/asset/asset_interface_bulk_edit_network.php

@@ -1,19 +1,6 @@
-<?php
+<div class="modal" id="bulkAssignNetworkModal" tabindex="-1">
-
+    <div class="modal-dialog">
-require_once '../../../includes/modal_header.php';
+        <div class="modal-content">
-
-$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">
@@ -59,7 +46,6 @@ ob_start();
                 <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>
+        </div>
-
+    </div>
-<?php
+</div>
-require_once '../../../includes/modal_footer.php';

agent/modals/asset/asset_interface_bulk_edit_type.php

@@ -1,20 +1,6 @@
-<?php
+<div class="modal" id="bulkSetInterfaceTypeModal" tabindex="-1">
-
+    <div class="modal-dialog">
-require_once '../../../includes/modal_header.php';
+        <div class="modal-content">
-
-$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">
@@ -45,7 +31,6 @@ ob_start();
                 <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>
+        </div>
-
+    </div>
-<?php
+</div>
-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, document_name
+                        SELECT documents.document_id, documents.document_name
                         FROM documents
                         LEFT JOIN asset_documents
                         ON documents.document_id = asset_documents.document_id
                         AND asset_documents.asset_id = $asset_id
-                        WHERE document_client_id = $client_id
+                        WHERE documents.document_client_id = $client_id
-                        AND document_archived_at IS NULL
+                        AND documents.document_archived_at IS NULL
                         AND asset_documents.asset_id IS NULL
-                        ORDER BY document_name ASC
+                        ORDER BY documents.document_name ASC
                     ");
                     while ($row = mysqli_fetch_array($sql_documents_select)) {
                         $document_id = intval($row['document_id']);
@@ -67,3 +67,4 @@ ob_start();
 
 <?php
 require_once '../../../includes/modal_footer.php';
+?>

agent/modals/asset/asset_link_file.php

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

agent/modals/certificate/certificate_export.php

@@ -1,13 +1,6 @@
-<?php
+<div class="modal" id="exportCertificateModal" tabindex="-1">
-
+    <div class="modal-dialog">
-require_once '../../../includes/modal_header.php';
+        <div class="modal-content">
-
-$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">
@@ -15,7 +8,9 @@ ob_start();
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
-    <input type="hidden" name="client_id" value="<?= $client_id ?>">
+                <?php if ($client_url) { ?>
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } ?>
                 <div class="modal-body">
 
                 </div>
@@ -24,6 +19,6 @@ ob_start();
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
             </form>
-
+        </div>
-<?php
+    </div>
-require_once '../../../includes/modal_footer.php';
+</div>

agent/modals/client/client_add.php

@@ -324,7 +324,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
                             </div>
-                            <input type="text" class="form-control" inputmode="decimal" 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="numeric" 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';
 
-$client_ids = array_map('intval', $_GET['client_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-$count = count($client_ids);
+$count = count($selected_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 ($client_ids as $client_id) { ?><input type="hidden" name="client_ids[]" value="<?= $client_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="client_ids[]" value="<?= $id ?>"><?php } ?>
 
     <div class="modal-body">
 

agent/modals/client/client_bulk_assign_tags.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$client_ids = array_map('intval', $_GET['client_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-$count = count($client_ids);
+$count = count($selected_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 ($client_ids as $client_id) { ?><input type="hidden" name="client_ids[]" value="<?= $client_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="client_ids[]" value="<?= $id ?>"><?php } ?>
     <input type="hidden" name="bulk_remove_tags" value="0">
     
     <div class="modal-body">

agent/modals/client/client_bulk_edit_hourly_rate.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$client_ids = array_map('intval', $_GET['client_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-$count = count($client_ids);
+$count = count($selected_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 ($client_ids as $client_id) { ?><input type="hidden" name="client_ids[]" value="<?= $client_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="client_ids[]" value="<?= $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="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="bulk_rate" placeholder="0.00" required>
+                <input type="text" class="form-control" inputmode="numeric" 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';
 
-$client_ids = array_map('intval', $_GET['client_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-$count = count($client_ids);
+$count = count($selected_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 ($client_ids as $client_id) { ?><input type="hidden" name="client_ids[]" value="<?= $client_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="client_ids[]" value="<?= $id ?>"><?php } ?>
 
     <div class="modal-body">
 

agent/modals/client/client_bulk_edit_referral.php

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

agent/modals/client/client_bulk_email.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$client_ids = array_map('intval', $_GET['client_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-$count = count($client_ids);
+$count = count($selected_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 ($client_ids as $client_id) { ?><input type="hidden" name="client_ids[]" value="<?= $client_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="client_ids[]" value="<?= $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="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" placeholder="0.00" required>
+                            <input type="text" class="form-control" inputmode="numeric" 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="decimal"
+                            <input type="text" class="form-control" inputmode="numeric"
                                    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,11 +1,6 @@
-<?php
+<div class="modal" id="exportClientModal" tabindex="-1">
-
+    <div class="modal-dialog">
-require_once '../../../includes/modal_header.php';
+        <div class="modal-content">
-
-ob_start();
-
-?>
-
             <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Clients to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
@@ -20,6 +15,6 @@ ob_start();
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
             </form>
-
+        </div>
-<?php
+    </div>
-require_once '../../../includes/modal_footer.php';
+</div>

agent/modals/client/client_import.php

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

agent/modals/contact/contact_bulk_assign_location.php

@@ -3,9 +3,9 @@
 require_once '../../../includes/modal_header.php';
 
 $client_id = intval($_GET['client_id']);
-$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-$count = count($contact_ids);
+$count = count($selected_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 ($contact_ids as $contact_id) { ?><input type="hidden" name="contact_ids[]" value="<?= $contact_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="contact_ids[]" value="<?= $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';
 
-$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-$count = count($contact_ids);
+$count = count($selected_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 ($contact_ids as $contact_id) { ?><input type="hidden" name="contact_ids[]" value="<?= $contact_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="contact_ids[]" value="<?= $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';
 
-$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-$count = count($contact_ids);
+$count = count($selected_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 ($contact_ids as $contact_id) { ?><input type="hidden" name="contact_ids[]" value="<?= $contact_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="contact_ids[]" value="<?= $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';
 
-$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-$count = count($contact_ids);
+$count = count($selected_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 ($contact_ids as $contact_id) { ?><input type="hidden" name="contact_ids[]" value="<?= $contact_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="contact_ids[]" value="<?= $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';
 
-$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-$count = count($contact_ids);
+$count = count($selected_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 ($contact_ids as $contact_id) { ?><input type="hidden" name="contact_ids[]" value="<?= $contact_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="contact_ids[]" value="<?= $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';
 
-$contact_ids = array_map('intval', $_GET['contact_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-$count = count($contact_ids);
+$count = count($selected_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 ($contact_ids as $contact_id) { ?><input type="hidden" name="contact_ids[]" value="<?= $contact_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="contact_ids[]" value="<?= $id ?>"><?php } ?>
     <div class="modal-body">
 
         <label>From Email / Display Name</label>

agent/modals/contact/contact_details.php

@@ -51,14 +51,7 @@ $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
+$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");
-    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
@@ -84,7 +77,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 ASC
+    ORDER BY credential_name DESC
 ");
 $credential_count = mysqli_num_rows($sql_related_credentials);
 
@@ -383,27 +376,6 @@ 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>
@@ -417,12 +389,6 @@ 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,13 +1,6 @@
-<?php
+<div class="modal" id="exportContactModal" tabindex="-1">
-
+    <div class="modal-dialog">
-require_once '../../../includes/modal_header.php';
+        <div class="modal-content">
-
-$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">
@@ -15,8 +8,9 @@ ob_start();
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
-    <input type="hidden" name="client_id" value="<?= $client_id ?>">
+                <?php if($client_url) { ?>
-
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } ?>
                 <div class="modal-body">
 
                 </div>
@@ -25,6 +19,6 @@ ob_start();
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
             </form>
-
+        </div>
-<?php
+    </div>
-require_once '../../../includes/modal_footer.php';
+</div>

agent/modals/contact/contact_import.php

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

agent/modals/credential/credential_bulk_assign_tags.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$credential_ids = array_map('intval', $_GET['credential_ids'] ?? []);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-$count = count($credential_ids);
+$count = count($selected_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 ($credential_ids as $credential_id) { ?><input type="hidden" name="credential_ids[]" value="<?= $credential_id ?>"><?php } ?>
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="credential_ids[]" value="<?= $id ?>"><?php } ?>
     <div class="modal-body">
         <input type="hidden" name="bulk_remove_tags" value="0">
 

agent/modals/credential/credential_export.php

@@ -1,13 +1,6 @@
-<?php
+<div class="modal" id="exportCredentialModal" tabindex="-1">
-
+    <div class="modal-dialog">
-require_once '../../../includes/modal_header.php';
+        <div class="modal-content">
-
-$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">
@@ -15,8 +8,9 @@ ob_start();
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
-    <input type="hidden" name="client_id" value="<?= $client_id ?>">
+                <?php if ($client_url) { ?>
-
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } ?>
                 <div class="modal-body">
 
                 </div>
@@ -25,6 +19,6 @@ ob_start();
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
             </form>
-
+        </div>
-<?php
+    </div>
-require_once '../../../includes/modal_footer.php';
+</div>

agent/modals/credential/credential_import.php

@@ -1,13 +1,6 @@
-<?php
+<div class="modal" id="importCredentialModal" tabindex="-1">
-
+	<div class="modal-dialog">
-require_once '../../../includes/modal_header.php';
+		<div class="modal-content">
-
-$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">
@@ -15,7 +8,9 @@ ob_start();
 				</button>
 			</div>
 			<form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-	<input type="hidden" name="client_id" value="<?= $client_id ?>">
+				<?php if ($client_url) { ?>
+				<input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+				<?php } ?>
 				<div class="modal-body">
 					<p><strong>Format csv file with headings & data:</strong><br>Name, Description, Username, Password, TOTP, URI</p>
 					<hr>
@@ -30,6 +25,6 @@ ob_start();
 					<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
 				</div>
 			</form>
-
+		</div>
-<?php
+	</div>
-require_once '../../../includes/modal_footer.php';
+</div>