- Fix "Identifier" issue when saving acl for username without @ sign

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

2 files changed, 5 insertions, 3 deletions

diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index 8d5ee2da2..2b1baaa3c 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -432,8 +432,10 @@ class acl extends rcube_plugin
         if (!empty($this->specials) && in_array($user, $this->specials)) {
             $username = $this->gettext($user);
         }
-        else if (!strpos($user, '@') && ($realm = $this->get_realm())) {
-            $user .= '@' . rcube_idn_to_ascii(preg_replace('/^@/', '', $realm));
+        else {
+            if (!strpos($user, '@') && ($realm = $this->get_realm())) {
+                $user .= '@' . rcube_idn_to_ascii(preg_replace('/^@/', '', $realm));
+            }
             $username = $user;
         }
 
diff --git a/plugins/acl/skins/default/acl.css b/plugins/acl/skins/default/acl.css
index bee94ac61..c3582995d 100644
--- a/plugins/acl/skins/default/acl.css
+++ b/plugins/acl/skins/default/acl.css
@@ -41,7 +41,7 @@
   width: 96%;
   text-align: left;
   overflow: hidden;
-  text-overflow: ellipsis;                                                                                                                           
+  text-overflow: ellipsis;
   -o-text-overflow: ellipsis;
 }