- Fix HTML to plain text conversion doesn't handle citation blocks (#1486921)

alecpl

2010-09-29 11bcac5802dbdd01ee37b97e84f9a91c5777d9e6

 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
 */
@@ -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  IMAP host
     * @param boolean 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
     *