diff --git a/contrib/ipban/main.php b/contrib/ipban/main.php index b0ef5261..98d399c3 100644 --- a/contrib/ipban/main.php +++ b/contrib/ipban/main.php @@ -54,23 +54,19 @@ class IPBan extends Extension { else $end = $_POST['end']; send_event(new AddIPBanEvent($_POST['ip'], $_POST['reason'], $end)); - global $page; - $page->set_mode("redirect"); - $page->set_redirect(make_link("ip_ban/list")); + $event->page->set_mode("redirect"); + $event->page->set_redirect(make_link("ip_ban/list")); } } else if($event->get_arg(0) == "remove") { if(isset($_POST['id'])) { send_event(new RemoveIPBanEvent($_POST['id'])); - - global $page; - $page->set_mode("redirect"); - $page->set_redirect(make_link("ip_ban/list")); + $event->page->set_mode("redirect"); + $event->page->set_redirect(make_link("ip_ban/list")); } } else if($event->get_arg(0) == "list") { - global $page; - $this->theme->display_bans($page, $this->get_bans()); + $this->theme->display_bans($event->page, $this->get_bans()); } } } @@ -87,7 +83,8 @@ class IPBan extends Extension { } if(is_a($event, 'RemoveIPBanEvent')) { - $this->remove_ip_ban($event->id); + global $database; + $database->Execute("DELETE FROM bans WHERE id = ?", array($event->id)); } } // }}} @@ -105,7 +102,7 @@ class IPBan extends Extension { ip CHAR(15) NOT NULL, end_timestamp INTEGER, reason TEXT NOT NULL, - INDEX (end) + INDEX (end_timestamp) ) {$database->engine->create_table_extras}; "); $config->set_int("ext_ipban_version", 5); @@ -192,7 +189,10 @@ class IPBan extends Extension { private function get_active_bans() { global $database; - $bans = $database->get_all("SELECT * FROM bans WHERE (end_timestamp > ? OR end_timestamp is null)", array(time())); + $bans = $database->get_all(" + SELECT * FROM bans + WHERE (end_timestamp > now()) OR (end_timestamp IS NULL) + "); if($bans) {return $bans;} else {return array();} } @@ -202,11 +202,6 @@ class IPBan extends Extension { $sql = "INSERT INTO bans (ip, reason, end_timestamp, banner_id) VALUES (?, ?, ?, ?)"; $database->Execute($sql, array($ip, $reason, strtotime($end), $user->id)); } - - private function remove_ip_ban($id) { - global $database; - $database->Execute("DELETE FROM bans WHERE id = ?", array($id)); - } // }}} } add_event_listener(new IPBan(), 10); diff --git a/contrib/numeric_score/main.php b/contrib/numeric_score/main.php index 2d74dc0f..f6ebdefe 100644 --- a/contrib/numeric_score/main.php +++ b/contrib/numeric_score/main.php @@ -74,7 +74,7 @@ class NumericScore extends Extension { if(is_a($event, 'SearchTermParseEvent')) { $matches = array(); - if(preg_match("/score(<|<=|=|=>|>)(\d+)/", $event->term, $matches)) { + if(preg_match("/score(<|<=|=|>=|>)(\d+)/", $event->term, $matches)) { $cmp = $matches[1]; $score = $matches[2]; $event->set_querylet(new Querylet("numeric_score $cmp $score"));