From 0116d874459ab4fde510ad45eeb2ca3c6f7d1b00 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Fri, 15 Sep 2023 20:02:37 +0200
Subject: [PATCH] Create loadFooterScripts(), update page_actions + formatting

---
 includes/functions.php    | 12 ++++++++
 includes/page_actions.php | 11 ++-----
 index.php                 | 61 ++++++++++++++++-----------------------
 3 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/includes/functions.php b/includes/functions.php
index f42dd122..24a42f15 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -819,3 +819,15 @@ function getTooltip($msg, $id, $visible = true, $data_html = false)
     echo '<i class="fas fa-question-circle text-muted ' .$opt1.'" id="' .$id. '" data-toggle="tooltip" ' .$opt2. ' data-placement="auto" title="' . _($msg). '"></i>';
 }
 
+// Load non default JS/ECMAScript in footer
+function loadFooterScripts($extraFooterScripts)
+{
+    foreach ($extraFooterScripts as $script) {
+        echo '<script type="text/javascript" src="' , $script['src'] , '"';
+        if ($script['defer']) {
+            echo ' defer="defer"';
+        }
+        echo '></script>' , PHP_EOL;
+    }
+}
+
diff --git a/includes/page_actions.php b/includes/page_actions.php
index f97bc5d1..b460dd43 100755
--- a/includes/page_actions.php
+++ b/includes/page_actions.php
@@ -13,7 +13,7 @@
             DisplayWPAConfig();
             break;
         case "/network_conf":
-            DisplayNetworkingConfig($extraFooterScripts);
+            DisplayNetworkingConfig();
             break;
         case "/hostapd_conf":
             DisplayHostAPDConfig();
@@ -30,12 +30,6 @@
         case "/torproxy_conf":
             DisplayTorProxyConfig();
             break;
-        case "/firewall_conf":
-            DisplayFirewallConfig();
-            break;
-        case "/ddclient_conf":
-            DisplayDDClientConfig();
-            break;
         case "/auth_conf":
             DisplayAuthConfig($_SESSION['user_id']);
             break;
@@ -54,4 +48,5 @@
         default:
             DisplayDashboard($extraFooterScripts);
         }
-        ?>
+      ?>
+
diff --git a/index.php b/index.php
index b0cd670e..1da42e06 100755
--- a/index.php
+++ b/index.php
@@ -4,12 +4,12 @@
  * Raspbian WiFi Configuration Portal (RaspAP)
  *
  * Simple AP setup & WiFi management for Debian-based devices.
- * Enables use of simple web interface rather than SSH to control WiFi and related services  on the Raspberry Pi.
+ * Enables use of simple web interface rather than SSH to control WiFi and related services on the Raspberry Pi.
  * Recommended distribution is Raspberry Pi OS (64-bit) Lite. Specific instructions to install the supported software are
  * in the README and original post by @SirLagz. For a quick run through, the packages required for the WebGUI are:
  * lighttpd (version 1.4.59 installed via apt)
  * php-cgi (version 7.4.33 installed via apt)
- * along with their supporting packages, php7.3 will also need to be enabled.
+ * along with their supporting packages, php7.4 will also need to be enabled.
  *
  * @author  Lawrence Yau <sirlagz@gmail.com>
  * @author  Bill Zimmerman <billzimmerman@gmail.com>
@@ -104,30 +104,28 @@ initializeApp();
       <!-- Sidebar -->
       <?php require_once 'includes/sidebar.php'; ?>
       <!-- End of Sidebar -->
-
-    <!-- Content Wrapper -->
-    <div id="content-wrapper" class="d-flex flex-column">
-
-    <!-- Main Content -->
-    <div id="content">
-      <!-- Topbar -->
-      <?php require_once 'includes/navbar.php'; ?>
-      <!-- End of Topbar -->
-      <!-- Begin Page Content -->
-      <div class="container-fluid">
-      <?php require_once 'includes/page_actions.php'; ?>
-      </div><!-- /.container-fluid -->
-    </div><!-- End of Main Content -->
-    <!-- Footer -->
-    <footer class="sticky-footer bg-grey-100">
-      <div class="container my-auto">
-        <div class="copyright text-center my-auto">
-          <span></span>
-        </div>
-      </div>
-    </footer>
-    <!-- End Footer -->
-    </div><!-- End of Content Wrapper -->
+      <!-- Content Wrapper -->
+      <div id="content-wrapper" class="d-flex flex-column">
+        <!-- Main Content -->
+        <div id="content">
+          <!-- Topbar -->
+          <?php require_once 'includes/navbar.php'; ?>
+          <!-- End of Topbar -->
+          <!-- Begin Page Content -->
+          <div class="container-fluid">
+          <?php require_once 'includes/page_actions.php'; ?>
+          </div><!-- /.container-fluid -->
+        </div><!-- End of Main Content -->
+        <!-- Footer -->
+        <footer class="sticky-footer bg-grey-100">
+          <div class="container my-auto">
+            <div class="copyright text-center my-auto">
+              <span></span>
+            </div>
+          </div>
+        </footer>
+        <!-- End Footer -->
+      </div><!-- End of Content Wrapper -->
     </div><!-- End of Page Wrapper -->
     <!-- Scroll to Top Button-->
     <a class="scroll-to-top rounded" href="#page-top" style="display: inline;">
@@ -152,15 +150,6 @@ initializeApp();
     <!-- Custom RaspAP JS -->
     <script src="app/js/custom.js"></script>
 
-    <?php
-    // Load non default JS/ECMAScript in footer.
-    foreach ($extraFooterScripts as $script) {
-        echo '<script type="text/javascript" src="' , $script['src'] , '"';
-        if ($script['defer']) {
-            echo ' defer="defer"';
-        }
-        echo '></script>' , PHP_EOL;
-    }
-    ?>
+    <?php loadFooterScripts($extraFooterScripts); ?>
   </body>
 </html>