Permalink
Browse files

merge 'remove rss from index' changeset

git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.0@71 7f39781d-f577-437e-ae19-be835c7a54ca
  • Loading branch information...
1 parent 43418fd commit 30c9e4a5893fbe2737fe3297c7405de5806706f9 shish committed May 7, 2007
Showing with 39 additions and 49 deletions.
  1. +39 −49 core/ext/index.ext.php
View
@@ -4,58 +4,53 @@ class Index extends Extension {
// event handling {{{
public function receive_event($event) {
if(is_a($event, 'PageRequestEvent') && ($event->page == "index")) {
- if($event->get_arg(0) == 'rss') {
- $this->do_rss();
+ $search_terms = array();
+ $page_number = 1;
+
+ if($event->count_args() > 0) {
+ $page_number = int_escape($event->get_arg(0));
if($page_number == 0) $page_number = 1; // invalid -> 0
}
- else {
- $search_terms = array();
- $page_number = 1;
- if($event->count_args() > 0) {
- $page_number = int_escape($event->get_arg(0));
- }
-
- if(isset($_GET['search'])) {
- $search_terms = explode(' ', $_GET['search']);
- $query = "search=".html_escape($_GET['search']);
- }
- else {
- $query = null;
- }
+ if(isset($_GET['search'])) {
+ $search_terms = explode(' ', $_GET['search']);
+ $query = "search=".html_escape($_GET['search']);
+ }
+ else {
+ $query = null;
+ }
- global $page;
- global $config;
- global $database;
+ global $page;
+ global $config;
+ global $database;
- $total_pages = $database->count_pages($search_terms);
- $count = $config->get_int('index_width') * $config->get_int('index_height');
- $images = $database->get_images(($page_number-1)*$count, $count, $search_terms);
+ $total_pages = $database->count_pages($search_terms);
+ $count = $config->get_int('index_width') * $config->get_int('index_height');
+ $images = $database->get_images(($page_number-1)*$count, $count, $search_terms);
- if(count($search_terms) == 0) {
- $page_title = $config->get_string('title');
- }
- else {
- $page_title = html_escape($_GET['search']);
- /*
- $page_title = "";
- foreach($search_terms as $term) {
- $h_term = html_escape($term);
- $page_title .= "<a href='".make_link("post/list", "search=$h_term")."'>$h_term</a>";
- }
- */
- $page->set_subheading("Page $page_number / $total_pages");
- }
- if($page_number > 1 || count($search_terms) > 0) {
- // $page_title .= " / $page_number";
+ if(count($search_terms) == 0) {
+ $page_title = $config->get_string('title');
+ }
+ else {
+ $page_title = html_escape($_GET['search']);
+ /*
+ $page_title = "";
+ foreach($search_terms as $term) {
+ $h_term = html_escape($term);
+ $page_title .= "<a href='".make_link("post/list", "search=$h_term")."'>$h_term</a>";
}
-
- $page->set_title($page_title);
- $page->set_heading($page_title);
- $page->add_side_block(new Block("Navigation", $this->build_navigation($page_number, $total_pages, $search_terms)), 0);
- $page->add_main_block(new Block("Images", $this->build_table($images, $query)), 10);
- $page->add_main_block(new Paginator("index", $query, $page_number, $total_pages), 90);
+ */
+ $page->set_subheading("Page $page_number / $total_pages");
}
+ if($page_number > 1 || count($search_terms) > 0) {
+ // $page_title .= " / $page_number";
+ }
+
+ $page->set_title($page_title);
+ $page->set_heading($page_title);
+ $page->add_side_block(new Block("Navigation", $this->build_navigation($page_number, $total_pages, $search_terms)), 0);
+ $page->add_main_block(new Block("Images", $this->build_table($images, $query)), 10);
+ $page->add_main_block(new Paginator("index", $query, $page_number, $total_pages), 90);
}
if(is_a($event, 'SetupBuildingEvent')) {
@@ -138,11 +133,6 @@ private function build_thumb($image, $query=null) {
return "<td><a href='$h_view_link'><img title='$h_tip' alt='$h_tip' src='$h_thumb_link'></a></td>\n";
}
// }}}
-// rss {{{
- private function do_rss() {
- // TODO: this function
- }
-// }}}
}
add_event_listener(new Index());
?>

0 comments on commit 30c9e4a

Please sign in to comment.