From 3b684655e2afcb6d24885c98a7821db4d6db4e07 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 15 Jun 2009 07:40:57 +0800
Subject: Refactor feed code to use stdClass everywhere.  Fix bugs in the
 max-pages calculation code.  Move feed related data into the $feed variable
 and only pass that to the view.

Signed-off-by:  <unostar@danalan.info>
---
 modules/comment/helpers/comment_rss.php | 48 +++++++++++++++++----------------
 modules/comment/views/comment.mrss.php  | 34 +++++++++++------------
 2 files changed, 42 insertions(+), 40 deletions(-)

(limited to 'modules/comment')

diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
index 56de4284..c3eb7b2b 100644
--- a/modules/comment/helpers/comment_rss.php
+++ b/modules/comment/helpers/comment_rss.php
@@ -21,43 +21,45 @@
 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 comments($offset, $limit, $id) {
-    $orm = ORM::factory("comment")
+    $comments = ORM::factory("comment")
       ->where("state", "published")
       ->orderby("created", "DESC");
-    if (!empty($id)) {
-      $orm->where("item_id", $id);
+    if ($id) {
+      $comments->where("item_id", $id);
     }
 
-    $feed["view"] = "comment.mrss";
-    $comments = $orm->find_all($limit, $offset);
-    $feed["children"] = array();
+    $feed->view = "comment.mrss";
+    $comments = $comments->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
-      );
+      $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);
     }
 
-    $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");
+    $all_comments = ORM::factory("comment")->where("state", "published");
+    if ($id) {
+      $all_comments->where("item_id", $id);
+    }
+
+    $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;
   }
diff --git a/modules/comment/views/comment.mrss.php b/modules/comment/views/comment.mrss.php
index d2177026..4f520144 100644
--- a/modules/comment/views/comment.mrss.php
+++ b/modules/comment/views/comment.mrss.php
@@ -6,33 +6,33 @@
    xmlns:fh="http://purl.org/syndication/history/1.0">
   <channel>
     <generator>gallery3</generator>
-    <title><?= p::clean($title) ?></title>
-    <link><?= $link ?></link>
-    <description><?= p::clean($description) ?></description>
+    <title><?= p::clean($feed->title) ?></title>
+    <link><?= $feed->uri ?></link>
+    <description><?= p::clean($feed->description) ?></description>
     <language>en-us</language>
-    <atom:link rel="self" href="<?= $feed_link ?>" type="application/rss+xml" />
+    <atom:link rel="self" href="<?= $feed->uri ?>" type="application/rss+xml" />
     <fh:complete/>
-    <? if (!empty($previous_page_link)): ?>
-    <atom:link rel="previous" href="<?= $previous_page_link ?>" type="application/rss+xml" />
+    <? if (!empty($feed->previous_page_uri)): ?>
+    <atom:link rel="previous" href="<?= $feed->previous_page_uri ?>" type="application/rss+xml" />
     <? endif ?>
-    <? if (!empty($next_page_link)): ?>
-    <atom:link rel="next" href="<?= $next_page_link ?>" type="application/rss+xml" />
+    <? if (!empty($feed->next_page_uri)): ?>
+    <atom:link rel="next" href="<?= $feed->next_page_uri ?>" type="application/rss+xml" />
     <? endif ?>
     <pubDate><?= $pub_date ?></pubDate>
     <lastBuildDate><?= $pub_date ?></lastBuildDate>
-    <? foreach ($children as $child): ?>
+    <? foreach ($feed->children as $child): ?>
     <item>
-      <title><?= p::clean($child["title"]) ?></title>
-      <link><?= p::clean($child["item_link"]) ?></link>
-      <author><?= p::clean($child["author"]) ?></author>
-      <guid isPermaLink="true"><?= $child["item_link"] ?></guid>
-      <pubDate><?= $child["pub_date"] ?></pubDate>
+      <title><?= p::clean($child->title) ?></title>
+      <link><?= p::clean($child->item_uri) ?></link>
+      <author><?= p::clean($child->author) ?></author>
+      <guid isPermaLink="true"><?= $child->item_uri ?></guid>
+      <pubDate><?= $child->pub_date ?></pubDate>
       <content:encoded>
         <![CDATA[
-          <p><?= p::clean($child["text"]) ?></p>
+          <p><?= p::clean($child->text) ?></p>
           <p>
-            <img alt="" src="<?= $child["thumb_url"] ?>"
-                 height="<?= $child["thumb_height"] ?>" width="<?= $child["thumb_width"] ?>" />
+            <img alt="" src="<?= $child->thumb_url ?>"
+                 height="<?= $child->thumb_height ?>" width="<?= $child->thumb_width ?>" />
             <br />
           </p>
         ]]>
-- 
cgit v1.2.3