From 186c05898f031268ffbc6e132094ea657235538d Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Thu, 15 Apr 2010 14:43:44 +0000 Subject: [PATCH] Utilize where_link function git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1442 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- adminer/include/functions.inc.php | 5 +++-- adminer/select.inc.php | 6 ++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php index 5dab809a..42a46e96 100644 --- a/adminer/include/functions.inc.php +++ b/adminer/include/functions.inc.php @@ -188,9 +188,10 @@ function where_check($val) { * @param string column identifier * @param string * @return string +* @return string */ -function where_link($i, $column, $value) { - return "&where%5B$i%5D%5Bcol%5D=" . urlencode($column) . "&where%5B$i%5D%5Bop%5D=%3D&where%5B$i%5D%5Bval%5D=" . urlencode($value); +function where_link($i, $column, $value, $operator = "=") { + return "&where%5B$i%5D%5Bcol%5D=" . urlencode($column) . "&where%5B$i%5D%5Bop%5D=" . urlencode($operator) . "&where%5B$i%5D%5Bval%5D=" . urlencode($value); } /** Set cookie valid for 1 month diff --git a/adminer/select.inc.php b/adminer/select.inc.php index 16386e71..76604d3f 100644 --- a/adminer/select.inc.php +++ b/adminer/select.inc.php @@ -249,13 +249,11 @@ if (!$columns) { $i = 0; foreach ((array) $_GET["where"] as $v) { if (!array_key_exists($v["col"], $unique_array)) { - $link .= h("&where[$i][col]=" . urlencode($v["col"]) . "&where[$i][op]=" . urlencode($v["op"]) . "&where[$i][val]=" . urlencode($v["val"])); - $i++; + $link .= h(where_link($i++, $v["col"], $v["val"], urlencode($v["op"]))); } } foreach ($unique_array as $k => $v) { - $link .= h("&where[$i][col]=" . urlencode($k) . "&where[$i][op]=" . (isset($v) ? "%3D&where[$i][val]=" . urlencode($v) : "IS+NULL")); - $i++; + $link .= h(where_link($i++, $k, $v, (isset($v) ? "=" : "IS NULL"))); } } }