From 253cc5890dec068d2ca3fb0ea2c36c1d945e8fa5 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Fri, 03 Oct 2008 02:25:53 -0400
Subject: [PATCH] Fix typo.
---
program/include/rcube_config.php | 97 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 83 insertions(+), 14 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 91e3722..0723834 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -27,6 +27,7 @@
class rcube_config
{
private $prop = array();
+ private $errors = array();
/**
@@ -40,6 +41,8 @@
/**
* Load config from local config file
+ *
+ * @todo Remove global $CONFIG
*/
private function load()
{
@@ -48,28 +51,39 @@
ob_start();
// load main config file
- include_once(INSTALL_PATH . 'config/main.inc.php');
- $this->prop = (array)$rcmail_config;
+ if (include(RCMAIL_CONFIG_DIR . '/main.inc.php'))
+ $this->prop = (array)$rcmail_config;
+ else
+ $this->errors[] = 'main.inc.php was not found.';
// load database config
- include_once(INSTALL_PATH . 'config/db.inc.php');
- $this->prop += (array)$rcmail_config;
+ if (include(RCMAIL_CONFIG_DIR . '/db.inc.php'))
+ $this->prop += (array)$rcmail_config;
+ else
+ $this->errors[] = 'db.inc.php was not found.';
// load host-specific configuration
$this->load_host_config();
- // fix paths
- $this->prop['skin_path'] = $this->prop['skin_path'] ? unslashify($this->prop['skin_path']) : 'skins/default';
- $this->prop['log_dir'] = $this->prop['log_dir'] ? unslashify($this->prop['log_dir']) : INSTALL_PATH . 'logs';
-
- // handle aliases
- if (isset($this->prop['locale_string']) && empty($this->prop['language']))
- $this->prop['language'] = $this->prop['locale_string'];
+ // set skin (with fallback to old 'skin_path' property)
+ if (empty($this->prop['skin']) && !empty($this->prop['skin_path']))
+ $this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
+ else if (empty($this->prop['skin']))
+ $this->prop['skin'] = 'default';
+ // fix paths
+ $this->prop['log_dir'] = $this->prop['log_dir'] ? unslashify($this->prop['log_dir']) : INSTALL_PATH . 'logs';
+ $this->prop['temp_dir'] = $this->prop['temp_dir'] ? unslashify($this->prop['temp_dir']) : INSTALL_PATH . 'temp';
+
// set PHP error logging according to config
if ($this->prop['debug_level'] & 1) {
ini_set('log_errors', 1);
- ini_set('error_log', $this->prop['log_dir'] . '/errors');
+
+ if ($this->prop['log_driver'] == 'syslog') {
+ ini_set('error_log', 'syslog');
+ } else {
+ ini_set('error_log', $this->prop['log_dir'].'/errors');
+ }
}
if ($this->prop['debug_level'] & 4) {
ini_set('display_errors', 1);
@@ -80,6 +94,9 @@
// clear output buffer
ob_end_clean();
+
+ // export config data
+ $GLOBALS['CONFIG'] = &$this->prop;
}
@@ -98,8 +115,8 @@
$fname = preg_replace('/[^a-z0-9\.\-_]/i', '', $_SERVER['HTTP_HOST']) . '.inc.php';
}
- if ($fname && is_file(INSTALL_PATH . 'config/' . $fname)) {
- include(INSTALL_PATH . 'config/' . $fname);
+ if ($fname && is_file(RCMAIL_CONFIG_DIR . '/' . $fname)) {
+ include(RCMAIL_CONFIG_DIR . '/' . $fname);
$this->prop = array_merge($this->prop, (array)$rcmail_config);
}
}
@@ -172,5 +189,57 @@
}
+ /**
+ * Try to autodetect operating system and find the correct line endings
+ *
+ * @return string The appropriate mail header delimiter
+ */
+ public function header_delimiter()
+ {
+ // use the configured delimiter for headers
+ if (!empty($this->prop['mail_header_delimiter']))
+ return $this->prop['mail_header_delimiter'];
+ else if (strtolower(substr(PHP_OS, 0, 3) == 'win'))
+ return "\r\n";
+ else if (strtolower(substr(PHP_OS, 0, 3) == 'mac'))
+ return "\r\n";
+ else
+ return "\n";
+ }
+
+
+
+ /**
+ * Return the mail domain configured for the given host
+ *
+ * @param string IMAP host
+ * @return string Resolved SMTP host
+ */
+ public function mail_domain($host)
+ {
+ $domain = $host;
+
+ if (is_array($this->prop['mail_domain'])) {
+ if (isset($this->prop['mail_domain'][$host]))
+ $domain = $this->prop['mail_domain'][$host];
+ }
+ else if (!empty($this->prop['mail_domain']))
+ $domain = $this->prop['mail_domain'];
+
+ return $domain;
+ }
+
+
+ /**
+ * Getter for error state
+ *
+ * @return mixed Error message on error, False if no errors
+ */
+ public function get_error()
+ {
+ return empty($this->errors) ? false : join("\n", $this->errors);
+ }
+
+
}
--
Gitblit v1.9.1