Imported Upstream version 0.5.1

[roundcube.git] / program / include / rcube_smtp.php

diff --git a/program/include/rcube_smtp.php b/program/include/rcube_smtp.php
index b3db9d22955d275d4c39df9b034ba4b47c80342e..e795bc48f33197d779bb92520e29eb13fb31d07c 100644 (file)
--- a/program/include/rcube_smtp.php
+++ b/program/include/rcube_smtp.php
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: rcube_smtp.php 4123 2010-10-22 19:16:45Z alec $
+ $Id: rcube_smtp.php 4509 2011-02-09 10:51:50Z thomasb $
 
 */
 
@@ -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);