Imported Upstream version 0.2~stable

[roundcube.git] / program / include / rcube_config.php

diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 8e956de1e89bcd0d863dce1bdf9d71918e195a89..7903407023957e753cbe2bbbbe1a314988232f71 100644 (file)
--- 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();
 
 
   /**
@@ -50,28 +51,47 @@ class rcube_config
     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();
 
+    // 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['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'];
+    $this->prop['temp_dir'] = $this->prop['temp_dir'] ? unslashify($this->prop['temp_dir']) : INSTALL_PATH . 'temp';
+
+    // fix default imap folders encoding
+    foreach (array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder)
+      $this->prop[$folder] = rcube_charset_convert($this->prop[$folder], RCMAIL_CHARSET, 'UTF-7');
+
+    if (!empty($this->prop['default_imap_folders']))
+      foreach ($this->prop['default_imap_folders'] as $n => $folder)
+        $this->prop['default_imap_folders'][$n] = rcube_charset_convert($folder, RCMAIL_CHARSET, 'UTF-7');
 
     // 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);
@@ -103,8 +123,8 @@ class rcube_config
       $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);
     }
   }
@@ -177,5 +197,57 @@ class rcube_config
   }
   
   
+  /**
+   * 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);
+  }
+
+
 }