1 files changed, 49 insertions, 35 deletions

diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
index 56de4284..afcc275c 100644
--- a/modules/comment/helpers/comment_rss.php
+++ b/modules/comment/helpers/comment_rss.php
@@ -19,46 +19,60 @@
  */
 
 class comment_rss_Core {
-  static function available_feeds($item) {
-    return array(array("description" => t("All new comments"),
-                       "type" => "block",
-                       "uri" => "comments"),
-                 array("description" => sprintf(t("Comments on %s"), $item->title),
-                       "type" => "block",
-                       "uri" => "comments/{$item->id}"));
+  static function available_feeds($item, $tag) {
+    $feeds["comment/newest"] = t("All new comments");
+    if ($item) {
+      $feeds["comment/item/$item->id"] =
+        t("Comments on %title", array("title" => p::clean($item->title)));
+    }
+    return $feeds;
   }
 
-  static function comments($offset, $limit, $id) {
-    $orm = ORM::factory("comment")
-      ->where("state", "published")
-      ->orderby("created", "DESC");
-    if (!empty($id)) {
-      $orm->where("item_id", $id);
-    }
+  static function feed($feed_id, $offset, $limit, $id) {
+    switch ($feed_id) {
+    case "newest":
+      $comments = ORM::factory("comment")
+        ->where("state", "published")
+        ->orderby("created", "DESC");
+      $all_comments = ORM::factory("comment")
+        ->where("state", "published")
+        ->orderby("created", "DESC");
+      break;
 
-    $feed["view"] = "comment.mrss";
-    $comments = $orm->find_all($limit, $offset);
-    $feed["children"] = array();
-    foreach ($comments as $comment) {
-      $item = $comment->item();
-      $feed["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
-      );
+    case "item":
+      $comments = ORM::factory("comment")
+        ->where("state", "published")
+        ->orderby("created", "DESC")
+        ->where("item_id", $id);
+      $all_comments = ORM::factory("comment")
+        ->where("state", "published")
+        ->where("item_id", $id);
     }
 
-    $feed["max_pages"] = ceil($comments->count() / $limit);
-    $feed["title"] = htmlspecialchars(t("Recent Comments"));
-    $feed["link"] = url::abs_site("albums/" . (empty($id) ? "1" : $id));
-    $feed["description"] = t("Recent Comments");
+    if (!empty($comments)) {
+      $feed->view = "comment.mrss";
+      $comments = $comments->find_all($limit, $offset);
+      $feed->children = array();
+      foreach ($comments as $comment) {
+        $item = $comment->item();
+        $feed->children[] = new ArrayObject(
+          array("pub_date" => date("D, d M Y H:i:s T", $comment->created),
+                "text" => $comment->text,
+                "thumb_url" => $item->thumb_url(),
+                "thumb_height" => $item->thumb_height,
+                "thumb_width" => $item->thumb_width,
+                "item_uri" => url::abs_site("{$item->type}s/$item->id"),
+                "title" => $item->title,
+                "author" => $comment->author_name()),
+          ArrayObject::ARRAY_AS_PROPS);
+      }
 
-    return $feed;
+      $feed->max_pages = ceil($all_comments->find_all()->count() / $limit);
+      $feed->title = htmlspecialchars(t("Recent Comments"));
+      $feed->uri = url::abs_site("albums/" . (empty($id) ? "1" : $id));
+      $feed->description = t("Recent Comments");
+
+      return $feed;
+    }
   }
 }
\ No newline at end of file