extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

merged from trunk

Browse Source
This commit is contained in:
Lars Kneschke 2007-03-19 09:13:57 +00:00
parent 31c863fb89
commit d14d8c7663
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
setup/inc/class.setup.inc.php
View File

@ -175,7 +175,6 @@
{ {
#phpinfo(); #phpinfo();
$FormLogout = get_var('FormLogout', array('GET','POST')); $FormLogout = get_var('FormLogout', array('GET','POST'));
$ConfigLang = get_var('ConfigLang', array('POST','COOKIE'));
if(!$FormLogout) if(!$FormLogout)
{ {
$ConfigLogin = get_var('ConfigLogin', array('POST')); $ConfigLogin = get_var('ConfigLogin', array('POST'));
@ -189,6 +188,7 @@
$ConfigPW = get_var('ConfigPW', array('POST','COOKIE')); $ConfigPW = get_var('ConfigPW', array('POST','COOKIE'));
$HeaderUser = get_var('HeaderUser', array('POST','COOKIE')); $HeaderUser = get_var('HeaderUser', array('POST','COOKIE'));
$HeaderPW = get_var('HeaderPW', array('POST','COOKIE')); $HeaderPW = get_var('HeaderPW', array('POST','COOKIE'));
$ConfigLang = get_var('ConfigLang', array('POST','COOKIE'));
/* Setup defaults to aid in header upgrade to version 1.26. /* Setup defaults to aid in header upgrade to version 1.26.
* This was the first version to include the following values. * This was the first version to include the following values.
@ -215,7 +215,7 @@
$this->set_cookie('ConfigUser','',$expire,'/'); $this->set_cookie('ConfigUser','',$expire,'/');
$this->set_cookie('ConfigPW','',$expire,'/'); $this->set_cookie('ConfigPW','',$expire,'/');
$this->set_cookie('ConfigDomain','',$expire,'/'); $this->set_cookie('ConfigDomain','',$expire,'/');
// $this->set_cookie('ConfigLang','',$expire,'/'); $this->set_cookie('ConfigLang','',$expire,'/');
$GLOBALS['egw_info']['setup']['LastDomain'] = $_COOKIE['ConfigDomain']; $GLOBALS['egw_info']['setup']['LastDomain'] = $_COOKIE['ConfigDomain'];
$GLOBALS['egw_info']['setup']['ConfigLoginMSG'] = lang('You have successfully logged out'); $GLOBALS['egw_info']['setup']['ConfigLoginMSG'] = lang('You have successfully logged out');
$GLOBALS['egw_info']['setup']['HeaderLoginMSG'] = ''; $GLOBALS['egw_info']['setup']['HeaderLoginMSG'] = '';
@ -225,7 +225,7 @@
$expire = time() - 86400; $expire = time() - 86400;
$this->set_cookie('HeaderUser','',$expire,'/'); $this->set_cookie('HeaderUser','',$expire,'/');
$this->set_cookie('HeaderPW','',$expire,'/'); $this->set_cookie('HeaderPW','',$expire,'/');
// $this->set_cookie('ConfigLang','',$expire,'/'); $this->set_cookie('ConfigLang','',$expire,'/');
$GLOBALS['egw_info']['setup']['HeaderLoginMSG'] = lang('You have successfully logged out'); $GLOBALS['egw_info']['setup']['HeaderLoginMSG'] = lang('You have successfully logged out');
$GLOBALS['egw_info']['setup']['ConfigLoginMSG'] = ''; $GLOBALS['egw_info']['setup']['ConfigLoginMSG'] = '';
return False; return False;
@ -920,7 +920,6 @@
'account_primary_group' => $primary_group_id, 'account_primary_group' => $primary_group_id,
'account_expires' => -1, 'account_expires' => -1,
'account_email' => $email, 'account_email' => $email,
'account_members' => ''
); );
if (!($accountid = $GLOBALS['egw']->accounts->save($account))) if (!($accountid = $GLOBALS['egw']->accounts->save($account)))
{ {
@ -971,7 +970,7 @@
$accounts = $GLOBALS['egw']->accounts->search(array( $accounts = $GLOBALS['egw']->accounts->search(array(
'type' => 'accounts', 'type' => 'accounts',
'start' => 0, 'start' => 0,
'offset' => 2 // we only need to check 2 accounts, if we just check for not anonymous 'offset' => 2, // we only need to check 2 accounts, if we just check for not anonymous
)); ));
if (!$accounts || !is_array($accounts) || !count($accounts)) if (!$accounts || !is_array($accounts) || !count($accounts))
@ -1021,7 +1020,7 @@
$this->db->delete($this->acl_table,array( $this->db->delete($this->acl_table,array(
'acl_appname' => $app, 'acl_appname' => $app,
'acl_location' => $location, 'acl_location' => $location,
'acl_account' => $account 'acl_account' => $account,
),__LINE__,__FILE__); ),__LINE__,__FILE__);
if ((int) $rights) if ((int) $rights)

11
setup/inc/functions.inc.php
View File

@ -153,15 +153,12 @@
foreach($languages as $data) foreach($languages as $data)
{ {
if($data['available'] && !empty($data['lang'])) if($data['available'] && !empty($data['lang']))
{
$short = substr($data['lang'],0,2);
if ($short == $ConfigLang || $data['lang'] == $ConfigLang || empty($ConfigLang) && $short == substr($_SERVER['HTTP_ACCEPT_LANGUAGE'],0,2))
{
$selected = ' selected';
}
else
{ {
$selected = ''; $selected = '';
$short = substr($data['lang'],0,2);
if ($short == $ConfigLang || empty($ConfigLang) && $short == substr($_SERVER['HTTP_ACCEPT_LANGUAGE'],0,2))
{
$selected = ' selected="selected"';
} }
$select .= '<option value="' . $data['lang'] . '"' . $selected . '>' . $data['descr'] . '</option>' . "\n"; $select .= '<option value="' . $data['lang'] . '"' . $selected . '>' . $data['descr'] . '</option>' . "\n";
} }