diff options
Diffstat (limited to 'program/include/rcube_config.php')
| -rw-r--r-- | program/include/rcube_config.php | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php index 1b621e0fc..aae3656a1 100644 --- a/program/include/rcube_config.php +++ b/program/include/rcube_config.php @@ -49,6 +49,11 @@ class rcube_config public function __construct() { $this->load(); + + // Defaults, that we do not require you to configure, + // but contain information that is used in various + // locations in the code: + $this->set('contactlist_fields', array('name', 'firstname', 'surname', 'email')); } @@ -76,10 +81,14 @@ class rcube_config $this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path'])); } else { - $this->prop['skin'] = 'default'; + $this->prop['skin'] = 'larry'; } } + // larry is the new default skin :-) + if ($this->prop['skin'] == 'default') + $this->prop['skin'] = 'larry'; + // fix paths $this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : INSTALL_PATH . 'logs'; $this->prop['temp_dir'] = $this->prop['temp_dir'] ? realpath(unslashify($this->prop['temp_dir'])) : INSTALL_PATH . 'temp'; @@ -233,10 +242,8 @@ class rcube_config // Honor the dont_override setting for any existing user preferences $dont_override = $this->get('dont_override'); if (is_array($dont_override) && !empty($dont_override)) { - foreach ($prefs as $key => $pref) { - if (in_array($key, $dont_override)) { - unset($prefs[$key]); - } + foreach ($dont_override as $key) { + unset($prefs[$key]); } } @@ -245,6 +252,11 @@ class rcube_config $prefs['timezone'] = timezone_name_from_abbr('', $prefs['timezone'] * 3600, 0); } + // larry is the new default skin :-) + if ($prefs['skin'] == 'default') { + $prefs['skin'] = 'larry'; + } + $this->userprefs = $prefs; $this->prop = array_merge($this->prop, $prefs); |