[Phpgroupware-cvs] phpgwapi/inc class.phpgw.inc.php class.sessions...

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Branch:         
Changes by:     Dave Hall <address@hidden>      06/02/19 11:45:25

Modified files:
        inc            : class.phpgw.inc.php class.sessions.inc.php 

Log message:
        &smp; is needed in links for 'pages' to validate, this makes it happen, 
if your app is now broken use phpgwapi.phpgw.redirect_link to fix it, don't 
roll this back

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/class.phpgw.inc.php.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/class.sessions.inc.php.diff?tr1=1.110&tr2=1.111&r1=text&r2=text

Patches:
Index: phpgwapi/inc/class.phpgw.inc.php
diff -u phpgwapi/inc/class.phpgw.inc.php:1.49 
phpgwapi/inc/class.phpgw.inc.php:1.50
--- phpgwapi/inc/class.phpgw.inc.php:1.49       Thu Dec 30 06:47:31 2004
+++ phpgwapi/inc/class.phpgw.inc.php    Sun Feb 19 11:45:25 2006
@@ -7,7 +7,7 @@
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage application
-       * @version $Id: class.phpgw.inc.php,v 1.49 2004/12/30 06:47:31 skwashd 
Exp $
+       * @version $Id: class.phpgw.inc.php,v 1.50 2006/02/19 11:45:25 skwashd 
Exp $
        */
 
        /**
@@ -88,7 +88,7 @@
 
                function redirect_link($url = '',$extravars='')
                {
-                       $this->redirect($this->session->link($url, $extravars));
+                       $this->redirect($this->session->link($url, $extravars, 
true));
                }
 
                /**
@@ -137,7 +137,7 @@
                        
                        if ( !$url )
                        {
-                               $url = $SERVER['PHP_SELF'];
+                               $url = $_SERVER['PHP_SELF'];
                        }
                        if ( $iis )
                        {
Index: phpgwapi/inc/class.sessions.inc.php
diff -u phpgwapi/inc/class.sessions.inc.php:1.110 
phpgwapi/inc/class.sessions.inc.php:1.111
--- phpgwapi/inc/class.sessions.inc.php:1.110   Thu Feb 10 11:37:57 2005
+++ phpgwapi/inc/class.sessions.inc.php Sun Feb 19 11:45:25 2006
@@ -10,7 +10,7 @@
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage accounts
-       * @version $Id: class.sessions.inc.php,v 1.110 2005/02/10 11:37:57 
fipsfuchs Exp $
+       * @version $Id: class.sessions.inc.php,v 1.111 2006/02/19 11:45:25 
skwashd Exp $
        * @link http://www.sanisoft.com/phplib/manual/DB_sql.php
        */
 
@@ -1090,10 +1090,17 @@
                *
                * @param string $url a url relative to the phpgroupware install 
root
                * @param array $extravars query string arguements
+               * @param bool $redirect is this for a redirect link ?
                * @return string generated url
                */
-               function link($url, $extravars = '')
+               function link($url, $extravars = '', $redirect = False)
                {
+                       $term = '&';
+                       if ( !$redirect && 
!ExecMethod('phpgwapi.browser.is_ie') ) // IE chokes on &amp; IE really is a 
PoS!
+                       {
+                               $term = '&amp;'; // W#C Compliant
+                       }
+                       
                        /* first we process the $url to build the full 
scriptname */
                        $full_scriptname = True;
 
@@ -1185,7 +1192,7 @@
                                {
                                        if (!empty($new_extravars))
                                        {
-                                               $new_extravars .= '&';
+                                               $new_extravars .= $term;
                                        }
                                        $new_extravars .= 
$key.'='.urlencode($value);
                                }