Changeset 981

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Packages/Common/Modules/ModuleManager.php (modified) (15 diffs)
• Packages/Common/Modules/Setup.php (modified) (5 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 977; // Subversion revision
+$Revision = 981; // Subversion revision
 $DatabaseRevision = 970; // SQL structure revision
-$ReleaseTime = strtotime('2025-06-30');
+$ReleaseTime = strtotime('2026-12-01');

trunk/Packages/Common/Modules/ModuleManager.php

@@ -14 +14 @@
     $this->Description = 'User interface for module management.';
     $this->Dependencies = array(ModuleSetup::GetName());
-    $this->Revision = 1;
     $this->Type = ModuleType::System;
     $this->Models = array(ModelField::GetClassName(), ModuleDependency::GetClassName());
@@ -30 +29 @@
     //$this->LoadFromDatabase();
 
-    $this->System->FormManager->RegisterClass('Module', array(
+    Core::Cast($this->System)->FormManager->RegisterClass('Module', array(
       'Title' => 'Moduly',
       'Table' => 'Module',
@@ -49 +48 @@
       ),
     ));
-    $this->System->FormManager->RegisterFormType('TModule', array(
+    Core::Cast($this->System)->FormManager->RegisterFormType('TModule', array(
       'Type' => 'Reference',
       'Table' => 'Module',
@@ -56 +55 @@
       'Filter' => '1',
     ));
-    $this->System->FormManager->RegisterFormType('TModelListModule', array(
+    Core::Cast($this->System)->FormManager->RegisterFormType('TModelListModule', array(
       'Type' => 'ManyToOne',
       'Table' => 'Model',
@@ -63 +62 @@
       'Filter' => '1',
     ));
-    $this->System->FormManager->RegisterClass('Model', array(
+    Core::Cast($this->System)->FormManager->RegisterClass('Model', array(
       'Title' => 'Modely',
       'Table' => 'Model',
@@ -76 +75 @@
       ),
     ));
-    $this->System->FormManager->RegisterFormType('TModel', array(
+    Core::Cast($this->System)->FormManager->RegisterFormType('TModel', array(
       'Type' => 'Reference',
       'Table' => 'Model',
@@ -83 +82 @@
       'Filter' => '1',
     ));
-    $this->System->FormManager->RegisterFormType('TModelFieldListModel', array(
+    Core::Cast($this->System)->FormManager->RegisterFormType('TModelFieldListModel', array(
       'Type' => 'ManyToOne',
       'Table' => 'ModelField',
@@ -90 +89 @@
       'Filter' => '1',
     ));
-    $this->System->FormManager->RegisterClass('ModelField', array(
+    Core::Cast($this->System)->FormManager->RegisterClass('ModelField', array(
       'Title' => 'Pole modelu',
       'Table' => 'ModelField',
@@ -104 +103 @@
       ),
     ));
-    $this->System->FormManager->RegisterFormType('TModuleLink', array(
+    Core::Cast($this->System)->FormManager->RegisterFormType('TModuleLink', array(
       'Type' => 'Reference',
       'Table' => 'ModuleLink',
@@ -111 +110 @@
       'Filter' => '1',
     ));
-    $this->System->FormManager->RegisterFormType('TModuleLinkListModule', array(
+    Core::Cast($this->System)->FormManager->RegisterFormType('TModuleLinkListModule', array(
       'Type' => 'ManyToOne',
       'Table' => 'ModuleLink',
@@ -118 +117 @@
       'Filter' => '1',
     ));
-    $this->System->FormManager->RegisterClass('ModuleLink', array(
+    Core::Cast($this->System)->FormManager->RegisterClass('ModuleLink', array(
       'Title' => 'Vazby modulu',
       'Table' => 'ModuleLink',
@@ -127 +126 @@
       ),
     ));
-    $this->System->FormManager->RegisterFormType('TModule', array(
+    Core::Cast($this->System)->FormManager->RegisterFormType('TModule', array(
       'Type' => 'Reference',
       'Table' => 'Module',
@@ -250 +249 @@
         'Type' => ModelColumnType::GetName($Field->Type), 'Nullable' => (int)$Field->Nullable));
     }
-    if ($ModelDesc->DefaultValues != null)
-    {
-      $Values = call_user_func('self::'.$ModelDesc->DefaultValues);
+    if ($ModelDesc->DefaultValuesMethod != null)
+    {
+      $Values = call_user_func('self::'.$ModelDesc->DefaultValuesMethod);
       foreach ($Values as $Value)
       {
@@ -303 +302 @@
   {
     //DebugLog('Loading modules...');
-    $this->Modules = array();
     $Query = 'SELECT `Id`, `Name`,`Installed` FROM `Module`';
     $DbResult = $this->Database->query($Query);
@@ -419 +417 @@
   function Show(): string
   {
+    if (!ModuleSetup::Cast($this->System->GetModule('Setup'))->UserLogged())
+      return 'Nemáte oprávnění';
+
     $Output = '';
     if (array_key_exists('op', $_GET)) $Operation = $_GET['op'];

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')