From 18617e0d67760e3868feeecae583305c5c961618 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 22 Mar 2012 11:41:25 +0100
Subject: Small improvement in unknown user name handling

---
 lib/kolab_client_task.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/kolab_client_task.php b/lib/kolab_client_task.php
index 2a49344..920d8ae 100644
--- a/lib/kolab_client_task.php
+++ b/lib/kolab_client_task.php
@@ -182,7 +182,7 @@ class kolab_client_task
                     }
                     // @TODO: why user.info returns empty result for 'cn=Directory Manager' login?
                     else if (preg_match('/^cn=([a-zA-Z ]+)/', $login['username'], $m)) {
-                        $user['fullname'] = $m[1];
+                        $user['fullname'] = ucwords($m[1]);
                     }
 
                     // Save user data
@@ -501,13 +501,13 @@ class kolab_client_task
             return $this->cache['user_names'][$dn];
         }
 
-        if (preg_match('/^cn=([a-z ]+)$/i', $dn, $m)) {
-            $username = $m[1];
-        }
-        else {
-            $result   = $this->api->get('user.info', array('user' => $dn));
-            $user     = $result->get($dn);
-            $username = $user['displayname'];
+        $result   = $this->api->get('user.info', array('user' => $dn));
+        $user     = $result->get($dn);
+
+        if (empty($user) || empty($user['displayname'])) {
+            if (preg_match('/^cn=([a-zA=Z ]+)/', $dn, $m)) {
+                $username = ucwords($m[1]);
+            }
         }
 
         return $this->cache['user_names'][$dn] = $username;
-- 
cgit v1.1