From 1272d0837eeefb96af69bbb24a93b05cc818837f Mon Sep 17 00:00:00 2001
From: Tim Almdal
Date: Thu, 11 Jun 2009 00:44:34 -0700
Subject: Changed rss_theme::sidebar_blocks to fire the event
"request_feed_links" to allow modules to contribute rss feed links to the rss
sidebar block. Ticket #388.
---
modules/comment/helpers/comment_event.php | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'modules/comment/helpers')
diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php
index a3beb27a..6370e27d 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -21,4 +21,10 @@ class comment_event_Core {
static function item_before_delete($item) {
Database::instance()->delete("comments", array("item_id" => $item->id));
}
+
+ static function request_feed_links($event_data) {
+ $event_data->feeds[t("All new comments")] = url::site("rss/comments");
+ $event_data->feeds[sprintf(t("Comments on %s"), $event_data->item->title)] =
+ url::site("rss/comments/{$event_data->item->id}");
+ }
}
--
cgit v1.2.3
From e5793b5b2680cba14dda6bd0242b262baa0d00a6 Mon Sep 17 00:00:00 2001
From: Tim Almdal
Date: Fri, 12 Jun 2009 06:58:53 -0700
Subject: Change the "request_feed_links" eventing handling so that individual
modules provide the part of the url (the suffix) that they are interested in
and the rss module will format the rest of the url.
---
modules/comment/helpers/comment_event.php | 4 ++--
modules/gallery/helpers/gallery_event.php | 2 +-
modules/rss/helpers/rss_theme.php | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
(limited to 'modules/comment/helpers')
diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php
index 6370e27d..fdf3a96f 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -23,8 +23,8 @@ class comment_event_Core {
}
static function request_feed_links($event_data) {
- $event_data->feeds[t("All new comments")] = url::site("rss/comments");
+ $event_data->feeds[t("All new comments")] = "comments";
$event_data->feeds[sprintf(t("Comments on %s"), $event_data->item->title)] =
- url::site("rss/comments/{$event_data->item->id}");
+ "comments/{$event_data->item->id}";
}
}
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index b652d9a4..b1e9332d 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -45,6 +45,6 @@ class gallery_event_Core {
}
static function request_feed_links($event_data) {
- $event_data->feeds[t("New photos or movies")] = url::site("rss/updates");
+ $event_data->feeds[t("New photos or movies")] = url::site("updates");
}
}
diff --git a/modules/rss/helpers/rss_theme.php b/modules/rss/helpers/rss_theme.php
index b433c66a..2e4e141b 100644
--- a/modules/rss/helpers/rss_theme.php
+++ b/modules/rss/helpers/rss_theme.php
@@ -40,7 +40,9 @@ class rss_theme_Core {
$event_data->feeds = array();
$event_data->item = $theme->item();
module::event("request_feed_links", $event_data);
-
+ foreach ($event_data->feeds as $key => $feed) {
+ $event_data->feeds[$key] = url::site("rss/$feed");
+ }
$block = new Block();
$block->css_id = "gRss";
$block->title = t("Available RSS Feeds");
--
cgit v1.2.3
From d4d145a44302a1438df7416e3046457bc9582806 Mon Sep 17 00:00:00 2001
From: Tim Almdal
Date: Fri, 12 Jun 2009 07:46:42 -0700
Subject: Change from an event driven model to a call driven model similiar to
the task api.
---
modules/comment/helpers/comment_event.php | 6 ------
modules/comment/helpers/comment_rss.php | 30 ++++++++++++++++++++++++++++++
modules/gallery/helpers/gallery_event.php | 4 ----
modules/gallery/helpers/gallery_rss.php | 27 +++++++++++++++++++++++++++
modules/rss/helpers/rss.php | 21 +++++++++++++++++++++
modules/rss/helpers/rss_theme.php | 9 +--------
6 files changed, 79 insertions(+), 18 deletions(-)
create mode 100644 modules/comment/helpers/comment_rss.php
create mode 100644 modules/gallery/helpers/gallery_rss.php
(limited to 'modules/comment/helpers')
diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php
index fdf3a96f..a3beb27a 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -21,10 +21,4 @@ class comment_event_Core {
static function item_before_delete($item) {
Database::instance()->delete("comments", array("item_id" => $item->id));
}
-
- static function request_feed_links($event_data) {
- $event_data->feeds[t("All new comments")] = "comments";
- $event_data->feeds[sprintf(t("Comments on %s"), $event_data->item->title)] =
- "comments/{$event_data->item->id}";
- }
}
diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
new file mode 100644
index 00000000..9ae28726
--- /dev/null
+++ b/modules/comment/helpers/comment_rss.php
@@ -0,0 +1,30 @@
+ t("All new comments"),
+ "sidebar" => true,
+ "uri" => "comments"),
+ array("description" => sprintf(t("Comments on %s"), $item->title),
+ "sidebar" => true,
+ "uri" => "comments/{$item->id}"));
+ }
+}
\ No newline at end of file
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index b1e9332d..aa11b7c0 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -43,8 +43,4 @@ class gallery_event_Core {
module::clear_var("gallery", "choose_default_tookit");
}
}
-
- static function request_feed_links($event_data) {
- $event_data->feeds[t("New photos or movies")] = url::site("updates");
- }
}
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
new file mode 100644
index 00000000..0b87b1b1
--- /dev/null
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -0,0 +1,27 @@
+ t("New photos or movies"),
+ "sidebar" => true,
+ "uri" => "updates"));
+ }
+}
diff --git a/modules/rss/helpers/rss.php b/modules/rss/helpers/rss.php
index b320aeae..b0e7b30f 100644
--- a/modules/rss/helpers/rss.php
+++ b/modules/rss/helpers/rss.php
@@ -27,4 +27,25 @@ class rss_Core {
static function tag_feed($tag) {
return url::site("rss/tags/$tag->id}");
}
+
+ /**
+ * Get all available rss feeds
+ */
+ static function get_feeds($item, $sidebar_only=true) {
+ $feeds = array();
+ foreach (module::active() as $module) {
+ $class_name = "{$module->name}_rss";
+ if (method_exists($class_name, "available_feeds")) {
+ foreach (call_user_func(array($class_name, "available_feeds"), $item) as $feed) {
+ if ($sidebar_only && !$feed["sidebar"]) {
+ continue;
+ }
+ $feeds[$feed["description"]] = url::site("rss/{$feed['uri']}");
+ }
+ }
+ }
+
+ return $feeds;
+ }
+
}
\ No newline at end of file
diff --git a/modules/rss/helpers/rss_theme.php b/modules/rss/helpers/rss_theme.php
index 2e4e141b..b82133bd 100644
--- a/modules/rss/helpers/rss_theme.php
+++ b/modules/rss/helpers/rss_theme.php
@@ -36,18 +36,11 @@ class rss_theme_Core {
return;
}
- $event_data = new stdClass();
- $event_data->feeds = array();
- $event_data->item = $theme->item();
- module::event("request_feed_links", $event_data);
- foreach ($event_data->feeds as $key => $feed) {
- $event_data->feeds[$key] = url::site("rss/$feed");
- }
$block = new Block();
$block->css_id = "gRss";
$block->title = t("Available RSS Feeds");
$block->content = new View("rss_block.html");
- $block->content->feeds = $event_data->feeds;
+ $block->content->feeds = rss::get_feeds($theme->item());
return $block;
}
--
cgit v1.2.3
From dc6c75cd05b66b030daa9b4088ee69758f71e1e8 Mon Sep 17 00:00:00 2001
From: Tim Almdal
Date: Fri, 12 Jun 2009 08:52:03 -0700
Subject: Move the processing of rss feeds from the rss controller to callbacks
in the modules that are supplying the feed. The rss controller becomes a
router. In this change the comment and updates fields are distributed.
---
modules/comment/helpers/comment_rss.php | 35 ++++++++++++
modules/comment/views/comment.mrss.php | 43 +++++++++++++++
modules/gallery/helpers/gallery_rss.php | 15 ++++++
modules/rss/controllers/rss.php | 95 ++++++---------------------------
modules/rss/helpers/rss.php | 8 +++
modules/rss/views/comment.mrss.php | 43 ---------------
6 files changed, 117 insertions(+), 122 deletions(-)
create mode 100644 modules/comment/views/comment.mrss.php
delete mode 100644 modules/rss/views/comment.mrss.php
(limited to 'modules/comment/helpers')
diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
index 9ae28726..b191c326 100644
--- a/modules/comment/helpers/comment_rss.php
+++ b/modules/comment/helpers/comment_rss.php
@@ -27,4 +27,39 @@ class comment_rss_Core {
"sidebar" => true,
"uri" => "comments/{$item->id}"));
}
+
+ static function comments($offset, $limit, $id) {
+ $feed = new stdClass();
+ $orm = ORM::factory("comment")
+ ->where("state", "published")
+ ->orderby("created", "DESC");
+ if (!empty($id)) {
+ $orm->where("item_id", $id);
+ }
+
+ $feed->view = "comment.mrss";
+ $comments = $orm->find_all($limit, $offset);
+ $feed->data["children"] = array();
+ foreach ($comments as $comment) {
+ $item = $comment->item();
+ $feed->data["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->max_pages = ceil($comments->count() / $limit);
+ $feed->data["title"] = htmlspecialchars(t("Recent Comments"));
+ $feed->data["link"] = url::abs_site("albums/" . (empty($id) ? "1" : $id));
+ $feed->data["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
new file mode 100644
index 00000000..d2177026
--- /dev/null
+++ b/modules/comment/views/comment.mrss.php
@@ -0,0 +1,43 @@
+
+ echo "" ?>
+
+
+ gallery3
+ = p::clean($title) ?>
+ = $link ?>
+ = p::clean($description) ?>
+ en-us
+
+
+ if (!empty($previous_page_link)): ?>
+
+ endif ?>
+ if (!empty($next_page_link)): ?>
+
+ endif ?>
+ = $pub_date ?>
+ = $pub_date ?>
+ foreach ($children as $child): ?>
+ -
+ = p::clean($child["title"]) ?>
+ = p::clean($child["item_link"]) ?>
+ = p::clean($child["author"]) ?>
+ = $child["item_link"] ?>
+ = $child["pub_date"] ?>
+
+ = p::clean($child["text"]) ?>
+
+
"
+ height="= $child["thumb_height"] ?>" width="= $child["thumb_width"] ?>" />
+
+
+ ]]>
+
+
+ endforeach ?>
+
+
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index 0b87b1b1..98798346 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -24,4 +24,19 @@ class gallery_rss_Core {
"sidebar" => true,
"uri" => "updates"));
}
+
+ static function updates($offset, $limit) {
+ $feed = new stdClass();
+ $feed->data["children"] = ORM::factory("item")
+ ->viewable()
+ ->where("type !=", "album")
+ ->orderby("created", "DESC")
+ ->find_all($limit, $offset);
+ $feed->max_pages = ceil($feed->data["children"]->count() / $limit);
+ $feed->data["title"] = t("Recent Updates");
+ $feed->data["link"] = url::abs_site("albums/1");
+ $feed->data["description"] = t("Recent Updates");
+
+ return $feed;
+ }
}
diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php
index 1f8b8a4e..7e5b6193 100644
--- a/modules/rss/controllers/rss.php
+++ b/modules/rss/controllers/rss.php
@@ -62,47 +62,6 @@ class Rss_Controller extends Controller {
print $view;
}
- public function updates() {
- $page = $this->input->get("page", 1);
- if ($page < 1) {
- url::redirect("rss/updates");
- }
-
- $items = ORM::factory("item")
- ->viewable()
- ->where("type !=", "album")
- ->orderby("created", "DESC")
- ->find_all(self::$page_size, ($page - 1) * self::$page_size);
- $max_pages = ceil($items->count() / self::$page_size);
-
- if ($max_pages && $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 = t("Recent Updates");
- $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) {
@@ -145,59 +104,37 @@ class Rss_Controller extends Controller {
print $view;
}
- public function comments($id=null) {
+ public function __call($method, $arguments) {
+ $id = empty($arguments) ? null : $arguments[0];
$page = $this->input->get("page", 1);
+ $feed_uri = "rss/$method" . (empty($id) ? "" : "/$id");
if ($page < 1) {
- url::redirect("rss/comments/$id");
+ url::redirect($feed_uri);
}
- $orm = ORM::factory("comment")
- ->where("state", "published")
- ->orderby("created", "DESC");
- if (!empty($id)) {
- $orm->where("item_id", $id);
+ $feed = rss::process_feed($method, ($page - 1) * self::$page_size, self::$page_size, $id);
+ if ($feed->max_pages && $page > $feed->max_pages) {
+ url::redirect("$feed_uri?page={$feed->max_pages}");
}
- $comments = $orm->find_all(self::$page_size, ($page - 1) * self::$page_size);
- $max_pages = ceil($orm->count_last_query() / self::$page_size);
-
- if ($max_pages && $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
- );
+ $view = new View(empty($feed->view) ? "feed.mrss" : $feed->view);
+ foreach ($feed->data as $field => $value) {
+ $view->$field = $value;
}
+ $view->feed_link = url::abs_site($feed_uri);
if ($page > 1) {
$previous_page = $page - 1;
- $view->previous_page_link = url::site("rss/comments/{$item->id}?page={$previous_page}");
+ $view->previous_page_link = url::site("$feed_uri?page={$previous_page}");
}
- if ($page < $max_pages) {
+ if ($page < $feed->max_pages) {
$next_page = $page + 1;
- $view->next_page_link = url::site("rss/comments/{$item->id}?page={$next_page}");
+ $view->next_page_link = url::site("$feed_uri?page={$next_page}");
}
+ $view->pub_date = date("D, d M Y H:i:s T");
+
rest::http_content_type(rest::RSS);
print $view;
}
diff --git a/modules/rss/helpers/rss.php b/modules/rss/helpers/rss.php
index b0e7b30f..1d30425f 100644
--- a/modules/rss/helpers/rss.php
+++ b/modules/rss/helpers/rss.php
@@ -48,4 +48,12 @@ class rss_Core {
return $feeds;
}
+ static function process_feed($feed, $offset, $limit, $id) {
+ foreach (module::active() as $module) {
+ $class_name = "{$module->name}_rss";
+ if (method_exists($class_name, $feed)) {
+ return call_user_func(array($class_name, $feed), $offset, $limit, $id);
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/modules/rss/views/comment.mrss.php b/modules/rss/views/comment.mrss.php
deleted file mode 100644
index d2177026..00000000
--- a/modules/rss/views/comment.mrss.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- echo "" ?>
-
-
- gallery3
- = p::clean($title) ?>
- = $link ?>
- = p::clean($description) ?>
- en-us
-
-
- if (!empty($previous_page_link)): ?>
-
- endif ?>
- if (!empty($next_page_link)): ?>
-
- endif ?>
- = $pub_date ?>
- = $pub_date ?>
- foreach ($children as $child): ?>
- -
- = p::clean($child["title"]) ?>
- = p::clean($child["item_link"]) ?>
- = p::clean($child["author"]) ?>
- = $child["item_link"] ?>
- = $child["pub_date"] ?>
-
- = p::clean($child["text"]) ?>
-
-
"
- height="= $child["thumb_height"] ?>" width="= $child["thumb_width"] ?>" />
-
-
- ]]>
-
-
- endforeach ?>
-
-
--
cgit v1.2.3