Merge branch 'master' into techbar

.gitignore

@@ -22,3 +22,7 @@ plugins/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/URI/*
 plugins/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/CSS/*
 !plugins/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/CSS/.gitkeep
 .vscode/settings.json
+xcustom/*
+!xcustom/readme.php
+post/xcustom
+!post/xcustom/readme.php

CODE_OF_CONDUCT.md

@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-the forums / Discord.
+the forums.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

README.md

@@ -121,6 +121,7 @@ If you want to improve ITFlow, feel free to fork the repo and create a pull requ
 ### Supporters
 We’re incredibly grateful to the organizations and individuals who support the project - a big thank you to:
 - CompuMatter
+- F1 for HELP
 - JetBrains
 
 <!-- LICENSE -->

accounts.php

@@ -6,6 +6,9 @@ $order = "ASC";
 
 require_once "inc_all.php";
 
+// Perms
+enforceUserPermission('module_financial');
+
 //Rebuild URL
 $url_query_strings_sort = http_build_query($get_copy);
 
@@ -42,8 +45,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <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-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=account_name&order=<?php echo $disp; ?>">Name</a></th>
+                        <th>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=account_currency_code&order=<?php echo $disp; ?>">Currency</a></th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=account_name&order=<?php echo $disp; ?>">
+                                Name <?php if ($sort == 'account_name') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=account_currency_code&order=<?php echo $disp; ?>">
+                                Currency <?php if ($sort == 'account_currency_code') { echo $order_icon; } ?>
+                            </a>
+                        </th>
                         <th class="text-right">Balance</th>
                         <th class="text-center">Action</th>
                     </tr>

admin_api.php

@@ -78,11 +78,31 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <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</a></th>
+                            <th>
-                            <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_client_id&order=<?php echo $disp; ?>">Client</a></th>
+                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_name&order=<?php echo $disp; ?>">
-                            <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_secret&order=<?php echo $disp; ?>">Secret</a></th>
+                                    Name <?php if ($sort == 'api_key_name') { echo $order_icon; } ?>
-                            <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_created_at&order=<?php echo $disp; ?>">Created</a></th>
+                                </a>
-                            <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_expire&order=<?php echo $disp; ?>">Expires</a></th>
+                            </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>

admin_api_key_add_modal.php

@@ -60,7 +60,7 @@ $decryptPW = randomString(160);
                                     <select class="form-control select2" name="client" required>
                                         <option value="0"> ALL CLIENTS </option>
                                         <?php
-                                        $sql = mysqli_query($mysqli, "SELECT * FROM clients ORDER BY client_name ASC");
+                                        $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']); ?>

admin_audit_log.php

@@ -200,16 +200,48 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <table class="table table-sm table-striped table-borderless table-hover">
                     <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
                     <tr>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_created_at&order=<?php echo $disp; ?>">Timestamp</a></th>
+                        <th>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_name&order=<?php echo $disp; ?>">User</a></th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_created_at&order=<?php echo $disp; ?>">
+                                Timestamp <?php if ($sort == 'log_created_at') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_name&order=<?php echo $disp; ?>">
+                                User <?php if ($sort == 'user_name') { echo $order_icon; } ?>
+                            </a>
+                        </th>
                         <?php if (empty($client)) { ?>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">Client</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>
                         <?php } ?>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_type&order=<?php echo $disp; ?>">Type</a></th>
+                        <th>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_action&order=<?php echo $disp; ?>">Action</a></th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_type&order=<?php echo $disp; ?>">
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_description&order=<?php echo $disp; ?>">Description</a></th>
+                                Type <?php if ($sort == 'log_type') { echo $order_icon; } ?>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_ip&order=<?php echo $disp; ?>">IP Address</a></th>
+                            </a>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_user_agent&order=<?php echo $disp; ?>">User Agent</a></th>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_action&order=<?php echo $disp; ?>">
+                                Action <?php if ($sort == 'log_action') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_description&order=<?php echo $disp; ?>">
+                                Description <?php if ($sort == 'log_description') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_ip&order=<?php echo $disp; ?>">
+                                IP Address <?php if ($sort == 'log_ip') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_user_agent&order=<?php echo $disp; ?>">
+                                User Agent <?php if ($sort == 'log_user_agent') { echo $order_icon; } ?>
+                            </a>
+                        </th>
                     </tr>
                     </thead>
                     <tbody>
@@ -237,7 +269,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         if (empty($client_name)) {
                             $client_name_display = "-";
                         } else {
-                            $client_name_display = "<a href='client_logs.php?client_id=$client_id&tab=logs'>$client_name</a>";
+                            $client_name_display = "<a href='client_overview.php?client_id=$client_id'>$client_name</a>";
                         }
                         $log_entity_id = intval($row['log_entity_id']);
 
@@ -253,7 +285,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             <td><?php echo $log_action; ?></td>
                             <td><?php echo $log_description; ?></td>
                             <td><?php echo $log_ip; ?></td>
-                            <td><?php echo "$log_user_os<br>$log_user_browser"; ?></td>
+                            <td><?php echo "$log_user_os<div class='text-secondary'>$log_user_browser</div>"; ?></td>
                         </tr>
 
                         <?php

admin_backup.php

@@ -7,7 +7,8 @@ require_once "inc_all_admin.php";
         <h3 class="card-title"><i class="fas fa-fw fa-database mr-2"></i>Download Database</h3>
     </div>
     <div class="card-body" style="text-align: center;">
-        <a class="btn btn-primary btn-lg p-3" href="post.php?download_database&csrf_token=<?php echo $_SESSION['csrf_token'] ?>"><i class="fas fa-fw fa-4x fa-download"></i><br><br>Download</a>
+        <div class="alert alert-secondary">If you are unable to back up the entire VM, you'll need to back up the files & database individually. There is no built-in restore. See the <a href="https://docs.itflow.org/backups" target="_blank">docs here</a>.</div>
+        <a class="btn btn-primary btn-lg p-3" href="post.php?download_database&csrf_token=<?php echo $_SESSION['csrf_token'] ?>"><i class="fas fa-fw fa-4x fa-download"></i><br><br>Download database</a>
     </div>
 </div>
 

admin_category.php

@@ -113,12 +113,12 @@ if (isset($_GET['archived'])) {
         <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) {
+                <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-                    echo "d-none";
-                } ?>">
                     <tr>
-                        <th><a class="text-dark"
+                        <th>
-                                href="?<?php echo $url_query_strings_sort; ?>&sort=category_name&order=<?php echo $disp; ?>">Name</a>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=category_name&order=<?php echo $disp; ?>">
+                                Name <?php if ($sort == 'category_name') { echo $order_icon; } ?>
+                            </a>
                         </th>
                         <th>Color</th>
                         <th class="text-center">Action</th>

admin_custom_link.php

@@ -50,10 +50,26 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <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-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=custom_link_name&order=<?php echo $disp; ?>">Name</a></th>
+                        <th>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=custom_link_order&order=<?php echo $disp; ?>">Order</a></th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=custom_link_name&order=<?php echo $disp; ?>">
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=custom_link_uri&order=<?php echo $disp; ?>">URI / <span class="text-secondary">New Tab</span></a></th>
+                                Name <?php if ($sort == 'custom_link_name') { echo $order_icon; } ?>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=custom_link_location&order=<?php echo $disp; ?>">Location</a></th>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=custom_link_order&order=<?php echo $disp; ?>">
+                                Order <?php if ($sort == 'custom_link_order') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=custom_link_uri&order=<?php echo $disp; ?>">
+                                URI / <span class="text-secondary">New Tab</span> <?php if ($sort == 'custom_link_uri') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=custom_link_location&order=<?php echo $disp; ?>">
+                                Location <?php if ($sort == 'custom_link_location') { echo $order_icon; } ?>
+                            </a>
+                        </th>
                         <th class="text-center">Action</th>
                     </tr>
                     </thead>
@@ -78,6 +94,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $custom_link_order_display = $custom_link_order;
                         }
                         $custom_link_location = intval($row['custom_link_location']);
+                        if ($custom_link_location == 1) {
+                            $custom_link_location_display = "Main Side Nav";
+                        } else {
+                            $custom_link_location_display = "Top Nav";
+                        }
 
                         ?>
                         <tr>
@@ -89,7 +110,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             </td>
                             <td><?php echo $custom_link_order_display; ?></td>
                             <td><?php echo "$custom_link_uri $custom_link_new_tab_display"; ?></td>
-                            <td><?php echo $custom_link_location; ?></td>
+                            <td><?php echo $custom_link_location_display; ?></td>
                             <td>
                                 <div class="dropdown dropleft text-center">
                                     <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">

admin_custom_link_add_modal.php

@@ -66,6 +66,7 @@
                             </div>
                             <select class="form-control select2" name="location" required>
                                 <option value="1">Main Side Nav</option>
+                                <option value="2">Top Nav (Icon Required)</option>
                             </select>
                         </div>
                     </div>

admin_custom_link_edit_modal.php

@@ -64,6 +64,7 @@
                             </div>
                             <select class="form-control select2" name="location" required>
                                 <option value="1" <?php if ($custom_link_location == 1) { echo "selected"; } ?> >Main Side Nav</option>
+                                <option value="2" <?php if ($custom_link_location == 2) { echo "selected"; } ?> >Top Nav (Icon Required)</option>
                             </select>
                         </div>
                     </div>

admin_debug.php

@@ -5,191 +5,503 @@ require_once "database_version.php";
 
 require_once "config.php";
 
-$folderPath = 'uploads';
+$checks = [];
 
-function countFilesInDirectory($dir) {
+// Section: System Information
-    $count = 0;
+$systemInfo = [];
-    $size = 0;
-    $files = scandir($dir);
 
-    foreach ($files as $file) {
+// Operating System and Version
-        if ($file === '.' || $file === '..') {
+$os = php_uname();
-            continue;
+$systemInfo[] = [
-        }
+    'name' => 'Operating System',
+    'value' => $os,
+];
 
-        $filePath = $dir . '/' . $file;
+// Web Server and Version
+$webServer = $_SERVER['SERVER_SOFTWARE'] ?? 'Unknown';
+$systemInfo[] = [
+    'name' => 'Web Server',
+    'value' => $webServer,
+];
 
-        if (is_file($filePath)) {
+// Kernel and Version
-            $count++;
+$kernelVersion = php_uname('r');
-            $size += filesize($filePath);
+$systemInfo[] = [
-        } elseif (is_dir($filePath)) {
+    'name' => 'Kernel Version',
-            $result = countFilesInDirectory($filePath);
+    'value' => $kernelVersion,
-            $count += $result['count'];
+];
-            $size += $result['size'];
-        }
-    }
 
-    return [
+// Database and Version
-        'count' => $count,
+$dbVersion = $mysqli->server_info;
-        'size' => $size
+$systemInfo[] = [
+    'name' => 'Database Version',
+    'value' => $dbVersion,
+];
+
+// Section: PHP Extensions
+$phpExtensions = [];
+$extensions = [
+    'php-mailparse' => 'mailparse',
+    'php-imap' => 'imap',
+    'php-mysqli' => 'mysqli',
+    'php-intl' => 'intl',
+    'php-curl' => 'curl',
+    'php-mbstring' => 'mbstring',
+    'php-gd' => 'gd',
+];
+
+foreach ($extensions as $name => $ext) {
+    $loaded = extension_loaded($ext);
+    $phpExtensions[] = [
+        'name' => "$name installed",
+        'passed' => $loaded,
+        'value' => $loaded ? 'Installed' : 'Not Installed',
     ];
 }
 
-// Function to compare two arrays recursively and return the differences
+// Section: PHP Configuration
-function arrayDiffRecursive($array1, $array2) {
+$phpConfig = [];
-    $diff = array();
 
-    foreach ($array1 as $key => $value) {
+// Check if shell_exec is enabled
-        if (is_array($value)) {
+$disabled_functions = explode(',', ini_get('disable_functions'));
-            if (!isset($array2[$key]) || !is_array($array2[$key])) {
+$disabled_functions = array_map('trim', $disabled_functions);
-                $diff[$key] = $value;
+$shell_exec_enabled = !in_array('shell_exec', $disabled_functions);
-            } else {
+
-                $recursiveDiff = arrayDiffRecursive($value, $array2[$key]);
+$phpConfig[] = [
-                if (!empty($recursiveDiff)) {
+    'name' => 'shell_exec is enabled',
-                    $diff[$key] = $recursiveDiff;
+    'passed' => $shell_exec_enabled,
+    'value' => $shell_exec_enabled ? 'Enabled' : 'Disabled',
+];
+
+// Check upload_max_filesize and post_max_size >= 500M
+function return_bytes($val) {
+    $val = trim($val);
+    $unit = strtolower(substr($val, -1));
+    $num = (float)$val;
+    switch ($unit) {
+        case 'g':
+            $num *= 1024;
+        case 'm':
+            $num *= 1024;
+        case 'k':
+            $num *= 1024;
     }
+    return $num;
+}
+
+$required_bytes = 500 * 1024 * 1024; // 500M in bytes
+
+$upload_max_filesize = ini_get('upload_max_filesize');
+$post_max_size = ini_get('post_max_size');
+
+$upload_passed = return_bytes($upload_max_filesize) >= $required_bytes;
+$post_passed = return_bytes($post_max_size) >= $required_bytes;
+
+$phpConfig[] = [
+    'name' => 'upload_max_filesize >= 500M',
+    'passed' => $upload_passed,
+    'value' => $upload_max_filesize,
+];
+
+$phpConfig[] = [
+    'name' => 'post_max_size >= 500M',
+    'passed' => $post_passed,
+    'value' => $post_max_size,
+];
+
+// PHP Memory Limit >= 128M
+$memoryLimit = ini_get('memory_limit');
+$memoryLimitBytes = return_bytes($memoryLimit);
+$memoryLimitPassed = $memoryLimitBytes >= (128 * 1024 * 1024);
+$phpConfig[] = [
+    'name' => 'PHP Memory Limit >= 128M',
+    'passed' => $memoryLimitPassed,
+    'value' => $memoryLimit,
+];
+
+// Max Execution Time >= 300 seconds
+$maxExecutionTime = ini_get('max_execution_time');
+$maxExecutionTimePassed = $maxExecutionTime >= 300;
+$phpConfig[] = [
+    'name' => 'Max Execution Time >= 300 seconds',
+    'passed' => $maxExecutionTimePassed,
+    'value' => $maxExecutionTime . ' seconds',
+];
+
+// Check PHP version >= 8.2.0
+$php_version = PHP_VERSION;
+$php_passed = version_compare($php_version, '8.2.0', '>=');
+
+$phpConfig[] = [
+    'name' => 'PHP version >= 8.2.0',
+    'passed' => $php_passed,
+    'value' => $php_version,
+];
+
+// Section: Shell Commands
+$shellCommands = [];
+
+if ($shell_exec_enabled) {
+    $commands = ['whois', 'dig', 'git'];
+
+    foreach ($commands as $command) {
+        $which = trim(shell_exec("which $command 2>/dev/null"));
+        $exists = !empty($which);
+        $shellCommands[] = [
+            'name' => "Command '$command' available",
+            'passed' => $exists,
+            'value' => $exists ? $which : 'Not Found',
+        ];
     }
 } else {
-            if (!isset($array2[$key]) || $array2[$key] !== $value) {
+    // If shell_exec is disabled, mark commands as unavailable
-                $diff[$key] = $value;
+    foreach (['whois', 'dig', 'git'] as $command) {
-            }
+        $shellCommands[] = [
-        }
+            'name' => "Command '$command' available",
-    }
+            'passed' => false,
-
+            'value' => 'shell_exec Disabled',
-    return $diff;
+        ];
-}
-
-// Function to load the table structures from an SQL dump file URL
-function loadTableStructuresFromSQLDumpURL($fileURL) {
-    $context = stream_context_create(array('http' => array('header' => 'Accept: application/octet-stream')));
-    $fileContent = file_get_contents($fileURL, false, $context);
-
-    if ($fileContent === false) {
-        return null;
-    }
-
-    $structure = array();
-    $queries = explode(";", $fileContent);
-
-    foreach ($queries as $query) {
-        $query = trim($query);
-
-        if (!empty($query)) {
-            if (preg_match("/^CREATE TABLE `(.*)` \((.*)\)$/s", $query, $matches)) {
-                $tableName = $matches[1];
-                $tableStructure = $matches[2];
-                $structure[$tableName] = array('structure' => $tableStructure);
-            }
-        }
-    }
-
-    return $structure;
-}
-
-// Function to fetch the database structure from the MySQL server
-function fetchDatabaseStructureFromServer() {
-
-    global $mysqli;
-
-    $tables = array();
-
-    // Fetch table names
-    $result = $mysqli->query("SHOW TABLES");
-
-    if ($result->num_rows > 0) {
-        while ($row = $result->fetch_row()) {
-            $tableName = $row[0];
-            $tables[$tableName] = array();
     }
 }
 
-    // Fetch table structures
+// Section: SSL Checks
-    foreach ($tables as $tableName => &$table) {
+$sslChecks = [];
-        $result = $mysqli->query("SHOW CREATE TABLE `$tableName`");
 
-        if ($result->num_rows > 0) {
+// Check if accessing via HTTPS
-            $row = $result->fetch_row();
+$https = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || $_SERVER['SERVER_PORT'] == 443;
-            $table['structure'] = $row[1];
+$sslChecks[] = [
+    'name' => 'Accessing via HTTPS',
+    'passed' => $https,
+    'value' => $https ? 'Yes' : 'No',
+];
+
+// SSL Certificate Validity Check
+if ($https) {
+    $streamContext = stream_context_create(["ssl" => ["capture_peer_cert" => true]]);
+    $socket = @stream_socket_client("ssl://{$_SERVER['HTTP_HOST']}:443", $errno, $errstr, 30, STREAM_CLIENT_CONNECT, $streamContext);
+
+    if ($socket) {
+        $params = stream_context_get_params($socket);
+        $cert = $params['options']['ssl']['peer_certificate'];
+        $certInfo = openssl_x509_parse($cert);
+
+        $validFrom = $certInfo['validFrom_time_t'];
+        $validTo = $certInfo['validTo_time_t'];
+        $currentTime = time();
+
+        $certValid = ($currentTime >= $validFrom && $currentTime <= $validTo);
+
+        $sslChecks[] = [
+            'name' => 'SSL Certificate is valid',
+            'passed' => $certValid,
+            'value' => $certValid ? 'Valid' : 'Invalid or Expired',
+        ];
+    } else {
+        $sslChecks[] = [
+            'name' => 'SSL Certificate is valid',
+            'passed' => false,
+            'value' => 'Unable to retrieve certificate',
+        ];
+    }
+} else {
+    $sslChecks[] = [
+        'name' => 'SSL Certificate is valid',
+        'passed' => false,
+        'value' => 'Not using HTTPS',
+    ];
+}
+
+// Section: Domain Checks
+$domainChecks = [];
+
+// Check if the site has a valid FQDN
+$fqdn = $_SERVER['HTTP_HOST'];
+$isValidFqdn = (bool) filter_var('http://' . $fqdn, FILTER_VALIDATE_URL) && preg_match('/^[a-z0-9.-]+\.[a-z]{2,}$/i', $fqdn);
+
+$domainChecks[] = [
+    'name' => 'Site has a valid FQDN',
+    'passed' => $isValidFqdn,
+    'value' => $fqdn,
+];
+
+// Section: File Permissions
+$filePermissions = [];
+
+// Check if web user has write access to webroot directory
+$webroot = $_SERVER['DOCUMENT_ROOT'];
+$writable = is_writable($webroot);
+$filePermissions[] = [
+    'name' => 'Web user has write access to webroot directory',
+    'passed' => $writable,
+    'value' => $webroot,
+];
+
+// Section: Uploads Directory Stats
+$uploadsStats = [];
+
+// Define the uploads directory path
+$uploadsDir = __DIR__ . '/uploads'; // Adjust the path if needed
+
+if (is_dir($uploadsDir)) {
+    // Function to recursively count files and calculate total size
+    function getDirStats($dir) {
+        $files = 0;
+        $size = 0;
+
+        $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir));
+        foreach ($iterator as $file) {
+            if ($file->isFile()) {
+                $files++;
+                $size += $file->getSize();
+            }
+        }
+        return ['files' => $files, 'size' => $size];
+    }
+
+    $stats = getDirStats($uploadsDir);
+    $sizeInMB = round($stats['size'] / (1024 * 1024), 2);
+
+    $uploadsStats[] = [
+        'name' => 'Number of files in uploads directory',
+        'value' => $stats['files'],
+    ];
+
+    $uploadsStats[] = [
+        'name' => 'Total size of uploads directory (MB)',
+        'value' => $sizeInMB . ' MB',
+    ];
+} else {
+    $uploadsStats[] = [
+        'name' => 'Uploads directory exists',
+        'value' => 'Directory not found',
+    ];
+}
+
+// Section: Database Stats
+$databaseStats = [];
+
+// Get list of tables
+$tablesResult = $mysqli->query("SHOW TABLE STATUS");
+if ($tablesResult) {
+    $totalTables = 0;
+    $totalFields = 0;
+    $totalRows = 0;
+    $totalSize = 0;
+    $tableDetails = [];
+
+    while ($table = $tablesResult->fetch_assoc()) {
+        $tableName = $table['Name'];
+        $tableRows = $table['Rows'];
+        $dataLength = $table['Data_length'];
+        $indexLength = $table['Index_length'];
+        $tableSize = ($dataLength + $indexLength) / (1024 * 1024); // Size in MB
+
+        // Get number of fields
+        $fieldsResult = $mysqli->query("SHOW COLUMNS FROM `$tableName`");
+        $numFields = $fieldsResult->num_rows;
+        $fieldsResult->free();
+
+        $totalTables++;
+        $totalFields += $numFields;
+        $totalRows += $tableRows;
+        $totalSize += $tableSize;
+
+        $tableDetails[] = [
+            'name' => $tableName,
+            'fields' => $numFields,
+            'rows' => $tableRows,
+            'size' => round($tableSize, 2),
+        ];
+    }
+    $tablesResult->free();
+
+    $databaseStats[] = [
+        'name' => 'Current Database Version',
+        'value' => CURRENT_DATABASE_VERSION,
+    ];
+    $databaseStats[] = [
+        'name' => 'Total number of tables',
+        'value' => $totalTables,
+    ];
+    $databaseStats[] = [
+        'name' => 'Total number of fields',
+        'value' => $totalFields,
+    ];
+    $databaseStats[] = [
+        'name' => 'Total number of rows',
+        'value' => $totalRows,
+    ];
+    $databaseStats[] = [
+        'name' => 'Total database size (MB)',
+        'value' => round($totalSize, 2) . ' MB',
+    ];
+} else {
+    $databaseStats[] = [
+        'name' => 'Database connection error',
+        'value' => $mysqli->error,
+    ];
+}
+
+// Section: Database Structure Comparison
+$dbComparison = [];
+
+// Path to the db.sql file
+$dbSqlFile = __DIR__ . '/db.sql';
+
+if (file_exists($dbSqlFile)) {
+    // Read the db.sql file
+    $sqlContent = file_get_contents($dbSqlFile);
+
+    // Remove comments and empty lines
+    $lines = explode("\n", $sqlContent);
+    $sqlStatements = [];
+    $statement = '';
+
+    foreach ($lines as $line) {
+        // Remove single-line comments
+        $line = preg_replace('/--.*$/', '', $line);
+        $line = preg_replace('/\/\*.*?\*\//', '', $line);
+
+        // Skip empty lines
+        if (trim($line) == '') {
+            continue;
+        }
+
+        // Append line to the current statement
+        $statement .= $line . "\n";
+
+        // Check if the statement ends with a semicolon
+        if (preg_match('/;\s*$/', $line)) {
+            $sqlStatements[] = $statement;
+            $statement = '';
         }
     }
 
-    return $tables;
+    // Parse the CREATE TABLE statements
+    $sqlTables = [];
+
+    foreach ($sqlStatements as $sql) {
+        if (preg_match('/CREATE TABLE\s+`?([^` ]+)`?\s*\((.*)\)(.*?);/msi', $sql, $match)) {
+            $tableName = $match[1];
+            $columnsDefinition = $match[2];
+
+            // Extract column names and data types
+            $columns = [];
+            $columnLines = explode("\n", $columnsDefinition);
+            foreach ($columnLines as $line) {
+                $line = trim($line);
+                // Skip empty lines and lines that do not define columns
+                if ($line == '' || strpos($line, 'PRIMARY KEY') !== false || strpos($line, 'UNIQUE KEY') !== false || strpos($line, 'KEY') === 0 || strpos($line, 'CONSTRAINT') === 0 || strpos($line, ')') === 0) {
+                    continue;
                 }
 
-//function to get current crontab and return it as an array
+                // Remove trailing comma if present
-function get_crontab() {
+                $line = rtrim($line, ',');
-    $crontab = shell_exec('crontab -l');
+
-    $crontab = explode(PHP_EOL, $crontab);
+                // Match column definition
-    return $crontab;
+                if (preg_match('/^`([^`]+)`\s+(.+)/', $line, $colMatch)) {
+                    $colName = $colMatch[1];
+                    $colDefinition = $colMatch[2];
+
+                    // Extract the data type from the column definition
+                    $tokens = preg_split('/\s+/', $colDefinition);
+                    $colType = $tokens[0];
+
+                    // Handle data types with parentheses (e.g., varchar(255), decimal(15,2))
+                    if (preg_match('/^([a-zA-Z]+)\(([^)]+)\)/', $colType, $typeMatch)) {
+                        $colType = $typeMatch[1] . '(' . $typeMatch[2] . ')';
                     }
 
-// URL to the SQL dump file
+                    $columns[$colName] = $colType;
-$fileURL = "https://raw.githubusercontent.com/itflow-org/itflow/master/db.sql";
+                }
-
+            }
-// Load the desired table structures from the SQL dump file URL
+            $sqlTables[$tableName] = $columns;
-$desiredStructure = loadTableStructuresFromSQLDumpURL($fileURL);
+        }
-
-if ($desiredStructure === null) {
-    die("Failed to load the desired table structures from the SQL dump file URL.");
     }
 
-// Fetch the current database structure from the MySQL server
+    // Get current database table structures
-$currentStructure = fetchDatabaseStructureFromServer();
+    $dbTables = [];
-
+    $tablesResult = $mysqli->query("SHOW TABLES");
-if ($currentStructure === null) {
-    die("Failed to fetch the current database structure from the server.");
-}
-
-// Compare the structures and display the differences
-$differences = arrayDiffRecursive($desiredStructure, $currentStructure);
-
-//DB Stats
-// Query to fetch the number of tables
-$tablesQuery = "SHOW TABLES";
-$tablesResult = $mysqli->query($tablesQuery);
-
-$numTables = $tablesResult->num_rows;
-$numFields = 0;
-$numRows = 0;
-
-// Loop through each table
     while ($row = $tablesResult->fetch_row()) {
         $tableName = $row[0];
+        $columnsResult = $mysqli->query("SHOW COLUMNS FROM `$tableName`");
+        $columns = [];
+        while ($col = $columnsResult->fetch_assoc()) {
+            $columns[$col['Field']] = $col['Type'];
+        }
+        $columnsResult->free();
+        $dbTables[$tableName] = $columns;
+    }
+    $tablesResult->free();
 
-    // Query to fetch the number of fields
+    // Compare the structures
-    $fieldsQuery = "DESCRIBE `$tableName`";
+    foreach ($sqlTables as $tableName => $sqlColumns) {
-    $fieldsResult = $mysqli->query($fieldsQuery);
+        if (!isset($dbTables[$tableName])) {
+            $dbComparison[] = [
+                'name' => "Table `$tableName` missing in database",
+                'status' => 'Missing Table',
+            ];
+            continue;
+        }
 
-    // Check if the query was successful
+        // Compare columns
-    if ($fieldsResult) {
+        $dbColumns = $dbTables[$tableName];
-        $numFields += $fieldsResult->num_rows;
+        foreach ($sqlColumns as $colName => $colType) {
-
+            if (!isset($dbColumns[$colName])) {
-        // Query to fetch the number of rows
+                $dbComparison[] = [
-        $rowsQuery = "SELECT COUNT(*) FROM `$tableName`";
+                    'name' => "Column `$colName` missing in table `$tableName`",
-        $rowsResult = $mysqli->query($rowsQuery);
+                    'status' => 'Missing Column',
-
+                ];
-        // Check if the query was successful
-        if ($rowsResult) {
-            $numRows += $rowsResult->fetch_row()[0];
             } else {
-            echo "Error executing query: " . $mysqli->error;
+                // Normalize data types for comparison
+                $sqlColType = strtolower($colType);
+                $dbColType = strtolower($dbColumns[$colName]);
+
+                // Remove attributes and constraints
+                $sqlColType = preg_replace('/\s+.*$/', '', $sqlColType);
+                $dbColType = preg_replace('/\s+.*$/', '', $dbColType);
+
+                // Remove additional attributes like unsigned, zerofill, etc.
+                $sqlColType = preg_replace('/\s+unsigned|\s+zerofill|\s+binary/', '', $sqlColType);
+                $dbColType = preg_replace('/\s+unsigned|\s+zerofill|\s+binary/', '', $dbColType);
+
+                if ($sqlColType != $dbColType) {
+                    $dbComparison[] = [
+                        'name' => "Data type mismatch for `$colName` in table `$tableName`",
+                        'status' => "Expected: $colType, Found: {$dbColumns[$colName]}",
+                    ];
+                }
+            }
+        }
+
+        // Check for extra columns in the database that are not in the SQL file
+        foreach ($dbColumns as $colName => $colType) {
+            if (!isset($sqlColumns[$colName])) {
+                $dbComparison[] = [
+                    'name' => "Extra column `$colName` in table `$tableName` not present in db.sql",
+                    'status' => 'Extra Column',
+                ];
+            }
+        }
+    }
+
+    // Check for tables in the database not present in the db.sql file
+    foreach ($dbTables as $tableName => $dbColumns) {
+        if (!isset($sqlTables[$tableName])) {
+            $dbComparison[] = [
+                'name' => "Extra table `$tableName` in database not present in db.sql",
+                'status' => 'Extra Table',
+            ];
+        }
     }
 } else {
-        echo "Error executing query: " . $mysqli->error;
+    $dbComparison[] = [
-    }
+        'name' => 'db.sql file not found',
+        'status' => 'File Missing',
+    ];
 }
 
-//Get loaded PHP modules
+$mysqli->close();
-$loadedModules = get_loaded_extensions();
-
-//Get Server Info / Service versions
-$phpVersion = phpversion();
-$databaseInfo = mysqli_get_server_info($mysqli) . " / " .  $mysqli->server_version;
-$operatingSystem = php_uname();
-$webServer = $_SERVER['SERVER_SOFTWARE'];
-$errorLog = ini_get('error_log') ?: "Debian/Ubuntu default is usually /var/log/apache2/error.log";
-$updates = fetchUpdates();
-
 ?>
 
 <div class="card card-dark">
@@ -198,126 +510,227 @@ $updates = fetchUpdates();
     </div>
     <div class="card-body">
 
-            <h3>Server Info</h3>
+        <h2>Debugging</h2>
-
+        <ul>
-            <?php
+            <li>If you are experiencing a problem with ITFlow you may be directed to this page to gather server/app info.</li>
-            echo "PHP version: " . $phpVersion . "<br>";
+            <li>When creating forum posts / support requests ensure you share the information under <i>Server Info</i>, <i>ITFlow app</i> and <i>Database stats</i>.</li>
-            echo "Database Version: " . $databaseInfo . "<br>";
+            <li><a class="text-danger text-bold">Caution:</a> Be careful when sharing the full debug output - it contains your PHP session variables/cookies ("PHPSESSID") which could allow anyone to login to your ITFlow instance</li>
-            echo "Operating System: " . $operatingSystem . "<br>";
+            <li>Note: Sometimes you might need to gather <a href="https://docs.itflow.org/gathering_logs#error_logs">PHP error logs</a> as well</li>
-            echo "Web Server: " . $webServer  . "<br>";
+        </ul>
-            echo "Apache/PHP Error Log: " . $errorLog
-            ?>
-
         <hr>
 
-            <h3>File System</h3>
+        <!-- System Information Table -->
-            <?php
+        <h3>System Information</h3>
-            $result = countFilesInDirectory($folderPath);
+        <table class="table table-sm table-bordered">
-
+            <tbody>
-            $totalFiles = $result['count'];
+                <?php foreach ($systemInfo as $info): ?>
-            $totalSizeMB = round($result['size'] / (1024 * 1024), 2);
-
-            echo "Total number of files in $folderPath and its subdirectories: " . $totalFiles . "<br>";
-            echo "Total size of files in $folderPath and its subdirectories: " . $totalSizeMB . " MB";
-            ?>
-
-            <hr>
-            <h3>ITFlow app</h3>
-            <?php
-            echo "App Version: " . $updates->current_version . "<br>";
-            echo "Cron enabled: " . $config_enable_cron . "<br>";
-            echo "App Timezone: " . $config_timezone;
-            ?>
-
-            <hr>
-
-            <h3>Database Structure Check</h3>
-
-            <h4>Database stats</h4>
-
-            <?php
-            echo "Number of tables: " . $numTables . "<br>";
-            echo "Total number of fields: " . $numFields . "<br>";
-            echo "Total number of rows: " . $numRows . "<br>";
-            echo "Current Database Version: " . CURRENT_DATABASE_VERSION . "<br>";
-            ?>
-
-            <hr>
-
-            <h4>Table Stats</h4>
-            <?php
-            // Fetch all table names from the database
-            $tables = array();
-            $result = mysqli_query($mysqli, "SHOW TABLES");
-            while ($row = mysqli_fetch_array($result)) {
-                $tables[] = $row[0];
-            }
-
-            // Generate an HTML table to display the results
-            ?>
-            <table class="table table-sm">
                     <tr>
-                    <th>Table Name</th>
+                        <td><?= htmlspecialchars($info['name']); ?></td>
-                    <th>Number of Fields</th>
+                        <td><?= htmlspecialchars($info['value']); ?></td>
-                    <th>Number of Rows</th>
                     </tr>
-
+                <?php endforeach; ?>
-                <?php
+            </tbody>
-
-                foreach ($tables as $table) {
-                    // Count the number of fields and rows for each table
-                    $columns_result = mysqli_query($mysqli, "SHOW COLUMNS FROM `$table`");
-                    $columns = mysqli_num_rows($columns_result);
-
-                    $rows_result = mysqli_query($mysqli, "SELECT COUNT(*) FROM `$table`");
-                    $rows = mysqli_fetch_array($rows_result)[0];
-                    ?>
-
-                    <tr>
-                        <td><?php echo $table; ?></td>
-                        <td><?php echo $columns; ?></td>
-                        <td><?php echo $rows; ?></td>
-                    </tr>
-                <?php
-                }
-                ?>
         </table>
 
-            <hr>
+        <!-- PHP Extensions and Configuration Table -->
+        <h3 class="mt-3">PHP Extensions and Configuration</h3>
+        <table class="table table-sm table-bordered">
+            <!-- PHP Extensions Section -->
+            <thead>
+                <tr class="table-secondary">
+                    <th colspan="3">PHP Extensions</th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php foreach ($phpExtensions as $check): ?>
+                    <tr>
+                        <td><?= htmlspecialchars($check['name']); ?></td>
+                        <td class="text-center">
+                            <?php if ($check['passed']): ?>
+                                <i class="fas fa-check" style="color:green"></i>
+                            <?php else: ?>
+                                <i class="fas fa-times" style="color:red"></i>
+                            <?php endif; ?>
+                        </td>
+                        <td><?= htmlspecialchars($check['value']); ?></td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+            <!-- PHP Configuration Section -->
+            <thead>
+                <tr class="table-secondary">
+                    <th colspan="3">PHP Configuration</th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php foreach ($phpConfig as $check): ?>
+                    <tr>
+                        <td><?= htmlspecialchars($check['name']); ?></td>
+                        <td class="text-center">
+                            <?php if ($check['passed']): ?>
+                                <i class="fas fa-check" style="color:green"></i>
+                            <?php else: ?>
+                                <i class="fas fa-times" style="color:red"></i>
+                            <?php endif; ?>
+                        </td>
+                        <td><?= htmlspecialchars($check['value']); ?></td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+            <thead>
+                <tr class="table-secondary">
+                    <th colspan="3">Shell Commands</th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php foreach ($shellCommands as $check): ?>
+                    <tr>
+                        <td><?= htmlspecialchars($check['name']); ?></td>
+                        <td class="text-center">
+                            <?php if ($check['passed']): ?>
+                                <i class="fas fa-check" style="color:green"></i>
+                            <?php else: ?>
+                                <i class="fas fa-times" style="color:red"></i>
+                            <?php endif; ?>
+                        </td>
+                        <td><?= htmlspecialchars($check['value']); ?></td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+            <thead>
+                <tr class="table-secondary">
+                    <th colspan="3">SSL Checks</th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php foreach ($sslChecks as $check): ?>
+                    <tr>
+                        <td><?= htmlspecialchars($check['name']); ?></td>
+                        <td class="text-center">
+                            <?php if ($check['passed']): ?>
+                                <i class="fas fa-check" style="color:green"></i>
+                            <?php else: ?>
+                                <i class="fas fa-times" style="color:red"></i>
+                            <?php endif; ?>
+                        </td>
+                        <td><?= htmlspecialchars($check['value']); ?></td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+            <thead>
+                <tr class="table-secondary">
+                    <th colspan="3">Domain Checks</th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php foreach ($domainChecks as $check): ?>
+                    <tr>
+                        <td><?= htmlspecialchars($check['name']); ?></td>
+                        <td class="text-center">
+                            <?php if ($check['passed']): ?>
+                                <i class="fas fa-check" style="color:green"></i>
+                            <?php else: ?>
+                                <i class="fas fa-times" style="color:red"></i>
+                            <?php endif; ?>
+                        </td>
+                        <td><?= htmlspecialchars($check['value']); ?></td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
 
-            <h3>PHP Modules Installed</h3>
+            <!-- File Permissions Table -->
+            <thead>
+                <tr class="table-secondary">
+                    <th colspan="3">File Permissions</th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php foreach ($filePermissions as $check): ?>
+                    <tr>
+                        <td><?= htmlspecialchars($check['name']); ?></td>
+                        <td class="text-center">
+                            <?php if ($check['passed']): ?>
+                                <i class="fas fa-check" style="color:green"></i>
+                            <?php else: ?>
+                                <i class="fas fa-times" style="color:red"></i>
+                            <?php endif; ?>
+                        </td>
+                        <td><?= htmlspecialchars($check['value']); ?></td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+        </table>
 
-            <?php
-            foreach ($loadedModules as $module) {
-                echo $module . "<br>";
-            }
-            ?>
         
-            <hr>
 
-            <h3>PHP Info</h3>
+        <!-- Database Structure Comparison Table -->
-            <?php
+        <h3 class="mt-3">Database Structure Comparison</h3>
-            //Output phpinfo, but in a way that doesnt mess up the page
+        <table class="table table-sm table-bordered">
-            ob_start();
+            <tbody>
-            phpinfo();
+                <?php if (!empty($dbComparison)): ?>
-            $phpinfo = ob_get_contents();
+                    <?php foreach ($dbComparison as $issue): ?>
-            ob_end_clean();
+                        <tr>
+                            <td><?= htmlspecialchars($issue['name']); ?></td>
+                            <td colspan="2"><?= htmlspecialchars($issue['status']); ?></td>
+                        </tr>
+                    <?php endforeach; ?>
+                <?php else: ?>
+                    <tr>
+                        <td colspan="3">No discrepancies found between the database and db.sql file.</td>
+                    </tr>
+                <?php endif; ?>
+            </tbody>
+        </table>
 
-            //Remove everything before the body tag
+        <!-- Uploads Directory Stats Table -->
-            $phpinfo = preg_replace('%^.*<body>(.*)</body>.*$%ms', '$1', $phpinfo);
+        <h3 class="mt-3">Uploads Directory Stats</h3>
+        <table class="table table-sm table-bordered">
+            <tbody>
+                <?php foreach ($uploadsStats as $stat): ?>
+                    <tr>
+                        <td><?= htmlspecialchars($stat['name']); ?></td>
+                        <td colspan="2"><?= htmlspecialchars($stat['value']); ?></td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+        </table>
 
-            //Remove everything after the body tag
+        <!-- Database Stats Table -->
-            $phpinfo = preg_replace('%^(.*)</body>.*$%ms', '$1', $phpinfo);
+        <h3 class="mt-3">Database Stats</h3>
+        <table class="table table-sm table-bordered">
+            <tbody>
+                <?php foreach ($databaseStats as $stat): ?>
+                    <tr>
+                        <td><?= htmlspecialchars($stat['name']); ?></td>
+                        <td colspan="2"><?= htmlspecialchars($stat['value']); ?></td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+        </table>
 
-            //Remove the body tag itself
+        <!-- Table Stats Table -->
-            $phpinfo = preg_replace('%^<body>(.*)$%ms', '$1', $phpinfo);
+        <h3 class="mt-3">Table Stats</h3>
+        <table class="table table-sm table-bordered">
+            <thead>
+                <tr>
+                    <th>Table Name</th>
+                    <th>Fields / Rows</th>
+                    <th>Size (MB)</th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php foreach ($tableDetails as $table): ?>
+                    <tr>
+                        <td><?= htmlspecialchars($table['name']); ?></td>
+                        <td><?= htmlspecialchars("Fields: {$table['fields']}, Rows: {$table['rows']}"); ?></td>
+                        <td><?= htmlspecialchars($table['size'] . ' MB'); ?></td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+        </table>
 
-            //Output the result
-            echo $phpinfo;
-            ?>
-
-            <hr>
     </div>
+
 </div>
 
 <?php

admin_document_template.php

@@ -0,0 +1,137 @@
+<?php
+
+    // Default Column Sort by Filter
+    $sort = "document_name";
+    $order = "ASC";
+
+    require_once "inc_all_admin.php";
+
+    // Search query SQL snippet
+    if (!empty($q)) {
+        $query_snippet = "AND (MATCH(document_content_raw) AGAINST ('$q') OR document_name LIKE '%$q%')";
+    } else {
+        $query_snippet = ""; // empty
+    }
+
+    // Rebuild URL
+    $url_query_strings_sort = http_build_query($get_copy);
+
+    $sql = mysqli_query(
+        $mysqli,
+        "SELECT SQL_CALC_FOUND_ROWS * FROM documents
+        LEFT JOIN users ON document_created_by = user_id
+        WHERE document_template = 1
+        $query_snippet
+        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 mr-2"></i>Document Templates</h3>
+        <div class="card-tools">
+            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDocumentTemplateModal">
+                <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>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_name&order=<?php echo $disp; ?>">
+                                Template Name <?php if ($sort == 'document_name') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_created_at&order=<?php echo $disp; ?>">
+                                Created <?php if ($sort == 'document_created_at') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_updated_at&order=<?php echo $disp; ?>">
+                                Updated <?php if ($sort == 'document_updated_at') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th class="text-center">
+                            Action
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php
+
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $document_id = intval($row['document_id']);
+                            $document_name = nullable_htmlentities($row['document_name']);
+                            $document_description = nullable_htmlentities($row['document_description']);
+                            $document_content = nullable_htmlentities($row['document_content']);
+                            $document_created_by_name = nullable_htmlentities($row['user_name']);
+                            $document_created_at = nullable_htmlentities($row['document_created_at']);
+                            $document_updated_at = nullable_htmlentities($row['document_updated_at']);
+                            $document_folder_id = intval($row['document_folder_id']);
+
+                    ?>
+
+                    <tr>
+                        <td>
+                            <a class="text-bold" href="admin_document_template_details.php?document_id=<?php echo $document_id; ?>"><i class="fas fa-fw fa-file-alt text-dark"></i> <?php echo $document_name; ?></a>
+                            <div class="mt-1 text-secondary"><?php echo $document_description; ?></div>
+                        </td>
+                        <td>
+                            <?php echo $document_created_at; ?>
+                            <div class="text-secondary"><?php echo $document_created_by_name; ?></div>
+                        </td>
+                        <td><?php echo $document_updated_at; ?></td>
+                        <td>
+                            <div class="dropdown dropleft text-center">
+                                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                    <i class="fas fa-ellipsis-h"></i>
+                                </button>
+                                <div class="dropdown-menu">
+                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editDocumentTemplateModal<?php echo $document_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_document=<?php echo $document_id; ?>">
+                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                    </a>
+                                </div>
+                            </div>
+                        </td>
+                    </tr>
+
+                    <?php
+
+                            include "admin_document_template_edit_modal.php";
+
+                        }
+
+                    ?>
+
+                </tbody>
+            </table>
+            <br>
+        </div>
+        <?php include "pagination.php"; ?>
+    </div>
+</div>
+
+<?php include "admin_document_template_add_modal.php"; ?>
+<?php include "footer.php"; ?>

admin_document_template_details.php

@@ -31,10 +31,10 @@ $document_updated_at = nullable_htmlentities($row['document_updated_at']);
             <a href="clients.php">Home</a>
         </li>
         <li class="breadcrumb-item">
-            <a href="admin_users.php">Admin</a>
+            <a href="admin_user.php">Admin</a>
         </li>
         <li class="breadcrumb-item">
-            <a href="admin_document_templates.php">Document Templates</a>
+            <a href="admin_document_template.php">Document Templates</a>
         </li>
         <li class="breadcrumb-item active"><i class="fas fa-file mr-2"></i><?php echo $document_name; ?></li>
     </ol>

admin_document_templates.php

@@ -1,139 +0,0 @@
-<?php
-
-// Default Column Sort by Filter
-$sort = "document_name";
-$order = "ASC";
-
-require_once "inc_all_admin.php";
-
-
-// Search query SQL snippet
-if (!empty($q)) {
-  $query_snippet = "AND (MATCH(document_content_raw) AGAINST ('$q') OR document_name LIKE '%$q%')";
-}else{
-  $query_snippet = ""; // empty
-}
-
-//Rebuild URL
-$url_query_strings_sort = http_build_query($get_copy);
-
-$sql = mysqli_query(
-    $mysqli,
-    "SELECT SQL_CALC_FOUND_ROWS * FROM documents
-    LEFT JOIN users ON document_created_by = user_id
-    WHERE document_template = 1
-    $query_snippet
-    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 mr-2"></i>Document Templates</h3>
-    <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDocumentTemplateModal">
-        <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>
-              <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_name&order=<?php echo $disp; ?>">Template Name</a>
-            </th>
-            <th>
-              <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_created_at&order=<?php echo $disp; ?>">Created</a>
-            </th>
-            <th>
-              <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_updated_at&order=<?php echo $disp; ?>">Updated</a>
-            </th>
-            <th class="text-center">
-              Action
-            </th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-
-          while ($row = mysqli_fetch_array($sql)) {
-            $document_id = intval($row['document_id']);
-            $document_name = nullable_htmlentities($row['document_name']);
-            $document_description = nullable_htmlentities($row['document_description']);
-            $document_content = nullable_htmlentities($row['document_content']);
-            $document_created_by_name = nullable_htmlentities($row['user_name']);
-            $document_created_at = nullable_htmlentities($row['document_created_at']);
-            $document_updated_at = nullable_htmlentities($row['document_updated_at']);
-            $document_folder_id = intval($row['document_folder_id']);
-
-          ?>
-
-          <tr>
-            <td>
-              <a class="text-bold" href="admin_document_template_details.php?document_id=<?php echo $document_id; ?>"><i class="fas fa-fw fa-file-alt text-dark"></i> <?php echo $document_name; ?></a>
-              <div class="mt-1 text-secondary"><?php echo $document_description; ?></div>
-            </td>
-            <td>
-              <?php echo $document_created_at; ?>
-              <div class="text-secondary"><?php echo $document_created_by_name; ?></div>
-            </td>
-            <td><?php echo $document_updated_at; ?></td>
-            <td>
-              <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                  <i class="fas fa-ellipsis-h"></i>
-                </button>
-                <div class="dropdown-menu">
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editDocumentTemplateModal<?php echo $document_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" href="post.php?delete_document=<?php echo $document_id; ?>">
-                      <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                    </a>
-                  <?php } ?>
-                </div>
-              </div>
-            </td>
-          </tr>
-
-          <?php
-
-          include "admin_document_template_edit_modal.php";
-
-          }
-
-          ?>
-
-        </tbody>
-      </table>
-      <br>
-    </div>
-    <?php include "pagination.php";
- ?>
-  </div>
-</div>
-
-
-<?php include "admin_document_template_add_modal.php";
- ?>
-
-<?php include "footer.php";
- ?>

admin_legacy_debug.php

@@ -0,0 +1,335 @@
+<?php
+require_once "inc_all_admin.php";
+
+require_once "database_version.php";
+
+require_once "config.php";
+
+$folderPath = 'uploads';
+
+function countFilesInDirectory($dir) {
+    $count = 0;
+    $size = 0;
+    $files = scandir($dir);
+
+    foreach ($files as $file) {
+        if ($file === '.' || $file === '..') {
+            continue;
+        }
+
+        $filePath = $dir . '/' . $file;
+
+        if (is_file($filePath)) {
+            $count++;
+            $size += filesize($filePath);
+        } elseif (is_dir($filePath)) {
+            $result = countFilesInDirectory($filePath);
+            $count += $result['count'];
+            $size += $result['size'];
+        }
+    }
+
+    return [
+        'count' => $count,
+        'size' => $size
+    ];
+}
+
+// Function to compare two arrays recursively and return the differences
+function arrayDiffRecursive($array1, $array2) {
+    $diff = array();
+
+    foreach ($array1 as $key => $value) {
+        if (is_array($value)) {
+            if (!isset($array2[$key]) || !is_array($array2[$key])) {
+                $diff[$key] = $value;
+            } else {
+                $recursiveDiff = arrayDiffRecursive($value, $array2[$key]);
+                if (!empty($recursiveDiff)) {
+                    $diff[$key] = $recursiveDiff;
+                }
+            }
+        } else {
+            if (!isset($array2[$key]) || $array2[$key] !== $value) {
+                $diff[$key] = $value;
+            }
+        }
+    }
+
+    return $diff;
+}
+
+// Function to load the table structures from an SQL dump file URL
+function loadTableStructuresFromSQLDumpURL($fileURL) {
+    $context = stream_context_create(array('http' => array('header' => 'Accept: application/octet-stream')));
+    $fileContent = file_get_contents($fileURL, false, $context);
+
+    if ($fileContent === false) {
+        return null;
+    }
+
+    $structure = array();
+    $queries = explode(";", $fileContent);
+
+    foreach ($queries as $query) {
+        $query = trim($query);
+
+        if (!empty($query)) {
+            if (preg_match("/^CREATE TABLE `(.*)` \((.*)\)$/s", $query, $matches)) {
+                $tableName = $matches[1];
+                $tableStructure = $matches[2];
+                $structure[$tableName] = array('structure' => $tableStructure);
+            }
+        }
+    }
+
+    return $structure;
+}
+
+// Function to fetch the database structure from the MySQL server
+function fetchDatabaseStructureFromServer() {
+
+    global $mysqli;
+
+    $tables = array();
+
+    // Fetch table names
+    $result = $mysqli->query("SHOW TABLES");
+
+    if ($result->num_rows > 0) {
+        while ($row = $result->fetch_row()) {
+            $tableName = $row[0];
+            $tables[$tableName] = array();
+        }
+    }
+
+    // Fetch table structures
+    foreach ($tables as $tableName => &$table) {
+        $result = $mysqli->query("SHOW CREATE TABLE `$tableName`");
+
+        if ($result->num_rows > 0) {
+            $row = $result->fetch_row();
+            $table['structure'] = $row[1];
+        }
+    }
+
+    return $tables;
+}
+
+//function to get current crontab and return it as an array
+function get_crontab() {
+    $crontab = shell_exec('crontab -l');
+    $crontab = explode(PHP_EOL, $crontab);
+    return $crontab;
+}
+
+// URL to the SQL dump file
+$fileURL = "https://raw.githubusercontent.com/itflow-org/itflow/master/db.sql";
+
+// Load the desired table structures from the SQL dump file URL
+$desiredStructure = loadTableStructuresFromSQLDumpURL($fileURL);
+
+if ($desiredStructure === null) {
+    die("Failed to load the desired table structures from the SQL dump file URL.");
+}
+
+// Fetch the current database structure from the MySQL server
+$currentStructure = fetchDatabaseStructureFromServer();
+
+if ($currentStructure === null) {
+    die("Failed to fetch the current database structure from the server.");
+}
+
+// Compare the structures and display the differences
+$differences = arrayDiffRecursive($desiredStructure, $currentStructure);
+
+//DB Stats
+// Query to fetch the number of tables
+$tablesQuery = "SHOW TABLES";
+$tablesResult = $mysqli->query($tablesQuery);
+
+$numTables = $tablesResult->num_rows;
+$numFields = 0;
+$numRows = 0;
+
+// Loop through each table
+while ($row = $tablesResult->fetch_row()) {
+    $tableName = $row[0];
+
+    // Query to fetch the number of fields
+    $fieldsQuery = "DESCRIBE `$tableName`";
+    $fieldsResult = $mysqli->query($fieldsQuery);
+
+    // Check if the query was successful
+    if ($fieldsResult) {
+        $numFields += $fieldsResult->num_rows;
+
+        // Query to fetch the number of rows
+        $rowsQuery = "SELECT COUNT(*) FROM `$tableName`";
+        $rowsResult = $mysqli->query($rowsQuery);
+
+        // Check if the query was successful
+        if ($rowsResult) {
+            $numRows += $rowsResult->fetch_row()[0];
+        } else {
+            echo "Error executing query: " . $mysqli->error;
+        }
+    } else {
+        echo "Error executing query: " . $mysqli->error;
+    }
+}
+
+//Get loaded PHP modules
+$loadedModules = get_loaded_extensions();
+
+//Get Server Info / Service versions
+$phpVersion = phpversion();
+$databaseInfo = mysqli_get_server_info($mysqli) . " / " .  $mysqli->server_version;
+$operatingSystem = php_uname();
+$webServer = $_SERVER['SERVER_SOFTWARE'];
+$errorLog = ini_get('error_log') ?: "Debian/Ubuntu default is usually /var/log/apache2/error.log";
+$updates = fetchUpdates();
+
+?>
+
+    <div class="card card-dark">
+        <div class="card-header py-3">
+            <h3 class="card-title"><i class="fas fa-fw fa-bug mr-2"></i>Debug</h3>
+        </div>
+        <div class="card-body">
+
+            <h2>Debugging</h2>
+            <ul>
+                <li>If you are experiencing a problem with ITFlow you may be directed to this page to gather server/app info.</li>
+                <li>When creating forum posts / support requests ensure you share the information under <i>Server Info</i>, <i>ITFlow app</i> and <i>Database stats</i>.</li>
+                <li><a class="text-danger text-bold">Caution:</a> Be careful when sharing the full debug output - it contains your PHP session variables/cookies ("PHPSESSID") which could allow anyone to login to your ITFlow instance</li>
+                <li>Note: Sometimes you might need to gather <a href="https://docs.itflow.org/gathering_logs#error_logs">PHP error logs</a> as well</li>
+            </ul>
+            <br>
+
+            <h3>Server Info</h3>
+
+            <?php
+            echo "PHP version: " . $phpVersion . "<br>";
+            echo "Database Version: " . $databaseInfo . "<br>";
+            echo "Operating System: " . $operatingSystem . "<br>";
+            echo "Web Server: " . $webServer  . "<br>";
+            echo "Apache/PHP Error Log: " . $errorLog
+            ?>
+
+            <hr>
+
+            <h3>File System</h3>
+            <?php
+            $result = countFilesInDirectory($folderPath);
+
+            $totalFiles = $result['count'];
+            $totalSizeMB = round($result['size'] / (1024 * 1024), 2);
+
+            echo "Total number of files in $folderPath and its subdirectories: " . $totalFiles . "<br>";
+            echo "Total size of files in $folderPath and its subdirectories: " . $totalSizeMB . " MB";
+            ?>
+
+            <hr>
+            <h3>ITFlow app</h3>
+            <?php
+            echo "App Version: " . $updates->current_version . "<br>";
+            echo "Cron enabled: " . $config_enable_cron . "<br>";
+            echo "App Timezone: " . $config_timezone;
+            ?>
+
+            <hr>
+
+            <h3>Database Structure Check</h3>
+
+            <h4>Database stats</h4>
+
+            <?php
+            echo "Number of tables: " . $numTables . "<br>";
+            echo "Total number of fields: " . $numFields . "<br>";
+            echo "Total number of rows: " . $numRows . "<br>";
+            echo "Current Database Version: " . CURRENT_DATABASE_VERSION . "<br>";
+            ?>
+
+            <hr>
+
+            <h4>Table Stats</h4>
+            <?php
+            // Fetch all table names from the database
+            $tables = array();
+            $result = mysqli_query($mysqli, "SHOW TABLES");
+            while ($row = mysqli_fetch_array($result)) {
+                $tables[] = $row[0];
+            }
+
+            // Generate an HTML table to display the results
+            ?>
+            <table class="table table-sm">
+                <tr>
+                    <th>Table Name</th>
+                    <th>Number of Fields</th>
+                    <th>Number of Rows</th>
+                </tr>
+
+                <?php
+
+                foreach ($tables as $table) {
+                    // Count the number of fields and rows for each table
+                    $columns_result = mysqli_query($mysqli, "SHOW COLUMNS FROM `$table`");
+                    $columns = mysqli_num_rows($columns_result);
+
+                    $rows_result = mysqli_query($mysqli, "SELECT COUNT(*) FROM `$table`");
+                    $rows = mysqli_fetch_array($rows_result)[0];
+                    ?>
+
+                    <tr>
+                        <td><?php echo $table; ?></td>
+                        <td><?php echo $columns; ?></td>
+                        <td><?php echo $rows; ?></td>
+                    </tr>
+                <?php
+                }
+                ?>
+            </table>
+
+            <hr>
+
+            <h3>PHP Modules Installed</h3>
+
+            <?php
+            foreach ($loadedModules as $module) {
+                echo $module . "<br>";
+            }
+            ?>
+
+            <hr>
+
+            <h3>PHP Info</h3>
+            <?php
+            //Output phpinfo, but in a way that doesnt mess up the page
+            ob_start();
+            phpinfo();
+            $phpinfo = ob_get_contents();
+            ob_end_clean();
+
+            //Remove everything before the body tag
+            $phpinfo = preg_replace('%^.*<body>(.*)</body>.*$%ms', '$1', $phpinfo);
+
+            //Remove everything after the body tag
+            $phpinfo = preg_replace('%^(.*)</body>.*$%ms', '$1', $phpinfo);
+
+            //Remove the body tag itself
+            $phpinfo = preg_replace('%^<body>(.*)$%ms', '$1', $phpinfo);
+
+            //Output the result
+            echo $phpinfo;
+            ?>
+
+            <hr>
+        </div>
+    </div>
+
+<?php
+
+require_once "footer.php";
+

admin_mail_queue.php

@@ -102,13 +102,41 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <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=email_id&order=<?php echo $disp; ?>">ID</a></th>
+                            <th>
-                            <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=email_queued_at&order=<?php echo $disp; ?>">Queued</a></th>
+                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=email_id&order=<?php echo $disp; ?>">
-                            <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=email_from&order=<?php echo $disp; ?>">From</a></th>
+                                    ID <?php if ($sort == 'email_id') { echo $order_icon; } ?>
-                            <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=email_recipient&order=<?php echo $disp; ?>">To</a></th>
+                                </a>
-                            <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=email_subject&order=<?php echo $disp; ?>">Subject</a></th>
+                            </th>
-                            <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=email_status&order=<?php echo $disp; ?>">Status</a></th>
+                            <th>
-                            <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=email_attempts&order=<?php echo $disp; ?>">Attempts</a></th>
+                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=email_queued_at&order=<?php echo $disp; ?>">
+                                    Queued <?php if ($sort == 'email_queued_at') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                            <th>
+                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=email_from&order=<?php echo $disp; ?>">
+                                    From <?php if ($sort == 'email_from') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                            <th>
+                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=email_recipient&order=<?php echo $disp; ?>">
+                                    To <?php if ($sort == 'email_recipient') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                            <th>
+                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=email_subject&order=<?php echo $disp; ?>">
+                                    Subject <?php if ($sort == 'email_subject') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                            <th>
+                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=email_status&order=<?php echo $disp; ?>">
+                                    Status <?php if ($sort == 'email_status') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                            <th>
+                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=email_attempts&order=<?php echo $disp; ?>">
+                                    Attempts <?php if ($sort == 'email_attempts') { echo $order_icon; } ?>
+                                </a>
+                            </th>
                             <th>Action</th>
                         </tr>
                         </thead>

admin_mail_queue_message_view.php

@@ -45,7 +45,7 @@ if ($email_status == 0) {
 
 <ol class="breadcrumb d-print-none">
   <li class="breadcrumb-item">
-    <a href="admin_users.php"><i class="fas fa-fw fa-user-shield mr-2"></i>Admin</a>
+    <a href="admin_user.php"><i class="fas fa-fw fa-user-shield mr-2"></i>Admin</a>
   </li>
   <li class="breadcrumb-item">
     <a href="admin_mail_queue.php"><i class="fas fa-fw fa-mail-bulk mr-2"></i>Mail Queue</a>

admin_project_template.php

@@ -52,7 +52,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <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=project_template_name&order=<?php echo $disp; ?>">Template</a></th>
+                    <th>
+                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=project_template_name&order=<?php echo $disp; ?>">
+                            Template <?php if ($sort == 'project_template_name') { echo $order_icon; } ?>
+                        </a>
+                    </th>
                     <th>Tickets</th>
                     <th>Tasks</th>
                     <th class="text-center">Action</th>

admin_project_template_details.php

@@ -13,7 +13,7 @@ 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='project.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='admin_project_template.php'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>";
 
         include_once "footer.php";
         exit;
@@ -48,10 +48,10 @@ if (isset($_GET['project_template_id'])) {
 <!-- Breadcrumbs-->
 <ol class="breadcrumb d-print-none">
     <li class="breadcrumb-item">
-        <a href="admin_users.php">Admin</a>
+        <a href="admin_user.php">Admin</a>
     </li>
     <li class="breadcrumb-item">
-        <a href="admin_project_templates.php">Project Templates</a>
+        <a href="admin_project_template.php">Project Templates</a>
     </li>
     <li class="breadcrumb-item active">Project Template Details</li>
 </ol>
@@ -105,7 +105,7 @@ if (isset($_GET['project_template_id'])) {
                         <?php if ($session_user_role == 3) { ?>
                             <div class="dropdown-divider"></div>
                             <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?archive_project_template=<?php echo $project_template_id; ?>">
-                                <i class="fas fa-fw fa-archive mr-2"></i>Archive
+                                <i class="fas fa-fw fa-archive mr-2"></i>Archive (not yet implemented)
                             </a>
                         <?php } ?>
                         <?php if ($session_user_role == 3) { ?>

admin_project_template_ticket_template_add_modal.php

@@ -21,7 +21,7 @@
                                 <option value="">- Select a Ticket Template -</option>
                                 <?php
 
-                                $sql_ticket_templates_select = mysqli_query($mysqli, "SELECT * FROM ticket_templates
+                                $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
@@ -31,9 +31,9 @@
                                 );
                                 while ($row = mysqli_fetch_array($sql_ticket_templates_select)) {
                                     $ticket_template_id_select = intval($row['ticket_template_id']);
-                                    $ticket_template_subject_select = nullable_htmlentities($row['ticket_template_subject']);
+                                    $ticket_template_name_select = nullable_htmlentities($row['ticket_template_name']);
                                     ?>
-                                    <option value="<?php echo $ticket_template_id_select; ?>"><?php echo $ticket_template_subject_select; ?></option>
+                                    <option value="<?php echo $ticket_template_id_select; ?>"><?php echo $ticket_template_name_select; ?></option>
                                     <?php
                                 }
 

admin_role.php

@@ -21,7 +21,7 @@ $sql = mysqli_query(
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
-    <div class="alert alert-danger"><strong>Roles are not yet active/enforced - do not use.</strong><hr></div>
+    <div class="alert alert-warning"><strong>Roles are still in development. Permissions may not be fully enforced.</strong><hr></div>
 
     <div class="card card-dark">
         <div class="card-header py-2">
@@ -52,11 +52,24 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <table class="table table-striped table-borderless table-hover">
                     <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
                     <tr>
-                        <th class="text-center"><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_role_name&order=<?php echo $disp; ?>">Name</a></th>
+                        <th>
-                        <th class="text-center"><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_role_description&order=<?php echo $disp; ?>">Description</a></th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_role_name&order=<?php echo $disp; ?>">
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_role_is_admin&order=<?php echo $disp; ?>">Admin</a></th>
+                                Name <?php if ($sort == 'user_role_name') { echo $order_icon; } ?>
-                        <th><a class="text-dark">User count</a></th>
+                            </a>
-
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_role_description&order=<?php echo $disp; ?>">
+                                Description <?php if ($sort == 'user_role_description') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_role_is_admin&order=<?php echo $disp; ?>">
+                                Admin <?php if ($sort == 'user_role_is_admin') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th class="text-center">
+                            User count
+                        </th>
                         <th class="text-center">Action</th>
                     </tr>
                     </thead>
@@ -76,14 +89,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         ?>
                         <tr>
-                            <td class="text-center">
+                            <td>
                                 <a class="text-dark" href="#" data-toggle="modal" data-target="#editRoleModal<?php echo $role_id; ?>">
                                     <div class="text-secondary"><?php echo $role_name; ?></div>
                                 </a>
                             </td>
                             <td><?php echo $role_description; ?></td>
                             <td><?php echo $role_admin ? 'Yes' : 'No' ; ?></td>
-                            <td><?php echo $role_user_count ?></td>
+                            <td class="text-center"><?php echo $role_user_count ?></td>
                             <td>
                                 <?php if ($role_id !== 3) { ?>
                                     <div class="dropdown dropleft text-center">

admin_settings_default.php

@@ -110,7 +110,7 @@ require_once "inc_all_admin.php";
                         <option value="0">- None -</option>
                         <?php
 
-                        $sql = mysqli_query($mysqli, "SELECT * FROM accounts LEFT JOIN account_types ON account_types.account_type_id = accounts.account_type WHERE account_type_parent = 1 AND account_archived_at IS NULL ORDER BY account_name ASC");
+                        $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
                         while ($row = mysqli_fetch_array($sql)) {
                             $account_id = intval($row['account_id']);
                             $account_name = nullable_htmlentities($row['account_name']); ?>
@@ -230,12 +230,12 @@ require_once "inc_all_admin.php";
                             while ($row = mysqli_fetch_array($sql)) {
                                 $phone_mask = intval($row['config_phone_mask']);
                             } ?>
-                            <option <?php if ($phone_mask == 1) {
+                            <option <?php if ($phone_mask == 1) { echo "selected"; }?> value=1>
-                                        echo "selected";
+                                Enable - e.g. (412) 888-9999
-                                    }?> value=1>Enable</option>
+                            </option>
-                            <option <?php if ($phone_mask == 0) {
+                            <option <?php if ($phone_mask == 0) { echo "selected"; }?> value=0>
-                                        echo "selected";
+                                Disabled - e.g. 4128889999
-                                    }?> value=0>Disabled</option>
+                            </option>
                     </select>
                 </div>
             </div>

admin_settings_invoice.php

@@ -57,6 +57,16 @@ require_once "inc_all_admin.php";
                     <small class="text-secondary">We recommend updating the invoice footer to include policies on your late charges. This will be applied every 30 days after the invoice Due Date.</small>
                 </div>
 
+                <div class="form-group">
+                    <label>Email address to notify when invoices are paid online <small class="text-secondary">(Ideally a distribution list/shared mailbox)</small></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-bell"></i></span>
+                        </div>
+                        <input type="email" class="form-control" name="config_invoice_paid_notification_email" placeholder="Address to notify for paid invoices, leave bank for none" value="<?php echo nullable_htmlentities($config_invoice_paid_notification_email); ?>">
+                    </div>
+                </div>
+
                 <hr>
 
                 <h4>Recurring Invoice</h4>

admin_settings_notification.php

@@ -32,7 +32,7 @@ require_once "inc_all_admin.php";
                         </div>
                         <input type="text" class="form-control" name="config_cron_key" placeholder="Generate a CRON Key" value="<?php echo nullable_htmlentities($config_cron_key); ?>" readonly>
                         <div class="input-group-append">
-                            <a href="post.php?generate_cron_key" class="btn btn-secondary confirm-link"><i class="fas fa-fw fa-sync mr-2"></i>Generate</a>
+                            <a href="post.php?generate_cron_key" class="btn btn-secondary confirm-link"><i class="fas fa-fw fa-sync mr-2"></i>Regenerate</a>
                         </div>
                     </div>
                 </div>
@@ -48,11 +48,14 @@ require_once "inc_all_admin.php";
                         </tr>
                     </thead>
                     <tbody>
+                        <tr>
+                            <th colspan=5>Expirations</th>
+                        </tr>
                         <tr>
                             <th>
                                 <div><i class="fas fa-fw fa-globe mr-2"></i>Domain Expiration Notice</div>
                                 <small class="text-muted">
-                                    (This setting triggers a notification when a domain is approaching its expiration date, specifically at 1, 7, 14, 30, 90, and 120 days prior to expiry.)
+                                    (This setting triggers a notification when a domain is approaching its expiration date, specifically at 1, 7, 14, 30 and 90 days prior to expiry.)
                                 </small>
                             </th>
                             <td>
@@ -65,6 +68,35 @@ require_once "inc_all_admin.php";
                             <td></td>
                             <td></td>
                         </tr>
+                        <tr>
+                            <th>
+                                <div><i class="fas fa-fw fa-lock mr-2"></i>Certificate Expiration Notice</div>
+                                <small class="text-muted">
+                                    (This setting triggers a notification when a certificate is approaching its expiration date, specifically at 1, 7, 14, 30 and 90 days prior to expiry.)
+                                </small>
+                            </th>
+                            <td>
+                            </td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                        </tr>
+                        <tr>
+                            <th>
+                                <div><i class="fas fa-fw fa-desktop mr-2"></i>Asset Warranty Expiration Notice</div>
+                                <small class="text-muted">
+                                    (This setting triggers a notification when an asset is approaching its expiration date, specifically at 1, 7, 14, 30 and 90 days prior to expiry.)
+                                </small>
+                            </th>
+                            <td>
+                            </td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                        </tr>
+                        <tr>
+                            <th colspan=5>Billing</th>
+                        </tr>
                         <tr>
                             <th>
                                 <div><i class="fas fa-fw fa-file-invoice mr-2"></i>Invoice Reminders</div>
@@ -103,6 +135,9 @@ require_once "inc_all_admin.php";
                             </td>
                             <td></td>
                         </tr>
+                        <tr>
+                            <th colspan=5>Operational</th>
+                        </tr>
                         <tr>
                             <th>
                                 <div><i class="fas fa-fw fa-bell mr-2"></i>Send clients general notification emails</div>
@@ -118,6 +153,39 @@ require_once "inc_all_admin.php";
                             </td>
                             <td></td>
                         </tr>
+                        <tr>
+                            <th>
+                                <div><i class="fas fa-fw fa-link mr-2"></i>Shared Item View</div>
+                                <small class="text-secondary">(Notify when Shared items are viewed)</small>
+                            </th>
+                            <td></td>
+                            <td></td>
+                            <td>
+                            </td>
+                            <td></td>
+                        </tr>
+                        <tr>
+                            <th>
+                                <div><i class="fas fa-fw fa-clock mr-2"></i>Cron Execution</div>
+                                <small class="text-secondary">(Notify when the nightly cron job ran)</small>
+                            </th>
+                            <td></td>
+                            <td></td>
+                            <td>
+                            </td>
+                            <td></td>
+                        </tr>
+                        <tr>
+                            <th>
+                                <div><i class="fas fa-fw fa-download mr-2"></i>ITFlow Updates</div>
+                                <small class="text-secondary">(Notify when ITFlow has an update)</small>
+                            </th>
+                            <td></td>
+                            <td></td>
+                            <td>
+                            </td>
+                            <td></td>
+                        </tr>
                     </tbody>
                 </table>
 

admin_settings_online_payment.php

@@ -12,6 +12,9 @@ require_once "inc_all_admin.php";
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
+                <div class="alert alert-secondary">Currently, we only integrate with Stripe. Please see <a href="https://forum.itflow.org/d/439-payment-integrations-megathread" target="_blank">this forum post</a>.</div>
+                <br>
+
                 <div class="form-group">
                     <div class="custom-control custom-switch">
                         <input type="checkbox" class="custom-control-input" name="config_stripe_enable" <?php if ($config_stripe_enable == 1) { echo "checked"; } ?> value="1" id="enableStripeSwitch">
@@ -50,7 +53,7 @@ require_once "inc_all_admin.php";
                             <select class="form-control select2" name="config_stripe_account">
                                 <option value="">- Account -</option>
                                 <?php
-                                $sql_accounts = mysqli_query($mysqli, "SELECT * FROM accounts LEFT JOIN account_types ON account_types.account_type_id = accounts.account_type WHERE account_type_parent = 1 AND account_archived_at IS NULL ORDER BY account_name ASC");
+                                $sql_accounts = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
                                 while ($row = mysqli_fetch_array($sql_accounts)) {
                                     $account_id = intval($row['account_id']);
                                     $account_name = nullable_htmlentities($row['account_name']);

admin_side_nav.php

@@ -15,13 +15,18 @@
         <nav>
             <ul class="nav nav-pills nav-sidebar flex-column mt-2" data-widget="treeview" data-accordion="false">
                 <!-- ACCESS Section -->
-                <li class="nav-header">ACCESS</li>
                 <li class="nav-item">
-                    <a href="admin_users.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_users.php") {echo "active";} ?>">
+                    <a href="admin_user.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_user.php") {echo "active";} ?>">
                         <i class="nav-icon fas fa-users"></i>
                         <p>Users</p>
                     </a>
                 </li>
+                <li class="nav-item">
+                    <a href="admin_role.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_role.php") {echo "active";} ?>">
+                        <i class="nav-icon fas fa-user-shield"></i>
+                        <p>Roles</p>
+                    </a>
+                </li>
                 <li class="nav-item">
                     <a href="admin_api.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "admin_api.php") {echo "active";} ?>">
                         <i class="nav-icon fas fa-key"></i>
@@ -35,99 +40,74 @@
                     </a>
                 </li>
                         
-                <!-- TAGS & CATEGORIES Section -->
+                <li class="nav-header">TAGS & CATEGORIES</li>
-                <li class="nav-item has-treeview mt-2 <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_tags.php', 'admin_categories.php', 'admin_taxes.php', 'admin_account_types.php', 'admin_ticket_statuses.php', 'admin_custom_links.php']) ? 'menu-open' : ''); ?>">
+                
-                    <a href="#" class="nav-link">
-                        <p>
-                            TAGS & CATEGORIES
-                            <i class="right fas fa-angle-left"></i>
-                        </p>
-                    </a>
-                    <ul class="nav nav-treeview">
                 <li class="nav-item">
-                            <a href="admin_tags.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_tags.php' ? 'active' : ''); ?>">
+                    <a href="admin_tag.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_tag.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-tags"></i>
                         <p>Tags</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                            <a href="admin_categories.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_categories.php' ? 'active' : ''); ?>">
+                    <a href="admin_category.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_category.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-list-ul"></i>
                         <p>Categories</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                            <a href="admin_taxes.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_taxes.php' ? 'active' : ''); ?>">
+                    <a href="admin_tax.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_tax.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-balance-scale"></i>
                         <p>Taxes</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                            <a href="admin_ticket_statuses.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_ticket_statuses.php' ? 'active' : ''); ?>">
+                    <a href="admin_ticket_status.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_ticket_status.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-info-circle"></i>
                         <p>Ticket Statuses</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                            <a href="admin_custom_links.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_custom_links.php' ? 'active' : ''); ?>">
+                    <a href="admin_custom_link.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_custom_link.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-external-link-alt"></i>
                         <p>Custom Links</p>
                     </a>
                 </li>
-                    </ul>
-                </li>
 
-                <!-- TEMPLATES Section -->
+                <li class="nav-header">TEMPLATES</li>
-                <li class="nav-item has-treeview mt-2 <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_project_templates.php', 'admin_project_template_details.php', 'admin_ticket_templates.php', 'admin_ticket_template_details.php', 'admin_vendor_templates.php', 'admin_software_templates.php', 'admin_document_templates.php', 'admin_document_template_details.php']) ? 'menu-open' : ''); ?>">
+
-                    <a href="#" class="nav-link">
-                        <p>
-                            TEMPLATES
-                            <i class="right fas fa-angle-left"></i>
-                        </p>
-                    </a>
-                    <ul class="nav nav-treeview">
                 <li class="nav-item">
-                            <a href="admin_project_templates.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_project_templates.php', 'admin_project_template_details.php']) ? 'active' : ''); ?>">
+                    <a href="admin_project_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_project_template.php', 'admin_project_template_details.php']) ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-project-diagram"></i>
                         <p>Project Templates</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                            <a href="admin_ticket_templates.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_ticket_templates.php', 'admin_ticket_template_details.php']) ? 'active' : ''); ?>">
+                    <a href="admin_ticket_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_ticket_template.php', 'admin_ticket_template_details.php']) ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-life-ring"></i>
                         <p>Ticket Templates</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                            <a href="admin_vendor_templates.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_vendor_templates.php' ? 'active' : ''); ?>">
+                    <a href="admin_vendor_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_vendor_template.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-building"></i>
                         <p>Vendor Templates</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                            <a href="admin_software_templates.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_software_templates.php' ? 'active' : ''); ?>">
+                    <a href="admin_software_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_software_template.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-rocket"></i>
                         <p>License Templates</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                            <a href="admin_document_templates.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_document_templates.php', 'admin_document_template_details.php']) ? 'active' : ''); ?>">
+                    <a href="admin_document_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_document_template.php', 'admin_document_template_details.php']) ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-file"></i>
                         <p>Document Templates</p>
                     </a>
                 </li>
-                    </ul>
-                </li>
 
-                <!-- MAINTENANCE Section -->
+                <li class="nav-header">MAINTENANCE</li>
-                <li class="nav-item has-treeview mt-2 <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_mail_queue.php', 'admin_mail_queue_message_view.php', 'admin_logs.php', 'admin_backup.php', 'admin_debug.php', 'admin_update.php']) ? 'menu-open' : ''); ?>">
+
-                    <a href="#" class="nav-link">
-                        <p>
-                            MAINTENANCE
-                            <i class="right fas fa-angle-left"></i>
-                        </p>
-                    </a>
-                    <ul class="nav nav-treeview">
                 <li class="nav-item">
                     <a href="admin_mail_queue.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_mail_queue.php', 'admin_mail_queue_message_view.php']) ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-mail-bulk"></i>
@@ -135,7 +115,7 @@
                     </a>
                 </li>
                 <li class="nav-item">
-                            <a href="admin_logs.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_logs.php' ? 'active' : ''); ?>">
+                    <a href="admin_audit_log.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_audit_log.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-history"></i>
                         <p>Audit Logs</p>
                     </a>
@@ -158,11 +138,9 @@
                         <p>Update</p>
                     </a>
                 </li>
-                    </ul>
-                </li>
 
                 <!-- SETTINGS Section -->
-                <li class="nav-item has-treeview mt-2 <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['settings_company.php', 'settings_localization.php', 'settings_theme.php', 'settings_security.php', 'settings_mail.php', 'settings_notifications.php', 'settings_defaults.php', 'settings_invoice.php', 'settings_quote.php', 'settings_online_payment.php', 'settings_project.php', 'settings_ticket.php', 'settings_ai.php', 'settings_integrations.php', 'settings_telemetry.php', 'settings_modules.php']) ? 'menu-open' : ''); ?>">
+                <li class="nav-item has-treeview mt-2 <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['admin_settings_company.php', 'admin_settings_localization.php', 'admin_settings_theme.php', 'admin_settings_security.php', 'admin_settings_mail.php', 'admin_settings_notification.php', 'admin_settings_default.php', 'admin_settings_invoice.php', 'admin_settings_quote.php', 'admin_settings_online_payment.php', 'admin_settings_project.php', 'admin_settings_ticket.php', 'admin_settings_ai.php', 'admin_settings_integration.php', 'admin_settings_telemetry.php', 'admin_settings_module.php']) ? 'menu-open' : ''); ?>">
                     <a href="#" class="nav-link">
                         <p>
                             SETTINGS
@@ -171,97 +149,97 @@
                     </a>
                     <ul class="nav nav-treeview">
                         <li class="nav-item">
-                            <a href="settings_company.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_company.php' ? 'active' : ''); ?>">
+                            <a href="admin_settings_company.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_company.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fa fa-briefcase"></i>
                                 <p>Company Details</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_localization.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_localization.php' ? 'active' : ''); ?>">
+                            <a href="admin_settings_localization.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_localization.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fa fa-globe"></i>
                                 <p>Localization</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_theme.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_theme.php' ? 'active' : ''); ?>">
+                            <a href="admin_settings_theme.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_theme.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fa fa-paint-brush"></i>
                                 <p>Theme</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_security.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_security.php' ? 'active' : ''); ?>">
+                            <a href="admin_settings_security.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_security.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-shield-alt"></i>
                                 <p>Security</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_mail.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_mail.php' ? 'active' : ''); ?>">
+                            <a href="admin_settings_mail.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_mail.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon far fa-envelope"></i>
                                 <p>Mail</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_notifications.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_notifications.php' ? 'active' : ''); ?>">
+                            <a href="admin_settings_notification.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_notification.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon far fa-bell"></i>
                                 <p>Notifications</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_defaults.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_defaults.php' ? 'active' : ''); ?>">
+                            <a href="admin_settings_default.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_default.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-cogs"></i>
                                 <p>Defaults</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_invoice.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_invoice.php' ? 'active' : ''); ?>">
+                            <a href="admin_settings_invoice.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_invoice.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-file-invoice"></i>
                                 <p>Invoice</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_quote.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_quote.php' ? 'active' : ''); ?>">
+                            <a href="admin_settings_quote.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_quote.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-comment-dollar"></i>
                                 <p>Quote</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_online_payment.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_online_payment.php' ? 'active' : ''); ?>">
+                            <a href="admin_settings_online_payment.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_online_payment.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon far fa-credit-card"></i>
                                 <p>Online Payment</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_project.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_project.php' ? 'active' : ''); ?>">
+                            <a href="admin_settings_project.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_project.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-project-diagram"></i>
                                 <p>Project</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_ticket.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_ticket.php' ? 'active' : ''); ?>">
+                            <a href="admin_settings_ticket.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_ticket.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-life-ring"></i>
                                 <p>Ticket</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_ai.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_ai.php' ? 'active' : ''); ?>">
+                            <a href="admin_settings_ai.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_ai.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-robot"></i>
                                 <p>AI</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_integrations.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_integrations.php' ? 'active' : ''); ?>">
+                            <a href="admin_settings_integration.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_integration.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-plug"></i>
                                 <p>Integrations</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_telemetry.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_telemetry.php' ? 'active' : ''); ?>">
+                            <a href="admin_settings_telemetry.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_telemetry.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-satellite-dish"></i>
                                 <p>Telemetry</p>
                             </a>
                         </li>
                         <li class="nav-item">
-                            <a href="settings_modules.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'settings_modules.php' ? 'active' : ''); ?>">
+                            <a href="admin_settings_module.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'admin_settings_module.php' ? 'active' : ''); ?>">
                                 <i class="nav-icon fas fa-cube"></i>
                                 <p>Modules</p>
                             </a>

admin_software_template.php

@@ -52,9 +52,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <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=software_name&order=<?php echo $disp; ?>">Template</a></th>
+                    <th>
-                    <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=software_type&order=<?php echo $disp; ?>">Type</a></th>
+                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=software_name&order=<?php echo $disp; ?>">
-                    <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=software_license_type&order=<?php echo $disp; ?>">License Type</a></th>
+                            Template <?php if ($sort == 'software_name') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=software_type&order=<?php echo $disp; ?>">
+                            Type <?php if ($sort == 'software_type') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=software_license_type&order=<?php echo $disp; ?>">
+                            License Type <?php if ($sort == 'software_license_type') { echo $order_icon; } ?>
+                        </a>
+                    </th>
                     <th class="text-center">Action</th>
                 </tr>
                 </thead>

admin_tag.php

@@ -50,8 +50,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <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-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=tag_name&order=<?php echo $disp; ?>">Name</a></th>
+                        <th>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=tag_type&order=<?php echo $disp; ?>">Type</a></th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=tag_name&order=<?php echo $disp; ?>">
+                                Name <?php if ($sort == 'tag_name') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=tag_type&order=<?php echo $disp; ?>">
+                                Type <?php if ($sort == 'tag_type') { echo $order_icon; } ?>
+                            </a>
+                        </th>
                         <th class="text-center">Action</th>
                     </tr>
                     </thead>
@@ -68,6 +76,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $tag_type_display = "Location Tag";
                         } elseif ( $tag_type == 3) {
                             $tag_type_display = "Contact Tag";
+                        } elseif ( $tag_type == 4) {
+                            $tag_type_display = "Credential Tag";
                         } else {
                             $tag_type_display = "Unknown Tag";
                         }

admin_tag_add_modal.php

@@ -32,6 +32,7 @@
                 <option value="1">Client Tag</option>
                 <option value="2">Location Tag</option>
                 <option value="3">Contact Tag</option>
+                <option value="4">Credential Tag</option>
               </select>
             </div>
           </div>

admin_tag_edit_modal.php

@@ -32,6 +32,7 @@
                 <option value="1" <?php if ($tag_type == 1) { echo "selected"; } ?>>Client Tag</option>
                 <option value="2" <?php if ($tag_type == 2) { echo "selected"; } ?>>Location Tag</option>
                 <option value="3" <?php if ($tag_type == 3) { echo "selected"; } ?>>Contact Tag</option>
+                <option value="4" <?php if ($tag_type == 4) { echo "selected"; } ?>>Credential Tag</option>
               </select>
             </div>
           </div>

admin_tax.php

@@ -33,8 +33,16 @@ $num_rows = mysqli_num_rows($sql);
                 <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</a></th>
+                        <th>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=tax_percent&order=<?php echo $disp; ?>">Percent</a></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>

admin_ticket_status.php

@@ -50,9 +50,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <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-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_status_name&order=<?php echo $disp; ?>">Name</a></th>
+                        <th>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_status_color&order=<?php echo $disp; ?>">Color</a></th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_status_name&order=<?php echo $disp; ?>">
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_status_arctive&order=<?php echo $disp; ?>">Status</a></th>
+                                Name <?php if ($sort == 'ticket_status_name') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_status_color&order=<?php echo $disp; ?>">
+                                Color <?php if ($sort == 'ticket_status_color') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_status_active&order=<?php echo $disp; ?>">
+                                Status <?php if ($sort == 'ticket_status_active') { echo $order_icon; } ?>
+                            </a>
+                        </th>
                         <th class="text-center">Action</th>
                     </tr>
                     </thead>

admin_ticket_template.php

@@ -52,7 +52,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <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=ticket_template_name&order=<?php echo $disp; ?>">Template</a></th>
+                    <th>
+                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_template_name&order=<?php echo $disp; ?>">
+                            Template <?php if ($sort == 'ticket_template_name') { echo $order_icon; } ?>
+                        </a>
+                    </th>
                     <th>Tasks</th>
                     <th class="text-center">Action</th>
                 </tr>
@@ -70,7 +74,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     ?>
                     <tr>
                         <td>
-                            <a class="text-dark" href="#" data-toggle="modal" data-target="#editTicketTemplateModal<?php echo $ticket_template_id; ?>">
+                            <a class="text-dark">
                                 <div class="media">
                                     <i class="fa fa-fw fa-2x fa-life-ring mr-3"></i>
                                     <div class="media-body">
@@ -91,12 +95,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fas fa-ellipsis-h"></i>
                                 </button>
                                 <div class="dropdown-menu">
-                                    <?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_ticket_template=<?php echo $ticket_template_id; ?>">
                                         <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                     </a>
-                                    <?php } ?>
                                 </div>
                             </div>
                         </td>
@@ -114,6 +115,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 require_once "admin_ticket_template_add_modal.php";
-
 require_once "footer.php";
 

admin_ticket_template_add_modal.php

@@ -9,26 +9,6 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <div class="modal-body bg-white">
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-details"><i class="fa fa-fw fa-life-ring mr-2"></i>Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-ticket"><i class="fa fa-fw fa-life-ring mr-2"></i>Template</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-tasks"><i class="fa fa-fw fa-tasks mr-2"></i>Tasks</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-project-template"><i class="fa fa-fw fa-project-diagram mr-2"></i>Project Template</a>
-                        </li>
-                    </ul>
-
-                    <hr>
-
-                    <div class="tab-content">
-
-                        <div class="tab-pane fade show active" id="pills-details">
 
                     <div class="form-group">
                         <label>Template Name <strong class="text-danger">*</strong></label>
@@ -40,20 +20,6 @@
                         </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>
-
-                        <div class="tab-pane fade" id="pills-ticket">
-
                     <div class="form-group">
                         <label>Subject</label>
                         <div class="input-group">
@@ -79,34 +45,24 @@
                     </div>
                     <?php } ?>
 
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-tasks">
-
                     <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-tasks"></i></span>
+                                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
                             </div>
-                                    <input type="text" class="form-control" name="tasks[]" placeholder="Enter Task Name">
+                            <input type="text" class="form-control" name="description" placeholder="Short description">
-                                    <div class="input-group-append">
-                                        <button type="button" class="btn btn-primary"><i class="fas fa-fw fa-check mr-2"></i>Add</button>
                         </div>
                     </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-project-template">
 
                     <div class="form-group">
-                                <label>Project Template</label>
+                        <label>Add it to a Project Template?</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
                             </div>
                             <select class="form-control select2" name="project_template">
-                                        <option value="0">- None -</option>
+                                <option value="0">- No -</option>
                                 <?php
 
                                 $sql_project_templates = mysqli_query($mysqli, "SELECT * FROM project_templates WHERE project_template_archived_at IS NULL ORDER BY project_template_name ASC");
@@ -119,11 +75,6 @@
                             </select>
                         </div>
                     </div>
-
-                        </div>
-
-                    </div>
-                
                 </div>
                 <div class="modal-footer bg-white">
                     <button type="submit" name="add_ticket_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>

admin_ticket_template_details.php

@@ -35,10 +35,10 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE
             <a href="clients.php">Home</a>
         </li>
         <li class="breadcrumb-item">
-            <a href="admin_users.php">Admin</a>
+            <a href="admin_user.php">Admin</a>
         </li>
         <li class="breadcrumb-item">
-            <a href="admin_ticket_templates.php">Ticket Templates</a>
+            <a href="admin_ticket_template.php">Ticket Templates</a>
         </li>
         <li class="breadcrumb-item active"><i class="fas fa-life-ring mr-2"></i><?php echo $ticket_template_name; ?></li>
     </ol>
@@ -58,12 +58,12 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE
                         </div>
                     </h3>
                     <div class="card-tools">
-                        <button type="button" class="btn btn-default btn-sm" data-toggle="modal" data-target="#editTicketTemplateModal<?php echo $template_id; ?>">
+                        <button type="button" class="btn btn-default btn-sm" data-toggle="modal" data-target="#editTicketTemplateModal">
                             <i class="fas fa-edit"></i>
                         </button>
                     </div>
                 </div>
-                <h5><?php echo $ticket_subject; ?></h5>
+                <h5><?php echo $ticket_template_subject; ?></h5>
                 <div class="card-body prettyContent">
                     <?php echo $ticket_template_details; ?>
                 </div>
@@ -85,9 +85,9 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-tasks"></i></span>
                                 </div>
-                                <input type="text" class="form-control" name="task_name" placeholder="Task name">
+                                <input type="text" class="form-control" name="task_name" placeholder="Create a task" required>
                                 <div class="input-group-append">
-                                    <button type="submit" name="add_ticket_template_task" class="btn btn-primary"><i class="fas fa-fw fa-check mr-2"></i>Create</button>
+                                    <button type="submit" name="add_ticket_template_task" class="btn btn-primary"><i class="fas fa-fw fa-check"></i></button>
                                 </div>
                             </div>
                         </div>
@@ -98,18 +98,29 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE
                             $task_id = intval($row['task_template_id']);
                             $task_name = nullable_htmlentities($row['task_template_name']);
                             $task_order = intval($row['task_template_order']);
+                            $task_completion_estimate = intval($row['task_template_completion_estimate']);
                             $task_description = nullable_htmlentities($row['task_template_description']);
                             ?>
                             <tr>
                                 <td><i class="far fa-fw fa-square text-secondary"></i></td>
-                                <td><?php echo $task_name; ?></td>
+                                <td><span class="text-secondary"><?php echo $task_completion_estimate; ?>m</span> - <?php echo $task_name; ?></td>
                                 <td class="text-right">
-                                    <button type="button" class="btn btn-link btn-sm text-secondary" data-toggle="modal" data-target="#editTaskModal<?php echo $task_id; ?>">
+                                    <div class="float-right">
-                                        <i class="fa fa-fw fa-pencil-alt"></i>
+                                        <div class="dropdown dropleft text-center">
+                                            <button class="btn btn-link text-secondary btn-sm" type="button" data-toggle="dropdown">
+                                                <i class="fas fa-fw fa-ellipsis-v"></i>
                                             </button>
-                                    <a href="post.php?delete_task_template=<?php echo $task_id; ?>" class="btn btn-link btn-sm text-danger">
+                                            <div class="dropdown-menu">
-                                        <i class="fa fa-fw fa-trash-alt"></i>
+                                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTaskModal<?php echo $task_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?delete_task_template=<?php echo $task_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                                    <i class="fas fa-fw fa-trash-alt mr-2"></i>Delete
+                                                </a>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </td>
                             </tr>
                             <?php

admin_ticket_template_edit_modal.php

@@ -1,4 +1,5 @@
 <div class="modal" id="editTicketTemplateModal" tabindex="-1">
+
     <div class="modal-dialog modal-lg">
         <div class="modal-content bg-dark">
             <div class="modal-header">
@@ -10,20 +11,6 @@
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="ticket_template_id" value="<?php echo $ticket_template_id; ?>">
                 <div class="modal-body bg-white">
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-details"><i class="fa fa-fw fa-life-ring mr-2"></i>Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-ticket"><i class="fa fa-fw fa-life-ring mr-2"></i>Template</a>
-                        </li>
-                    </ul>
-
-                    <hr>
-
-                    <div class="tab-content">
-
-                        <div class="tab-pane fade show active" id="pills-details">
 
                     <div class="form-group">
                         <label>Template Name <strong class="text-danger">*</strong></label>
@@ -35,20 +22,6 @@
                         </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" value="<?php echo $ticket_template_description; ?>" placeholder="Short description">
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-ticket">
-
                     <div class="form-group">
                         <label>Subject</label>
                         <div class="input-group">
@@ -74,8 +47,14 @@
                     </div>
                     <?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" value="<?php echo $ticket_template_description; ?>" placeholder="Short description">
                         </div>
-
                     </div>
             
                 </div>

admin_update.php

@@ -32,13 +32,7 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
                 </div>
             <?php } ?>
 
-            <?php if (!empty($git_log)) { ?>
+            <?php if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { ?>
-                <a class="btn btn-primary btn-lg my-4" href="post.php?update"><i class="fas fa-fw fa-4x fa-download mb-1"></i><h5>Update App</h5></a>
-                <a class="btn btn-danger btn-lg" href="post.php?update&force_update=1"><i class="fas fa-fw fa-4x fa-hammer mb-1"></i><h5>FORCE Update App</h5></a>
-                <hr>
-
-            <?php } else {
-                if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { ?>
                 <div class="alert alert-warning">
                     <strong>Ensure you have a current <a href="https://docs.itflow.org/backups">app & database backup</a> before updating!</strong>
                 </div>
@@ -50,6 +44,15 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
                 <small class="text-secondary">Latest DB Version: <?php echo LATEST_DATABASE_VERSION; ?></small>
                 <br>
                 <small class="text-secondary">Branch: <?php echo $repo_branch; ?></small>
+
+                <hr>
+
+            <?php } else {
+                if (!empty($git_log)) { ?>
+
+                    <a class="btn btn-primary btn-lg my-4" href="post.php?update"><i class="fas fa-fw fa-4x fa-download mb-1"></i><h5>Update App</h5></a>
+                    <a class="btn btn-danger btn-lg" href="post.php?update&force_update=1"><i class="fas fa-fw fa-4x fa-hammer mb-1"></i><h5>FORCE Update App</h5></a>
+
                 <?php } else { ?>
                     <p class="text-secondary">Current Database Version:<br><strong class="text-dark"><?php echo CURRENT_DATABASE_VERSION; ?></strong></p>
                     <p class="text-secondary">Current App Version:<br><strong class="text-dark"><?php echo $current_version; ?></strong></p>

admin_user.php

@@ -66,12 +66,30 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <table class="table table-striped table-borderless table-hover">
                 <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
                 <tr>
-                    <th class="text-center"><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_name&order=<?php echo $disp; ?>">Name</a></th>
+                    <th class="text-center">
-                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_email&order=<?php echo $disp; ?>">Email</a></th>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_name&order=<?php echo $disp; ?>">
-                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_role&order=<?php echo $disp; ?>">Role</a></th>
+                            Name <?php if ($sort == 'user_name') { echo $order_icon; } ?>
-                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_status&order=<?php echo $disp; ?>">Status</a></th>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_email&order=<?php echo $disp; ?>">
+                            Email <?php if ($sort == 'user_email') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_role&order=<?php echo $disp; ?>">
+                            Role <?php if ($sort == 'user_role') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_status&order=<?php echo $disp; ?>">
+                            Status <?php if ($sort == 'user_status') { echo $order_icon; } ?>
+                        </a>
+                    </th>
                     <th class="text-center">MFA</th>
-                    <th>Last Login</th>
+                    <th>
+                        Last Login
+                    </th>
                     <th class="text-center">Action</th>
                 </tr>
                 </thead>

admin_vendor_template.php

@@ -52,8 +52,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <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_name&order=<?php echo $disp; ?>">Vendor</a></th>
+                        <th>
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=vendor_description&order=<?php echo $disp; ?>">Description</a></th>
+                            <a class="text-secondary" 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>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=vendor_description&order=<?php echo $disp; ?>">
+                                Description <?php if ($sort == 'vendor_description') { echo $order_icon; } ?>
+                            </a>
+                        </th>
                         <th>Contact</th>
                         <th class="text-center">Action</th>
                     </tr>

api/v1/contacts/contact_model.php

@@ -66,14 +66,6 @@ if (isset($_POST['contact_notes'])) {
     $notes = '';
 }
 
-if (isset($_POST['contact_auth_method'])) {
-    $auth_method = sanitizeInput($_POST['contact_auth_method']);
-} elseif ($contact_row) {
-    $auth_method = $contact_row['contact_auth_method'];
-} else {
-    $auth_method = '';
-}
-
 if (isset($_POST['contact_primary'])) {
     $primary = intval($_POST['contact_primary']);
 } elseif ($contact_row) {

api/v1/contacts/create.php

@@ -20,7 +20,7 @@ if (!empty($name) && !empty($email) && !empty($client_id)) {
     if (mysqli_num_rows($email_duplication_sql) == 0) {
 
         // Insert contact
-        $insert_sql = mysqli_query($mysqli, "INSERT INTO contacts SET contact_name = '$name', contact_title = '$title', contact_department = '$department', contact_email = '$email', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_notes = '$notes', contact_auth_method = '$auth_method', contact_primary = '$primary', contact_important = '$important', contact_billing = '$billing', contact_technical = '$technical', contact_location_id = $location_id, contact_client_id = $client_id");
+        $insert_sql = mysqli_query($mysqli, "INSERT INTO contacts SET contact_name = '$name', contact_title = '$title', contact_department = '$department', contact_email = '$email', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_notes = '$notes', contact_primary = '$primary', contact_important = '$important', contact_billing = '$billing', contact_technical = '$technical', contact_location_id = $location_id, contact_client_id = $client_id");
 
         // Check insert & get insert ID
         if ($insert_sql) {

api/v1/contacts/update.php

@@ -19,7 +19,7 @@ if (!empty($contact_id)) {
     require_once 'contact_model.php';
 
 
-    $update_sql = mysqli_query($mysqli, "UPDATE contacts SET contact_name = '$name', contact_title = '$title', contact_department = '$department', contact_email = '$email', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile',  contact_notes = '$notes', contact_auth_method = '$auth_method', contact_primary = '$primary', contact_important = '$important', contact_billing = '$billing', contact_technical = '$technical', contact_location_id = $location_id, contact_client_id = $client_id WHERE contact_id = $contact_id LIMIT 1");
+    $update_sql = mysqli_query($mysqli, "UPDATE contacts SET contact_name = '$name', contact_title = '$title', contact_department = '$department', contact_email = '$email', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile',  contact_notes = '$notes', contact_primary = '$primary', contact_important = '$important', contact_billing = '$billing', contact_technical = '$technical', contact_location_id = $location_id, contact_client_id = $client_id WHERE contact_id = $contact_id LIMIT 1");
 
     // Check insert & get insert ID
     if ($update_sql) {

budget.php

@@ -2,6 +2,9 @@
 
 require_once "inc_all.php";
 
+// Perms
+enforceUserPermission('module_financial');
+
 // Fetch categories
 $query = "SELECT category_id, category_name FROM categories WHERE category_type ='Expense' AND category_archived_at IS NULL";
 $result = mysqli_query($mysqli, $query);

budget_edit.php

@@ -2,6 +2,8 @@
 
 require_once "inc_all.php";
 
+enforceUserPermission('module_financial', 2);
+
 // Fetch categories
 $query = "SELECT category_id, category_name FROM categories WHERE category_type ='Expense' AND category_archived_at IS NULL";
 $result = mysqli_query($mysqli, $query);
@@ -52,6 +54,8 @@ $grandTotal = 0;
     </form>
     <form id="budgetForm" method="POST" action="post.php">
         <input type="hidden" name="year" value="<?php echo $currentYear; ?>">
+        <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
         <table class="table table-bordered table-striped">
             <thead>
             <tr>

calendar_event_add_modal.php

@@ -86,7 +86,7 @@
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-recycle"></i></span>
                                     </div>
-                                    <select class="form-control select2" name="repeat">
+                                    <select class="form-control select2" name="repeat" disabled>
                                         <option value="">Never</option>
                                         <option>Day</option>
                                         <option>Week</option>

calendar_event_edit_modal.php

@@ -88,7 +88,7 @@
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-recycle"></i></span>
                                     </div>
-                                    <select class="form-control select2" name="repeat">
+                                    <select class="form-control select2" name="repeat" disabled>
                                         <option <?php if (empty($event_repeat)) { echo "selected"; } ?> value="">Never</option>
                                         <option <?php if ($event_repeat == "Day") { echo "selected"; } ?>>Day</option>
                                         <option <?php if ($event_repeat == "Week") { echo "selected"; } ?>>Week</option>

calendar_events.php

@@ -8,7 +8,6 @@ if (isset($_GET['calendar_id'])) {
 }
 
 ?>
-<link href='plugins/fullcalendar-6.1.10/dist/index.global.js' rel='stylesheet' />
 
 <!-- So that when hovering over a created event it turns into a hand instead of cursor -->
 <style>
@@ -98,7 +97,7 @@ while ($row = mysqli_fetch_array($sql)) {
 <?php require_once "footer.php";
 ?>
 
-<script src='plugins/fullcalendar-6.1.10/dist/index.global.js'></script>
+<script src='plugins/fullcalendar/dist/index.global.js'></script>
 
 <script>
     document.addEventListener('DOMContentLoaded', function() {

check_login.php

@@ -38,20 +38,20 @@ $session_user_agent = sanitizeInput($_SERVER['HTTP_USER_AGENT']);
 
 $session_user_id = intval($_SESSION['user_id']);
 
-$sql = mysqli_query($mysqli, "SELECT * FROM users, user_settings WHERE users.user_id = user_settings.user_id AND users.user_id = $session_user_id");
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT * FROM users
+    LEFT JOIN user_settings ON users.user_id = user_settings.user_id
+    LEFT JOIN user_roles ON user_settings.user_role = user_roles.user_role_id
+    WHERE users.user_id = $session_user_id");
+
 $row = mysqli_fetch_array($sql);
 $session_name = sanitizeInput($row['user_name']);
 $session_email = $row['user_email'];
 $session_avatar = $row['user_avatar'];
 $session_token = $row['user_token'];
 $session_user_role = intval($row['user_role']);
-if ($session_user_role == 3) {
+$session_user_role_display = sanitizeInput($row['user_role_name']);
-    $session_user_role_display = "Administrator";
-} elseif ($session_user_role == 2) {
-    $session_user_role_display = "Technician";
-} else {
-    $session_user_role_display = "Accountant";
-}
 if (isset($row['user_role_is_admin']) && $row['user_role_is_admin'] == 1) {
     $session_is_admin = true;
 }

client_add_modal.php

@@ -2,12 +2,13 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>Create <?php if($leads == 0){ echo "Client"; } else { echo "Lead"; } ?></h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-user-plus mr-2"></i>Creating New <?php if($leads == 0){ echo "Client"; } else { echo "Lead"; } ?></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
                 <input type="hidden" name="lead" value="0">
                 <input type="hidden" name="net_terms" value="0">
                 <input type="hidden" name="currency_code" value="<?php echo $session_company_currency; ?>">
@@ -29,7 +30,7 @@
                         </li>
                         <?php } ?>
                         <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-more">More</a>
+                            <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
                         </li>
                     </ul>
 
@@ -40,12 +41,27 @@
                         <div class="tab-pane fade show active" id="pills-details">
 
                             <div class="form-group">
-                                <label>Name <strong class="text-danger">*</strong></label>
+                                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Is Lead</span></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="Name or Company" required autofocus>
+                                    <div class="input-group-append">
+                                        <div class="input-group-text">
+                                            <input type="checkbox" name="lead" value="1" <?php if($leads == 1){ echo "checked"; } ?>>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Shortened Name</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="abbreviation" placeholder="Shortned name for client - Max chars 6" maxlength="6" oninput="this.value = this.value.toUpperCase()">
                                 </div>
                             </div>
 
@@ -90,11 +106,23 @@
                             </div>
 
                             <div class="form-group">
-                                <label><i class="fas fa-fw fa-bullhorn mr-2"></i>Is Lead</label>
+                                <label>Tags</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
-                                        <input type="checkbox" name="lead" value="1" <?php if($leads == 1){ echo "checked"; } ?>>
+                                        <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 = 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>
 
@@ -289,44 +317,10 @@
 
                         <?php } ?>
 
-                        <div class="tab-pane fade" id="pills-more">
+                        <div class="tab-pane fade" id="pills-notes">
-
                             <div class="form-group">
-                                <label>Abbreviation</label>
+                                <textarea class="form-control" rows="10" name="notes" placeholder="Enter some notes"></textarea>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
                             </div>
-                                    <input type="text" class="form-control" name="abbreviation" placeholder="Abbreviated name for client" maxlength="6" oninput="this.value = this.value.toUpperCase()">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Notes</label>
-                                <textarea class="form-control" rows="6" name="notes" placeholder="Enter some notes"></textarea>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Tags</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="tags[]" data-placeholder="Add some tags" multiple>
-                                        <?php
-
-                                        $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 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>

client_asset_bulk_add_ticket_modal.php

@@ -0,0 +1,148 @@
+<div class="modal" id="bulkAddTicketModal" tabindex="-1">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <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>
+            
+            <input type="hidden" name="bulk_billable" value="0">
+            <input type="hidden" name="bulk_client" value="<?php echo $client_id; ?>">
+            <div class="modal-body bg-white">
+
+                <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">
+                    </div>
+                </div>
+
+                <?php if($config_ai_enable) { ?>
+                <div class="form-group">
+                    <textarea class="form-control tinymceai" id="textInput" name="bulk_details"></textarea>
+                </div>
+
+                <div class="mb-3">
+                    <button id="rewordButton" class="btn btn-primary" type="button"><i class="fas fa-fw fa-robot mr-2"></i>Reword</button>
+                    <button id="undoButton" class="btn btn-secondary" type="button" style="display:none;"><i class="fas fa-fw fa-redo-alt mr-2"></i>Undo</button>
+                </div>
+                <?php } else { ?>
+                <div class="form-group">
+                    <textarea class="form-control tinymce" rows="5" name="bulk_details"></textarea>
+                </div>
+                <?php } ?>
+
+                <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>
+
+                    <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="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 users.user_id, user_name FROM users
+                                LEFT JOIN user_settings on users.user_id = user_settings.user_id
+                                WHERE user_role > 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_client_id = $client_id AND 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 bg-white">
+                <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>

client_asset_details.php

@@ -117,8 +117,11 @@ if (isset($_GET['asset_id'])) {
 
     // Related Logins Query
     $sql_related_logins = mysqli_query($mysqli, "SELECT * FROM logins
+         LEFT JOIN login_tags ON login_tags.login_id = logins.login_id
+        LEFT JOIN tags ON tags.tag_id = login_tags.tag_id
         WHERE login_asset_id = $asset_id
         AND login_archived_at IS NULL
+        GROUP BY logins.login_id
         ORDER BY login_name DESC"
     );
     $login_count = mysqli_num_rows($sql_related_logins);
@@ -410,6 +413,28 @@ if (isset($_GET['asset_id'])) {
                                 $login_asset_id = intval($row['login_asset_id']);
                                 $login_software_id = intval($row['login_software_id']);
 
+                                // Tags
+                                $login_tag_name_display_array = array();
+                                $login_tag_id_array = array();
+                                $sql_login_tags = mysqli_query($mysqli, "SELECT * FROM login_tags LEFT JOIN tags ON login_tags.tag_id = tags.tag_id WHERE login_id = $login_id ORDER BY tag_name ASC");
+                                while ($row = mysqli_fetch_array($sql_login_tags)) {
+
+                                    $login_tag_id = intval($row['tag_id']);
+                                    $login_tag_name = nullable_htmlentities($row['tag_name']);
+                                    $login_tag_color = nullable_htmlentities($row['tag_color']);
+                                    if (empty($login_tag_color)) {
+                                        $login_tag_color = "dark";
+                                    }
+                                    $login_tag_icon = nullable_htmlentities($row['tag_icon']);
+                                    if (empty($login_tag_icon)) {
+                                        $login_tag_icon = "tag";
+                                    }
+
+                                    $login_tag_id_array[] = $login_tag_id;
+                                    $login_tag_name_display_array[] = "<a href='client_logins.php?client_id=$client_id&tags[]=$login_tag_id'><span class='badge text-light p-1 mr-1' style='background-color: $login_tag_color;'><i class='fa fa-fw fa-$login_tag_icon mr-2'></i>$login_tag_name</span></a>";
+                                }
+                                $login_tags_display = implode('', $login_tag_name_display_array);
+
                                 ?>
                                 <tr>
                                     <td>
@@ -684,8 +709,8 @@ if (isset($_GET['asset_id'])) {
                                 ?>
 
                                 <tr>
-                                    <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><span class="badge badge-pill badge-secondary p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span></a></td>
+                                    <td><a href="ticket.php?client_id=<?php echo $client_id; ?>&ticket_id=<?php echo $ticket_id; ?>"><span class="badge badge-pill badge-secondary p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span></a></td>
-                                    <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
+                                    <td><a href="ticket.php?client_id=<?php echo $client_id; ?>&ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
                                     <td><?php echo $ticket_priority_display; ?></td>
                                     <td>
                                         <span class='badge badge-pill text-light p-2' style="background-color: <?php echo $ticket_status_color; ?>"><?php echo $ticket_status_name; ?></span>

client_asset_edit_modal.php

@@ -37,7 +37,7 @@
 
                     <hr>
 
-                    <div class="tab-content">
+                    <div class="tab-content" <?php if (lookupUserPermission('module_support') <= 1) { echo 'inert'; } ?>>
 
                         <div class="tab-pane fade show active" id="pills-details<?php echo $asset_id; ?>">
 
@@ -397,7 +397,7 @@
 
                         <div class="tab-pane fade" id="pills-history<?php echo $asset_id; ?>">
 
-                            <?php $sql_history = mysqli_query($mysqli, "SELECT * FROM logs WHERE log_type = 'asset' and log_entity_id = $asset_id and log_client_id = $client_id");  ?>
+                            <?php $sql_asset_history = mysqli_query($mysqli, "SELECT * FROM asset_history WHERE asset_history_asset_id = $asset_id ORDER BY asset_history_id DESC LIMIT 10");  ?>
 
                             <div class="form-group">
                                 <label>Asset History</label>
@@ -405,19 +405,16 @@
                                 <ul>
 
                                     <?php
-                                    while ($row = mysqli_fetch_array($sql_history)) {
+                                    while ($row = mysqli_fetch_array($sql_asset_history)) {
-                                        $log_action = nullable_htmlentities(($row['log_action']));
+                                        $asset_history_description = nullable_htmlentities(($row['asset_history_description']));
-                                        $log_description = nullable_htmlentities(($row['log_description']));
+                                        $asset_history_created_at = nullable_htmlentities(($row['asset_history_created_at']));
-                                        $log_created_at = nullable_htmlentities(($row['log_created_at']));
+                                        echo "<li><small class='text-secondary'>$asset_history_created_at</small><br>$asset_history_description</li>";
-                                        echo "<li>$log_created_at - $log_action: $log_description</li>";
                                     }
                                     ?>
                                 </ul>
 
                             </div>
 
-
-
                         </div>
 
                     </div>

client_asset_interface_edit_modal.php

@@ -12,7 +12,7 @@
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
                 <input type="hidden" name="interface_id" value="<?php echo $interface_id; ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body bg-white" <?php if (lookupUserPermission('module_support') <= 1) { echo 'inert'; } ?>>
 
                     <div class="form-group">
                         <label>Interface Name</label>

client_assets.php

@@ -6,6 +6,9 @@ $order = "ASC";
 
 require_once "inc_all_client.php";
 
+// Perms
+enforceUserPermission('module_support');
+
 //Asset Type from GET
 if (isset($_GET['type']) && ($_GET['type']) == 'workstation') {
     $type_query = "asset_type = 'desktop' OR asset_type = 'laptop'";
@@ -96,6 +99,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-desktop mr-2"></i>Assets</h3>
             <div class="card-tools">
+                <?php if (lookupUserPermission("module_support") >= 2) { ?>
                     <div class="btn-group">
                     <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAssetModal">
                         <i class="fas fa-plus mr-2"></i>New <?php if (!empty($_GET['type'])) { echo ucwords(strip_tags(nullable_htmlentities($_GET['type']))); } else { echo "Asset"; } ?>
@@ -113,6 +117,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         <?php } ?>
                     </div>
                 </div>
+                <?php } ?>
             </div>
         </div>
         <div class="card-body">
@@ -208,7 +213,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 </a>
                                 <div class="dropdown ml-2" id="bulkActionButton" hidden>
                                     <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
-                                        <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
+                                        <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount"></span>)
                                     </button>
                                     <div class="dropdown-menu">
                                         <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignContactModal">
@@ -222,6 +227,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditStatusModal">
                                             <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">
+                                            <i class="fas fa-fw fa-life-ring mr-2"></i>Create Tickets
+                                        </a>
                                         <?php if ($archived) { ?>
                                         <div class="dropdown-divider"></div>
                                         <button class="dropdown-item text-info"
@@ -255,55 +264,94 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
                                 </div>
                             </td>
-                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_name&order=<?php echo $disp; ?>">Name</a></th>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_name&order=<?php echo $disp; ?>">
+                                    Name <?php if ($sort == 'asset_name') { echo $order_icon; } ?>
+                                </a>
+                            </th>
                             <?php if ($_GET['type'] !== 'virtual' && $_GET['type'] !== 'servers') { ?>
-                                <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_type&order=<?php echo $disp; ?>">Type</a></th>
+                                <th>
-                            <?php }
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_type&order=<?php echo $disp; ?>">
-                            if ($_GET['type'] !== 'virtual') { ?>
+                                        Type <?php if ($sort == 'asset_type') { echo $order_icon; } ?>
-                                <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_make&order=<?php echo $disp; ?>">Model</a></th>
+                                    </a>
-                            <?php }
+                                </th>
-                            if ($_GET['type'] !== 'virtual') { ?>
+                            <?php } ?>
-                                <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_serial&order=<?php echo $disp; ?>">Serial</a></th>
+                            <?php if ($_GET['type'] !== 'virtual') { ?>
+                                <th>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_make&order=<?php echo $disp; ?>">
+                                        Model <?php if ($sort == 'asset_make') { echo $order_icon; } ?>
+                                    </a>
+                                </th>
+                                <th>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_serial&order=<?php echo $disp; ?>">
+                                        Serial <?php if ($sort == 'asset_serial') { echo $order_icon; } ?>
+                                    </a>
+                                </th>
                             <?php } ?>
                             <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('OS', $_GET['show_column'])) { ?>
                                 <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other') { ?>
-                                <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_os&order=<?php echo $disp; ?>">OS</a></th>
+                                    <th>
+                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_os&order=<?php echo $disp; ?>">
+                                            OS <?php if ($sort == 'asset_os') { echo $order_icon; } ?>
+                                        </a>
+                                    </th>
                                 <?php } ?>
                             <?php } ?>
                             <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('IP', $_GET['show_column'])) { ?>
                                 <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=interface_ip&order=<?php echo $disp; ?>">IP</a>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=interface_ip&order=<?php echo $disp; ?>">
+                                        IP <?php if ($sort == 'interface_ip') { echo $order_icon; } ?>
+                                    </a>
                                 </th>
                             <?php } ?>
                             <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Purchase_Date', $_GET['show_column'])) { ?>
                                 <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_purchase_date&order=<?php echo $disp; ?>">Purchase Date</a>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_purchase_date&order=<?php echo $disp; ?>">
+                                        Purchase Date <?php if ($sort == 'asset_purchase_date') { echo $order_icon; } ?>
+                                    </a>
                                 </th>
                             <?php } ?>
                             <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Install_Date', $_GET['show_column'])) { ?>
                                 <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_install_date&order=<?php echo $disp; ?>">Install Date</a>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_install_date&order=<?php echo $disp; ?>">
+                                        Install Date <?php if ($sort == 'asset_install_date') { echo $order_icon; } ?>
+                                    </a>
                                 </th>
                             <?php } ?>
                             <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Warranty_Expire', $_GET['show_column'])) { ?>
                                 <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_warranty_expire&order=<?php echo $disp; ?>">Warranty Expire</a>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_warranty_expire&order=<?php echo $disp; ?>">
+                                        Warranty Expire <?php if ($sort == 'asset_warranty_expire') { echo $order_icon; } ?>
+                                    </a>
                                 </th>
                             <?php } ?>
                             <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'servers' && $_GET['type'] !== 'other') { ?>
                                 <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=contact_name&order=<?php echo $disp; ?>">Assigned To</a>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=contact_name&order=<?php echo $disp; ?>">
+                                        Assigned To <?php if ($sort == 'contact_name') { echo $order_icon; } ?>
+                                    </a>
                                 </th>
                             <?php } ?>
-                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=location_name&order=<?php echo $disp; ?>">Location</a></th>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=location_name&order=<?php echo $disp; ?>">
+                                    Location <?php if ($sort == 'location_name') { echo $order_icon; } ?>
+                                </a>
+                            </th>
                             <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Physical_Location', $_GET['show_column'])) { ?>
                                 <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_physical_location&order=<?php echo $disp; ?>">Physical Location</a>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_physical_location&order=<?php echo $disp; ?>">
+                                        Physical Location <?php if ($sort == 'asset_physical_location') { echo $order_icon; } ?>
+                                    </a>
                                 </th>
                             <?php } ?>
-                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_status&order=<?php echo $disp; ?>">Status</a></th>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_status&order=<?php echo $disp; ?>">
+                                    Status <?php if ($sort == 'asset_status') { echo $order_icon; } ?>
+                                </a>
+                            </th>
                             <th class="text-center">Action</th>
                         </tr>
+
                         </thead>
                         <tbody>
                         <?php
@@ -550,6 +598,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                                     <a class="dropdown-item text-info" href="post.php?unarchive_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
                                                         <i class="fas fa-fw fa-redo mr-2"></i>Unarchive
                                                     </a>
+                                                    <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                                    </a>
                                                     <?php } else { ?>
                                                     <a class="dropdown-item" href="#" data-toggle="modal" data-target="#transferAssetModal<?php echo $asset_id; ?>">
                                                         <i class="fas fa-fw fa-arrow-right mr-2"></i>Transfer
@@ -558,11 +609,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                                         <i class="fas fa-fw fa-archive mr-2"></i>Archive
                                                     </a>
                                                     <?php } ?>
-                                                    <?php if ($config_destructive_deletes_enable) { ?>
-                                                    <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                                        <i class="fas fa-fw fa-archive mr-2"></i>Delete
-                                                    </a>
-                                                    <?php } ?>
 
                                                 <?php } ?>
                                             </div>
@@ -589,6 +635,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <?php require_once "client_asset_bulk_assign_location_modal.php"; ?>
                 <?php require_once "client_asset_bulk_assign_contact_modal.php"; ?>
                 <?php require_once "client_asset_bulk_edit_status_modal.php"; ?>
+                <?php require_once "client_asset_bulk_add_ticket_modal.php"; ?>
             </form>
             <?php require_once "pagination.php"; ?>
         </div>

client_certificate_edit_modal.php

@@ -26,7 +26,7 @@
 
                     <hr>
 
-                    <div class="tab-content">
+                    <div class="tab-content" <?php if (lookupUserPermission('module_support') <= 1) { echo 'inert'; } ?>>
 
                         <div class="tab-pane fade show active" id="pillsEditDetails">
 

client_certificates.php

@@ -6,6 +6,8 @@ $order = "ASC";
 
 require_once "inc_all_client.php";
 
+// Perms
+enforceUserPermission('module_support');
 
 //Rebuild URL
 $url_query_strings_sort = http_build_query($get_copy);
@@ -83,10 +85,26 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
                             </div>
                         </td>
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=certificate_name&order=<?php echo $disp; ?>">Name</a></th>
+                        <th>
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=certificate_domain&order=<?php echo $disp; ?>">Domain</a></th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=certificate_name&order=<?php echo $disp; ?>">
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=certificate_issued_by&order=<?php echo $disp; ?>">Issued By</a></th>
+                                Name <?php if ($sort == 'certificate_name') { echo $order_icon; } ?>
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=certificate_expire&order=<?php echo $disp; ?>">Expire</a></th>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=certificate_domain&order=<?php echo $disp; ?>">
+                                Domain <?php if ($sort == 'certificate_domain') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=certificate_issued_by&order=<?php echo $disp; ?>">
+                                Issued By <?php if ($sort == 'certificate_issued_by') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=certificate_expire&order=<?php echo $disp; ?>">
+                                Expire <?php if ($sort == 'certificate_expire') { echo $order_icon; } ?>
+                            </a>
+                        </th>
                         <th class="text-center">Action</th>
                     </tr>
                     </thead>

client_contact_add_modal.php

@@ -198,6 +198,7 @@
                                         <div class="custom-control custom-checkbox">
                                             <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox" name="contact_important" value="1">
                                             <label class="custom-control-label" for="contactImportantCheckbox">Important</label>
+                                            <p class="text-secondary"><small>Pin Top</small></p>
                                         </div>
                                     </div>
                                 </div>
@@ -206,6 +207,7 @@
                                         <div class="custom-control custom-checkbox">
                                             <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox" name="contact_billing" value="1">
                                             <label class="custom-control-label" for="contactBillingCheckbox">Billing</label>
+                                            <p class="text-secondary"><small>Receives Invoices</small></p>
                                         </div>
                                     </div>
                                 </div>
@@ -214,6 +216,7 @@
                                         <div class="custom-control custom-checkbox">
                                             <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox" name="contact_technical" value="1">
                                             <label class="custom-control-label" for="contactTechnicalCheckbox">Technical</label>
+                                            <p class="text-secondary"><small>Access </small></p>
                                         </div>
                                     </div>
                                 </div>

client_contact_archive_modal.php

@@ -0,0 +1,56 @@
+<div class="modal" id="archiveContactModal<?php echo $contact_id; ?>" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-archive mr-2"></i>Archiving contact: <strong><?php echo $contact_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="contact_id" value="<?php echo $contact_id; ?>">
+                <div class="modal-body bg-white">
+
+                    <div class="alert alert-warning">
+                        Client Portal Access will be revoked upon archiving
+                    </div>
+
+                    <label>Unassign:</label>
+
+                    <div class="form-group">
+                        <div class="custom-control custom-checkbox">
+                            <input type="checkbox" class="custom-control-input" id="unassignAssetsCheckbox<?php echo $contact_id; ?>" name="unassign_assets" value="1">
+                            <label class="custom-control-label" for="unassignAssetsCheckbox<?php echo $contact_id; ?>">Assets</label>
+                        </div>
+                    </div>
+                
+                    <div class="form-group">
+                        <div class="custom-control custom-checkbox">
+                            <input type="checkbox" class="custom-control-input" id="unassignLicensesCheckbox<?php echo $contact_id; ?>" name="unassign_licenses" value="1">
+                            <label class="custom-control-label" for="unassignLicensesCheckbox<?php echo $contact_id; ?>">Licenses</label>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <div class="custom-control custom-checkbox">
+                            <input type="checkbox" class="custom-control-input" id="unassignDocumentsCheckbox<?php echo $contact_id; ?>" name="unassign_documents" value="1">
+                            <label class="custom-control-label" for="unassignDocumentsCheckbox<?php echo $contact_id; ?>">Documents</label>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <div class="custom-control custom-checkbox">
+                            <input type="checkbox" class="custom-control-input" id="anonymizeCheckbox<?php echo $contact_id; ?>" name="anonymize_contact" value="1">
+                            <label class="custom-control-label" for="anonymizeCheckbox<?php echo $contact_id; ?>">Anonymize Contact</label>
+                        </div>
+                    </div>
+                
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="archive_contact" class="btn btn-danger text-bold"><i class="fas fa-check mr-2"></i>Arhive</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>

client_contact_details.php

@@ -8,6 +8,7 @@ if (isset($_GET['contact_id'])) {
 
     $sql = mysqli_query($mysqli, "SELECT * FROM contacts 
         LEFT JOIN locations ON location_id = contact_location_id
+        LEFT JOIN users ON user_id = contact_user_id
         WHERE contact_id = $contact_id
     ");
 
@@ -30,7 +31,7 @@ if (isset($_GET['contact_id'])) {
     $contact_created_at = nullable_htmlentities($row['contact_created_at']);
     $contact_location_id = intval($row['contact_location_id']);
     $location_name = nullable_htmlentities($row['location_name']);
-    $auth_method = nullable_htmlentities($row['contact_auth_method']);
+    $auth_method = nullable_htmlentities($row['user_auth_method']);
     $contact_client_id = intval($row['contact_client_id']);
 
     // Check to see if Contact belongs to client
@@ -43,7 +44,13 @@ if (isset($_GET['contact_id'])) {
     $asset_count = mysqli_num_rows($sql_related_assets);
 
     // Related Logins Query
-    $sql_related_logins = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_contact_id = $contact_id ORDER BY login_name DESC");
+    $sql_related_logins = mysqli_query($mysqli, "SELECT * FROM logins
+        LEFT JOIN login_tags ON login_tags.login_id = logins.login_id
+        LEFT JOIN tags ON tags.tag_id = login_tags.tag_id
+        WHERE login_contact_id = $contact_id
+        GROUP BY logins.login_id
+        ORDER BY login_name DESC
+    ");
     $login_count = mysqli_num_rows($sql_related_logins);
 
     // Related Software Query
@@ -183,10 +190,6 @@ if (isset($_GET['contact_id'])) {
                     <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addTicketModal">
                         <i class="fa fa-fw fa-plus mr-2"></i>New Ticket
                     </a>
-                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addTicketFromTemplateModal">
-                        <i class="fa fa-fw fa-plus mr-2"></i>From Template
-                    </a>
-                    <div class="dropdown-divider"></div>
                 </div>
             </div>
 
@@ -380,6 +383,28 @@ if (isset($_GET['contact_id'])) {
                                 $login_asset_id = intval($row['login_asset_id']);
                                 $login_software_id = intval($row['login_software_id']);
 
+                                // Tags
+                                $login_tag_name_display_array = array();
+                                $login_tag_id_array = array();
+                                $sql_login_tags = mysqli_query($mysqli, "SELECT * FROM login_tags LEFT JOIN tags ON login_tags.tag_id = tags.tag_id WHERE login_id = $login_id ORDER BY tag_name ASC");
+                                while ($row = mysqli_fetch_array($sql_login_tags)) {
+
+                                    $login_tag_id = intval($row['tag_id']);
+                                    $login_tag_name = nullable_htmlentities($row['tag_name']);
+                                    $login_tag_color = nullable_htmlentities($row['tag_color']);
+                                    if (empty($login_tag_color)) {
+                                        $login_tag_color = "dark";
+                                    }
+                                    $login_tag_icon = nullable_htmlentities($row['tag_icon']);
+                                    if (empty($login_tag_icon)) {
+                                        $login_tag_icon = "tag";
+                                    }
+
+                                    $login_tag_id_array[] = $login_tag_id;
+                                    $login_tag_name_display_array[] = "<a href='client_logins.php?client_id=$client_id&tags[]=$login_tag_id'><span class='badge text-light p-1 mr-1' style='background-color: $login_tag_color;'><i class='fa fa-fw fa-$login_tag_icon mr-2'></i>$login_tag_name</span></a>";
+                                }
+                                $login_tags_display = implode('', $login_tag_name_display_array);
+
                                 ?>
                                 <tr>
                                     <td>
@@ -569,8 +594,8 @@ if (isset($_GET['contact_id'])) {
                                 ?>
 
                                 <tr>
-                                    <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><span class="badge badge-pill badge-secondary p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span></a></td>
+                                    <td><a href="ticket.php?client_id=<?php echo $client_id; ?>&ticket_id=<?php echo $ticket_id; ?>"><span class="badge badge-pill badge-secondary p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span></a></td>
-                                    <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
+                                    <td><a href="ticket.php?client_id=<?php echo $client_id; ?>&ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
                                     <td><?php echo $ticket_priority_display; ?></td>
                                     <td><span class='badge badge-pill text-light p-2' style="background-color: <?php echo $ticket_status_color; ?>"><?php echo $ticket_status_name; ?></span></td>
                                     <td><?php echo $ticket_assigned_to_display; ?></td>
@@ -658,7 +683,6 @@ if (isset($_GET['contact_id'])) {
 <?php
 
 require_once "ticket_add_modal.php";
-require_once "ticket_add_from_template_modal.php";
 
 require_once "footer.php";
 

client_contact_edit_modal.php

@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-user-edit mr-2"></i>Editing: <strong><?php echo $contact_name; ?></strong></h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-user-edit mr-2"></i>Editing contact: <strong><?php echo $contact_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
@@ -206,6 +206,7 @@
                                         <div class="custom-control custom-checkbox">
                                             <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox<?php echo $contact_id; ?>" name="contact_important" value="1" <?php if ($contact_important == 1) { echo "checked"; } ?>>
                                             <label class="custom-control-label" for="contactImportantCheckbox<?php echo $contact_id; ?>">Important</label>
+                                            <p class="text-secondary"><small>Pin Top</small></p>
                                         </div>
                                     </div>
                                 </div>
@@ -214,6 +215,7 @@
                                         <div class="custom-control custom-checkbox">
                                             <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox<?php echo $contact_id; ?>" name="contact_billing" value="1" <?php if ($contact_billing == 1) { echo "checked"; } ?>>
                                             <label class="custom-control-label" for="contactBillingCheckbox<?php echo $contact_id; ?>">Billing</label>
+                                            <p class="text-secondary"><small>Receives Invoices</small></p>
                                         </div>
                                     </div>
                                 </div>

client_contacts.php

@@ -35,8 +35,9 @@ if (isset($_GET['location']) & !empty($_GET['location'])) {
 //Rebuild URL
 $url_query_strings_sort = http_build_query($get_copy);
 
-$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS contacts.*, locations.*, GROUP_CONCAT(tags.tag_name) FROM contacts
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS contacts.*, locations.*, users.*, GROUP_CONCAT(tags.tag_name) FROM contacts
     LEFT JOIN locations ON location_id = contact_location_id
+    LEFT JOIN users ON user_id = contact_user_id
     LEFT JOIN contact_tags ON contact_tags.contact_id = contacts.contact_id
     LEFT JOIN tags ON tags.tag_id = contact_tags.tag_id
     WHERE contact_$archive_query
@@ -198,13 +199,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
                                 </div>
                             </td>
-                            <th><a class="text-secondary ml-3" href="?<?php echo $url_query_strings_sort; ?>&sort=contact_name&order=<?php echo $disp; ?>">Name</a></th>
                             <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=contact_department&order=<?php echo $disp; ?>">Department
+                                <a class="text-secondary ml-3" href="?<?php echo $url_query_strings_sort; ?>&sort=contact_name&order=<?php echo $disp; ?>">
+                                    Name <?php if ($sort == 'contact_name') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=contact_department&order=<?php echo $disp; ?>">
+                                    Department <?php if ($sort == 'contact_department') { echo $order_icon; } ?>
                                 </a>
                             </th>
                             <th>Contact</th>
-                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=location_name&order=<?php echo $disp; ?>">Location</a></th>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=location_name&order=<?php echo $disp; ?>">
+                                    Location <?php if ($sort == 'location_name') { echo $order_icon; } ?>
+                                </a>
+                            </th>
                             <th class="text-center">Action</th>
                         </tr>
                         </thead>
@@ -281,7 +291,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             } else {
                                 $location_name_display = $location_name;
                             }
-                            $auth_method = nullable_htmlentities($row['contact_auth_method']);
+                            $auth_method = nullable_htmlentities($row['user_auth_method']);
+                            $contact_user_id = intval($row['contact_user_id']);
 
                             // Related Assets Query
                             $sql_related_assets = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_contact_id = $contact_id ORDER BY asset_id DESC");
@@ -317,7 +328,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 }
 
                                 $contact_tag_id_array[] = $contact_tag_id;
-                                $contact_tag_name_display_array[] = "<a href='client_contacts.php?client_id=$client_id&q=$contact_tag_name'><span class='badge text-light p-1 mr-1' style='background-color: $contact_tag_color;'><i class='fa fa-fw fa-$contact_tag_icon mr-2'></i>$contact_tag_name</span></a>";
+                                $contact_tag_name_display_array[] = "<a href='client_contacts.php?client_id=$client_id&tags[]=$contact_tag_id'><span class='badge text-light p-1 mr-1' style='background-color: $contact_tag_color;'><i class='fa fa-fw fa-$contact_tag_icon mr-2'></i>$contact_tag_name</span></a>";
                             }
                             $contact_tags_display = implode('', $contact_tag_name_display_array);
 
@@ -348,16 +359,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                                 <div class="<?php if(!empty($contact_important)) { echo "text-bold"; } ?>"><?php echo $contact_name; ?></div>
                                                 <?php echo $contact_title_display; ?>
                                                 <div><?php echo $contact_primary_display; ?></div>
-                                                    
-                                            </div>
-                                        </div>
-                                    </a>
                                                 <?php
                                                 if (!empty($contact_tags_display)) { ?>
                                                     <div class="mt-1">
                                                         <?php echo $contact_tags_display; ?>
                                                     </div>
                                                 <?php } ?>   
+                                            </div>
+                                        </div>
+                                    </a>
+                                    
                                 </td>
                                 <td><?php echo $contact_department_display; ?></td>
                                 <td><?php echo $contact_info_display; ?></td>

client_document_add_modal.php

@@ -29,36 +29,55 @@
                         <textarea class="form-control tinymce" name="content"></textarea>
                     </div>
                     <?php } ?>
+
                     <div class="form-group">
+                        <label for="folderSelect">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" name="folder">
+                            <select class="form-control select2" name="folder" id="folderSelect">
                                 <option value="0">/</option>
                                 <?php
-                                $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                                // Recursive function to display folder options
+                                function display_folder_options($parent_folder_id, $client_id, $indent = 0) {
+                                    global $mysqli;
+
+                                    $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_location = 0 AND folder_client_id = $client_id ORDER BY folder_name ASC");
                                     while ($row = mysqli_fetch_array($sql_folders)) {
                                         $folder_id = intval($row['folder_id']);
                                         $folder_name = nullable_htmlentities($row['folder_name']);
 
-                                    ?>
+                                        // Indentation for subfolders
-                                    <option <?php if (isset($_GET['folder_id']) && $_GET['folder_id'] == $folder_id) echo "selected"; ?> value="<?php echo $folder_id ?>"><?php echo $folder_name; ?></option>
+                                        $indentation = str_repeat('&nbsp;', $indent * 4);
-                                    <?php
-                                }
-                                ?>
 
+                                        // Check if this folder is selected
+                                        $selected = '';
+                                        if ((isset($_GET['folder_id']) && $_GET['folder_id'] == $folder_id) || (isset($_POST['folder']) && $_POST['folder'] == $folder_id)) {
+                                            $selected = 'selected';
+                                        }
+
+                                        echo "<option value=\"$folder_id\" $selected>$indentation$folder_name</option>";
+
+                                        // Recursively display subfolders
+                                        display_folder_options($folder_id, $client_id, $indent + 1);
+                                    }
+                                }
+
+                                // Start displaying folder options from the root (parent_folder = 0)
+                                display_folder_options(0, $client_id);
+                                ?>
                             </select>
                         </div>
                     </div>
 
-                    <label>Description</label>
                     <div class="form-group">
+                        <label for="descriptionInput">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">
+                            <input type="text" class="form-control" name="description" id="descriptionInput" placeholder="Short summary of the document">
                         </div>
                     </div>
                 </div>

client_document_bulk_move_modal.php

@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>Moving documents</strong></h5>
+                <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>
@@ -10,7 +10,7 @@
             <div class="modal-body bg-white">
 
                 <div class="form-group">
-                    <label>Move Document to</label>
+                    <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>
@@ -18,13 +18,64 @@
                         <select class="form-control select2" name="bulk_folder_id">
                             <option value="0">/</option>
                                 <?php
-                            $sql_folders_select = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                                // Fetch all folders for the client
-                            while ($row = mysqli_fetch_array($sql_folders_select)) {
+                                $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");
-                                $folder_id_select = intval($row['folder_id']);
+                                $folders = array();
-                                $folder_name_select = nullable_htmlentities($row['folder_name']);
+
-                                ?>
+                                // Build an associative array of folders indexed by folder_id
-                                <option value="<?php echo $folder_id_select ?>"><?php echo $folder_name_select; ?></option>
+                                while ($row = mysqli_fetch_assoc($sql_all_folders)) {
-                                <?php
+                                    $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>

client_document_details.php

@@ -46,12 +46,47 @@ $document_client_visible = intval($row['document_client_visible']);
     <li class="breadcrumb-item">
         <a href="client_documents.php?client_id=<?php echo $client_id; ?>">Documents</a>
     </li>
-    <?php if ($document_folder_id > 0) { ?>
+    <?php
+    // Build the full folder path
+    $folder_id = $document_folder_id;
+    $folder_path = array();
+
+    while ($folder_id > 0) {
+        $sql_folder = mysqli_query($mysqli, "SELECT folder_name, parent_folder FROM folders WHERE folder_id = $folder_id");
+        if ($row_folder = mysqli_fetch_assoc($sql_folder)) {
+            $folder_name = nullable_htmlentities($row_folder['folder_name']);
+            $parent_folder = intval($row_folder['parent_folder']);
+
+            // Prepend the folder to the beginning of the array
+            array_unshift($folder_path, array('folder_id' => $folder_id, 'folder_name' => $folder_name));
+
+            // Move up to the parent folder
+            $folder_id = $parent_folder;
+        } else {
+            // If the folder is not found, break the loop
+            break;
+        }
+    }
+
+    // Output breadcrumb items for each folder in the path
+    foreach ($folder_path as $folder) {
+        $bread_crumb_folder_id = $folder['folder_id']; // Sanitized before put in array
+        $bread_crumb_folder_name = $folder['folder_name']; // Sanitized before put in array
+        ?>
         <li class="breadcrumb-item">
-        <a href="client_documents.php?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $document_folder_id; ?>"><i class="fas fa-fw fa-folder-open mr-2"></i><?php echo $folder_name; ?></a>
+            <a href="client_documents.php?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $bread_crumb_folder_id; ?>">
+                <i class="fas fa-fw fa-folder-open mr-2"></i><?php echo $bread_crumb_folder_name; ?>
+            </a>
+        </li>
+        <?php
+    }
+    ?>
+    <li class="breadcrumb-item active">
+        <i class="fas fa-file"></i> <?php echo $document_name; ?> 
+        <?php if (!empty($document_archived_at)) { 
+            echo "<span class='text-danger ml-2'>(ARCHIVED on $document_archived_at)</span>"; 
+        } ?>
     </li>
-    <?php } ?>
-    <li class="breadcrumb-item active"><i class="fas fa-file"></i> <?php echo $document_name; ?> <?php if(!empty($document_archived_at)){ echo "<span class='text-danger ml-2'>(ARCHIVED on $document_archived_at)</span>"; } ?></li>
 </ol>
 
 <div class="row">
@@ -84,7 +119,7 @@ $document_client_visible = intval($row['document_client_visible']);
                     <tbody>
                         <?php
                         $sql_document_revisions = mysqli_query($mysqli, "SELECT * FROM documents
-                            LEFT JOIN users ON document_created_by = user_id
+                            LEFT JOIN users ON document_updated_by = user_id
                             WHERE document_parent = $document_parent
                             ORDER BY document_created_at ASC"
                         );
@@ -101,6 +136,9 @@ $document_client_visible = intval($row['document_client_visible']);
                                 $revision_document_description_display = "-";
                             }
                             $revision_document_author = nullable_htmlentities($row['user_name']);
+                            if (empty($revision_document_author)) {
+                                $revision_document_author = $document_created_by_name;
+                            }
                             $revision_document_created_date = date('Y-m-d', strtotime($row['document_created_at']));
 
                         ?>
@@ -174,7 +212,7 @@ $document_client_visible = intval($row['document_client_visible']);
                 </button>
             </h6>
             <?php
-            $sql_contacts = mysqli_query($mysqli, "SELECT * FROM contacts, contact_documents
+            $sql_contacts = mysqli_query($mysqli, "SELECT contacts.contact_id, contact_name FROM contacts, contact_documents
                 WHERE contacts.contact_id = contact_documents.contact_id 
                 AND contact_documents.document_id = $document_id
                 ORDER BY contact_name ASC"
@@ -205,7 +243,7 @@ $document_client_visible = intval($row['document_client_visible']);
                 </button>
             </h6>
             <?php
-            $sql_assets = mysqli_query($mysqli, "SELECT * FROM assets, asset_documents
+            $sql_assets = mysqli_query($mysqli, "SELECT assets.asset_id, asset_name FROM assets, asset_documents
                 WHERE assets.asset_id = asset_documents.asset_id
                 AND asset_documents.document_id = $document_id
                 ORDER BY asset_name ASC"
@@ -236,7 +274,7 @@ $document_client_visible = intval($row['document_client_visible']);
                 </button>
             </h6>
             <?php
-            $sql_software = mysqli_query($mysqli, "SELECT * FROM software, software_documents
+            $sql_software = mysqli_query($mysqli, "SELECT software.software_id, software_name FROM software, software_documents
                 WHERE software.software_id = software_documents.software_id 
                 AND software_documents.document_id = $document_id
                 ORDER BY software_name ASC"
@@ -267,7 +305,7 @@ $document_client_visible = intval($row['document_client_visible']);
                 </button>
             </h6>
             <?php
-            $sql_vendors = mysqli_query($mysqli, "SELECT * FROM vendors, vendor_documents
+            $sql_vendors = mysqli_query($mysqli, "SELECT vendors.vendor_id, vendor_name FROM vendors, vendor_documents
                 WHERE vendors.vendor_id = vendor_documents.vendor_id 
                 AND vendor_documents.document_id = $document_id
                 ORDER BY vendor_name ASC"

client_document_link_asset_modal.php

@@ -8,7 +8,6 @@
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
                 <div class="modal-body bg-white">
 

client_document_link_contact_modal.php

@@ -8,7 +8,6 @@
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
                 <div class="modal-body bg-white">
 

client_document_link_file_modal.php

@@ -8,7 +8,6 @@
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
                 <div class="modal-body bg-white">
 

client_document_link_software_modal.php

@@ -8,7 +8,6 @@
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
                 <div class="modal-body bg-white">
 
@@ -28,7 +27,7 @@
                                     $exclude_condition = "";  // No condition if there are no displayed vendors
                                 }
 
-                                $sql_software_select = mysqli_query($mysqli, "SELECT * FROM software
+                                $sql_software_select = mysqli_query($mysqli, "SELECT software_id, software_name FROM software
                                     WHERE software_client_id = $client_id 
                                     AND software_archived_at IS NULL
                                     $exclude_condition

client_document_link_vendor_modal.php

@@ -8,7 +8,6 @@
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
                 <div class="modal-body bg-white">
 
@@ -28,7 +27,7 @@
                                     $exclude_condition = "";  // No condition if there are no displayed vendors
                                 }
 
-                                $sql_vendors_select = mysqli_query($mysqli, "SELECT * FROM vendors 
+                                $sql_vendors_select = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors 
                                     WHERE vendor_client_id = $client_id 
                                     AND vendor_archived_at IS NULL
                                     $exclude_condition

client_document_move_modal.php

@@ -9,7 +9,6 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <div class="modal-body bg-white">
 
                     <div class="form-group">
@@ -21,13 +20,64 @@
                             <select class="form-control select2" name="folder">
                                 <option value="0">/</option>
                                 <?php
-                                $sql_folders_select = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                                // Fetch all folders for the client
-                                while ($row = mysqli_fetch_array($sql_folders_select)) {
+                                $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");
-                                    $folder_id_select = intval($row['folder_id']);
+                                $folders = array();
-                                    $folder_name_select = nullable_htmlentities($row['folder_name']);
+
-                                    ?>
+                                // Build an associative array of folders indexed by folder_id
-                                    <option <?php if ($folder_id_select == $document_folder_id) echo "selected"; ?> value="<?php echo $folder_id_select ?>"><?php echo $folder_name_select; ?></option>
+                                while ($row = mysqli_fetch_assoc($sql_all_folders)) {
-                                    <?php
+                                    $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'] == $document_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>

client_documents.php

@@ -6,6 +6,8 @@ $order = "ASC";
 
 require_once "inc_all_client.php";
 
+// Perms
+enforceUserPermission('module_support');
 
 // Folder
 if (!empty($_GET['folder_id'])) {
@@ -61,8 +63,32 @@ if ($get_folder_id == 0 && $_GET["q"]) {
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
+// Breadcrumbs
+// Build the full folder path
+$folder_id = $get_folder_id;
+$folder_path = array();
+
+while ($folder_id > 0) {
+    $sql_folder = mysqli_query($mysqli, "SELECT folder_name, parent_folder FROM folders WHERE folder_id = $folder_id");
+    if ($row_folder = mysqli_fetch_assoc($sql_folder)) {
+        $folder_name = nullable_htmlentities($row_folder['folder_name']);
+        $parent_folder = intval($row_folder['parent_folder']);
+
+        // Prepend the folder to the beginning of the array
+        array_unshift($folder_path, array('folder_id' => $folder_id, 'folder_name' => $folder_name));
+
+        // Move up to the parent folder
+        $folder_id = $parent_folder;
+    } else {
+        // If the folder is not found, break the loop
+        break;
+    }
+}
+
 ?>
 
+
+
     <div class="card card-dark">
         <div class="card-header py-2">
             <h3 class="card-title mt-2">
@@ -72,12 +98,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                 <div class="btn-group">
                     <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDocumentModal">
-                        <i class="fas fa-plus mr-2"></i>Create
+                        <i class="fas fa-plus mr-2"></i>New Document
                     </button>
                     <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                     <div class="dropdown-menu">
                         <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#createFolderModal">
-                            <i class="fa fa-fw fa-folder-plus mr-2"></i>Folder
+                            <i class="fa fa-fw fa-folder-plus mr-2"></i>New Folder
                         </a>
                         <div class="dropdown-divider"></div>
                         <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addDocumentFromTemplateModal">From Template</a>
@@ -87,95 +113,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             </div>
 
         </div>
+
+        
+        
         <div class="card-body">
-            <div class="row">
-                <div class="col-md-3 border-right mb-3">
-                    <h4>Folders</h4>
-                    <hr>
-                    <ul class="nav nav-pills flex-column bg-light">
-                        <li class="nav-item">
-                            <div class="row">
-                                <div class="col-10">
-                                    
-                                    <?php
-                                    // Get a count of documents that have no folder
-                                    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_folder_id = 0 AND document_client_id = $client_id AND document_archived_at IS NULL"));
-                                    $num_documents = intval($row['num']);
-                                    ?>
-                                    <a class="nav-link <?php if ($get_folder_id == 0) { echo "active"; } ?>" href="?client_id=<?php echo $client_id; ?>&folder_id=0">/ <?php if ($num_documents > 0) { echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_documents</span>"; } ?></a>
-                                </div>
-                                <div class="col-2">
-                                </div>
-                            </div>
-                        </li>
-                        <?php
-                        $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
-                        while ($row = mysqli_fetch_array($sql_folders)) {
-                            $folder_id = intval($row['folder_id']);
-                            $folder_name = nullable_htmlentities($row['folder_name']);
-
-                            $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_folder_id = $folder_id AND document_archived_at IS NULL"));
-                            $num_documents = intval($row['num']);
-
-                            ?>
-
-                            <li class="nav-item">
-                                <div class="row">
-                                    <div class="col-10">
-                                        <a class="nav-link <?php if ($get_folder_id == $folder_id) { echo "active"; } ?> " href="?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $folder_id; ?>">
-                                            <?php
-                                            if ($get_folder_id == $folder_id) { ?>
-                                                <i class="fas fa-fw fa-folder-open"></i>
-                                            <?php } else { ?>
-                                                <i class="fas fa-fw fa-folder"></i>
-                                            <?php } ?>
-
-                                            <?php echo $folder_name; ?> <?php if ($num_documents > 0) { echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_documents</span>"; } ?>
-                                        </a>
-                                    </div>
-                                    <div class="col-2">
-                                        <div class="dropdown">
-                                            <button class="btn btn-sm" type="button" data-toggle="dropdown">
-                                                <i class="fas fa-ellipsis-v"></i>
-                                            </button>
-                                            <div class="dropdown-menu">
-                                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#renameFolderModal<?php echo $folder_id; ?>">
-                                                    <i class="fas fa-fw fa-edit mr-2"></i>Rename
-                                                </a>
-                                                <?php if ($session_user_role == 3 && $num_documents == 0) { ?>
-                                                    <div class="dropdown-divider"></div>
-                                                    <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_folder=<?php echo $folder_id; ?>">
-                                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                                    </a>
-                                                <?php } ?>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </li>
-
-                            <?php
-                            require "folder_rename_modal.php";
-
-
-                        }
-                        ?>
-                    </ul>
-                    <?php require_once "folder_create_modal.php";
- ?>
-                </div>
-
-                <div class="col-md-9">
             <form autocomplete="off">
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <input type="hidden" name="folder_id" value="<?php echo $get_folder_id; ?>">
                 <div class="row">
                     <div class="col-md-4">
                         <div class="input-group mb-3 mb-md-0">
-                                    <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Documents">
+                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search documents in <?php if($get_folder_id == 0) { echo "all folders"; } else { echo "current folder"; } ?>">
                             <div class="input-group-append">
                                 <button class="btn btn-dark"><i class="fa fa-search"></i></button>
                             </div>
+
                         </div>
                     </div>
                     <div class="col-md-8">
@@ -188,6 +140,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkMoveDocumentModal">
                                         <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
                                     </a>
+                                    <div class="dropdown-divider"></div>
+                                    <button class="dropdown-item text-danger text-bold"
+                                            type="submit" form="bulkActions" name="bulk_delete_documents">
+                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                    </button>
                                 </div>
                             </div>
                         </div>
@@ -197,6 +154,167 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             
             <hr>
 
+
+            <div class="row">
+                <div class="col-md-3 border-right mb-3">
+                    <h4>Folders</h4>
+                    <hr>
+                    <ul class="nav nav-pills flex-column bg-light">
+                        <li class="nav-item">
+                            <div class="row">
+                                <div class="col-10">
+                                    <?php
+                                    // Get a count of documents that have no folder
+                                    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_folder_id = 0 AND document_client_id = $client_id AND document_archived_at IS NULL"));
+                                    $num_documents = intval($row['num']);
+                                    ?>
+                                    <a class="nav-link <?php if ($get_folder_id == 0) { echo "active"; } ?>" href="?client_id=<?php echo $client_id; ?>&folder_id=0">
+                                        / <?php if ($num_documents > 0) { echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_documents</span>"; } ?>
+                                    </a>
+                                </div>
+                                <div class="col-2">
+                                </div>
+                            </div>
+                        </li>
+                        <?php
+                        // Function to check if a folder is an ancestor of the current folder
+                        function is_ancestor_folder($folder_id, $current_folder_id, $client_id) {
+                            global $mysqli;
+
+                            // Base case: if current_folder_id is 0 or equal to folder_id
+                            if ($current_folder_id == 0) {
+                                return false;
+                            }
+                            if ($current_folder_id == $folder_id) {
+                                return true;
+                            }
+
+                            // Get the parent folder of the current folder
+                            $result = mysqli_query($mysqli, "SELECT parent_folder FROM folders WHERE folder_id = $current_folder_id AND folder_client_id = $client_id");
+                            if ($row = mysqli_fetch_assoc($result)) {
+                                $parent_folder_id = intval($row['parent_folder']);
+                                // Recursive call to check the parent folder
+                                return is_ancestor_folder($folder_id, $parent_folder_id, $client_id);
+                            } else {
+                                // Folder not found
+                                return false;
+                            }
+                        }
+
+                        // Recursive function to display folders and subfolders
+                        function display_folders($parent_folder_id, $client_id, $indent = 0) {
+                            global $mysqli, $get_folder_id, $session_user_role;
+
+                            $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_location = 0 AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                            while ($row = mysqli_fetch_array($sql_folders)) {
+                                $folder_id = intval($row['folder_id']);
+                                $folder_name = nullable_htmlentities($row['folder_name']);
+
+                                // Get the number of documents in the folder
+                                $row2 = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_folder_id = $folder_id AND document_archived_at IS NULL"));
+                                $num_documents = intval($row2['num']);
+
+                                // Get the number of subfolders
+                                $subfolder_result = mysqli_query($mysqli, "SELECT COUNT(*) AS count FROM folders WHERE parent_folder = $folder_id AND folder_client_id = $client_id");
+                                $subfolder_count = intval(mysqli_fetch_assoc($subfolder_result)['count']);
+
+                                echo '<li class="nav-item">';
+                                echo '<div class="row">';
+                                echo '<div class="col-10">';
+                                echo '<a class="nav-link ';
+                                if ($get_folder_id == $folder_id) { echo "active"; }
+                                echo '" href="?client_id=' . $client_id . '&folder_id=' . $folder_id . '">';
+
+                                // Indentation for subfolders
+                                echo str_repeat('&nbsp;', $indent * 4);
+
+                                // Determine if the folder is open
+                                if ($get_folder_id == $folder_id || is_ancestor_folder($folder_id, $get_folder_id, $client_id)) {
+                                    echo '<i class="fas fa-fw fa-folder-open"></i>';
+                                } else {
+                                    echo '<i class="fas fa-fw fa-folder"></i>';
+                                }
+
+                                echo ' ' . $folder_name;
+
+                                if ($num_documents > 0) {
+                                    echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_documents</span>";
+                                }
+
+                                echo '</a>';
+                                echo '</div>';
+                                echo '<div class="col-2">';
+                                ?>
+                                <div class="dropdown">
+                                    <button class="btn btn-sm" type="button" data-toggle="dropdown">
+                                        <i class="fas fa-ellipsis-v"></i>
+                                    </button>
+                                    <div class="dropdown-menu">
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#renameFolderModal<?php echo $folder_id; ?>">
+                                            <i class="fas fa-fw fa-edit mr-2"></i>Rename
+                                        </a>
+                                        <?php
+                                        // Only show delete option if user is admin, folder has no documents, and no subfolders
+                                        if ($session_user_role == 3 && $num_documents == 0 && $subfolder_count == 0) { ?>
+                                            <div class="dropdown-divider"></div>
+                                            <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_folder=<?php echo $folder_id; ?>">
+                                                <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                            </a>
+                                        <?php } ?>
+                                    </div>
+                                </div>
+                                <?php
+                                echo '</div>';
+                                echo '</div>';
+
+                                // Include the rename and create subfolder modals
+                                require "folder_rename_modal.php";
+
+                                if ($subfolder_count > 0) {
+                                    // Display subfolders
+                                    echo '<ul class="nav nav-pills flex-column bg-light">';
+                                    display_folders($folder_id, $client_id, $indent + 1);
+                                    echo '</ul>';
+                                }
+
+                                echo '</li>';
+                            }
+                        }
+
+                        // Start displaying folders from the root (parent_folder = 0)
+                        display_folders(0, $client_id);
+                        ?>
+                    </ul>
+                    <?php require_once "folder_create_modal.php"; ?>
+                </div>
+
+                <div class="col-md-9">
+
+                    <nav>
+                        <ol class="breadcrumb">
+                            <li class="breadcrumb-item">
+                                <a href="?client_id=<?php echo $client_id; ?>&folder_id=0">
+                                    <i class="fas fa-fw fa-folder mr-2"></i>Root
+                                </a>
+                            </li>
+                            <?php
+                            // Output breadcrumb items for each folder in the path
+                            foreach ($folder_path as $folder) {
+                                $bread_crumb_folder_id = $folder['folder_id']; // Already Sanitized before it was pushed into array
+                                $bread_crumb_folder_name = $folder['folder_name']; // Already Sanitized before it was pushed into array
+
+                                ?>
+                                <li class="breadcrumb-item">
+                                    <a href="?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $bread_crumb_folder_id; ?>">
+                                        <i class="fas fa-fw fa-folder-open mr-2"></i><?php echo $bread_crumb_folder_name; ?>
+                                    </a>
+                                </li>
+                                <?php
+                            }
+                            ?>
+                        </ol>
+                    </nav>
+    
                     <form id="bulkActions" action="post.php" method="post">
                         <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
@@ -210,18 +328,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         </div>
                                     </td>
                                     <th>
-                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_name&order=<?php echo $disp; ?>">Name</a>
+                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_name&order=<?php echo $disp; ?>">
+                                            Name <?php if ($sort == 'document_name') { echo $order_icon; } ?>
+                                        </a>
                                     </th>
                                     <th>
-                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_created_at&order=<?php echo $disp; ?>">Created</a>
+                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_created_at&order=<?php echo $disp; ?>">
+                                            Created <?php if ($sort == 'document_created_at') { echo $order_icon; } ?>
+                                        </a>
                                     </th>
                                     <th>
-                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_updated_at&order=<?php echo $disp; ?>">Last Update</a>
+                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=document_updated_at&order=<?php echo $disp; ?>">
+                                            Last Update <?php if ($sort == 'document_updated_at') { echo $order_icon; } ?>
+                                        </a>
                                     </th>
                                     <th></th>
-                                    <th class="text-center">
+                                    <th class="text-center">Action</th>
-                                        Action
-                                    </th>
                                 </tr>
                                 </thead>
                                 <tbody>
@@ -256,6 +378,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     $item_type = nullable_htmlentities($row['item_type']);
                                     $item_related_id = intval($row['item_related_id']);
                                     $item_note = nullable_htmlentities($row['item_note']);
+                                    $item_recipient = nullable_htmlentities($row['item_recipient']);
                                     $item_views = nullable_htmlentities($row['item_views']);
                                     $item_view_limit = nullable_htmlentities($row['item_view_limit']);
                                     $item_created_at = nullable_htmlentities($row['item_created_at']);
@@ -280,9 +403,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         </td>
                                         <td><?php echo $document_updated_at; ?></td>
                                         <td>
-                                            <?php if($item_id) { ?>
+                                            <?php if (mysqli_num_rows($sql_shared) > 0) { ?>
-                                            <div title="Expires <?php echo $item_expire_at_human; ?>">
+                                                <div class="media" title="Expires <?php echo $item_expire_at_human; ?>">
-                                                <i class="fas fa-fw fa-link"></i> Shared
+                                                    <i class="fas fa-link mr-2 mt-1"></i>
+                                                    <div class="media-body">Shared
+                                                        <br>
+                                                        <small class="text-secondary"><?php echo $item_recipient; ?></small>
+                                                    </div>
                                                 </div>
                                             <?php } ?>
                                         </td>

client_domain_edit_modal.php

@@ -26,7 +26,7 @@
 
                     <hr>
 
-                    <div class="tab-content">
+                    <div class="tab-content" <?php if (lookupUserPermission('module_support') <= 1) { echo 'inert'; } ?>>
 
                         <div class="tab-pane fade show active" id="pills-overview">
 

client_domains.php

@@ -6,6 +6,8 @@ $order = "ASC";
 
 require_once "inc_all_client.php";
 
+// Perms
+enforceUserPermission('module_support');
 
 //Rebuild URL
 $url_query_strings_sort = http_build_query($get_copy);
@@ -109,12 +111,36 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
                                 </div>
                             </td>
-                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=domain_name&order=<?php echo $disp; ?>">Domain</a></th>
+                            <th>
-                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=registrar_name&order=<?php echo $disp; ?>">Registrar</a></th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=domain_name&order=<?php echo $disp; ?>">
-                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=webhost_name&order=<?php echo $disp; ?>">Web Host</a></th>
+                                    Domain <?php if ($sort == 'domain_name') { echo $order_icon; } ?>
-                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=dnshost_name&order=<?php echo $disp; ?>">DNS Host</a></th>
+                                </a>
-                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=mailhost_name&order=<?php echo $disp; ?>">Mail Host</a></th>
+                            </th>
-                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=domain_expire&order=<?php echo $disp; ?>">Expires</a></th>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=registrar_name&order=<?php echo $disp; ?>">
+                                    Registrar <?php if ($sort == 'registrar_name') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=webhost_name&order=<?php echo $disp; ?>">
+                                    Web Host <?php if ($sort == 'webhost_name') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=dnshost_name&order=<?php echo $disp; ?>">
+                                    DNS Host <?php if ($sort == 'dnshost_name') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=mailhost_name&order=<?php echo $disp; ?>">
+                                    Mail Host <?php if ($sort == 'mailhost_name') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=domain_expire&order=<?php echo $disp; ?>">
+                                    Expires <?php if ($sort == 'domain_expire') { echo $order_icon; } ?>
+                                </a>
+                            </th>
                             <th class="text-center">Action</th>
                         </tr>
                         </thead>

client_edit_modal.php

@@ -2,7 +2,7 @@
     <div class="modal-dialog">
         <div class="modal-content bg-dark">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-user-edit mr-2"></i>Editing: <strong>
+                <h5 class="modal-title"><i class="fa fa-fw fa-user-edit mr-2"></i>Editing Client: <strong>
                         <?php echo $client_name; ?>
                     </strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
@@ -30,7 +30,7 @@
                         </li>
                         <?php } ?>
                         <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-client-more<?php echo $client_id; ?>">More</a>
+                            <a class="nav-link" data-toggle="pill" href="#pills-client-notes<?php echo $client_id; ?>">Notes</a>
                         </li>
                     </ul>
 
@@ -41,13 +41,28 @@
                         <div class="tab-pane fade show active" id="pills-client-details<?php echo $client_id; ?>">
 
                             <div class="form-group">
-                                <label>Name <strong class="text-danger">*</strong></label>
+                                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Is Lead</span></label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
                                     </div>
                                     <input type="text" class="form-control" name="name" placeholder="Name or Company"
                                         value="<?php echo $client_name; ?>" required>
+                                    <div class="input-group-append">
+                                        <div class="input-group-text">
+                                            <input type="checkbox" name="lead" value="1" <?php if($client_is_lead == 1){ echo "checked"; } ?>>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Shortened Name</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="abbreviation" placeholder="Shortned name for client - Max chars 6" value="<?php echo $client_abbreviation; ?>" maxlength="6" oninput="this.value = this.value.toUpperCase()">
                                 </div>
                             </div>
 
@@ -101,13 +116,23 @@
                             </div>
 
                             <div class="form-group">
-                                <label>Is Lead <strong class="text-danger">*</strong></label>
+                                <label>Tags</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
-                                        <input type="checkbox" name="lead" value="1"<?php if ($client_is_lead == 1) {
+                                        <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
-                                            echo "checked";
-                                        } ?>>
                                     </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 = 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 if (in_array($tag_id_select, $client_tag_id_array)) { echo "selected"; } ?>><?php echo $tag_name_select; ?></option>
+                                        <?php } ?>
+
+                                    </select>
                                 </div>
                             </div>
 
@@ -182,44 +207,13 @@
 
                         <?php } ?>
 
-                        <div class="tab-pane fade" id="pills-client-more<?php echo $client_id; ?>">
+                        <div class="tab-pane fade" id="pills-client-notes<?php echo $client_id; ?>">
 
                             <div class="form-group">
-                                <label>Abbreviation</label>
+                                <textarea class="form-control" rows="10" placeholder="Enter some notes"
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="abbreviation" placeholder="Abbreviated name for client" value="<?php echo $client_abbreviation; ?>" maxlength="6" oninput="this.value = this.value.toUpperCase()">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <textarea class="form-control" rows="8" placeholder="Enter some notes"
                                     name="notes"><?php echo $client_notes; ?></textarea>
                             </div>
 
-                            <div class="form-group">
-                                <label>Tags</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="tags[]" data-placeholder="Add some tags" multiple>
-                                        <?php
-
-                                        $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 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 if (in_array($tag_id_select, $client_tag_id_array)) { echo "selected"; } ?>><?php echo $tag_name_select; ?></option>
-                                        <?php } ?>
-
-                                    </select>
-                                </div>
-                            </div>
-
                         </div>
 
                     </div>

client_events.php

@@ -9,8 +9,6 @@ if (isset($_GET['calendar_id'])) {
 
 ?>
 
-<link href='plugins/fullcalendar-6.1.10/dist/index.global.js' rel='stylesheet' />
-
 <!-- So that when hovering over a created event it turns into a hand instead of cursor -->
 <style>
     .fc-event {
@@ -49,7 +47,7 @@ while ($row = mysqli_fetch_array($sql)) {
 
 ?>
 
-<script src='plugins/fullcalendar-6.1.10/dist/index.global.js'></script>
+<script src='plugins/fullcalendar/dist/index.global.js'></script>
 
 <script>
     document.addEventListener('DOMContentLoaded', function() {
@@ -133,7 +131,7 @@ while ($row = mysqli_fetch_array($sql)) {
                     $event_start = json_encode($row['invoice_date']);
 
 
-                    echo "{ id: $event_id, title: $event_title, start: $event_start, display: 'list-item', color: 'blue', url: 'invoice.php?invoice_id=$event_id' },";
+                    echo "{ id: $event_id, title: $event_title, start: $event_start, display: 'list-item', color: 'blue', url: 'invoice.php?client_id=$client_id&invoice_id=$event_id' },";
                 }
 
                 //Quotes Created
@@ -143,7 +141,7 @@ while ($row = mysqli_fetch_array($sql)) {
                     $event_title = json_encode($row['quote_prefix'] . $row['quote_number'] . " " . $row['quote_scope']);
                     $event_start = json_encode($row['quote_date']);
 
-                    echo "{ id: $event_id, title: $event_title, start: $event_start, display: 'list-item', color: 'purple', url: 'quote.php?quote_id=$event_id' },";
+                    echo "{ id: $event_id, title: $event_title, start: $event_start, display: 'list-item', color: 'purple', url: 'quote.php?client_id=$client_id&quote_id=$event_id' },";
                 }
 
                 //Tickets Created
@@ -177,7 +175,7 @@ while ($row = mysqli_fetch_array($sql)) {
                         $event_color = "black";
                     }
 
-                    echo "{ id: $event_id, title: $event_title, start: $event_start, color: '$event_color', url: 'ticket.php?ticket_id=$event_id' },";
+                    echo "{ id: $event_id, title: $event_title, start: $event_start, color: '$event_color', url: 'ticket.php?client_id=$client_id&ticket_id=$event_id' },";
                 }
 
                 // Recurring Tickets
@@ -235,7 +233,7 @@ while ($row = mysqli_fetch_array($sql)) {
                     $event_start = json_encode($row['ticket_schedule']);
 
 
-                    echo "{ id: $event_id, title: $event_title, start: $event_start, color: '$event_color', url: 'ticket.php?ticket_id=$event_id' },";
+                    echo "{ id: $event_id, title: $event_title, start: $event_start, color: '$event_color', url: 'ticket.php?client_id=$client_id&ticket_id=$event_id' },";
                 }
                 ?>
             ],

client_file_bulk_move_modal.php

@@ -15,16 +15,67 @@
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
                         </div>
-                        <select class="form-control" name="bulk_folder_id">
+                        <select class="form-control select2" name="bulk_folder_id">
                             <option value="0">/</option>
                                 <?php
-                            $sql_folders_select = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                                // Fetch all folders for the client
-                            while ($row = mysqli_fetch_array($sql_folders_select)) {
+                                $sql_all_folders = mysqli_query($mysqli, "SELECT folder_id, folder_name, parent_folder FROM folders WHERE folder_location = 1 AND folder_client_id = $client_id ORDER BY folder_name ASC");
-                                $folder_id_select = intval($row['folder_id']);
+                                $folders = array();
-                                $folder_name_select = nullable_htmlentities($row['folder_name']);
+
-                                ?>
+                                // Build an associative array of folders indexed by folder_id
-                                <option value="<?php echo $folder_id_select ?>"><?php echo $folder_name_select; ?></option>
+                                while ($row = mysqli_fetch_assoc($sql_all_folders)) {
-                                <?php
+                                    $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>

client_file_link_asset_modal.php

@@ -8,7 +8,6 @@
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <input type="hidden" name="file_id" value="<?php echo $file_id; ?>">
                 <div class="modal-body bg-white">
 

client_file_move_modal.php

@@ -9,7 +9,6 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="file_id" value="<?php echo $file_id; ?>">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <div class="modal-body bg-white">
 
                     <div class="form-group">
@@ -18,16 +17,67 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
                             </div>
-                            <select class="form-control" name="folder_id">
+                            <select class="form-control select2" name="folder_id">
                                 <option value="0">/</option>
                                 <?php
-                                $sql_folders_select = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                                // Fetch all folders for the client
-                                while ($row = mysqli_fetch_array($sql_folders_select)) {
+                                $sql_all_folders = mysqli_query($mysqli, "SELECT folder_id, folder_name, parent_folder FROM folders WHERE folder_location = 1 AND folder_client_id = $client_id ORDER BY folder_name ASC");
-                                    $folder_id_select = intval($row['folder_id']);
+                                $folders = array();
-                                    $folder_name_select = nullable_htmlentities($row['folder_name']);
+
-                                    ?>
+                                // Build an associative array of folders indexed by folder_id
-                                    <option <?php if ($folder_id_select == $get_folder_id) echo "selected"; ?> value="<?php echo $folder_id_select ?>"><?php echo $folder_name_select; ?></option>
+                                while ($row = mysqli_fetch_assoc($sql_all_folders)) {
-                                    <?php
+                                    $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'] == $file_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>

client_file_rename_modal.php

@@ -9,18 +9,20 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="file_id" value="<?php echo $file_id; ?>">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <div class="modal-body bg-white">
 
                     <div class="form-group">
-                        <label>Name <strong class="text-danger">*</strong></label>
+                        <label>File 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-folder"></i></span>
                             </div>
                             <input type="text" class="form-control" name="file_name" placeholder="File Name" value="<?php echo $file_name; ?>" required>
                         </div>
-                        <label>Description <strong class="text-danger">*</strong></label>
+                    </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-folder"></i></span>

client_file_upload_modal.php

@@ -28,20 +28,37 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
                             </div>
-                            <select class="form-control" name="folder_id">
+                            <select class="form-control select2" name="folder_id">
                                 <option value="0">/</option>
                                 <?php
-                                $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                                // Recursive function to display folder options
+                                function display_folder_options($parent_folder_id, $client_id, $indent = 0) {
+                                    global $mysqli;
+
+                                    $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_location = 1 AND folder_client_id = $client_id ORDER BY folder_name ASC");
                                     while ($row = mysqli_fetch_array($sql_folders)) {
                                         $folder_id = intval($row['folder_id']);
                                         $folder_name = nullable_htmlentities($row['folder_name']);
 
-                                    ?>
+                                        // Indentation for subfolders
-                                    <option <?php if (isset($_GET['folder_id']) && $_GET['folder_id'] == $folder_id) echo "selected"; ?> value="<?php echo $folder_id ?>"><?php echo $folder_name; ?></option>
+                                        $indentation = str_repeat('&nbsp;', $indent * 4);
-                                    <?php
-                                }
-                                ?>
 
+                                        // Check if this folder is selected
+                                        $selected = '';
+                                        if ((isset($_GET['folder_id']) && $_GET['folder_id'] == $folder_id) || (isset($_POST['folder']) && $_POST['folder'] == $folder_id)) {
+                                            $selected = 'selected';
+                                        }
+
+                                        echo "<option value=\"$folder_id\" $selected>$indentation$folder_name</option>";
+
+                                        // Recursively display subfolders
+                                        display_folder_options($folder_id, $client_id, $indent + 1);
+                                    }
+                                }
+
+                                // Start displaying folder options from the root (parent_folder = 0)
+                                display_folder_options(0, $client_id);
+                                ?>
                             </select>
                         </div>
                     </div>

client_files.php

@@ -43,8 +43,8 @@ if ($get_folder_id == 0 && isset($_GET["q"])) {
     $sql = mysqli_query(
         $mysqli,
         "SELECT SQL_CALC_FOUND_ROWS * FROM files
+        LEFT JOIN users ON file_created_by = user_id
         WHERE file_client_id = $client_id
-        
         AND file_archived_at IS NULL
         AND (file_name LIKE '%$q%' OR file_ext LIKE '%$q%' OR file_description LIKE '%$q%')
         $query_images
@@ -54,6 +54,7 @@ if ($get_folder_id == 0 && isset($_GET["q"])) {
     $sql = mysqli_query(
         $mysqli,
         "SELECT SQL_CALC_FOUND_ROWS * FROM files
+        LEFT JOIN users ON file_created_by = user_id
         WHERE file_client_id = $client_id
         AND file_folder_id = $folder_id
         AND file_archived_at IS NULL
@@ -67,6 +68,28 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 $num_of_files = mysqli_num_rows($sql);
 
+// Breadcrumbs
+// Build the full folder path
+$folder_id = $get_folder_id;
+$folder_path = array();
+
+while ($folder_id > 0) {
+    $sql_folder = mysqli_query($mysqli, "SELECT folder_name, parent_folder FROM folders WHERE folder_id = $folder_id");
+    if ($row_folder = mysqli_fetch_assoc($sql_folder)) {
+        $folder_name = nullable_htmlentities($row_folder['folder_name']);
+        $parent_folder = intval($row_folder['parent_folder']);
+
+        // Prepend the folder to the beginning of the array
+        array_unshift($folder_path, array('folder_id' => $folder_id, 'folder_name' => $folder_name));
+
+        // Move up to the parent folder
+        $folder_id = $parent_folder;
+    } else {
+        // If the folder is not found, break the loop
+        break;
+    }
+}
+
 ?>
 
 <div class="card card-dark">
@@ -77,12 +100,12 @@ $num_of_files = mysqli_num_rows($sql);
         <div class="card-tools">
             <div class="btn-group">
                 <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#uploadFilesModal">
-                    <i class="fas fa-fw fa-cloud-upload-alt mr-2"></i>Upload
+                    <i class="fas fa-fw fa-cloud-upload-alt mr-2"></i>Upload File
                 </button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
                     <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#createFolderModal">
-                        <i class="fa fa-fw fa-folder-plus mr-2"></i>Create Folder
+                        <i class="fa fa-fw fa-folder-plus mr-2"></i>New Folder
                     </a>
                 </div>
             </div>
@@ -99,31 +122,74 @@ $num_of_files = mysqli_num_rows($sql);
                         <a class="nav-link <?php if ($get_folder_id == 0) { echo "active"; } ?>" href="?client_id=<?php echo $client_id; ?>&folder_id=0">/</a>
                     </li>
                     <?php
-                    $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = $folder_location AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                    // Function to check if a folder is an ancestor of the current folder
+                    function is_ancestor_folder($folder_id, $current_folder_id, $client_id) {
+                        global $mysqli;
+
+                        // Base case: if current_folder_id is 0 or equal to folder_id
+                        if ($current_folder_id == 0) {
+                            return false;
+                        }
+                        if ($current_folder_id == $folder_id) {
+                            return true;
+                        }
+
+                        // Get the parent folder of the current folder
+                        $result = mysqli_query($mysqli, "SELECT parent_folder FROM folders WHERE folder_id = $current_folder_id AND folder_client_id = $client_id");
+                        if ($row = mysqli_fetch_assoc($result)) {
+                            $parent_folder_id = intval($row['parent_folder']);
+                            // Recursive call to check the parent folder
+                            return is_ancestor_folder($folder_id, $parent_folder_id, $client_id);
+                        } else {
+                            // Folder not found
+                            return false;
+                        }
+                    }
+
+                    // Recursive function to display folders and subfolders
+                    function display_folders($parent_folder_id, $client_id, $indent = 0) {
+                        global $mysqli, $get_folder_id, $session_user_role;
+
+                        $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_location = 1 AND folder_client_id = $client_id ORDER BY folder_name ASC");
                         while ($row = mysqli_fetch_array($sql_folders)) {
                             $folder_id = intval($row['folder_id']);
                             $folder_name = nullable_htmlentities($row['folder_name']);
 
-                        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files WHERE file_archived_at IS NULL AND file_folder_id = $folder_id"));
+                            // Get the number of files in the folder
-                        $num_files = intval($row['num']);
+                            $row2 = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files WHERE file_folder_id = $folder_id AND file_archived_at IS NULL"));
+                            $num_files = intval($row2['num']);
 
+                            // Get the number of subfolders
+                            $subfolder_result = mysqli_query($mysqli, "SELECT COUNT(*) AS count FROM folders WHERE parent_folder = $folder_id AND folder_client_id = $client_id");
+                            $subfolder_count = intval(mysqli_fetch_assoc($subfolder_result)['count']);
+
+                            echo '<li class="nav-item">';
+                            echo '<div class="row">';
+                            echo '<div class="col-10">';
+                            echo '<a class="nav-link ';
+                            if ($get_folder_id == $folder_id) { echo "active"; }
+                            echo '" href="?client_id=' . $client_id . '&folder_id=' . $folder_id . '">';
+
+                            // Indentation for subfolders
+                            echo str_repeat('&nbsp;', $indent * 4);
+
+                            // Determine if the folder is open
+                            if ($get_folder_id == $folder_id || is_ancestor_folder($folder_id, $get_folder_id, $client_id)) {
+                                echo '<i class="fas fa-fw fa-folder-open"></i>';
+                            } else {
+                                echo '<i class="fas fa-fw fa-folder"></i>';
+                            }
+
+                            echo ' ' . $folder_name;
+
+                            if ($num_files > 0) {
+                                echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_files</span>";
+                            }
+
+                            echo '</a>';
+                            echo '</div>';
+                            echo '<div class="col-2">';
                             ?>
-
-                        <li class="nav-item">
-                            <div class="row">
-                                <div class="col-10">
-                                    <a class="nav-link <?php if ($get_folder_id == $folder_id) { echo "active"; } ?> " href="?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $folder_id; ?>&view=<?php echo $view; ?>">
-                                        <?php
-                                        if ($get_folder_id == $folder_id) { ?>
-                                            <i class="fas fa-fw fa-folder-open"></i>
-                                        <?php } else { ?>
-                                            <i class="fas fa-fw fa-folder"></i>
-                                        <?php } ?>
-
-                                        <?php echo $folder_name; ?> <?php if ($num_files > 0) { echo "<span class='badge badge-pill badge-dark float-right mt-1'>$num_files</span>"; } ?>
-                                    </a>
-                                </div>
-                                <div class="col-2">
                             <div class="dropdown">
                                 <button class="btn btn-sm" type="button" data-toggle="dropdown">
                                     <i class="fas fa-ellipsis-v"></i>
@@ -132,7 +198,9 @@ $num_of_files = mysqli_num_rows($sql);
                                     <a class="dropdown-item" href="#" data-toggle="modal" data-target="#renameFolderModal<?php echo $folder_id; ?>">
                                         <i class="fas fa-fw fa-edit mr-2"></i>Rename
                                     </a>
-                                            <?php if ($session_user_role == 3 && $num_files == 0) { ?>
+                                    <?php
+                                    // Only show delete option if user is admin, folder has no files, and no subfolders
+                                    if ($session_user_role == 3 && $num_files == 0 && $subfolder_count == 0) { ?>
                                         <div class="dropdown-divider"></div>
                                         <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_folder=<?php echo $folder_id; ?>">
                                             <i class="fas fa-fw fa-trash mr-2"></i>Delete
@@ -140,21 +208,32 @@ $num_of_files = mysqli_num_rows($sql);
                                     <?php } ?>
                                 </div>
                             </div>
-                                </div>
-                            </div>
-                        </li>
-
                             <?php
+                            echo '</div>';
+                            echo '</div>';
+
+                            // Include the rename and create subfolder modals
                             require "folder_rename_modal.php";
 
-
+                            if ($subfolder_count > 0) {
+                                // Display subfolders
+                                echo '<ul class="nav nav-pills flex-column bg-light">';
+                                display_folders($folder_id, $client_id, $indent + 1);
+                                echo '</ul>';
                             }
+
+                            echo '</li>';
+                        }
+                    }
+
+                    // Start displaying folders from the root (parent_folder = 0)
+                    display_folders(0, $client_id);
                     ?>
                 </ul>
-                <?php require_once "folder_create_modal.php";
+                <?php require_once "folder_create_modal.php"; ?>
- ?>
             </div>
 
+
             <div class="col-md-9">
 
                 <form autocomplete="off">
@@ -162,15 +241,15 @@ $num_of_files = mysqli_num_rows($sql);
                     <input type="hidden" name="view" value="<?php echo $view; ?>">
                     <input type="hidden" name="folder_id" value="<?php echo $get_folder_id; ?>">
                     <div class="row">
-                        <div class="col-md-4">
+                        <div class="col-md-5">
                             <div class="input-group mb-3 mb-md-0">
-                                <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Files">
+                                <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search for files in <?php if($get_folder_id == 0) { echo "all folders"; } else { echo "current folder"; } ?>">
                                 <div class="input-group-append">
                                     <button class="btn btn-dark"><i class="fa fa-search"></i></button>
                                 </div>
                             </div>
                         </div>
-                        <div class="col-md-8">
+                        <div class="col-md-7">
                             <div class="btn-group float-right">
                                 <a href="?<?php echo $url_query_strings_sort; ?>&view=0" class="btn <?php if($view == 0){ echo "btn-primary"; } else { echo "btn-outline-secondary"; } ?>"><i class="fas fa-list-ul"></i></a>
                                 <a href="?<?php echo $url_query_strings_sort; ?>&view=1" class="btn <?php if($view == 1){ echo "btn-primary"; } else { echo "btn-outline-secondary"; } ?>"><i class="fas fa-th-large"></i></a>
@@ -183,6 +262,11 @@ $num_of_files = mysqli_num_rows($sql);
                                         <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkMoveFilesModal">
                                             <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
                                         </a>
+                                        <div class="dropdown-divider"></div>
+                                        <button class="dropdown-item text-danger text-bold"
+                                                type="submit" form="bulkActions" name="bulk_delete_files">
+                                            <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                        </button>
                                     </div>
                                 </div>
 
@@ -191,6 +275,31 @@ $num_of_files = mysqli_num_rows($sql);
                     </div>
                 </form>
 
+                <nav class="mt-3">
+                    <ol class="breadcrumb">
+                        <li class="breadcrumb-item">
+                            <a href="?client_id=<?php echo $client_id; ?>&folder_id=0">
+                                <i class="fas fa-fw fa-folder mr-2"></i>Root
+                            </a>
+                        </li>
+                        <?php
+                        // Output breadcrumb items for each folder in the path
+                        foreach ($folder_path as $folder) {
+                            $bread_crumb_folder_id = $folder['folder_id']; // Already Sanitized before it was pushed into array
+                            $bread_crumb_folder_name = $folder['folder_name']; // Already Sanitized before it was pushed into array
+
+                            ?>
+                            <li class="breadcrumb-item">
+                                <a href="?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $bread_crumb_folder_id; ?>">
+                                    <i class="fas fa-fw fa-folder-open mr-2"></i><?php echo $bread_crumb_folder_name; ?>
+                                </a>
+                            </li>
+                            <?php
+                        }
+                        ?>
+                    </ol>
+                </nav>
+
                 <hr>
 
                 <?php
@@ -211,6 +320,10 @@ $num_of_files = mysqli_num_rows($sql);
                         $file_name = nullable_htmlentities($row['file_name']);
                         $file_reference_name = nullable_htmlentities($row['file_reference_name']);
                         $file_ext = nullable_htmlentities($row['file_ext']);
+                        $file_size = intval($row['file_size']);
+                        $file_size_KB = number_format($file_size / 1024);
+                        $file_mime_type = nullable_htmlentities($row['file_mime_type']);
+                        $file_uploaded_by = nullable_htmlentities($row['user_name']);
 
                         ?>
 
@@ -255,8 +368,26 @@ $num_of_files = mysqli_num_rows($sql);
                                         <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
                                     </div>
                                 </td>
-                                <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_name&order=<?php echo $disp; ?>">Name</a></th>
+                                <th>
-                                <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_created_at&order=<?php echo $disp; ?>">Uploaded</a></th>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_name&order=<?php echo $disp; ?>">
+                                        Name <?php if ($sort == 'file_name') { echo $order_icon; } ?>
+                                    </a>
+                                </th>
+                                <th>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_mime_type&order=<?php echo $disp; ?>">
+                                        Type <?php if ($sort == 'file_mime_type') { echo $order_icon; } ?>
+                                    </a>
+                                </th>
+                                <th>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_size&order=<?php echo $disp; ?>">
+                                        Size <?php if ($sort == 'file_size') { echo $order_icon; } ?>
+                                    </a>
+                                </th>
+                                <th>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=file_created_at&order=<?php echo $disp; ?>">
+                                        Uploaded <?php if ($sort == 'file_created_at') { echo $order_icon; } ?>
+                                    </a>
+                                </th>
                                 <th></th>
                                 <th class="text-center">Action</th>
                             </tr>
@@ -294,7 +425,12 @@ $num_of_files = mysqli_num_rows($sql);
                                 } else {
                                     $file_icon = "file";
                                 }
+                                $file_size = intval($row['file_size']);
+                                $file_size_KB = number_format($file_size / 1024);
+                                $file_mime_type = nullable_htmlentities($row['file_mime_type']);
+                                $file_uploaded_by = nullable_htmlentities($row['user_name']);
                                 $file_created_at = nullable_htmlentities($row['file_created_at']);
+                                $file_folder_id = intval($row['file_folder_id']);
                                 
                                 // Check if shared
                                 $sql_shared = mysqli_query(
@@ -315,6 +451,7 @@ $num_of_files = mysqli_num_rows($sql);
                                 $item_type = nullable_htmlentities($row['item_type']);
                                 $item_related_id = intval($row['item_related_id']);
                                 $item_note = nullable_htmlentities($row['item_note']);
+                                $item_recipient = nullable_htmlentities($row['item_recipient']);
                                 $item_views = nullable_htmlentities($row['item_views']);
                                 $item_view_limit = nullable_htmlentities($row['item_view_limit']);
                                 $item_created_at = nullable_htmlentities($row['item_created_at']);
@@ -330,9 +467,9 @@ $num_of_files = mysqli_num_rows($sql);
                                         </div>
                                     </td>
                                     <td>
-                                        <a href="<?php echo "uploads/clients/$client_id/$file_reference_name"; ?>" target="_blank" class="text-secondary">
+                                        <a href="<?php echo "uploads/clients/$client_id/$file_reference_name"; ?>" target="_blank">
                                             <div class="media">
-                                                <i class="fa fa-fw fa-2x fa-<?php echo $file_icon; ?> mr-3"></i>
+                                                <i class="fa fa-fw fa-2x fa-<?php echo $file_icon; ?> text-dark mr-3"></i>
                                                 <div class="media-body">
                                                     <p>
                                                         <?php echo basename($file_name); ?>
@@ -343,11 +480,20 @@ $num_of_files = mysqli_num_rows($sql);
                                             </div>
                                         </a>
                                     </td>
-                                    <td><?php echo $file_created_at; ?></td>
+                                    <td><?php echo $file_mime_type; ?></td>
+                                    <td><?php echo $file_size_KB; ?> KB</td>
                                     <td>
-                                        <?php if($item_id) { ?>
+                                        <?php echo $file_created_at; ?>
-                                        <div title="Expires <?php echo $item_expire_at_human; ?>">
+                                        <div class="text-secondary mt-1"><?php echo $file_uploaded_by; ?></div>        
-                                            <i class="fas fa-fw fa-link"></i> Shared
+                                    </td>
+                                    <td>
+                                        <?php if (mysqli_num_rows($sql_shared) > 0) { ?>
+                                            <div class="media" title="Expires <?php echo $item_expire_at_human; ?>">
+                                                <i class="fas fa-link mr-2 mt-1"></i>
+                                                <div class="media-body">Shared
+                                                    <br>
+                                                    <small class="text-secondary"><?php echo $item_recipient; ?></small>
+                                                </div>
                                             </div>
                                         <?php } ?>
                                     </td>

client_invoices.php

@@ -6,6 +6,8 @@ $order = "DESC";
 
 require_once "inc_all_client.php";
 
+// Perms
+enforceUserPermission('module_sales');
 
 //Rebuild URL
 $url_query_strings_sort = http_build_query($get_copy);
@@ -47,9 +49,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                 <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)) {
+                        <input type="search" class="form-control" name="q" 
-                                                                                        echo stripslashes(nullable_htmlentities($q));
+                            value="<?php if (isset($q)) {echo stripslashes(nullable_htmlentities($q)); } ?>"
-                                                                                    } ?>" placeholder="Search Invoices">
+                            placeholder="Search Invoices"
+                        >
                         <div class="input-group-append">
                             <button class="btn btn-dark"><i class="fa fa-search"></i></button>
                         </div>
@@ -71,17 +74,43 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <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) {
+                <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-                                            echo "d-none";
-                                        } ?>">
                 <tr>
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=invoice_number&order=<?php echo $disp; ?>">Number</a></th>
+                    <th>
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=invoice_scope&order=<?php echo $disp; ?>">Scope</a></th>
+                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=invoice_number&order=<?php echo $disp; ?>">
-                        <th class="text-right"><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=invoice_amount&order=<?php echo $disp; ?>">Amount</a></th>
+                            Number <?php if ($sort == 'invoice_number') { echo $order_icon; } ?>
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=invoice_date&order=<?php echo $disp; ?>">Date</a></th>
+                        </a>
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=invoice_due&order=<?php echo $disp; ?>">Due</a></th>
+                    </th>
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=category_name&order=<?php echo $disp; ?>">Category</a></th>
+                    <th>
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=invoice_status&order=<?php echo $disp; ?>">Status</a></th>
+                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=invoice_scope&order=<?php echo $disp; ?>">
+                            Scope <?php if ($sort == 'invoice_scope') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th class="text-right">
+                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=invoice_amount&order=<?php echo $disp; ?>">
+                            Amount <?php if ($sort == 'invoice_amount') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=invoice_date&order=<?php echo $disp; ?>">
+                            Date <?php if ($sort == 'invoice_date') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=invoice_due&order=<?php echo $disp; ?>">
+                            Due <?php if ($sort == 'invoice_due') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=category_name&order=<?php echo $disp; ?>">
+                            Category <?php if ($sort == 'category_name') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=invoice_status&order=<?php echo $disp; ?>">
+                            Status <?php if ($sort == 'invoice_status') { echo $order_icon; } ?>
+                        </a>
+                    </th>
                     <th class="text-center">Action</th>
                 </tr>
                 </thead>
@@ -132,7 +161,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     ?>
 
                         <tr>
-                            <td class="text-bold"><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
+                            <td class="text-bold"><a href="invoice.php?client_id=<?php echo $client_id; ?>&invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
                             <td><?php echo $invoice_scope_display; ?></td>
                             <td class="text-bold text-right"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
                             <td><?php echo $invoice_date; ?></td>

client_location_edit_modal.php

@@ -30,7 +30,7 @@
 
                     <hr>
 
-                    <div class="tab-content">
+                    <div class="tab-content" <?php if (lookupUserPermission('module_client') <= 1) { echo 'inert'; } ?>>
 
                         <div class="tab-pane fade show active" id="pills-details<?php echo $location_id; ?>">
 

client_locations.php

@@ -147,10 +147,26 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
                             </div>
                         </td>
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=location_name&order=<?php echo $disp; ?>">Name</a></th>
+                        <th>
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=location_address&order=<?php echo $disp; ?>">Address</a></th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=location_name&order=<?php echo $disp; ?>">
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=location_phone&order=<?php echo $disp; ?>">Phone</a></th>
+                                Name <?php if ($sort == 'location_name') { echo $order_icon; } ?>
-                        <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=location_hours&order=<?php echo $disp; ?>">Hours</a></th>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=location_address&order=<?php echo $disp; ?>">
+                                Address <?php if ($sort == 'location_address') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=location_phone&order=<?php echo $disp; ?>">
+                                Phone <?php if ($sort == 'location_phone') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=location_hours&order=<?php echo $disp; ?>">
+                                Hours <?php if ($sort == 'location_hours') { echo $order_icon; } ?>
+                            </a>
+                        </th>
                         <th class="text-center">Action</th>
                     </tr>
                     </thead>
@@ -209,7 +225,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             }
 
                             $location_tag_id_array[] = $location_tag_id;
-                            $location_tag_name_display_array[] = "<a href='client_locations.php?client_id=$client_id&q=$location_tag_name'><span class='badge text-light p-1 mr-1' style='background-color: $location_tag_color;'><i class='fa fa-fw fa-$location_tag_icon mr-2'></i>$location_tag_name</span></a>";
+                            $location_tag_name_display_array[] = "<a href='client_locations.php?client_id=$client_id&tags[]=$location_tag_id'><span class='badge text-light p-1 mr-1' style='background-color: $location_tag_color;'><i class='fa fa-fw fa-$location_tag_icon mr-2'></i>$location_tag_name</span></a>";
                         }
                         $location_tags_display = implode('', $location_tag_name_display_array);