From 3158fd3e702d0df6b7f95382fadbc94c5f5adbdf Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Thu, 12 May 2011 08:10:14 +0000
Subject: - Fixed IDNA encoding/decoding of e-mail addresses (#1487909)

git-svn-id: https://svn.roundcube.net/trunk@4749 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 plugins/new_user_dialog/new_user_dialog.php |  4 ++--
 plugins/new_user_dialog/package.xml         | 26 +++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/new_user_dialog/new_user_dialog.php b/plugins/new_user_dialog/new_user_dialog.php
index c8b82fdab..0d6837335 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' => idn_to_utf8($identity['email']),
+        'value' => rcube_idn_to_utf8($identity['email']),
         'disabled' => ($identities_level == 1 || $identities_level == 3)
       )));
 
@@ -112,7 +112,7 @@ class new_user_dialog extends rcube_plugin
     if ($identities_level == 1 || $identities_level == 3)
       $save_data['email'] = $identity['email'];
     else
-      $save_data['email'] = idn_to_ascii($save_data['email']);
+      $save_data['email'] = rcube_idn_to_ascii($save_data['email']);
 
     // save data if not empty
     if (!empty($save_data['name']) && !empty($save_data['email'])) {
diff --git a/plugins/new_user_dialog/package.xml b/plugins/new_user_dialog/package.xml
index 198a9fadb..52874701f 100644
--- a/plugins/new_user_dialog/package.xml
+++ b/plugins/new_user_dialog/package.xml
@@ -13,10 +13,10 @@
 		<email>roundcube@gmail.com</email>
 		<active>yes</active>
 	</lead>
-	<date>2010-12-02</date>
-	<time>12:00:00</time>
+	<date>2011-05-12</date>
+	<time>10:00</time>
 	<version>
-		<release>1.3</release>
+		<release>1.4</release>
 		<api>1.0</api>
 	</version>
 	<stability>
@@ -25,8 +25,7 @@
 	</stability>
 	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
 	<notes>
-- Added setting of focus on name input
-- Added gl_ES translation
+- Fixed IDNA encoding/decoding of e-mail addresses (#1487909)
     </notes>
 	<contents>
 		<dir baseinstalldir="/" name="/">
@@ -119,5 +118,22 @@
 - Fix possible error on form submission (#1486103)
             </notes>
         </release>
+        <release>
+	        <date>2010-12-02</date>
+	        <time>12:00:00</time>
+	        <version>
+		        <release>1.3</release>
+		        <api>1.0</api>
+	        </version>
+	        <stability>
+		        <release>stable</release>
+		        <api>stable</api>
+	        </stability>
+	        <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
+	        <notes>
+- Added setting of focus on name input
+- Added gl_ES translation
+            </notes>
+        </release>
     </changelog>
 </package>
-- 
cgit v1.2.3