From 0f0c17ad9ef6dc5f82e7147a16f2cab7aae657db Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 14 Oct 2010 06:23:29 -0400
Subject: [PATCH] - improved IMAP errors handling (continue)
---
program/include/rcube_config.php | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index bd53517..a7e1d9e 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -4,8 +4,8 @@
+-----------------------------------------------------------------------+
| program/include/rcube_config.php |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2008-2010, RoundCube Dev. - Switzerland |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2008-2010, Roundcube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -20,7 +20,7 @@
*/
/**
- * Configuration class for RoundCube
+ * Configuration class for Roundcube
*
* @package Core
*/
@@ -130,7 +130,7 @@
* Read configuration from a file
* and merge with the already stored config values
*
- * @param string Full path to the config file to be loaded
+ * @param string $fpath Full path to the config file to be loaded
* @return booelan True on success, false on failure
*/
public function load_from_file($fpath)
@@ -150,8 +150,8 @@
/**
* Getter for a specific config parameter
*
- * @param string Parameter name
- * @param mixed Default value if not set
+ * @param string $name Parameter name
+ * @param mixed $def Default value if not set
* @return mixed The requested config value
*/
public function get($name, $def = null)
@@ -163,8 +163,8 @@
/**
* Setter for a config parameter
*
- * @param string Parameter name
- * @param mixed Parameter value
+ * @param string $name Parameter name
+ * @param mixed $value Parameter value
*/
public function set($name, $value)
{
@@ -175,7 +175,7 @@
/**
* Override config options with the given values (eg. user prefs)
*
- * @param array Hash array with config props to merge over
+ * @param array $prefs Hash array with config props to merge over
*/
public function merge($prefs)
{
@@ -187,7 +187,7 @@
* Merge the given prefs over the current config
* and make sure that they survive further merging.
*
- * @param array Hash array with user prefs
+ * @param array $prefs Hash array with user prefs
*/
public function set_user_prefs($prefs)
{
@@ -210,7 +210,7 @@
/**
* Return requested DES crypto key.
*
- * @param string Crypto key name
+ * @param string $key Crypto key name
* @return string Crypto key
*/
public function get_crypto_key($key)
@@ -247,8 +247,17 @@
public function header_delimiter()
{
// use the configured delimiter for headers
- if (!empty($this->prop['mail_header_delimiter']))
- return $this->prop['mail_header_delimiter'];
+ if (!empty($this->prop['mail_header_delimiter'])) {
+ $delim = $this->prop['mail_header_delimiter'];
+ if ($delim == "\n" || $delim == "\r\n")
+ return $delim;
+ else
+ raise_error(array(
+ 'code' => 500, 'type' => 'php',
+ 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Invalid mail_header_delimiter setting"
+ ), true, false);
+ }
$php_os = strtolower(substr(PHP_OS, 0, 3));
@@ -265,10 +274,11 @@
/**
* Return the mail domain configured for the given host
*
- * @param string IMAP host
+ * @param string $host IMAP host
+ * @param boolean $encode If true, domain name will be converted to IDN ASCII
* @return string Resolved SMTP host
*/
- public function mail_domain($host)
+ public function mail_domain($host, $encode=true)
{
$domain = $host;
@@ -277,12 +287,15 @@
$domain = $this->prop['mail_domain'][$host];
}
else if (!empty($this->prop['mail_domain']))
- $domain = $this->prop['mail_domain'];
-
+ $domain = rcube_parse_host($this->prop['mail_domain']);
+
+ if ($encode)
+ $domain = idn_to_ascii($domain);
+
return $domain;
}
-
-
+
+
/**
* Getter for error state
*
--
Gitblit v1.9.1