Flag duplicate numbering in debug

CHANGELOG.md

@@ -2,54 +2,6 @@
 
 This file documents all notable changes made to ITFlow.
 
-## [25.12.1] Maint Release
-
-### Major Changes
-- Unified the Client/Agent Login and process (Note only Client Users can Reset passwords from the login page, does not apply to agent users).
-
-### Bug Fixes
-- Fix Payment Provider not adding an account.
-- Fix New ticket button in contact details in the related tickets section.
-
-### New Features & Updates
-- You can now Set Payment Provider income/expense account, expense vendor and expense category upond creation or editing.
-- Moved Saved Payment Provider Methods away from admin side nav to the count link within Payment Providers page.
-- Moved AI Models from the admin side nav to the model count link within AI Providers.
-- Add Favicon Reset.
-
-## [25.12] Stable Release
-
-### Breaking Changes ###
-- For Existing installs: **php-xml** extension needs to be installed for document creation and editing, new install script does this for you as of Dec 6th 2025. To install php-xml: `sudo apt install php-xml`
-
-### Major Changes
-- Consolidated "Files" and "Documents" into a single section called **Files**.
-
-### Bug Fixes
-- Resolved issue with updating asset notes in asset details.
-- Fixed problem with bulk ticket merging.
-- Corrected issue where decimal inputs (e.g., price, cost) weren’t displaying on iPhones in certain forms.
-- Added CSV escaping to the sample export data in areas where a sample CSV template is provided.
-- Fix a race condition where dupe tickets, invoices, recurring invoices, recurring tickets, quotes will be created using the same number if created in parallel espcecially when using the API.
-
-### New Features & Updates
-- Introduced automatic subject-based ticket merging/reply detection. Now, if an email comes from a known contact or domain and the subject matches 95% of a ticket opened in the last 7 days, it will be merged automatically.
-- Added `cleanInput` function to sanitize data before inserting it into the database when using MySQLi prepared statements.
-- Migrated client post functionality to use MySQLi prepared statements.
-- Updated payment method post functionality to use MySQLi prepared statements.
-- Implemented `saveBase64Images()` to convert base64-encoded `<img>` tags into actual image files stored under `/uploads/<module>/<id>/` with secure filenames. Added wrapper functions, and updated document creation to use processed image paths.
-- For new documents and document templates, images are now stored in `/uploads/documents/$document_id` instead of being stored as base64 in the database, using the `saveBase64Images()` function.
-- UI/UX improvements made to the document details page.
-- Removed sidebar quick-add options.
-- Created new folders in the uploads directory: `documents`, `document_templates`, and `recurring_tickets`.
-- Reworked the bulk action function to pass the name arrays, instead of a generic `selected_ids` array. This allows multiple bulk name arrays to be passed at once, currently used for the new file-document merge.
-- Big task: Converted the remaining modals to use the new `ajax-modal` system, enabling more flexible flow expansion going forward.
-- Mail queue: Added a `--no-mx-validation` flag to bypass recipient domain MX validation.
-- Bump PHPMailer from 7.0.0 to 7.0.1.
-- Bump stripe-php from 18.1.0 to 19.0.0.
-- Bump TCPDF from 6.10.0 to 6.10.1.
-- Bump TinyMCE from 8.2.0 to 8.2.2.
-
 ## [25.11.1] Maint Release
 
 ### Fixes
@@ -334,7 +286,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">
-                            <a class="badge badge-dark badge-pill p-2" href="ai_model.php"><?= $ai_model_count ?></a>
+                        <td><?php echo $ai_model_count; ?></td>
                         <td>
                             <div class="dropdown dropleft text-center">
                                 <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">

admin/database_updates.php

@@ -4134,30 +4134,10 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
         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
+    // if (CURRENT_DATABASE_VERSION == '2.3.8') {
+    //     // Insert queries here required to update to DB version 2.3.9
     //     // Then, update the database to the next sequential version
-    //     mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.4.0'");
+    //     mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.9'");
     // }
 
 } 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) {
@@ -503,6 +502,12 @@ if (file_exists($dbSqlFile)) {
     ];
 }
 
+// Duplicate checks
+$duplicate_tickets_sql = mysqli_query($mysqli, "SELECT ticket_number, COUNT(*) AS count FROM tickets GROUP BY ticket_number HAVING count > 1");
+$duplicate_quotes_sql =  mysqli_query($mysqli, "SELECT quote_number, COUNT(*) AS count FROM quotes GROUP BY quote_number HAVING count > 1");
+$duplicate_invoices_sql =  mysqli_query($mysqli, "SELECT invoice_number, COUNT(*) AS count FROM invoices GROUP BY invoice_number HAVING count > 1");
+
+
 $mysqli->close();
 ?>
 
@@ -683,7 +688,7 @@ $mysqli->close();
                 </tbody>
             </table>
         </div>
-
+        
 
         <!-- Database Structure Comparison Table -->
         <h3 class="mt-3">Database Structure Comparison</h3>
@@ -759,6 +764,40 @@ $mysqli->close();
             </table>
         </div>
 
+        <!-- Duplicated ticket/quote/invoice numbers -->
+        <h3 class="mt-3">Duplicated Numbering</h3>
+        <h4>Tickets</h4>
+        <ul>
+            <?php if (mysqli_num_rows($duplicate_tickets_sql) > 0 ) {
+                while ($row = $duplicate_tickets_sql->fetch_assoc()) {
+                    echo "<li>" . $config_ticket_prefix . nullable_htmlentities($row['ticket_number']) . " (" . $row['count'] . ")" . "</li>";
+                }
+            } else {
+                echo "No duplicate ticket numbers.";
+            } ?>
+        </ul>
+        <h4>Quotes</h4>
+        <ul>
+            <?php if (mysqli_num_rows($duplicate_quotes_sql) > 0 ) {
+                while ($row = $duplicate_quotes_sql->fetch_assoc()) {
+                    echo "<li>" . $config_quote_prefix . nullable_htmlentities($row['quote_number']) . " (" . $row['count'] . ")" . "</li>";
+                }
+            } else {
+                echo "No duplicate quote numbers.";
+            } ?>
+        </ul>
+        <h4>Invoices</h4>
+        <ul>
+            <?php if (mysqli_num_rows($duplicate_invoices_sql) > 0 ) {
+                while ($row = $duplicate_invoices_sql->fetch_assoc()) {
+                    echo "<li>" . $config_invoice_prefix . nullable_htmlentities($row['invoice_number']) . " (" . $row['count'] . ")" . "</li>";
+                }
+            } else {
+                echo "No duplicate invoice numbers.";
+            } ?>
+        </ul>
+
+
     </div>
 
 </div>
@@ -766,3 +805,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,21 +67,31 @@
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="/admin/payment_provider.php"
-                           class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['payment_provider.php', 'saved_payment_method.php']) ? 'active' : ''); ?>">
+                        <a href="/admin/payment_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'payment_provider.php' ? 'active' : ''); ?>">
                             <i class="nav-icon far fa-credit-card"></i>
                             <p>Payment Providers</p>
                         </a>
                     </li>
+                    <li class="nav-item">
+                        <a href="/admin/saved_payment_method.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'saved_payment_method.php' ? 'active' : ''); ?>">
+                            <i class="nav-icon far fa-credit-card"></i>
+                            <p>Saved Payments</p>
+                        </a>
+                    </li>
                 <?php } ?>
                     <li class="nav-item">
-                        <a href="/admin/ai_provider.php"
-                        class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['ai_provider.php', 'ai_model.php']) ? 'active' : ''); ?>">
+                        <a href="/admin/ai_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ai_provider.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-robot"></i>
                             <p>AI Providers</p>
                         </a>
                     </li>
-
+                    <li class="nav-item">
+                        <a href="/admin/ai_model.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ai_model.php' ? 'active' : ''); ?>">
+                            <i class="nav-icon fas fa-robot"></i>
+                            <p>AI Models</p>
+                        </a>
+                    </li>
+                
                 <?php if ($config_module_enable_ticketing) { ?>
                     <li class="nav-item">
                         <a href="/admin/ticket_status.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ticket_status.php' ? 'active' : ''); ?>">
@@ -288,7 +296,7 @@
                 </li>
 
                 <?php
-                $sql_custom_links = mysqli_query($mysqli, "SELECT * FROM custom_links
+                $sql_custom_links = mysqli_query($mysqli, "SELECT * FROM custom_links 
                     WHERE custom_link_location = 4 AND custom_link_archived_at IS NULL
                     ORDER BY custom_link_order ASC, custom_link_name ASC"
                 );

admin/modals/api/api_key_add.php

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

admin/modals/payment_provider/payment_provider_add.php

@@ -16,182 +16,85 @@ ob_start();
 
     <div class="modal-body">
 
-        <div class="alert alert-info text-center">
-            <h6>Before Adding a Payment Provider!</h6>
-            We recommend you add an <strong>Account</strong> and <strong>Vendor</strong> based off the Provider name before continuing eg <strong>Stripe</strong>
+        <div class="alert alert-info">
+            An income account named after the provider will always be created and used for income of paid invoices.<br>
+            If "Enable Expense" option is enabled, a matching vendor will also be automatically created for expense tracking. Additionally, an expense category named "Payment Processing" will be created.
         </div>
 
-        <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>
+        <div class="form-group">
+            <label>Provider <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
+                </div>
+                <select class="form-control select2" name="provider">
+                    <option>Stripe</option>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Publishable key <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                </div>
+                <input type="text" class="form-control" name="public_key" placeholder="Publishable API Key (pk_...)">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Secret key <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                </div>
+                <input type="text" class="form-control" name="private_key" placeholder="Secret API Key (sk_...)">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Threshold</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                </div>
+                <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="threshold" placeholder="1000.00">
+            </div>
+            <small class="form-text text-muted">Will not show as an option at Checkout if invoice amount is above this number, 0 disables the threshold check.</small>
+        </div>
 
         <hr>
 
-        <div class="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">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
-                        </div>
-                        <select class="form-control select2" name="provider">
-                            <option>Stripe</option>
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Publishable key <strong class="text-danger">*</strong></label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="public_key" placeholder="Publishable API Key (pk_...)">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Secret key <strong class="text-danger">*</strong></label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="private_key" placeholder="Secret API Key (sk_...)">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Income / Expense Account <strong class="text-danger">*</strong></label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
-                        </div>
-                        <select class="form-control select2" name="account" required>
-                            <option value="">- Select an Account -</option>
-                            <?php
-
-                            $sql = mysqli_query($mysqli, "SELECT account_id, account_name FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $account_id = intval($row['account_id']);
-                                $account_name = nullable_htmlentities($row['account_name']);
-                                ?>
-                                <option <?php if ($account_name === 'Stripe') { echo "selected"; } ?> value="<?= $account_id ?>"><?= $account_name ?></option>
-
-                                <?php
-                            }
-                            ?>
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Threshold</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
-                        </div>
-                        <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="threshold" placeholder="1000.00">
-                    </div>
-                    <small class="form-text text-muted">Will not show as an option at Checkout if invoice amount is above this number, 0 disables the threshold check.</small>
-                </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-expense">
-
-                <div class="form-group">
-                    <div class="custom-control custom-switch">
-                        <input type="checkbox" class="custom-control-input" name="enable_expense" checked value="1" id="enableExpenseSwitch">
-                        <label class="custom-control-label" for="enableExpenseSwitch">Enable Expense</label>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Payment Provider Vendor <strong class="text-danger">*</strong></label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
-                        </div>
-                        <select class="form-control select2" name="expense_vendor" required>
-                            <option value="0">Expense Disabled</option>
-                            <?php
-
-                            $sql = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors WHERE vendor_client_id = 0 AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $vendor_id = intval($row['vendor_id']);
-                                $vendor_name = nullable_htmlentities($row['vendor_name']);
-                                ?>
-                                <option <?php if ($vendor_name === 'Stripe') { echo "selected"; } ?> value="<?= $vendor_id ?>"><?= $vendor_name ?></option>
-
-                                <?php
-                            }
-                            ?>
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Expense Category <strong class="text-danger">*</strong></label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
-                        </div>
-                        <select class="form-control select2" name="expense_category" required>
-                            <option value="">- Select a Category -</option>
-                            <?php
-
-                            $sql = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Expense' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $category_id = intval($row['category_id']);
-                                $category_name = nullable_htmlentities($row['category_name']);
-                                ?>
-                                <option <?php if ($category_name === 'Processing Fee') { echo "selected"; } ?> value="<?= $category_id ?>"><?= $category_name ?></option>
-
-                                <?php
-                            }
-                            ?>
-                        </select>
-                        <div class="input-group-append">
-                            <button class="btn btn-secondary ajax-modal" type="button"
-                                data-modal-url="../admin/modals/category/category_add.php?category=Expense">
-                                <i class="fas fa-plus"></i>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Percentage Fee to expense</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-percent"></i></span>
-                        </div>
-                        <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="percentage_fee" placeholder="Enter Percentage">
-                    </div>
-                    <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
-                </div>
-
-                <div class="form-group">
-                    <label>Flat Fee to expense</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
-                        </div>
-                        <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,3}" name="flat_fee" placeholder="0.030">
-                    </div>
-                    <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
-                </div>
-
+        <div class="form-group">
+            <div class="custom-control custom-switch">
+                <input type="checkbox" class="custom-control-input" name="enable_expense" checked value="1" id="enableExpenseSwitch">
+                <label class="custom-control-label" for="enableExpenseSwitch">Enable Expense</label>
             </div>
         </div>
+
+        <div class="form-group">
+            <label>Percentage Fee to expense</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-percent"></i></span>
+                </div>
+                <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="percentage_fee" placeholder="Enter Percentage">
+            </div>
+            <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
+        </div>
+
+        <div class="form-group">
+            <label>Flat Fee to expense</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                </div>
+                <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,3}" name="flat_fee" placeholder="0.030">
+            </div>
+            <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
+        </div>
+
     </div>
     <div class="modal-footer">
         <button type="submit" name="add_payment_provider" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Add</button>

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']);
-$category_id = intval($row['payment_provider_expense_category']);
+$vendor_id = nullable_htmlentities($row['payment_provider_expense_vendor']);
+$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,170 +21,80 @@ $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="provider_id" value="<?= $provider_id ?>">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+    <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>
+        <div class="form-group">
+            <label>Publishable key <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                </div>
+                <input type="text" class="form-control" name="public_key" placeholder="Publishable API Key (pk_...)" value="<?php echo $public_key; ?>">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Secret key <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                </div>
+                <input type="text" class="form-control" name="private_key" placeholder="Secret API Key (sk_...)" value="<?php echo $private_key; ?>">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Threshold</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                </div>
+                <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="threshold" placeholder="1000.00" value="<?php echo $threshold; ?>">
+            </div>
+            <small class="form-text text-muted">Will not show as an option at Checkout if above this number</small>
+        </div>
 
         <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 ?>">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Secret key <strong class="text-danger">*</strong></label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="private_key" placeholder="Secret API Key (sk_...)" value="<?= $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>
-
-                <div class="form-group">
-                    <label>Threshold</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
-                        </div>
-                        <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="threshold" placeholder="1000.00" value="<?php echo $threshold; ?>">
-                    </div>
-                    <small class="form-text text-muted">Will not show as an option at Checkout if above this number</small>
-                </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-expense">
-
-                <div class="form-group">
-                    <label>Payment Provider Vendor <strong class="text-danger">*</strong></label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
-                        </div>
-                        <select class="form-control select2" name="expense_vendor" required>
-                            <option value="0">Expense Disabled</option>
-                            <?php
-
-                            $sql = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors WHERE vendor_client_id = 0 AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $vendor_id_select = intval($row['vendor_id']);
-                                $vendor_name = nullable_htmlentities($row['vendor_name']);
-                                ?>
-                                <option <?php if ($vendor_id === $vendor_id_select) { echo "selected"; } ?>
-                                    value="<?= $vendor_id_select ?>"><?= $vendor_name ?>
-                                </option>
-
-                                <?php
-                            }
-                            ?>
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Expense Category <strong class="text-danger">*</strong></label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
-                        </div>
-                        <select class="form-control select2" name="expense_category" required>
-                            <option value="">- Select a Category -</option>
-                            <?php
-
-                            $sql_category = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Expense' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                            while ($row = mysqli_fetch_array($sql_category)) {
-                                $category_id_select = intval($row['category_id']);
-                                $category_name = nullable_htmlentities($row['category_name']);
-                                ?>
-                                <option <?php if ($category_id === $category_id_select) { echo "selected"; } ?> value="<?= $category_id_select ?>"><?= $category_name ?></option>
-
-                                <?php
-                            }
-                            ?>
-                        </select>
-                        <div class="input-group-append">
-                            <button class="btn btn-secondary ajax-modal" type="button"
-                                data-modal-url="../admin/modals/category/category_add.php?category=Expense">
-                                <i class="fas fa-plus"></i>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Percentage Fee to expense</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-percent"></i></span>
-                        </div>
-                        <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="percentage_fee" value="<?php echo $percent_fee; ?>" placeholder="Enter Percentage">
-                    </div>
-                    <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
-                </div>
-
-                <div class="form-group">
-                    <label>Flat Fee to expense</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
-                        </div>
-                        <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,3}" name="flat_fee" value="<?php echo $flat_fee; ?>" placeholder="0.030">
-                    </div>
-                    <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
-                </div>
+        <div class="form-group">
+            <div class="custom-control custom-switch">
+                <input type="checkbox" class="custom-control-input" name="enable_expense" <?php if ($vendor_id) { echo "checked";  } ?> value="1" id="enableEditExpenseSwitch">
+                <label class="custom-control-label" for="enableEditExpenseSwitch">Enable Expense</label>
             </div>
+            <small>(Category: Payment Processing -- Vendor: <?php echo $provider_name; ?></small>
         </div>
+
+        <div class="form-group">
+            <label>Percentage Fee to expense</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-percent"></i></span>
+                </div>
+                <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,2}" name="percentage_fee" value="<?php echo $percent_fee; ?>" placeholder="Enter Percentage">
+            </div>
+            <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
+        </div>
+
+        <div class="form-group">
+            <label>Flat Fee to expense</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                </div>
+                <input type="text" class="form-control" inputmode="decimal" pattern="[0-9]*\.?[0-9]{0,3}" name="flat_fee" value="<?php echo $flat_fee; ?>" placeholder="0.030">
+            </div>
+            <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
+        </div>
+
     </div>
     <div 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/user/user_export.php

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

admin/payment_provider.php

@@ -6,10 +6,10 @@ $order = "ASC";
 
 require_once "includes/inc_all_admin.php";
 
-$sql = mysqli_query($mysqli, "SELECT * FROM payment_providers
+$sql = mysqli_query($mysqli, "SELECT * FROM payment_providers 
     LEFT JOIN accounts ON payment_provider_account = account_id
     LEFT JOIN vendors ON payment_provider_expense_vendor = vendor_id
-    LEFT JOIN categories ON payment_provider_expense_category = category_id
+    LEFT JOIN categories ON payment_provider_expense_category = category_id 
     ORDER BY $sort $order"
 );
 
@@ -57,7 +57,7 @@ $num_rows = mysqli_num_rows($sql);
                     <th>
                         <a class="text-dark">Expensed Fee</a>
                     </th>
-                    <th 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">
-                            <a class="badge badge-dark badge-pill p-2" href="saved_payment_method.php"><?= $saved_payment_count ?></a>
-                        </td>
+                        <td><?php echo $saved_payment_count; ?></td>
                         <td>
                             <div class="dropdown dropleft text-center">
                                 <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">

admin/post/ai_model.php

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

admin/post/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']);
-    $expense_vendor = intval($_POST['expense_vendor']) ?? 0;
-    $expense_category = intval($_POST['expense_category']) ?? 0;
+    $enable_expense = intval($_POST['enable_expense'] ?? 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");
-    if (mysqli_num_rows($sql) > 0) {
+    $sql = "SELECT 1 FROM payment_providers WHERE payment_provider_name = '$provider' LIMIT 1";
+    $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']);
-    $expense_vendor = intval($_POST['expense_vendor']) ?? 0;
-    $expense_category = intval($_POST['expense_category']) ?? 0;
+    $enable_expense = intval($_POST['enable_expense'] ?? 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");
 
@@ -67,7 +98,7 @@ if (isset($_POST['edit_payment_provider'])) {
 if (isset($_GET['delete_payment_provider'])) {
 
     validateCSRFToken($_GET['csrf_token']);
-
+    
     $provider_id = intval($_GET['delete_payment_provider']);
 
     // When deleted it cascades deletes

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

@@ -13,18 +13,18 @@ $sql = mysqli_query($mysqli, "
         clients.client_name,
         client_payment_provider.payment_provider_client
     FROM client_saved_payment_methods
-    LEFT JOIN payment_providers
+    LEFT JOIN payment_providers 
         ON client_saved_payment_methods.saved_payment_provider_id = payment_providers.payment_provider_id
-    LEFT JOIN clients
+    LEFT JOIN clients 
         ON client_saved_payment_methods.saved_payment_client_id = clients.client_id
     LEFT JOIN client_payment_provider
         ON client_payment_provider.client_id = client_saved_payment_methods.saved_payment_client_id
         AND client_payment_provider.payment_provider_id = client_saved_payment_methods.saved_payment_provider_id
-    WHERE
-        client_name LIKE '%$q%'
-        OR payment_provider_name LIKE '%$q%'
-        OR saved_payment_description LIKE '%$q%'
-        OR payment_provider_client LIKE '%$q%'
+    WHERE 
+        client_name LIKE '%$q%' 
+        OR payment_provider_name LIKE '%$q%' 
+        OR saved_payment_description LIKE '%$q%' 
+        OR payment_provider_client LIKE '%$q%' 
         OR saved_payment_provider_method LIKE '%$q%'
     ORDER BY $sort $order
 ");
@@ -33,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>
-                            <?= $client_name ?>
-                            <br>
-                            <small class="text-secondary">ID: <?= $client_id ?></small>
-                        </td>
-                        <td>
-                            <?= $provider_name ?>
-                            <br>
-                            <small class="text-secondary">ID: <?= $provider_id ?></small>
-                        </td>
+                        <td><?php echo $client_name; ?> (<?php echo $client_id; ?>)</td>
+                        <td><?php echo $provider_name; ?> (<?php echo $provider_id; ?>)</td>
                         <td><?php echo $saved_payment_description; ?></td>
                         <td><?php echo $provider_client; ?></td>
                         <td><?php echo $provider_payment_method; ?></td>

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/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="#"
-                            data-modal-url="modals/user/user_export.php">
-                            <i class="fa fa-fw fa-download mr-2"></i>Export
-                        </a>
+                        <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>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-danger ajax-modal" href="#"
-                            data-modal-url="modals/user/user_all_reset_password.php"
-                            data-modal-size="lg">
-                            <i class="fas fa-skull-crossbones mr-2"></i>IR
-                        </a>
+                        <a class="dropdown-item text-danger ajax-modal" href="#" data-modal-url="modals/user/user_all_reset_password.php" data-modal-size="lg"><i class="fas fa-skull-crossbones mr-2"></i>IR</a>
                     <?php } ?>
                 </div>
             </div>
@@ -61,7 +54,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </div>
                 <div class="col-md-8">
                     <div class="btn-group float-right">
-                        <a href="?archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>"
+                        <a href="?archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>" 
                             class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"; } ?>">
                             <i class="fa fa-fw fa-archive mr-2"></i>Archived
                         </a>
@@ -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";

agent/ajax.php

@@ -46,10 +46,10 @@ 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
+        LEFT JOIN clients ON ticket_client_id = client_id 
         LEFT JOIN contacts ON ticket_contact_id = contact_id
         LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
         WHERE ticket_number = $merge_into_ticket_number");
@@ -86,7 +86,7 @@ if (isset($_POST['contact_set_notes'])) {
     $notes = sanitizeInput($_POST['notes']);
 
     // Get Contact Details and Client ID for Logging
-    $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id
+    $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id 
         FROM contacts WHERE contact_id = $contact_id"
     );
     $row = mysqli_fetch_array($sql);
@@ -108,7 +108,7 @@ if (isset($_POST['asset_set_notes'])) {
     $notes = sanitizeInput($_POST['notes']);
 
     // Get Asset Details and Client ID for Logging
-    $sql = mysqli_query($mysqli,"SELECT asset_name, asset_client_id
+    $sql = mysqli_query($mysqli,"SELECT asset_name, asset_client_id 
         FROM assets WHERE asset_id = $asset_id"
     );
     $row = mysqli_fetch_array($sql);
@@ -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"));
@@ -496,8 +496,8 @@ if (isset($_POST['update_kanban_ticket'])) {
                 if (!empty($config_smtp_host) && $config_ticket_client_general_notifications == 1) {
 
                     // Get details
-                    $ticket_sql = mysqli_query($mysqli, "SELECT contact_name, contact_email, ticket_prefix, ticket_number, ticket_subject, ticket_status_name, ticket_assigned_to, ticket_url_key, ticket_client_id FROM tickets
-                        LEFT JOIN clients ON ticket_client_id = client_id
+                    $ticket_sql = mysqli_query($mysqli, "SELECT contact_name, contact_email, ticket_prefix, ticket_number, ticket_subject, ticket_status_name, ticket_assigned_to, ticket_url_key, ticket_client_id FROM tickets 
+                        LEFT JOIN clients ON ticket_client_id = client_id 
                         LEFT JOIN contacts ON ticket_contact_id = contact_id
                         LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
                         WHERE ticket_id = $ticket_id
@@ -905,7 +905,7 @@ if (isset($_GET['ai_ticket_summary'])) {
     }
 
     $prompt = "
-    Summarize the following IT support ticket and its responses in a concise, clear, and professional manner.
+    Summarize the following IT support ticket and its responses in a concise, clear, and professional manner. 
     The summary should include:
 
     1. Main Issue: What was the problem reported by the user?
@@ -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

@@ -15,8 +15,8 @@ if (isset($_GET['asset_id'])) {
     $asset_id = intval($_GET['asset_id']);
 
     $sql = mysqli_query($mysqli, "SELECT * FROM assets
-        LEFT JOIN clients ON client_id = asset_client_id
-        LEFT JOIN contacts ON asset_contact_id = contact_id
+        LEFT JOIN clients ON client_id = asset_client_id 
+        LEFT JOIN contacts ON asset_contact_id = contact_id 
         LEFT JOIN locations ON asset_location_id = location_id
         LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1
         WHERE asset_id = $asset_id
@@ -101,7 +101,7 @@ if (isset($_GET['asset_id'])) {
         $ticket_count = mysqli_num_rows($sql_related_tickets);
 
         // Related Recurring Tickets Query
-        $sql_related_recurring_tickets = mysqli_query($mysqli, "SELECT recurring_tickets.* FROM recurring_tickets
+        $sql_related_recurring_tickets = mysqli_query($mysqli, "SELECT recurring_tickets.* FROM recurring_tickets 
             LEFT JOIN recurring_ticket_assets ON recurring_tickets.recurring_ticket_id = recurring_ticket_assets.recurring_ticket_id
             WHERE recurring_ticket_asset_id = $asset_id OR recurring_ticket_assets.asset_id = $asset_id
             GROUP BY recurring_tickets.recurring_ticket_id
@@ -110,10 +110,10 @@ if (isset($_GET['asset_id'])) {
         $recurring_ticket_count = mysqli_num_rows($sql_related_recurring_tickets);
 
         // Related Documents
-        $sql_related_documents = mysqli_query($mysqli, "SELECT * FROM asset_documents
+        $sql_related_documents = mysqli_query($mysqli, "SELECT * FROM asset_documents 
             LEFT JOIN documents ON asset_documents.document_id = documents.document_id
-            WHERE asset_documents.asset_id = $asset_id
-            AND document_archived_at IS NULL
+            WHERE asset_documents.asset_id = $asset_id 
+            AND document_archived_at IS NULL 
             ORDER BY document_name DESC"
         );
         $document_count = mysqli_num_rows($sql_related_documents);
@@ -142,7 +142,7 @@ if (isset($_GET['asset_id'])) {
 
         // Network Interfaces
         $sql_related_interfaces = mysqli_query($mysqli, "
-            SELECT
+            SELECT 
                 ai.interface_id,
                 ai.interface_name,
                 ai.interface_description,
@@ -173,7 +173,7 @@ if (isset($_GET['asset_id'])) {
               )
             LEFT JOIN assets AS connected_assets
               ON connected_assets.asset_id = connected_interfaces.interface_asset_id
-            WHERE
+            WHERE 
                 ai.interface_asset_id = $asset_id
                 AND ai.interface_archived_at IS NULL
             ORDER BY ai.interface_name ASC
@@ -182,7 +182,7 @@ if (isset($_GET['asset_id'])) {
         $interface_count = mysqli_num_rows($sql_related_interfaces);
 
         // Related Files
-        $sql_related_files = mysqli_query($mysqli, "SELECT * FROM asset_files
+        $sql_related_files = mysqli_query($mysqli, "SELECT * FROM asset_files 
             LEFT JOIN files ON asset_files.file_id = files.file_id
             WHERE asset_files.asset_id = $asset_id
             AND file_archived_at IS NULL
@@ -204,7 +204,7 @@ if (isset($_GET['asset_id'])) {
         // Related Documents
         $sql_related_documents = mysqli_query($mysqli, "SELECT * FROM asset_documents, documents
             LEFT JOIN users ON document_created_by = user_id
-            WHERE asset_documents.asset_id = $asset_id
+            WHERE asset_documents.asset_id = $asset_id 
             AND asset_documents.document_id = documents.document_id
             AND document_archived_at IS NULL
             ORDER BY document_name ASC"
@@ -214,7 +214,7 @@ if (isset($_GET['asset_id'])) {
 
         // Related Credentials Query
         $sql_related_credentials = mysqli_query($mysqli, "
-            SELECT
+            SELECT 
                 credentials.credential_id AS credential_id,
                 credentials.credential_name,
                 credentials.credential_description,
@@ -239,8 +239,8 @@ if (isset($_GET['asset_id'])) {
         // Related Software Query
         $sql_related_software = mysqli_query(
             $mysqli,
-            "SELECT * FROM software_assets
-            LEFT JOIN software ON software_assets.software_id = software.software_id
+            "SELECT * FROM software_assets 
+            LEFT JOIN software ON software_assets.software_id = software.software_id 
             WHERE software_assets.asset_id = $asset_id
             AND software_archived_at IS NULL
             ORDER BY software_name DESC"
@@ -250,7 +250,7 @@ if (isset($_GET['asset_id'])) {
 
         // Linked Services
         $sql_linked_services = mysqli_query($mysqli, "SELECT * FROM service_assets, services
-            WHERE service_assets.asset_id = $asset_id
+            WHERE service_assets.asset_id = $asset_id 
             AND service_assets.service_id = services.service_id
             ORDER BY service_name ASC"
         );
@@ -283,7 +283,7 @@ if (isset($_GET['asset_id'])) {
                             <div>
                                 <?= $asset_tags_display ?>
                             </div>
-                        <?php } ?>
+                        <?php } ?>   
                         <?php if ($asset_type) { ?>
                             <div class="mt-1"><i class="fa fa-fw fa-tag text-secondary mr-3"></i><?= $asset_type; ?></div>
                         <?php }
@@ -469,15 +469,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="#"
-                                            data-modal-url="modals/asset/asset_interface_bulk_edit_network.php?client_id=<?= $client_id ?>"
-                                            data-bulk="true">
+                                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#bulkAssignNetworkModal">
                                             <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="#"
-                                            data-modal-url="modals/asset/asset_interface_bulk_edit_type.php?client_id=<?= $client_id ?>"
-                                            data-bulk="true">
+                                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#bulkSetInterfaceTypeModal">
                                             <i class="fas fa-fw fa-ethernet mr-2"></i>Set Type
                                         </a>
                                         <div class="dropdown-divider"></div>
@@ -601,6 +597,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

@@ -92,7 +92,7 @@ if (isset($_GET['tags']) && is_array($_GET['tags']) && !empty($_GET['tags'])) {
 
 //Get Asset Counts
 $row = mysqli_fetch_assoc(mysqli_query($mysqli, "
-    SELECT
+    SELECT 
         COUNT(*) AS all_count,
         SUM(CASE WHEN asset_type IN ('laptop', 'desktop') THEN 1 ELSE 0 END) AS workstation_count,
         SUM(CASE WHEN asset_type = 'server' THEN 1 ELSE 0 END) AS server_count,
@@ -102,8 +102,8 @@ $row = mysqli_fetch_assoc(mysqli_query($mysqli, "
     FROM (
         SELECT assets.* FROM assets
         LEFT JOIN clients ON client_id = asset_client_id
-        LEFT JOIN contacts ON asset_contact_id = contact_id
-        LEFT JOIN locations ON asset_location_id = location_id
+        LEFT JOIN contacts ON asset_contact_id = contact_id 
+        LEFT JOIN locations ON asset_location_id = location_id 
         LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1
         LEFT JOIN asset_tags ON asset_tag_asset_id = asset_id
         LEFT JOIN tags ON tag_id = asset_tag_tag_id
@@ -137,8 +137,8 @@ $sql = mysqli_query(
     $mysqli,
     "SELECT SQL_CALC_FOUND_ROWS * FROM assets
     LEFT JOIN clients ON asset_client_id = client_id
-    LEFT JOIN contacts ON asset_contact_id = contact_id
-    LEFT JOIN locations ON asset_location_id = location_id
+    LEFT JOIN contacts ON asset_contact_id = contact_id 
+    LEFT JOIN locations ON asset_location_id = location_id 
     LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1
     LEFT JOIN asset_tags ON asset_tag_asset_id = asset_id
     LEFT JOIN tags ON tag_id = asset_tag_tag_id
@@ -200,16 +200,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="#"
-                        data-modal-url="modals/asset/asset_import.php?<?= $client_url ?>">
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importAssetModal">
                         <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="#"
-                            data-modal-url="modals/asset/asset_export.php?<?= $client_url ?>">
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportAssetModal">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     <?php } ?>
@@ -244,7 +242,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $sql_locations_filter = mysqli_query($mysqli, "
                                 SELECT DISTINCT location_id, location_name
                                 FROM locations
-                                WHERE location_client_id = $client_id
+                                WHERE location_client_id = $client_id 
                                 AND ( EXISTS (SELECT 1 FROM assets WHERE asset_location_id = location_id  AND $archive_query) OR location_id = $location_filter)
                                 ORDER BY location_name ASC
                             ");
@@ -268,7 +266,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             <?php
                             $sql_clients_filter = mysqli_query($mysqli, "
-                                SELECT DISTINCT client_id, client_name
+                                SELECT DISTINCT client_id, client_name 
                                 FROM clients
                                 JOIN assets ON asset_client_id = client_id
                                 WHERE $archive_query
@@ -465,7 +463,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     IP <?php if ($sort == 'interface_ip') { echo $order_icon; } ?>
                                 </a>
                             </th>
-                        <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Mac_Address', $_GET['show_column'])) { ?>
+                        <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Mac_Address', $_GET['show_column'])) { ?> 
                             <th>
                                 <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=interface_mac&order=<?php echo $disp; ?>">
                                     MAC Address <?php if ($sort == 'interface_mac') { echo $order_icon; } ?>
@@ -607,7 +605,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         }
                         $contact_name = nullable_htmlentities($row['contact_name']);
                         if ($contact_name) {
-                            $contact_name_display = "<a class='ajax-modal' href='#' data-modal-url='modals/contact/contact_details.php?id=$asset_contact_id' data-modal-size='lg'>$contact_name $contact_archive_display</a>";
+                            $contact_name_display = "<a class='ajax-modal' href='#' data-modal-url='modals/contact/contact_details.php?id=$asset_contact_id' data-modal-size='lg'>$contact_name $contact_archive_display</a>";    
                         } else {
                             $contact_name_display = "-";
                         }
@@ -667,7 +665,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                                 <div class="mt-1">
                                                     <?= $asset_tags_display ?>
                                                 </div>
-                                            <?php } ?>
+                                            <?php } ?>   
                                         </div>
                                     </div>
                                 </a>
@@ -791,4 +789,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="#"\
-                            data-modal-url="modals/certificate/certificate_export.php?<?= $client_url ?>">
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportCertificateModal">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     </div>
@@ -79,7 +78,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
     <div class="card-body">
         <form autocomplete="off">
-            <?php if ($client_url) { ?>
+            <?php if ($client_url) { ?> 
             <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
             <?php } ?>
             <input type="hidden" name="archived" value="<?php echo $archived; ?>">
@@ -104,7 +103,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             <?php
                             $sql_clients_filter = mysqli_query($mysqli, "
-                                SELECT DISTINCT client_id, client_name
+                                SELECT DISTINCT client_id, client_name 
                                 FROM clients
                                 JOIN certificates ON certificate_client_id = client_id
                                 WHERE $archive_query
@@ -127,7 +126,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                 <div class="col-md-6">
                     <div class="btn-group float-right">
-                        <a href="?<?php echo $client_url; ?>archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>"
+                        <a href="?<?php echo $client_url; ?>archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>" 
                             class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"; } ?>">
                             <i class="fa fa-fw fa-archive mr-2"></i>Archived
                         </a>
@@ -284,7 +283,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                                 <i class="fas fa-fw fa-archive mr-2"></i>Archive
                                             </a>
                                             <?php } ?>
-
+                                            
                                         <?php } ?>
                                     </div>
                                 </div>
@@ -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="#"
-                            data-modal-url="modals/client/client_import.php">
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importClientModal">
                             <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="#"
-                            data-modal-url="modals/client/client_export.php">
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportClientModal">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     </div>
@@ -130,7 +128,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </div>
 
                         <div class="btn-group">
-                            <a href="?<?php echo $url_query_strings_sort ?>&archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>"
+                            <a href="?<?php echo $url_query_strings_sort ?>&archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>" 
                                 class="btn btn-<?php if ($archived == 1) { echo "primary"; } else { echo "default"; } ?>">
                                 <i class="fa fa-fw fa-archive mr-2"></i>Archived
                             </a>
@@ -139,38 +137,38 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fas fa-fw fa-layer-group"></i><span class="d-none d-sm-inline ml-2">Action</span> (<span id="selectedCount">0</span>)
                                 </button>
                                 <div class="dropdown-menu">
-                                   <a class="dropdown-item ajax-modal" href="#"
+                                   <a class="dropdown-item ajax-modal" href="#" 
                                         data-modal-url="modals/client/client_bulk_add_ticket.php"
                                         data-modal-size="lg"
                                         data-bulk="true">
                                         <i class="fas fa-fw fa-life-ring mr-2"></i>Open Tickets
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item ajax-modal" href="#"
+                                    <a class="dropdown-item ajax-modal" href="#" 
                                         data-modal-url="modals/client/client_bulk_edit_hourly_rate.php"
                                         data-bulk="true">
                                         <i class="fas fa-fw fa-clock mr-2"></i>Set Hourly Rate
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item ajax-modal" href="#"
+                                    <a class="dropdown-item ajax-modal" href="#" 
                                         data-modal-url="modals/client/client_bulk_edit_industry.php"
                                         data-bulk="true">
                                         <i class="fas fa-fw fa-briefcase mr-2"></i>Set Industry
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item ajax-modal" href="#"
+                                    <a class="dropdown-item ajax-modal" href="#" 
                                         data-modal-url="modals/client/client_bulk_edit_referral.php"
                                         data-bulk="true">
                                         <i class="fas fa-fw fa-link mr-2"></i>Set Referral
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item ajax-modal" href="#"
+                                    <a class="dropdown-item ajax-modal" href="#" 
                                         data-modal-url="modals/client/client_bulk_assign_tags.php"
                                         data-bulk="true">
                                         <i class="fas fa-fw fa-tags mr-2"></i>Assign Tags
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item ajax-modal" href="#"
+                                    <a class="dropdown-item ajax-modal" href="#" 
                                         data-modal-url="modals/client/client_bulk_email.php"
                                         data-modal-size="lg"
                                         data-bulk="true">
@@ -195,15 +193,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </div>
                 </div>
             </div>
-            <div
-                class="collapse
-                    <?php
+            <div 
+                class="collapse 
+                    <?php 
                     if (isset($_GET['dtf']) && $_GET['dtf'] !== '1970-01-01'
                         || $industry_filter
                         || $referral_filter
                         || (isset($_GET['tags']) && is_array($_GET['tags']))
                     )
-                    { echo "show"; }
+                    { echo "show"; } 
                     ?>
                 "
                 id="advancedFilter"
@@ -222,10 +220,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         <div class="form-group">
                             <label>Tag</label>
                             <select onchange="this.form.submit()" class="form-control select2" name="tags[]" data-placeholder="- Select Tags -" multiple>
-                                <?php
+                                <?php 
                                 $sql_tags_filter = mysqli_query($mysqli, "
                                     SELECT tags.tag_id, tags.tag_name
-                                    FROM tags
+                                    FROM tags 
                                     LEFT JOIN client_tags ON client_tags.tag_id = tags.tag_id
                                     WHERE tag_type = 1
                                     GROUP BY tags.tag_id
@@ -283,10 +281,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             </div>
         </form>
     </div>
-
+    
     <form id="bulkActions" action="post.php" method="post">
         <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-        <div class="table-responsive">
+        <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>
@@ -366,11 +364,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     }
 
                     // Counts
-
+                    
                     // Contact Count
                     $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL"));
                     $contact_count = $row['num'];
-                    if ($contact_count) {
+                    if ($contact_count) { 
                         $contact_count_display = "<a href='contacts.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-dark p-2' title='Contacts ($contact_count)'><i class='fas fa-fw fa-users mr-2'></i>$contact_count</a>";
                     } else {
                         $contact_count_display = '';
@@ -379,34 +377,34 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     // Vendors Count
                     $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_client_id = $client_id AND vendor_archived_at IS NULL"));
                     $vendor_count = $row['num'];
-                    if ($vendor_count) {
+                    if ($vendor_count) { 
                         $vendor_count_display = "<a href='vendors.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-dark p-2' title='Vendors ($vendor_count)'><i class='fas fa-fw fa-building mr-2'></i>$vendor_count</a>";
                     } else {
                         $vendor_count_display = '';
                     }
-
+                    
                     // Asset Count
                     $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL"));
                     $asset_count = $row['num'];
-                    if ($asset_count) {
+                    if ($asset_count) { 
                         $asset_count_display = "<a href='assets.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Assets ($asset_count)'><i class='fas fa-fw fa-desktop mr-2'></i>$asset_count</a>";
                     } else {
                         $asset_count_display = '';
                     }
-
+                    
                     // Credential Count
                     $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_client_id = $client_id AND credential_archived_at IS NULL"));
                     $credential_count = $row['num'];
-                    if ($credential_count) {
+                    if ($credential_count) { 
                         $credential_count_display = "<a href='credentials.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Credentials ($credential_count)'><i class='fas fa-fw fa-key mr-2'></i>$credential_count</a>";
                     } else {
                         $credential_count_display = '';
                     }
-
+                    
                     // Software Count
                     $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_client_id = $client_id AND software_archived_at IS NULL"));
                     $software_count = $row['num'];
-                    if ($software_count) {
+                    if ($software_count) { 
                         $software_count_display = "<a href='software.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Licenses ($software_count)'><i class='fas fa-fw fa-cube mr-2'></i>$software_count</a>";
                     } else {
                         $software_count_display = '';
@@ -415,7 +413,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     // Ticket Count
                     $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_client_id = $client_id AND ticket_archived_at IS NULL"));
                     $ticket_count = $row['num'];
-                    if ($ticket_count) {
+                    if ($ticket_count) { 
                         $ticket_count_display = "<a href='tickets.php?client_id=$client_id' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Tickets ($ticket_count)'><i class='fas fa-fw fa-life-ring mr-2'></i>$ticket_count</a>";
                     } else {
                         $ticket_count_display = '';
@@ -520,10 +518,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             }
 
                             if (!empty($contact_name)) { ?>
-                                <div class="text-bold">
+                                <div class="text-bold">   
                                     <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><a class="ajax-modal" href="#"
                                         data-modal-url="modals/contact/contact_details.php?client_id=<?= $client_id ?>&id=<?= $contact_id ?>" data-modal-size="lg"><?= $contact_name; ?>
-
+                                        
                                      </a>
                                 </div>
                             <?php } else {
@@ -619,10 +617,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </form>
      <!-- Ends Card Body -->
     <?php require_once "../includes/filter_footer.php"; ?>
-
+    
 </div> <!-- End Card -->
 
 <script src="../js/bulk_actions.js"></script>
 
 <?php
+require_once "modals/client/client_import.php";
+require_once "modals/client/client_export.php";
 require_once "../includes/footer.php";

agent/contact_details.php

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

agent/contacts.php

@@ -98,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="#"
-                        data-modal-url="modals/contact/contact_import.php?<?= $client_url ?>">
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importContactModal">
                         <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="#"
-                        data-modal-url="modals/contact/contact_export.php?<?= $client_url ?>">
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportContactModal">
                         <i class="fa fa-fw fa-download mr-2"></i>Export
                     </a>
                 </div>
@@ -114,7 +112,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
     <div class="card-body">
         <form autocomplete="off">
-            <?php if ($client_url) { ?>
+            <?php if ($client_url) { ?> 
             <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
             <?php } ?>
             <input type="hidden" name="archived" value="<?php echo $archived; ?>">
@@ -136,7 +134,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             <?php
                             $sql_tags_filter = mysqli_query($mysqli, "
                                 SELECT tags.tag_id, tags.tag_name
-                                FROM tags
+                                FROM tags 
                                 LEFT JOIN contact_tags ON contact_tags.tag_id = tags.tag_id
                                 LEFT JOIN contacts ON contact_tags.contact_id = contacts.contact_id
                                 WHERE tag_type = 3
@@ -165,7 +163,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $sql_locations_filter = mysqli_query($mysqli, "
                                 SELECT DISTINCT location_id, location_name
                                 FROM locations
-                                WHERE location_client_id = $client_id
+                                WHERE location_client_id = $client_id 
                                 AND ( EXISTS (SELECT 1 FROM contacts WHERE contact_location_id = location_id  AND $archive_query) OR location_id = $location_filter)
                                 ORDER BY location_name ASC
                             ");
@@ -189,7 +187,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             <?php
                             $sql_clients_filter = mysqli_query($mysqli, "
-                                SELECT DISTINCT client_id, client_name
+                                SELECT DISTINCT client_id, client_name 
                                 FROM clients
                                 JOIN contacts ON contact_client_id = client_id
                                 WHERE $archive_query
@@ -212,7 +210,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                 <div class="col-md-3">
                     <div class="btn-group float-right">
-                        <a href="?<?php echo $client_url; ?>archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>"
+                        <a href="?<?php echo $client_url; ?>archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>" 
                             class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"; } ?>">
                             <i class="fa fa-fw fa-archive mr-2"></i>Archived
                         </a>
@@ -221,7 +219,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
                             </button>
                             <div class="dropdown-menu">
-                                <?php if ($client_url) { ?>
+                                <?php if ($client_url) { ?> 
                                 <a class="dropdown-item ajax-modal" href="#"
                                     data-modal-url="modals/contact/contact_bulk_assign_location.php?<?= $client_url ?>"
                                     data-bulk="true">
@@ -399,7 +397,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         $contact_user_id = intval($row['contact_user_id']);
                         if ($contact_user_id) {
                             $user_exists_display = "<span class='badge badge-pill badge-dark p-1' title='User: $auth_method'><i class='fas fa-fw fa-user'></i></span>";
-                        } else {
+                        } else { 
                             $user_exists_display = "";
                         }
 
@@ -408,25 +406,25 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         // Asset Count
                         $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_contact_id = $contact_id AND asset_archived_at IS NULL"));
                         $asset_count = $row['num'];
-                        if ($asset_count) {
+                        if ($asset_count) { 
                             $asset_count_display = "<a href='contact_details.php?client_id=$client_id&contact_id=$contact_id#assets' class='mr-2 mb-1 badge badge-pill badge-dark p-2' title='Assets ($asset_count)'><i class='fas fa-fw fa-desktop mr-2'></i>$asset_count</a>";
                         } else {
                             $asset_count_display = '';
                         }
-
+                        
                         // Credential Count
                         $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_contact_id = $contact_id AND credential_archived_at IS NULL"));
                         $credential_count = $row['num'];
-                        if ($credential_count) {
+                        if ($credential_count) { 
                             $credential_count_display = "<a href='contact_details.php?client_id=$client_id&contact_id=$contact_id#credentials' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Credentials ($credential_count)'><i class='fas fa-fw fa-key mr-2'></i>$credential_count</a>";
                         } else {
                             $credential_count_display = '';
                         }
-
+                        
                         // Software Count
                         $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software, software_contacts WHERE software.software_id = software_contacts.software_id AND software_contacts.contact_id = $contact_id AND software_archived_at IS NULL"));
                         $software_count = $row['num'];
-                        if ($software_count) {
+                        if ($software_count) { 
                             $software_count_display = "<a href='contact_details.php?client_id=$client_id&contact_id=$contact_id#software' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Licenses ($software_count)'><i class='fas fa-fw fa-cube mr-2'></i>$software_count</a>";
                         } else {
                             $software_count_display = '';
@@ -435,7 +433,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         // Ticket Count
                         $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_contact_id = $contact_id AND ticket_archived_at IS NULL"));
                         $ticket_count = $row['num'];
-                        if ($ticket_count) {
+                        if ($ticket_count) { 
                             $ticket_count_display = "<a href='contact_details.php?client_id=$client_id&contact_id=$contact_id#tickets' class='mr-2 mb-1 badge badge-pill badge-secondary p-2' title='Tickets ($ticket_count)'><i class='fas fa-fw fa-life-ring mr-2'></i>$ticket_count</a>";
                         } else {
                             $ticket_count_display = '';
@@ -493,11 +491,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                                 <div class="mt-1">
                                                     <?php echo $contact_tags_display; ?>
                                                 </div>
-                                            <?php } ?>
+                                            <?php } ?>   
                                         </div>
                                     </div>
                                 </a>
-
+                                
                             </td>
                             <td><?php echo $contact_department; ?></td>
                             <td><?php echo $contact_info_display; ?></td>
@@ -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="#"
-                        data-modal-url="modals/credential/credential_import.php?<?= $client_url ?>">
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importCredentialModal">
                         <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="#"
-                            data-modal-url="modals/credential/credential_export.php?<?= $client_url ?>">
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportCredentialModal">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     <?php } ?>
@@ -153,7 +151,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             <?php
                             $sql_tags_filter = mysqli_query($mysqli, "
                                 SELECT tags.tag_id, tags.tag_name
-                                FROM tags
+                                FROM tags 
                                 LEFT JOIN credential_tags ON credential_tags.tag_id = tags.tag_id
                                 LEFT JOIN credentials ON credential_tags.credential_id = credentials.credential_id
                                 WHERE tag_type = 4
@@ -171,7 +169,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </select>
                     </div>
                 </div>
-
+                
                 <?php if ($client_url) { ?>
                 <div class="col-md-2">
                     <div class="input-group mb-3 mb-md-0">
@@ -200,7 +198,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             <?php
                             $sql_clients_filter = mysqli_query($mysqli, "
-                                SELECT DISTINCT client_id, client_name
+                                SELECT DISTINCT client_id, client_name 
                                 FROM clients
                                 JOIN credentials ON credential_client_id = client_id
                                 WHERE $archive_query
@@ -359,7 +357,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             }
                             $credential_tags_display = implode('', $credential_tag_name_display_array);
 
-                            if ($credential_contact_id) {
+                            if ($credential_contact_id) { 
                                 $credential_contact_display = "<a href='#' class='mr-2 mb-1 badge badge-pill badge-dark p-2 ajax-modal' title='$contact_name'
                                     data-modal-size='lg'
                                     data-modal-url='modals/contact/contact_details.php?id=$credential_contact_id'>
@@ -368,7 +366,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 $credential_contact_display = '';
                             }
 
-                            if ($credential_asset_id) {
+                            if ($credential_asset_id) { 
                                 $credential_asset_display = "<a href='#' class='mr-2 mb-1 badge badge-pill badge-secondary p-2 ajax-modal' title='$asset_name' data-toggle=''
                                     data-modal-size='lg'
                                     data-modal-url='modals/asset/asset_details.php?id=$credential_asset_id'>
@@ -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/document_details.php

@@ -17,7 +17,7 @@ if (isset($_GET['document_id'])) {
 
 $folder_location = 0;
 
-$sql_document = mysqli_query($mysqli, "SELECT * FROM documents
+$sql_document = mysqli_query($mysqli, "SELECT * FROM documents 
     LEFT JOIN folders ON document_folder_id = folder_id
     LEFT JOIN users ON document_created_by = user_id
     WHERE document_client_id = $client_id AND document_id = $document_id
@@ -51,10 +51,10 @@ $page_title = $row['document_name'];
 
 <ol class="breadcrumb d-print-none">
     <li class="breadcrumb-item">
-        <a href="client_overview.php?client_id=<?= $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>
@@ -92,9 +92,9 @@ $page_title = $row['document_name'];
     }
     ?>
     <li class="breadcrumb-item active">
-        <i class="fas fa-file"></i> <?php echo $document_name; ?>
-        <?php if (!empty($document_archived_at)) {
-            echo "<span class='text-danger ml-2'>(ARCHIVED on $document_archived_at)</span>";
+        <i class="fas fa-file"></i> <?php echo $document_name; ?> 
+        <?php if (!empty($document_archived_at)) { 
+            echo "<span class='text-danger ml-2'>(ARCHIVED on $document_archived_at)</span>"; 
         } ?>
     </li>
 </ol>
@@ -170,9 +170,9 @@ $page_title = $row['document_name'];
                             <td><?= $document_version_description_display ?></td>
                             <td><?= $document_version_author ?></td>
                         </tr>
-                        <?php
+                        <?php 
                         $document_version_count++; // Increment the counter
-                        }
+                        } 
                         ?>
                     </tbody>
                 </table>
@@ -202,14 +202,13 @@ $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"
-                    data-modal-url="modals/document/document_link_file.php?document_id=<?= $document_id ?>">
+                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkFileToDocumentModal">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
             <?php
             $sql_files = mysqli_query($mysqli, "SELECT * FROM files, document_files
-                WHERE document_files.file_id = files.file_id
+                WHERE document_files.file_id = files.file_id 
                 AND document_files.document_id = $document_id
                 ORDER BY file_name ASC"
             );
@@ -225,9 +224,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 class="confirm-link" href="post.php?unlink_file_from_document&file_id=<?= $file_id ?>&document_id=<?= $document_id ?>">
-                        <i class="fas fa-fw fa-unlink text-secondary float-right" title="Unlink File"></i>
+                    <a href="files.php?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $folder_id; ?>&q=<?php echo $file_name; ?>" target="_blank"><?php echo $file_name; ?></a>
+                    <a class="confirm-link" href="post.php?unlink_file_from_document&file_id=<?php echo $file_id; ?>&document_id=<?php echo $document_id; ?>">
+                        <i class="fas fa-fw fa-trash-alt text-secondary float-right"></i>
                     </a>
                 </div>
                 <?php
@@ -235,14 +234,13 @@ $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"
-                    data-modal-url="modals/document/document_link_contact.php?document_id=<?= $document_id ?>">
+                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkContactToDocumentModal">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
             <?php
             $sql_contacts = mysqli_query($mysqli, "SELECT contacts.contact_id, contact_name FROM contacts, contact_documents
-                WHERE contacts.contact_id = contact_documents.contact_id
+                WHERE contacts.contact_id = contact_documents.contact_id 
                 AND contact_documents.document_id = $document_id
                 ORDER BY contact_name ASC"
             );
@@ -262,7 +260,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 +268,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 +295,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,14 +303,13 @@ $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"
-                    data-modal-url="modals/document/document_link_software.php?document_id=<?= $document_id ?>">
+                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkSoftwareToDocumentModal">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
             <?php
             $sql_software = mysqli_query($mysqli, "SELECT software.software_id, software_name FROM software, software_documents
-                WHERE software.software_id = software_documents.software_id
+                WHERE software.software_id = software_documents.software_id 
                 AND software_documents.document_id = $document_id
                 ORDER BY software_name ASC"
             );
@@ -329,7 +326,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,14 +334,13 @@ $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"
-                    data-modal-url="modals/document/document_link_vendor.php?document_id=<?= $document_id ?>">
+                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkVendorToDocumentModal">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
             <?php
             $sql_vendors = mysqli_query($mysqli, "SELECT vendors.vendor_id, vendor_name FROM vendors, vendor_documents
-                WHERE vendors.vendor_id = vendor_documents.vendor_id
+                WHERE vendors.vendor_id = vendor_documents.vendor_id 
                 AND vendor_documents.document_id = $document_id
                 ORDER BY vendor_name ASC"
             );
@@ -360,10 +356,10 @@ $page_title = $row['document_name'];
                 ?>
                 <div class="ml-2">
                     <a class="ajax-modal" href="#" data-modal-url="modals/vendor/vendor_details.php?id=<?= $vendor_id ?>">
-                        <?php echo $vendor_name; ?>
+                        <?php echo $vendor_name; ?>        
                     </a>
                     <a class="confirm-link float-right" href="post.php?unlink_vendor_from_document&vendor_id=<?php echo $vendor_id; ?>&document_id=<?php echo $document_id; ?>">
-                        <i class="fas fa-fw fa-unlink text-secondary" title="Unlink Vendor"></i>
+                        <i class="fas fa-fw fa-trash-alt text-secondary"></i>
                     </a>
                 </div>
             <?php
@@ -376,8 +372,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="#"
-                        data-modal-url="modals/document/document_edit_visibility.php?document_id=<?= $document_id ?>">
+                    <a href="#" data-toggle="modal" data-target="#editDocumentClientVisibileModal">
                         <?php
                         if ($document_client_visible) {
                             echo "<span class='text-bold text-dark'>visible</span>";
@@ -432,5 +427,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,479 @@
+<?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
+}
+
+// Folder ID
+$get_folder_id = 0;
+if (!empty($_GET['folder_id'])) {
+    $get_folder_id = intval($_GET['folder_id']);
+}
+
+// Set Folder Location Var used when creating folders
+$folder_location = 0;
+
+if ($get_folder_id == 0 && isset($_GET["q"])) {
+    $sql = mysqli_query(
+        $mysqli,
+        "SELECT SQL_CALC_FOUND_ROWS * FROM documents
+        LEFT JOIN users ON document_created_by = user_id
+        WHERE document_client_id = $client_id
+        AND document_archived_at IS NULL
+        $query_snippet
+        ORDER BY $sort $order LIMIT $record_from, $record_to"
+    );
+}else{
+    $sql = mysqli_query(
+        $mysqli,
+        "SELECT SQL_CALC_FOUND_ROWS * FROM documents
+        LEFT JOIN users ON document_created_by = user_id
+        WHERE document_client_id = $client_id
+        AND document_folder_id = $folder
+        AND document_archived_at IS NULL
+        $query_snippet
+        ORDER BY $sort $order LIMIT $record_from, $record_to"
+    );
+}
+
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+
+// Breadcrumbs
+// Build the full folder path
+$folder_id = $get_folder_id;
+$folder_path = array();
+
+while ($folder_id > 0) {
+    $sql_folder = mysqli_query($mysqli, "SELECT folder_name, parent_folder FROM folders WHERE folder_id = $folder_id");
+    if ($row_folder = mysqli_fetch_assoc($sql_folder)) {
+        $folder_name = nullable_htmlentities($row_folder['folder_name']);
+        $parent_folder = intval($row_folder['parent_folder']);
+
+        // Prepend the folder to the beginning of the array
+        array_unshift($folder_path, array('folder_id' => $folder_id, 'folder_name' => $folder_name));
+
+        // Move up to the parent folder
+        $folder_id = $parent_folder;
+    } else {
+        // If the folder is not found, break the loop
+        break;
+    }
+}
+
+?>
+
+<div class="card card-dark">
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2">
+            <i class="fa fa-fw fa-folder mr-2"></i>Documents
+        </h3>
+        <div class="card-tools">
+
+            <div class="btn-group">
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/document/document_add.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>" data-modal-size="lg">
+                    <i class="fas fa-plus mr-2"></i>New Document
+                </button>
+                <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
+                <div class="dropdown-menu">
+                    <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/folder/folder_add.php?client_id=<?= $client_id ?>&folder_location=0&current_folder_id=<?= $get_folder_id ?>">
+                        <i class="fa fa-fw fa-folder-plus mr-2"></i>New Folder
+                    </a>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addDocumentFromTemplateModal">From Template</a>
+                </div>
+            </div>
+
+        </div>
+
+    </div>
+
+    <div class="card-body">
+        <form autocomplete="off">
+            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+            <input type="hidden" name="folder_id" value="<?php echo $get_folder_id; ?>">
+            <div class="row">
+                <div class="col-md-4">
+                    <div class="input-group mb-3 mb-md-0">
+                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search documents in <?php if($get_folder_id == 0) { echo "all folders"; } else { echo "current folder"; } ?>">
+                        <div class="input-group-append">
+                            <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+                        </div>
+
+                    </div>
+                </div>
+                <div class="col-md-8">
+                    <div class="btn-group float-right">
+                        <div class="dropdown ml-2" id="bulkActionButton" hidden>
+                            <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
+                                <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
+                            </button>
+                            <div class="dropdown-menu">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/document/document_bulk_move.php?client_id=<?= $client_id ?>"
+                                    data-bulk="true">
+                                    <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
+                                </a>
+                                <div class="dropdown-divider"></div>
+                                <button class="dropdown-item text-danger text-bold"
+                                        type="submit" form="bulkActions" name="bulk_delete_documents">
+                                    <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+        
+        <hr>
+
+
+        <div class="row">
+            <div class="col-md-3 border-right mb-3">
+                <h4>Folders</h4>
+                <hr>
+                <ul class="nav nav-pills flex-column bg-light">
+                    <li class="nav-item">
+                        <div class="row">
+                            <div class="col-10">
+                                <?php
+                                // Get a count of documents that have no folder
+                                $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_folder_id = 0 AND document_client_id = $client_id AND document_archived_at IS NULL"));
+                                $num_documents = intval($row['num']);
+                                ?>
+                                <a class="nav-link <?php if ($get_folder_id == 0) { echo "active"; } ?>" href="?client_id=<?php echo $client_id; ?>&folder_id=0">
+                                    / <?php if ($num_documents > 0) { echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_documents</span>"; } ?>
+                                </a>
+                            </div>
+                            <div class="col-2">
+                            </div>
+                        </div>
+                    </li>
+                    <?php
+                    // Function to check if a folder is an ancestor of the current folder
+                    function is_ancestor_folder($folder_id, $current_folder_id, $client_id) {
+                        global $mysqli;
+
+                        // Base case: if current_folder_id is 0 or equal to folder_id
+                        if ($current_folder_id == 0) {
+                            return false;
+                        }
+                        if ($current_folder_id == $folder_id) {
+                            return true;
+                        }
+
+                        // Get the parent folder of the current folder
+                        $result = mysqli_query($mysqli, "SELECT parent_folder FROM folders WHERE folder_id = $current_folder_id AND folder_client_id = $client_id");
+                        if ($row = mysqli_fetch_assoc($result)) {
+                            $parent_folder_id = intval($row['parent_folder']);
+                            // Recursive call to check the parent folder
+                            return is_ancestor_folder($folder_id, $parent_folder_id, $client_id);
+                        } else {
+                            // Folder not found
+                            return false;
+                        }
+                    }
+
+                    // Recursive function to display folders and subfolders
+                    function display_folders($parent_folder_id, $client_id, $indent = 0) {
+                        global $mysqli, $get_folder_id, $session_user_role;
+
+                        $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_location = 0 AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                        while ($row = mysqli_fetch_array($sql_folders)) {
+                            $folder_id = intval($row['folder_id']);
+                            $folder_name = nullable_htmlentities($row['folder_name']);
+
+                            // Get the number of documents in the folder
+                            $row2 = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_folder_id = $folder_id AND document_archived_at IS NULL"));
+                            $num_documents = intval($row2['num']);
+
+                            // Get the number of subfolders
+                            $subfolder_result = mysqli_query($mysqli, "SELECT COUNT(*) AS count FROM folders WHERE parent_folder = $folder_id AND folder_client_id = $client_id");
+                            $subfolder_count = intval(mysqli_fetch_assoc($subfolder_result)['count']);
+
+                            echo '<li class="nav-item">';
+                            echo '<div class="row">';
+                            echo '<div class="col-10">';
+                            echo '<a class="nav-link ';
+                            if ($get_folder_id == $folder_id) { echo "active"; }
+                            echo '" href="?client_id=' . $client_id . '&folder_id=' . $folder_id . '">';
+
+                            // Indentation for subfolders
+                            echo str_repeat('&nbsp;', $indent * 4);
+
+                            // Determine if the folder is open
+                            if ($get_folder_id == $folder_id || is_ancestor_folder($folder_id, $get_folder_id, $client_id)) {
+                                echo '<i class="fas fa-fw fa-folder-open"></i>';
+                            } else {
+                                echo '<i class="fas fa-fw fa-folder"></i>';
+                            }
+
+                            echo ' ' . $folder_name;
+
+                            if ($num_documents > 0) {
+                                echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_documents</span>";
+                            }
+
+                            echo '</a>';
+                            echo '</div>';
+                            echo '<div class="col-2">';
+                            ?>
+                            <div class="dropdown">
+                                <button class="btn btn-sm" type="button" data-toggle="dropdown">
+                                    <i class="fas fa-ellipsis-v"></i>
+                                </button>
+                                <div class="dropdown-menu">
+                                    <a class="dropdown-item ajax-modal" href="#"
+                                        data-modal-url="modals/folder/folder_rename.php?id=<?= $folder_id ?>">
+                                        <i class="fas fa-fw fa-edit mr-2"></i>Rename
+                                    </a>
+                                    <?php
+                                    // Only show delete option if user is admin, folder has no documents, and no subfolders
+                                    if ($session_user_role == 3 && $num_documents == 0 && $subfolder_count == 0) { ?>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_folder=<?php echo $folder_id; ?>">
+                                            <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                        </a>
+                                    <?php } ?>
+                                </div>
+                            </div>
+                            <?php
+                            echo '</div>';
+                            echo '</div>';
+
+                            if ($subfolder_count > 0) {
+                                // Display subfolders
+                                echo '<ul class="nav nav-pills flex-column bg-light">';
+                                display_folders($folder_id, $client_id, $indent + 1);
+                                echo '</ul>';
+                            }
+
+                            echo '</li>';
+                        }
+                    }
+
+                    // Start displaying folders from the root (parent_folder = 0)
+                    display_folders(0, $client_id);
+                    ?>
+                </ul>
+            </div>
+
+            <div class="col-md-9">
+
+                <nav>
+                    <ol class="breadcrumb">
+                        <li class="breadcrumb-item">
+                            <a href="?client_id=<?php echo $client_id; ?>&folder_id=0">
+                                <i class="fas fa-fw fa-folder mr-2"></i>Root
+                            </a>
+                        </li>
+                        <?php
+                        // Output breadcrumb items for each folder in the path
+                        foreach ($folder_path as $folder) {
+                            $bread_crumb_folder_id = $folder['folder_id']; // Already Sanitized before it was pushed into array
+                            $bread_crumb_folder_name = $folder['folder_name']; // Already Sanitized before it was pushed into array
+
+                            ?>
+                            <li class="breadcrumb-item">
+                                <a href="?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $bread_crumb_folder_id; ?>">
+                                    <i class="fas fa-fw fa-folder-open mr-2"></i><?php echo $bread_crumb_folder_name; ?>
+                                </a>
+                            </li>
+                            <?php
+                        }
+                        ?>
+                    </ol>
+                </nav>
+
+                <form id="bulkActions" action="post.php" method="post">
+                    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+                    <div class="table-responsive-sm">
+                        <table class="table table-border">
+                            <thead class="thead-light <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                            <tr>
+                                <td class="bg-light pr-0">
+                                    <div class="form-check">
+                                        <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
+                                    </div>
+                                </td>
+                                <th>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_name&order=<?php echo $disp; ?>">
+                                        Name <?php if ($sort == 'document_name') { echo $order_icon; } ?>
+                                    </a>
+                                </th>
+                                <th>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_created_at&order=<?php echo $disp; ?>">
+                                        Created <?php if ($sort == 'document_created_at') { echo $order_icon; } ?>
+                                    </a>
+                                </th>
+                                <th>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_updated_at&order=<?php echo $disp; ?>">
+                                        Last Update <?php if ($sort == 'document_updated_at') { echo $order_icon; } ?>
+                                    </a>
+                                </th>
+                                <th></th>
+                                <th class="text-center">Action</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <?php
+
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $document_id = intval($row['document_id']);
+                                $document_name = nullable_htmlentities($row['document_name']);
+                                $document_description = nullable_htmlentities($row['document_description']);
+                                $document_content = nullable_htmlentities($row['document_content']);
+                                $document_created_by_name = nullable_htmlentities($row['user_name']);
+                                $document_created_at = date("m/d/Y",strtotime($row['document_created_at']));
+                                if ($row['document_updated_at']) {
+                                    $document_updated_at_display = date("m/d/Y",strtotime($row['document_updated_at']));
+                                } else {
+                                    $document_updated_at_display = "-";
+                                }
+                                $document_folder_id = intval($row['document_folder_id']);
+
+                                // Check if shared
+                                $sql_shared = mysqli_query(
+                                    $mysqli,
+                                    "SELECT * FROM shared_items
+                                    WHERE item_client_id = $client_id
+                                    AND item_active = 1
+                                    AND item_views != item_view_limit
+                                    AND item_expire_at > NOW()
+                                    AND item_type = 'Document'
+                                    AND item_related_id = $document_id
+                                    LIMIT 1"
+                                );
+                                $row = mysqli_fetch_array($sql_shared);
+                                if($row) {
+                                    $item_id = intval($row['item_id']);
+                                    $item_active = nullable_htmlentities($row['item_active']);
+                                    $item_key = nullable_htmlentities($row['item_key']);
+                                    $item_type = nullable_htmlentities($row['item_type']);
+                                    $item_related_id = intval($row['item_related_id']);
+                                    $item_note = nullable_htmlentities($row['item_note']);
+                                    $item_recipient = nullable_htmlentities($row['item_recipient']);
+                                    $item_views = nullable_htmlentities($row['item_views']);
+                                    $item_view_limit = nullable_htmlentities($row['item_view_limit']);
+                                    $item_created_at = nullable_htmlentities($row['item_created_at']);
+                                    $item_expire_at = nullable_htmlentities($row['item_expire_at']);
+                                    $item_expire_at_human = timeAgo($row['item_expire_at']);
+                                }
+
+                                ?>
+
+                                <tr>
+                                    <td class="bg-light pr-0">
+                                        <div class="form-check">
+                                            <input class="form-check-input bulk-select" type="checkbox" name="document_ids[]" value="<?php echo $document_id ?>">
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <a href="document_details.php?client_id=<?php echo $client_id; ?>&document_id=<?php echo $document_id; ?>"><i class="fas fa-fw fa-file-alt"></i> <?php echo $document_name; ?></a>
+                                        <div class="text-secondary mt-1"><?php echo $document_description; ?>
+                                    </td>
+                                    <td>
+                                        <?php echo $document_created_at; ?>
+                                        <div class="text-secondary mt-1"><?php echo $document_created_by_name; ?>
+                                    </td>
+                                    <td><?php echo $document_updated_at_display; ?></td>
+                                    <td>
+                                        <?php if (mysqli_num_rows($sql_shared) > 0) { ?>
+                                            <div class="media" title="Expires <?php echo $item_expire_at_human; ?>">
+                                                <i class="fas fa-link mr-2 mt-1"></i>
+                                                <div class="media-body">Shared
+                                                    <br>
+                                                    <small class="text-secondary"><?php echo $item_recipient; ?></small>
+                                                </div>
+                                            </div>
+                                        <?php } ?>
+                                    </td>
+                                    <td>
+                                        <div class="dropdown dropleft text-center">
+                                            <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                                <i class="fas fa-ellipsis-h"></i>
+                                            </button>
+                                            <div class="dropdown-menu">
+                                                <a class="dropdown-item ajax-modal" href="#"
+                                                    data-modal-size="lg"
+                                                    data-modal-url="modals/document/document_view.php?id=<?= $document_id ?>">
+                                                    <i class="fas fa-fw fa-eye mr-2"></i>Quick View
+                                                </a>
+                                                <div class="dropdown-divider"></div>
+                                                <a class="dropdown-item ajax-modal" href="#"
+                                                    data-modal-size="lg"
+                                                    data-modal-url="modals/document/document_edit.php?id=<?= $document_id ?>">
+                                                    <i class="fas fa-fw fa-pencil-alt mr-2"></i>Edit
+                                                </a>
+                                                <div class="dropdown-divider"></div>
+                                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'Document', $document_id"; ?>)">
+                                                    <i class="fas fa-fw fa-share mr-2"></i>Share
+                                                </a>
+                                                <div class="dropdown-divider"></div>
+                                                <a class="dropdown-item ajax-modal" href="#"
+                                                    data-modal-url="modals/document/document_rename.php?id=<?= $document_id ?>">
+                                                    <i class="fas fa-fw fa-pencil-alt mr-2"></i>Rename
+                                                </a>
+                                                <div class="dropdown-divider"></div>
+                                                <a class="dropdown-item ajax-modal" href="#"
+                                                    data-modal-url="modals/document/document_move.php?id=<?= $document_id ?>">
+                                                    <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
+                                                </a>
+                                                <?php if ($session_user_role == 3) { ?>
+                                                    <div class="dropdown-divider"></div>
+                                                    <a class="dropdown-item text-danger confirm-link" href="post.php?archive_document=<?php echo $document_id; ?>">
+                                                        <i class="fas fa-fw fa-archive mr-2"></i>Archive
+                                                    </a>
+                                                    <div class="dropdown-divider"></div>
+                                                    <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_document=<?php echo $document_id; ?>">
+                                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                                    </a>
+                                                <?php } ?>
+                                            </div>
+                                        </div>
+                                    </td>
+                                </tr>
+
+                            <?php
+
+                            }
+
+                            ?>
+
+                            </tbody>
+                        </table>
+                        <br>
+                    </div>
+                </form>
+                <?php require_once "../includes/filter_footer.php"; ?>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script src="../js/bulk_actions.js"></script>
+
+<?php
+require_once "modals/share_modal.php";
+require_once "modals/document/document_add_from_template.php";
+require_once "../includes/footer.php";

agent/domains.php

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

@@ -368,24 +368,22 @@ $num_root_items = intval($row_root_files['num']) + intval($row_root_docs['num'])
         <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">
+                <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle" data-toggle="dropdown"><i class="fas fa-fw fa-plus mr-2"></i>New</button>
+                <div class="dropdown-menu">
+                    
+                    
                     <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">
+                       data-modal-url="modals/document/document_add.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>">
                         <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 ?>">
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal"
+                       data-target="#addDocumentFromTemplateModal">
                         <i class="fas fa-fw fa-file mr-2"></i>Document from Template
                     </a>
                     <div class="dropdown-divider"></div>
@@ -449,15 +447,24 @@ $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
                                         </a>
+                                        <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 Documents
+                                        </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
                                         </button>
+                                        <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 Documents
+                                        </button>
                                     </div>
                                 </div>
 

agent/invoice.php

@@ -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="#"
-                                    data-modal-url="modals/invoice/invoice_recurring_add.php?invoice_id=<?= $invoice_id ?>">
+                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addInvoiceRecurringModal<?php echo $invoice_id; ?>">
                                     <i class="fa fa-fw fa-sync-alt text-secondary mr-2"></i>Recurring
                                 </a>
                                 <div class="dropdown-divider"></div>
@@ -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"
-                    data-modal-url="modals/invoice/invoice_add.php?<?= $client_url ?>">
-                    <i class="fas fa-plus mr-2"></i>New Invoice
-                </button>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/invoice/invoice_add.php?<?= $client_url ?>"><i class="fas fa-plus mr-2"></i>New Invoice</button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
-                    <a class="dropdown-item text-dark ajax-modal" href="#"
-                         data-modal-url="modals/invoice/invoice_export.php?<?= $client_url ?>">
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportInvoicesModal">
                         <i class="fa fa-fw fa-download mr-2"></i>Export
                     </a>
                 </div>
@@ -221,7 +217,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
                             </button>
                             <div class="dropdown-menu">
-                                <?php if ($client_url && $balance > 0) { ?>
+                                <?php if ($client_url && $balance > 0) { ?> 
                                     <a class="dropdown-item ajax-modal" href="#"
                                         data-modal-url="modals/payment/payment_bulk_add.php?<?= $client_url ?>">
                                         <i class="fa fa-credit-card mr-2"></i>Batch Payment
@@ -361,7 +357,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         // Saved Payment Methods
                         $sql_saved_payment_methods = mysqli_query($mysqli, "
                             SELECT * FROM client_saved_payment_methods
-                            LEFT JOIN payment_providers
+                            LEFT JOIN payment_providers 
                                 ON client_saved_payment_methods.saved_payment_provider_id = payment_providers.payment_provider_id
                             WHERE saved_payment_client_id = $client_id
                             AND payment_provider_active = 1;
@@ -457,4 +453,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="#"
-                        data-modal-url="modals/location/location_import.php?<?= $client_url ?>">
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importLocationModal">
                         <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="#"
-                            data-modal-url="modals/location/location_export.php?<?= $client_url ?>">
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportLocationModal">
                             <i class="fa fa-fw fa-download mr-2"></i>Export
                         </a>
                     <?php } ?>
@@ -121,8 +119,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         <select onchange="this.form.submit()" class="form-control select2" name="tags[]" data-placeholder="- Select Tags -" multiple>
                             <?php
                             $sql_tags_filter = mysqli_query($mysqli, "
-                                SELECT tags.tag_id, tags.tag_name, tag_type
-                                FROM tags
+                                SELECT tags.tag_id, tags.tag_name, tag_type 
+                                FROM tags 
                                 LEFT JOIN location_tags ON location_tags.tag_id = tags.tag_id
                                 LEFT JOIN locations ON location_tags.location_id = locations.location_id
                                 WHERE tag_type = 2
@@ -150,7 +148,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                             <?php
                             $sql_clients_filter = mysqli_query($mysqli, "
-                                SELECT DISTINCT client_id, client_name
+                                SELECT DISTINCT client_id, client_name 
                                 FROM clients
                                 JOIN locations ON location_client_id = client_id
                                 WHERE $archive_query
@@ -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/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">
 
@@ -38,7 +38,7 @@ ob_start();
         </div>
 
         <div class="row">
-
+                        
             <div class="col">
                 <div class="form-group">
                     <label>Priority <strong class="text-danger">*</strong></label>

agent/modals/asset/asset_bulk_assign_contact.php

@@ -3,9 +3,9 @@
 require_once '../../../includes/modal_header.php';
 
 $client_id = intval($_GET['client_id']);
-$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

@@ -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">
         <input type="hidden" name="remove_tags" value="0">

agent/modals/asset/asset_bulk_edit_status.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$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'] ?? []);
-$count = count($asset_ids);
+$selected_ids = array_map('intval', $_GET['selected_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">
 
@@ -39,7 +39,7 @@ ob_start();
                     <option value="">- Select Client -</option>
                     <?php
                         $clients_sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $client_select_query");
-
+                
                         while ($row = mysqli_fetch_array($clients_sql)) {
                             $client_id_select = intval($row["client_id"]);
                             $client_name_select = nullable_htmlentities($row["client_name"]);

agent/modals/asset/asset_export.php

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

agent/modals/asset/asset_import.php

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

agent/modals/asset/asset_interface_add.php

@@ -78,11 +78,11 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
                         </div>
-                        <input
-                            type="text"
-                            class="form-control"
+                        <input 
+                            type="text" 
+                            class="form-control" 
                             name="description"
-                            placeholder="Short Description"
+                            placeholder="Short Description" 
                             maxlength="200"
                         >
                     </div>

agent/modals/asset/asset_interface_bulk_edit_network.php

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

agent/modals/asset/asset_interface_bulk_edit_type.php

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

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
-                        AND document_archived_at IS NULL
+                        ON documents.document_id = asset_documents.document_id
+                        AND asset_documents.asset_id = $asset_id
+                        WHERE documents.document_client_id = $client_id
+                        AND documents.document_archived_at IS NULL
                         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

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

agent/modals/certificate/certificate_export.php

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

agent/modals/client/client_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">
 
@@ -34,7 +34,7 @@ ob_start();
         </div>
 
         <div class="row">
-
+                        
             <div class="col">
                 <div class="form-group">
                     <label>Priority <strong class="text-danger">*</strong></label>

agent/modals/client/client_bulk_assign_tags.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$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,9 +19,9 @@ ob_start();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($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">
 
         <div class="form-group form-check">

agent/modals/client/client_bulk_edit_hourly_rate.php

@@ -2,9 +2,9 @@
 
 require_once '../../../includes/modal_header.php';
 
-$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_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,8 +18,8 @@ ob_start();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-    <?php foreach ($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">
 
         <div class="form-group">

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_export.php

@@ -1,25 +1,20 @@
-<?php
-
-require_once '../../../includes/modal_header.php';
-
-ob_start();
-
-?>
-
-<div class="modal-header bg-dark">
-    <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Clients to CSV</h5>
-    <button type="button" class="close text-white" data-dismiss="modal">
-        <span>&times;</span>
-    </button>
+<div class="modal" id="exportClientModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
+                <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Clients to CSV</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <div class="modal-body">
+                </div>
+                <div class="modal-footer">
+                    <button type="submit" name="export_clients_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+                </div>
+            </form>
+        </div>
+    </div>
 </div>
-<form action="post.php" method="post" autocomplete="off">
-    <div class="modal-body">
-    </div>
-    <div class="modal-footer">
-        <button type="submit" name="export_clients_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
-        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-    </div>
-</form>
-
-<?php
-require_once '../../../includes/modal_footer.php';

agent/modals/client/client_import.php

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

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

agent/modals/contact/contact_import.php

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

agent/modals/credential/credential_export.php

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

agent/modals/credential/credential_import.php

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

agent/modals/document/document_add_from_template.php

@@ -1,97 +1,93 @@
-<?php
+<div class="modal" id="addDocumentFromTemplateModal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header bg-dark">
+        <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>New Document from Template</h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+          <span>&times;</span>
+        </button>
+      </div>
+      <form action="post.php" method="post" autocomplete="off">
+        <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+        <div class="modal-body">
 
-require_once '../../../includes/modal_header.php';
+          <label>Template</label>
+          <div class="form-group">
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-puzzle-piece"></i></span>
+              </div>
+              <select class="form-control" name="document_template_id" required>
+                <option value="">- Select Template -</option>
+                <?php
+                $sql_document_templates = mysqli_query($mysqli, "SELECT * FROM document_templates WHERE document_template_archived_at IS NULL ORDER BY document_template_name ASC");
+                while ($row = mysqli_fetch_array($sql_document_templates)) {
+                  $document_template_id = intval($row['document_template_id']);
+                  $document_template_name = nullable_htmlentities($row['document_template_name']);
 
-$client_id = intval($_GET['client_id'] ?? 0);
-$contact_id = intval($_GET['contact_id'] ?? 0);
-$asset_id = intval($_GET['asset_id'] ?? 0);
-intval($_GET['folder_id'] ?? 0);
+                ?>
+                <option value="<?php echo $document_template_id ?>"><?php echo $document_template_name; ?></option>
+                <?php
+                }
+                ?>
 
-ob_start();
+              </select>
+            </div>
+          </div>
 
-?>
+          <label>Document name</label>
+          <div class="form-group">
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
+              </div>
+              <input type="text" class="form-control" name="name" placeholder="Name" required>
+            </div>
+          </div>
 
-<div class="modal-header bg-dark">
-    <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>New Document from Template</h5>
-    <button type="button" class="close text-white" data-dismiss="modal">
-        <span>&times;</span>
-    </button>
+          <label>Description</label>
+          <div class="form-group">
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
+              </div>
+              <input type="text" class="form-control" name="description" placeholder="Short summary of the document">
+            </div>
+          </div>
+
+          <label>Folder</label>
+          <div class="form-group">
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
+              </div>
+              <select class="form-control" name="folder">
+                <option value="0">/</option>
+                <?php
+                $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                while ($row = mysqli_fetch_array($sql_folders)) {
+                  $folder_id = intval($row['folder_id']);
+                  $folder_name = nullable_htmlentities($row['folder_name']);
+
+                ?>
+                <option <?php if (isset($_GET['folder_id']) && $_GET['folder_id'] == $folder_id) echo "selected"; ?> value="<?php echo $folder_id ?>"><?php echo $folder_name; ?></option>
+                <?php
+                }
+                ?>
+
+              </select>
+            </div>
+          </div>
+
+        </div>
+
+        <div class="modal-footer">
+
+          <button type="submit" name="add_document_from_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+          <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+
+        </div>
+      </form>
+    </div>
+  </div>
 </div>
-<form action="post.php" method="post" autocomplete="off">
-    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-    <div class="modal-body">
-
-        <label>Template</label>
-        <div class="form-group">
-            <div class="input-group">
-                <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-puzzle-piece"></i></span>
-                </div>
-                <select class="form-control" name="document_template_id" required>
-                    <option value="">- Select Template -</option>
-                    <?php
-                    $sql_document_templates = mysqli_query($mysqli, "SELECT * FROM document_templates WHERE document_template_archived_at IS NULL ORDER BY document_template_name ASC");
-                    while ($row = mysqli_fetch_array($sql_document_templates)) {
-                        $document_template_id = intval($row['document_template_id']);
-                        $document_template_name = nullable_htmlentities($row['document_template_name']);
-                    ?>
-                        <option value="<?php echo $document_template_id ?>"><?php echo $document_template_name; ?></option>
-                    <?php
-                    }
-                    ?>
-                </select>
-            </div>
-        </div>
-
-        <label>Document name</label>
-        <div class="form-group">
-            <div class="input-group">
-                <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
-                </div>
-                <input type="text" class="form-control" name="name" placeholder="Name" required>
-            </div>
-        </div>
-
-        <label>Description</label>
-        <div class="form-group">
-            <div class="input-group">
-                <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
-                </div>
-                <input type="text" class="form-control" name="description" placeholder="Short summary of the document">
-            </div>
-        </div>
-
-        <label>Folder</label>
-        <div class="form-group">
-            <div class="input-group">
-                <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
-                </div>
-                <select class="form-control" name="folder">
-                    <option value="0">/</option>
-                    <?php
-                    $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
-                    while ($row = mysqli_fetch_array($sql_folders)) {
-                        $folder_id = intval($row['folder_id']);
-                        $folder_name = nullable_htmlentities($row['folder_name']);
-                    ?>
-                        <option <?php if (isset($_GET['folder_id']) && $_GET['folder_id'] == $folder_id) echo "selected"; ?> value="<?php echo $folder_id ?>"><?php echo $folder_name; ?></option>
-                    <?php
-                    }
-                    ?>
-                </select>
-            </div>
-        </div>
-
-    </div>
-
-    <div class="modal-footer">
-        <button type="submit" name="add_document_from_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
-        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-    </div>
-</form>
-
-<?php
-require_once '../../../includes/modal_footer.php';

agent/modals/document/document_edit.php

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

agent/modals/document/document_edit_visibility.php

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

agent/modals/document/document_link_asset.php

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

agent/modals/document/document_link_contact.php

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

agent/modals/document/document_link_file.php

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

agent/modals/document/document_link_software.php

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

agent/modals/document/document_link_vendor.php

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

agent/modals/domain/domain_export.php

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

agent/modals/expense/expense_add.php

@@ -152,6 +152,8 @@ ob_start();
                         </button>
                     </div>
                 </div>
+
+
             </div>
 
             <?php if ($client_id) { ?>

agent/modals/expense/expense_bulk_delete.php

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

agent/modals/expense/expense_bulk_edit_account.php

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

agent/modals/expense/expense_bulk_edit_category.php

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

agent/modals/expense/expense_bulk_edit_client.php

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

agent/modals/expense/expense_export.php

@@ -1,119 +1,114 @@
-<?php
+<div class="modal" id="exportExpensesModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
+                <h5 class="modal-title"><i class="fa fa-fw fa-download mr-2"></i>Exporting Expenses to CSV</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
 
-require_once '../../../includes/modal_header.php';
+                <div class="modal-body">
 
-ob_start();
+                    <div class="form-group">
+                        <label>Account</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">
+                                <option value="">- All Accounts -</option>
 
-?>
+                                <?php
+                                $sql_accounts_filter = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
+                                while ($row = mysqli_fetch_array($sql_accounts_filter)) {
+                                    $account_id = intval($row['account_id']);
+                                    $account_name = nullable_htmlentities($row['account_name']);
+                                ?>
+                                    <option <?php if ($account_filter == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?></option>
+                                <?php
+                                }
+                                ?>
 
-<div class="modal-header bg-dark">
-    <h5 class="modal-title"><i class="fa fa-fw fa-download mr-2"></i>Exporting Expenses to CSV</h5>
-    <button type="button" class="close text-white" data-dismiss="modal">
-        <span>&times;</span>
-    </button>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Vendor</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="vendor">
+                                <option value="">- All Vendors -</option>
+
+                                <?php
+                                $sql_vendors_filter = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = 0 ORDER BY vendor_name ASC");
+                                while ($row = mysqli_fetch_array($sql_vendors_filter)) {
+                                    $vendor_id = intval($row['vendor_id']);
+                                    $vendor_name = nullable_htmlentities($row['vendor_name']);
+                                ?>
+                                    <option <?php if ($vendor_filter == $vendor_id) { echo "selected"; } ?> value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
+                                <?php
+                                }
+                                ?>
+
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Category</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                            </div>
+                            <select class="form-control select2" name="category">
+                                <option value="">- All Categories -</option>
+
+                                <?php
+                                $sql_categories_filter = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Expense' ORDER BY category_name ASC");
+                                while ($row = mysqli_fetch_array($sql_categories_filter)) {
+                                    $category_id = intval($row['category_id']);
+                                    $category_name = nullable_htmlentities($row['category_name']);
+                                ?>
+                                    <option <?php if ($category_filter == $category_id) { echo "selected"; } ?> value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+                                <?php
+                                }
+                                ?>
+
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Date From</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                            </div>
+                            <input type="date" class="form-control" name="date_from" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Date To</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                            </div>
+                            <input type="date" class="form-control" name="date_to" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                        </div>
+                    </div>
+
+                </div>
+                <div class="modal-footer">
+                    <button type="submit" name="export_expenses_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </div>
+            </form>
+        </div>
+    </div>
 </div>
-<form action="post.php" method="post" autocomplete="off">
-
-    <div class="modal-body">
-
-        <div class="form-group">
-            <label>Account</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">
-                    <option value="">- All Accounts -</option>
-
-                    <?php
-                    $sql_accounts_filter = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
-                    while ($row = mysqli_fetch_array($sql_accounts_filter)) {
-                        $account_id = intval($row['account_id']);
-                        $account_name = nullable_htmlentities($row['account_name']);
-                    ?>
-                        <option <?php if ($account_filter == $account_id) { echo "selected"; } ?> value="<?= $account_id ?>"><?= $account_name ?></option>
-                    <?php
-                    }
-                    ?>
-
-                </select>
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label>Vendor</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="vendor">
-                    <option value="">- All Vendors -</option>
-
-                    <?php
-                    $sql_vendors_filter = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = 0 ORDER BY vendor_name ASC");
-                    while ($row = mysqli_fetch_array($sql_vendors_filter)) {
-                        $vendor_id = intval($row['vendor_id']);
-                        $vendor_name = nullable_htmlentities($row['vendor_name']);
-                    ?>
-                        <option <?php if ($vendor_filter == $vendor_id) { echo "selected"; } ?> value="<?= $vendor_id ?>"><?= $vendor_name ?></option>
-                    <?php
-                    }
-                    ?>
-
-                </select>
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label>Category</label>
-            <div class="input-group">
-                <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
-                </div>
-                <select class="form-control select2" name="category">
-                    <option value="">- All Categories -</option>
-
-                    <?php
-                    $sql_categories_filter = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Expense' ORDER BY category_name ASC");
-                    while ($row = mysqli_fetch_array($sql_categories_filter)) {
-                        $category_id = intval($row['category_id']);
-                        $category_name = nullable_htmlentities($row['category_name']);
-                    ?>
-                        <option <?php if ($category_filter == $category_id) { echo "selected"; } ?> value="<?= $category_id ?>"><?= $category_name ?></option>
-                    <?php
-                    }
-                    ?>
-
-                </select>
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label>Date From</label>
-            <div class="input-group">
-                <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                </div>
-                <input type="date" class="form-control" name="date_from" max="2999-12-31">
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label>Date To</label>
-            <div class="input-group">
-                <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                </div>
-                <input type="date" class="form-control" name="date_to" max="2999-12-31">
-            </div>
-        </div>
-
-    </div>
-    <div class="modal-footer">
-        <button type="submit" name="export_expenses_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
-        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-    </div>
-</form>
-
-<?php
-require_once '../../../includes/modal_footer.php';

agent/modals/file/file_bulk_move.php

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

agent/modals/folder/folder_add.php

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

agent/modals/invoice/invoice_bulk_edit_category.php

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

agent/modals/invoice/invoice_export.php

@@ -1,49 +1,44 @@
-<?php
+<div class="modal" id="exportInvoicesModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
+                <h5 class="modal-title"><i class="fa fa-fw fa-download mr-2"></i>Export Invoices to CSV</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <?php if (isset($_GET['client_id'])) { ?>
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } ?>
+                <div class="modal-body">
 
-require_once '../../../includes/modal_header.php';
+                    <div class="form-group">
+                        <label>Date From</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                            </div>
+                            <input type="date" class="form-control" name="date_from" max="2999-12-31" value="<?php echo nullable_htmlentities($dtf); ?>">
+                        </div>
+                    </div>
 
-$client_id = intval($_GET['client_id'] ?? 0);
+                    <div class="form-group">
+                        <label>Date To</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                            </div>
+                            <input type="date" class="form-control" name="date_to" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
+                        </div>
+                    </div>
 
-ob_start();
-
-?>
-
-<div class="modal-header bg-dark">
-    <h5 class="modal-title"><i class="fa fa-fw fa-download mr-2"></i>Export Invoices to CSV</h5>
-    <button type="button" class="close text-white" data-dismiss="modal">
-        <span>&times;</span>
-    </button>
+                </div>
+                <div class="modal-footer">
+                    <button type="submit" name="export_invoices_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </div>
+            </form>
+        </div>
+    </div>
 </div>
-<form action="post.php" method="post" autocomplete="off">
-    <input type="hidden" name="client_id" value="<?= $client_id ?>">
-    <div class="modal-body">
-
-        <div class="form-group">
-            <label>Date From</label>
-            <div class="input-group">
-                <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                </div>
-                <input type="date" class="form-control" name="date_from" max="2999-12-31">
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label>Date To</label>
-            <div class="input-group">
-                <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                </div>
-                <input type="date" class="form-control" name="date_to" max="2999-12-31">
-            </div>
-        </div>
-
-    </div>
-    <div class="modal-footer">
-        <button type="submit" name="export_invoices_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
-        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-    </div>
-</form>
-
-<?php
-require_once '../../../includes/modal_footer.php';

agent/modals/invoice/invoice_recurring_add.php

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

agent/modals/location/location_bulk_assign_tags.php

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

agent/modals/location/location_export.php

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

agent/modals/location/location_import.php

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

agent/modals/network/network_export.php

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

agent/modals/payment/payment_export.php

@@ -1,30 +1,24 @@
-<?php
-
-require_once '../../../includes/modal_header.php';
-
-$client_id = intval($_GET['client_id'] ?? 0);
-
-ob_start();
-
-?>
-
-<div class="modal-header bg-dark">
-    <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Payments to CSV</h5>
-    <button type="button" class="close text-white" data-dismiss="modal">
-        <span>&times;</span>
-    </button>
+<div class="modal" id="exportPaymentModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
+                <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Payments to CSV</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <?php if (isset($_GET['client_id'])) { ?>
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } ?>
+                <div class="modal-body">
+                    
+                </div>
+                <div class="modal-footer">
+                    <button type="submit" name="export_payments_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+                </div>
+            </form>
+        </div>
+    </div>
 </div>
-<form action="post.php" method="post" autocomplete="off">
-    <input type="hidden" name="client_id" value="<?= $client_id ?>">
-
-    <div class="modal-body">
-
-    </div>
-    <div class="modal-footer">
-        <button type="submit" name="export_payments_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
-        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-    </div>
-</form>
-
-<?php
-require_once '../../../includes/modal_footer.php';

agent/modals/product/product_bulk_edit_category.php

@@ -1,58 +1,42 @@
+<div class="modal" id="bulkEditCategoryModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
+                <h5 class="modal-title"><i class="fa fa-fw fa-list mr-2"></i>Bulk Set Category</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
 
-<?php
+                <div class="form-group">
+                    <label>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="bulk_category_id">
+                            <?php
 
-require_once '../../../includes/modal_header.php';
+                            $sql = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Income' 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 value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
 
-$product_ids = array_map('intval', $_GET['product_ids'] ?? []);
-
-$count = count($product_ids);
-
-ob_start();
-
-?>
-
-<div class="modal-header bg-dark">
-    <h5 class="modal-title"><i class="fa fa-fw fa-list mr-2"></i>Set Category for <strong><?= $count ?></strong> Products</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 ($product_ids as $product_id) { ?><input type="hidden" name="product_ids[]" value="<?= $product_id ?>"><?php } ?>
-    <div class="modal-body">
-
-        <div class="form-group">
-            <label>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>
+                                <?php
+                            }
+                            ?>
+                        </select>
+                    </div>
                 </div>
-                <select class="form-control select2" name="bulk_category_id">
-                    <?php
 
-                    $sql = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Income' 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 value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-
-                        <?php
-                    }
-                    ?>
-                </select>
+            </div>
+            <div class="modal-footer">
+                <button type="submit" name="bulk_edit_product_category" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check mr-2"></i>Set</button>
+                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
         </div>
-
     </div>
-    <div class="modal-footer">
-        <button type="submit" name="bulk_edit_product_category" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check mr-2"></i>Set</button>
-        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-    </div>
-</form>
-
-
-<?php
-require_once '../../../includes/modal_footer.php';
+</div>

agent/modals/product/product_export.php

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

agent/modals/quote/quote_export.php

@@ -1,30 +1,24 @@
-<?php
+<div class="modal" id="exportQuoteModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
+                <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Quotes to CSV</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <?php if(isset($_GET['client_id'])) { ?>
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } ?>
+                <div class="modal-body">
 
-require_once '../../../includes/modal_header.php';
-
-$client_id = intval($_GET['client_id'] ?? 0);
-
-ob_start();
-
-?>
-
-<div class="modal-header bg-dark">
-    <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Quotes to CSV</h5>
-    <button type="button" class="close text-white" data-dismiss="modal">
-        <span>&times;</span>
-    </button>
+                </div>
+                <div class="modal-footer">
+                    <button type="submit" name="export_quotes_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+                </div>
+            </form>
+        </div>
+    </div>
 </div>
-<form action="post.php" method="post" autocomplete="off">
-    <input type="hidden" name="client_id" value="<?= $client_id ?>">
-
-    <div class="modal-body">
-
-    </div>
-    <div class="modal-footer">
-        <button type="submit" name="export_quotes_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
-        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-    </div>
-</form>
-
-<?php
-require_once '../../../includes/modal_footer.php';

agent/modals/quote/quote_note.php

@@ -1,30 +1,24 @@
 <div class="modal" id="quoteNoteModal" tabindex="-1">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title text-white">
-                    <i class="fas fa-fw fa-edit mr-2"></i>Quote Notes
-                </h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="quote_id" value="<?php echo $quote_id; ?>">
-                <div class="modal-body">
-                    <div class="form-group">
-                        <textarea class="form-control" rows="8" name="note" placeholder="Enter some notes"><?php echo $quote_note; ?></textarea>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="quote_note" class="btn btn-primary text-bold">
-                        <i class="fas fa-check mr-2"></i>Save
-                    </button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal">
-                        <i class="fas fa-times mr-2"></i>Cancel
-                    </button>
-                </div>
-            </form>
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content">
+      <div class="modal-header bg-dark">
+        <h5 class="modal-title text-white"><i class="fas fa-fw fa-edit mr-2"></i>Quote Notes</h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <form action="post.php" method="post" autocomplete="off">
+        <input type="hidden" name="quote_id" value="<?php echo $quote_id; ?>">
+        <div class="modal-body">  
+          <div class="form-group">
+            <textarea class="form-control" rows="8" name="note" placeholder="Enter some notes"><?php echo $quote_note; ?></textarea>
+          </div>
         </div>
+        <div class="modal-footer">
+          <button type="submit" name="quote_note" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
+          <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+        </div>
+      </form>
     </div>
-</div>
+  </div>
+</div>

agent/modals/quote/quote_to_invoice.php

@@ -1,53 +1,34 @@
-<?php
-
-require_once '../../../includes/modal_header.php';
-
-$quote_id = intval($_GET['quote_id']);
-
-$sql = mysqli_query($mysqli, "SELECT * FROM quotes WHERE quote_id = $quote_id LIMIT 1");
-
-$row = mysqli_fetch_array($sql);
-$quote_prefix = nullable_htmlentities($row['quote_prefix']);
-$quote_number = intval($row['quote_number']);
-
-ob_start();
-?>
-
-<div class="modal-header bg-dark">
-    <h5 class="modal-title">
-        <i class="fas fa-fw fa-file mr-2"></i>
-        Quote <?= "$quote_prefix$quote_number" ?>
-        <i class="fas fa-arrow-right mr-2"></i>Invoice
-    </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="quote_id" value="<?= $quote_id ?>">
-
-    <div class="modal-body">
-
-        <div class="form-group">
+<div class="modal" id="addQuoteToInvoiceModal<?php echo $quote_id; ?>" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header bg-dark">
+        <h5 class="modal-title"><i class="fas fa-fw fa-file mr-2"></i>Quote <?php echo "$quote_prefix$quote_number"; ?> <i class="fas fa-arrow-right mr-2"></i>Invoice</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="quote_id" value="<?php echo $quote_id; ?>">
+        <input type="hidden" name="client_net_terms" value="<?php echo $client_net_terms; ?>">
+        
+        <div class="modal-body">
+         
+          <div class="form-group">
             <label>Invoice Date <strong class="text-danger">*</strong></label>
             <div class="input-group">
-                <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                </div>
-                <input type="date" class="form-control" name="date" max="2999-12-31" value="<?= date("Y-m-d"); ?>" required>
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+              </div>
+              <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
             </div>
+          </div>
+      
         </div>
-
+        <div class="modal-footer">
+          <button type="submit" name="add_quote_to_invoice" class="btn btn-primary text-bold"><strong><i class="fas fa-check mr-2"></i>Create Invoice</button>
+            <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+        </div>
+      </form>
     </div>
-    <div class="modal-footer">
-        <button type="submit" name="add_quote_to_invoice" class="btn btn-primary text-bold">
-            <strong><i class="fas fa-check mr-2"></i>Create Invoice</strong>
-        </button>
-        <button type="button" class="btn btn-light" data-dismiss="modal">
-            <i class="fas fa-times mr-2"></i>Cancel
-        </button>
-    </div>
-</form>
-
-<?php
-require_once '../../../includes/modal_footer.php';
+  </div>
+</div>