From b46e5b7407940499964d8a553c3eada05850f29d Mon Sep 17 00:00:00 2001 From: thomascube Date: Wed, 9 Feb 2011 10:51:50 +0000 Subject: Apply more bugfixes from trunk for 0.5.1 --- program/include/rcube_smtp.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'program/include/rcube_smtp.php') diff --git a/program/include/rcube_smtp.php b/program/include/rcube_smtp.php index 5d1d459e9..81f212dcf 100644 --- a/program/include/rcube_smtp.php +++ b/program/include/rcube_smtp.php @@ -101,7 +101,7 @@ class rcube_smtp $helo_host = 'localhost'; // IDNA Support - $smtp_host = idn_to_ascii($smtp_host); + $smtp_host = rcube_idn_to_ascii($smtp_host); $this->conn = new Net_SMTP($smtp_host, $smtp_port, $helo_host); @@ -132,8 +132,9 @@ class rcube_smtp if ($smtp_user && $smtp_pass) { // IDNA Support - if (strpos($smtp_user, '@')) - $smtp_user = idn_to_ascii($smtp_user); + if (strpos($smtp_user, '@')) { + $smtp_user = rcube_idn_to_ascii($smtp_user); + } $result = $this->conn->auth($smtp_user, $smtp_pass, $smtp_auth_type, $use_tls, $smtp_authz); -- cgit v1.2.3