Changeset 981 for trunk/Packages/Common/Modules/Setup.php

Timestamp:

Dec 1, 2025, 10:11:09 PM (3 hours ago)

Author:

chronos

Message:

• Fixed: Check if system user is logged in modules page.

File:

• trunk/Packages/Common/Modules/Setup.php (modified) (5 diffs)

trunk/Packages/Common/Modules/Setup.php

@@ -15 +15 @@
     $this->License = 'GNU/GPLv3';
     $this->Description = 'Base setup module';
-    $this->Revision = 1;
     $this->Type = ModuleType::System;
 
@@ -59 +58 @@
     $Output = $this->UpdateManager->Upgrade();
     return $Output;
+  }
+
+  function UserLogged(): bool
+  {
+    if (!array_key_exists('SystemPassword', $_SESSION)) $_SESSION['SystemPassword'] = '';
+    if (array_key_exists('login', $_POST)) $_SESSION['SystemPassword'] = $_POST['SystemPassword'];
+    return sha1($_SESSION['SystemPassword']) == Core::Cast($this->System)->Config['SystemPassword'];
   }
 }
@@ -125 +131 @@
   function Show(): string
   {
-    global $ConfigDefinition, $DatabaseRevision, $Config, $Updates;
+    global $DatabaseRevision, $Config;
 
     $this->UpdateManager = ModuleSetup::Cast($this->System->GetModule('Setup'))->UpdateManager;
@@ -136 +142 @@
     if (isset($this->Config))
     {
-      if (!array_key_exists('SystemPassword', $_SESSION)) $_SESSION['SystemPassword'] = '';
-      if (array_key_exists('login', $_POST)) $_SESSION['SystemPassword'] = $_POST['SystemPassword'];
-      if (sha1($_SESSION['SystemPassword']) != $this->Config['SystemPassword'])
+      if (!ModuleSetup::Cast($this->System->GetModule('Setup'))->UserLogged())
       {
         $Output .= $this->LoginPanel();
@@ -153 +157 @@
         else if ($Action == 'models')
         {
-          $this->System->FormManager->UpdateSQLMeta();
+          Core::Cast($this->System)->FormManager->UpdateSQLMeta();
         }
         else if ($Action == 'upgrade')