Changeset 9 for trunk/Modules

Timestamp:

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

Author:

chronos

Message:

• Fixed: Modules initialization.

Location:

trunk/Modules

Files:

• Map/ModuleMap.php (modified) (1 diff)
• User/ModuleUser.php (modified) (1 diff)
• User/PasswordHash.php (modified) (1 diff)
• User/User.php (modified) (3 diffs)

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