From a1ab3314f33bb69b9f40dd700ea769bbeffc8a5d Mon Sep 17 00:00:00 2001 From: alec Date: Wed, 29 Sep 2010 12:36:28 +0000 Subject: - Add Internationalized Domain Name (IDNA) support (#1483894) git-svn-id: https://svn.roundcube.net/trunk@4009 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_config.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'roundcubemail/program/include/rcube_config.php') diff --git a/roundcubemail/program/include/rcube_config.php b/roundcubemail/program/include/rcube_config.php index 36892c0e1..8020c3912 100644 --- a/roundcubemail/program/include/rcube_config.php +++ b/roundcubemail/program/include/rcube_config.php @@ -274,10 +274,11 @@ class rcube_config /** * 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; @@ -288,6 +289,9 @@ class rcube_config else if (!empty($this->prop['mail_domain'])) $domain = rcube_parse_host($this->prop['mail_domain']); + if ($encode) + $domain = idn_to_ascii($domain); + return $domain; } -- cgit v1.2.3