Fix broken set_url_var function in functions/html.php (#1729814).

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12437 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index a4fba6225545bbbe1b40e99ea1b7525d3ebbcc27..0126ccfd57f9a296a1bdeb52cf95528c6a1fa6eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 
 Version 1.5.2 - SVN
 -------------------
+  - Fix broken set_url_var function in functions/html.php (#1729814).
   - Fix incorrect detection of auth mechanisms in conf.pl (#1727033).
   - The search expression in the LDAP backend of the Addressbook is now
     configurable, which can allow the result set to be expanded.

diff --git a/functions/html.php b/functions/html.php
index 41f38bd5debb87fa6b7df5dbe1700a08fa0a1b41..2df57f2e7aa0e9550a2e1639a06e7070ae1e5d48 100644 (file)
--- a/functions/html.php
+++ b/functions/html.php
@@ -314,13 +314,14 @@ function html_tag( $tag,                // Tag to output
 
 
 /**
- * handy function to set url vars
-//FIXME: You call this documentation?  :-)  What does "set url vars" mean?  Looks like it might take a fully-formed URI (possibly with a query string) and adds a variable/value pair to it(?)... Does $link work on only the var being added or the whole URI?
+ * This function is used to add, modify or delete GET variables in a URL. 
+ * It is especially useful when $url = $PHP_SELF
  *
- * especially useful when $url = $PHP_SELF
+ * Set $val to NULL to remove $var from $url.
+ * To ensure compatibility with older versions, use $val='0' to set $var to 0. 
  *
  * @param string $url url that must be modified
- * @param string $var variable name
+ * @param string $var GET variable name
  * @param string $val variable value
  * @param boolean $link controls sanitizing of ampersand in urls (since 1.3.2)
  *
@@ -329,61 +330,45 @@ function html_tag( $tag,                // Tag to output
  * @since 1.3.0
  *
  */
-function set_url_var($url, $var, $val=0, $link=true) {
-    $k = '';
-    $pat_a = array (
-                    '/.+(\\&'.$var.')=(.*)\\&/AU',   /* in the middle */
-                    '/.+\\?('.$var.')=(.*\\&).+/AU', /* at front, more follow */
-                    '/.+(\\?'.$var.')=(.*)$/AU',     /* at front and only var */
-                    '/.+(\\&'.$var.')=(.*)$/AU'      /* at the end */
-                    );
+function set_url_var($url, $var, $val=null, $link=true) {
     $url = str_replace('&','&',$url);
 
-    // FIXME: why switch is used instead of if () or one preg_match()
-    switch (true) {
-    case (preg_match($pat_a[0],$url,$regs)):
-        $k = $regs[1];
-        $v = $regs[2];
-        break;
-    case (preg_match($pat_a[1],$url,$regs)):
-        $k = $regs[1];
-        $v = $regs[2];
-        break;
-    case (preg_match($pat_a[2],$url,$regs)):
-        $k = $regs[1];
-        $v = $regs[2];
-        break;
-    case (preg_match($pat_a[3],$url,$regs)):
-        $k = $regs[1];
-        $v = $regs[2];
-        break;
-    default:
-        if ($val) {
-            if (strpos($url,'?')) {
-                $url .= "&$var=$val";
-            } else {
-                $url .= "?$var=$val";
-            }
+    if (strpos($url, '?') === false) {
+        $url .= '?';
+    }   
+
+    list($uri, $params) = explode('?', $url, 2);
+        
+    $newpar = array(); 
+    $params = explode('&', $params);
+   
+    foreach ($params as $p) {
+        if (trim($p)) {
+            $p = explode('=', $p);
+            $newpar[$p[0]] = (isset($p[1]) ? $p[1] : '');
         }
-        break;
     }
 
-    if ($k) {
-        if ($val) {
-            $rpl = "$k=$val";
-        } else {
-            $rpl = '';
-        }
-        if( substr($v,-1)=='&' ) {
-            $rpl .= '&';
-        }
-        $pat = "/$k=$v/";
-        $url = preg_replace($pat,$rpl,$url);
+    if (is_null($val)) {
+        unset($newpar[$var]);
+    } else {
+        $newpar[$var] = $val;
+    }
+
+    if (!count($newpar)) {
+        return $uri;
+    }
+   
+    $url = $uri . '?';
+    foreach ($newpar as $name => $value) {
+        $url .= "$name=$value&";
     }
+     
+    $url = substr($url, 0, -1);
     if ($link) {
         $url = str_replace('&','&',$url);
     }
+    
     return $url;
 }
 
-