From 8b2c05afc0a9f8ad7490fd46bb1c8249d03c2fb8 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Thu, 19 Feb 2009 15:24:17 +0000 Subject: 1) Rename the module media_rss to rss 2) Protect the fullsize image with a permission check 3) Added a content:encoded element to each item which allows the image to show up in the body of the feed. --- modules/media_rss/controllers/media_rss.php | 108 ---------------------- modules/media_rss/helpers/media_rss.php | 30 ------ modules/media_rss/helpers/media_rss_installer.php | 31 ------- modules/media_rss/helpers/media_rss_theme.php | 32 ------- modules/media_rss/module.info | 3 - modules/media_rss/views/feed.mrss.php | 55 ----------- modules/rss/controllers/rss.php | 108 ++++++++++++++++++++++ modules/rss/helpers/rss.php | 30 ++++++ modules/rss/helpers/rss_installer.php | 33 +++++++ modules/rss/helpers/rss_theme.php | 32 +++++++ modules/rss/module.info | 3 + modules/rss/views/feed.mrss.php | 68 ++++++++++++++ 12 files changed, 274 insertions(+), 259 deletions(-) delete mode 100644 modules/media_rss/controllers/media_rss.php delete mode 100644 modules/media_rss/helpers/media_rss.php delete mode 100644 modules/media_rss/helpers/media_rss_installer.php delete mode 100644 modules/media_rss/helpers/media_rss_theme.php delete mode 100644 modules/media_rss/module.info delete mode 100644 modules/media_rss/views/feed.mrss.php create mode 100644 modules/rss/controllers/rss.php create mode 100644 modules/rss/helpers/rss.php create mode 100644 modules/rss/helpers/rss_installer.php create mode 100644 modules/rss/helpers/rss_theme.php create mode 100644 modules/rss/module.info create mode 100644 modules/rss/views/feed.mrss.php (limited to 'modules') diff --git a/modules/media_rss/controllers/media_rss.php b/modules/media_rss/controllers/media_rss.php deleted file mode 100644 index 1bc34557..00000000 --- a/modules/media_rss/controllers/media_rss.php +++ /dev/null @@ -1,108 +0,0 @@ -input->get("page", 1); - if ($page < 1) { - url::redirect("media_rss/albums/{$item->id}"); - } - - $children = $item - ->viewable() - ->descendants(self::$page_size, ($page - 1) * self::$page_size, "photo"); - $max_pages = ceil($item->viewable()->descendants_count("photo") / self::$page_size); - - if ($page > $max_pages) { - url::redirect("media_rss/albums/{$item->id}?page=$max_pages"); - } - - $view = new View("feed.mrss"); - $view->title = $item->title; - $view->link = url::abs_site("albums/{$item->id}"); - $view->description = $item->description; - $view->feed_link = url::abs_site("media_rss/albums/{$item->id}"); - $view->children = $children; - - if ($page > 1) { - $previous_page = $page - 1; - $view->previous_page_link = url::site("media_rss/albums/{$item->id}?page={$previous_page}"); - } - - if ($page < $max_pages) { - $next_page = $page + 1; - $view->next_page_link = url::site("media_rss/albums/{$item->id}?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) { - return Kohana::show_404(); - } - - $page = $this->input->get("page", 1); - if ($page < 1) { - url::redirect("media_rss/tags/{$tag->id}"); - } - - $children = $tag->items(self::$page_size, ($page - 1) * self::$page_size, "photo"); - $max_pages = ceil($tag->count / self::$page_size); - - if ($page > $max_pages) { - url::redirect("media_rss/tags/{$tag->id}?page=$max_pages"); - } - - $view = new View("feed.mrss"); - $view->title = $tag->name; - $view->link = url::abs_site("tags/{$tag->id}"); - $view->description = t("Photos related to %tag_name", array("tag_name" => $tag->name)); - $view->feed_link = url::abs_site("media_rss/tags/{$tag->id}"); - $view->children = $children; - - if ($page > 1) { - $previous_page = $page - 1; - $view->previous_page_link = url::site("media_rss/tags/{$tag->id}?page={$previous_page}"); - } - - if ($page < $max_pages) { - $next_page = $page + 1; - $view->next_page_link = url::site("media_rss/tags/{$tag->id}?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; - } -} \ No newline at end of file diff --git a/modules/media_rss/helpers/media_rss.php b/modules/media_rss/helpers/media_rss.php deleted file mode 100644 index 3f98277f..00000000 --- a/modules/media_rss/helpers/media_rss.php +++ /dev/null @@ -1,30 +0,0 @@ -is_album() ? $item->id : $item->parent_id; - return url::site("media_rss/albums/$id"); - } - - static function tag_feed($tag) { - return url::site("media_rss/tags/$tag->id}"); - } -} \ No newline at end of file diff --git a/modules/media_rss/helpers/media_rss_installer.php b/modules/media_rss/helpers/media_rss_installer.php deleted file mode 100644 index 170f2dfb..00000000 --- a/modules/media_rss/helpers/media_rss_installer.php +++ /dev/null @@ -1,31 +0,0 @@ -item()) { - $url = media_rss::item_feed($theme->item()); - } else if ($theme->tag()) { - $url = media_rss::tag_feed($theme->tag()); - } - - if (!empty($url)) { - return ""; - } - } -} diff --git a/modules/media_rss/module.info b/modules/media_rss/module.info deleted file mode 100644 index 09b12c27..00000000 --- a/modules/media_rss/module.info +++ /dev/null @@ -1,3 +0,0 @@ -name = Media RSS -description = Provide a Media RSS feed for albums -version = 1 diff --git a/modules/media_rss/views/feed.mrss.php b/modules/media_rss/views/feed.mrss.php deleted file mode 100644 index d56b8ee0..00000000 --- a/modules/media_rss/views/feed.mrss.php +++ /dev/null @@ -1,55 +0,0 @@ - -" ?> - - - gallery3 - <?= htmlspecialchars($title) ?> - - - en-us - - - - - - - - diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php new file mode 100644 index 00000000..24ba7249 --- /dev/null +++ b/modules/rss/controllers/rss.php @@ -0,0 +1,108 @@ +input->get("page", 1); + if ($page < 1) { + url::redirect("rss/albums/{$item->id}"); + } + + $children = $item + ->viewable() + ->descendants(self::$page_size, ($page - 1) * self::$page_size, "photo"); + $max_pages = ceil($item->viewable()->descendants_count("photo") / self::$page_size); + + if ($page > $max_pages) { + url::redirect("rss/albums/{$item->id}?page=$max_pages"); + } + + $view = new View("feed.mrss"); + $view->title = $item->title; + $view->link = url::abs_site("albums/{$item->id}"); + $view->description = $item->description; + $view->feed_link = url::abs_site("rss/albums/{$item->id}"); + $view->children = $children; + + if ($page > 1) { + $previous_page = $page - 1; + $view->previous_page_link = url::site("rss/albums/{$item->id}?page={$previous_page}"); + } + + if ($page < $max_pages) { + $next_page = $page + 1; + $view->next_page_link = url::site("rss/albums/{$item->id}?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) { + return Kohana::show_404(); + } + + $page = $this->input->get("page", 1); + if ($page < 1) { + url::redirect("rss/tags/{$tag->id}"); + } + + $children = $tag->items(self::$page_size, ($page - 1) * self::$page_size, "photo"); + $max_pages = ceil($tag->count / self::$page_size); + + if ($page > $max_pages) { + url::redirect("rss/tags/{$tag->id}?page=$max_pages"); + } + + $view = new View("feed.mrss"); + $view->title = $tag->name; + $view->link = url::abs_site("tags/{$tag->id}"); + $view->description = t("Photos related to %tag_name", array("tag_name" => $tag->name)); + $view->feed_link = url::abs_site("rss/tags/{$tag->id}"); + $view->children = $children; + + if ($page > 1) { + $previous_page = $page - 1; + $view->previous_page_link = url::site("rss/tags/{$tag->id}?page={$previous_page}"); + } + + if ($page < $max_pages) { + $next_page = $page + 1; + $view->next_page_link = url::site("rss/tags/{$tag->id}?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; + } +} \ No newline at end of file diff --git a/modules/rss/helpers/rss.php b/modules/rss/helpers/rss.php new file mode 100644 index 00000000..728c2847 --- /dev/null +++ b/modules/rss/helpers/rss.php @@ -0,0 +1,30 @@ +is_album() ? $item->id : $item->parent_id; + return url::site("rss/albums/$id"); + } + + static function tag_feed($tag) { + return url::site("rss/tags/$tag->id}"); + } +} \ No newline at end of file diff --git a/modules/rss/helpers/rss_installer.php b/modules/rss/helpers/rss_installer.php new file mode 100644 index 00000000..aabd5664 --- /dev/null +++ b/modules/rss/helpers/rss_installer.php @@ -0,0 +1,33 @@ +item()) { + $url = rss::item_feed($theme->item()); + } else if ($theme->tag()) { + $url = rss::tag_feed($theme->tag()); + } + + if (!empty($url)) { + return ""; + } + } +} diff --git a/modules/rss/module.info b/modules/rss/module.info new file mode 100644 index 00000000..ffd26192 --- /dev/null +++ b/modules/rss/module.info @@ -0,0 +1,3 @@ +name = RSS +description = Provide a RSS feeds +version = 1 diff --git a/modules/rss/views/feed.mrss.php b/modules/rss/views/feed.mrss.php new file mode 100644 index 00000000..6015f471 --- /dev/null +++ b/modules/rss/views/feed.mrss.php @@ -0,0 +1,68 @@ + +" ?> + + + gallery3 + <?= htmlspecialchars($title) ?> + + + en-us + + + + + + + + -- cgit v1.2.3