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

trunk/Modules/RSS/RSS.php

@@ -3 +3 @@
 class ModuleRSS extends AppModule
 {
-  var $RSSChannels;
+  public array $RSSChannels;
 
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -17 +17 @@
   }
 
-  function Start()
+  function DoStart(): void
   {
-    $this->System->RegisterPage('rss', 'PageRSS');
+    $this->System->RegisterPage(['rss'], 'PageRSS');
     $this->System->RegisterPageHeader('RSS', array($this, 'ShowRSSHeader'));
   }
 
-  function RegisterRSS($Channel, $Pos = NULL, $Callback = NULL)
+  function RegisterRSS(array $Channel, $Pos = NULL, $Callback = NULL): void
   {
     $this->RSSChannels[$Channel['Channel']] = $Channel;
 
     if (is_null($Pos)) $this->RSSChannelsPos[] = $Channel['Channel'];
-    else {
+    else
+    {
       array_splice($this->RSSChannelsPos, $Pos, 0, $Channel['Channel']);
     }
   }
 
-  function UnregisterRSS($ChannelName)
+  function UnregisterRSS($ChannelName): void
   {
     unset($this->RSSChannels[$ChannelName]);
@@ -39 +40 @@
   }
 
-  function ShowRSSHeader()
+  function ShowRSSHeader(): string
   {
     $Output = '';
     foreach ($this->RSSChannels as $Channel)
     {
-      //if ($this->System->User->Licence($Channel['Permission']))
+      //if (ModuleUser::Cast($this->System->GetModule('User'))->User->Licence($Channel['Permission']))
         $Output .= ' <link rel="alternate" title="'.$Channel['Title'].'" href="'.
           $this->System->Link('/rss/?channel='.$Channel['Channel']).'" type="application/rss+xml" />';
@@ -50 +51 @@
     return $Output;
   }
+
+  static function Cast(AppModule $AppModule): ModuleRSS
+  {
+    if ($AppModule instanceof ModuleRSS)
+    {
+      return $AppModule;
+    }
+    throw new Exception('Expected ModuleRSS type but got '.gettype($AppModule));
+  }
 }
 
 class PageRSS extends Page
 {
-  function Show()
+  function Show(): string
   {
     $this->ClearPage = true;
@@ -62 +72 @@
     if (array_key_exists('token', $_GET)) $Token = $_GET['token'];
       else $Token = '';
-    if (array_key_exists($ChannelName, $this->System->ModuleManager->Modules['RSS']->RSSChannels))
+    if (array_key_exists($ChannelName, ModuleRSS::Cast($this->System->GetModule('RSS'))->RSSChannels))
     {
-      $Channel = $this->System->ModuleManager->Modules['RSS']->RSSChannels[$ChannelName];
-      if ($this->System->User->CheckPermission($Channel['Permission']['Module'], $Channel['Permission']['Operation']) or
-      $this->System->User->CheckToken($Channel['Permission']['Module'], $Channel['Permission']['Operation'], $Token))
+      $Channel = ModuleRSS::Cast($this->System->GetModule('RSS'))->RSSChannels[$ChannelName];
+      if (ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission($Channel['Permission']['Module'], $Channel['Permission']['Operation']) or
+      ModuleUser::Cast($this->System->GetModule('User'))->User->CheckToken($Channel['Permission']['Module'], $Channel['Permission']['Operation'], $Token))
       {
         if (is_string($Channel['Callback'][0]))