Changeset 887 for trunk/Modules/Portal/Portal.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/Portal/Portal.php (modified) (15 diffs)

trunk/Modules/Portal/Portal.php

@@ -5 +5 @@
 class ModulePortal extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -16 +16 @@
   }
 
-  function DoInstall()
-  {
-  }
-
-  function DoUninstall()
-  {
-  }
-
-  function DoStart()
-  {
-    $this->System->RegisterPage('', 'PagePortal');
+  function DoInstall(): void
+  {
+  }
+
+  function DoUninstall(): void
+  {
+  }
+
+  function DoStart(): void
+  {
+    $this->System->RegisterPage([''], 'PagePortal');
     $this->System->FormManager->RegisterClass('MemberOptions', array(
       'Title' => 'Nastavení zákazníka',
@@ -42 +42 @@
       ),
     ));
-    $this->System->ModuleManager->Modules['User']->UserPanel[] = array('PagePortal', 'UserPanel');
-  }
-
-  function DoStop()
+    ModuleUser::Cast($this->System->GetModule('User'))->UserPanel[] = array('PagePortal', 'UserPanel');
+  }
+
+  function DoStop(): void
   {
   }
@@ -52 +52 @@
 class PagePortal extends Page
 {
-  var $FullTitle = 'Zděchovský rozcestník';
-  var $ShortTitle = 'Rozcestník';
-
-  function ShowActions($ActionGroup)
+  function __construct(System $System)
+  {
+    parent::__construct($System);
+    $this->FullTitle = 'Zděchovský rozcestník';
+    $this->ShortTitle = 'Rozcestník';
+  }
+
+  function ShowActions(array $ActionGroup): string
   {
     $Output = '';
@@ -67 +71 @@
   }
 
-  function InfoBar()
+  function InfoBar(): string
   {
     $Output2 = '';
@@ -98 +102 @@
     //$Output .= 'Server běží: '.$this->GetServerUptime().'      ';
 
-    if ($this->System->User->CheckPermission('Finance', 'DisplaySubjectState'))
-    {
-      $DbResult = $this->Database->select('MemberPayment', 'Cash', 'Member=(SELECT Customer FROM UserCustomerRel WHERE Id='.$this->System->User->User['Id'].')');
+    if (ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('Finance', 'DisplaySubjectState'))
+    {
+      $DbResult = $this->Database->select('MemberPayment', 'Cash', 'Member=(SELECT Customer FROM UserCustomerRel WHERE Id='.ModuleUser::Cast($this->System->GetModule('User'))->User->User['Id'].')');
       if ($DbResult->num_rows > 0)
       {
@@ -112 +116 @@
   }
 
-  function UserPanel()
-  {
+  function UserPanel(): string
+  {
+    $User = &ModuleUser::Cast($this->System->GetModule('User'))->User;
     $Output = '<a href="'.$this->System->Link('/user/?Action=UserOptions').'">Profil</a><br />';
-    if ($this->System->User->CheckPermission('Finance', 'MemberOptions'))
+    if ($User->CheckPermission('Finance', 'MemberOptions'))
       $Output .= '<a href="'.$this->System->Link('/?Action=MemberOptions').'">Fakturační adresa</a><br />';
-    if ($this->System->User->CheckPermission('Finance', 'DisplaySubjectState'))
+    if ($User->CheckPermission('Finance', 'DisplaySubjectState'))
       $Output .= '<a href="'.$this->System->Link('/finance/platby/').'">Finance</a><br />';
-    if ($this->System->User->CheckPermission('Network', 'RegistredHostList'))
+    if ($User->CheckPermission('Network', 'RegistredHostList'))
       $Output .= '<a href="'.$this->System->Link('/network/user-hosts/').'">Počítače</a><br />';
-    if ($this->System->User->CheckPermission('News', 'Insert'))
+    if ($User->CheckPermission('News', 'Insert'))
       $Output .= '<a href="'.$this->System->Link('/aktuality/?action=add').'">Vložení aktuality</a><br />';
-    if ($this->System->User->CheckPermission('EatingPlace', 'Edit'))
+    if ($User->CheckPermission('EatingPlace', 'Edit'))
       $Output .= '<a href="'.$this->System->Link('/jidelna/menuedit.php').'">Úprava jídelníčků</a><br />';
-    if ($this->System->User->CheckPermission('Finance', 'Manage'))
+    if ($User->CheckPermission('Finance', 'Manage'))
       $Output .= '<a href="'.$this->System->Link('/finance/sprava/').'">Správa financí</a><br />';
-    if ($this->System->User->CheckPermission('IS', 'Manage'))
+    if ($User->CheckPermission('IS', 'Manage'))
       $Output .= '<a href="'.$this->System->Link('/is/').'">Správa dat</a><br />';
     return $Output;
   }
 
-  function WebcamPanel()
-  {
-    $Output = $this->System->ModuleManager->Modules['WebCam']->ShowImage();
-    return $Output;
-  }
-
-  function MeteoPanel()
+  function WebcamPanel(): string
+  {
+    $Output = ModuleWebCam::Cast($this->System->GetModule('WebCam'))->ShowImage();
+    return $Output;
+  }
+
+  function MeteoPanel(): string
   {
     $Output = '<a href="https://stat.zdechov.net/meteo/?Measure=28" title="Klikněte pro detailní informace a předpověď"><img src="https://www.zdechov.net/meteo/koliba.png" border="0" alt="Počasí - Meteostanice Zděchov" width="150" height="150" /></a>';
@@ -144 +149 @@
   }
 
-  function OnlineHostList()
+  function OnlineHostList(): string
   {
     $Output = '<span style="font-size: smaller;">';
@@ -158 +163 @@
   }
 
-  function ShowBadPayerList()
-  {
-    $Output .= '<div class="PanelTitle">Dlužníci:</div><span style="font-size: smaller;">';
-    $DbResult = $Database->select('Subject', 'Name', 'Money < 0 ORDER BY Money');
+  function ShowBadPayerList(): string
+  {
+    $Output = '<div class="PanelTitle">Dlužníci:</div><span style="font-size: smaller;">';
+    $DbResult = $this->Database->select('Subject', 'Name', 'Money < 0 ORDER BY Money');
     while ($Row = $DbResult->fetch_array())
     {
@@ -170 +175 @@
   }
 
-  function Panel($Title, $Content, $Menu = array())
+  function Panel(string $Title, string $Content, array $Menu = array()): string
   {
     if (count($Menu) > 0)
+    {
       foreach ($Menu as $Item)
+      {
         $Title .= '<div class="Action">'.$Item.'</div>';
+      }
+    }
     return '<div class="Panel"><div class="Title">'.$Title.'</div><div class="Content">'.$Content.'</div></div>';
   }
 
-  function Show()
+  function Show(): string
   {
     $Output = '';
@@ -186 +195 @@
       if ($Action == 'CustomizeNewsSave')
       {
-        $Output .= $this->System->ModuleManager->Modules['News']->CustomizeSave();
+        $Output .= ModuleNews::Cast($this->System->GetModule('News'))->CustomizeSave();
       } else
       if ($Action == 'MemberOptions')
       {
         $DbResult = $this->Database->query('SELECT `Customer` FROM `UserCustomerRel` '.
-          'WHERE `User`='.$this->System->User->User['Id']);
+          'WHERE `User`='.ModuleUser::Cast($this->System->GetModule('User'))->User->User['Id']);
         while ($CustomerUserRel = $DbResult->fetch_assoc())
         {
@@ -218 +227 @@
           $Form->Values['FamilyMemberCount'] = 0;
 
-        $DbResult = $this->Database->update('Member', 'Id='.$this->System->User->User['Member'],
+        $User = &ModuleUser::Cast($this->System->GetModule('User'))->User;
+        $DbResult = $this->Database->update('Member', 'Id='.$User->User['Member'],
            array('FamilyMemberCount' => $Form->Values['FamilyMemberCount']));
-        $DbResult = $this->Database->query('SELECT Subject FROM Member WHERE Id='.$this->System->User->User['Member']);
+        $DbResult = $this->Database->query('SELECT Subject FROM Member WHERE Id='.$User->User['Member']);
         $Member = $DbResult->fetch_assoc();
         $DbResult = $this->Database->update('Subject', 'Id='.$Member['Subject'],
@@ -228 +238 @@
           'DIC' => $Form->Values['DIC']));
         $Output .= $this->SystemMessage('Nastavení', 'Nastavení zákazníka uloženo.');
-        $this->System->ModuleManager->Modules['Log']->NewRecord('Member+Subject', 'Nastavení zákazníka/subjektu změněno',
+        ModuleLog::Cast($this->System->GetModule('Log'))->NewRecord('Member+Subject', 'Nastavení zákazníka/subjektu změněno',
           $Form->Values['Name']);
         $DbResult = $this->Database->query('SELECT Member.Id, Member.FamilyMemberCount, '.
           'Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, '.
           'Subject.AddressCountry, Subject.IC, Subject.DIC FROM Member JOIN Subject '.
-          'ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->User->User['Member']);
+          'ON Subject.Id = Member.Subject WHERE Member.Id='.$User->User['Member']);
         $DbRow = $DbResult->fetch_array();
         foreach ($Form->Definition['Items'] as $Index => $Item)
@@ -246 +256 @@
   }
 
-  function ShowMain()
+  function ShowMain(): string
   {
     $Output = '';
@@ -270 +280 @@
         else if ($Panel['Module'] == 'UserOptions')
         {
-          //if ($this->System->User->User['Id'] != null) $Output .= $this->Panel('Přihlášený uživatel', $this->UserPanel());
+          //if (ModuleUser::Cast($this->System->GetModule('User'))->User->User['Id'] != null) $Output .= $this->Panel('Přihlášený uživatel', $this->UserPanel());
         } else
         if ($Panel['Module'] == 'Webcam') $Output .= $this->Panel('Kamery', $this->WebcamPanel());
         if ($Panel['Module'] == 'Meteo') $Output .= $this->Panel('Meteostanice', $this->MeteoPanel());
         else if ($Panel['Module'] == 'NewsGroupList')
-          $Output .= $this->Panel('Aktuality', $this->System->ModuleManager->Modules['News']->Show(), array('<a href="?Action=CustomizeNews">Upravit</a>'));
+          $Output .= $this->Panel('Aktuality', ModuleNews::Cast($this->System->GetModule('News'))->Show(), array('<a href="?Action=CustomizeNews">Upravit</a>'));
       }
       $Output .= '</td>';