From 0a7fd1471a6d49ad62d54c71e038131b5cfb386a Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Tue, 11 Jun 2024 12:09:00 -0400
Subject: [PATCH] Move All Domains from main side nav to Reports under Overview
 header

---
 domains.php          |  7 +++---
 inc_all_reports.php  |  1 +
 reports_side_nav.php | 57 +++++++++++++++++++++++++-------------------
 side_nav.php         |  7 +-----
 4 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/domains.php b/domains.php
index a31fef94..fc262bfd 100644
--- a/domains.php
+++ b/domains.php
@@ -4,8 +4,7 @@
 $sort = "domain_name";
 $order = "ASC";
 
-require_once "inc_all.php";
-
+require_once "inc_all_reports.php";
 
 //Rebuild URL
 $url_query_strings_sort = http_build_query($get_copy);
@@ -22,8 +21,8 @@ $sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS domains.*,
     LEFT JOIN vendors AS dnshost ON domains.domain_dnshost = dnshost.vendor_id
     LEFT JOIN vendors AS mailhost ON domains.domain_mailhost = mailhost.vendor_id
     LEFT JOIN vendors AS webhost ON domains.domain_webhost = webhost.vendor_id
-    AND domain_archived_at IS NULL
-    AND (domain_name LIKE '%$q%' OR domain_description LIKE '%$q%' OR registrar.vendor_name LIKE '%$q%' OR dnshost.vendor_name LIKE '%$q%' OR mailhost.vendor_name LIKE '%$q%' OR webhost.vendor_name LIKE '%$q%' OR client_name LIKE '%$q%') 
+    WHERE domain_archived_at IS NULL
+    AND (domains.domain_name LIKE '%$q%' OR domain_description LIKE '%$q%' OR registrar.vendor_name LIKE '%$q%' OR dnshost.vendor_name LIKE '%$q%' OR mailhost.vendor_name LIKE '%$q%' OR webhost.vendor_name LIKE '%$q%' OR client_name LIKE '%$q%') 
     ORDER BY $sort $order LIMIT $record_from, $record_to");
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
diff --git a/inc_all_reports.php b/inc_all_reports.php
index 6722e623..1a37e30e 100644
--- a/inc_all_reports.php
+++ b/inc_all_reports.php
@@ -16,6 +16,7 @@ require_once "inc_wrapper.php";
 
 require_once "inc_alert_feedback.php";
 
+require_once "pagination_head.php";
 
 // Set variable default values
 $largest_income_month = 0;
diff --git a/reports_side_nav.php b/reports_side_nav.php
index 7eeafbf6..b6bfe839 100644
--- a/reports_side_nav.php
+++ b/reports_side_nav.php
@@ -92,31 +92,40 @@
 
                 <?php  if ($session_user_role == 2 || $session_user_role == 3) { ?>
                 <li class="nav-header">TECHNICAL</li>
-                    <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"; } ?>">
-                            <i class="nav-icon fas fa-life-ring"></i>
-                            <p>Tickets</p>
-                        </a>
-                    </li>
+                <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"; } ?>">
+                        <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"; } ?>">
-                            <i class="nav-icon fas fa-life-ring"></i>
-                            <p>Tickets by Client</p>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="report_password_rotation.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_password_rotation.php") { echo "active"; } ?>">
-                            <i class="nav-icon fas fa-life-ring"></i>
-                            <p>Password rotation</p>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="report_all_assets_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_all_assets_by_client.php") { echo "active"; } ?>">
-                            <i class="nav-icon fas fa-life-ring"></i>
-                            <p>All Assets</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"; } ?>">
+                        <i class="nav-icon fas fa-life-ring"></i>
+                        <p>Tickets by Client</p>
+                    </a>
+                </li>
+                <li class="nav-item">
+                    <a href="report_password_rotation.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_password_rotation.php") { echo "active"; } ?>">
+                        <i class="nav-icon fas fa-life-ring"></i>
+                        <p>Password rotation</p>
+                    </a>
+                </li>
+                
+                <li class="nav-header">OVERVIEWS</li>
+                
+                <li class="nav-item">
+                    <a href="report_all_assets_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_all_assets_by_client.php") { echo "active"; } ?>">
+                        <i class="nav-icon fas fa-life-ring"></i>
+                        <p>All Assets</p>
+                    </a>
+                </li>
+                <li class="nav-item">
+                    <a href="domains.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "domains.php") { echo "active"; } ?>">
+                        <i class="nav-icon fas fa-globe"></i>
+                        <p>All Domains</p>
+                    </a>
+                </li>
                 <?php } // End technical reports IF statement ?>
 
             </ul>
diff --git a/side_nav.php b/side_nav.php
index 972ba667..ca7d5de7 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -28,12 +28,7 @@
                         </p>
                     </a>
                 </li>
-                <li class="nav-item">
-                    <a href="domains.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "domains.php") { echo "active"; } ?>">
-                        <i class="nav-icon fas fa-globe"></i>
-                        <p>All Domains</p>
-                    </a>
-                </li>
+                
                 <?php if ($session_user_role >= 2 && $config_module_enable_ticketing == 1) { ?>
                     <li class="nav-header mt-3">SUPPORT</li>
                     <li class="nav-item">