From 33a054ccc03eba0caff95c04ddf99d0ac6b7ac19 Mon Sep 17 00:00:00 2001
From: csarven <csarven@controlyourself.ca>
Date: Fri, 5 Dec 2008 17:14:02 -0500
Subject: [PATCH] trac855 trac856 and Feed list for the Favorited page

darcs-hash:20081205221402-eefa4-9c765fe3c7a6e0cf9cdee1749ed2bebb24d3deaf.gz
---
 actions/favorited.php |  7 ++++++-
 actions/public.php    | 12 +++++++++++-
 actions/tag.php       |  7 ++++++-
 lib/personal.php      | 28 ++++++++++++++++++++++++++++
 lib/util.php          |  2 ++
 5 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/actions/favorited.php b/actions/favorited.php
index 78749a3ab9..035e2f9535 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -44,6 +44,11 @@ class FavoritedAction extends StreamAction {
 		common_raw($output);
 		common_element_end('div');
 		$this->public_views_menu();
+
+		$this->show_feeds_list(array(0=>array('href'=>common_local_url('favoritedrss'),
+											  'type' => 'rss',
+											  'version' => 'RSS 1.0',
+											  'item' => 'favoritedrss')));
 	}
 
 	function show_header() {
@@ -108,4 +113,4 @@ class FavoritedAction extends StreamAction {
 		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
 						  $page, 'favorited');
 	}
-}
\ No newline at end of file
+}
diff --git a/actions/public.php b/actions/public.php
index 753b9d07fe..8a41dcd56b 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -53,6 +53,16 @@ class PublicAction extends StreamAction {
 		}
 
 		$this->public_views_menu();
+
+
+		$this->show_feeds_list(array(0=>array('href'=>common_local_url('publicrss'),
+											  'type' => 'rss',
+											  'version' => 'RSS 1.0',
+											  'item' => 'publicrss'),
+									 1=>array('href'=>common_local_url('publicatom'),
+											  'type' => 'atom',
+											  'version' => 'Atom 1.0',
+											  'item' => 'publicatom')));
 	}
 
 	function get_instructions() {
@@ -92,4 +102,4 @@ class PublicAction extends StreamAction {
 		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
 						  $page, 'public');
 	}
-}
\ No newline at end of file
+}
diff --git a/actions/tag.php b/actions/tag.php
index 034072a6bf..50b76dbcdb 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -35,7 +35,6 @@ class TagAction extends StreamAction {
 			common_show_header(sprintf(_("Notices tagged with %s"), $tag),
 							   array($this, 'show_header'), $tag,
 							   array($this, 'show_top'));
-
 			$this->show_notices($tag);
 		} else {
 			common_show_header(_("Tags"),
@@ -69,6 +68,12 @@ class TagAction extends StreamAction {
 			common_element_end('div');
 			$this->public_views_menu();
 		}
+		else {
+			$this->show_feeds_list(array(0=>array('href'=>common_local_url('tagrss'),
+												  'type' => 'rss',
+												  'version' => 'RSS 1.0',
+												  'item' => 'tagrss')));
+		}
 	}
 
 	function show_tags()
diff --git a/lib/personal.php b/lib/personal.php
index f1c6ea9b13..86433b4867 100644
--- a/lib/personal.php
+++ b/lib/personal.php
@@ -122,6 +122,34 @@ class PersonalAction extends Action {
 				$feed['textContent'] = "RSS";
 				break;
 
+			case 'publicrss':
+				$feed_classname = $feed['type'];
+				$feed_mimetype = "application/".$feed['type']."+xml";
+				$feed_title = "Public timeline ".$feed['version']." feed";
+				$feed['textContent'] = "RSS";
+				break;
+
+			case 'publicatom':
+				$feed_classname = "atom";
+				$feed_mimetype = "application/".$feed['type']."+xml";
+				$feed_title = "Public timeline ".$feed['version']." feed";
+				$feed['textContent'] = "Atom";
+				break;
+
+			case 'tagrss':
+				$feed_classname = $feed['type'];
+				$feed_mimetype = "application/".$feed['type']."+xml";
+				$feed_title = $feed['version']." feed for this tag";
+				$feed['textContent'] = "RSS";
+				break;
+
+			case 'favoritedrss':
+				$feed_classname = $feed['type'];
+				$feed_mimetype = "application/".$feed['type']."+xml";
+				$feed_title = "Favorited ".$feed['version']." feed";
+				$feed['textContent'] = "RSS";
+				break;
+
 			case 'foaf':
 				$feed_classname = "foaf";
 				$feed_mimetype = "application/".$feed['type']."+xml";
diff --git a/lib/util.php b/lib/util.php
index 077c9219a8..1b0fc1ec82 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1064,6 +1064,8 @@ function common_fancy_url($action, $args=NULL) {
 		}
 	 case 'publicrss':
 		return common_path('rss');
+	 case 'publicatom':
+		return common_path("api/statuses/public_timeline.atom");
 	 case 'publicxrds':
 		return common_path('xrds');
 	 case 'featuredrss':