From 41a8e4146357aec4a5b9c0019dd1b1c27cdcd803 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Thu, 31 Jul 2025 18:48:33 -0400
Subject: [PATCH] Move reports back and rename them appropriately update broken
 links

---
 user/includes/inc_all_reports.php             | 19 ++++++++++++
 .../reports_side_nav.php}                     | 30 +++++++++----------
 user/includes/side_nav.php                    |  2 +-
 .../{reports/budget.php => report_budget.php} |  2 +-
 ...ce.php => report_clients_with_balance.php} |  2 +-
 ...ion.php => report_credential_rotation.php} |  2 +-
 ...endor.php => report_expense_by_vendor.php} |  2 +-
 ...summary.php => report_expense_summary.php} |  2 +-
 ...client.php => report_income_by_client.php} |  2 +-
 ..._summary.php => report_income_summary.php} |  2 +-
 .../index.php => report_overview.php}         |  2 +-
 ...profit_loss.php => report_profit_loss.php} |  2 +-
 ...ent.php => report_recurring_by_client.php} |  2 +-
 ...tax_summary.php => report_tax_summary.php} |  2 +-
 ...client.php => report_ticket_by_client.php} |  2 +-
 ..._summary.php => report_ticket_summary.php} |  2 +-
 ...billed.php => report_tickets_unbilled.php} |  2 +-
 ...me_by_tech.php => report_time_by_tech.php} |  2 +-
 user/reports/includes/inc_all_reports.php     | 19 ------------
 user/reports/includes/modal_footer.php        |  9 ------
 user/reports/includes/modal_header.php        | 13 --------
 21 files changed, 50 insertions(+), 72 deletions(-)
 create mode 100644 user/includes/inc_all_reports.php
 rename user/{reports/includes/side_nav.php => includes/reports_side_nav.php} (62%)
 rename user/{reports/budget.php => report_budget.php} (98%)
 rename user/{reports/clients_with_balance.php => report_clients_with_balance.php} (98%)
 rename user/{reports/credential_rotation.php => report_credential_rotation.php} (98%)
 rename user/{reports/expense_by_vendor.php => report_expense_by_vendor.php} (98%)
 rename user/{reports/expense_summary.php => report_expense_summary.php} (99%)
 rename user/{reports/income_by_client.php => report_income_by_client.php} (98%)
 rename user/{reports/income_summary.php => report_income_summary.php} (99%)
 rename user/{reports/index.php => report_overview.php} (92%)
 rename user/{reports/profit_loss.php => report_profit_loss.php} (99%)
 rename user/{reports/recurring_by_client.php => report_recurring_by_client.php} (98%)
 rename user/{reports/tax_summary.php => report_tax_summary.php} (99%)
 rename user/{reports/ticket_by_client.php => report_ticket_by_client.php} (99%)
 rename user/{reports/ticket_summary.php => report_ticket_summary.php} (99%)
 rename user/{reports/tickets_unbilled.php => report_tickets_unbilled.php} (99%)
 rename user/{reports/time_by_tech.php => report_time_by_tech.php} (99%)
 delete mode 100644 user/reports/includes/inc_all_reports.php
 delete mode 100644 user/reports/includes/modal_footer.php
 delete mode 100644 user/reports/includes/modal_header.php

diff --git a/user/includes/inc_all_reports.php b/user/includes/inc_all_reports.php
new file mode 100644
index 00000000..2894d0f9
--- /dev/null
+++ b/user/includes/inc_all_reports.php
@@ -0,0 +1,19 @@
+<?php
+
+require_once "../config.php";
+require_once "../functions.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/reports/includes/side_nav.php b/user/includes/reports_side_nav.php
similarity index 62%
rename from user/reports/includes/side_nav.php
rename to user/includes/reports_side_nav.php
index 21de1cf7..d93f9183 100644
--- a/user/reports/includes/side_nav.php
+++ b/user/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="../">
+    <a class="pb-1 mt-1 brand-link" href="index.php">
         <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,61 +18,61 @@
                 <li class="nav-header">FINANCIAL</li>
                 <?php if ($config_module_enable_accounting == 1 && lookupUserPermission("module_financial") >= 1) { ?>
                     <li class="nav-item">
-                        <a href="income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "income_summary.php") { echo "active"; } ?>">
+                        <a href="report_income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_income_summary.php") { echo "active"; } ?>">
                             <i class="far fa-circle nav-icon"></i>
                             <p>Income</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="income_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "income_by_client.php") { echo "active"; } ?>">
+                        <a href="report_income_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_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="recurring_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_by_client.php") { echo "active"; } ?>">
+                        <a href="report_recurring_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_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="clients_with_balance.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "clients_with_balance.php") { echo "active"; } ?>">
+                        <a href="report_clients_with_balance.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_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="expense_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expense_summary.php") { echo "active"; } ?>">
+                        <a href="report_expense_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_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="expense_by_vendor.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expense_by_vendor.php") { echo "active"; } ?>">
+                        <a href="report_expense_by_vendor.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_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="budget.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "budget.php") { echo "active"; } ?>">
+                        <a href="report_budget.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_budget.php") { echo "active"; } ?>">
                             <i class="fas fa-list nav-icon"></i>
                             <p>Budget</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="tax_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tax_summary.php") { echo "active"; } ?>">
+                        <a href="report_tax_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_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="profit_loss.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "profit_loss.php") { echo "active"; } ?>">
+                        <a href="report_profit_loss.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_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="tickets_unbilled.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets_unbilled.php") { echo "active"; } ?>">
+                        <a href="report_tickets_unbilled.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_tickets_unbilled.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Unbilled Tickets</p>
                         </a>
@@ -84,21 +84,21 @@
                 <li class="nav-header">TECHNICAL</li>
                 <?php  if ($config_module_enable_ticketing && lookupUserPermission("module_support") >= 1) { ?>
                     <li class="nav-item">
-                        <a href="ticket_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "ticket_summary.php") { echo "active"; } ?>">
+                        <a href="report_ticket_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_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="ticket_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "ticket_by_client.php") { echo "active"; } ?>">
+                        <a href="report_ticket_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_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="time_by_tech.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "time_by_tech.php") { echo "active"; } ?>">
+                        <a href="report_time_by_tech.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_time_by_tech.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Time by Technician</p>
                         </a>
@@ -106,7 +106,7 @@
                 <?php } ?>
                 <?php if (lookupUserPermission("module_credential") >= 1) { ?>
                     <li class="nav-item">
-                        <a href="credential_rotation.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "credential_rotation.php") { echo "active"; } ?>">
+                        <a href="report_credential_rotation.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_credential_rotation.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-key"></i>
                             <p>Credential rotation</p>
                         </a>
diff --git a/user/includes/side_nav.php b/user/includes/side_nav.php
index ddcf103a..6a800213 100644
--- a/user/includes/side_nav.php
+++ b/user/includes/side_nav.php
@@ -194,7 +194,7 @@
 
                 <?php if (lookupUserPermission("module_reporting") >= 1) { ?>
                     <li class="nav-item mt-3">
-                        <a href="reports" class="nav-link">
+                        <a href="report_overview.php" 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/reports/budget.php b/user/report_budget.php
similarity index 98%
rename from user/reports/budget.php
rename to user/report_budget.php
index 861d6494..f55e15a6 100644
--- a/user/reports/budget.php
+++ b/user/report_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/reports/clients_with_balance.php b/user/report_clients_with_balance.php
similarity index 98%
rename from user/reports/clients_with_balance.php
rename to user/report_clients_with_balance.php
index cd677d07..30abd2de 100644
--- a/user/reports/clients_with_balance.php
+++ b/user/report_clients_with_balance.php
@@ -81,5 +81,5 @@ enforceUserPermission('module_financial');
 </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/user/reports/credential_rotation.php b/user/report_credential_rotation.php
similarity index 98%
rename from user/reports/credential_rotation.php
rename to user/report_credential_rotation.php
index af10bc0c..10f5395c 100644
--- a/user/reports/credential_rotation.php
+++ b/user/report_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/reports/expense_by_vendor.php b/user/report_expense_by_vendor.php
similarity index 98%
rename from user/reports/expense_by_vendor.php
rename to user/report_expense_by_vendor.php
index 70670319..9d0745fa 100644
--- a/user/reports/expense_by_vendor.php
+++ b/user/report_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/reports/expense_summary.php b/user/report_expense_summary.php
similarity index 99%
rename from user/reports/expense_summary.php
rename to user/report_expense_summary.php
index 09555e9f..72c7b2aa 100644
--- a/user/reports/expense_summary.php
+++ b/user/report_expense_summary.php
@@ -115,7 +115,7 @@ $sql_categories = mysqli_query($mysqli, "SELECT * FROM categories WHERE category
     </div>
 </div>
 
-<?php require_once "includes/footer.php";
+<?php require_once "../includes/footer.php";
  ?>
 
 <script>
diff --git a/user/reports/income_by_client.php b/user/report_income_by_client.php
similarity index 98%
rename from user/reports/income_by_client.php
rename to user/report_income_by_client.php
index fffa8515..d7e8f55a 100644
--- a/user/reports/income_by_client.php
+++ b/user/report_income_by_client.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/reports/income_summary.php b/user/report_income_summary.php
similarity index 99%
rename from user/reports/income_summary.php
rename to user/report_income_summary.php
index 187fdf23..ba00ba9f 100644
--- a/user/reports/income_summary.php
+++ b/user/report_income_summary.php
@@ -147,7 +147,7 @@ $sql_categories = mysqli_query($mysqli, "SELECT * FROM categories WHERE category
     </div>
 </div>
 
-<?php require_once "includes/footer.php"; ?>
+<?php require_once "../includes/footer.php"; ?>
 
 <script>
     // Set new default font family and font color to mimic Bootstrap's default styling
diff --git a/user/reports/index.php b/user/report_overview.php
similarity index 92%
rename from user/reports/index.php
rename to user/report_overview.php
index 1eacdb85..75fab592 100644
--- a/user/reports/index.php
+++ b/user/report_overview.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/reports/profit_loss.php b/user/report_profit_loss.php
similarity index 99%
rename from user/reports/profit_loss.php
rename to user/report_profit_loss.php
index 0ad73daf..50bc529b 100644
--- a/user/reports/profit_loss.php
+++ b/user/report_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/reports/recurring_by_client.php b/user/report_recurring_by_client.php
similarity index 98%
rename from user/reports/recurring_by_client.php
rename to user/report_recurring_by_client.php
index bb181194..a65af8c8 100644
--- a/user/reports/recurring_by_client.php
+++ b/user/report_recurring_by_client.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/reports/tax_summary.php b/user/report_tax_summary.php
similarity index 99%
rename from user/reports/tax_summary.php
rename to user/report_tax_summary.php
index 55d52839..7e664a24 100644
--- a/user/reports/tax_summary.php
+++ b/user/report_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/reports/ticket_by_client.php b/user/report_ticket_by_client.php
similarity index 99%
rename from user/reports/ticket_by_client.php
rename to user/report_ticket_by_client.php
index b03b4bf3..1320c610 100644
--- a/user/reports/ticket_by_client.php
+++ b/user/report_ticket_by_client.php
@@ -296,5 +296,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/reports/ticket_summary.php b/user/report_ticket_summary.php
similarity index 99%
rename from user/reports/ticket_summary.php
rename to user/report_ticket_summary.php
index fb6044d5..97418ce9 100644
--- a/user/reports/ticket_summary.php
+++ b/user/report_ticket_summary.php
@@ -83,7 +83,7 @@ $sql_tickets = mysqli_query($mysqli, "SELECT ticket_id FROM tickets");
     </div>
 </div>
 
-<?php require_once "includes/footer.php";
+<?php require_once "../includes/footer.php";
  ?>
 
 <script>
diff --git a/user/reports/tickets_unbilled.php b/user/report_tickets_unbilled.php
similarity index 99%
rename from user/reports/tickets_unbilled.php
rename to user/report_tickets_unbilled.php
index 0bc306f0..fc6f634a 100644
--- a/user/reports/tickets_unbilled.php
+++ b/user/report_tickets_unbilled.php
@@ -178,5 +178,5 @@ $rows = 0;
     </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/user/reports/time_by_tech.php b/user/report_time_by_tech.php
similarity index 99%
rename from user/reports/time_by_tech.php
rename to user/report_time_by_tech.php
index 9e6a1715..3315446f 100644
--- a/user/reports/time_by_tech.php
+++ b/user/report_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";
 
diff --git a/user/reports/includes/inc_all_reports.php b/user/reports/includes/inc_all_reports.php
deleted file mode 100644
index 23f50a66..00000000
--- a/user/reports/includes/inc_all_reports.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-require_once "../../config.php";
-require_once "../../functions.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/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/reports/includes/modal_footer.php b/user/reports/includes/modal_footer.php
deleted file mode 100644
index 4bbe5766..00000000
--- a/user/reports/includes/modal_footer.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<script src="js/app.js"></script>
-<script src="plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
-
-<?php
-    $content = ob_get_clean();
-
-    // Return the title and content as a JSON response
-    echo json_encode(['content' => $content]);
-?>
\ No newline at end of file
diff --git a/user/reports/includes/modal_header.php b/user/reports/includes/modal_header.php
deleted file mode 100644
index 695f098a..00000000
--- a/user/reports/includes/modal_header.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-require_once "../../../config.php";
-require_once "../../../functions.php";
-require_once "../../../includes/check_login.php";
-
-header('Content-Type: application/json');
-
-// Check for the 'id' parameter
-//if (!isset($_GET['id'])) {
-//    echo json_encode(['error' => 'ID missing.']);
-//    exit;
-//}