Changeset 349 for trunk

Timestamp:

Jan 18, 2012, 7:16:43 AM (13 years ago)

Author:

chronos

Message:

• Opraveno: Korekce systému pěkných URL. Nyní podporují i přenos dotazovacího řetězce za znakem ?.

Location:

trunk

Files:

• .htaccess (modified) (2 diffs)
• Modules/TV/TV.php (modified) (4 diffs)
• Modules/page.php (modified) (1 diff)
• index.php (modified) (2 diffs)

trunk/.htaccess

@@ -5 +5 @@
 
 RewriteEngine On
-#RewriteBase /
+RewriteBase /
 
 # Pretty urls on localhost with alias
@@ -11 +11 @@
 RewriteCond  %{REQUEST_FILENAME}  !-f
 RewriteCond  %{REQUEST_FILENAME}  !-d
-RewriteRule   ^(.*)$ index.php?page=$1
+RewriteRule   ^(.*)$ centrala/index.php?$1
 
 # Pretty urls 

trunk/Modules/TV/TV.php

@@ -7 +7 @@
   
   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;
-    
+
     $Output = 'Stažení přehrávače: <a href="http://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/>'.
@@ -59 +68 @@
     $Output .= 'Další online TV na webu: <a href="http://www.tvinfo.cz/live/televize/evropa/cz">TV info</a><br/>';
     
-    return($Output);
+    return($Output);     
   }
-}
 
-class TVPlaylistPage extends Page
-{
-  var $FullTitle = 'Síťová televize';
-  var $ShortTitle = 'IPTV';
-  var $SimplePage = true;
-  
-  function Show()
+  function ShowPlaylist()
   {
+    $this->SimplePage = true;
+    $this->FormatHTML = false;
+    
     Header("Content-Type: audio/mpegurl");
     Header("Content-Disposition: attachment; filename=playlist.m3u");
@@ -94 +99 @@
     }   
     return($Output);
-  }
+  } 
 }
 
@@ -133 +138 @@
   {
     $this->System->Pages['tv'] = 'TVChannelsPage';
-    $this->System->Pages['tv/playlist.m3u'] = 'TVPlaylistPage';
   }
   

trunk/Modules/page.php

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

trunk/index.php

@@ -304 +304 @@
 }
 
-if(array_key_exists('page', $_GET))
+function ProcessURL()
+{
+  $QueryString = $_SERVER['QUERY_STRING'];
+  if(substr($QueryString, -1, 1) == '/') $QueryString = substr($QueryString, 0, -1);
+  //echo('"'.$QueryString.'"');
+  $PathItems = explode('/', $QueryString);
+  if(strpos($_SERVER['REQUEST_URI'], '?') !== false)
+    $_SERVER['QUERY_STRING'] = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], '?') + 1);
+    else $_SERVER['QUERY_STRING'] = '';    
+  parse_str($_SERVER['QUERY_STRING'], $_GET);
+  return($PathItems);
+}
+
+$System->PathItems = ProcessURL();
+//print_r($_GET);
+//print_r($System->PathItems);
+
+if($System->PathItems[0] != '')
 {  
-  $Page = $_GET['page'];
-  if(substr($Page, -1) == '/') $Page = substr($Page, 0, -1);
+  $Page = $System->PathItems[0];
+  //if(substr($Page, -1) == '/') $Page = substr($Page, 0, -1);
   //print_r($System->Pages);
   if(array_key_exists($Page, $System->Pages)) 
@@ -316 +333 @@
     $PageObject->System = &$System;
     $PageObject->GetOutput();
-  } else echo('Stránka nenalezena');
+  } else echo(PAGE_NOT_FOUND);
 } else 
 {