rss fixes

1 files changed, 13 insertions, 11 deletions

diff --git a/lib/rss.php b/lib/rss.php
index eefb9ad1..27e84324 100644
--- a/lib/rss.php
+++ b/lib/rss.php
@@ -26,20 +26,22 @@
 */
 function show_now_playingRSS () {
 
+header ("Content-Type: application/xml");
+
         $dbh = dbh();
         $web_path = conf('web_path');
         $rss_main_title = conf('rss_main_title');
         $rss_main_description = conf('rss_main_description');
         $rss_main_copyright = conf('rss_main_copyright');
         $rss_main_language = conf('rss_main_language');
-        $rss_song_description = conf('rss_song_description');
+        $rss_description = conf('rss_song_description');
 
         $sql = "SELECT * FROM now_playing ORDER BY start_time DESC";
 
         $db_result = mysql_query($sql, $dbh);
         $today = date("d-m-Y");
-
-        echo "<rss version=\"0.91\">";
+        $rss_song_description = $rss_description;
+        echo "<rss version=\"2.0\">";
         echo "<channel>\n<title>$rss_main_title</title>\n";
         echo "<link>$web_path</link>\n<description>$rss_main_description</description>\n";
         echo "<copyright>$rss_main_copyright</copyright>";
@@ -48,17 +50,17 @@ function show_now_playingRSS () {
         while ($r = mysql_fetch_object($db_result)) {
                 $song = new Song($r->song_id);
                 $song->format_song();
-                $user = get_user_byid($r->user_id);
+
                 if (is_object($song)) {
                         $artist = $song->f_artist;
                         $album = $song->get_album_name();
-                        $text = "$artist - $song->f_title";
-                        echo "<item> ";
-                        echo " <title><![CDATA[$text]]></title> ";
-                        echo " <link>$web_path/albums.php?action=show&amp;album=$song->album</link>";
-                        echo " <description>$rss_song_description</description>";
-                        echo " <pubDate>$today</pubDate>";
-                        echo "</item>";
+                        $text = "$artist - $song->f_title played by $r->user";
+                        echo "<item> \n";
+                        echo " <title><![CDATA[$text]]></title> \n";
+                        echo " <link>$web_path/albums.php?action=show&amp;album=$song->album</link>\n";
+                        echo " <description><![CDATA[$song->f_title @ $album is played by $r->user]]></description>\n";
+                        echo " <pubDate>$today</pubDate>\n";
+                        echo "</item>\n";
                 }
         }