Utilize where_link function
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1442 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
parent
16290b0929
commit
186c05898f
|
@ -188,9 +188,10 @@ function where_check($val) {
|
||||||
* @param string column identifier
|
* @param string column identifier
|
||||||
* @param string
|
* @param string
|
||||||
* @return string
|
* @return string
|
||||||
|
* @return string
|
||||||
*/
|
*/
|
||||||
function where_link($i, $column, $value) {
|
function where_link($i, $column, $value, $operator = "=") {
|
||||||
return "&where%5B$i%5D%5Bcol%5D=" . urlencode($column) . "&where%5B$i%5D%5Bop%5D=%3D&where%5B$i%5D%5Bval%5D=" . urlencode($value);
|
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
|
/** Set cookie valid for 1 month
|
||||||
|
|
|
@ -249,13 +249,11 @@ if (!$columns) {
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach ((array) $_GET["where"] as $v) {
|
foreach ((array) $_GET["where"] as $v) {
|
||||||
if (!array_key_exists($v["col"], $unique_array)) {
|
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"]));
|
$link .= h(where_link($i++, $v["col"], $v["val"], urlencode($v["op"])));
|
||||||
$i++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
foreach ($unique_array as $k => $v) {
|
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"));
|
$link .= h(where_link($i++, $k, $v, (isset($v) ? "=" : "IS NULL")));
|
||||||
$i++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue