- Fix IDNA support when IDN/INTL modules are in use (#1487742)

git-svn-id: https://svn.roundcube.net/trunk@4485 208e9e7b-5314-0410-a742-e7e81cd9613c

5 files changed, 8 insertions, 8 deletions

diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
index f60957e53..96e6ebcce 100644
--- a/plugins/managesieve/managesieve.php
+++ b/plugins/managesieve/managesieve.php
@@ -66,7 +66,7 @@ class managesieve extends rcube_plugin
         $host = rcube_parse_host($this->rc->config->get('managesieve_host', 'localhost'));
         $port = $this->rc->config->get('managesieve_port', 2000);
 
-        $host = idn_to_ascii($host);
+        $host = rcube_idn_to_ascii($host);
 
         // try to connect to managesieve server and to fetch the script
         $this->sieve = new rcube_sieve($_SESSION['username'],
diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
index ecdf7c137..45750facd 100644
--- a/plugins/new_user_identity/new_user_identity.php
+++ b/plugins/new_user_identity/new_user_identity.php
@@ -40,7 +40,7 @@ class new_user_identity extends rcube_plugin
             if (count($results->records) == 1) {
                 $args['user_name'] = $results->records[0]['name'];
                 if (!$args['user_email'] && strpos($results->records[0]['email'], '@')) {
-                    $args['user_email'] = idn_to_ascii($results->records[0]['email']);
+                    $args['user_email'] = rcube_idn_to_ascii($results->records[0]['email']);
                 }
             }
         }
diff --git a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
index 5d7cc012e..ee6bcc04b 100644
--- a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
+++ b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
@@ -73,8 +73,8 @@ class squirrelmail_usercopy extends rcube_plugin
 				foreach ($this->abook as $rec) {
 				    // #1487096 handle multi-address and/or too long items
 				    $rec['email'] = array_shift(explode(';', $rec['email']));
-                    if (check_email(idn_to_ascii($rec['email']))) {
-                        $rec['email'] = idn_to_utf8($rec['email']);
+                    if (check_email(rcube_idn_to_ascii($rec['email']))) {
+                        $rec['email'] = rcube_idn_to_utf8($rec['email']);
     					$contacts->insert($rec, true);
 			        }
 			    }
diff --git a/plugins/virtuser_file/virtuser_file.php b/plugins/virtuser_file/virtuser_file.php
index d91e532a9..9d4efd12b 100644
--- a/plugins/virtuser_file/virtuser_file.php
+++ b/plugins/virtuser_file/virtuser_file.php
@@ -40,7 +40,7 @@ class virtuser_file extends rcube_plugin
 	        $arr = preg_split('/\s+/', $r[$i]);
 
 	        if (count($arr) > 0 && strpos($arr[0], '@')) {
-		        $result[] = idn_to_ascii(trim(str_replace('\\@', '@', $arr[0])));
+		        $result[] = rcube_idn_to_ascii(trim(str_replace('\\@', '@', $arr[0])));
 
 		        if ($p['first']) {
 		            $p['email'] = $result[0];
diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php
index 8f154c235..e59095f29 100644
--- a/plugins/virtuser_query/virtuser_query.php
+++ b/plugins/virtuser_query/virtuser_query.php
@@ -58,11 +58,11 @@ class virtuser_query extends rcube_plugin
 	        if (strpos($sql_arr[0], '@')) {
 		        if ($p['extended'] && count($sql_arr) > 1) {
 		            $result[] = array(
-			            'email' 	    => idn_to_ascii($sql_arr[0]),
+			            'email' 	    => rcube_idn_to_ascii($sql_arr[0]),
             			'name' 		    => $sql_arr[1],
 			            'organization'  => $sql_arr[2],
-            			'reply-to' 	    => idn_to_ascii($sql_arr[3]),
-			            'bcc' 		    => idn_to_ascii($sql_arr[4]),
+            			'reply-to' 	    => rcube_idn_to_ascii($sql_arr[3]),
+			            'bcc' 		    => rcube_idn_to_ascii($sql_arr[4]),
         			    'signature' 	=> $sql_arr[5],
 		            	'html_signature' => (int)$sql_arr[6],
     		        );