From 34a7a558b359dd82a4d44157688264fda9d49cd7 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Thu, 8 Mar 2012 01:30:08 +0000
Subject: [PATCH] IP searching in postgres, hackishly (compare text(address) to
 username, rather than comparing address to inet(username))

---
 contrib/log_db/main.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/contrib/log_db/main.php b/contrib/log_db/main.php
index 626b4360..8399720a 100644
--- a/contrib/log_db/main.php
+++ b/contrib/log_db/main.php
@@ -60,16 +60,20 @@ class LogDatabase extends Extension {
 				if(!empty($_GET["user"])) {
 					if($database->engine->name == "pgsql") {
 						if(preg_match("#\d+\.\d+\.\d+\.\d+(/\d+)?#", $_GET["user"])) {
-							$wheres[] = "(username = :user OR address << :user)";
+							$wheres[] = "(username = :user1 OR text(address) = :user2)";
+							$args["user1"] = $_GET["user"];
+							$args["user2"] = $_GET["user"] . "/32";
 						}
 						else {
 							$wheres[] = "lower(username) = lower(:user)";
+							$args["user"] = $_GET["user"];
 						}
 					}
 					else {
-						$wheres[] = "(username = :user OR address = :user)";
+						$wheres[] = "(username = :user1 OR address = :user2)";
+						$args["user1"] = $_GET["user"];
+						$args["user2"] = $_GET["user"];
 					}
-					$args["user"] = $_GET["user"];
 				}
 				if(!empty($_GET["priority"])) {
 					$wheres[] = "priority >= :priority";