|
|
@ -26,6 +26,8 @@
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
class rcube_config
|
|
|
|
class rcube_config
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
const DEFAULT_SKIN = 'larry';
|
|
|
|
|
|
|
|
|
|
|
|
private $prop = array();
|
|
|
|
private $prop = array();
|
|
|
|
private $errors = array();
|
|
|
|
private $errors = array();
|
|
|
|
private $userprefs = array();
|
|
|
|
private $userprefs = array();
|
|
|
@ -81,13 +83,13 @@ class rcube_config
|
|
|
|
$this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
|
|
|
|
$this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
$this->prop['skin'] = 'larry';
|
|
|
|
$this->prop['skin'] = self::DEFAULT_SKIN;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// larry is the new default skin :-)
|
|
|
|
// larry is the new default skin :-)
|
|
|
|
if ($this->prop['skin'] == 'default')
|
|
|
|
if ($this->prop['skin'] == 'default')
|
|
|
|
$this->prop['skin'] = 'larry';
|
|
|
|
$this->prop['skin'] = self::DEFAULT_SKIN;
|
|
|
|
|
|
|
|
|
|
|
|
// fix paths
|
|
|
|
// fix paths
|
|
|
|
$this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : INSTALL_PATH . 'logs';
|
|
|
|
$this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : INSTALL_PATH . 'logs';
|
|
|
@ -254,7 +256,7 @@ class rcube_config
|
|
|
|
|
|
|
|
|
|
|
|
// larry is the new default skin :-)
|
|
|
|
// larry is the new default skin :-)
|
|
|
|
if ($prefs['skin'] == 'default') {
|
|
|
|
if ($prefs['skin'] == 'default') {
|
|
|
|
$prefs['skin'] = 'larry';
|
|
|
|
$prefs['skin'] = self::DEFAULT_SKIN;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
$this->userprefs = $prefs;
|
|
|
|
$this->userprefs = $prefs;
|
|
|
|