[Phpgroupware-cvs] phpgwapi/inc functions.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Sigurd Nes <sigurdne>   06/06/19 15:40:21

Modified files:
        inc            : functions.inc.php 

Log message:
        fix to let external link work with cookie-session

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/functions.inc.php?cvsroot=phpgwapi&r1=1.189&r2=1.190

Patches:
Index: functions.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -b -r1.189 -r1.190
--- functions.inc.php   17 Jun 2006 07:14:33 -0000      1.189
+++ functions.inc.php   19 Jun 2006 15:40:21 -0000      1.190
@@ -7,7 +7,7 @@
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage utilities
-       * @version $Id: functions.inc.php,v 1.189 2006/06/17 07:14:33 sigurdne 
Exp $
+       * @version $Id: functions.inc.php,v 1.190 2006/06/19 15:40:21 sigurdne 
Exp $
        */
        
        
@@ -323,19 +323,34 @@
                {
                        if($_GET['menuaction'])
                        {
+                               unset($_GET['click_history']);
+                               unset($_GET['sessionid']);
+                               unset($_GET['kp3']);
                                
$GLOBALS['phpgw']->session->phpgw_setcookie('redirect',serialize($_GET),$cookietime=0);
                        }
                        
                        $GLOBALS['phpgw']->redirect_link('/login.php','cd=10');
                }
 
-               $redirect_data = 
unserialize(get_var('redirect',array('GET','COOKIE')));
+               $redirect = 
unserialize(get_var('redirect',array('GET','COOKIE')));
 
-               if($redirect_data)
+               if($redirect)
                {
-                       $redirect_data['sessionid'] = $_GET['sessionid'];
+                       while(list($key,$value) = each($redirect))
+                       {
+                               $redirect_data[$key] = $value;
+                       }
+                       
+                       if(get_var('sessionid',array('GET')))
+                       {
+                               $redirect_data['sessionid'] = 
get_var('sessionid',array('GET'));
+                               $redirect_data['kp3'] = 
get_var('kp3',array('GET'));
+                       }
+                       
                        
$GLOBALS['phpgw']->session->phpgw_setcookie('redirect',false,$cookietime=0);
                        
$GLOBALS['phpgw']->redirect_link('/index.php',$redirect_data);  
+                       unset($redirect);
+                       unset($redirect_data);
                }
 
                $GLOBALS['phpgw']->datetime = CreateObject('phpgwapi.datetime');