[Phpgroupware-cvs] CVS: phpgroupware login.php,1.97,1.98

[Ralf Becker <address@hidden>]

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

Modified Files:
        login.php 
Log Message:
added config-switch to disable autoload of langfiles
plus daves fix for register_globals off

Index: login.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/login.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -r1.97 -r1.98
*** login.php   17 Jun 2003 13:23:20 -0000      1.97
--- login.php   10 Aug 2003 10:11:43 -0000      1.98
***************
*** 212,228 ****
                else
                {
!                       if ($GLOBALS['phpgw_forward'])
                        {
!                               while (list($name,$value) = each($_GET))
                                {
                                        if (ereg('phpgw_',$name))
                                        {
!                                               $extra_vars .= '&' . $name . 
'=' . urlencode($value);
                                        }
                                }
                        }
!                       check_langs();
                        
!                       $GLOBALS['phpgw']->redirect_link('/home.php','cd=yes' . 
$extra_vars);
                }
        }
--- 212,234 ----
                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);
                                        }
                                }
                        }
!                       if 
(!$GLOBALS['phpgw_info']['server']['disable_autoload_langfiles'])
!                       {
!                               check_langs();
!                       }
!                       $extra_vars['cd'] = 'yes';
                        
!                       $GLOBALS['phpgw']->redirect_link('/home.php', 
$extra_vars);
                }
        }
***************
*** 278,281 ****
--- 284,288 ----
                reset($GLOBALS['phpgw_domain']);
                list($default_domain) = each($GLOBALS['phpgw_domain']);
+ 
                if ($_COOKIE['last_domain'] != $default_domain && 
!empty($_COOKIE['last_domain']))
                {
***************
*** 284,288 ****
        }
  
!       while (list($name,$value) = each($_GET))
        {
                if (ereg('phpgw_',$name))
--- 291,295 ----
        }
  
!       foreach($_GET as $name => $value)
        {
                if (ereg('phpgw_',$name))