alecpl
2010-09-06 372d3bf6dead9800d75a39ebfcd884da5128b64f
program/include/rcube_config.php
@@ -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));
@@ -277,12 +286,12 @@
                $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']);
        return $domain;
    }
    /**
     * Getter for error state
     *