Changeset 473 for trunk

Timestamp:

Jan 1, 2013, 12:21:11 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Otvírací doby přepracovány na aplikační modul.
• Upraveno: Předávání zobrazení stránek nyní pracuje se stromem registrovaných stránek.

Location:

trunk

Files:

• Common/Global.php (modified) (4 diffs)
• Common/Page.php (modified) (1 diff)
• Modules/OpeningHours (added)
• Modules/OpeningHours/OpeningHours.php (added)
• Modules/TV/TV.php (modified) (4 diffs)
• index.php (modified) (1 diff)
• otevreno.php (deleted)

trunk/Common/Global.php

@@ -32 +32 @@
 include_once(dirname(__FILE__).'/../Modules/Network/Network.php');
 include_once(dirname(__FILE__).'/../Modules/TV/TV.php');
-
+include_once(dirname(__FILE__).'/../Modules/OpeningHours/OpeningHours.php');
 $PrefixMultipliers = array
 (
@@ -110 +110 @@
   /** @var AppModuleManager */
   var $ModuleManager;
+  var $PathItems;
 
   function __construct()
@@ -125 +126 @@
   }
   
-  function ShowPage($Path)
+  function SearchPage($PathItems, $Pages)
+  {
+    $PathItem = $PathItems[0];
+    if(array_key_exists($PathItem, $Pages))
+    {
+      if(is_array($Pages[$PathItem])) 
+      {
+        array_shift($PathItems);
+        return(SearchPage($PathItems, $Path[$PathItem]));
+      } else return($this->Pages[$PathItem]);
+    } else return('');
+  }
+  
+  function ShowPage()
   {
     /* @var $Page Page */
-    if(array_key_exists($Path, $this->Pages)) 
-    {
-      $ClassName = $this->Pages[$Path];
+    $ClassName = $this->SearchPage($this->PathItems, $this->Pages);     
+    if($ClassName != '') 
+    {
       $Page = new $ClassName();
       $Page->System = &$this;
       $Page->Database = &$this->Database;
       $Page->GetOutput();
-    } else echo('Page '.$Path.' not found.');
+    } else echo('Page '.implode('/', $this->PathItems).' not found.');
   }
   
@@ -283 +297 @@
   $System->ModuleManager->RegisterModule(new Network($System));
   $System->ModuleManager->RegisterModule(new TV($System));
+  $System->ModuleManager->RegisterModule(new ModuleOpeningHours($System));
   $System->ModuleManager->StartAll();
 }

trunk/Common/Page.php

@@ -1 +1 @@
 <?php
+
+define('PAGE_NOT_FOUND', 'Stránka nenalezena');
 
 class Page extends Module

trunk/Modules/TV/TV.php

@@ -2 +2 @@
 
 include_once('Common/Global.php');
-
-class PagePlayList extends Page
-{
-  function Show()
-  {
-    $this->ClearPage = true;
-        
-    Header("Content-Type: audio/mpegurl");
-    Header("Content-Disposition: attachment; filename=playlist.m3u");
-
-    echo('#EXTM3U'."\n");
-    if(array_key_exists('id', $_GET))
-    {
-      $DbResult = $this->Database->select('TV', '*', ' (`Stream` <> "") AND (`ShortName`="'.addslashes($_GET['id']).'") ');
-      if($DbResult->num_rows > 0)
-      {
-        $Channel = $DbResult->fetch_array();
-        echo('#EXTINF:0,'.$Channel['Name']."\n");
-        echo($Channel['Stream']."\n");
-      }
-    } else
-    {
-      $DbResult = $this->Database->select('TV', '*', ' (`Stream` <> "") ORDER BY `Name` ');
-      while($Channel = $DbResult->fetch_array())
-      {
-        echo('#EXTINF:0,'.$Channel['Name']."\n");
-        echo($Channel['Stream']."\n");
-      }
-    }
-  }
-}
 
 class PageIPTV extends Page
@@ -40 +9 @@
   
   function Show()
+  {   
+    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());
+  }
+  
+  function ShowChannelList()
   {
     global $Channels;
@@ -96 +74 @@
     return($Output);
   }
+
+  function ShowPlayList()
+  {
+    $this->ClearPage = true;
+        
+    Header("Content-Type: audio/mpegurl");
+    Header("Content-Disposition: attachment; filename=playlist.m3u");
+
+    echo('#EXTM3U'."\n");
+    if(array_key_exists('id', $_GET))
+    {
+      $DbResult = $this->Database->select('TV', '*', ' (`Stream` <> "") AND (`ShortName`="'.addslashes($_GET['id']).'") ');
+      if($DbResult->num_rows > 0)
+      {
+        $Channel = $DbResult->fetch_array();
+        echo('#EXTINF:0,'.$Channel['Name']."\n");
+        echo($Channel['Stream']."\n");
+      }
+    } else
+    {
+      $DbResult = $this->Database->select('TV', '*', ' (`Stream` <> "") ORDER BY `Name` ');
+      while($Channel = $DbResult->fetch_array())
+      {
+        echo('#EXTINF:0,'.$Channel['Name']."\n");
+        echo($Channel['Stream']."\n");
+      }
+    }
+  }  
 }
 
@@ -123 +129 @@
     parent::Start();
     $this->System->RegisterPage('tv', 'PageIPTV');
-    $this->System->RegisterPage('tv/playlist.m3u', 'PagePlayList');    
   }  
   

trunk/index.php

@@ -2 +2 @@
 
 include_once('Common/Global.php');
-$Path = ProcessURL();
-$System->ShowPage(implode('/', $Path));
+$System->PathItems = ProcessURL();
+$System->ShowPage();
 
 ?>