Changeset 887 for trunk/Modules/OpeningHours/OpeningHours.php

Timestamp:

Nov 20, 2020, 12:08:12 AM (4 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/OpeningHours/OpeningHours.php (modified) (11 diffs)

trunk/Modules/OpeningHours/OpeningHours.php

@@ -5 +5 @@
 class PageSubjectOpenTime extends Page
 {
-  var $FullTitle = 'Otvírací doby místních subjektů';
-  var $ShortTitle = 'Otvírací doby';
-  var $DaysOfWeek = array('Pondělí', 'Úterý', 'Středa', 'Čtvrtek', 'Pátek', 'Sobota', 'Neděle');
-  var $EventType = array('Žádný', 'Otevřeno', 'Zavřeno');
-  var $ParentClass = 'PagePortal';
-
-  function ToHumanTime($Time)
+  public array $DaysOfWeek = array('Pondělí', 'Úterý', 'Středa', 'Čtvrtek', 'Pátek', 'Sobota', 'Neděle');
+  public array $EventType = array('Žádný', 'Otevřeno', 'Zavřeno');
+
+  function __construct(System $System)
+  {
+    parent::__construct($System);
+    $this->FullTitle = 'Otvírací doby místních subjektů';
+    $this->ShortTitle = 'Otvírací doby';
+    $this->ParentClass = 'PagePortal';
+  }
+
+  function ToHumanTime(float $Time): string
   {
     $Hours = floor($Time / 60);
@@ -20 +25 @@
   }
 
-  function ToHumanTime2($Time)
+  function ToHumanTime2(float $Time): string
   {
     $Days = floor($Time / 24 / 60);
@@ -34 +39 @@
   }
 
-  function EditSubject($Id)
-  {
-    if ($this->System->User->CheckPermission('OpeningHours', 'Edit'))
+  function EditSubject(int $Id): string
+  {
+    if (ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('OpeningHours', 'Edit'))
     {
       $Output = '<div class="Centred">';
@@ -73 +78 @@
   }
 
-  function SaveSubject($Id)
-  {
-    global $Config;
-
+  function SaveSubject(int $Id): string
+  {
     $Output = '';
-    if ($this->System->User->CheckPermission('OpeningHours', 'Edit'))
+    if (ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('OpeningHours', 'Edit'))
     {
       $this->Database->delete('SubjectOpenTimeDay', 'Subject='.$Id);
@@ -100 +103 @@
       $Output .= 'Uloženo';
 
-      $File = new File($this->Database);
+      $File = new File($this->System);
 
       // Delete old file
@@ -114 +117 @@
   }
 
-  function ShowAll()
+  function ShowAll(): string
   {
     $Output = '<div class="Centred">';
@@ -138 +141 @@
         }
       }
-      //print_r($Events);
 
       // Calculate time to next event
@@ -190 +192 @@
       if ($Subject['Photo'] != 0) $Output .= '<a href="file?id='.$Subject['Photo'].'">Fotka</a> ';
 
-      if ($this->System->User->CheckPermission('SubjectOpenTime', 'Edit'))
+      if (ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('SubjectOpenTime', 'Edit'))
         $Output .= '<a href="edit?Subject='.$Subject['Id'].'">Editovat</a><br />';
       $Output .= '<br />';
@@ -198 +200 @@
   }
 
-  function Show()
+  function Show(): string
   {
     if (count($this->System->PathItems) > 1)
@@ -215 +217 @@
 class ModuleOpeningHours extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -226 +228 @@
   }
 
-  function DoStart()
-  {
-    $this->System->Pages['otviraci-doby'] = 'PageSubjectOpenTime';
-  }
-
-  function DoInstall()
-  {
-  }
-
-  function DoUnInstall()
+  function DoStart(): void
+  {
+    $this->System->RegisterPage(['otviraci-doby'], 'PageSubjectOpenTime');
+  }
+
+  function DoStop(): void
+  {
+    $this->System->UnregisterPage(['otviraci-doby']);
+  }
+
+  function DoInstall(): void
+  {
+  }
+
+  function DoUnInstall(): void
   {
   }