holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed prob with login-scree-message and no cookie

Browse Source
This commit is contained in:
Ralf Becker 2003-09-23 21:26:58 +00:00
parent d26cfa20e9
commit 060311ab7d
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
login.php
View File

@ -254,29 +254,25 @@
$accounts = CreateObject('phpgwapi.accounts'); $accounts = CreateObject('phpgwapi.accounts');
$prefs = CreateObject('phpgwapi.preferences', $accounts->name2id($_COOKIE['last_loginid'])); $prefs = CreateObject('phpgwapi.preferences', $accounts->name2id($_COOKIE['last_loginid']));
if (! $prefs->account_id) if ($prefs->account_id)
{
// Default to the first language, the users browser accepts.
list($lang) = explode(',',$_SERVER["HTTP_ACCEPT_LANGUAGE"]);
$lang = substr($lang,0,2);
if(strlen($lang) != 2) $lang="en";
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = $lang;
}
else
{ {
$GLOBALS['phpgw_info']['user']['preferences'] = $prefs->read_repository(); $GLOBALS['phpgw_info']['user']['preferences'] = $prefs->read_repository();
} }
#print 'LANG:' . $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] . '<br>';
} }
else if (!isset($_COOKIE['last_loginid']) || !$prefs->account_id)
{ {
// If the lastloginid cookies isn't set, we will default to the first language, // If the lastloginid cookies isn't set, we will default to the first language,
// the users browser accepts. // the users browser accepts.
list($lang) = explode(',',$_SERVER["HTTP_ACCEPT_LANGUAGE"]); list($lang) = explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
$lang = substr($lang,0,2); if (strlen($lang) > 2)
if(strlen($lang) != 2) $lang="en"; {
$lang = substr($lang,0,2);
}
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = $lang; $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = $lang;
} }
#print 'LANG:' . $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] . '<br>';
$GLOBALS['phpgw']->translation->init(); // this will set the language according to the (new) set prefs
$GLOBALS['phpgw']->translation->add_app('login'); $GLOBALS['phpgw']->translation->add_app('login');
$GLOBALS['phpgw']->translation->add_app('loginscreen'); $GLOBALS['phpgw']->translation->add_app('loginscreen');
if (lang('loginscreen_message') == 'loginscreen_message*') if (lang('loginscreen_message') == 'loginscreen_message*')

5
phpgwapi/inc/class.translation_sql.inc.php
View File

@ -48,6 +48,11 @@
$this->userlang = $GLOBALS['phpgw_info']['user']['preferences']['common']['lang']; $this->userlang = $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
} }
$this->add_app('common'); $this->add_app('common');
if (!count($GLOBALS['lang']))
{
$this->userlang = 'en';
$this->add_app('common');
}
$this->add_app($GLOBALS['phpgw_info']['flags']['currentapp']); $this->add_app($GLOBALS['phpgw_info']['flags']['currentapp']);
} }