From 6b6c70f1dff335a57751347f62dff518bc7969cc Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Tue, 23 Sep 2025 17:05:12 -0400
Subject: [PATCH] added extra ../ to href for css and js in header and footer
 to allow code to be placed deeper within the directory structure moved
 reports to /user/reports, this should also fix the new custom directories

---
 includes/footer.php                           | 34 +++++++++----------
 includes/header.php                           | 26 +++++++-------
 includes/top_nav.php                          | 14 ++++----
 modals/notifications.php                      |  4 +--
 user/includes/inc_all_reports.php             | 20 -----------
 user/includes/side_nav.php                    |  2 +-
 .../{report_budget.php => reports/budget.php} |  2 +-
 .../clients_with_balance.php}                 |  4 +--
 .../credential_rotation.php}                  |  2 +-
 .../expense_by_vendor.php}                    |  2 +-
 .../expense_summary.php}                      |  2 +-
 user/reports/includes/inc_all_reports.php     | 20 +++++++++++
 .../includes/reports_side_nav.php             | 28 +++++++--------
 .../income_by_client.php}                     |  4 +--
 .../income_summary.php}                       |  2 +-
 .../index.php}                                |  2 +-
 .../profit_loss.php}                          |  2 +-
 .../recurring_by_client.php}                  |  4 +--
 .../tax_summary.php}                          |  2 +-
 .../ticket_by_client.php}                     |  2 +-
 .../ticket_summary.php}                       |  2 +-
 .../tickets_unbilled.php}                     |  4 +--
 .../time_by_tech.php}                         |  2 +-
 23 files changed, 93 insertions(+), 93 deletions(-)
 delete mode 100644 user/includes/inc_all_reports.php
 rename user/{report_budget.php => reports/budget.php} (98%)
 rename user/{report_clients_with_balance.php => reports/clients_with_balance.php} (93%)
 rename user/{report_credential_rotation.php => reports/credential_rotation.php} (98%)
 rename user/{report_expense_by_vendor.php => reports/expense_by_vendor.php} (98%)
 rename user/{report_expense_summary.php => reports/expense_summary.php} (99%)
 create mode 100644 user/reports/includes/inc_all_reports.php
 rename user/{ => reports}/includes/reports_side_nav.php (63%)
 rename user/{report_income_by_client.php => reports/income_by_client.php} (94%)
 rename user/{report_income_summary.php => reports/income_summary.php} (99%)
 rename user/{report_overview.php => reports/index.php} (92%)
 rename user/{report_profit_loss.php => reports/profit_loss.php} (99%)
 rename user/{report_recurring_by_client.php => reports/recurring_by_client.php} (92%)
 rename user/{report_tax_summary.php => reports/tax_summary.php} (99%)
 rename user/{report_ticket_by_client.php => reports/ticket_by_client.php} (99%)
 rename user/{report_ticket_summary.php => reports/ticket_summary.php} (99%)
 rename user/{report_tickets_unbilled.php => reports/tickets_unbilled.php} (97%)
 rename user/{report_time_by_tech.php => reports/time_by_tech.php} (99%)

diff --git a/includes/footer.php b/includes/footer.php
index 8800ddac..ad30ac9d 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -19,27 +19,27 @@ if (basename(dirname($_SERVER['REQUEST_URI'])) === 'admin') { ?>
 <!-- REQUIRED SCRIPTS -->
 
 <!-- Bootstrap 4 -->
-<script src="../plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
+<script src="../../plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
 
 <!-- Custom js-->
-<script src="../plugins/moment/moment.min.js"></script>
-<script src="../plugins/chart.js/chart.umd.min.js"></script>
-<script src="../plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
-<script src="../plugins/daterangepicker/daterangepicker.js"></script>
-<script src="../plugins/select2/js/select2.min.js"></script>
-<script src="../plugins/inputmask/jquery.inputmask.min.js"></script>
-<script src="../plugins/tinymce/tinymce.min.js" referrerpolicy="origin"></script>
-<script src="../plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
-<script src="../plugins/clipboardjs/clipboard.min.js"></script>
-<script src="../js/keepalive.js"></script>
-<script src="../plugins/DataTables/datatables.min.js"></script>
-<script src="../plugins/intl-tel-input/js/intlTelInput.min.js"></script>
+<script src="../../plugins/moment/moment.min.js"></script>
+<script src="../../plugins/chart.js/chart.umd.min.js"></script>
+<script src="../../plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
+<script src="../../plugins/daterangepicker/daterangepicker.js"></script>
+<script src="../../plugins/select2/js/select2.min.js"></script>
+<script src="../../plugins/inputmask/jquery.inputmask.min.js"></script>
+<script src="../../plugins/tinymce/tinymce.min.js" referrerpolicy="origin"></script>
+<script src="../../plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
+<script src="../../plugins/clipboardjs/clipboard.min.js"></script>
+<script src="../../js/keepalive.js"></script>
+<script src="../../plugins/DataTables/datatables.min.js"></script>
+<script src="../../plugins/intl-tel-input/js/intlTelInput.min.js"></script>
 
 <!-- AdminLTE App -->
-<script src="../plugins/adminlte/js/adminlte.min.js"></script>
-<script src="../js/app.js"></script>
-<script src="../js/ajax_modal.js"></script>
-<script src="../js/confirm_modal.js"></script>
+<script src="../../plugins/adminlte/js/adminlte.min.js"></script>
+<script src="../../js/app.js"></script>
+<script src="../../js/ajax_modal.js"></script>
+<script src="../../js/confirm_modal.js"></script>
 
 </body>
 </html>
diff --git a/includes/header.php b/includes/header.php
index 835da821..83e7268b 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -20,26 +20,26 @@ header("X-Frame-Options: DENY");
 
     <!-- Favicon -->
     <?php if(file_exists('../uploads/favicon.ico')): ?>
-        <link rel="icon" type="image/x-icon" href="../uploads/favicon.ico">
+        <link rel="icon" type="image/x-icon" href="../../uploads/favicon.ico">
     <?php endif; ?>
 
     <!-- Font Awesome -->
-    <link rel="stylesheet" href="../plugins/fontawesome-free/css/all.min.css">
+    <link rel="stylesheet" href="../../plugins/fontawesome-free/css/all.min.css">
 
     <!-- Custom Styles -->
-    <link href="../plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
-    <link href="../plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
-    <link href="../plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
-    <link href="../plugins/daterangepicker/daterangepicker.css" rel="stylesheet">
-    <link href="../plugins/toastr/toastr.min.css" rel="stylesheet">
-    <link href="../plugins/DataTables/datatables.min.css" rel="stylesheet">
-    <link href="../plugins/intl-tel-input/css/intlTelInput.min.css" rel="stylesheet">
-    <link href="../css/itflow_custom.css" rel="stylesheet">
-    <link rel="stylesheet" href="../plugins/adminlte/css/adminlte.min.css">
+    <link href="../../plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
+    <link href="../../plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
+    <link href="../../plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
+    <link href="../../plugins/daterangepicker/daterangepicker.css" rel="stylesheet">
+    <link href="../../plugins/toastr/toastr.min.css" rel="stylesheet">
+    <link href="../../plugins/DataTables/datatables.min.css" rel="stylesheet">
+    <link href="../../plugins/intl-tel-input/css/intlTelInput.min.css" rel="stylesheet">
+    <link href="../../css/itflow_custom.css" rel="stylesheet">
+    <link rel="stylesheet" href="../../plugins/adminlte/css/adminlte.min.css">
 
     <!-- Scripts -->
-    <script src="../plugins/jquery/jquery.min.js"></script>
-    <script src="../plugins/toastr/toastr.min.js"></script>
+    <script src="../../plugins/jquery/jquery.min.js"></script>
+    <script src="../../plugins/toastr/toastr.min.js"></script>
 </head>
 <body class="
     hold-transition sidebar-mini layout-fixed layout-navbar-fixed 
diff --git a/includes/top_nav.php b/includes/top_nav.php
index 630ccf6b..1b99313b 100644
--- a/includes/top_nav.php
+++ b/includes/top_nav.php
@@ -12,7 +12,7 @@
     <ul class="navbar-nav ml-auto">
 
         <!-- SEARCH FORM -->
-        <form class="form-inline" action="../user/global_search.php">
+        <form class="form-inline" action="../../user/global_search.php">
             <div class="input-group input-group-sm">
                 <input class="form-control form-control-navbar" type="search" placeholder="Search everywhere" name="query"
                     value="<?php if (isset($_GET['query'])) { echo nullable_htmlentities($_GET['query']); } ?>">
@@ -64,7 +64,7 @@
         ?>
 
         <li class="nav-item">
-            <a class="nav-link ajax-modal" href="#" data-modal-url="../modals/notifications.php">
+            <a class="nav-link ajax-modal" href="#" data-modal-url="../../modals/notifications.php">
                 <i class="fas fa-bell"></i>
                 <?php if ($num_notifications) { ?>
                 <span class="badge badge-light badge-pill navbar-badge position-absolute" style="top: 1px; right: 3px;">
@@ -79,7 +79,7 @@
                 <?php if (empty($session_avatar)) { ?>
                 <i class="fas fa-user-circle mr-1"></i>
                 <?php }else{ ?>
-                <img src="<?php echo "../uploads/users/$session_user_id/$session_avatar"; ?>"
+                <img src="<?php echo "../../uploads/users/$session_user_id/$session_avatar"; ?>"
                     class="user-image img-circle">
                 <?php } ?>
                 <span
@@ -92,7 +92,7 @@
                     <i class="fas fa-user-circle fa-6x"></i>
                     <?php }else{ ?>
 
-                    <img src="<?php echo "../uploads/users/$session_user_id/$session_avatar"; ?>" class="img-circle">
+                    <img src="<?php echo "../../uploads/users/$session_user_id/$session_avatar"; ?>" class="img-circle">
                     <?php } ?>
                     <p>
                         <?php echo stripslashes(nullable_htmlentities($session_name)); ?>
@@ -102,10 +102,10 @@
                 <!-- Menu Footer-->
                 <li class="user-footer">
                     <?php if ($session_is_admin) { ?>
-                        <a href="../admin" class="btn btn-default btn-block btn-flat mb-2"><i class="fas fa-user-shield mr-2"></i>Administration</a>
+                        <a href="../../admin" class="btn btn-default btn-block btn-flat mb-2"><i class="fas fa-user-shield mr-2"></i>Administration</a>
                     <?php } ?>
-                    <a href="../user/user_details.php" class="btn btn-default btn-flat"><i class="fas fa-user-cog mr-2"></i>Account</a>
-                    <a href="post.php?logout" class="btn btn-default btn-flat float-right"><i class="fas fa-sign-out-alt mr-2"></i>Logout</a>
+                    <a href="../../user/user_details.php" class="btn btn-default btn-flat"><i class="fas fa-user-cog mr-2"></i>Account</a>
+                    <a href="../post.php?logout" class="btn btn-default btn-flat float-right"><i class="fas fa-sign-out-alt mr-2"></i>Logout</a>
                 </li>
             </ul>
         </li>
diff --git a/modals/notifications.php b/modals/notifications.php
index b2d961bd..dce12ddc 100644
--- a/modals/notifications.php
+++ b/modals/notifications.php
@@ -86,11 +86,11 @@ ob_start();
     ]; ?>" class="btn btn-primary">
         <span class="text-white text-bold"><i class="fas fa-check mr-2"></i>Dismiss all</span>
     </a>
-    <a href="notifications.php" class="btn btn-secondary">
+    <a href="../../user/notifications.php" class="btn btn-secondary">
         <span class="text-white">See all Notifications</span>
     </a>
     <?php } else { ?>
-    <a href="notifications.php?dismissed" class="btn btn-dark">
+    <a href="../../user/notifications.php?dismissed" class="btn btn-dark">
         <span class="text-white text-bold">See Dismissed Notifications</span>
     </a>
     <?php } ?>
diff --git a/user/includes/inc_all_reports.php b/user/includes/inc_all_reports.php
deleted file mode 100644
index 1a2ec280..00000000
--- a/user/includes/inc_all_reports.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-require_once "../config.php";
-require_once "../functions.php";
-require_once "../includes/router.php";
-require_once "../includes/check_login.php";
-require_once "../includes/page_title.php";
-// Reporting Perms
-enforceUserPermission('module_reporting');
-require_once "../includes/header.php";
-require_once "../includes/top_nav.php";
-require_once "includes/reports_side_nav.php";
-require_once "../includes/inc_wrapper.php";
-require_once "../includes/inc_alert_feedback.php";
-require_once "../includes/filter_header.php";
-
-// Set variable default values
-$largest_income_month = 0;
-$largest_invoice_month = 0;
-$recurring_total = 0;
diff --git a/user/includes/side_nav.php b/user/includes/side_nav.php
index 0ed1efb1..44d09ab1 100644
--- a/user/includes/side_nav.php
+++ b/user/includes/side_nav.php
@@ -188,7 +188,7 @@
 
                 <?php if (lookupUserPermission("module_reporting") >= 1) { ?>
                     <li class="nav-item mt-3">
-                        <a href="report_overview.php" class="nav-link">
+                        <a href="reports/" class="nav-link">
                             <i class="fas fa-chart-line nav-icon"></i>
                             <p>Reports</p>
                             <i class="fas fa-angle-right nav-icon float-right"></i>
diff --git a/user/report_budget.php b/user/reports/budget.php
similarity index 98%
rename from user/report_budget.php
rename to user/reports/budget.php
index f55e15a6..badad9ce 100644
--- a/user/report_budget.php
+++ b/user/reports/budget.php
@@ -103,5 +103,5 @@ $monthlyTotals = array_fill(1, 12, 0);  // Initialize monthly totals for each mo
     </div>
 </div>
 
-<?php require_once "../includes/footer.php";
+<?php require_once "../../includes/footer.php";
  ?>
\ No newline at end of file
diff --git a/user/report_clients_with_balance.php b/user/reports/clients_with_balance.php
similarity index 93%
rename from user/report_clients_with_balance.php
rename to user/reports/clients_with_balance.php
index 30abd2de..ce3f8fc1 100644
--- a/user/report_clients_with_balance.php
+++ b/user/reports/clients_with_balance.php
@@ -67,7 +67,7 @@ enforceUserPermission('module_financial');
                     ?>
 
                     <tr>
-                        <td><a href="invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
+                        <td><a href="../../user/invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
                         <td class="text-right"><?php echo numfmt_format_currency($currency_format, $balance, $session_company_currency); ?></td>
                     </tr>
                     <?php
@@ -81,5 +81,5 @@ enforceUserPermission('module_financial');
 </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
 
diff --git a/user/report_credential_rotation.php b/user/reports/credential_rotation.php
similarity index 98%
rename from user/report_credential_rotation.php
rename to user/reports/credential_rotation.php
index 10f5395c..be1e09d9 100644
--- a/user/report_credential_rotation.php
+++ b/user/reports/credential_rotation.php
@@ -71,5 +71,5 @@ $passwords_not_rotated_sql = mysqli_query($mysqli,
     </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
 
diff --git a/user/report_expense_by_vendor.php b/user/reports/expense_by_vendor.php
similarity index 98%
rename from user/report_expense_by_vendor.php
rename to user/reports/expense_by_vendor.php
index 9d0745fa..1488a2dc 100644
--- a/user/report_expense_by_vendor.php
+++ b/user/reports/expense_by_vendor.php
@@ -93,5 +93,5 @@ $sql_vendor_expenses = mysqli_query($mysqli, "
     </div>
 </div>
 
-<?php require_once "../includes/footer.php";
+<?php require_once "../../includes/footer.php";
  ?>
diff --git a/user/report_expense_summary.php b/user/reports/expense_summary.php
similarity index 99%
rename from user/report_expense_summary.php
rename to user/reports/expense_summary.php
index 727d9678..a127eb64 100644
--- a/user/report_expense_summary.php
+++ b/user/reports/expense_summary.php
@@ -122,7 +122,7 @@ $largest_expense_month = 0;
     </div>
 </div>
 
-<?php require_once "../includes/footer.php"; ?>
+<?php require_once "../../includes/footer.php"; ?>
 
 <script>
     // Bootstrap-like defaults for Chart.js v4
diff --git a/user/reports/includes/inc_all_reports.php b/user/reports/includes/inc_all_reports.php
new file mode 100644
index 00000000..72dc1ce6
--- /dev/null
+++ b/user/reports/includes/inc_all_reports.php
@@ -0,0 +1,20 @@
+<?php
+
+require_once "../../config.php";
+require_once "../../functions.php";
+require_once "../../includes/router.php";
+require_once "../../includes/check_login.php";
+require_once "../../includes/page_title.php";
+// Reporting Perms
+enforceUserPermission('module_reporting');
+require_once "../../includes/header.php";
+require_once "../../includes/top_nav.php";
+require_once "includes/reports_side_nav.php";
+require_once "../../includes/inc_wrapper.php";
+require_once "../../includes/inc_alert_feedback.php";
+require_once "../../includes/filter_header.php";
+
+// Set variable default values
+$largest_income_month = 0;
+$largest_invoice_month = 0;
+$recurring_total = 0;
diff --git a/user/includes/reports_side_nav.php b/user/reports/includes/reports_side_nav.php
similarity index 63%
rename from user/includes/reports_side_nav.php
rename to user/reports/includes/reports_side_nav.php
index d9a07424..02697654 100644
--- a/user/includes/reports_side_nav.php
+++ b/user/reports/includes/reports_side_nav.php
@@ -1,7 +1,7 @@
 <!-- Main Sidebar Container -->
 <aside class="main-sidebar sidebar-dark-primary d-print-none">
 
-    <a class="pb-1 mt-1 brand-link" href="index.php">
+    <a class="pb-1 mt-1 brand-link" href="../../user/<?php echo $config_start_page ?>">
         <p class="h5"><i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
             <span class="brand-text ">Back | <strong>Reports</strong>
         </p>
@@ -18,55 +18,55 @@
                 <li class="nav-header">FINANCIAL</li>
                 <?php if ($config_module_enable_accounting == 1 && lookupUserPermission("module_financial") >= 1) { ?>
                     <li class="nav-item">
-                        <a href="report_income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_income_summary.php") { echo "active"; } ?>">
+                        <a href="income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "income_summary.php") { echo "active"; } ?>">
                             <i class="far fa-circle nav-icon"></i>
                             <p>Income</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_income_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_income_by_client.php") { echo "active"; } ?>">
+                        <a href="income_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "income_by_client.php") { echo "active"; } ?>">
                             <i class="far fa-user nav-icon"></i>
                             <p>Income By Client</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_recurring_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_recurring_by_client.php") { echo "active"; } ?>">
+                        <a href="recurring_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_by_client.php") { echo "active"; } ?>">
                             <i class="fa fa-sync nav-icon"></i>
                             <p>Recurring Income By Client</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_clients_with_balance.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_clients_with_balance.php") { echo "active"; } ?>">
+                        <a href="clients_with_balance.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "clients_with_balance.php") { echo "active"; } ?>">
                             <i class="fa fa-exclamation-triangle nav-icon"></i>
                             <p>Clients with a Balance</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_expense_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_expense_summary.php") { echo "active"; } ?>">
+                        <a href="expense_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expense_summary.php") { echo "active"; } ?>">
                             <i class="far fa-credit-card nav-icon"></i>
                             <p>Expense</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_expense_by_vendor.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_expense_by_vendor.php") { echo "active"; } ?>">
+                        <a href="expense_by_vendor.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expense_by_vendor.php") { echo "active"; } ?>">
                             <i class="far fa-building nav-icon"></i>
                             <p>Expense By Vendor</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_tax_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_tax_summary.php") { echo "active"; } ?>">
+                        <a href="tax_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tax_summary.php") { echo "active"; } ?>">
                             <i class="fas fa-percent nav-icon"></i>
                             <p>Tax Summary</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_profit_loss.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_profit_loss.php") { echo "active"; } ?>">
+                        <a href="profit_loss.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "profit_loss.php") { echo "active"; } ?>">
                             <i class="fas fa-file-invoice-dollar nav-icon"></i>
                             <p>Profit & Loss</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_tickets_unbilled.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_tickets_unbilled.php") { echo "active"; } ?>">
+                        <a href="tickets_unbilled.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets_unbilled.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Unbilled Tickets</p>
                         </a>
@@ -78,21 +78,21 @@
                 <li class="nav-header">TECHNICAL</li>
                 <?php  if ($config_module_enable_ticketing && lookupUserPermission("module_support") >= 1) { ?>
                     <li class="nav-item">
-                        <a href="report_ticket_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_ticket_summary.php") { echo "active"; } ?>">
+                        <a href="ticket_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "ticket_summary.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Tickets</p>
                         </a>
                     </li>
 
                     <li class="nav-item">
-                        <a href="report_ticket_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_ticket_by_client.php") { echo "active"; } ?>">
+                        <a href="ticket_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "ticket_by_client.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Tickets by Client</p>
                         </a>
                     </li>
 
                     <li class="nav-item">
-                        <a href="report_time_by_tech.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_time_by_tech.php") { echo "active"; } ?>">
+                        <a href="time_by_tech.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "time_by_tech.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Time by Technician</p>
                         </a>
@@ -100,7 +100,7 @@
                 <?php } ?>
                 <?php if (lookupUserPermission("module_credential") >= 1) { ?>
                     <li class="nav-item">
-                        <a href="report_credential_rotation.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_credential_rotation.php") { echo "active"; } ?>">
+                        <a href="credential_rotation.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "credential_rotation.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-key"></i>
                             <p>Credential rotation</p>
                         </a>
diff --git a/user/report_income_by_client.php b/user/reports/income_by_client.php
similarity index 94%
rename from user/report_income_by_client.php
rename to user/reports/income_by_client.php
index d7e8f55a..a39016bf 100644
--- a/user/report_income_by_client.php
+++ b/user/reports/income_by_client.php
@@ -77,7 +77,7 @@ $sql_payment_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(payment_date) A
                     ?>
 
                     <tr>
-                        <td><a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
+                        <td><a href="../../user/client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
                         <td class="text-right"><?php echo numfmt_format_currency($currency_format, $amount_paid, $session_company_currency); ?></td>
                     </tr>
                     <?php
@@ -91,5 +91,5 @@ $sql_payment_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(payment_date) A
 </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
 
diff --git a/user/report_income_summary.php b/user/reports/income_summary.php
similarity index 99%
rename from user/report_income_summary.php
rename to user/reports/income_summary.php
index 13975619..95d6f420 100644
--- a/user/report_income_summary.php
+++ b/user/reports/income_summary.php
@@ -124,7 +124,7 @@ $largest_income_month = 0;
     </div>
 </div>
 
-<?php require_once "../includes/footer.php"; ?>
+<?php require_once "../../includes/footer.php"; ?>
 
 <script>
     // Bootstrap-like defaults for Chart.js v4
diff --git a/user/report_overview.php b/user/reports/index.php
similarity index 92%
rename from user/report_overview.php
rename to user/reports/index.php
index 75fab592..3732ab40 100644
--- a/user/report_overview.php
+++ b/user/reports/index.php
@@ -16,5 +16,5 @@ require_once "includes/inc_all_reports.php";
         </div>
     </div>
 
-<?php require_once "../includes/footer.php"; ?>
+<?php require_once "../../includes/footer.php"; ?>
 
diff --git a/user/report_profit_loss.php b/user/reports/profit_loss.php
similarity index 99%
rename from user/report_profit_loss.php
rename to user/reports/profit_loss.php
index 50bc529b..f250614f 100644
--- a/user/report_profit_loss.php
+++ b/user/reports/profit_loss.php
@@ -433,5 +433,5 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
         </div>
     </div>
 
-<?php require_once "../includes/footer.php";
+<?php require_once "../../includes/footer.php";
 
diff --git a/user/report_recurring_by_client.php b/user/reports/recurring_by_client.php
similarity index 92%
rename from user/report_recurring_by_client.php
rename to user/reports/recurring_by_client.php
index a65af8c8..ccc56308 100644
--- a/user/report_recurring_by_client.php
+++ b/user/reports/recurring_by_client.php
@@ -46,7 +46,7 @@ $sql = mysqli_query($mysqli, "
 
 
                     <tr>
-                        <td><a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
+                        <td><a href="../../user/client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
                         <td class="text-right"><?php echo numfmt_format_currency($currency_format, $recurring_monthly_total, $session_company_currency); ?></td>
                     </tr>
                     <?php
@@ -63,5 +63,5 @@ $sql = mysqli_query($mysqli, "
     </div>
 </div>
 
-<?php require_once "../includes/footer.php";
+<?php require_once "../../includes/footer.php";
  ?>
diff --git a/user/report_tax_summary.php b/user/reports/tax_summary.php
similarity index 99%
rename from user/report_tax_summary.php
rename to user/reports/tax_summary.php
index 7e664a24..62df4990 100644
--- a/user/report_tax_summary.php
+++ b/user/reports/tax_summary.php
@@ -117,5 +117,5 @@ $sql_tax = mysqli_query($mysqli, "SELECT `tax_name` FROM `taxes`");
         </div>
     </div>
 
-<?php require_once "../includes/footer.php";
+<?php require_once "../../includes/footer.php";
 
diff --git a/user/report_ticket_by_client.php b/user/reports/ticket_by_client.php
similarity index 99%
rename from user/report_ticket_by_client.php
rename to user/reports/ticket_by_client.php
index 8b3de281..6772e689 100644
--- a/user/report_ticket_by_client.php
+++ b/user/reports/ticket_by_client.php
@@ -339,5 +339,5 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients
     </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
 
diff --git a/user/report_ticket_summary.php b/user/reports/ticket_summary.php
similarity index 99%
rename from user/report_ticket_summary.php
rename to user/reports/ticket_summary.php
index ec5e77a6..8d8ad342 100644
--- a/user/report_ticket_summary.php
+++ b/user/reports/ticket_summary.php
@@ -95,7 +95,7 @@ $largest_ticket_month = 0;
     </div>
 </div>
 
-<?php require_once "../includes/footer.php"; ?>
+<?php require_once "../../includes/footer.php"; ?>
 
 <script>
     // Bootstrap-like defaults for Chart.js v4
diff --git a/user/report_tickets_unbilled.php b/user/reports/tickets_unbilled.php
similarity index 97%
rename from user/report_tickets_unbilled.php
rename to user/reports/tickets_unbilled.php
index fc6f634a..3f918ea1 100644
--- a/user/report_tickets_unbilled.php
+++ b/user/reports/tickets_unbilled.php
@@ -152,7 +152,7 @@ $rows = 0;
 
                             <tr>
                                 <td>
-                                    <a href="tickets.php?client_id=<?php echo $client_id; ?>&billable=1&unbilled"><?php echo $client_name; ?></a>
+                                    <a href="../../user/tickets.php?client_id=<?php echo $client_id; ?>&billable=1&unbilled"><?php echo $client_name; ?></a>
                                 </td>
                                 <td class="text-right"><?php echo $ticket_raised_count; ?></td>
                                 <td class="text-right"><?php echo $ticket_closed_count; ?></td>
@@ -178,5 +178,5 @@ $rows = 0;
     </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
 
diff --git a/user/report_time_by_tech.php b/user/reports/time_by_tech.php
similarity index 99%
rename from user/report_time_by_tech.php
rename to user/reports/time_by_tech.php
index 3315446f..db0acaa9 100644
--- a/user/report_time_by_tech.php
+++ b/user/reports/time_by_tech.php
@@ -177,5 +177,5 @@ $sql_users = mysqli_query($mysqli, "
     </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";