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

postgres barfs if you try to compare a string to an inet_addr

Browse Source
This commit is contained in:
Shish 2010-02-03 14:29:55 +00:00
parent 5e4f387983
commit 8b93b0644c
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/log_db/main.php
View File

@ -55,10 +55,23 @@ class LogDatabase extends SimpleExtension {
$args[] = $_GET["module"]; $args[] = $_GET["module"];
} }
if(!empty($_GET["user"])) { if(!empty($_GET["user"])) {
if($database->engine->name == "pgsql") {
if(preg_match("#\d+\.\d+\.\d+\.\d+(/\d+)?#", $_GET["user"])) {
$wheres[] = "(username = ? OR address << ?)";
$args[] = $_GET["user"];
$args[] = $_GET["user"];
}
else {
$wheres[] = "lower(username) = lower(?)";
$args[] = $_GET["user"];
}
}
else {
$wheres[] = "(username = ? OR address = ?)"; $wheres[] = "(username = ? OR address = ?)";
$args[] = $_GET["user"]; $args[] = $_GET["user"];
$args[] = $_GET["user"]; $args[] = $_GET["user"];
} }
}
if(!empty($_GET["priority"])) { if(!empty($_GET["priority"])) {
$wheres[] = "priority >= ?"; $wheres[] = "priority >= ?";
$args[] = int_escape($_GET["priority"]); $args[] = int_escape($_GET["priority"]);