[adminer-svn] SF.net SVN: adminer:[1442] trunk/adminer

[<jak...@us...>]

Revision: 1442
          http://adminer.svn.sourceforge.net/adminer/?rev=1442&view=rev
Author:   jakubvrana
Date:     2010-04-15 14:43:44 +0000 (Thu, 15 Apr 2010)

Log Message:
-----------
Utilize where_link function

Modified Paths:
--------------
    trunk/adminer/include/functions.inc.php
    trunk/adminer/select.inc.php

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2010-04-15 12:42:31 UTC (rev 1441)
+++ trunk/adminer/include/functions.inc.php	2010-04-15 14:43:44 UTC (rev 1442)
@@ -188,9 +188,10 @@
 * @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

Modified: trunk/adminer/select.inc.php
===================================================================
--- trunk/adminer/select.inc.php	2010-04-15 12:42:31 UTC (rev 1441)
+++ trunk/adminer/select.inc.php	2010-04-15 14:43:44 UTC (rev 1442)
@@ -249,13 +249,11 @@
 								$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")));
 								}
 							}
 						}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.