[Phpgroupware-cvs] sitemgr/sitemgr-site/functions.inc.php, 1.8

[nomail]

Update of /sitemgr/sitemgr-site
Modified Files:
        Branch: 
          functions.inc.php

date: 2004/07/20 23:22:54;  author: skwashd;  state: Exp;  lines: +3 -4

Log Message:
merge from 16
=====================================================================
Index: sitemgr/sitemgr-site/functions.inc.php
diff -u sitemgr/sitemgr-site/functions.inc.php:1.7 
sitemgr/sitemgr-site/functions.inc.php:1.8
--- sitemgr/sitemgr-site/functions.inc.php:1.7  Thu May 22 02:36:54 2003
+++ sitemgr/sitemgr-site/functions.inc.php      Tue Jul 20 23:22:54 2004
@@ -20,7 +20,7 @@
 
        function sitemgr_link($extravars = '')
        {
-               $kp3 = $GLOBALS['HTTP_GET_VARS']['kp3'] ? 
$GLOBALS['HTTP_GET_VARS']['kp3'] : $GLOBALS['HTTP_COOKIE_VARS']['kp3'];
+               $kp3 = $_GET['kp3'] ? $_GET['kp3'] : $_COOKIE['kp3'];
 
                if (! $kp3)
                {
@@ -63,16 +63,15 @@
                        
                if (is_array($extravars))
                {
-                       while(list($key,$value) = each($extravars))
+                       foreach($extravars as $key => $value)
                        {
                                if (!empty($new_extravars))
                                {
                                        $new_extravars .= '&';
                                }
-                               $new_extravars .= (($value == '') ? $key : 
"$key=$value");
+                               $new_extravars .= (($value == '') ? $key : 
($key . '=' . urlencode($value)) );
                        }
                        // This needs to be explictly reset to a string 
variable type for PHP3
-                       settype($extravars,'string');
                        $extravars = $new_extravars;
                }
                if (isset($GLOBALS['phpgw_info']['server']['usecookies']) && 
$GLOBALS['phpgw_info']['server']['usecookies'])