Continue refactoring the rss module and distribute the creation of album and

tag feeds to the gallery and tag modules respectively.  This chould close
ticket #388
This commit is contained in:
Tim Almdal
2009-06-12 11:48:13 -07:00
parent dc6c75cd05
commit 30bdaa8123
3 changed files with 63 additions and 85 deletions
-84
View File
@@ -20,90 +20,6 @@
class Rss_Controller extends Controller {
public static $page_size = 30;
public function albums($id) {
$item = ORM::factory("item", $id);
access::required("view", $item);
$page = $this->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 ($max_pages && $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 ($max_pages && $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;
}
public function __call($method, $arguments) {
$id = empty($arguments) ? null : $arguments[0];
$page = $this->input->get("page", 1);