added config-switch to disable autoload of langfiles

plus daves fix for register_globals off
This commit is contained in:
Ralf Becker 2003-08-10 10:11:43 +00:00
parent cd1025f9cf
commit 6e69545b4b

View File

@ -211,19 +211,25 @@
} }
else else
{ {
if ($GLOBALS['phpgw_forward']) $forward = get_var('phpgw_forward', array('GET', 'POST'), 0);
if($forward)
{ {
while (list($name,$value) = each($_GET)) $extra_vars['phpgw_forward'] = $forward;
foreach($_GET as $name => $value)
{ {
if (ereg('phpgw_',$name)) if (ereg('phpgw_',$name))
{ {
$extra_vars .= '&' . $name . '=' . urlencode($value); $extra_vars[$name] = urlencode($value);
} }
} }
} }
check_langs(); if (!$GLOBALS['phpgw_info']['server']['disable_autoload_langfiles'])
{
check_langs();
}
$extra_vars['cd'] = 'yes';
$GLOBALS['phpgw']->redirect_link('/home.php','cd=yes' . $extra_vars); $GLOBALS['phpgw']->redirect_link('/home.php', $extra_vars);
} }
} }
else else
@ -277,13 +283,14 @@
{ {
reset($GLOBALS['phpgw_domain']); reset($GLOBALS['phpgw_domain']);
list($default_domain) = each($GLOBALS['phpgw_domain']); list($default_domain) = each($GLOBALS['phpgw_domain']);
if ($_COOKIE['last_domain'] != $default_domain && !empty($_COOKIE['last_domain'])) if ($_COOKIE['last_domain'] != $default_domain && !empty($_COOKIE['last_domain']))
{ {
$last_loginid .= '@' . $_COOKIE['last_domain']; $last_loginid .= '@' . $_COOKIE['last_domain'];
} }
} }
while (list($name,$value) = each($_GET)) foreach($_GET as $name => $value)
{ {
if (ereg('phpgw_',$name)) if (ereg('phpgw_',$name))
{ {