Rework folder browsing implementation

- Add support for text files
- Add previous directory
- Add XSLT sheet for browsing with the browser

diff --git a/src/podcasts.php b/src/podcasts.php
index 9948af42f62d59c8e8923318c0dee687879b3c4d..1756ed5ad426c501568ba5f60cf90859c3017343 100644 (file)
--- a/src/podcasts.php
+++ b/src/podcasts.php
@@ -1,45 +1,28 @@
 <?php
 <?php

-function sendPodcastList()
+function sendPodcast($path)

 {
 {

-    $files = glob(__DIR__ . '/../var/podcasts/*.url');
-    if (count($files) == 0) {
-        sendMessage('Keine Podcasts');
-        return;
-    }
+    global $varDir, $host1;

 
 

-    $listItems = array();
-    foreach ($files as $file) {
-        $title = basename($file, '.url');
-        $listItems[] = '<Item>'
-            . '<ItemType>ShowOnDemand</ItemType>'
-            . '<ShowOnDemandName>' . htmlspecialchars($title) . '</ShowOnDemandName>'
-            . '<ShowOnDemandURL>http://radio567.vtuner.com/podcasts/' . urlencode(basename($file)) . '</ShowOnDemandURL>'
-            . '</Item>';
-    }
-    sendListItems($listItems);
-}
-
-function sendPodcast($file)
-{
-    //strip /podcasts/
-    $file = substr(urldecode($file), 10);
+    $file = urldecode($path);

     if (strpos($file, '..') !== false) {
         sendMessage('No');
         return;
     }
 
     if (strpos($file, '..') !== false) {
         sendMessage('No');
         return;
     }
 

-    $path = __DIR__ . '/../var/podcasts/' . $file;
-    if (!file_exists($path)) {
-        return sendMessage('File does not exist: ' . $file);
+    $fullPath = $varDir . $path;
+    if (!file_exists($fullPath)) {
+        return sendMessage('File does not exist: ' . $path);

     }
 
     }
 

-    $url = trim(file_get_contents($path));
+    $url = trim(file_get_contents($fullPath));

 
 

-    $cacheFile = '/tmp/podcast-' . md5($file) . '.xml';
+    $cacheFile = '/tmp/podcast-' . md5($path) . '.xml';

     downloadIfNewer($url, $cacheFile);
     
     $sx = simplexml_load_file($cacheFile);
     $listItems = array();
     downloadIfNewer($url, $cacheFile);
     
     $sx = simplexml_load_file($cacheFile);
     $listItems = array();

+    addPreviousItem($listItems, $path);
+

     foreach ($sx->channel->item as $item) {
         $title = (string) $item->title;
         $desc = (string) $item->description;
     foreach ($sx->channel->item as $item) {
         $title = (string) $item->title;
         $desc = (string) $item->description;


@@ -48,8 +31,7 @@ function sendPodcast($file)
         $listItems[] = '<Item>'
             . '<ItemType>ShowEpisode</ItemType>'
             . '<ShowEpisodeName>' . utf8_decode(htmlspecialchars($title)) . '</ShowEpisodeName>'
         $listItems[] = '<Item>'
             . '<ItemType>ShowEpisode</ItemType>'
             . '<ShowEpisodeName>' . utf8_decode(htmlspecialchars($title)) . '</ShowEpisodeName>'

-            . '<ShowEpisodeURL>http://radio567.vtuner.com/play-url?url=' . urlencode($url) . '</ShowEpisodeURL>'
-            //. '<ShowEpisodeURL>' . htmlspecialchars($url) . '</ShowEpisodeURL>'
+            . '<ShowEpisodeURL>' . $host1 . 'play-url?url=' . urlencode($url) . '</ShowEpisodeURL>'

             . '<ShowDesc>' . utf8_decode(htmlspecialchars($desc)) . '</ShowDesc>'
             . '<ShowMime>MP3</ShowMime>' 
             . '</Item>';
             . '<ShowDesc>' . utf8_decode(htmlspecialchars($desc)) . '</ShowDesc>'
             . '<ShowMime>MP3</ShowMime>' 
             . '</Item>';

diff --git a/www/.htaccess b/www/.htaccess
index 4fb1fbebb7f02302e7bd090b2ecbaa93b4299c19..e834892080c6c6127791a05b17dd4a789812c1b0 100644 (file)
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -1,3 +1,5 @@
 RewriteEngine On
 RewriteBase /
 RewriteEngine On
 RewriteBase /

+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d

 RewriteRule ^.*$ index.php
 RewriteRule ^.*$ index.php

diff --git a/www/html.xsl b/www/html.xsl
new file mode 100644 (file)
index 0000000..4d15bd4
--- /dev/null
+++ b/www/html.xsl
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+  <xsl:template match="ListOfItems">
+    <html>
+      <body>
+       <xsl:for-each select="Item[ItemType='Previous']">
+        <pre>
+         <a>
+          <xsl:attribute name="href">
+           <xsl:value-of select="UrlPrevious"/>
+          </xsl:attribute>
+          <xsl:text>&lt; back</xsl:text>
+         </a>
+        </pre>
+       </xsl:for-each>
+
+       <xsl:if test="Item[ItemType='Message']">
+        <h2>Messages</h2>
+        <xsl:for-each select="Item[ItemType='Message']">
+         <p>
+          <xsl:value-of select="Message"/>
+         </p>
+        </xsl:for-each>
+       </xsl:if>
+
+       <pre style="border: 1px solid black">
+
+        <xsl:for-each select="Item">
+         <xsl:if test="ItemType='Display'">
+          <xsl:text>[d] </xsl:text>
+          <xsl:value-of select="Display"/><xsl:text>
+</xsl:text>
+         </xsl:if>
+
+         <xsl:if test="ItemType='Dir'">
+          <xsl:text>[D] </xsl:text>
+          <a>
+           <xsl:attribute name="href">
+            <xsl:value-of select="UrlDir"/>
+           </xsl:attribute>
+           <xsl:value-of select="Title"/>
+          </a>
+          <xsl:text>
+</xsl:text>
+         </xsl:if>
+
+         <xsl:if test="ItemType='ShowOnDemand'">
+          <xsl:text>[S] </xsl:text>
+           <a>
+            <xsl:attribute name="href">
+             <xsl:value-of select="ShowOnDemandURL"/>
+            </xsl:attribute>
+            <xsl:value-of select="ShowOnDemandName"/>
+           </a>
+           <xsl:text>
+</xsl:text>
+         </xsl:if>
+
+         <xsl:if test="ItemType='ShowEpisode'">
+          <xsl:text>[E] </xsl:text>
+          <a>
+           <xsl:attribute name="href">
+            <xsl:value-of select="ShowEpisodeURL"/>
+           </xsl:attribute>
+           <xsl:value-of select="ShowEpisodeName"/>
+          </a>
+           <xsl:text>
+</xsl:text>
+         </xsl:if>
+
+        </xsl:for-each>
+       </pre>
+
+       <xsl:if test="Item[ItemType='ShowEpisode']">
+        <h2>Show episodes</h2>
+        <xsl:for-each select="Item[ItemType='ShowEpisode']">
+         <h3>
+          <a>
+           <xsl:attribute name="href">
+            <xsl:value-of select="ShowEpisodeURL"/>
+           </xsl:attribute>
+           <xsl:value-of select="ShowEpisodeName"/>
+          </a>
+         </h3>
+         <p>
+          <xsl:value-of select="ShowDesc"/>
+          (<xsl:value-of select="ShowMime"/>)
+         </p>
+        </xsl:for-each>
+       </xsl:if>
+
+       <xsl:if test="Item[ItemType='Station']">
+        <h2>Internet radio stations</h2>
+        <xsl:for-each select="Item[ItemType='Station']">
+         <h3>
+          #<xsl:value-of select="StationId"/>:
+          <a>
+           <xsl:attribute name="href">
+            <xsl:value-of select="StationUrl"/>
+           </xsl:attribute>
+           <xsl:value-of select="StationName"/>
+          </a>
+         </h3>
+         <p>
+          <xsl:value-of select="StationDesc"/>
+          (<xsl:value-of select="ShowMime"/>)
+         </p>
+        </xsl:for-each>
+       </xsl:if>
+
+      </body>
+    </html>
+  </xsl:template>
+</xsl:stylesheet>

diff --git a/www/index.php b/www/index.php
index cc0be0e5c25c009c7f0b2383b17b2cc26ce956cd..3f06722943073ca3ad8f69ece56abb44ecc81708 100644 (file)
--- a/www/index.php
+++ b/www/index.php
@@ -1,8 +1,19 @@
 <?php
 set_include_path(get_include_path() . PATH_SEPARATOR . __DIR__ . '/../src/');
 $fullUri = $_SERVER['REQUEST_URI'];
 <?php
 set_include_path(get_include_path() . PATH_SEPARATOR . __DIR__ . '/../src/');
 $fullUri = $_SERVER['REQUEST_URI'];

-$path    = $_SERVER['REDIRECT_URL'];
+if (isset($_SERVER['REDIRECT_URL'])) {
+    $path    = $_SERVER['REDIRECT_URL'];
+} else {
+    $path = '/';
+}

 $dataDir = __DIR__ . '/../data/';
 $dataDir = __DIR__ . '/../data/';

+$varDir  = realpath(__DIR__ . '/../var') . '/';
+$host1 = 'http://radio567.vtuner.com/';
+$host2 = 'http://radio5672.vtuner.com/';
+if ($_SERVER['HTTP_HOST'] !== '') {
+    $host1 = 'http://' . $_SERVER['HTTP_HOST'] . '/';
+    $host2 = 'http://' . $_SERVER['HTTP_HOST'] . '/';
+}

 
 if (strtolower($fullUri) == '/setupapp/radio567/asp/browsexpa/loginxml.asp?token=0') {
     //initial login for "internet radio" and podcasts
 
 if (strtolower($fullUri) == '/setupapp/radio567/asp/browsexpa/loginxml.asp?token=0') {
     //initial login for "internet radio" and podcasts


@@ -18,23 +29,13 @@ if (strtolower($fullUri) == '/setupapp/radio567/asp/browsexpa/loginxml.asp?token
     exit();
 } else if ($path == '/setupapp/radio567/asp/BrowseXPA/LoginXML.asp') {
     //"Internet Radio"
     exit();
 } else if ($path == '/setupapp/radio567/asp/BrowseXPA/LoginXML.asp') {
     //"Internet Radio"

-    header('Content-type: text/xml');
-    sendList('internetradio');
-    exit();
+    $path = '/internetradio';

 } else if ($path == '/setupapp/radio567/asp/BrowseXPA/navXML.asp') {
     //"Podcasts"
 } else if ($path == '/setupapp/radio567/asp/BrowseXPA/navXML.asp') {
     //"Podcasts"

-    require_once 'podcasts.php';
-    sendPodcastList();
-    exit();
-} else if (substr($path, 0, 9) == '/podcasts') {
-    require_once 'podcasts.php';
-    sendPodcast($path);
-    exit();    
+    $path = '/podcasts';

 } else if ($path == '/RadioNative.php') {
     //"My Noxon"
 } else if ($path == '/RadioNative.php') {
     //"My Noxon"

-    header('Content-type: text/xml');
-    sendList('mynoxon');
-    exit();
+    $path = '/mynoxon';

 } else if ($path == '/setupapp/radio567/asp/BrowseXML/FavXML.asp') {
     //Internet Radio Station favorites favorited on device
 } else if ($path == '/RadioNativeFavorites.php') {
 } else if ($path == '/setupapp/radio567/asp/BrowseXML/FavXML.asp') {
     //Internet Radio Station favorites favorited on device
 } else if ($path == '/RadioNativeFavorites.php') {


@@ -47,10 +48,134 @@ if (strtolower($fullUri) == '/setupapp/radio567/asp/browsexpa/loginxml.asp?token
     header('HTTP/1.0 301 Moved Permanently');
     header('Location: ' . getFinalUrl($url));
     exit();
     header('HTTP/1.0 301 Moved Permanently');
     header('Location: ' . getFinalUrl($url));
     exit();

-} else {
-    sendList(ltrim($path, '/'));

 }
 
 }
 

+handleRequest(ltrim($path, '/'));
+
+function handleRequest($path)
+{
+    global $varDir;
+    if (strpos($path, '..') !== false) {
+        sendMessage('No');
+        return;
+    }
+
+    $fullPath = $varDir . $path;
+    if (!file_exists($fullPath)) {
+        sendMessage('Not found: ' . $path);
+        return;
+    }
+
+    if (is_dir($fullPath)) {
+        sendDir($path);
+    } else if (substr($path, -4) == '.url') {
+        require_once 'podcasts.php';
+        sendPodcast($path);
+    } else if (substr($path, -4) == '.txt') {
+        sendTextFile($path);
+    } else {
+        sendMessage('Unknown file type');
+    }
+}
+
+function sendDir($path)
+{
+    global $varDir;
+
+    $listItems = array();
+    addPreviousItem($listItems, $path);
+
+    $entries = glob(str_replace('//', '/', $varDir . rtrim($path, '/') . '/*'));
+    $count = 0;
+    foreach ($entries as $entry) {
+        $urlPath = substr($entry, strlen($varDir));
+        if (is_dir($entry)) {
+            ++$count;
+            $listItems[] = getDirItem(basename($entry), $urlPath . '/');
+        } else if (substr($entry, -4) == '.url') {
+            //podcast
+            ++$count;
+            $listItems[] = getPodcastItem(basename($entry, '.url'), $urlPath);
+        } else if (substr($entry, -4) == '.txt') {
+            //plain text file
+            ++$count;
+            $listItems[] = getDirItem(basename($entry, '.txt'), $urlPath);
+        }
+    }
+    if (!$count) {
+        $listItems[] = getMessageItem('No files or folders');
+    }
+    sendListItems($listItems);
+}
+
+function sendTextFile($path)
+{
+    global $varDir;
+    $listItems = array();
+    addPreviousItem($listItems, $path);
+
+    $lines = file($varDir . $path);
+    foreach ($lines as $line) {
+        $listItems[] = getDisplayItem($line);
+    }
+    sendListItems($listItems);
+}
+
+function getDisplayItem($line)
+{
+    return '<Item>'
+        . '<ItemType>Display</ItemType>'
+        . '<Display>' . utf8_decode(htmlspecialchars(trim($line))) . '</Display>'
+        . '</Item>';
+}
+
+function getDirItem($title, $urlPath)
+{
+    global $host1, $host2;
+    return '<Item>'
+        . '<ItemType>Dir</ItemType>'
+        . '<Title>' . utf8_decode(htmlspecialchars($title)) . '</Title>'
+        . '<UrlDir>' . $host1 . utf8_decode(htmlspecialchars($urlPath)) . '</UrlDir>'
+        . '<UrlDirBackUp>' . $host2 . utf8_decode(htmlspecialchars($urlPath)) . '</UrlDirBackUp>'
+        . '</Item>';
+}
+
+function getPodcastItem($title, $urlPath)
+{
+    global $host1;
+    return '<Item>'
+        . '<ItemType>ShowOnDemand</ItemType>'
+        . '<ShowOnDemandName>' . utf8_decode(htmlspecialchars($title)) . '</ShowOnDemandName>'
+        . '<ShowOnDemandURL>' . $host1 . utf8_decode(htmlspecialchars($urlPath)) . '</ShowOnDemandURL>'
+        . '</Item>';
+}
+
+function getMessageItem($msg)
+{
+    return '<Item>'
+        . '<ItemType>Message</ItemType>'
+        . '<Message>' . utf8_decode(htmlspecialchars($msg)) . '</Message>'
+        . '</Item>';
+}
+
+function getPreviousItem($urlPath)
+{
+    global $host1, $host2;
+    return '<Item>'
+        . '<ItemType>Previous</ItemType>'
+        . '<UrlPrevious>' . $host1 . utf8_decode(htmlspecialchars($urlPath)) . '</UrlPrevious>'
+        . '<UrlPreviousBackUp>' . $host1 . utf8_decode(htmlspecialchars($urlPath)) . '</UrlPreviousBackUp>'
+        . '</Item>';
+}
+
+function addPreviousItem(&$listItems, $urlPath)
+{
+    $parentDir = dirname($urlPath) . '/';
+    if ($parentDir == '/') {
+        return;
+    }
+    $listItems[] = getPreviousItem($parentDir);
+}

 
 function getFinalUrl($url)
 {
 
 function getFinalUrl($url)
 {


@@ -65,8 +190,12 @@ function getFinalUrl($url)
     return $url;
 }
 
     return $url;
 }
 

+function sendMessage($msg)
+{
+    sendListItems(array(getMessageItem($msg)));
+}

 
 

-function sendList($path)
+function sendListItems($listItems)

 {
     $startitems = 1;
     $enditems = 10;
 {
     $startitems = 1;
     $enditems = 10;


@@ -76,54 +205,17 @@ function sendList($path)
     if (isset($_GET['enditems'])) {
         $enditems = (int) $_GET['enditems'];
     }
     if (isset($_GET['enditems'])) {
         $enditems = (int) $_GET['enditems'];
     }

+    //TODO: limit list

 
 

-    header('Content-type: text/xml');
-    echo <<<XML
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-<ListOfItems>
-  <ItemCount>-1</ItemCount>
-  <Item>
-    <ItemType>Message</ItemType>
-    <Message>$path</Message>
-  </Item>
-  <Item>
-    <ItemType>Dir</ItemType>
-    <Title>$path</Title>
-    <UrlDir>http://radio567.vtuner.com/$path</UrlDir>
-    <UrlDirBackUp>http://radio5672.vtuner.com/$path</UrlDirBackUp>
-  </Item>
-</ListOfItems>
-
-XML;
-}
-
-function sendMessage($msg)
-{
-    header('Content-type: text/xml');
-    $xMsg = htmlspecialchars($msg);
-    echo <<<XML
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-<ListOfItems>
-  <Item>
-    <ItemType>Message</ItemType>
-    <Message>$xMsg</Message>
-  </Item>
-</ListOfItems>
-
-XML;
-}
-
-function sendListItems($listItems)
-{

     $xml = '<?xml version="1.0" encoding="iso-8859-1"?>' . "\n";
     $xml = '<?xml version="1.0" encoding="iso-8859-1"?>' . "\n";

+    $xml .= '<?xml-stylesheet type="text/xsl" href="/html.xsl"?>' . "\n";

     $xml .= '<ListOfItems>' . "\n";
     foreach ($listItems as $item) {
         $xml .= $item . "\n";
     }
     $xml .= "</ListOfItems>\n";
     $xml .= '<ListOfItems>' . "\n";
     foreach ($listItems as $item) {
         $xml .= $item . "\n";
     }
     $xml .= "</ListOfItems>\n";

-    
+

     header('Content-type: text/xml');
     echo $xml;
 }
     header('Content-type: text/xml');
     echo $xml;
 }

-

 ?>
 ?>