diff options
Diffstat (limited to 'modules/comment')
| -rw-r--r-- | modules/comment/helpers/comment_rss.php | 84 | ||||
| -rw-r--r-- | modules/comment/views/comment.mrss.php | 34 |
2 files changed, 66 insertions, 52 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 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> ]]> |