Merge branch 'master' of github.com:roundcube/roundcubemail

1 files changed, 9 insertions, 5 deletions

diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
index f3dae20a3..200d9accd 100644
--- a/plugins/new_user_identity/new_user_identity.php
+++ b/plugins/new_user_identity/new_user_identity.php
@@ -36,11 +36,14 @@ class new_user_identity extends rcube_plugin
         $rcmail = rcmail::get_instance();
 
         if ($this->init_ldap($args['host'])) {
-            $results = $this->ldap->search('*', $args['user'], TRUE);
+            $results = $this->ldap->search('*', $args['user'], true);
             if (count($results->records) == 1) {
-                $args['user_name'] = $results->records[0]['name'];
-                if (!$args['user_email'] && strpos($results->records[0]['email'], '@')) {
-                    $args['user_email'] = rcube_idn_to_ascii($results->records[0]['email']);
+                $user_name  = is_array($results->records[0]['name']) ? $results->records[0]['name'][0] : $results->records[0]['name'];
+                $user_email = is_array($results->records[0]['email']) ? $results->records[0]['email'][0] : $results->records[0]['email'];
+
+                $args['user_name'] = $user_name;
+                if (!$args['user_email'] && strpos($user_email, '@')) {
+                    $args['user_email'] = rcube_idn_to_ascii($user_email);
                 }
             }
         }
@@ -49,8 +52,9 @@ class new_user_identity extends rcube_plugin
 
     private function init_ldap($host)
     {
-        if ($this->ldap)
+        if ($this->ldap) {
             return $this->ldap->ready;
+        }
 
         $rcmail = rcmail::get_instance();