[Librefm-commits] [1060] Rationalise feeds.

[Toby Inkster]

Revision: 1060
          http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1060
Author:   tobyink
Date:     2009-04-30 12:20:52 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
Rationalise feeds.

Modified Paths:
--------------
    trunk/nixtape/user-journal.php
    trunk/nixtape/user-profile.php
    trunk/nixtape/user-recent-tracks.php

Modified: trunk/nixtape/user-journal.php
===================================================================
--- trunk/nixtape/user-journal.php      2009-04-30 12:12:31 UTC (rev 1059)
+++ trunk/nixtape/user-journal.php      2009-04-30 12:20:52 UTC (rev 1060)
@@ -76,12 +76,18 @@
 $smarty->assign('profile', true);
 $smarty->assign('items', $items);
 $smarty->assign('extra_head_links', array(
-       array(
-               'rel'=>'alternate',
-               'type' => 'application/rss+xml' ,
-               'title' => 'RSS 1.0 Feed (Journal)',
-               'href' => $user->journal_rss
-               )
+               array(
+                       'rel'=>'alternate',
+                       'type' => 'application/rss+xml' ,
+                       'title' => 'RSS 1.0 Feed (Journal)',
+                       'href' => $user->journal_rss
+                       ),
+               array(
+                       'rel' => 'meta',
+                       'type' => 'application/rdf+xml' ,
+                       'title' => 'FOAF',
+                       'href' => 
$base_url.'/rdf.php?fmt=xml&page='.htmlentities(str_replace($base_url, '', 
$user->getURL()))
+                       )
        ));
 $smarty->display('user-journal.tpl');
        

Modified: trunk/nixtape/user-profile.php
===================================================================
--- trunk/nixtape/user-profile.php      2009-04-30 12:12:31 UTC (rev 1059)
+++ trunk/nixtape/user-profile.php      2009-04-30 12:20:52 UTC (rev 1060)
@@ -60,13 +60,19 @@
                                'rel'=>'alternate',
                                'type' => 'application/rss+xml' ,
                                'title' => 'RSS 1.0 Feed (Recent plays)',
-                               'href' => 
$base_url.'/rdf.php?fmt=rss&page='.htmlentities($_SERVER['REQUEST_URI'])
+                               'href' => 
$base_url.'/rdf.php?fmt=rss&page='.htmlentities(str_replace($base_url, '', 
$user->getURL('recent-tracks')))
                                ),
                        array(
+                               'rel'=>'alternate',
+                               'type' => 'application/rss+xml' ,
+                               'title' => 'RSS 1.0 Feed (Journal)',
+                               'href' => $user->journal_rss
+                               ),
+                       array(
                                'rel' => 'meta',
                                'type' => 'application/rdf+xml' ,
                                'title' => 'FOAF',
-                               'href' => 
$base_url.'/rdf.php?fmt=xml&page='.htmlentities($_SERVER['REQUEST_URI'])
+                               'href' => 
$base_url.'/rdf.php?fmt=xml&page='.htmlentities(str_replace($base_url, '', 
$user->getURL()))
                                )
                ));
 

Modified: trunk/nixtape/user-recent-tracks.php
===================================================================
--- trunk/nixtape/user-recent-tracks.php        2009-04-30 12:12:31 UTC (rev 
1059)
+++ trunk/nixtape/user-recent-tracks.php        2009-04-30 12:20:52 UTC (rev 
1060)
@@ -56,13 +56,13 @@
                                'rel'=>'alternate',
                                'type' => 'application/rss+xml' ,
                                'title' => 'RSS 1.0 Feed (Recent plays)',
-                               'href' => 
$base_url.'/rdf.php?fmt=rss&page='.htmlentities($_SERVER['REQUEST_URI'])
+                               'href' => 
$base_url.'/rdf.php?fmt=rss&page='.htmlentities(str_replace($base_url, '', 
$user->getURL('recent-tracks')))
                                ),
                        array(
                                'rel' => 'meta',
                                'type' => 'application/rdf+xml' ,
                                'title' => 'FOAF',
-                               'href' => 
$base_url.'/rdf.php?fmt=xml&page='.htmlentities($_SERVER['REQUEST_URI'])
+                               'href' => 
$base_url.'/rdf.php?fmt=xml&page='.htmlentities(str_replace($base_url, '', 
$user->getURL()))
                                )
                ));