Changeset 9 for trunk

Timestamp:

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

Author:

chronos

Message:

• Fixed: Modules initialization.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Global.php (modified) (6 diffs)
• Modules/Map/ModuleMap.php (modified) (1 diff)
• Modules/User/ModuleUser.php (modified) (1 diff)
• Modules/User/PasswordHash.php (modified) (1 diff)
• Modules/User/User.php (modified) (3 diffs)
• Packages/Common/Common.php (deleted)
• Packages/Common/Modules/ModuleAdmin.php (modified) (14 diffs)
• Packages/Common/Paging.php (modified) (1 diff)
• Packages/Common/System.php (modified) (1 diff)
• Packages/Common/Table.php (modified) (1 diff)

trunk/Application/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 8;
-$DatabaseRevision = 8;
+$Revision = 9;
+$DatabaseRevision = 7;
 $ReleaseTime = strtotime('2023-06-01');

trunk/Global.php

@@ -1 +1 @@
 <?php
 
-function HumanDate($Time)
+function HumanDate(?string $Time): string
 {
   return date('j.n.Y', $Time);
 }
 
-function GetMicrotime()
+function GetMicrotime(): float
 {
-  list($Usec, $Sec) = explode(" ", microtime());
+  list($Usec, $Sec) = explode(' ', microtime());
   return (float)$Usec + (float)$Sec;
-}
+} 
 
-function MakeLink($Target, $Title)
+function MakeLink(string $Target, string $Title): string
 {
   return '<a href="'.$Target.'">'.$Title.'</a>';
 }
 
-function Table($Table)
+function Table(array $Table): string
 {
-  $Result = '<table cellspacing="0" class="BasicTable">';
-  $Result .= '<tr>';
-  foreach ($Table['Header'] as $Item)
-    $Result .= '<th>'.$Item.'</th>';
-  $Result .= '</tr>';
+  $Result = '<table class="BasicTable">';
+  if (array_key_exists('Header', $Table))
+  {
+    $Result .= '<tr>';
+    foreach ($Table['Header'] as $Item)
+      $Result .= '<th>'.$Item.'</th>';
+    $Result .= '</tr>';
+  }
   foreach ($Table['Rows'] as $Row)
   {
     $Result .= '<tr>';
-    foreach ($Row as $Item)
-      $Result .= '<td>'.$Item.'</td>';
+    foreach ($Row as $Index => $Item)
+    {
+      if ($Index == 0) $Class = ' class="Header"'; else $Class = '';
+      $Result .= '<td'.$Class.' style="width: '.(floor(100 / count($Row))).'%">'.$Item.'</td>';
+    }
     $Result .= '</tr>';
   }
@@ -35 +41 @@
 }
 
-function ShowEditTable($ClassName, $Values)
+function ShowEditTable(string $ClassName, array $Values): string
 {
   global $Classes, $Types;
@@ -68 +74 @@
 }
 
-function ProcessURL()
+function ProcessURL(): array
 {
   if (array_key_exists('REDIRECT_QUERY_STRING', $_SERVER))
@@ -82 +88 @@
 }
 
-function GetQueryStringArray($QueryString)
+function GetQueryStringArray(string $QueryString): array
 {
   $Result = array();
@@ -98 +104 @@
 }
 
-function SetQueryStringArray($QueryStringArray)
+function SetQueryStringArray(array $QueryStringArray): string
 {
   $Parts = array();
@@ -108 +114 @@
 }
 
-function GetRemoteAddress()
+function GetRemoteAddress(): string
 {
   if (array_key_exists('REMOTE_ADDR', $_SERVER)) $IP = $_SERVER['REMOTE_ADDR'];

trunk/Modules/Map/ModuleMap.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/Map.php');
+include_once(dirname(__FILE__).'/MapGoogle.php');
+include_once(dirname(__FILE__).'/MapOSM.php');
+include_once(dirname(__FILE__).'/MapSeznam.php');
 
 class ModuleMap extends Module

trunk/Modules/User/ModuleUser.php

@@ -133 +133 @@
     $this->System->User = new User($this->System);
     if (isset($_SERVER['REMOTE_ADDR'])) $this->System->User->Check();
-    $this->System->RegisterPage('userlist', 'PageUserList');
-    $this->System->RegisterPage('user', 'PageUser');
+    $this->System->RegisterPage(['userlist'], 'PageUserList');
+    $this->System->RegisterPage(['user'], 'PageUser');
     $this->System->RegisterPageBarItem('Top', 'User', array($this, 'TopBarCallback'));
     $this->System->FormManager->RegisterClass('UserLogin', array(

trunk/Modules/User/PasswordHash.php

@@ -1 +1 @@
 <?php
+
 
 class PasswordHash
 {
-  function Hash($Password, $Salt)
+  function Hash(string $Password, string $Salt): string
   {
     return sha1(sha1($Password).$Salt);
   }
 
-  function Verify($Password, $Salt, $StoredHash)
+  function Verify(string $Password, string $Salt, string $StoredHash): bool
   {
     return $this->Hash($Password, $Salt) == $StoredHash;
   }
 
-  function GetSalt()
+  function GetSalt(): string
   {
-    mt_srand(microtime(true) * 100000 + memory_get_usage(true));
+    mt_srand(intval(microtime(true)) * 100000 + memory_get_usage(true));
     return sha1(uniqid(mt_rand(), true));
   }

trunk/Modules/User/User.php

@@ -143 +143 @@
 
             // Send activation mail to user email
-            $ServerURL = 'http://'.$this->System->Config['Web']['Host'].$this->System->Config['Web']['RootFolder'];
+            $ServerURL = 'http://'.Core::Cast($this->System)->Config['Web']['Host'].Core::Cast($this->System)->Config['Web']['RootFolder'];
             $Mail = new Mail();
             $Mail->Subject = 'Registrace nového účtu';
@@ -154 +154 @@
               '<br/><br/>Na tento email neodpovídejte.", 'text/html');
             $Mail->AddTo($Email, $Name);
-            $Mail->From = $this->System->Config['Web']['Title'].' <noreplay@zdechov.net>';
+            $Mail->From = Core::Cast($this->System)->Config['Web']['Title'].' <noreplay@zdechov.net>';
             $Mail->Send();
 
@@ -368 +368 @@
       $NewPassword = substr(sha1(strtoupper($Row['Login'])), 0, 7);
 
-      $ServerURL = 'http://'.$this->System->Config['Web']['Host'].$this->System->Config['Web']['RootFolder'];
+      $ServerURL = 'http://'.Core::Cast($this->System)->Config['Web']['Host'].Core::Cast($this->System)->Config['Web']['RootFolder'];
       $Mail = new Mail();
       $Mail->Subject = 'Obnova hesla';
-      $Mail->From = $this->System->Config['Web']['Title'].' <noreplay@zdechov.net>';
+      $Mail->From = Core::Cast($this->System)->Config['Web']['Title'].' <noreplay@zdechov.net>';
       $Mail->AddTo($Row['Email'], $Row['Name']);
       $Mail->AddBody('Požádali jste o zaslání nového hesla na serveru <a href="'.$ServerURL.'">'.$ServerURL.'"</a>.<br />\n'.

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;