Permalink
Browse files

- actually we don't need default_skin option

  • Loading branch information...
1 parent a7aa8cf commit 67effe9904d62880ab5bdaaf58b97af7113ed97f @alecpl alecpl committed Jun 15, 2008
View
@@ -4,7 +4,7 @@ CHANGELOG RoundCube Webmail
2008/06/15 (alec)
----------
- Added option to select skin in user preferences
- WARNING: option 'skin_path' replaced by 'default_skin'!
+ WARNING: option 'skin_path' replaced by 'skin' option!
2008/06/14 (alec)
----------
View
@@ -94,9 +94,6 @@ $rcmail_config['smtp_log'] = TRUE;
// available cols are: subject, from, to, cc, replyto, date, size, encoding
$rcmail_config['list_cols'] = array('subject', 'from', 'date', 'size');
-// skin name: folder from skins/
-$rcmail_config['default_skin'] = 'default';
-
// includes should be interpreted as PHP files
$rcmail_config['skin_include_php'] = FALSE;
@@ -315,8 +312,8 @@ $rcmail_config['delete_always'] = false;
/***** these settings can be overwritten by user's preferences *****/
-// skin name (see 'default_skin' option)
-$rcmail_config['skin'] = $rcmail_config['default_skin'];
+// skin name: folder from skins/
+$rcmail_config['skin'] = 'default';
// show up to X items in list view
$rcmail_config['pagesize'] = 40;
@@ -61,7 +61,7 @@ private function load()
$this->load_host_config();
// fix paths
- $this->prop['default_skin'] = $this->prop['default_skin'] ? unslashify($this->prop['default_skin']) : 'default';
+ $this->prop['skin'] = $this->prop['skin'] ? unslashify($this->prop['skin']) : 'default';
$this->prop['log_dir'] = $this->prop['log_dir'] ? unslashify($this->prop['log_dir']) : INSTALL_PATH . 'logs';
// handle aliases
@@ -59,7 +59,7 @@ public function __construct($task, $framed = false)
// load the correct skin (in case user-defined)
if (empty($this->config['skin']) || !is_readable('skins/'.$this->config['skin']))
- $this->config['skin'] = $this->config['default_skin'];
+ $this->config['skin'] = 'default';
$this->config['skin_path'] = 'skins/'.$this->config['skin'];
@@ -35,7 +35,7 @@ $a_user_prefs = array(
'logout_expunge' => isset($_POST['_logout_expunge']) ? TRUE : FALSE,
'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0,
'mdn_requests' => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0,
- 'skin' => isset($_POST['_skin']) ? get_input_value('_skin', RCUBE_INPUT_POST) : $CONFIG['default_skin'],
+ 'skin' => isset($_POST['_skin']) ? get_input_value('_skin', RCUBE_INPUT_POST) : $CONFIG['skin'],
);
// don't override these parameters

0 comments on commit 67effe9

Please sign in to comment.