updates for new api

git-svn-id: file:///home/shish/svn/shimmie2/trunk@1138 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2008-12-13 04:13:44 +00:00
parent b9b3f540e2
commit eba8322a6d
3 changed files with 13 additions and 11 deletions

View File

@ -8,10 +8,10 @@
class AutoComplete implements Extension {
public function receive_event(Event $event) {
if(($event instanceof PageRequestEvent) && ($event->page_name == "index" || $event->page_name == "view")) {
if(($event instanceof PageRequestEvent) && ($event->page_matches("index") || $event->page_matches("view"))) {
$event->page->add_header("<script>autocomplete_url='".html_escape(make_link("autocomplete"))."';</script>");
}
if(($event instanceof PageRequestEvent) && ($event->page_name == "autocomplete")) {
if(($event instanceof PageRequestEvent) && $event->page_matches("autocomplete")) {
$event->page->set_mode("data");
$event->page->set_type("text/plain");
$event->page->set_data($this->get_completions($event->get_arg(0)));

View File

@ -30,7 +30,7 @@ class BrowserSearch implements Extension {
}
// The search.xml file that is generated on the fly
if(($event instanceof PageRequestEvent) && ($event->page_name == "browser_search") && $event->get_arg(0) == "please_dont_use_this_tag_as_it_would_break_stuff__search.xml") {
if(($event instanceof PageRequestEvent) && $event->page_matches("browser_search/please_dont_use_this_tag_as_it_would_break_stuff__search.xml")) {
// First, we need to build all the variables we'll need
$search_title = $config->get_string('title');
@ -58,7 +58,12 @@ class BrowserSearch implements Extension {
$page->set_mode("data");
$page->set_type("text/xml");
$page->set_data($xml);
} else if(($event instanceof PageRequestEvent) && ($event->page_name == "browser_search") && !$config->get_bool("disable_search_suggestions")) { // We need to return results!
}
else if(($event instanceof PageRequestEvent) && (
$event->page_matches("browser_search") &&
!$config->get_bool("disable_search_suggestions")
)) {
global $database;
// We have to build some json stuff

View File

@ -9,7 +9,7 @@
class Tagger implements Extension {
var $theme;
public function receive_event ($event) {
public function receive_event(Event $event) {
if(is_null($this->theme))
$this->theme = get_theme_object($this);
@ -43,10 +43,7 @@ add_event_listener(new Tagger());
// Tagger AJAX back-end
class TaggerXML implements Extension {
public function receive_event(Event $event) {
if(($event instanceof PageRequestEvent)
&& $event->page_name == "tagger"
&& $event->get_arg(0) == "tags")
{
if(($event instanceof PageRequestEvent) && $event->page_matches("tagger/tags")) {
global $page;
//$match_tags = null;
@ -55,9 +52,9 @@ class TaggerXML implements Extension {
if (isset($_GET['s'])) { // tagger/tags[/...]?s=$string
// return matching tags in XML form
$tags = $this->match_tag_list($_GET['s']);
} else if($event->get_arg(1)) { // tagger/tags/$int
} else if($event->get_arg(0)) { // tagger/tags/$int
// return arg[1] AS image_id's tag list in XML form
$tags = $this->image_tag_list($event->get_arg(1));
$tags = $this->image_tag_list($event->get_arg(0));
}
$xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n".