Updating hibernate system & control panel.

PixelsetDev · Apr 29, 2024 · 472e749 · 472e749
1 parent 0180c64
commit 472e749
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 21 deletions.
diff --git a/Plugins/ControlPanel/CPRouter.php b/Plugins/ControlPanel/CPRouter.php
@@ -32,13 +32,13 @@ public function Register(Router $Router): void
     private function Account(bool $Authenticated): void
     {
         if ($Authenticated) {
-            $this->Router->GET(CPURL_ACCOUNT, '../Plugins/ControlPanel/Views/Account.php');
-            $this->Router->GET(CPURL_ACCOUNT.CPURL_JOIN, '../Plugins/ControlPanel/Views/Account.php');
-            $this->Router->GET(CPURL_ACCOUNT.CPURL_LOGOUT, '../Processes/Saturn/AccountManager/Logout.php');
+            $this->Router->GET(CPURL_ACCOUNT, CPPAGE_ACCOUNT);
+            $this->Router->GET(CPURL_ACCOUNT.CPURL_JOIN, CPPAGE_ACCOUNT);
+            $this->Router->GET(CPURL_ACCOUNT.CPURL_LOGOUT, CPPAGE_LOGOUT);
         } else {
-            $this->Router->GET('/account', CPPAGE_LOGIN);
-            $this->Router->GET('/account/join', '../Plugins/ControlPanel/Views/Join.php');
-            $this->Router->GET('/account/logout', '../Processes/Saturn/AccountManager/Logout.php');
+            $this->Router->GET(CPURL_ACCOUNT, CPPAGE_LOGIN);
+            $this->Router->GET(CPURL_ACCOUNT.CPURL_JOIN, CPPAGE_REGISTER);
+            $this->Router->GET(CPURL_ACCOUNT.CPURL_LOGOUT, CPPAGE_LOGOUT);
         }
     }
 

diff --git a/Plugins/ControlPanel/CPURLs.php b/Plugins/ControlPanel/CPURLs.php
@@ -7,5 +7,9 @@
 const CPURL_EDIT = '/edit';
 const CPURL_PLUGINS = '/plugins';
 const CPURL_USERS = '/users';
+
 const CPPAGE_NOACCESS = '../Plugins/ControlPanel/Views/NoAccess.php';
 const CPPAGE_LOGIN = '../Plugins/ControlPanel/Views/Login.php';
+const CPPAGE_REGISTER = '../Plugins/ControlPanel/Views/Join.php';
+const CPPAGE_LOGOUT = '../Plugins/ControlPanel/Views/Logout.php';
+const CPPAGE_ACCOUNT = '../Plugins/ControlPanel/Views/Account.php';
diff --git a/Processes/DefaultViews/Maintenance.php b/Processes/DefaultViews/Maintenance.php
@@ -28,7 +28,7 @@
                     <?= __('Maintenance_Mode_Message_2'); ?>
                 </p>
 
-                <a class="navigation-item dark:text-white" href="<?= SATURN_ROOT; ?>/account">
+                <a class="navigation-item dark:text-white" href="<?= SATURN_ROOT; ?>/panel">
                     <?= __('Admin_Login'); ?>
                 </a>
             </div>

diff --git a/Processes/Saturn/PluginManager/Hibernate.php b/Processes/Saturn/PluginManager/Hibernate.php
@@ -4,18 +4,9 @@
 
 class Hibernate
 {
-    public function Hibernate($Manifest): bool
+    public function IsHibernating($Manifest): bool
     {
-        foreach ($Manifest->Hibernate as $Hibernate) {
-            return $this->URL($Hibernate);
-        }
-
-        return false;
-    }
-
-    public function URL($URL): bool
-    {
-        if (str_contains($_SERVER['REQUEST_URI'], $URL)) {
+        if (in_array($_SERVER['REQUEST_URI'], $Manifest->Hibernate)) {
             return false;
         }
 

diff --git a/Processes/Saturn/PluginManager/PluginLoader.php b/Processes/Saturn/PluginManager/PluginLoader.php
@@ -27,7 +27,7 @@ public function Load(): void
 
             if ($Manifest->Hibernate !== false) {
                 $Hibernate = new Hibernate();
-                if ($Hibernate->Hibernate($Manifest)) {
+                if ($Hibernate->IsHibernating($Manifest)) {
                     $this->LoadStatus($Plugin, false, 'Plugin is hibernating. It will load and be ready to use when needed.');
                     continue;
                 }

diff --git a/Processes/Saturn/System.php b/Processes/Saturn/System.php
@@ -7,8 +7,8 @@
 const SATSYS_DISALLOWED_PAGES = ['Assets', 'Plugins', 'Processes', 'Settings', 'Storage', 'Themes', 'panel', 'account', 'api'];
 
 // Website modes
-const MODE_MAINT = 0;
-const MODE_LIVE = 1;
+const MODE_MAINT = 1;
+const MODE_LIVE = 0;
 
 // Website environemnts
 const ENV_PROD = 0;

diff --git a/Processes/Start.php b/Processes/Start.php
@@ -74,6 +74,8 @@ function __(string $Text): string
 
 $Actions->Run('Saturn.PostStart');
 
+var_dump($SaturnPlugins);
+
 // ROUTER
 require_once __DIR__.'/Router.php';