Branch 'roundcubemail-plugins-kolab-3.1' - plugins/kolab_auth

[Aleksander Machniak]

 plugins/kolab_auth/kolab_auth_ldap.php |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit dff060e1c06af663cccfa37b6752ff0b9eb82a6e
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Fri Mar 14 14:05:26 2014 +0100

    Fix case-sensitivity in normalization/mapping of LDAP entries (Bug #2905)

diff --git a/plugins/kolab_auth/kolab_auth_ldap.php b/plugins/kolab_auth/kolab_auth_ldap.php
index ddf7cff..d529b73 100644
--- a/plugins/kolab_auth/kolab_auth_ldap.php
+++ b/plugins/kolab_auth/kolab_auth_ldap.php
@@ -329,12 +329,14 @@ class kolab_auth_ldap extends rcube_ldap_generic
 
         // fields mapping
         foreach ($this->fieldmap as $field => $attr) {
-            // $entry is indexed by lower-case attribute names
+            // $entry might be indexed by lower-case attribute names
             $attr_lc = strtolower($attr);
             if (isset($entry[$attr_lc])) {
                 $entry[$field] = $entry[$attr_lc];
             }
-            // @TODO: consider returning also $entry[$attr] when $attr != $attr_lc
+            else if (isset($entry[$attr])) {
+                $entry[$field] = $entry[$attr];
+            }
         }
 
         return $entry;