1) Updated the media feed with new fields

2) Created a comments feed (/rss/comments)
3) Created a updates feed (/rss/updates)

User interface to follow

3 files changed, 147 insertions, 3 deletions

diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php
index 24ba7249..c550ec68 100644
--- a/modules/rss/controllers/rss.php
+++ b/modules/rss/controllers/rss.php
@@ -64,6 +64,48 @@ class Rss_Controller extends Controller {
     print $view;
   }
 
+  public function updates() {
+    $page = $this->input->get("page", 1);
+    if ($page < 1) {
+      url::redirect("rss/updates");
+    }
+
+    $orm = ORM::factory(item)
+      ->viewable()
+      ->where("type !=", "album")
+      ->orderby("created", DESC);
+    $items = $orm
+      ->find_all(self::$page_size, ($page - 1) * self::$page_size);
+    $max_pages = ceil($orm->count_last_query() / self::$page_size);
+
+    if ($page > $max_pages) {
+      url::redirect("rss/updates?page=$max_pages");
+    }
+
+    $view = new View("feed.mrss");
+    $view->title = t("Recent Updates");
+    $view->link = url::abs_site("albums/1");
+    $view->description = $item->description;
+    $view->feed_link = url::abs_site("rss/updates");
+    $view->children = $items;
+
+    if ($page > 1) {
+      $previous_page = $page - 1;
+      $view->previous_page_link = url::site("rss/updates?page={$previous_page}");
+    }
+
+    if ($page < $max_pages) {
+      $next_page = $page + 1;
+      $view->next_page_link = url::site("rss/updates?page={$next_page}");
+    }
+
+    // @todo do we want to add an upload date to the items table?
+    $view->pub_date = date("D, d M Y H:i:s T");
+
+    rest::http_content_type(rest::RSS);
+    print $view;
+  }
+
   public function tags($id) {
     $tag = ORM::factory("tag", $id);
     if (!$tag->loaded) {
@@ -105,4 +147,61 @@ class Rss_Controller extends Controller {
     rest::http_content_type(rest::RSS);
     print $view;
   }
+
+  public function comments($id=null) {
+    $page = $this->input->get("page", 1);
+    if ($page < 1) {
+      url::redirect("rss/comments/$id");
+    }
+
+    $orm = ORM::factory("comment")
+      ->where("state", "published")
+      ->orderby("created", "DESC");
+    if (!empty($id)) {
+      $orm->where("item_id", $id);
+    }
+                       
+    $comments = $orm->find_all(self::$page_size, ($page - 1) * self::$page_size);
+    $max_pages = ceil($orm->count_last_query() / self::$page_size);
+
+    if ($page > $max_pages) {
+      url::redirect("rss/comments/{$item->id}?page=$max_pages");
+    }
+
+    $view = new View("comment.mrss");
+    $view->title = htmlspecialchars(t("Recent Comments"));
+    $view->link = url::abs_site("albums/1");
+    $view->description = t("Recent Comments");
+    $view->feed_link = url::abs_site("rss/comments");
+    $view->pub_date = date("D, d M Y H:i:s T");
+   
+    $view->children = array();
+    foreach ($comments as $comment) {
+      $item = $comment->item();
+      $view->children[] = array(
+        "pub_date" => date("D, d M Y H:i:s T", $comment->created),
+        "text" => htmlspecialchars($comment->text),
+        "thumb_url" => $item->thumb_url(),
+        "thumb_height" => $item->thumb_height,
+        "thumb_width" => $item->thumb_width,
+        "item_link" => htmlspecialchars(url::abs_site("{$item->type}s/$item->id")),
+        "title" =>htmlspecialchars($item->title),
+        "author" =>
+          empty($comment->guest_name) ? $comment->author()->full_name : $comment->guest_name
+      );
+    }
+
+    if ($page > 1) {
+      $previous_page = $page - 1;
+      $view->previous_page_link = url::site("rss/comments/{$item->id}?page={$previous_page}");
+    }
+
+    if ($page < $max_pages) {
+      $next_page = $page + 1;
+      $view->next_page_link = url::site("rss/comments/{$item->id}?page={$next_page}");
+    }
+
+    rest::http_content_type(rest::RSS);
+        print $view;
+  }
 }
\ No newline at end of file
diff --git a/modules/rss/views/comment.mrss.php b/modules/rss/views/comment.mrss.php
new file mode 100644
index 00000000..8b7e4f70
--- /dev/null
+++ b/modules/rss/views/comment.mrss.php
@@ -0,0 +1,43 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<? echo "<?xml version=\"1.0\" ?>" ?>
+<rss version="2.0" xmlns:media="http://search.yahoo.com/mrss/"
+   xmlns:atom="http://www.w3.org/2005/Atom"
+   xmlns:content="http://purl.org/rss/1.0/modules/content/"
+   xmlns:fh="http://purl.org/syndication/history/1.0">
+  <channel>
+    <generator>gallery3</generator>
+    <title><?= $title ?></title>
+    <link><?= $link ?></link>
+    <description><?= htmlspecialchars($description) ?></description>
+    <language>en-us</language>
+    <atom:link rel="self" href="<?= $feed_link ?>" type="application/rss+xml" />
+    <fh:complete/>
+    <? if (!empty($previous_page_link)): ?>
+    <atom:link rel="previous" href="<?= $previous_page_link ?>" type="application/rss+xml" />
+    <? endif ?>
+    <? if (!empty($next_page_link)): ?>
+    <atom:link rel="next" href="<?= $next_page_link ?>" type="application/rss+xml" />
+    <? endif ?>
+    <pubDate><?= $pub_date ?></pubDate>
+    <lastBuildDate><?= $pub_date ?></lastBuildDate>
+    <? foreach ($children as $child): ?>
+    <item>
+      <title><?= $child["title"]?></title>
+      <link><?= $child["item_link"] ?></link>
+      <author><?= $child["author"] ?></author>
+      <guid isPermaLink="true"><?= $child["item_link"] ?></guid>
+      <pubDate><?= $child["pub_date"] ?></pubDate>
+      <content:encoded>
+        <![CDATA[
+          <p><?= $child["text"] ?></p>
+          <p>
+            <img alt="" src="<?= $child["thumb_url"] ?>"
+                        height="<?= $child["thumb_height"] ?>" width="<?= $child["thumb_width"] ?>" />
+            <br />
+          </p>
+        ]]>
+      </content:encoded>
+    </item>
+    <? endforeach ?>
+  </channel>
+</rss>
diff --git a/modules/rss/views/feed.mrss.php b/modules/rss/views/feed.mrss.php
index dbaee532..fbcd415e 100644
--- a/modules/rss/views/feed.mrss.php
+++ b/modules/rss/views/feed.mrss.php
@@ -23,11 +23,12 @@
     <? foreach ($children as $child): ?>
     <item>
       <title><?= htmlspecialchars($child->title) ?></title>
-      <link><?= url::abs_site("photos/$child->id") ?></link>
-      <description><?= htmlspecialchars($child->description) ?></description>
-      <guid isPermaLink="true"><?= url::abs_site("photos/$child->id") ?></guid>
+      <link><?= url::abs_site("{$child->type}s/{$child->id}") ?></link>
+      <guid isPermaLink="true"><?= url::abs_site("{$child->type}s/{$child->id}") ?></guid>
+       <pubDate><?= date("D, d M Y H:i:s T", $child->createdb); ?></pubDate>
       <content:encoded>
         <![CDATA[
+          <span><?= $child->description ?></span>
           <p>
             <img alt="" src="<?= $child->resize_url(true) ?>"
                  title="<?= htmlspecialchars($child->title) ?>"
@@ -51,6 +52,7 @@
                        />
        <? if (access::can("view_full", $child)): ?>
        <media:content url="<?= $child->file_url(true) ?>"
+          
                        fileSize="<?= filesize($child->file_path()) ?>"
                        type="<?= $child->mime_type ?>"
                        height="<?= $child->height ?>"