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

trunk/Modules/TV/TV.php

@@ -5 +5 @@
 class PageIPTV extends Page
 {
-  var $FullTitle = 'Síťová televize';
-  var $ShortTitle = 'IPTV';
-  var $ParentClass = 'PagePortal';
-
-  function Show()
+  function __construct(System $System)
   {
-    if (count($this->System->PathItems) > 1)
-    {
-      if ($this->System->PathItems[1] == 'playlist.m3u') return $this->ShowPlayList();
-        else return PAGE_NOT_FOUND;
-    } else return $this->ShowChannelList();
+    parent::__construct($System);
+    $this->FullTitle = 'Síťová televize';
+    $this->ShortTitle = 'IPTV';
+    $this->ParentClass = 'PagePortal';
   }
 
-  function ShowChannelList()
+  function Show(): string
   {
-    global $Channels;
-
-    $Output = 'Stažení přehrávače: <a href="http://www.videolan.org/vlc/">VLC Media Player</a><br/>'.
+    $Output = 'Stažení přehrávače: <a href="https://www.videolan.org/vlc/">VLC Media Player</a><br/>'.
     'Seznam všech kanálů do přehrávače: <a href="playlist.m3u">Playlist</a><br/>'.
     'Zobrazení playlistu ve VLC lze provést pomocí menu <strong>View - Playlist</strong> nebo klávesové zkratky CTRL+L<br/>'.
@@ -28 +21 @@
     '<div align="center"><strong>Výpis kanálů:</strong><br>';
 
-    $Where =
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `TV` LEFT JOIN `TVGroup` ON `TVGroup`.`Id` = `TV`.`Category` '.
       ' LEFT JOIN `Language` ON `Language`.`Id` = `TV`.`Language` WHERE (`TV`.`Stream` <> "") OR (`TV`.`StreamWeb` <> "")');
@@ -69 +61 @@
     $Output .= '</div><br/>';
 
-    $Output .= 'Další online TV na webu: <a href="http://spustit.cz">Spustit.cz</a><br/>';
-    $Output .= 'Další online TV na webu: <a href="http://www.tvinfo.cz/live/televize/evropa/cz">TV info</a><br/>';
+    $Output .= 'Další online TV na webu: <a href="https://spustit.cz/">Spustit.cz</a><br/>';
 
     return $Output;
   }
+}
 
-  function ShowPlayList()
+class PagePlaylist extends Page
+{
+  function Show(): string
   {
     $this->ClearPage = true;
@@ -82 +76 @@
     Header("Content-Disposition: attachment; filename=playlist.m3u");
 
-    echo('#EXTM3U'."\n");
+    $Output = '#EXTM3U'."\n";
     if (array_key_exists('id', $_GET))
     {
@@ -89 +83 @@
       {
         $Channel = $DbResult->fetch_array();
-        echo('#EXTINF:0,'.$Channel['Name']."\n");
-        echo($Channel['Stream']."\n");
+        $Output .= '#EXTINF:0,'.$Channel['Name']."\n";
+        $Output .= $Channel['Stream']."\n";
       }
     } else
@@ -97 +91 @@
       while ($Channel = $DbResult->fetch_array())
       {
-        echo('#EXTINF:0,'.$Channel['Name']."\n");
-        echo($Channel['Stream']."\n");
+        $Output .= '#EXTINF:0,'.$Channel['Name']."\n";
+        $Output .= $Channel['Stream']."\n";
       }
     }
+    return $Output;
   }
 }
@@ -106 +101 @@
 class ModuleTV extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -117 +112 @@
   }
 
-  function DoInstall()
+  function DoInstall(): void
   {
   }
 
-  function DoUninstall()
+  function DoUninstall(): void
   {
   }
 
-  function DoStart()
+  function DoStart(): void
   {
-    $this->System->RegisterPage('tv', 'PageIPTV');
+    $this->System->RegisterPage(['tv'], 'PageIPTV');
+    $this->System->RegisterPage(['tv', 'playlist.m3u'], 'PagePlaylist');
     $this->System->FormManager->RegisterClass('TV', array(
       'Title' => 'TV kanály',
@@ -170 +166 @@
   }
 
-  function DoStop()
+  function DoStop(): void
   {
   }