Changeset 887 for trunk/Modules/User/UserPage.php

Timestamp:

Nov 20, 2020, 12:08:12 AM (3 years ago)

Author:

chronos

Message:

• Added: Static types added to almost all classes, methods and function. Supported by PHP 7.4.
• Fixed: Various found code issues.

File:

• trunk/Modules/User/UserPage.php (modified) (13 diffs)

trunk/Modules/User/UserPage.php

@@ -3 +3 @@
 class PageUser extends Page
 {
-  var $FullTitle = 'Uživatel';
-  var $ShortTitle = 'Uživatel';
-  var $ParentClass = 'PagePortal';
-
-  function Panel($Title, $Content, $Menu = array())
+  function __construct(System $System)
+  {
+    parent::__construct($System);
+    $this->FullTitle = 'Uživatel';
+    $this->ShortTitle = 'Uživatel';
+    $this->ParentClass = 'PagePortal';
+  }
+
+  function Panel(string $Title, string $Content, array $Menu = array()): string
   {
     if (count($Menu) > 0)
@@ -15 +19 @@
   }
 
-  function ShowContacts()
+  function ShowContacts(): string
   {
     $Query = 'SELECT `Contact`.`Value`, `Contact`.`Description`, (SELECT `Name` FROM `ContactCategory` WHERE `ContactCategory`.`Id` = `Contact`.`Category`) AS `Category` '.
       'FROM `Contact` WHERE `User` = '.
-      $this->System->User->User['Id'];
+      ModuleUser::Cast($this->System->GetModule('User'))->User->User['Id'];
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS T');
     $DbRow = $DbResult->fetch_row();
@@ -53 +57 @@
   }
 
-  function ShowUserPanel()
-  {
+  function ShowUserPanel(): string
+  {
+    $User = &ModuleUser::Cast($this->System->GetModule('User'))->User;
     $Output = '';
-    if ($this->System->User->User['Id'] != null)
+    if ($User->User['Id'] != null)
     {
       $Actions = '';
-      foreach ($this->System->ModuleManager->Modules['User']->UserPanel as $Action)
+      foreach (ModuleUser::Cast($this->System->GetModule('User'))->UserPanel as $Action)
       {
         if (is_string($Action[0]))
@@ -71 +76 @@
       $Output .= $this->Panel('Nabídka uživatele', $Actions);
       $Output .= '</td><td style="vertical-align:top;">';
-      if ($this->System->User->User['Id'] != null)
+      if ($User->User['Id'] != null)
         {
           $Form = new Form($this->System->FormManager);
           $Form->SetClass('UserOptions');
-          $Form->LoadValuesFromDatabase($this->System->User->User['Id']);
+          $Form->LoadValuesFromDatabase($User->User['Id']);
           $Form->OnSubmit = '?Action=UserOptionsSave';
           $Output .= $Form->ShowViewForm();
@@ -88 +93 @@
   }
 
-  function Show()
-  {
+  function Show(): string
+  {
+    $User = &ModuleUser::Cast($this->System->GetModule('User'))->User;
     $Output = '';
     if (array_key_exists('Action', $_GET))
@@ -112 +118 @@
           if (array_key_exists('StayLogged', $_POST) and ($_POST['StayLogged'] == 'on')) $StayLogged = true;
             else $StayLogged = false;
-          $Result = $this->System->User->Login($_POST['Username'], $_POST['Password'], $StayLogged);
+          $Result = $User->Login($_POST['Username'], $_POST['Password'], $StayLogged);
           $Output .= $this->SystemMessage('Přihlášení', $Result);
           if ($Result <> USER_LOGGED_IN)
@@ -130 +136 @@
       if ($Action == 'Logout')
       {
-        if ($this->System->User->User['Id'] != null)
-        {
-          $Output .= $this->SystemMessage('Odhlášení', $this->System->User->Logout());
+        if ($User->User['Id'] != null)
+        {
+          $Output .= $this->SystemMessage('Odhlášení', $User->Logout());
         } else $Output .= $this->SystemMessage('Nastavení uživatele', 'Nejste přihlášen');
       } else
       if ($Action == 'UserOptions')
       {
-        if ($this->System->User->User['Id'] != null)
+        if ($User->User['Id'] != null)
         {
           $Form = new Form($this->System->FormManager);
           $Form->SetClass('UserOptions');
-          $Form->LoadValuesFromDatabase($this->System->User->User['Id']);
+          $Form->LoadValuesFromDatabase($User->User['Id']);
           $Form->OnSubmit = '?Action=UserOptionsSave';
           $Output .= $Form->ShowEditForm();
@@ -151 +157 @@
         $Form->SetClass('UserOptions');
         $Form->LoadValuesFromForm();
-        $Form->SaveValuesToDatabase($this->System->User->User['Id']);
+        $Form->SaveValuesToDatabase($User->User['Id']);
         $Output .= $this->SystemMessage('Nastavení', 'Nastavení uloženo.');
-        $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Nastavení uživatele změněno', $Form->Values['Name']);
-        $Form->LoadValuesFromDatabase($this->System->User->User['Id']);
+        ModuleLog::Cast($this->System->GetModule('Log'))->NewRecord('User', 'Nastavení uživatele změněno', $Form->Values['Name']);
+        $Form->LoadValuesFromDatabase($User->User['Id']);
         $Form->OnSubmit = '?Action=UserOptionsSave';
         $Output .= $Form->ShowEditForm();
@@ -169 +175 @@
       {
         $Output .= $this->SystemMessage('Potvrzení registrace',
-          $this->System->User->RegisterConfirm($_GET['User'], $_GET['H']));
+          $User->RegisterConfirm($_GET['User'], $_GET['H']));
       } else
       if ($Action == 'PasswordRecovery')
@@ -183 +189 @@
         $Form->SetClass('PasswordRecovery');
         $Form->LoadValuesFromForm();
-        $Result = $this->System->User->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
+        $Result = $User->PasswordRecoveryRequest($Form->Values['Name'], $Form->Values['Email']);
         $Output .= $this->SystemMessage('Obnova hesla', $Result);
         if ($Result <> USER_PASSWORD_RECOVERY_SUCCESS)
@@ -192 +198 @@
       if ($Action == 'PasswordRecoveryConfirm')
       {
-        $Output .= $this->SystemMessage('Obnova hesla', $this->System->User->PasswordRecoveryConfirm($_GET['User'], $_GET['H'], $_GET['P']));
+        $Output .= $this->SystemMessage('Obnova hesla', $User->PasswordRecoveryConfirm($_GET['User'], $_GET['H'], $_GET['P']));
       } else
       if ($Action == 'UserRegisterSave')
@@ -199 +205 @@
         $Form->SetClass('UserRegister');
         $Form->LoadValuesFromForm();
-        $Result = $this->System->User->Register($Form->Values['Login'], $Form->Values['Password'],
+        $Result = $User->Register($Form->Values['Login'], $Form->Values['Password'],
           $Form->Values['Password2'], $Form->Values['Email'], $Form->Values['Name']);
         $Output .= $this->SystemMessage('Registrace nového účtu', $Result);
@@ -216 +222 @@
   }
 
-  function ShowMain()
+  function ShowMain(): string
   {
     $Output = 'Nebyla vybrána akce';