stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-22 23:05:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use stdClass to return the feed data. Just use an array.

Browse Source
This commit is contained in:
Tim Almdal
2009-06-14 12:38:57 -07:00
parent 76b89556fc
commit 8b7f7a2fbe
4 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/comment/helpers/comment_rss.php
+7 -8
View File
@@ -29,7 +29,6 @@ class comment_rss_Core {
}
static function comments($offset, $limit, $id) {
$feed = new stdClass();
$orm = ORM::factory("comment")
->where("state", "published")
->orderby("created", "DESC");
@@ -37,12 +36,12 @@ class comment_rss_Core {
$orm->where("item_id", $id);
}
$feed->view = "comment.mrss";
$feed["view"] = "comment.mrss";
$comments = $orm->find_all($limit, $offset);
$feed->data["children"] = array();
$feed["children"] = array();
foreach ($comments as $comment) {
$item = $comment->item();
$feed->data["children"][] = array(
$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(),
@@ -55,10 +54,10 @@ class comment_rss_Core {
);
}
$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");
$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");
return $feed;
}
modules/gallery/helpers/gallery_rss.php
+10 -12
View File
@@ -29,16 +29,15 @@ class gallery_rss_Core {
}
static function updates($offset, $limit) {
$feed = new stdClass();
$feed->data["children"] = ORM::factory("item")
$feed["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");
$feed["max_pages"] = ceil($feed["children"]->count() / $limit);
$feed["title"] = t("Recent Updates");
$feed["link"] = url::abs_site("albums/1");
$feed["description"] = t("Recent Updates");
return $feed;
}
@@ -47,14 +46,13 @@ class gallery_rss_Core {
$item = ORM::factory("item", $id);
access::required("view", $item);
$feed = new stdClass();
$feed->data["children"] = $item
$feed["children"] = $item
->viewable()
->descendants($limit, $offset, "photo");
$feed->max_pages = ceil($item->viewable()->descendants_count("photo") / $limit);
$feed->data["title"] = $item->title;
$feed->data["link"] = url::abs_site("albums/{$item->id}");
$feed->data["description"] = $item->description;
$feed["max_pages"] = ceil($item->viewable()->descendants_count("photo") / $limit);
$feed["title"] = $item->title;
$feed["link"] = url::abs_site("albums/{$item->id}");
$feed["description"] = $item->description;
return $feed;
}
modules/rss/controllers/rss.php
+9 -5
View File
@@ -28,12 +28,16 @@ class Rss_Controller extends Controller {
}
$feed = rss::feed_data($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}");
$max_pages = $feed["max_pages"];
if ($max_pages && $page > $max_pages) {
url::redirect("$feed_uri?page={$max_pages}");
}
unset($feed["max_pages"]);
$view = new View(empty($feed->view) ? "feed.mrss" : $feed->view);
foreach ($feed->data as $field => $value) {
$view = new View(empty($feed["view"]) ? "feed.mrss" : $feed["view"]);
unset($feed["view"]);
foreach ($feed as $field => $value) {
$view->$field = $value;
}
$view->feed_link = url::abs_site($feed_uri);
@@ -43,7 +47,7 @@ class Rss_Controller extends Controller {
$view->previous_page_link = url::site("$feed_uri?page={$previous_page}");
}
if ($page < $feed->max_pages) {
if ($page < $max_pages) {
$next_page = $page + 1;
$view->next_page_link = url::site("$feed_uri?page={$next_page}");
}
modules/tag/helpers/tag_rss.php
+5 -6
View File
@@ -31,12 +31,11 @@ class tag_rss_Core {
return Kohana::show_404();
}
$feed = new stdClass();
$feed->data["children"] = $tag->items($limit, $offset, "photo");
$feed->max_pages = ceil($tag->count / $limit);
$feed->data["title"] = $tag->name;
$feed->data["link"] = url::abs_site("tags/{$tag->id}");
$feed->data["description"] = t("Photos related to %tag_name", array("tag_name" => $tag->name));
$feed["children"] = $tag->items($limit, $offset, "photo");
$feed["max_pages"] = ceil($tag->count / $limit);
$feed["title"] = $tag->name;
$feed["link"] = url::abs_site("tags/{$tag->id}");
$feed["description"] = t("Photos related to %tag_name", array("tag_name" => $tag->name));
return $feed;
}