[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/05/30 05:50:12

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

Log message:
        fix link()

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

Patches:
Index: phpgwapi/inc/class.phpgw.inc.php
diff -u phpgwapi/inc/class.phpgw.inc.php:1.50 
phpgwapi/inc/class.phpgw.inc.php:1.51
--- phpgwapi/inc/class.phpgw.inc.php:1.50       Sun Feb 19 11:45:25 2006
+++ phpgwapi/inc/class.phpgw.inc.php    Tue May 30 05:50:12 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.50 2006/02/19 11:45:25 skwashd 
Exp $
+       * @version $Id: class.phpgw.inc.php,v 1.51 2006/05/30 05:50:12 skwashd 
Exp $
        */
 
        /**
@@ -78,12 +78,13 @@
                 * @access public
                 * @param string $string The url the link is for
                 * @param string $extravars     Extra params to be passed to 
the url
+                * @param string $redirect is the resultant link being used in 
a header('Location:' ... redirect?
                 * @return string The full url after processing
                 * @see session->link()
                 */
-               function link($url = '', $extravars = '')
+               function link($url = '', $extravars = '', $redirect = false)
                {
-                       return $this->session->link($url, $extravars);
+                       return $this->session->link($url, $extravars, 
$redirect);
                }
 
                function redirect_link($url = '',$extravars='')
Index: phpgwapi/inc/class.sessions.inc.php
diff -u phpgwapi/inc/class.sessions.inc.php:1.111 
phpgwapi/inc/class.sessions.inc.php:1.112
--- phpgwapi/inc/class.sessions.inc.php:1.111   Sun Feb 19 11:45:25 2006
+++ phpgwapi/inc/class.sessions.inc.php Tue May 30 05:50:12 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.111 2006/02/19 11:45:25 
skwashd Exp $
+       * @version $Id: class.sessions.inc.php,v 1.112 2006/05/30 05:50:12 
skwashd Exp $
        * @link http://www.sanisoft.com/phplib/manual/DB_sql.php
        */
 
@@ -125,7 +125,7 @@
                */
                function sessions_()
                {
-                       $this->db = $GLOBALS['phpgw']->db;
+                       $this->db =& $GLOBALS['phpgw']->db;
                        $this->sessionid = 
get_var('sessionid',array('GET','COOKIE'));
                        $this->kp3       = get_var('kp3',array('GET','COOKIE'));
                        
@@ -1093,12 +1093,12 @@
                * @param bool $redirect is this for a redirect link ?
                * @return string generated url
                */
-               function link($url, $extravars = '', $redirect = False)
+               function link($url, $extravars = array(), $redirect=false)
                {
                        $term = '&';
-                       if ( !$redirect && 
!ExecMethod('phpgwapi.browser.is_ie') ) // IE chokes on &amp; IE really is a 
PoS!
+                       if ( !$redirect )
                        {
-                               $term = '&amp;'; // W#C Compliant
+                               $term = '&amp;'; // W3C Compliant
                        }
                        
                        /* first we process the $url to build the full 
scriptname */
@@ -1171,7 +1171,8 @@
                        }
                        
                        /* add session params if not using cookies */
-                       if (@!$GLOBALS['phpgw_info']['server']['usecookies'])
+                       if ( 
!isset($GLOBALS['phpgw_info']['server']['usecookies']) 
+                               || 
!$GLOBALS['phpgw_info']['server']['usecookies'])
                        {
                                $extravars['sessionid'] = $this->sessionid;
                                $extravars['kp3'] = $this->kp3;