merge 'remove rss from index' changeset
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.0@71 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
		
							parent
							
								
									43418fd287
								
							
						
					
					
						commit
						30c9e4a589
					
				@ -4,16 +4,12 @@ class Index extends Extension {
 | 
				
			|||||||
// event handling {{{
 | 
					// event handling {{{
 | 
				
			||||||
	public function receive_event($event) {
 | 
						public function receive_event($event) {
 | 
				
			||||||
		if(is_a($event, 'PageRequestEvent') && ($event->page == "index")) {
 | 
							if(is_a($event, 'PageRequestEvent') && ($event->page == "index")) {
 | 
				
			||||||
			if($event->get_arg(0) == 'rss') {
 | 
					 | 
				
			||||||
				$this->do_rss();
 | 
					 | 
				
			||||||
				if($page_number == 0) $page_number = 1; // invalid -> 0
 | 
					 | 
				
			||||||
			}
 | 
					 | 
				
			||||||
			else {
 | 
					 | 
				
			||||||
			$search_terms = array();
 | 
								$search_terms = array();
 | 
				
			||||||
			$page_number = 1;
 | 
								$page_number = 1;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			if($event->count_args() > 0) {
 | 
								if($event->count_args() > 0) {
 | 
				
			||||||
				$page_number = int_escape($event->get_arg(0));
 | 
									$page_number = int_escape($event->get_arg(0));
 | 
				
			||||||
 | 
									if($page_number == 0) $page_number = 1; // invalid -> 0
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			if(isset($_GET['search'])) {
 | 
								if(isset($_GET['search'])) {
 | 
				
			||||||
@ -56,7 +52,6 @@ class Index extends Extension {
 | 
				
			|||||||
			$page->add_main_block(new Block("Images", $this->build_table($images, $query)), 10);
 | 
								$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->add_main_block(new Paginator("index", $query, $page_number, $total_pages), 90);
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if(is_a($event, 'SetupBuildingEvent')) {
 | 
							if(is_a($event, 'SetupBuildingEvent')) {
 | 
				
			||||||
			$sb = new SetupBlock("Index Options");
 | 
								$sb = new SetupBlock("Index Options");
 | 
				
			||||||
@ -138,11 +133,6 @@ class Index extends Extension {
 | 
				
			|||||||
		return "<td><a href='$h_view_link'><img title='$h_tip' alt='$h_tip' src='$h_thumb_link'></a></td>\n";
 | 
							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());
 | 
					add_event_listener(new Index());
 | 
				
			||||||
?>
 | 
					?>
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user