Merge pull request #1246 from itflow-org/develop

Develop to Master for Release

CHANGELOG.md

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

admin/ai_model.php

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

admin/ai_provider.php

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

admin/api_keys.php

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

admin/contract_templates.php

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

admin/custom_link.php

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

admin/database_updates.php

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

admin/debug.php

@@ -46,8 +46,6 @@ $systemInfo[] = [
 // Section: PHP Extensions
 $phpExtensions = [];
 $extensions = [
-    'php-mailparse' => 'mailparse',
-    'php-imap' => 'imap',
     'php-mysqli' => 'mysqli',
     'php-intl' => 'intl',
     'php-curl' => 'curl',

admin/document_template.php

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

admin/document_template_details.php

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

admin/includes/side_nav.php

@@ -110,6 +110,12 @@
                 <?php if ($config_module_enable_itdoc) { ?>
                     <li class="nav-header">TEMPLATES</li>
 
+                    <li class="nav-item">
+                        <a href="/admin/contract_templates.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'contract_templates.php' ? 'active' : ''); ?>">
+                            <i class="nav-icon fas fa-file-contract"></i>
+                            <p>Contract Templates</p>
+                        </a>
+                    </li>
                     <li class="nav-item">
                         <a href="/admin/project_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['project_template.php', 'project_template_details.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-project-diagram"></i>

admin/modals/ai/ai_model_add.php

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

admin/modals/ai/ai_provider_add.php

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

admin/modals/api/api_key_add.php

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

admin/modals/contract_template/contract_template_add.php

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

admin/modals/custom_link/custom_link_add.php

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

admin/modals/document_template/document_template_add.php

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

admin/modals/payment_method/payment_method_add.php

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

admin/modals/payment_provider/payment_provider_add.php

@@ -1,103 +1,106 @@
-<div class="form-group">
-    <div class="modal" id="addPaymentProviderModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Add Payment Provider</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+<?php
 
-                <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                    <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>
+ob_start();
 
-                    <div class="form-group">
-                        <label>Provider <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
-                            </div>
-                            <select class="form-control select2" name="provider">
-                                <option>Stripe</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Publishable key <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="public_key" placeholder="Publishable API Key (pk_...)">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Secret key <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="private_key" placeholder="Secret API Key (sk_...)">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Threshold</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
-                            </div>
-                            <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="threshold" placeholder="1000.00">
-                        </div>
-                        <small class="form-text text-muted">Will not show as an option at Checkout if invoice amount is above this number, 0 disables the threshold check.</small>
-                    </div>
-
-                    <hr>
-
-                    <div class="form-group">
-                        <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" name="enable_expense" checked value="1" id="enableExpenseSwitch">
-                            <label class="custom-control-label" for="enableExpenseSwitch">Enable Expense</label>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Percentage Fee to expense</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-percent"></i></span>
-                            </div>
-                            <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="percentage_fee" placeholder="Enter Percentage">
-                        </div>
-                        <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Flat Fee to expense</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
-                            </div>
-                            <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,3}" name="flat_fee" placeholder="0.030">
-                        </div>
-                        <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_payment_provider" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Add</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Add Payment Provider</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+    <div class="modal-body">
+
+        <div class="alert alert-info">
+            An income account named after the provider will always be created and used for income of paid invoices.<br>
+            If "Enable Expense" option is enabled, a matching vendor will also be automatically created for expense tracking. Additionally, an expense category named "Payment Processing" will be created.
+        </div>
+
+        <div class="form-group">
+            <label>Provider <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
+                </div>
+                <select class="form-control select2" name="provider">
+                    <option>Stripe</option>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Publishable key <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                </div>
+                <input type="text" class="form-control" name="public_key" placeholder="Publishable API Key (pk_...)">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Secret key <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                </div>
+                <input type="text" class="form-control" name="private_key" placeholder="Secret API Key (sk_...)">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Threshold</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                </div>
+                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="threshold" placeholder="1000.00">
+            </div>
+            <small class="form-text text-muted">Will not show as an option at Checkout if invoice amount is above this number, 0 disables the threshold check.</small>
+        </div>
+
+        <hr>
+
+        <div class="form-group">
+            <div class="custom-control custom-switch">
+                <input type="checkbox" class="custom-control-input" name="enable_expense" checked value="1" id="enableExpenseSwitch">
+                <label class="custom-control-label" for="enableExpenseSwitch">Enable Expense</label>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Percentage Fee to expense</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-percent"></i></span>
+                </div>
+                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="percentage_fee" placeholder="Enter Percentage">
+            </div>
+            <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
+        </div>
+
+        <div class="form-group">
+            <label>Flat Fee to expense</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                </div>
+                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,3}" name="flat_fee" placeholder="0.030">
+            </div>
+            <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_payment_provider" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Add</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

admin/modals/project_template/project_template_add.php

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

admin/modals/project_template/project_template_edit.php

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

admin/modals/project_template/project_template_ticket_template_add.php

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

admin/modals/role/role_add.php

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

admin/modals/software_template/software_template_add.php

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

admin/modals/tag/tag_add.php

@@ -17,6 +17,7 @@ if (isset($_GET['type'])) {
         $type_display = "Credential";
     }
 }
+ob_start();
 
 ?>
 

admin/modals/tax/tax_add.php

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

admin/modals/ticket_status/ticket_status_add.php

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

admin/modals/user/user_add.php

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

admin/modals/user/user_all_reset_password.php

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

admin/modals/user/user_edit.php

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

admin/modals/user/user_invite.php

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

admin/modals/vendor_template/vendor_template_add.php

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

admin/payment_method.php

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

admin/payment_provider.php

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

admin/post.php

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

admin/post/contract_template.php

@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * ITFlow - GET/POST request handler for Contract Templates
+ */
+
+defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
+
+if (isset($_POST['add_contract_template'])) {
+
+    // Sanitize text inputs
+    $name = sanitizeInput($_POST['contract_template_name']);
+    $type = sanitizeInput($_POST['contract_template_type']);
+    $update_frequency = sanitizeInput($_POST['contract_template_update_frequency']);
+    $support_hours = sanitizeInput($_POST['contract_template_support_hours']);
+    $details = mysql_escape_string($mysqli, $_POST['contract_template_details']);
+
+    // Numeric fields cast to integer
+    $sla_low_resp = intval($_POST['sla_low_response_time']);
+    $sla_med_resp = intval($_POST['sla_medium_response_time']);
+    $sla_high_resp = intval($_POST['sla_high_response_time']);
+    $sla_low_res = intval($_POST['sla_low_resolution_time']);
+    $sla_med_res = intval($_POST['sla_medium_resolution_time']);
+    $sla_high_res = intval($_POST['sla_high_resolution_time']);
+    $hourly_rate = intval($_POST['contract_template_hourly_rate']);
+    $after_hours_rate = intval($_POST['contract_template_after_hours_hourly_rate']);
+    $net_terms = intval($_POST['contract_template_net_terms']);
+
+    // Insert into database (numbers not quoted)
+    mysqli_query($mysqli, "
+        INSERT INTO contract_templates SET
+        contract_template_name = '$name',
+        contract_template_description = '$description',
+        contract_template_details = '$details',
+        contract_template_type = '$type',
+        contract_template_update_frequency = '$update_frequency',
+        sla_low_response_time = $sla_low_resp,
+        sla_medium_response_time = $sla_med_resp,
+        sla_high_response_time = $sla_high_resp,
+        sla_low_resolution_time = $sla_low_res,
+        sla_medium_resolution_time = $sla_med_res,
+        sla_high_resolution_time = $sla_high_res,
+        contract_template_hourly_rate = $hourly_rate,
+        contract_template_after_hours_hourly_rate = $after_hours_rate,
+        contract_template_support_hours = '$support_hours',
+        contract_template_net_terms = $net_terms,
+        contract_template_created_by = $session_user_id,
+        contract_template_created_at = NOW()
+    ");
+
+    $contract_template_id = mysqli_insert_id($mysqli);
+
+    // Log action
+    logAction("Contract Template", "Create", "$session_name created contract template $name", 0, $contract_template_id);
+
+    // Flash message
+    flash_alert("Contract Template <strong>$name</strong> created");
+
+    // Redirect back
+    redirect();
+}
+
+?>

admin/project_template.php

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

admin/project_template_details.php

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

admin/roles.php

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

admin/software_template.php

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

admin/tax.php

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

admin/ticket_status.php

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

admin/ticket_template_details.php

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

admin/users.php

@@ -26,16 +26,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-users mr-2"></i>Users</h3>
         <div class="card-tools">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addUserModal">
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/user/user_add.php">
                     <i class="fas fa-fw fa-user-plus mr-2"></i>New User
                 </button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
-                    <!--<a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#userInviteModal"><i class="fas fa-paper-plane mr-2"></i>Invite User</a>-->
+                    <!--<a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/user/user_invite.php"><i class="fas fa-paper-plane mr-2"></i>Invite User</a>-->
                     <?php if ($num_rows[0] > 1) { ?>
                         <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportUserModal"><i class="fa fa-fw fa-download mr-2"></i>Export</a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-danger" href="#" data-toggle="modal" data-target="#resetAllUserPassModal"><i class="fas fa-skull-crossbones mr-2"></i>IR</a>
+                        <a class="dropdown-item text-danger ajax-modal" href="#" data-modal-url="modals/user/user_all_reset_password.php" data-modal-size="lg"><i class="fas fa-skull-crossbones mr-2"></i>IR</a>
                     <?php } ?>
                 </div>
             </div>
@@ -233,15 +233,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
  ?>
     </div>
 </div>
-<script>
-    function generatePassword() {
-        document.getElementById("password").value = "<?php echo randomString() ?>"
-    }
-</script>
 
 <?php
-require_once "modals/user/user_add.php";
-require_once "modals/user/user_invite.php";
 require_once "modals/user/user_export.php";
-require_once "modals/user/user_all_reset_password.php";
-require_once "../includes/footer.php";
+require_once "../includes/footer.php";

admin/vendor_template.php

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

agent/accounts.php

@@ -25,7 +25,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <div class="card-header py-2">
             <h3 class="card-title mt-2"><i class="fa fa-fw fa-piggy-bank mr-2"></i>Accounts</h3>
             <div class="card-tools">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAccountModal"><i class="fas fa-plus mr-2"></i>New Account</button>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/account/account_add.php"><i class="fas fa-plus mr-2"></i>New Account</button>
             </div>
         </div>
         <div class="card-body">
@@ -123,6 +123,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-
-require_once "modals/account/account_add.php";
 require_once "../includes/footer.php";

agent/ajax.php

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

agent/asset_details.php

@@ -4,7 +4,7 @@
 if (isset($_GET['client_id'])) {
     require_once "includes/inc_all_client.php";
     $client_query = "AND asset_client_id = $client_id";
-    $client_url = "AND client_id=$client_id&";
+    $client_url = "client_id=$client_id&";
 } else {
     require_once "includes/inc_client_overview_all.php";
     $client_query = '';
@@ -361,23 +361,23 @@ if (isset($_GET['asset_id'])) {
                     <div class="dropdown dropleft mr-2">
                         <button type="button" class="btn btn-primary" data-toggle="dropdown"><i class="fas fa-plus mr-2"></i>New</button>
                         <div class="dropdown-menu">
-                            <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addTicketModal">
+                            <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/ticket/ticket_add.php?<?= $client_url ?>&asset_id=<?= $asset_id ?>" data-modal-size="lg">
                                 <i class="fa fa-fw fa-life-ring mr-2"></i>New Ticket
                             </a>
                             <div class="dropdown-divider"></div>
-                            <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addRecurringTicketModal">
+                            <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/recurring_ticket/recurring_ticket_add.php?<?= $client_url ?>&asset_id=<?= $asset_id ?>" data-modal-size="lg">
                                 <i class="fa fa-fw fa-recycle mr-2"></i>New Recurring Ticket
                             </a>
                             <div class="dropdown-divider"></div>
-                            <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addCredentialModal">
+                            <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/credential/credential_add.php?<?= $client_url ?>asset_id=<?= $asset_id ?>">
                                 <i class="fa fa-fw fa-key mr-2"></i>New Credential
                             </a>
                             <div class="dropdown-divider"></div>
-                            <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addDocumentModal">
+                            <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/document/document_add.php?<?= $client_url ?>&asset_id=<?= $asset_id ?>" data-modal-size="lg">
                                 <i class="fa fa-fw fa-file-alt mr-2"></i>New Document
                             </a>
                             <div class="dropdown-divider"></div>
-                            <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#uploadFilesModal">
+                            <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/file/file_upload.php?<?= $client_url ?>&asset_id=<?= $asset_id ?>">
                                 <i class="fa fa-fw fa-upload mr-2"></i>Upload file(s)
                             </a>
                         </div>
@@ -419,7 +419,7 @@ if (isset($_GET['asset_id'])) {
                         <h3 class="card-title mt-2"><i class="fa fa-fw fa-ethernet mr-2"></i>Interfaces</h3>
                         <div class="card-tools">
                             <div class="btn-group">
-                                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAssetInterfaceModal">
+                                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/asset/asset_interface_add.php?&asset_id=<?= $asset_id ?>">
                                     <i class="fas fa-plus mr-2"></i>New Interface
                                 </button>
                                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
@@ -1220,16 +1220,9 @@ if (isset($_GET['asset_id'])) {
     <script src="../js/bulk_actions.js"></script>
 
     <?php
-
-    require_once "modals/asset/asset_interface_add.php";
     require_once "modals/asset/asset_interface_multiple_add.php";
     require_once "modals/asset/asset_interface_import.php";
     require_once "modals/asset/asset_interface_export.php";
-    require_once "modals/ticket/ticket_add.php";
-    require_once "modals/recurring_ticket/recurring_ticket_add.php";
-    require_once "modals/credential/credential_add.php";
-    require_once "modals/document/document_add.php";
-    require_once "modals/file/file_upload.php";
 
 }
 

agent/assets.php

@@ -303,27 +303,40 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             </button>
                             <div class="dropdown-menu">
                                 <?php if ($client_url) { ?>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignContactModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_assign_contact.php?<?= $client_url ?>"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-user mr-2"></i>Assign Contact
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignLocationModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_assign_location.php?<?= $client_url ?>"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-map-marker-alt mr-2"></i>Assign Location
                                 </a>
                                 <?php } ?>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignPhysicalLocationModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_assign_physical_location.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-map-marker-alt mr-2"></i>Set Physical Location
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditStatusModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_edit_status.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-info mr-2"></i>Set Status
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAddTicketModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_add_ticket.php"
+                                    data-modal-size="lg"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-life-ring mr-2"></i>Create Tickets
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkTransferAssetClientModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_transfer_client.php?<?= $client_url ?>"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-arrow-right mr-2"></i>Transfer to Client
                                 </a>
                                 <?php if ($archived) { ?>
@@ -692,16 +705,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php
-            if ($client_url) {
-                require_once "modals/asset/asset_bulk_assign_contact.php";  
-                require_once "modals/asset/asset_bulk_assign_location.php";
-            }
-            ?>
-            <?php require_once "modals/asset/asset_bulk_assign_physical_location.php"; ?>
-            <?php require_once "modals/asset/asset_bulk_transfer_client.php"; ?>
-            <?php require_once "modals/asset/asset_bulk_edit_status.php"; ?>
-            <?php require_once "modals/asset/asset_bulk_add_ticket.php"; ?>
         </form>
         <?php require_once "../includes/filter_footer.php"; ?>
     </div>

agent/calendar.php

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

agent/certificates.php

@@ -64,7 +64,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-lock mr-2"></i>Certificates</h3>
         <div class="card-tools">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCertificateModal"><i class="fas fa-plus mr-2"></i>New Certificate</button>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/certificate/certificate_add.php?<?= $client_url ?>"><i class="fas fa-plus mr-2"></i>New Certificate</button>
                 <?php if ($num_rows[0] > 0) { ?>
                     <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                     <div class="dropdown-menu">
@@ -249,8 +249,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             <td><?php echo $certificate_issued_by; ?></td>
 
                             <td>
-                                <div><?php echo $certificate_expire; ?></div>
-                                <div><small><?php echo $certificate_expire_ago; ?></small></div>
+                                <div><?php echo $certificate_expire ?: '-'; ?></div>
+                                <?php if (!empty($certificate_expire)) { ?>
+                                    <div><small><?php echo $certificate_expire_ago; ?></small></div>
+                                <?php } ?>
                             </td>
                             <?php if (!$client_url) { ?>
                             <td><a href="certificates.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
@@ -303,11 +305,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-require_once "modals/certificate/certificate_add.php";
 require_once "modals/certificate/certificate_export.php";
 ?>
 
 <script src="../js/bulk_actions.js"></script>
-<script src="js/certificate_fetch_ssl.js"></script>
 
-<?php require_once "../includes/footer.php";
+<?php require_once "../includes/footer.php";

agent/clients.php

@@ -137,27 +137,41 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fas fa-fw fa-layer-group"></i><span class="d-none d-sm-inline ml-2">Action</span> (<span id="selectedCount">0</span>)
                                 </button>
                                 <div class="dropdown-menu">
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAddTicketModal">
+                                   <a class="dropdown-item ajax-modal" href="#" 
+                                        data-modal-url="modals/client/client_bulk_add_ticket.php"
+                                        data-modal-size="lg"
+                                        data-bulk="true">
                                         <i class="fas fa-fw fa-life-ring mr-2"></i>Open Tickets
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditHourlyRateModal">
+                                    <a class="dropdown-item ajax-modal" href="#" 
+                                        data-modal-url="modals/client/client_bulk_edit_hourly_rate.php"
+                                        data-bulk="true">
                                         <i class="fas fa-fw fa-clock mr-2"></i>Set Hourly Rate
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditIndustryModal">
+                                    <a class="dropdown-item ajax-modal" href="#" 
+                                        data-modal-url="modals/client/client_bulk_edit_industry.php"
+                                        data-bulk="true">
                                         <i class="fas fa-fw fa-briefcase mr-2"></i>Set Industry
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditReferralModal">
+                                    <a class="dropdown-item ajax-modal" href="#" 
+                                        data-modal-url="modals/client/client_bulk_edit_referral.php"
+                                        data-bulk="true">
                                         <i class="fas fa-fw fa-link mr-2"></i>Set Referral
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignTagsModal">
+                                    <a class="dropdown-item ajax-modal" href="#" 
+                                        data-modal-url="modals/client/client_bulk_assign_tags.php"
+                                        data-bulk="true">
                                         <i class="fas fa-fw fa-tags mr-2"></i>Assign Tags
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkSendEmailModal">
+                                    <a class="dropdown-item ajax-modal" href="#" 
+                                        data-modal-url="modals/client/client_bulk_email.php"
+                                        data-modal-size="lg"
+                                        data-bulk="true">
                                         <i class="fas fa-fw fa-paper-plane mr-2"></i>Send Email
                                     </a>
                                     <?php if ($archived) { ?>
@@ -268,7 +282,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         </form>
     </div>
     
-    <form id="bulkActions" action="post.php" method="post" enctype="multipart/form-data">
+    <form id="bulkActions" action="post.php" method="post">
         <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
         <div class="table-responsive-sm">
             <table class="table table-hover mb-0 text-nowrap">
@@ -600,14 +614,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </tbody>
             </table>
         </div>
-        <?php 
-            require_once "modals/client/client_bulk_edit_industry.php";
-            require_once "modals/client/client_bulk_edit_referral.php";
-            require_once "modals/client/client_bulk_edit_hourly_rate.php";
-            require_once "modals/client/client_bulk_assign_tags.php";
-            require_once "modals/client/client_bulk_add_ticket.php"; 
-            require_once "modals/client/client_bulk_email.php";
-        ?>
     </form>
      <!-- Ends Card Body -->
     <?php require_once "../includes/filter_footer.php"; ?>

agent/contact_details.php

@@ -20,8 +20,15 @@ if (isset($_GET['contact_id'])) {
         LEFT JOIN users ON user_id = contact_user_id
         WHERE contact_id = $contact_id
         $client_query
+        LIMIT 1
     ");
 
+    if (mysqli_num_rows($sql) == 0) {
+        echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1><a class='btn btn-lg btn-secondary mt-3' href='javascript:history.back()'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>";
+        require_once "../includes/footer.php";
+        exit();
+    }
+
     $row = mysqli_fetch_array($sql);
     $client_id = intval($row['client_id']);
     $client_name = nullable_htmlentities($row['client_name']);
@@ -255,11 +262,11 @@ if (isset($_GET['contact_id'])) {
                 <div class="dropdown dropleft mr-2">
                     <button type="button" class="btn btn-primary" data-toggle="dropdown"><i class="fas fa-plus mr-2"></i>New</button>
                     <div class="dropdown-menu">
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addTicketModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/ticket/ticket_add.php?<?= $client_url ?>&contact_id=<?= $contact_id ?>" data-modal-size="lg">
                             <i class="fa fa-fw fa-life-ring mr-2"></i>New Ticket
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addRecurringTicketModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/recurring_ticket/recurring_ticket_add.php?<?= $client_url ?>&contact_id=<?= $contact_id ?>" data-modal-size="lg">
                             <i class="fa fa-fw fa-recycle mr-2"></i>New Recurring Ticket
                         </a>
                         <div class="dropdown-divider"></div>
@@ -267,15 +274,15 @@ if (isset($_GET['contact_id'])) {
                             <i class="fa fa-fw fa-desktop mr-2"></i>New Asset
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addCredentialModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/credential/credential_add.php?<?= $client_url ?>&contact_id=<?= $contact_id ?>">
                             <i class="fa fa-fw fa-key mr-2"></i>New Credential
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addDocumentModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/document/document_add.php?<?= $client_url ?>&contact_id=<?= $contact_id ?>" data-modal-size="lg">
                             <i class="fa fa-fw fa-file-alt mr-2"></i>New Document
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#uploadFilesModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/file/file_upload.php?<?= $client_url ?>&contact_id=<?= $contact_id ?>">
                             <i class="fa fa-fw fa-upload mr-2"></i>Upload file(s)
                         </a>
                         <div class="dropdown-divider"></div>
@@ -1172,11 +1179,4 @@ if (isset($_GET['contact_id'])) {
     <script src="js/credential_show_otp_via_id.js"></script>
 
 <?php
-
-require_once "modals/ticket/ticket_add.php";
-require_once "modals/recurring_ticket/recurring_ticket_add.php";
-require_once "modals/credential/credential_add.php";
-require_once "modals/document/document_add.php";
-require_once "modals/file/file_upload.php";
-
 require_once "../includes/footer.php";

agent/contacts.php

@@ -220,28 +220,41 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             </button>
                             <div class="dropdown-menu">
                                 <?php if ($client_url) { ?> 
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignLocationModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/contact/contact_bulk_assign_location.php?<?= $client_url ?>"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-map-marker-alt mr-2"></i>Assign Location
                                 </a>
                                 <div class="dropdown-divider"></div>
                                 <?php } ?>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditPhoneModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/contact/contact_bulk_edit_phone.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-phone-alt mr-2"></i>Set Phone Number
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditDepartmentModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/contact/contact_bulk_edit_department.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-users mr-2"></i>Set Department
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditRoleModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/contact/contact_bulk_edit_role.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-user-shield mr-2"></i>Set Roles
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignTagsModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/contact/contact_bulk_assign_tags.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-tags mr-2"></i>Assign Tags
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkSendEmailModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/contact/contact_bulk_email.php"
+                                    data-modal-size="lg"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-paper-plane mr-2"></i>Send Email
                                 </a>
                                 <?php if ($archived) { ?>
@@ -545,15 +558,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php if ($client_url) { require_once "modals/contact/contact_bulk_assign_location.php"; } ?>
-            <?php require_once "modals/contact/contact_bulk_edit_phone.php"; ?>
-            <?php require_once "modals/contact/contact_bulk_edit_department.php"; ?>
-            <?php require_once "modals/contact/contact_bulk_edit_role.php"; ?>
-            <?php require_once "modals/contact/contact_bulk_assign_tags.php"; ?>
-            <?php require_once "modals/contact/contact_bulk_email.php"; ?>
         </form>
-        <?php require_once "../includes/filter_footer.php";
-?>
+        <?php require_once "../includes/filter_footer.php"; ?>
     </div>
 </div>
 
@@ -563,7 +569,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 require_once "modals/contact/contact_export.php";
 if ($client_url) {
-    require_once "modals/contact/contact_invite.php";
+    //require_once "modals/contact/contact_invite.php";
     require_once "modals/contact/contact_import.php";
 }
 require_once "../includes/footer.php";

agent/credentials.php

@@ -106,7 +106,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <div class="card-tools">
             <?php if (lookupUserPermission("module_credential") >= 2) { ?>
                 <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCredentialModal" <?php if (!isset($_COOKIE['user_encryption_session_key'])) { echo "disabled"; } ?>>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/credential/credential_add.php?<?= $client_url ?>" <?php if (!isset($_COOKIE['user_encryption_session_key'])) { echo "disabled"; } ?>>
                     <i class="fas fa-plus mr-2"></i>New Credential
                 </button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
@@ -241,7 +241,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                 </button>
                                 <?php } else { ?>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignTagsModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/credential/credential_bulk_assign_tags.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-tags mr-2"></i>Assign Tags
                                 </a>
                                     <div class="dropdown-divider"></div>
@@ -519,10 +521,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "modals/credential/credential_bulk_assign_tags.php"; ?>
         </form>
-        <?php require_once "../includes/filter_footer.php";
-        ?>
+        <?php require_once "../includes/filter_footer.php"; ?>
     </div>
 </div>
 
@@ -534,7 +534,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "modals/credential/credential_add.php";
 require_once "modals/credential/credential_export.php";
 if ($client_url) {
     require_once "modals/credential/credential_import.php";

agent/dashboard.php

@@ -734,8 +734,8 @@ if ($user_config_dashboard_technical_enable == 1) {
                                     $contact_display = empty($contact_name) ? "-" : "<a href='contact_details.php?client_id=$client_id&contact_id=$contact_id'>$contact_name</a>";
                                 ?>
                                     <tr class="<?php echo empty($ticket_updated_at) ? 'text-bold' : ''; ?>">
-                                        <td><a class="text-dark" href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo "$ticket_prefix$ticket_number"; ?></a></td>
-                                        <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
+                                        <td><a class="text-dark" href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?php echo $ticket_id; ?>"><?php echo "$ticket_prefix$ticket_number"; ?></a></td>
+                                        <td><a href="ticket.php?client_id=<?= $client_id ?>&ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
                                         <td><a href="tickets.php?client_id=<?php echo $client_id; ?>"><strong><?php echo $client_name; ?></strong></a></td>
                                         <td><?php echo $contact_display; ?></td>
                                         <td><span class='p-2 badge badge-pill badge-<?php echo $ticket_priority_color; ?>'><?php echo $ticket_priority; ?></span></td>

agent/document_details.php

@@ -20,9 +20,16 @@ $folder_location = 0;
 $sql_document = mysqli_query($mysqli, "SELECT * FROM documents 
     LEFT JOIN folders ON document_folder_id = folder_id
     LEFT JOIN users ON document_created_by = user_id
-    WHERE document_client_id = $client_id AND document_id = $document_id"
+    WHERE document_client_id = $client_id AND document_id = $document_id
+    LIMIT 1"
 );
 
+if (mysqli_num_rows($sql_document) == 0) {
+    echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1><a class='btn btn-lg btn-secondary mt-3' href='javascript:history.back()'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>";
+    require_once "../includes/footer.php";
+    exit();
+}
+
 $row = mysqli_fetch_array($sql_document);
 
 $folder_name = nullable_htmlentities($row['folder_name']);

agent/documents.php

@@ -92,12 +92,12 @@ while ($folder_id > 0) {
         <div class="card-tools">
 
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDocumentModal">
+                <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" href="#" data-toggle="modal" data-target="#createFolderModal">
+                    <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>
@@ -130,7 +130,9 @@ while ($folder_id > 0) {
                                 <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
                             </button>
                             <div class="dropdown-menu">
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkMoveDocumentModal">
+                                <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>
@@ -276,7 +278,6 @@ while ($folder_id > 0) {
                     display_folders(0, $client_id);
                     ?>
                 </ul>
-                <?php require_once "modals/folder/folder_add.php"; ?>
             </div>
 
             <div class="col-md-9">
@@ -466,10 +467,8 @@ while ($folder_id > 0) {
                         </table>
                         <br>
                     </div>
-                    <?php require_once "modals/document/document_bulk_move.php"; ?>
                 </form>
-                <?php require_once "../includes/filter_footer.php";
-?>
+                <?php require_once "../includes/filter_footer.php"; ?>
             </div>
         </div>
     </div>
@@ -479,6 +478,5 @@ while ($folder_id > 0) {
 
 <?php
 require_once "modals/share_modal.php";
-require_once "modals/document/document_add.php";
 require_once "modals/document/document_add_from_template.php";
 require_once "../includes/footer.php";

agent/domains.php

@@ -76,7 +76,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <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" data-toggle="modal" data-target="#addDomainModal"><i class="fas fa-plus mr-2"></i>New Domain</button>
+                    <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/domain/domain_add.php?<?= $client_url ?>"><i class="fas fa-plus mr-2"></i>New Domain</button>
                     <?php if ($num_rows[0] > 0) { ?>
                         <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                         <div class="dropdown-menu">
@@ -307,8 +307,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <td><?php echo $domain_dnshost_name_display; ?></td>
                                 <td><?php echo $domain_mailhost_name_display; ?></td>
                                 <td>
-                                    <div><?php echo $domain_expire; ?></div>
-                                    <div><small><?php echo $domain_expire_ago; ?></small></div>
+                                    <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>
@@ -361,7 +363,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "modals/domain/domain_add.php";
 require_once "modals/domain/domain_export.php";
 ?>
 

agent/expenses.php

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

agent/files.php

@@ -99,12 +99,12 @@ while ($folder_id > 0) {
 
         <div class="card-tools">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#uploadFilesModal">
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/file/file_upload.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>">
                     <i class="fas fa-fw fa-cloud-upload-alt mr-2"></i>Upload
                 </button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
-                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#createFolderModal">
+                    <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/folder/folder_add.php?client_id=<?= $client_id ?>&folder_location=1&current_folder_id=<?= $get_folder_id ?>">
                         <i class="fa fa-fw fa-folder-plus mr-2"></i>New Folder
                     </a>
                 </div>
@@ -228,7 +228,7 @@ while ($folder_id > 0) {
                     display_folders(0, $client_id);
                     ?>
                 </ul>
-                <?php require_once "modals/folder/folder_add.php"; ?>
+                <?php //require_once "modals/folder/folder_add.php"; ?>
             </div>
 
 
@@ -257,7 +257,9 @@ while ($folder_id > 0) {
                                         <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
                                     </button>
                                     <div class="dropdown-menu">
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkMoveFilesModal">
+                                        <a class="dropdown-item ajax-modal" href="#"
+                                            data-modal-url="modals/file/file_bulk_move.php?client_id=<?= $client_id ?>"
+                                            data-bulk="true">
                                             <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
                                         </a>
                                         <div class="dropdown-divider"></div>
@@ -581,13 +583,11 @@ while ($folder_id > 0) {
 
                         </table>
                     </div>
-                    <?php require_once "modals/file/file_bulk_move.php"; ?>
                 </form>
 
                 <?php } ?>
 
-                <?php require_once "../includes/filter_footer.php";
- ?>
+                <?php require_once "../includes/filter_footer.php"; ?>
 
             </div>
         </div>
@@ -620,7 +620,6 @@ function prevFile() {
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/file/file_upload.php";
 require_once "modals/share_modal.php";
 require_once "modals/file/file_delete.php";
 require_once "../includes/footer.php";

agent/global_search.php

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

agent/includes/inc_all_client.php

@@ -37,7 +37,8 @@ if (isset($_GET['client_id'])) {
     if (mysqli_num_rows($sql) == 0) {
         require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/header.php';
 
-        echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1></center>";
+        echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1><a class='btn btn-lg btn-secondary mt-3' href='javascript:history.back()'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>";
+        exit;
     } else {
 
         $row = mysqli_fetch_array($sql);

agent/invoice.php

@@ -199,21 +199,12 @@ if (isset($_GET['invoice_id'])) {
     ?>
 
     <ol class="breadcrumb d-print-none">
-        <?php if (isset($_GET['client_id'])) { ?>
         <li class="breadcrumb-item">
-            <a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
+            <a href="invoices.php">All Invoices</a>
         </li>
         <li class="breadcrumb-item">
-            <a href="invoices.php?client_id=<?php echo $client_id; ?>">Invoices</a>
+            <a href="invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?> Invoices</a>
         </li>
-        <?php } else { ?>
-        <li class="breadcrumb-item">
-            <a href="invoices.php">Invoices</a>
-        </li>
-        <li class="breadcrumb-item">
-            <a href="invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
-        </li>
-        <?php } ?>
         <li class="breadcrumb-item active"><?php echo "$invoice_prefix$invoice_number"; ?></li>
         <?php if (isset($invoice_overdue)) { ?>
             <span class="p-2 ml-2 badge badge-danger"><?php echo $invoice_overdue; ?></span>

agent/invoices.php

@@ -162,7 +162,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <h3 class="card-title mt-2"><i class="fa fa-fw fa-file-invoice mr-2"></i>Invoices</h3>
         <div class="card-tools">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addInvoiceModal"><i class="fas fa-plus mr-2"></i>New Invoice</button>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/invoice/invoice_add.php?<?= $client_url ?>"><i class="fas fa-plus mr-2"></i>New Invoice</button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
                     <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportInvoicesModal">
@@ -218,12 +218,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             </button>
                             <div class="dropdown-menu">
                                 <?php if ($client_url && $balance > 0) { ?> 
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addBulkPaymentModal">
+                                    <a class="dropdown-item ajax-modal" href="#"
+                                        data-modal-url="modals/payment/payment_bulk_add.php?<?= $client_url ?>">
                                         <i class="fa fa-credit-card mr-2"></i>Batch Payment
                                     </a>
                                     <div class="dropdown-divider"></div>
                                 <?php } ?>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditCategoryModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/invoice/invoice_bulk_edit_category.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-list-ul mr-2"></i>Set Category
                                 </a>
                             </div>
@@ -246,7 +249,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             </div>
         </form>
         <hr>
-        <form id="bulkActions" action="post.php" method="post" enctype="multipart/form-data">
+        <form id="bulkActions" action="post.php" method="post">
             <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
             <div class="table-responsive-sm">
                 <table class="table table-striped table-borderless table-hover">
@@ -362,7 +365,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 </div>
                             </td>
                             <td class="text-bold">
-                                <a href="invoice.php?<?php echo $client_url; ?>invoice_id=<?php echo $invoice_id; ?>">
+                                <a href="invoice.php?client_id=<?= $client_id ?>&invoice_id=<?= $invoice_id ?>">
                                 <?php echo "$invoice_prefix$invoice_number"; ?>
                                 </a>
                             </td>
@@ -437,17 +440,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "modals/invoice/invoice_bulk_edit_category.php"; ?>
         </form>
-        <?php require_once "../includes/filter_footer.php";
-?>
+        <?php require_once "../includes/filter_footer.php"; ?>
     </div>
 </div>
 
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/invoice/invoice_add.php";
-if ($client_url) { require_once "modals/payment/payment_bulk_add.php"; }
 require_once "modals/invoice/invoice_export.php";
 require_once "../includes/footer.php";

agent/js/ticket_change_client.js

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

agent/js/ticket_time_tracking.js

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

agent/locations.php

@@ -79,7 +79,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <h3 class="card-title mt-2"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>Locations</h3>
         <div class="card-tools">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addLocationModal">
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/location/location_add.php?<?= $client_url ?>">
                     <i class="fas fa-plus mr-2"></i>New Location
                 </button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
@@ -180,7 +180,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
                             </button>
                             <div class="dropdown-menu">
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignTagsModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/location/location_bulk_assign_tags.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-tags mr-2"></i>Assign Tags
                                 </a>
                                 <?php if ($archived) { ?>
@@ -393,10 +395,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "modals/location/location_bulk_assign_tags.php"; ?>
         </form>
-        <?php require_once "../includes/filter_footer.php";
- ?>
+        <?php require_once "../includes/filter_footer.php"; ?>
     </div>
 </div>
 
@@ -404,7 +404,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "modals/location/location_add.php";
 require_once "modals/location/location_import.php";
 require_once "modals/location/location_export.php";
 require_once "../includes/footer.php";

agent/modals/account/account_add.php

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

agent/modals/asset/asset_bulk_add_ticket.php

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

agent/modals/asset/asset_bulk_assign_contact.php

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

agent/modals/asset/asset_bulk_assign_location.php

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

agent/modals/asset/asset_bulk_assign_physical_location.php

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

agent/modals/asset/asset_bulk_edit_status.php

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

agent/modals/asset/asset_bulk_transfer_client.php

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

agent/modals/asset/asset_interface_add.php

@@ -1,224 +1,231 @@
-<div class="modal" id="addAssetInterfaceModal" 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>New Network Interface</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$asset_id = intval($_GET['asset_id'] ?? 0);
+$client_id = intval(getFieldById('assets', $asset_id, 'asset_client_id') ?? 0);
+
+ob_start();
+
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-ethernet mr-2"></i>New Network Interface</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="asset_id" value="<?php echo $asset_id; ?>">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+    <div class="modal-body">
+
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-interface-details">Details</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-interface-network">Network</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-interface-notes">Notes</a>
+            </li>
+        </ul>
+
+        <hr>
+
+        <div class="tab-content">
+
+            <div class="tab-pane fade show active" id="pills-interface-details">
+
+                <!-- Interface Name -->
+                <div class="form-group">
+                    <label>Interface Name or Port / <span class="text-secondary">Primary</span></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>
+                        <input type="text" class="form-control" name="name" placeholder="Interface name or port number" maxlength="200" required>
+                        <div class="input-group-append">
+                            <div class="input-group-text">
+                                <input type="checkbox" name="primary_interface" value="1" title="Mark Interface as primary">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- Type -->
+                <div class="form-group">
+                    <label for="network">Type</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-plug"></i></span>
+                        </div>
+                        <select class="form-control select2" name="type">
+                            <option value="">- Select Type -</option>
+                            <?php foreach($interface_types_array as $interface_type) { ?>
+                                <option><?php echo $interface_type; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+                <!-- Interface Description -->
+                <div class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                        </div>
+                        <input 
+                            type="text" 
+                            class="form-control" 
+                            name="description"
+                            placeholder="Short Description" 
+                            maxlength="200"
+                        >
+                    </div>
+                </div>
+
             </div>
 
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-
-                <div class="modal-body">
-
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-interface-details">Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-interface-network">Network</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-interface-notes">Notes</a>
-                        </li>
-                    </ul>
-
-                    <hr>
-
-                    <div class="tab-content">
-
-                        <div class="tab-pane fade show active" id="pills-interface-details">
-
-                            <!-- Interface Name -->
-                            <div class="form-group">
-                                <label>Interface Name or Port / <span class="text-secondary">Primary</span></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>
-                                    <input type="text" class="form-control" name="name" placeholder="Interface name or port number" maxlength="200" required>
-                                    <div class="input-group-append">
-                                        <div class="input-group-text">
-                                            <input type="checkbox" name="primary_interface" value="1" title="Mark Interface as primary">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- Type -->
-                            <div class="form-group">
-                                <label for="network">Type</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-plug"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="type">
-                                        <option value="">- Select Type -</option>
-                                        <?php foreach($interface_types_array as $interface_type) { ?>
-                                            <option><?php echo $interface_type; ?></option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                            <!-- Interface Description -->
-                            <div class="form-group">
-                                <label>Description</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-                                    </div>
-                                    <input 
-                                        type="text" 
-                                        class="form-control" 
-                                        name="description"
-                                        placeholder="Short Description" 
-                                        maxlength="200"
-                                    >
-                                </div>
-                            </div>
+            <div class="tab-pane fade" id="pills-interface-network">
 
+                <!-- MAC Address -->
+                <div class="form-group">
+                    <label>MAC Address</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-
-                        <div class="tab-pane fade" id="pills-interface-network">
-
-                            <!-- MAC Address -->
-                            <div class="form-group">
-                                <label>MAC Address</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>
-                                    <input type="text" class="form-control" name="mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
-                                </div>
-                            </div>
-
-                            <!-- IP (with optional DHCP checkbox) -->
-                            <div class="form-group">
-                                <label>IP or DHCP</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>
-                                    <input type="text" class="form-control" name="ip" placeholder="IP Address" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
-                                    <div class="input-group-append">
-                                        <div class="input-group-text">
-                                            <input type="checkbox" name="dhcp" value="1" title="Check to mark address as DHCP controlled">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- NAT IP -->
-                            <div class="form-group">
-                                <label>NAT IP</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>
-                                    <input
-                                        type="text"
-                                        class="form-control"
-                                        name="nat_ip"
-                                        placeholder="Nat IP"
-                                        maxlength="200"
-                                        data-inputmask="'alias': 'ip'"
-                                        data-mask
-                                    >
-                                </div>
-                            </div>
-
-                            <!-- IPv6 -->
-                            <div class="form-group">
-                                <label>IPv6</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>
-                                    <input type="text" class="form-control" name="ipv6" placeholder="IPv6 Address" maxlength="200">
-                                </div>
-                            </div>
-
-                            <!-- 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="network">
-                                        <option value="">- Select Network -</option>
-                                        <?php
-                                        $sql_network_select = mysqli_query($mysqli, "SELECT * FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id ORDER BY network_name ASC");
-                                        while ($row = mysqli_fetch_array($sql_network_select)) {
-                                            $network_id = $row['network_id'];
-                                            $network_name = nullable_htmlentities($row['network_name']);
-                                            $network = nullable_htmlentities($row['network']);
-                                            ?>
-                                            <option value="<?php echo $network_id; ?>">
-                                                <?php echo "$network_name - $network"; ?>
-                                            </option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Connected to</label>
-                                <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="connected_to">
-                                        <option value="">- NSelect Asset and Interface -</option>
-                                        <?php
-                                        $sql_interfaces_select = mysqli_query($mysqli, "
-                                            SELECT i.interface_id, i.interface_name, a.asset_name
-                                            FROM asset_interfaces i
-                                            LEFT JOIN assets a ON a.asset_id = i.interface_asset_id
-                                            WHERE a.asset_archived_at IS NULL
-                                              AND a.asset_client_id = $client_id
-                                              AND a.asset_id != $asset_id
-                                              AND i.interface_id NOT IN (SELECT interface_a_id FROM asset_interface_links)
-                                              AND i.interface_id NOT IN (SELECT interface_b_id FROM asset_interface_links)
-                                            ORDER BY a.asset_name ASC, i.interface_name ASC
-                                        ");
-
-                                        while ($row = mysqli_fetch_array($sql_interfaces_select)) {
-                                            $interface_id_select = intval($row['interface_id']);
-                                            $interface_name_select = nullable_htmlentities($row['interface_name']);
-                                            $asset_name_select = nullable_htmlentities($row['asset_name']);
-                                            ?>
-                                            <option value="<?php echo $interface_id_select; ?>">
-                                                <?php echo "$asset_name_select - $interface_name_select"; ?>
-                                            </option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-interface-notes">
-                            <!-- Notes -->
-                            <div class="form-group">
-                                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
-                            </div>
-                        </div>
-
+                        <input type="text" class="form-control" name="mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
                     </div>
+                </div>
 
+                <!-- IP (with optional DHCP checkbox) -->
+                <div class="form-group">
+                    <label>IP or DHCP</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>
+                        <input type="text" class="form-control" name="ip" placeholder="IP Address" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
+                        <div class="input-group-append">
+                            <div class="input-group-text">
+                                <input type="checkbox" name="dhcp" value="1" title="Check to mark address as DHCP controlled">
+                            </div>
+                        </div>
+                    </div>
                 </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_asset_interface" class="btn btn-primary text-bold">
-                        <i class="fas fa-check mr-2"></i>Create
-                    </button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Close</button>
+
+                <!-- NAT IP -->
+                <div class="form-group">
+                    <label>NAT IP</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>
+                        <input
+                            type="text"
+                            class="form-control"
+                            name="nat_ip"
+                            placeholder="Nat IP"
+                            maxlength="200"
+                            data-inputmask="'alias': 'ip'"
+                            data-mask
+                        >
+                    </div>
                 </div>
-            </form>
+
+                <!-- IPv6 -->
+                <div class="form-group">
+                    <label>IPv6</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>
+                        <input type="text" class="form-control" name="ipv6" placeholder="IPv6 Address" maxlength="200">
+                    </div>
+                </div>
+
+                <!-- 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="network">
+                            <option value="">- Select Network -</option>
+                            <?php
+                            $sql_network_select = mysqli_query($mysqli, "SELECT * FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id ORDER BY network_name ASC");
+                            while ($row = mysqli_fetch_array($sql_network_select)) {
+                                $network_id = $row['network_id'];
+                                $network_name = nullable_htmlentities($row['network_name']);
+                                $network = nullable_htmlentities($row['network']);
+                                ?>
+                                <option value="<?php echo $network_id; ?>">
+                                    <?php echo "$network_name - $network"; ?>
+                                </option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Connected to</label>
+                    <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="connected_to">
+                            <option value="">- Select Asset and Interface -</option>
+                            <?php
+                            $sql_interfaces_select = mysqli_query($mysqli, "
+                                SELECT interface_id, interface_name, asset_name
+                                FROM asset_interfaces
+                                LEFT JOIN assets ON asset_id = interface_asset_id
+                                WHERE asset_archived_at IS NULL
+                                  AND asset_client_id = $client_id
+                                  AND asset_id != $asset_id
+                                  AND interface_id NOT IN (SELECT interface_a_id FROM asset_interface_links)
+                                  AND interface_id NOT IN (SELECT interface_b_id FROM asset_interface_links)
+                                ORDER BY asset_name ASC, interface_name ASC
+                            ");
+
+                            while ($row = mysqli_fetch_array($sql_interfaces_select)) {
+                                $interface_id_select = intval($row['interface_id']);
+                                $interface_name_select = nullable_htmlentities($row['interface_name']);
+                                $asset_name_select = nullable_htmlentities($row['asset_name']);
+                                ?>
+                                <option value="<?php echo $interface_id_select; ?>">
+                                    <?php echo "$asset_name_select - $interface_name_select"; ?>
+                                </option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-interface-notes">
+                <!-- Notes -->
+                <div class="form-group">
+                    <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
+                </div>
+            </div>
+
         </div>
+
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_asset_interface" class="btn btn-primary text-bold">
+            <i class="fas fa-check mr-2"></i>Create
+        </button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Close</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/calendar/calendar_add.php

@@ -1,41 +1,45 @@
-<div class="modal" id="addCalendarModal" 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-calendar-plus mr-2"></i>New Calendar</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <div class="modal-body">
+<?php
 
-                    <div class="form-group">
-                        <label>Name</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Name your calendar" maxlength="200" required autofocus>
-                        </div>
-                    </div>
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
-                        <label>Color <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-paint-brush"></i></span>
-                            </div>
-                            <input type="color" class="form-control col-3" name="color" required>
-                        </div>
-                    </div>
+ob_start();
 
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_calendar" class="btn btn-primary"><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 class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-calendar-plus mr-2"></i>New Calendar</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Name</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Name your calendar" maxlength="200" required autofocus>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Color <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-paint-brush"></i></span>
+                </div>
+                <input type="color" class="form-control col-3" name="color" required>
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_calendar" class="btn btn-primary"><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/certificate/certificate_add.php

@@ -1,166 +1,175 @@
-<div class="modal" id="addCertificateModal" 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-lock mr-2"></i>New Certificate</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <div class="modal-body">
+<?php
 
-                    <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-certificate">Certificate</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
-                        </li>
-                    </ul>
+require_once '../../../includes/modal_header.php';
 
-                    <hr>
+$client_id = intval($_GET['client_id'] ?? 0);
 
-                    <div class="tab-content">
+ob_start();
 
-                        <div class="tab-pane fade show active" id="pills-details">
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-lock mr-2"></i>New Certificate</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <div class="modal-body">
 
-                            <?php if ($client_url) { ?>
-                                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                            <?php } else { ?>
+        <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-certificate">Certificate</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
+            </li>
+        </ul>
 
-                                <div class="form-group">
-                                    <label>Client <strong class="text-danger">*</strong></label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                        </div>
-                                        <select class="form-control select2" name="client_id" required>
-                                            <option value="">- Select Client -</option>
-                                            <?php
+        <hr>
 
-                                            $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
-                                            while ($row = mysqli_fetch_array($sql)) {
-                                                $client_id = intval($row['client_id']);
-                                                $client_name = nullable_htmlentities($row['client_name']); ?>
-                                                <option <?php if ($client_id == isset($_GET['client'])) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+        <div class="tab-content">
 
-                                            <?php } ?>
-                                        </select>
-                                    </div>
-                                </div>
+            <div class="tab-pane fade show active" id="pills-details">
 
-                            <?php } ?>
+                <?php if ($client_id) { ?>
+                    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } else { ?>
 
-                            <div class="form-group">
-                                <label>Certificate Name <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Certificate name" maxlength="200" required autofocus>
-                                </div>
+                    <div class="form-group">
+                        <label>Client <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                             </div>
+                            <select class="form-control select2" name="client_id" required>
+                                <option value="">- Select Client -</option>
+                                <?php
 
-                            <div class="form-group">
-                                <label>Description</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="description" placeholder="Short Description">
-                                </div>
-                            </div>
+                                $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $client_id_select = intval($row['client_id']);
+                                    $client_name = nullable_htmlentities($row['client_name']); ?>
+                                    <option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name; ?></option>
 
-                            <?php if ($client_url) { ?>
-                            <div class="form-group">
-                                <label>Domain</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="domain_id">
-                                        <option value="">- Domain -</option>
-                                        <?php
-                                        $domains_sql = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_archived_at IS NULL AND domain_client_id = $client_id ORDER BY domain_name ASC");
-                                        while ($domain_row = mysqli_fetch_array($domains_sql)) {
-                                            $domain_id = intval($domain_row['domain_id']);
-                                            $domain_name = nullable_htmlentities($domain_row['domain_name']);
-                                            echo "<option value=\"$domain_id\">$domain_name</option>";
-                                        }
-                                        ?>
-                                    </select>
-                                </div>
-                            </div>
-                            <?php } ?>
-                        
+                                <?php } ?>
+                            </select>
                         </div>
-
-                        <div class="tab-pane fade" id="pills-certificate">
-
-                            <div class="form-group">
-                                <label>Domain <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i>&nbsp;https://</span>
-                                    </div>
-                                    <input type="text" class="form-control" name="domain" id="domain" placeholder="FQDN" maxlength="200" required>
-                                    <div class="input-group-append">
-                                        <button type="button" class="btn btn-secondary" onclick="fetchSSL('new')"><i class="fas fa-fw fa-sync-alt"></i></button>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Issued By </label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="issued_by" id="issuedBy" placeholder="Issued By" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Expire Date</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
-                                    </div>
-                                    <input type="date" class="form-control" name="expire" id="expire" max="2999-12-31">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Public Key </label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                                    </div>
-                                    <textarea class="form-control" rows="8" name="public_key" id="publicKey" placeholder="-----BEGIN CERTIFICATE-----"></textarea>
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-notes">
-                            <div class="form-group">
-                                <textarea class="form-control" rows="12" placeholder="Enter some notes" name="notes"></textarea>
-                            </div>
-                        </div>
-
                     </div>
 
+                <?php } ?>
+
+                <div class="form-group">
+                    <label>Certificate Name <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="name" placeholder="Certificate name" maxlength="200" required autofocus>
+                    </div>
                 </div>
 
-                <div class="modal-footer">
-                    <button type="submit" name="add_certificate" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                <div class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description" placeholder="Short Description">
+                    </div>
                 </div>
-            </form>
+
+                <?php if ($client_id) { ?>
+                <div class="form-group">
+                    <label>Domain</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                        </div>
+                        <select class="form-control select2" name="domain_id">
+                            <option value="">- Domain -</option>
+                            <?php
+                            $domains_sql = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_archived_at IS NULL AND domain_client_id = $client_id ORDER BY domain_name ASC");
+                            while ($domain_row = mysqli_fetch_array($domains_sql)) {
+                                $domain_id = intval($domain_row['domain_id']);
+                                $domain_name = nullable_htmlentities($domain_row['domain_name']);
+                                echo "<option value=\"$domain_id\">$domain_name</option>";
+                            }
+                            ?>
+                        </select>
+                    </div>
+                </div>
+                <?php } ?>
+            
+            </div>
+
+            <div class="tab-pane fade" id="pills-certificate">
+
+                <div class="form-group">
+                    <label>Domain <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-globe"></i>&nbsp;https://</span>
+                        </div>
+                        <input type="text" class="form-control" name="domain" id="domain" placeholder="FQDN" maxlength="200" required>
+                        <div class="input-group-append">
+                            <button type="button" class="btn btn-secondary" onclick="fetchSSL('new')"><i class="fas fa-fw fa-sync-alt"></i></button>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Issued By </label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="issued_by" id="issuedBy" placeholder="Issued By" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Expire Date</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
+                        </div>
+                        <input type="date" class="form-control" name="expire" id="expire" max="2999-12-31">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Public Key </label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                        </div>
+                        <textarea class="form-control" rows="8" name="public_key" id="publicKey" placeholder="-----BEGIN CERTIFICATE-----"></textarea>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-notes">
+                <div class="form-group">
+                    <textarea class="form-control" rows="12" placeholder="Enter some notes" name="notes"></textarea>
+                </div>
+            </div>
+
         </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="add_certificate" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<script src="/agent/js/certificate_fetch_ssl.js"></script>
+
+<?php
+
+require_once '../../../includes/modal_footer.php';

agent/modals/certificate/certificate_edit.php

@@ -193,5 +193,7 @@ ob_start();
     </div>
 </form>
 
+<script src="/agent/js/certificate_fetch_ssl.js"></script>
+
 <?php
 require_once '../../../includes/modal_footer.php';

agent/modals/client/client_add.php

@@ -15,7 +15,7 @@ ob_start();
 ?>
 
 <div class="modal-header bg-dark">
-    <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>Creating New <?php if($leads_filter == 0){ echo "Client"; } else { echo "Lead"; } ?></h5>
+    <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>New <?php if($leads_filter == 0){ echo "Client"; } else { echo "Lead"; } ?></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
@@ -328,21 +328,6 @@ ob_start();
                         </div>
                     </div>
 
-                    <div class="form-group">
-                        <label>Currency <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
-                            </div>
-                            <select class="form-control select2" name="currency_code" required>
-                                <option value="">- Select Currency -</option>
-                                <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
-                                    <option <?php if ($session_company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
-
                     <div class="form-group">
                         <label>Payment Terms</label>
                         <div class="input-group">
@@ -380,7 +365,7 @@ ob_start();
         </div>
     </div>
     <div class="modal-footer">
-        <button type="submit" name="add_client" class="btn btn-primary text-bold" onclick="promptPrimaryContact()"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="submit" name="add_client" class="btn btn-primary text-bold" onclick="promptPrimaryContact()"><i class="fa fa-check mr-2"></i>Create Client</button>
         <button type="button" class="btn btn-outline-secondary" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Close</button>
     </div>
 </form>

agent/modals/client/client_bulk_add_ticket.php

@@ -1,137 +1,151 @@
-<div class="modal" id="bulkAddTicketModal" tabindex="-1">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>Creating Tickets for Clients</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>Subject <strong class="text-danger">*</strong></label>
-                    <input type="text" class="form-control" name="bulk_subject" placeholder="Enter a subject" maxlength="200">
-                </div>
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group">
-                    <textarea class="form-control tinymceTicket" id="textInput" name="bulk_details"></textarea>
-                </div>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-                <div class="row">
-                                
-                    <div class="col">
-                        <div class="form-group">
-                            <label>Priority <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
-                                </div>
-                                <select class="form-control select2" name="bulk_priority">
-                                    <option>Low</option>
-                                    <option>Medium</option>
-                                    <option>High</option>
-                                </select>
-                            </div>
-                        </div>
-                    </div>
+$count = count($selected_ids);
 
-                    <div class="col">
-                        <div class="form-group">
-                            <label>Category</label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
-                                </div>
-                                <select class="form-control select2" name="bulk_category">
-                                    <option value="0">- Not Categorized -</option>
-                                    <?php
-                                    $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL");
-                                    while ($row = mysqli_fetch_array($sql_categories)) {
-                                        $category_id = intval($row['category_id']);
-                                        $category_name = nullable_htmlentities($row['category_name']);
+// Generate the HTML form content using output buffering.
+ob_start();
 
-                                        ?>
-                                        <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-                                    <?php } ?>
+?>
 
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-
-                <div class="row">
-                    <div class="col">
-
-                        <div class="form-group">
-                            <label>Assign to</label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
-                                </div>
-                                <select class="form-control select2" name="bulk_assigned_to">
-                                    <option value="0">Not Assigned</option>
-                                    <?php
-
-                                    $sql = mysqli_query(
-                                        $mysqli,
-                                        "SELECT user_id, user_name FROM users
-                                        WHERE user_role_id > 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
-                                    );
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $user_id = intval($row['user_id']);
-                                        $user_name = nullable_htmlentities($row['user_name']); ?>
-                                        <option value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
-                                    <?php } ?>
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="col">
-
-                        <div class="form-group">
-                            <label>Project</label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
-                                </div>
-                                <select class="form-control select2" name="bulk_project">
-                                    <option value="0">- None -</option>
-                                    <?php
-
-                                    $sql_projects = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_completed_at IS NULL AND project_archived_at IS NULL ORDER BY project_name ASC");
-                                    while ($row = mysqli_fetch_array($sql_projects)) {
-                                        $project_id_select = intval($row['project_id']);
-                                        $project_name_select = nullable_htmlentities($row['project_name']); ?>
-                                        <option value="<?php echo $project_id_select; ?>"><?php echo $project_name_select; ?></option>
-
-                                    <?php } ?>
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <?php if ($config_module_enable_accounting) { ?>
-                <div class="form-group">
-                    <div class="custom-control custom-switch">
-                        <input type="checkbox" class="custom-control-input" name="bulk_billable" <?php if ($config_ticket_default_billable == 1) { echo "checked"; } ?> value="1" id="billableSwitch">
-                        <label class="custom-control-label" for="billableSwitch">Billable</label>
-                    </div>
-                </div>
-                <?php } ?>
-
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_add_client_ticket" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-            </div>
-            
-        </div>
-    </div>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>New Tickets for <strong><?= $count ?></strong> Client(s)</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 ($selected_ids as $id) { ?><input type="hidden" name="client_ids[]" value="<?= $id ?>"><?php } ?>
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Subject <strong class="text-danger">*</strong></label>
+            <input type="text" class="form-control" name="bulk_subject" placeholder="Enter a subject" maxlength="200" required>
+        </div>
+
+        <div class="form-group">
+            <textarea class="form-control tinymceTicket" id="textInput" name="bulk_details"></textarea>
+        </div>
+
+        <div class="row">
+                        
+            <div class="col">
+                <div class="form-group">
+                    <label>Priority <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
+                        </div>
+                        <select class="form-control select2" name="bulk_priority" required>
+                            <option>Low</option>
+                            <option>Medium</option>
+                            <option>High</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col">
+                <div class="form-group">
+                    <label>Category</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
+                        </div>
+                        <select class="form-control select2" name="bulk_category">
+                            <option value="0">- Not Categorized -</option>
+                            <?php
+                            $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL");
+                            while ($row = mysqli_fetch_array($sql_categories)) {
+                                $category_id = intval($row['category_id']);
+                                $category_name = nullable_htmlentities($row['category_name']);
+
+                                ?>
+                                <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+        <div class="row">
+            <div class="col">
+
+                <div class="form-group">
+                    <label>Assign to</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
+                        </div>
+                        <select class="form-control select2" name="bulk_assigned_to">
+                            <option value="0">Not Assigned</option>
+                            <?php
+
+                            $sql = mysqli_query(
+                                $mysqli,
+                                "SELECT user_id, user_name FROM users
+                                WHERE user_role_id > 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
+                            );
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $user_id = intval($row['user_id']);
+                                $user_name = nullable_htmlentities($row['user_name']); ?>
+                                <option value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col">
+
+                <div class="form-group">
+                    <label>Project</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
+                        </div>
+                        <select class="form-control select2" name="bulk_project">
+                            <option value="0">- None -</option>
+                            <?php
+
+                            $sql_projects = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_completed_at IS NULL AND project_archived_at IS NULL ORDER BY project_name ASC");
+                            while ($row = mysqli_fetch_array($sql_projects)) {
+                                $project_id_select = intval($row['project_id']);
+                                $project_name_select = nullable_htmlentities($row['project_name']); ?>
+                                <option value="<?php echo $project_id_select; ?>"><?php echo $project_name_select; ?></option>
+
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <?php if ($config_module_enable_accounting) { ?>
+        <div class="form-group">
+            <div class="custom-control custom-switch">
+                <input type="checkbox" class="custom-control-input" name="bulk_billable" <?php if ($config_ticket_default_billable == 1) { echo "checked"; } ?> value="1" id="billableSwitch">
+                <label class="custom-control-label" for="billableSwitch">Billable</label>
+            </div>
+        </div>
+        <?php } ?>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_add_client_ticket" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/client/client_bulk_assign_tags.php

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

agent/modals/client/client_bulk_edit_hourly_rate.php

@@ -1,31 +1,45 @@
-<div class="modal" id="bulkEditHourlyRateModal" 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-clock mr-2"></i>Bulk Edit Hourly Rate</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group">
-                    <label>Hourly Rate</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
-                        </div>
-                        <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="bulk_rate" placeholder="0.00">
-                    </div>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-clock mr-2"></i>Set Hourly Rate for <strong><?= $count ?></strong> Client(s)</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 ($selected_ids as $id) { ?><input type="hidden" name="client_ids[]" value="<?= $id ?>"><?php } ?>
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Hourly Rate</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>
-
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_edit_client_hourly_rate" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="bulk_rate" placeholder="0.00" required>
             </div>
         </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_client_hourly_rate" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/client/client_bulk_edit_industry.php

@@ -1,31 +1,45 @@
-<div class="modal" id="bulkEditIndustryModal" 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-briefcase mr-2"></i>Bulk Edit Industry</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group">
-                    <label>Industry</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-briefcase"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="bulk_industry" placeholder="Enter an Industry" maxlength="200">
-                    </div>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-briefcase mr-2"></i>Set Industry for <strong><?= $count ?></strong> Client(s)</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 ($selected_ids as $id) { ?><input type="hidden" name="client_ids[]" value="<?= $id ?>"><?php } ?>
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Industry</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-briefcase"></i></span>
                 </div>
-
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_edit_client_industry" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                <input type="text" class="form-control" name="bulk_industry" placeholder="Enter an Industry" maxlength="200" required>
             </div>
         </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_client_industry" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/client/client_bulk_edit_referral.php

@@ -1,47 +1,59 @@
-<div class="modal" id="bulkEditReferralModal" 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-link mr-2"></i>Bulk Edit Referral</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group">
-                    <label>Referral</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_referral">
-                            <option value="">- Select a Referral -</option>
-                            <?php
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-                            $referral_sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                            while ($row = mysqli_fetch_array($referral_sql)) {
-                                $referral = nullable_htmlentities($row['category_name']); ?>
-                                <option><?php echo $referral; ?></option>
-                            <?php } ?>
+$count = count($selected_ids);
 
-                        </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=Referral">
-                                <i class="fas fa-fw fa-plus"></i>
-                            </button>
-                        </div>
-                    </div>
+ob_start();
+
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-link mr-2"></i>Set Referral for <strong><?= $count ?></strong> Clients</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 ($selected_ids as $id) { ?><input type="hidden" name="client_ids[]" value="<?= $id ?>"><?php } ?>
+    
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Referral</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
                 </div>
+                <select class="form-control select2" name="bulk_referral">
+                    <option value="">- Select a Referral -</option>
+                    <?php
+                    $referral_sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                    while ($row = mysqli_fetch_array($referral_sql)) {
+                        $referral = nullable_htmlentities($row['category_name']); ?>
+                        <option><?php echo $referral; ?></option>
+                    <?php } ?>
 
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_edit_client_referral" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </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=Referral">
+                        <i class="fas fa-fw fa-plus"></i>
+                    </button>
+                </div>
             </div>
         </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_client_referral" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/client/client_bulk_email.php

@@ -1,100 +1,113 @@
-<div class="modal" id="bulkSendEmailModal" tabindex="-1">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-envelope-open mr-2"></i>Bulk Send Email</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-envelope-open mr-2"></i>Send Emails to <strong><?= $count ?></strong> Client(s)</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 ($selected_ids as $id) { ?><input type="hidden" name="client_ids[]" value="<?= $id ?>"><?php } ?>
+
+    <div class="modal-body">
+
+        <label>From Email / <span class="text-secondary">Display Name</span></label>
+        <div class="form-row">
+
+            <div class="form-group col-sm-6">
+                <select type="text" class="form-control select2" name="mail_from">
+                    <option value="<?php echo nullable_htmlentities($config_mail_from_email); ?>">
+                        <?php echo nullable_htmlentities("$config_mail_from_name - $config_mail_from_email"); ?></option>
+                    <option value="<?php echo nullable_htmlentities($config_invoice_from_email); ?>">
+                        <?php echo nullable_htmlentities("$config_invoice_from_name - $config_invoice_from_email"); ?></option>
+                    <option value="<?php echo nullable_htmlentities($config_quote_from_email); ?>">
+                        <?php echo nullable_htmlentities("$config_quote_from_name - $config_quote_from_email"); ?></option>
+                    <option value="<?php echo nullable_htmlentities($config_ticket_from_email); ?>">
+                        <?php echo nullable_htmlentities("$config_ticket_from_name - $config_ticket_from_email"); ?></option>
+                </select>
             </div>
 
-            <div class="modal-body">
-
-                <label>From Email / <span class="text-secondary">Display Name</span></label>
-                <div class="form-row">
-
-                    <div class="form-group col-sm-6">
-                        <select type="text" class="form-control select2" name="mail_from">
-                            <option value="<?php echo nullable_htmlentities($config_mail_from_email); ?>">
-                                <?php echo nullable_htmlentities("$config_mail_from_name - $config_mail_from_email"); ?></option>
-                            <option value="<?php echo nullable_htmlentities($config_invoice_from_email); ?>">
-                                <?php echo nullable_htmlentities("$config_invoice_from_name - $config_invoice_from_email"); ?></option>
-                            <option value="<?php echo nullable_htmlentities($config_quote_from_email); ?>">
-                                <?php echo nullable_htmlentities("$config_quote_from_name - $config_quote_from_email"); ?></option>
-                            <option value="<?php echo nullable_htmlentities($config_ticket_from_email); ?>">
-                                <?php echo nullable_htmlentities("$config_ticket_from_name - $config_ticket_from_email"); ?></option>
-                        </select>
-                    </div>
-
-                    <div class="form-group col-sm-6">
-                        <input type="text" class="form-control" name="mail_from_name" placeholder="From Name" maxlength="255"
-                            value="<?php echo nullable_htmlentities($config_mail_from_name); ?>">
-                    </div>
-                </div>
-
-
-                <label>Recipients</label>
-                <div class="form-row">
-
-                    <div class="col-md-3">
-                        <div class="form-group">
-                            <div class="custom-control custom-checkbox">
-                                <input type="checkbox" class="custom-control-input" id="contactPrimaryCheckbox" name="primary_contacts" value="1">
-                                <label class="custom-control-label" for="contactPrimaryCheckbox">Primary Contacts</label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-3">
-                        <div class="form-group">
-                            <div class="custom-control custom-checkbox">
-                                <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox" name="important_contacts" value="1">
-                                <label class="custom-control-label" for="contactImportantCheckbox">Important Contacts</label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-3">
-                        <div class="form-group">
-                            <div class="custom-control custom-checkbox">
-                                <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox" name="billing_contacts" value="1">
-                                <label class="custom-control-label" for="contactBillingCheckbox">Billing Contacts</label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-3">
-                        <div class="form-group">
-                            <div class="custom-control custom-checkbox">
-                                <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox" name="technical_contacts" value="1">
-                                <label class="custom-control-label" for="contactTechnicalCheckbox">Technical Contacts</label>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-
-                <div class="form-group">
-                    <input type="text" class="form-control" name="subject" placeholder="Subject" maxlength="255">
-                </div>
-
-                <div class="form-group">
-                    <textarea class="form-control tinymce" name="body"
-                        placeholder="Type an email in here"></textarea>
-                </div>
-
-                <div class="form-group">
-                    <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="datetime-local" class="form-control" name="queued_at">
-                    </div>
-                </div>
-
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_send_client_email" class="btn btn-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>Send</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+            <div class="form-group col-sm-6">
+                <input type="text" class="form-control" name="mail_from_name" placeholder="From Name" maxlength="255"
+                    value="<?php echo nullable_htmlentities($config_mail_from_name); ?>">
             </div>
         </div>
+
+        <label>Recipients</label>
+        <div class="form-row">
+
+            <div class="col-md-3">
+                <div class="form-group">
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" class="custom-control-input" id="contactPrimaryCheckbox" name="primary_contacts" value="1">
+                        <label class="custom-control-label" for="contactPrimaryCheckbox">Primary Contacts</label>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-3">
+                <div class="form-group">
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox" name="important_contacts" value="1">
+                        <label class="custom-control-label" for="contactImportantCheckbox">Important Contacts</label>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-3">
+                <div class="form-group">
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox" name="billing_contacts" value="1">
+                        <label class="custom-control-label" for="contactBillingCheckbox">Billing Contacts</label>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-3">
+                <div class="form-group">
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox" name="technical_contacts" value="1">
+                        <label class="custom-control-label" for="contactTechnicalCheckbox">Technical Contacts</label>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+        <div class="form-group">
+            <input type="text" class="form-control" name="subject" placeholder="Subject" maxlength="255">
+        </div>
+
+        <div class="form-group">
+            <textarea class="form-control tinymce" name="body"
+                placeholder="Type an email in here"></textarea>
+        </div>
+
+        <div class="form-group">
+            <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="datetime-local" class="form-control" name="queued_at">
+            </div>
+        </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_send_client_email" class="btn btn-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>Send</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/client/client_delete.php

@@ -5,7 +5,7 @@
                 <div class="mb-4" style="text-align: center;">
                     <i class="far fa-10x fa-times-circle text-danger mb-3 mt-3"></i>
                     <h2>Are you really, really, really sure?</h2>
-                    <h6 class="mb-4 text-secondary">Do you really want to <b>delete <?php echo $client_name; ?> and ALL associated data</b>? This includes <?php echo $client_name; ?>'s documents, tickets, files, financial data, logs, etc. <br><br>This process cannot be undone.</h6>
+                    <h6 class="mb-4 text-secondary">Do you really want to <b>delete <i><?php echo $client_name; ?></i> and ALL associated data</b>? This includes <i><?php echo $client_name; ?></i>'s documents, tickets, files, payments, invoices, logs, etc.<br>See <a href="https://forum.itflow.org/d/1147-deleting-a-client-deletes-payments" target="_blank">this</a> forum post.<br><br>This process cannot be undone.</h6>
                     <div class="form-group">
                         <input type="hidden" id="clientName<?php echo $client_id ?>" value="<?php echo $client_name; ?>">
                         <input class="form-control" type="text" id="clientNameProvided<?php echo $client_id ?>" onkeyup="validateClientNameDelete(<?php echo $client_id ?>)" placeholder="Type '<?php echo $client_name; ?>' to confirm data deletion">
@@ -17,4 +17,4 @@
         </div>
     </div>
 </div>
-<script src="../js/client_delete_confirm.js"></script>
+<script src="/agent/js/client_delete_confirm.js"></script>

agent/modals/client/client_edit.php

@@ -12,7 +12,6 @@ $client_is_lead = intval($row['client_lead']);
 $client_type = nullable_htmlentities($row['client_type']);
 $client_website = nullable_htmlentities($row['client_website']);
 $client_referral = nullable_htmlentities($row['client_referral']);
-$client_currency_code = nullable_htmlentities($row['client_currency_code']);
 $client_net_terms = intval($row['client_net_terms']);
 $client_tax_id_number = nullable_htmlentities($row['client_tax_id_number']);
 $client_abbreviation = nullable_htmlentities($row['client_abbreviation']);
@@ -188,25 +187,6 @@ ob_start();
                         </div>
                     </div>
 
-                    <div class="form-group">
-                        <label>Currency <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
-                            </div>
-                            <select class="form-control select2" name="currency_code" required>
-                                <option value="">- Currency -</option>
-                                <?php foreach ($currencies_array as $currency_code => $currency_name) { ?>
-                                    <option <?php if ($client_currency_code == $currency_code) {
-                                        echo "selected";
-                                    } ?> value="<?php echo $currency_code; ?>">
-                                        <?php echo "$currency_code - $currency_name"; ?>
-                                    </option>
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
-
                     <div class="form-group">
                         <label>Invoice Net Terms</label>
                         <div class="input-group">

agent/modals/contact/contact_add.php

@@ -148,7 +148,10 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
                         </div>
-                        <input type="email" class="form-control" name="email" placeholder="Email Address" maxlength="200">
+                        <input type="email" class="form-control" name="email" id="contact_email" placeholder="Email Address" maxlength="200" onfocusout="contact_email_check()">
+                    </div>
+                    <div class="mt-2">
+                        <span class="text-info" id="contact_check_info"></span>
                     </div>
                 </div>
 
@@ -219,12 +222,12 @@ ob_start();
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                                 </div>
-                                <input type="password" class="form-control" data-toggle="password" id="password-add" name="contact_password" placeholder="Password" autocomplete="new-password">
+                                <input type="password" class="form-control" data-toggle="password" id="password" name="contact_password" placeholder="Password" autocomplete="new-password">
                                 <div class="input-group-append">
                                     <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
                                 </div>
                                 <div class="input-group-append">
-                                    <button type="button" class="btn btn-default" onclick="generatePassword('add')">
+                                    <button type="button" class="btn btn-default" onclick="generatePassword()">
                                         <i class="fa fa-fw fa-question"></i>
                                     </button>
                                 </div>
@@ -313,22 +316,14 @@ ob_start();
 <!-- JavaScript to Show/Hide Password Form Group -->
 <script>
 
-function generatePassword(type, id) {
-    // Send a GET request to ajax.php as ajax.php?get_readable_pass=true
+function generatePassword() {
     jQuery.get(
         "ajax.php", {
             get_readable_pass: 'true'
         },
         function(data) {
-            //If we get a response from post.php, parse it as JSON
             const password = JSON.parse(data);
-
-            // Set the password value to the correct modal, based on the type
-            if (type == "add") {
-                document.getElementById("password-add").value = password;
-            } else if (type == "edit") {
-                document.getElementById("password-edit-"+id.toString()).value = password;
-            }
+            document.getElementById("password").value = password;
         }
     );
 }
@@ -347,6 +342,23 @@ $(document).ready(function() {
 });
 </script>
 
+<script>
+    // Checks contact emails
+    function contact_email_check() {
+        var email = document.getElementById("contact_email").value;
+        //Send a GET request to ajax.php as ajax.php?contact_email_check=true&email=email
+        jQuery.get(
+            "ajax.php",
+            {contact_email_check: 'true', email: email},
+            function(data) {
+                //If we get a response from ajax.php, parse it as JSON
+                const contact_check_data = JSON.parse(data);
+                document.getElementById("contact_check_info").innerHTML = contact_check_data.message;
+            }
+        );
+    }
+</script>
+
 <?php
 
 require_once '../../../includes/modal_footer.php';

agent/modals/contact/contact_bulk_assign_location.php

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

agent/modals/contact/contact_bulk_assign_tags.php

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

agent/modals/contact/contact_bulk_edit_department.php

@@ -1,31 +1,43 @@
-<div class="modal" id="bulkEditDepartmentModal" 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>Bulk Set Department / Group</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                <label>Department / Group</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-users"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="bulk_department" placeholder="Department or group" maxlength="200">
-                    </div>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-users mr-2"></i>Set Department / Group for <strong><?= $count ?></strong> Contacts</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 ($selected_ids as $id) { ?><input type="hidden" name="contact_ids[]" value="<?= $id ?>"><?php } ?>
+    <div class="modal-body">
+
+        <label>Department / Group</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-users"></i></span>
                 </div>
-
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_edit_contact_department" 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>
+                <input type="text" class="form-control" name="bulk_department" placeholder="Department or group" maxlength="200">
             </div>
         </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_contact_department" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set Department</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/contact/contact_bulk_edit_phone.php

@@ -1,31 +1,43 @@
-<div class="modal" id="bulkEditPhoneModal" 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-phone-alt mr-2"></i>Bulk Set Phone Number</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                <label>Phone</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-phone"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="bulk_phone" placeholder="Phone Number" maxlength="200">
-                    </div>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-phone-alt mr-2"></i>Set Phone Number for <strong><?= $count ?></strong> Contacts</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 ($selected_ids as $id) { ?><input type="hidden" name="contact_ids[]" value="<?= $id ?>"><?php } ?>
+    <div class="modal-body">
+
+        <label>Phone</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-phone"></i></span>
                 </div>
-
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_edit_contact_phone" 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>
+                <input type="text" class="form-control" name="bulk_phone" placeholder="Phone Number" maxlength="200">
             </div>
         </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_contact_phone" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set Phone Number</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/contact/contact_bulk_edit_role.php

@@ -1,49 +1,59 @@
-<div class="modal" id="bulkEditRoleModal" 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-shield mr-2"></i>Bulk Set Roles</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                <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">
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-                <div class="form-group">
-                    <div class="custom-control custom-checkbox">
-                        <input type="checkbox" class="custom-control-input" id="bulkContactImportantCheckbox" name="bulk_contact_important" value="1">
-                        <label class="custom-control-label" for="bulkContactImportantCheckbox">Important</label>
-                        <small class="form-text text-muted">Important Person and pins them to the top of the contact list</small>
-                    </div>
-                </div>
-           
-                <div class="form-group">
-                    <div class="custom-control custom-checkbox">
-                        <input type="checkbox" class="custom-control-input" id="bulkContactBillingCheckbox" name="bulk_contact_billing" value="1">
-                        <label class="custom-control-label" for="bulkContactBillingCheckbox">Billing</label>
-                        <small class="form-text text-muted">Receives Invoices and Receipts and has access to billing via the portal</small>
-                    </div>
-                </div>
-           
-                <div class="form-group">
-                    <div class="custom-control custom-checkbox">
-                        <input type="checkbox" class="custom-control-input" id="bulkContactTechnicalCheckbox" name="bulk_contact_technical" value="1">
-                        <label class="custom-control-label" for="bulkContactTechnicalCheckbox">Technical</label>
-                        <small class="form-text text-muted">Person to contact for technical related things and has access to all tickets and documents via the portal</small>
-                    </div>
-                </div>
+$count = count($selected_ids);
 
-            </div>
+ob_start();
 
-            <div class="modal-footer">
-                <button type="submit" name="bulk_edit_contact_role" 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 class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-user-shield mr-2"></i>Set Roles for <strong><?= $count ?></strong> Contacts</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 ($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">
+    <div class="modal-body">
+        <div class="form-group">
+            <div class="custom-control custom-checkbox">
+                <input type="checkbox" class="custom-control-input" id="bulkContactImportantCheckbox" name="bulk_contact_important" value="1">
+                <label class="custom-control-label" for="bulkContactImportantCheckbox">Important</label>
+                <small class="form-text text-muted">Important Person and pins them to the top of the contact list</small>
             </div>
         </div>
+
+        <div class="form-group">
+            <div class="custom-control custom-checkbox">
+                <input type="checkbox" class="custom-control-input" id="bulkContactBillingCheckbox" name="bulk_contact_billing" value="1">
+                <label class="custom-control-label" for="bulkContactBillingCheckbox">Billing</label>
+                <small class="form-text text-muted">Receives Invoices and Receipts and has access to billing via the portal</small>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="custom-control custom-checkbox">
+                <input type="checkbox" class="custom-control-input" id="bulkContactTechnicalCheckbox" name="bulk_contact_technical" value="1">
+                <label class="custom-control-label" for="bulkContactTechnicalCheckbox">Technical</label>
+                <small class="form-text text-muted">Person to contact for technical related things and has access to all tickets and documents via the portal</small>
+            </div>
+        </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_contact_role" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set Roles</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/contact/contact_bulk_email.php

@@ -1,61 +1,73 @@
-<div class="modal" id="bulkSendEmailModal" tabindex="-1">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-envelope-open mr-2"></i>Bulk Send Email</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-envelope-open mr-2"></i>Send Email to <strong><?= $count ?></strong> Contacts</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 ($selected_ids as $id) { ?><input type="hidden" name="contact_ids[]" value="<?= $id ?>"><?php } ?>
+    <div class="modal-body">
+
+        <label>From Email / Display Name</label>
+        <div class="form-row">
+
+            <div class="form-group col-sm-6">
+                <select type="text" class="form-control select2" name="mail_from">
+                    <option value="<?php echo nullable_htmlentities($config_mail_from_email); ?>">
+                        <?php echo nullable_htmlentities("$config_mail_from_name - $config_mail_from_email"); ?></option>
+                    <option value="<?php echo nullable_htmlentities($config_invoice_from_email); ?>">
+                        <?php echo nullable_htmlentities("$config_invoice_from_name - $config_invoice_from_email"); ?></option>
+                    <option value="<?php echo nullable_htmlentities($config_quote_from_email); ?>">
+                        <?php echo nullable_htmlentities("$config_quote_from_name - $config_quote_from_email"); ?></option>
+                    <option value="<?php echo nullable_htmlentities($config_ticket_from_email); ?>">
+                        <?php echo nullable_htmlentities("$config_ticket_from_name - $config_ticket_from_email"); ?></option>
+                </select>
             </div>
 
-            <div class="modal-body">
-
-                <label>From Email / Display Name</label>
-                <div class="form-row">
-
-                    <div class="form-group col-sm-6">
-                        <select type="text" class="form-control select2" name="mail_from">
-                            <option value="<?php echo nullable_htmlentities($config_mail_from_email); ?>">
-                                <?php echo nullable_htmlentities("$config_mail_from_name - $config_mail_from_email"); ?></option>
-                            <option value="<?php echo nullable_htmlentities($config_invoice_from_email); ?>">
-                                <?php echo nullable_htmlentities("$config_invoice_from_name - $config_invoice_from_email"); ?></option>
-                            <option value="<?php echo nullable_htmlentities($config_quote_from_email); ?>">
-                                <?php echo nullable_htmlentities("$config_quote_from_name - $config_quote_from_email"); ?></option>
-                            <option value="<?php echo nullable_htmlentities($config_ticket_from_email); ?>">
-                                <?php echo nullable_htmlentities("$config_ticket_from_name - $config_ticket_from_email"); ?></option>
-                        </select>
-                    </div>
-
-                    <div class="form-group col-sm-6">
-                        <input type="text" class="form-control" name="mail_from_name" placeholder="From Name" maxlength="255"
-                            value="<?php echo nullable_htmlentities($config_mail_from_name); ?>">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <input type="text" class="form-control" name="subject" placeholder="Subject" maxlength="255">
-                </div>
-
-                <div class="form-group">
-                    <textarea class="form-control tinymce" name="body"
-                        placeholder="Type an email in here"></textarea>
-                </div>
-
-                <div class="form-group">
-                    <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="datetime-local" class="form-control" name="queued_at">
-                    </div>
-                </div>
-
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="send_bulk_mail_now" class="btn btn-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>Send</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+            <div class="form-group col-sm-6">
+                <input type="text" class="form-control" name="mail_from_name" placeholder="From Name" maxlength="255"
+                    value="<?php echo nullable_htmlentities($config_mail_from_name); ?>">
             </div>
         </div>
+
+        <div class="form-group">
+            <input type="text" class="form-control" name="subject" placeholder="Subject" maxlength="255">
+        </div>
+
+        <div class="form-group">
+            <textarea class="form-control tinymce" name="body"
+                placeholder="Type an email in here"></textarea>
+        </div>
+
+        <div class="form-group">
+            <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="datetime-local" class="form-control" name="queued_at">
+            </div>
+        </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="send_bulk_mail_now" class="btn btn-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>Send Emails</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/contact/contact_edit.php

@@ -223,12 +223,12 @@ ob_start();
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                                 </div>
-                                <input type="password" class="form-control" data-toggle="password" id="password-edit-<?php echo $contact_id; ?>" name="contact_password" placeholder="Password" autocomplete="new-password">
+                                <input type="password" class="form-control" data-toggle="password" id="password" name="contact_password" placeholder="Password" autocomplete="new-password">
                                 <div class="input-group-append">
                                     <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
                                 </div>
                                 <div class="input-group-append">
-                                    <button type="button" class="btn btn-default" onclick="generatePassword('edit', <?php echo $contact_id; ?>)">
+                                    <button type="button" class="btn btn-default" onclick="generatePassword()">
                                         <i class="fa fa-fw fa-question"></i>
                                     </button>
                                 </div>
@@ -346,22 +346,14 @@ ob_start();
 <!-- JavaScript to Show/Hide Password Form Group -->
 <script>
 
-function generatePassword(type, id) {
-    // Send a GET request to ajax.php as ajax.php?get_readable_pass=true
+function generatePassword() {
     jQuery.get(
         "ajax.php", {
             get_readable_pass: 'true'
         },
         function(data) {
-            //If we get a response from post.php, parse it as JSON
             const password = JSON.parse(data);
-
-            // Set the password value to the correct modal, based on the type
-            if (type == "add") {
-                document.getElementById("password-add").value = password;
-            } else if (type == "edit") {
-                document.getElementById("password-edit-"+id.toString()).value = password;
-            }
+            document.getElementById("password").value = password;
         }
     );
 }

agent/modals/credential/credential_add.php

@@ -1,257 +1,263 @@
-<div class="modal" id="addCredentialModal" 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-key mr-2"></i>New Credential</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                
-                <div class="modal-body">
+<?php
 
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-credential-details">Details</a>
-                        </li>
-                        <?php if ($client_url) { ?>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-credential-relation">Relation</a>
-                        </li>
-                        <?php } ?>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-credential-notes">Notes</a>
-                        </li>
-                    </ul>
+require_once '../../../includes/modal_header.php';
 
-                    <hr>
+$client_id = intval($_GET['client_id'] ?? 0);
+$contact_id = intval($_GET['contact_id'] ?? 0);
+$asset_id = intval($_GET['asset_id'] ?? 0);
 
-                    <div class="tab-content">
+ob_start();
 
-                        <div class="tab-pane fade show active" id="pills-credential-details">
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i>New Credential</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    
+    <div class="modal-body">
 
-                            <?php if ($client_url) { ?>
-                                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                            <?php } else { ?>
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-credential-details">Details</a>
+            </li>
+            <?php if ($client_id) { ?>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-credential-relation">Relation</a>
+            </li>
+            <?php } ?>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-credential-notes">Notes</a>
+            </li>
+        </ul>
 
-                                <div class="form-group">
-                                    <label>Client <strong class="text-danger">*</strong></label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                        </div>
-                                        <select class="form-control select2" name="client_id" required>
-                                            <option value="">- Select Client -</option>
-                                            <?php
+        <hr>
 
-                                            $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
-                                            while ($row = mysqli_fetch_array($sql)) {
-                                                $client_id = intval($row['client_id']);
-                                                $client_name = nullable_htmlentities($row['client_name']); ?>
-                                                <option <?php if ($client_id == isset($_GET['client'])) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+        <div class="tab-content">
 
-                                            <?php } ?>
-                                        </select>
-                                    </div>
-                                </div>
+            <div class="tab-pane fade show active" id="pills-credential-details">
 
-                            <?php } ?>
+                <?php if ($client_id) { ?>
+                    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } else { ?>
 
-                            <div class="form-group">
-                                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Important?</span></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="name" placeholder="Name of Login" maxlength="200" required autofocus>
-                                    <div class="input-group-append">
-                                        <div class="input-group-text">
-                                            <input type="checkbox" name="important" value="1">
-                                        </div>
-                                    </div>
-                                </div>
+                    <div class="form-group">
+                        <label>Client <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                             </div>
+                            <select class="form-control select2" name="client_id" required>
+                                <option value="">- Select Client -</option>
+                                <?php
 
-                            <div class="form-group">
-                                <label>Description</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="description" placeholder="Description" maxlength="500">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Username / ID</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="username" placeholder="Username or ID" maxlength="350"> <!-- DB field is 500, 350 un-encrypted chars -->
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Password / 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-lock"></i></span>
-                                    </div>
-                                    <input type="password" class="form-control" data-toggle="password" id="password" name="password" placeholder="Password or Key" required maxlength="350" autocomplete="new-password">
-                                    <div class="input-group-append">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-                                    </div>
-                                    <div class="input-group-append">
-                                        <span class="btn btn-default"><i class="fa fa-fw fa-question" onclick="generatePassword()"></i></span>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>TOTP Seed</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="password" class="form-control" data-toggle="password" name="otp_secret" placeholder="Insert secret key" maxlength="200">
-                                    <div class="input-group-append">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>URI</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="uri" placeholder="http://192.168.1.1" maxlength="500">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>URI 2</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="uri_2" placeholder="https://server.company.com:5001" maxlength="500">
-                                </div>
-                            </div>
+                                $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $client_id_select = intval($row['client_id']);
+                                    $client_name = nullable_htmlentities($row['client_name']); ?>
+                                    <option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name; ?></option>
 
+                                <?php } ?>
+                            </select>
                         </div>
+                    </div>
 
-                        <?php if ($client_url) { ?>
-                        <div class="tab-pane fade" id="pills-credential-relation">
-                            <div class="form-group">
-                                <label>Contact</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="contact">
-                                        <option value="">- Select Contact -</option>
-                                        <?php
+                <?php } ?>
 
-                                        $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $contact_id = intval($row['contact_id']);
-                                            $contact_name = nullable_htmlentities($row['contact_name']);
-                                            ?>
-                                            <option
-                                                <?php if (isset($_GET['contact_id']) && $contact_id == $_GET['contact_id']) { 
-                                                echo "selected"; }
-                                                ?>
-                                                value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?>
-                                            </option>
-
-                                            <?php
-                                        }
-                                        ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Asset</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="asset">
-                                        <option value="">- Select Asset -</option>
-                                        <?php
-
-                                        $sql = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN locations on asset_location_id = location_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $asset_id = intval($row['asset_id']);
-                                            $asset_name = nullable_htmlentities($row['asset_name']);
-                                            $asset_location = nullable_htmlentities($row['location_name']);
-
-                                            $asset_display_string = $asset_name;
-                                            if (!empty($asset_location)) {
-                                                $asset_display_string = "$asset_name ($asset_location)";
-                                            }
-
-                                            ?>
-                                            <option <?php if (isset($_GET['asset_id']) && $asset_id == $_GET['asset_id']) { 
-                                                echo "selected"; } ?>
-                                                value="<?php echo $asset_id; ?>"><?php echo $asset_display_string; ?></option>
-
-                                            <?php
-                                        }
-                                        ?>
-                                    </select>
-                                </div>
+                <div class="form-group">
+                    <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Important?</span></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="name" placeholder="Name of Login" maxlength="200" required autofocus>
+                        <div class="input-group-append">
+                            <div class="input-group-text">
+                                <input type="checkbox" name="important" value="1">
                             </div>
                         </div>
-                        <?php } ?>
-
-                        <div class="tab-pane fade" id="pills-credential-notes">
-
-                            <div class="form-group">
-                                <textarea class="form-control" rows="12" placeholder="Enter some notes" name="note"></textarea>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Tags</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="tags[]" data-placeholder="Add some tags" multiple>
-                                        <?php
-
-                                        $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 4 ORDER BY tag_name ASC");
-                                        while ($row = mysqli_fetch_array($sql_tags_select)) {
-                                            $tag_id_select = intval($row['tag_id']);
-                                            $tag_name_select = nullable_htmlentities($row['tag_name']);
-                                            ?>
-                                            <option value="<?php echo $tag_id_select; ?>"><?php echo $tag_name_select; ?></option>
-                                        <?php } ?>
-
-                                    </select>
-                                    <div class="input-group-append">
-                                        <button class="btn btn-secondary ajax-modal" type="button"
-                                            data-modal-url="../admin/modals/tag/tag_add.php?type=4">
-                                            <i class="fas fa-plus"></i>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
                     </div>
                 </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_credential" 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 class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description" placeholder="Description" maxlength="500">
+                    </div>
                 </div>
-            </form>
+
+                <div class="form-group">
+                    <label>Username / ID</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="username" placeholder="Username or ID" maxlength="350"> <!-- DB field is 500, 350 un-encrypted chars -->
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Password / 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-lock"></i></span>
+                        </div>
+                        <input type="password" class="form-control" data-toggle="password" id="password" name="password" placeholder="Password or Key" required maxlength="350" autocomplete="new-password">
+                        <div class="input-group-append">
+                            <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                        </div>
+                        <div class="input-group-append">
+                            <span class="btn btn-default"><i class="fa fa-fw fa-question" onclick="generatePassword()"></i></span>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>TOTP Seed</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="password" class="form-control" data-toggle="password" name="otp_secret" placeholder="Insert secret key" maxlength="200">
+                        <div class="input-group-append">
+                            <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>URI</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="uri" placeholder="http://192.168.1.1" maxlength="500">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>URI 2</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="uri_2" placeholder="https://server.company.com:5001" maxlength="500">
+                    </div>
+                </div>
+
+            </div>
+
+            <?php if ($client_id) { ?>
+            <div class="tab-pane fade" id="pills-credential-relation">
+                <div class="form-group">
+                    <label>Contact</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                        </div>
+                        <select class="form-control select2" name="contact">
+                            <option value="">- Select Contact -</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $contact_id_select = intval($row['contact_id']);
+                                $contact_name = nullable_htmlentities($row['contact_name']);
+                                ?>
+                                <option
+                                    <?php if ($contact_id == $contact_id_select) { echo "selected"; } ?>
+                                    value="<?php echo $contact_id_select; ?>"><?php echo $contact_name; ?>
+                                </option>
+
+                                <?php
+                            }
+                            ?>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Asset</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                        </div>
+                        <select class="form-control select2" name="asset">
+                            <option value="">- Select Asset -</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN locations on asset_location_id = location_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $asset_id_select = intval($row['asset_id']);
+                                $asset_name = nullable_htmlentities($row['asset_name']);
+                                $asset_location = nullable_htmlentities($row['location_name']);
+
+                                $asset_display_string = $asset_name;
+                                if (!empty($asset_location)) {
+                                    $asset_display_string = "$asset_name ($asset_location)";
+                                }
+
+                                ?>
+                                <option <?php if ($asset_id == $asset_id_select) { echo "selected"; } ?>
+                                    value="<?php echo $asset_id_select; ?>"><?php echo $asset_display_string; ?></option>
+
+                                <?php
+                            }
+                            ?>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <?php } ?>
+
+            <div class="tab-pane fade" id="pills-credential-notes">
+
+                <div class="form-group">
+                    <textarea class="form-control" rows="12" placeholder="Enter some notes" name="note"></textarea>
+                </div>
+
+                <div class="form-group">
+                    <label>Tags</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
+                        </div>
+                        <select class="form-control select2" name="tags[]" data-placeholder="Add some tags" multiple>
+                            <?php
+
+                            $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 4 ORDER BY tag_name ASC");
+                            while ($row = mysqli_fetch_array($sql_tags_select)) {
+                                $tag_id_select = intval($row['tag_id']);
+                                $tag_name_select = nullable_htmlentities($row['tag_name']);
+                                ?>
+                                <option value="<?php echo $tag_id_select; ?>"><?php echo $tag_name_select; ?></option>
+                            <?php } ?>
+
+                        </select>
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary ajax-modal" type="button"
+                                data-modal-url="../admin/modals/tag/tag_add.php?type=4">
+                                <i class="fas fa-plus"></i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+
         </div>
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_credential" 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/credential/credential_bulk_assign_tags.php

@@ -1,55 +1,67 @@
-<div class="modal" id="bulkAssignTagsModal" 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-tags mr-2"></i>Bulk Assigning Tags</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <div class="modal-body">
-                <input type="hidden" name="bulk_remove_tags" value="0">
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group form-check">
-                    <input type="checkbox" class="form-check-input" name="bulk_remove_tags" value="1">
-                    <label class="form-check-label text-danger">Remove Existing Tags</label>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-tags mr-2"></i>Assign Tags to <strong><?= $count ?></strong> Credentials</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 ($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">
+
+        <div class="form-group form-check">
+            <input type="checkbox" class="form-check-input" name="bulk_remove_tags" value="1">
+            <label class="form-check-label text-danger">Remove Existing Tags</label>
+        </div>
+
+        <div class="form-group">
+            <label>Tags</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
                 </div>
+                <select class="form-control select2" name="bulk_tags[]" data-placeholder="Add some tags" multiple>
+                    <?php
 
-                <div class="form-group">
-                    <label>Tags</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_tags[]" data-placeholder="Add some tags" multiple>
-                            <?php
+                    $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 4 ORDER BY tag_name ASC");
+                    while ($row = mysqli_fetch_array($sql_tags_select)) {
+                        $tag_id_select = intval($row['tag_id']);
+                        $tag_name_select = nullable_htmlentities($row['tag_name']);
+                        ?>
+                        <option value="<?php echo $tag_id_select; ?>"><?php echo $tag_name_select; ?></option>
+                    <?php } ?>
 
-                            $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 4 ORDER BY tag_name ASC");
-                            while ($row = mysqli_fetch_array($sql_tags_select)) {
-                                $tag_id_select = intval($row['tag_id']);
-                                $tag_name_select = nullable_htmlentities($row['tag_name']);
-                                ?>
-                                <option value="<?php echo $tag_id_select; ?>"><?php echo $tag_name_select; ?></option>
-                            <?php } ?>
-
-                        </select>
-                        <div class="input-group-append">
-                            <button class="btn btn-secondary ajax-modal" type="button"
-                                data-modal-size="sm"
-                                data-modal-url="../admin/modals/tag/tag_add.php?id=4">
-                                <i class="fas fa-plus"></i>
-                            </button>
-                        </div>
-                    </div>
+                </select>
+                <div class="input-group-append">
+                    <button class="btn btn-secondary ajax-modal" type="button"
+                        data-modal-size="sm"
+                        data-modal-url="../admin/modals/tag/tag_add.php?id=4">
+                        <i class="fas fa-plus"></i>
+                    </button>
                 </div>
-
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_assign_credential_tags" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
         </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_assign_credential_tags" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign Tags</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';

agent/modals/document/document_add.php

@@ -1,61 +1,66 @@
-<div class="modal" id="addDocumentModal" tabindex="-1">
-    <div class="modal-dialog modal-xl">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>New Document</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+$contact_id = intval($_GET['contact_id'] ?? 0);
+$asset_id = intval($_GET['asset_id'] ?? 0);
+intval($_GET['folder_id'] ?? 0);
+
+ob_start();
+
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>New Document</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
+    <input type="hidden" name="contact" value="<?= $contact_id ?>">
+    <input type="hidden" name="asset" value="<?= $asset_id ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <input type="text" class="form-control" name="name" placeholder="Name" maxlength="200" required autofocus>
+        </div>
+
+        <div class="form-group">
+            <textarea class="form-control tinymce" name="content"></textarea>
+        </div>
+
+        <div class="form-group">
+            <label>Select Folder</label>
+            <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 select2" name="folder">
+                    <option value="0">/</option>
+                    <?php
+                    // Start displaying folder options from the root (parent_folder = 0)
+                    display_folder_options(0, $client_id);
+                    ?>
+                </select>
             </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <?php if (isset($_GET['contact_id'])) { ?>
-                <input type="hidden" name="contact" value="<?php echo intval($_GET['contact_id']); ?>">
-                <?php } ?>
-                <?php if (isset($_GET['asset_id'])) { ?>
-                <input type="hidden" name="asset" value="<?php echo intval($_GET['asset_id']); ?>">
-                <?php } ?>
-                <div class="modal-body">
+        </div>
 
-                    <div class="form-group">
-                        <input type="text" class="form-control" name="name" placeholder="Name" maxlength="200" required autofocus>
-                    </div>
-
-                    <div class="form-group">
-                        <textarea class="form-control tinymce" name="content"></textarea>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Select Folder</label>
-                        <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 select2" name="folder">
-                                <option value="0">/</option>
-                                <?php
-                                // Start displaying folder options from the root (parent_folder = 0)
-                                display_folder_options(0, $client_id);
-                                ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Description</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="description" placeholder="Short summary of the document">
-                        </div>
-                    </div>
+        <div class="form-group">
+            <label>Description</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
                 </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_document" 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>
+                <input type="text" class="form-control" name="description" placeholder="Short summary of the document">
+            </div>
         </div>
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_document" 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_bulk_move.php

@@ -1,92 +1,108 @@
-<div class="modal" id="bulkMoveDocumentModal" 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>Moving documents</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>Move Documents to</label>
-                    <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 select2" name="bulk_folder_id">
-                            <option value="0">/</option>
-                                <?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 = 0 AND folder_client_id = $client_id ORDER BY folder_name ASC");
-                                $folders = array();
+require_once '../../../includes/modal_header.php';
 
-                                // 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()
-                                    );
-                                }
+$client_id = intval($_GET['client_id']);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-                                // 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
+$count = count($selected_ids);
 
-                                // Prepare a list of root folders
-                                $root_folders = array();
-                                foreach ($folders as $id => $folder) {
-                                    if ($folder['parent_folder'] == 0) {
-                                        $root_folders[] = $folder;
-                                    }
-                                }
+ob_start();
 
-                                // 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'];
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>Move <strong><?= $count ?></strong> Documents</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
 
-                                    // Indentation for subfolders
-                                    $indentation = str_repeat('&nbsp;', $level * 4);
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="document_ids[]" value="<?= $id ?>"><?php } ?>
 
-                                    // Check if this folder is selected
-                                    $selected = '';
-                                    if ($folder['folder_id'] == $get_folder_id) {
-                                        $selected = 'selected';
-                                    }
+    <div class="modal-body">
 
-                                    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 class="form-group">
+            <label>Target Folder</label>
+            <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 select2" name="bulk_folder_id">
+                    <option value="0">/</option>
+                        <?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 = 0 AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                        $folders = array();
 
-            </div>
-            <div class="modal-footer">
-                <button type="submit" name="bulk_move_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Move</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                        // 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()
+                            );
+                        }
+
+                        // 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>
+    <div class="modal-footer">
+        <button type="submit" name="bulk_move_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Move Documents</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';