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

using preferences class to set preferences

Browse Source
This commit is contained in:
Ralf Becker 2011-06-11 11:53:43 +00:00
parent 07972fc074
commit c2feef73de
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,7 +262,6 @@ class setup
$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,'/');
$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'] = '';
@ -272,7 +271,6 @@ class setup
$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,'/');
$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;
@ -743,19 +741,20 @@ class setup
} }
} }
// store default/forced preferences, if any found // store default/forced preferences, if any found
$preferences = new preferences();
$preferences->read_repository(false);
foreach(array( foreach(array(
preferences::DEFAULT_ID => $default, 'default' => $default,
preferences::FORCED_ID => $forced, 'forced' => $forced,
) as $owner => $prefs) ) as $type => $prefs)
{ {
if ($prefs) if ($prefs)
{ {
$this->db->insert($this->prefs_table,array( foreach($prefs as $name => $value)
'preference_value' => serialize($prefs), {
),array( $preferences->add($appname == 'preferences' ? 'common' : $appname, $name, $value, $type);
'preference_owner' => $owner, }
'preference_app' => $appname == 'preferences' ? 'common' : $appname, $preferences->save_repository(false, $type);
),__LINE__,__FILE__);
//error_log(__METHOD__."('$appname') storing ".($owner==preferences::DEFAULT_ID?'default':'forced')." prefs=".array2string($prefs)); //error_log(__METHOD__."('$appname') storing ".($owner==preferences::DEFAULT_ID?'default':'forced')." prefs=".array2string($prefs));
} }
} }