From 7881b58d92bc5cecc8bd26bdf1d72c8ee29c5382 Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Sat, 30 Aug 2008 20:59:11 +0000
Subject: sync to trunk

---
 config/ampache.cfg.php.dist        |   4 +--
 docs/CHANGELOG                     |   1 +
 images/icon_feed.png               | Bin 0 -> 691 bytes
 lib/class/rss.class.php            |  65 +++++++++++++++++++++++++++++++++++++
 templates/show_index.inc.php       |   3 +-
 templates/show_now_playing.inc.php |   5 +--
 6 files changed, 73 insertions(+), 5 deletions(-)
 create mode 100644 images/icon_feed.png
 create mode 100644 lib/class/rss.class.php

diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist
index 06fa6815..056a2d93 100644
--- a/config/ampache.cfg.php.dist
+++ b/config/ampache.cfg.php.dist
@@ -525,8 +525,8 @@ transcode_cmd_ogg   = "oggsplt -qn %FILE% %OFFSET% %EOF% -o - | oggdec -Q -o - -
 ;
 ; use_rss = false (values true | false)
 ;
-;DEFAULT: use_rss = false 
-;use_rss = false
+;DEFAULT: use_rss = true
+use_rss = true
 ;
 ;
 ; rss_main_title = the title for your feed.
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 1717e4dd..1891e690 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,7 @@
 
 --------------------------------------------------------------------------
   v.3.5-Alpha1
+	- Add links to RSS feeds and set default to TRUE in config.dist
         - Fixed Dynamic Random/Related URLs with players that always send
                 a byte offset (MPD)
 	- Added Checkbox to use existing Database
diff --git a/images/icon_feed.png b/images/icon_feed.png
new file mode 100644
index 00000000..315c4f4f
Binary files /dev/null and b/images/icon_feed.png differ
diff --git a/lib/class/rss.class.php b/lib/class/rss.class.php
new file mode 100644
index 00000000..17d3b154
--- /dev/null
+++ b/lib/class/rss.class.php
@@ -0,0 +1,65 @@
+<?php
+/*
+
+ Copyright Ampache.org
+ All Rights Reserved
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; version 2
+ of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA. 
+
+*/
+
+/**
+ * RSS Class
+ * This is not currently used by the stable version of ampache, really here for future use and
+ * due to the fact it was back-ported from /trunk
+ */
+class RSS {
+
+	private static $types = array('nowplaying',
+				'latestartist',
+				'latestalbum',
+				'popularalbum',
+				'popularartist',
+				'popularsong',
+				'recentlyplayed');
+
+	/**
+	 * Constructor
+	 * This takes a flagged.id and then pulls in the information for said flag entry
+	 */
+	public function __construct() { 
+
+		// Nothing here for now
+
+	} // constructor
+
+	/**
+ 	 * get_display
+	 * This dumps out some html and an icon for the type of rss that we specify
+	 */
+	public static function get_display($type='nowplaying') { 
+
+		// Default to now playing
+		if (!in_array($type,self::$types)) { 
+			$type = 'nowplaying'; 
+		} 	
+
+		$string = '<a href="' . Config::get('web_path') . '/rss.php?type=' . $type . '">' . get_user_icon('feed',_('RSS Feed')) . '</a>';  
+
+		return $string; 
+
+	} // get_display
+
+} // end RSS class
diff --git a/templates/show_index.inc.php b/templates/show_index.inc.php
index 497b1b3b..81ffd05e 100644
--- a/templates/show_index.inc.php
+++ b/templates/show_index.inc.php
@@ -42,7 +42,8 @@
         <?php
                 $data = Song::get_recently_played();
 		Song::build_cache(array_keys($data)); 
-		show_box_top(_('Recently Played')); 
+		$link = Config::get('use_rss') ? ' ' . RSS::get_display('recentlyplayed') :  '';
+		show_box_top(_('Recently Played') . $link); 
                 require_once Config::get('prefix') . '/templates/show_recently_played.inc.php'; 
 		show_box_bottom(); 
         ?>
diff --git a/templates/show_now_playing.inc.php b/templates/show_now_playing.inc.php
index 267bb9c4..d489c274 100644
--- a/templates/show_now_playing.inc.php
+++ b/templates/show_now_playing.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
-Copyright (c) 2001 - 2007 Ampache.org
+Copyright (c) Ampache.org
 All rights reserved.
 
 This program is free software; you can redistribute it and/or
@@ -28,8 +28,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
 if (count($results)) {
+$link = Config::get('use_rss') ? ' ' . RSS::get_display('nowplaying') : ''; 
 ?>
-<?php show_box_top(_('Now Playing')); ?>
+<?php show_box_top(_('Now Playing') . $link); ?>
 <div class="np_row">
 <?php 
 foreach ($results as $item) {
-- 
cgit