From 0a5de911e9e8e1c8181ef5fce6d062b8841655f4 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Thu, 18 Apr 2024 18:37:43 -0400
Subject: [PATCH] Combine Settings and with Admin Side Nav

---
 inc_all_settings.php        |  24 ------
 settings_ai.php             |   2 +-
 settings_company.php        |   2 +-
 settings_custom_fields.php  |   2 +-
 settings_defaults.php       |   2 +-
 settings_integrations.php   |   2 +-
 settings_invoice.php        |   2 +-
 settings_localization.php   |   2 +-
 settings_mail.php           |   2 +-
 settings_maintenance.php    |   2 +-
 settings_modules.php        |   2 +-
 settings_notifications.php  |   2 +-
 settings_online_payment.php |   2 +-
 settings_project.php        |   2 +-
 settings_quote.php          |   2 +-
 settings_security.php       |   2 +-
 settings_side_nav.php       | 153 ------------------------------------
 settings_telemetry.php      |   2 +-
 settings_theme.php          |   2 +-
 settings_ticket.php         |   2 +-
 side_nav.php                |   7 --
 21 files changed, 18 insertions(+), 202 deletions(-)
 delete mode 100644 inc_all_settings.php
 delete mode 100644 settings_side_nav.php

diff --git a/inc_all_settings.php b/inc_all_settings.php
deleted file mode 100644
index 0376612f..00000000
--- a/inc_all_settings.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-require_once "config.php";
-
-require_once "functions.php";
-
-require_once "check_login.php";
-
-
-validateAdminRole();
-
-require_once "header.php";
-
-require_once "top_nav.php";
-
-require_once "settings_side_nav.php";
-
-require_once "inc_wrapper.php";
-
-require_once "inc_alert_feedback.php";
-
-require_once "pagination_head.php";
-
-
diff --git a/settings_ai.php b/settings_ai.php
index d8f4d3d8..e36f1464 100644
--- a/settings_ai.php
+++ b/settings_ai.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
  ?>
 
 <div class="card card-dark">
diff --git a/settings_company.php b/settings_company.php
index bd0fef91..f3e42cf6 100644
--- a/settings_company.php
+++ b/settings_company.php
@@ -1,5 +1,5 @@
 <?php
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 
 $sql = mysqli_query($mysqli,"SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1");
diff --git a/settings_custom_fields.php b/settings_custom_fields.php
index 12b2f117..33060c77 100644
--- a/settings_custom_fields.php
+++ b/settings_custom_fields.php
@@ -4,7 +4,7 @@
 $sort = "custom_field_label";
 $order = "ASC";
 
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 
 if (isset($_GET['table'])) {
diff --git a/settings_defaults.php b/settings_defaults.php
index 6a309e7f..6cf80398 100644
--- a/settings_defaults.php
+++ b/settings_defaults.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
  ?>
 
 <div class="card card-dark">
diff --git a/settings_integrations.php b/settings_integrations.php
index 12dad047..6a71ae2b 100644
--- a/settings_integrations.php
+++ b/settings_integrations.php
@@ -1,5 +1,5 @@
 <?php
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
  ?>
 
 <div class="card card-dark">
diff --git a/settings_invoice.php b/settings_invoice.php
index 230b6be1..991e60fd 100644
--- a/settings_invoice.php
+++ b/settings_invoice.php
@@ -1,5 +1,5 @@
 <?php
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
  ?>
 
     <div class="card card-dark">
diff --git a/settings_localization.php b/settings_localization.php
index d7cf4b59..286e87f6 100644
--- a/settings_localization.php
+++ b/settings_localization.php
@@ -1,5 +1,5 @@
 <?php
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 
 $sql = mysqli_query($mysqli,"SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1");
diff --git a/settings_mail.php b/settings_mail.php
index bee8af34..dde100ee 100644
--- a/settings_mail.php
+++ b/settings_mail.php
@@ -1,5 +1,5 @@
 <?php
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
  ?>
 
     <div class="card card-dark">
diff --git a/settings_maintenance.php b/settings_maintenance.php
index 6ce2104c..5623eafc 100644
--- a/settings_maintenance.php
+++ b/settings_maintenance.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 require_once "database_version.php";
 
diff --git a/settings_modules.php b/settings_modules.php
index 64a01f15..a54661ac 100644
--- a/settings_modules.php
+++ b/settings_modules.php
@@ -1,5 +1,5 @@
 <?php
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
  ?>
 
 <div class="card card-dark">
diff --git a/settings_notifications.php b/settings_notifications.php
index dcfb1e8f..854fe95a 100644
--- a/settings_notifications.php
+++ b/settings_notifications.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 ?>
 
diff --git a/settings_online_payment.php b/settings_online_payment.php
index 635eab90..bf5418c9 100644
--- a/settings_online_payment.php
+++ b/settings_online_payment.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 
 ?>
diff --git a/settings_project.php b/settings_project.php
index 9a231144..4064f83d 100644
--- a/settings_project.php
+++ b/settings_project.php
@@ -1,5 +1,5 @@
 <?php
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
  ?>
 
     <div class="card card-dark">
diff --git a/settings_quote.php b/settings_quote.php
index 2a51e301..ea3c2763 100644
--- a/settings_quote.php
+++ b/settings_quote.php
@@ -1,5 +1,5 @@
 <?php
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
  ?>
 
     <div class="card card-dark">
diff --git a/settings_security.php b/settings_security.php
index 05797037..70671cd9 100644
--- a/settings_security.php
+++ b/settings_security.php
@@ -1,5 +1,5 @@
 <?php
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
 
 ?>
 
diff --git a/settings_side_nav.php b/settings_side_nav.php
deleted file mode 100644
index ef115e91..00000000
--- a/settings_side_nav.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<!-- Main Sidebar Container -->
-<aside class="main-sidebar sidebar-dark-<?php echo nullable_htmlentities($config_theme); ?> d-print-none">
-
-  <a class="brand-link pb-1 mt-1" href="clients.php">
-    <p class="h6"><i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i> Back | <strong>Settings</strong></p>
-  </a>
-
-  <!-- Sidebar -->
-  <div class="sidebar">
-
-    <!-- Sidebar Menu -->
-    <nav>
-
-      <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" data-accordion="false">
-
-        <li class="nav-item">
-          <a href="settings_company.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_company.php") { echo "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 if (basename($_SERVER["PHP_SELF"]) == "settings_localization.php") { echo "active"; } ?>">
-            <i class="nav-icon fa fa-globe"></i>
-            <p>Localization</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_theme.php") { echo "active"; } ?>"
-            href="settings_theme.php">
-            <i class="nav-icon fa fa-paint-brush"></i>
-            <p>Theme</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_security.php") { echo "active"; } ?>"
-             href="settings_security.php">
-            <i class="nav-icon fas fa-shield-alt"></i>
-            <p>Security</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_mail.php") { echo "active"; } ?>"
-            href="settings_mail.php">
-            <i class="nav-icon far fa-envelope"></i>
-            <p>Mail</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_notifications.php") { echo "active"; } ?>"
-            href="settings_notifications.php">
-            <i class="nav-icon far fa-bell"></i>
-            <p>Notifications</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_defaults.php") { echo "active"; } ?>"
-            href="settings_defaults.php">
-            <i class="nav-icon fas fa-cogs"></i>
-            <p>Defaults</p>
-          </a>
-        </li>
-
-        <?php if ($config_module_enable_accounting) { ?>
-
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_invoice.php") { echo "active"; } ?>"
-            href="settings_invoice.php">
-            <i class="nav-icon fas fa-file-invoice"></i>
-            <p>Invoice</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_quote.php") { echo "active"; } ?>"
-            href="settings_quote.php">
-            <i class="nav-icon fas fa-comment-dollar"></i>
-            <p>Quote</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_online_payment.php") { echo "active"; } ?>"
-            href="settings_online_payment.php">
-            <i class="nav-icon far fa-credit-card"></i>
-            <p>Online Payment</p>
-          </a>
-        </li>
-
-        <?php } ?>
-
-        <?php if ($config_module_enable_ticketing) { ?>
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_project.php") { echo "active"; } ?>"
-            href="settings_project.php">
-            <i class="nav-icon fas fa-project-diagram"></i>
-            <p>Project</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_ticket.php") { echo "active"; } ?>"
-            href="settings_ticket.php">
-            <i class="nav-icon fas fa-life-ring"></i>
-            <p>Ticket</p>
-          </a>
-        </li>
-        <?php } ?>
-
-        <li class="nav-item">
-          <a href="settings_ai.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_ai.php") { echo "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 if (basename($_SERVER["PHP_SELF"]) == "settings_integrations.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-plug"></i>
-            <p>Integrations</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_telemetry.php") { echo "active"; } ?>"
-            href="settings_telemetry.php">
-            <i class="nav-icon fas fa-satellite-dish"></i>
-            <p>Telemetry</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_modules.php") { echo "active"; } ?>"
-             href="settings_modules.php">
-              <i class="nav-icon fas fa-cube"></i>
-              <p>Modules</p>
-          </a>
-        </li>
-      </ul>
-    </nav>
-    <!-- /.sidebar-menu -->
-
-    <div class="mb-3"></div>
-
-  </div>
-  <!-- /.sidebar -->
-</aside>
diff --git a/settings_telemetry.php b/settings_telemetry.php
index a27aca3f..ee054479 100644
--- a/settings_telemetry.php
+++ b/settings_telemetry.php
@@ -1,5 +1,5 @@
 <?php
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
  ?>
 
     <div class="card card-dark">
diff --git a/settings_theme.php b/settings_theme.php
index 0b2879fb..a503a85e 100644
--- a/settings_theme.php
+++ b/settings_theme.php
@@ -1,5 +1,5 @@
 <?php
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
  ?>
 
     <div class="card card-dark">
diff --git a/settings_ticket.php b/settings_ticket.php
index 29afe15b..18ef56de 100644
--- a/settings_ticket.php
+++ b/settings_ticket.php
@@ -1,5 +1,5 @@
 <?php
-require_once "inc_all_settings.php";
+require_once "inc_all_admin.php";
  ?>
 
     <div class="card card-dark">
diff --git a/side_nav.php b/side_nav.php
index 6c1a1b88..f9c8dafc 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -185,13 +185,6 @@
                             <i class="fas fa-angle-right nav-icon float-right"></i>
                         </a>
                     </li>
-                    <li class="nav-item">
-                        <a href="settings_company.php" class="nav-link">
-                            <i class="nav-icon fas fa-cogs"></i>
-                            <p>Settings</p>
-                            <i class="fas fa-angle-right nav-icon float-right"></i>
-                        </a>
-                    </li>
                 <?php } ?>
             </ul>
         </nav>