From 6cd00992a2c7de38e0ff7df152fba8ea89012dce Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 12 Sep 2008 12:48:23 -0400
Subject: [PATCH] - Fixed quota img height/width setting from template (#1484857)

---
 program/include/rcube_config.php |  109 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 103 insertions(+), 6 deletions(-)

diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 541767a..98e688d 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,16 +51,29 @@
     ob_start();
     
     // load main config file
-    include_once(INSTALL_PATH . 'config/main.inc.php');
-    $this->prop = (array)$rcmail_config;
+    if (include(INSTALL_PATH . 'config/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(INSTALL_PATH . 'config/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';
+    $this->prop['temp_dir'] = $this->prop['temp_dir'] ? unslashify($this->prop['temp_dir']) : INSTALL_PATH . 'temp';
     
     // handle aliases
     if (isset($this->prop['locale_string']) && empty($this->prop['language']))
@@ -66,7 +82,12 @@
     // 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);
@@ -77,6 +98,9 @@
     
     // clear output buffer
     ob_end_clean();
+
+    // export config data
+    $GLOBALS['CONFIG'] = &$this->prop;
   }
   
   
@@ -148,5 +172,78 @@
     return $this->prop;
   }
   
+  
+  /**
+   * Return a 24 byte key for the DES encryption
+   *
+   * @return string DES encryption key
+   */
+  public function get_des_key()
+  {
+    $key = !empty($this->prop['des_key']) ? $this->prop['des_key'] : 'rcmail?24BitPwDkeyF**ECB';
+    $len = strlen($key);
+
+    // make sure the key is exactly 24 chars long
+    if ($len<24)
+      $key .= str_repeat('_', 24-$len);
+    else if ($len>24)
+      substr($key, 0, 24);
+
+    return $key;
+  }
+  
+  
+  /**
+   * 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