From e3701f3916ab04afa5f263be4e6fdb3a506465b3 Mon Sep 17 00:00:00 2001
From: shish <shish@7f39781d-f577-437e-ae19-be835c7a54ca>
Date: Tue, 12 Aug 2008 01:36:39 +0000
Subject: [PATCH] tidying up

git-svn-id: file:///home/shish/svn/shimmie2/trunk@982 7f39781d-f577-437e-ae19-be835c7a54ca
---
 contrib/ipban/main.php | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/contrib/ipban/main.php b/contrib/ipban/main.php
index 966c573c..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));
 		}
 	}
 // }}}
@@ -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);