Changeset 9 for trunk/Packages

Timestamp:

Jun 1, 2023, 1:01:38 AM (11 months ago)

Author:

chronos

Message:

• Fixed: Modules initialization.

Location:

trunk/Packages/Common

Files:

• Common.php (deleted)
• Modules/ModuleAdmin.php (modified) (14 diffs)
• Paging.php (modified) (1 diff)
• System.php (modified) (1 diff)
• Table.php (modified) (1 diff)

trunk/Packages/Common/Modules/ModuleAdmin.php

@@ -8 +8 @@
   {
     parent::__construct($System);
-    $this->Name = 'ModuleManager';
+    $this->Name = 'Admin';
     $this->Version = '1.0';
     $this->Creator = 'Chronos';
@@ -49 +49 @@
       ),
     ));
-    $this->System->FormManager->RegisterFormType('TModule', array(
+    Core::Cast($this->System)->FormManager->RegisterFormType('TModule', array(
       'Type' => 'Reference',
       'Table' => 'Module',
@@ -56 +56 @@
       'Filter' => '1',
     ));
-    $this->System->FormManager->RegisterFormType('TModelListModule', array(
+    Core::Cast($this->System)->FormManager->RegisterFormType('TModelListModule', array(
       'Type' => 'ManyToOne',
       'Table' => 'Model',
@@ -63 +63 @@
       'Filter' => '1',
     ));
-    $this->System->FormManager->RegisterClass('Model', array(
+    Core::Cast($this->System)->FormManager->RegisterClass('Model', array(
       'Title' => 'Modely',
       'Table' => 'Model',
@@ -76 +76 @@
       ),
     ));
-    $this->System->FormManager->RegisterFormType('TModel', array(
+    Core::Cast($this->System)->FormManager->RegisterFormType('TModel', array(
       'Type' => 'Reference',
       'Table' => 'Model',
@@ -83 +83 @@
       'Filter' => '1',
     ));
-    $this->System->FormManager->RegisterFormType('TModelFieldListModel', array(
+    Core::Cast($this->System)->FormManager->RegisterFormType('TModelFieldListModel', array(
       'Type' => 'ManyToOne',
       'Table' => 'ModelField',
@@ -90 +90 @@
       'Filter' => '1',
     ));
-    $this->System->FormManager->RegisterClass('ModelField', array(
+    Core::Cast($this->System)->FormManager->RegisterClass('ModelField', array(
       'Title' => 'Pole modelu',
       'Table' => 'ModelField',
@@ -104 +104 @@
       ),
     ));
-    $this->System->FormManager->RegisterFormType('TModuleLink', array(
+    Core::Cast($this->System)->FormManager->RegisterFormType('TModuleLink', array(
       'Type' => 'Reference',
       'Table' => 'ModuleLink',
@@ -111 +111 @@
       'Filter' => '1',
     ));
-    $this->System->FormManager->RegisterFormType('TModuleLinkListModule', array(
+    Core::Cast($this->System)->FormManager->RegisterFormType('TModuleLinkListModule', array(
       'Type' => 'ManyToOne',
       'Table' => 'ModuleLink',
@@ -118 +118 @@
       'Filter' => '1',
     ));
-    $this->System->FormManager->RegisterClass('ModuleLink', array(
+    Core::Cast($this->System)->FormManager->RegisterClass('ModuleLink', array(
       'Title' => 'Vazby modulu',
       'Table' => 'ModuleLink',
@@ -127 +127 @@
       ),
     ));
-    $this->System->FormManager->RegisterFormType('TModule', array(
+    Core::Cast($this->System)->FormManager->RegisterFormType('TModule', array(
       'Type' => 'Reference',
       'Table' => 'Module',
@@ -250 +250 @@
         '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 +303 @@
   {
     //DebugLog('Loading modules...');
-    $this->Modules = array();
     $Query = 'SELECT `Id`, `Name`,`Installed` FROM `Module`';
     $DbResult = $this->Database->query($Query);
@@ -492 +491 @@
     $Output = '';
 
-    $Pageing = new Paging();
+    $Pageing = new Paging($this->System);
     $Pageing->TotalCount = count($this->System->ModuleManager->Modules);
-    $Table = new VisualTable();
+    $Table = new VisualTable($this->System);
     $Table->SetColumns(array(
       array('Name' => 'Name', 'Title' => T('Name')),

trunk/Packages/Common/Paging.php

@@ -8 +8 @@
   public string $SQLLimit;
   public int $Page;
+  private System $System;
 
-  function __construct()
+  function __construct(System $System)
   {
-    global $System;
-
-    $this->ItemPerPage = $System->Config['Web']['ItemsPerPage'];
-    $this->Around = $System->Config['Web']['VisiblePagingItems'];
+    $this->System = $System;
+    $this->ItemPerPage = Core::Cast($this->System)->Config['Web']['ItemsPerPage'];
+    $this->Around = Core::Cast($this->System)->Config['Web']['VisiblePagingItems'];
   }
 

trunk/Packages/Common/System.php

@@ -39 +39 @@
   {
     if (array_key_exists($Name, $this->ModuleManager->Modules))
+    {
       return $this->ModuleManager->Modules[$Name];
-      else return null;
+    }
+    else 
+    {
+      echo('Module '.$Name.' not registered.');
+    }
   }
 

trunk/Packages/Common/Table.php

@@ -99 +99 @@
   private array $OrderDirSQL;
 
-  function __construct()
+  function __construct(System $System)
   {
-    global $System;
-
     $this->Columns = array();
     $this->Table = new TableMemory();
     $this->OrderDirSQL = array('ASC', 'DESC');
-    $this->OrderArrowImage = array($System->Link('/images/sort_asc.png'),
+    $this->OrderArrowImage = array(Core::Cast($System)->Link('/images/sort_asc.png'),
       $System->Link('/images/sort_desc.png'));
     $this->DefaultOrder = 0;