- Add Internationalized Domain Name (IDNA) support (#1483894)

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

1 files changed, 3 insertions, 1 deletions

diff --git a/plugins/new_user_dialog/new_user_dialog.php b/plugins/new_user_dialog/new_user_dialog.php
index 5bf8f8497..9b773be65 100644
--- a/plugins/new_user_dialog/new_user_dialog.php
+++ b/plugins/new_user_dialog/new_user_dialog.php
@@ -62,7 +62,7 @@ class new_user_dialog extends rcube_plugin
       $table->add(null, html::tag('input', array(
         'type' => 'text',
         'name' => '_email',
-        'value' => $identity['email'],
+        'value' => idn_to_utf8($identity['email']),
         'disabled' => ($identities_level == 1 || $identities_level == 3)
       )));
 
@@ -111,6 +111,8 @@ class new_user_dialog extends rcube_plugin
     // don't let the user alter the e-mail address if disabled by config
     if ($identities_level == 1 || $identities_level == 3)
       $save_data['email'] = $identity['email'];
+    else
+      $save_data['email'] = idn_to_ascii($save_data['email']);
 
     // save data if not empty
     if (!empty($save_data['name']) && !empty($save_data['email'])) {