james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge some fixes

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@984 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2008-08-12 02:39:08 +00:00
parent 770e313da1
commit 9d868750e2
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
contrib/ipban/main.php
View File

@ -54,23 +54,19 @@ class IPBan extends Extension {
else $end = $_POST['end']; else $end = $_POST['end'];
send_event(new AddIPBanEvent($_POST['ip'], $_POST['reason'], $end)); send_event(new AddIPBanEvent($_POST['ip'], $_POST['reason'], $end));
global $page; $event->page->set_mode("redirect");
$page->set_mode("redirect"); $event->page->set_redirect(make_link("ip_ban/list"));
$page->set_redirect(make_link("ip_ban/list"));
} }
} }
else if($event->get_arg(0) == "remove") { else if($event->get_arg(0) == "remove") {
if(isset($_POST['id'])) { if(isset($_POST['id'])) {
send_event(new RemoveIPBanEvent($_POST['id'])); send_event(new RemoveIPBanEvent($_POST['id']));
$event->page->set_mode("redirect");
global $page; $event->page->set_redirect(make_link("ip_ban/list"));
$page->set_mode("redirect");
$page->set_redirect(make_link("ip_ban/list"));
} }
} }
else if($event->get_arg(0) == "list") { else if($event->get_arg(0) == "list") {
global $page; $this->theme->display_bans($event->page, $this->get_bans());
$this->theme->display_bans($page, $this->get_bans());
} }
} }
} }
@ -87,7 +83,8 @@ class IPBan extends Extension {
} }
if(is_a($event, 'RemoveIPBanEvent')) { 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, ip CHAR(15) NOT NULL,
end_timestamp INTEGER, end_timestamp INTEGER,
reason TEXT NOT NULL, reason TEXT NOT NULL,
INDEX (end) INDEX (end_timestamp)
) {$database->engine->create_table_extras}; ) {$database->engine->create_table_extras};
"); ");
$config->set_int("ext_ipban_version", 5); $config->set_int("ext_ipban_version", 5);
@ -192,7 +189,10 @@ class IPBan extends Extension {
private function get_active_bans() { private function get_active_bans() {
global $database; 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;} if($bans) {return $bans;}
else {return array();} else {return array();}
} }
@ -202,11 +202,6 @@ class IPBan extends Extension {
$sql = "INSERT INTO bans (ip, reason, end_timestamp, banner_id) VALUES (?, ?, ?, ?)"; $sql = "INSERT INTO bans (ip, reason, end_timestamp, banner_id) VALUES (?, ?, ?, ?)";
$database->Execute($sql, array($ip, $reason, strtotime($end), $user->id)); $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); add_event_listener(new IPBan(), 10);

2
contrib/numeric_score/main.php
View File

@ -74,7 +74,7 @@ class NumericScore extends Extension {
if(is_a($event, 'SearchTermParseEvent')) { if(is_a($event, 'SearchTermParseEvent')) {
$matches = array(); $matches = array();
if(preg_match("/score(<|<=|=|=>|>)(\d+)/", $event->term, $matches)) { if(preg_match("/score(<|<=|=|>=|>)(\d+)/", $event->term, $matches)) {
$cmp = $matches[1]; $cmp = $matches[1];
$score = $matches[2]; $score = $matches[2];
$event->set_querylet(new Querylet("numeric_score $cmp $score")); $event->set_querylet(new Querylet("numeric_score $cmp $score"));