[Phpgroupware-cvs] CVS: phpgroupware login.php, 1.76.2.4.2.11, 1.76.2.4.2.12 home.php, 1.16.2.1.2.2, 1.16.2.1.2.3

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/phpgroupware
In directory subversions:/tmp/cvs-serv9609

Modified Files:
      Tag: Version-0_9_16-branch
        login.php home.php 
Log Message:
fixed forward for globals

Index: login.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/login.php,v
retrieving revision 1.76.2.4.2.11
retrieving revision 1.76.2.4.2.12
diff -C2 -r1.76.2.4.2.11 -r1.76.2.4.2.12
*** login.php   29 Jun 2003 10:21:58 -0000      1.76.2.4.2.11
--- login.php   13 Jul 2003 04:46:46 -0000      1.76.2.4.2.12
***************
*** 226,236 ****
                else
                {
!                       if ($GLOBALS['phpgw_forward'])
                        {
!                               while (list($name,$value) = each($_GET))
                                {
                                        if (ereg('phpgw_',$name))
                                        {
!                                               $extra_vars .= '&' . $name . 
'=' . urlencode($value);
                                        }
                                }
--- 226,238 ----
                else
                {
!                       $forward = get_var('phpgw_forward', array('GET', 
'POST'), 0);
!                       if($forward)
                        {
!                               $extra_vars['phpgw_forward'] =  $forward;
!                               foreach($_GET as $name => $value)
                                {
                                        if (ereg('phpgw_',$name))
                                        {
!                                               $extra_vars[$name] = 
urlencode($value);
                                        }
                                }
***************
*** 238,242 ****
                        check_langs();
                        
!                       $GLOBALS['phpgw']->redirect_link('/home.php','cd=yes' . 
$extra_vars);
                }
        }
--- 240,246 ----
                        check_langs();
                        
!                       $extra_vars['cd'] = 'yes';
!                       
!                       $GLOBALS['phpgw']->redirect_link('/home.php', 
$extra_vars);
                }
        }
***************
*** 295,299 ****
                reset($GLOBALS['phpgw_domain']);
                list($default_domain) = each($GLOBALS['phpgw_domain']);
!               if ($_COOKIE['last_domain'] != $default_domain && 
!empty($_COOKIE['last_domain']))
                {
                        $last_loginid .= '@' . $_COOKIE['last_domain'];
--- 299,303 ----
                reset($GLOBALS['phpgw_domain']);
                list($default_domain) = each($GLOBALS['phpgw_domain']);
!       if ($_COOKIE['last_domain'] != $default_domain && 
!empty($_COOKIE['last_domain']))
                {
                        $last_loginid .= '@' . $_COOKIE['last_domain'];
***************
*** 301,305 ****
        }
  
!       while (list($name,$value) = each($_GET))
        {
                if (ereg('phpgw_',$name))
--- 305,309 ----
        }
  
!       foreach($_GET as $name => $value)
        {
                if (ereg('phpgw_',$name))

Index: home.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/home.php,v
retrieving revision 1.16.2.1.2.2
retrieving revision 1.16.2.1.2.3
diff -C2 -r1.16.2.1.2.2 -r1.16.2.1.2.3
*** home.php    18 Apr 2003 00:21:29 -0000      1.16.2.1.2.2
--- home.php    13 Jul 2003 04:46:46 -0000      1.16.2.1.2.3
***************
*** 38,44 ****
        include('header.inc.php');
  
!       if ($GLOBALS['phpgw_forward'])
        {
!               while (list($name,$value) = each($GLOBALS['HTTP_GET_VARS']))
                {
                        if (ereg('phpgw_',$name))
--- 38,44 ----
        include('header.inc.php');
  
!       if ($_GET['phpgw_forward'])
        {
!               foreach($_GET as $name => $value)
                {
                        if (ereg('phpgw_',$name))
***************
*** 47,51 ****
                        }
                }
!               
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link($GLOBALS['phpgw_forward'],$extra_vars));
        }
  
--- 47,52 ----
                        }
                }
!               
$GLOBALS['phpgw']->redirect_link($_GET['phpgw_forward'],$extra_vars);
!               exit;
        }