- Framework refactoring (I hope it's the last one): rcube,rcmail,rcube_ui...

alecpl

2012-04-16 1aceb9cec82639250a603aa0806f0399f7bae68d

 program/include/rcube_config.php

@@ -369,11 +369,13 @@
            if (isset($this->prop['mail_domain'][$host]))
                $domain = $this->prop['mail_domain'][$host];
        }
        else if (!empty($this->prop['mail_domain']))
            $domain = rcmail::parse_host($this->prop['mail_domain']);
        else if (!empty($this->prop['mail_domain'])) {
            $domain = rcube_utils::parse_host($this->prop['mail_domain']);
        }

        if ($encode)
            $domain = rcube_idn_to_ascii($domain);
        if ($encode) {
            $domain = rcube_utils::idn_to_ascii($domain);
        }

        return $domain;
    }