From 2964fb573de6ead8a74a1a0defa0bfdd554ab50d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 16 Apr 2013 03:46:39 -0400
Subject: [PATCH] Fix handling of identities_level=4
---
plugins/new_user_dialog/package.xml | 25 ++++++++++++++++++++-----
plugins/new_user_dialog/new_user_dialog.php | 4 +---
2 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/plugins/new_user_dialog/new_user_dialog.php b/plugins/new_user_dialog/new_user_dialog.php
index 871384e..8d641c9 100644
--- a/plugins/new_user_dialog/new_user_dialog.php
+++ b/plugins/new_user_dialog/new_user_dialog.php
@@ -126,7 +126,7 @@
);
// don't let the user alter the e-mail address if disabled by config
- if ($identities_level == 1 || $identities_level == 3)
+ if (in_array($identities_level, array(1,3,4)))
$save_data['email'] = $identity['email'];
else
$save_data['email'] = rcube_utils::idn_to_ascii($save_data['email']);
@@ -141,5 +141,3 @@
}
}
-
-?>
diff --git a/plugins/new_user_dialog/package.xml b/plugins/new_user_dialog/package.xml
index 0bca1d9..c9f1965 100644
--- a/plugins/new_user_dialog/package.xml
+++ b/plugins/new_user_dialog/package.xml
@@ -13,10 +13,9 @@
<email>roundcube@gmail.com</email>
<active>yes</active>
</lead>
- <date>2012-01-16</date>
- <time>17:00</time>
+ <date>2013-04-16</date>
<version>
- <release>1.5</release>
+ <release>1.6</release>
<api>1.0</api>
</version>
<stability>
@@ -25,8 +24,7 @@
</stability>
<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
<notes>
-- Use jquery UI to render the dialog
-- Fixed IDNA encoding/decoding of e-mail addresses (#1487909)
+- Fix handling of identities_level=4
</notes>
<contents>
<dir baseinstalldir="/" name="/">
@@ -150,5 +148,22 @@
<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
<notes>- Use jquery UI to render the dialog</notes>
</release>
+ <release>
+ <date>2012-01-16</date>
+ <time>17:00</time>
+ <version>
+ <release>1.5</release>
+ <api>1.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
+ <notes>
+- Use jquery UI to render the dialog
+- Fixed IDNA encoding/decoding of e-mail addresses (#1487909)
+ </notes>
+ </release>
</changelog>
</package>
--
Gitblit v1.9.1