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

trunk/Modules/News/News.php

@@ -13 +13 @@
 class ModuleNews extends AppModule
 {
-  var $NewsCountPerCategory = 3;
-  var $UploadedFilesFolder = 'files/news/';
-
-  function __construct($System)
+  public int $NewsCountPerCategory = 3;
+  public string $UploadedFilesFolder = 'files/news/';
+
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -28 +28 @@
   }
 
-  function DoInstall()
-  {
-  }
-
-  function DoUnInstall()
-  {
-  }
-
-  function DoStart()
-  {
-    $this->System->RegisterPage('aktuality', 'PageNews');
-    $this->System->RegisterPage(array('aktuality', 'aktualizace'), 'PageNewsUpdate');
+  function DoInstall(): void
+  {
+  }
+
+  function DoUnInstall(): void
+  {
+  }
+
+  function DoStart(): void
+  {
+    $this->System->RegisterPage(['aktuality'], 'PageNews');
+    $this->System->RegisterPage(['aktuality', 'subscription'], 'PageNewsSubscription');
+    $this->System->RegisterPage(['aktuality', 'rss'], 'PageNewsRss');
+    $this->System->RegisterPage(['aktuality', 'aktualizace'], 'PageNewsUpdate');
     $this->System->FormManager->RegisterClass('News', array(
       'Title' => 'Aktualita',
@@ -86 +88 @@
     if ($this->System->ModuleManager->ModulePresent('Search'))
     {
-      $this->System->ModuleManager->Modules['Search']->RegisterSearch('Novinky', 'News', array('Title', 'Content'));
-    }
-  }
-
-  function ShowNews($Category, $ItemCount, $DaysAgo)
+      ModuleSearch::Cast($this->System->GetModule('Search'))->RegisterSearch('Novinky', 'News', array('Title', 'Content'));
+    }
+  }
+
+  function ShowNews(string $Category, int $ItemCount, int $DaysAgo): string
   {
     $ItemCount = abs($ItemCount);
@@ -98 +100 @@
     $Output = '<div class="NewsPanel"><div class="Title">'.$Row['Caption'];
     $Output .= '<div class="Action"><a href="aktuality/?category='.$Category.'">Zobrazit</a>';
-    if ($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category))
+    if (ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('News', 'Insert', 'Group', $Category))
       $Output .= ' <a href="aktuality/?action=add&amp;category='.$Category.'">Přidat</a>';
     $Output .= '</div></div><div class="Content">';
@@ -139 +141 @@
   }
 
-  function LoadSettingsFromCookies()
+  function LoadSettingsFromCookies(): void
   {
     // Initialize default news setting
@@ -163 +165 @@
   }
 
-  function Show()
+  function Show(): string
   {
     $Output = '';
@@ -197 +199 @@
   }
 
-  function ShowCustomizeMenu()
+  function ShowCustomizeMenu(): string
   {
     $Output = '<form action="?Action=CustomizeNewsSave" method="post">';
@@ -220 +222 @@
   }
 
-  function CustomizeSave()
+  function CustomizeSave(): void
   {
     $Checkbox = array('' => 0, 'on' => 1);
@@ -245 +247 @@
   }
 
-  function ModifyContent($Content)
+  function ModifyContent(string $Content): string
   {
     $Result = '';
@@ -254 +256 @@
     {
       $I = strpos($Content, 'http://');
-      if (($I > 0) and ($Content{$I - 1} != '"'))
+      if (($I > 0) and ($Content[$I - 1] != '"'))
       {
         $Result .= substr($Content, 0, $I);
@@ -272 +274 @@
     return $Result;
   }
+
+  static function Cast(AppModule $AppModule): ModuleNews
+  {
+    if ($AppModule instanceof ModuleNews)
+    {
+      return $AppModule;
+    }
+    throw new Exception('Expected ModuleNews type but got '.gettype($AppModule));
+  }
 }