Apply autoloader support for status messages

RaspAP · Sep 16, 2023 · 33c5961 · 33c5961
1 parent 07b950c
commit 33c5961
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 535 deletions.
diff --git a/app/css/all.css b/app/css/all.css
@@ -228,3 +228,8 @@ button > i.fas {
   pointer-events: none;
 }
 
+.close {
+  font-weight: 400;
+  font-size: 1.3rem;
+}
+
diff --git a/includes/adblock.php b/includes/adblock.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once 'includes/status_messages.php';
 require_once 'config.php';
 
 /**
@@ -9,7 +8,7 @@
  */
 function DisplayAdBlockConfig()
 {
-    $status = new StatusMessages();
+    $status = new \RaspAP\Messages\StatusMessage;
     $enabled = false;
     $custom_enabled = false;
 

diff --git a/includes/admin.php b/includes/admin.php
@@ -1,10 +1,8 @@
 <?php
 
-require_once 'includes/status_messages.php';
-
 function DisplayAuthConfig($username)
 {
-    $status = new StatusMessages();
+    $status = new \RaspAP\Messages\StatusMessage;
     $auth = new \RaspAP\Auth\HTTPAuth;
     $config = $auth->getAuthConfig();
     $password = $config['admin_pass'];

diff --git a/includes/configure_client.php b/includes/configure_client.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once 'includes/status_messages.php';
 require_once 'includes/wifi_functions.php';
 
 /**
@@ -9,7 +8,7 @@
  */
 function DisplayWPAConfig()
 {
-    $status = new StatusMessages();
+    $status = new \RaspAP\Messages\StatusMessage;
     $networks = [];
 
     getWifiInterface();

diff --git a/includes/dashboard.php b/includes/dashboard.php
@@ -10,7 +10,7 @@
 function DisplayDashboard(&$extraFooterScripts)
 {
     getWifiInterface();
-    $status = new StatusMessages();
+    $status = new \RaspAP\Messages\StatusMessage;
     // Need this check interface name for proper shell execution.
     if (!preg_match('/^([a-zA-Z0-9]+)$/', $_SESSION['wifi_client_interface'])) {
         $status->addMessage(_('Interface name invalid.'), 'danger');

diff --git a/includes/dhcp.php b/includes/dhcp.php
@@ -1,14 +1,13 @@
 <?php
 
-require_once 'includes/status_messages.php';
 require_once 'config.php';
 
 /**
  * Manage DHCP configuration
  */
 function DisplayDHCPConfig()
 {
-    $status = new StatusMessages();
+    $status = new \RaspAP\Messages\StatusMessage;
     if (!RASPI_MONITOR_ENABLED) {
         if (isset($_POST['savedhcpdsettings'])) {
             saveDHCPConfig($status);