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

[Aleksander Machniak]

 plugins/kolab_auth/kolab_auth.php |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ba4e9b1eb572a01d186b76bc55d41f544f7cf069
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Fri Jan 24 13:44:04 2014 +0100

    Fix missing resolving of %dn in kolab_auth_role_settings

diff --git a/plugins/kolab_auth/kolab_auth.php b/plugins/kolab_auth/kolab_auth.php
index b8daf96..5120c30 100644
--- a/plugins/kolab_auth/kolab_auth.php
+++ b/plugins/kolab_auth/kolab_auth.php
@@ -164,8 +164,9 @@ class kolab_auth extends rcube_plugin
 
         if (!empty($role_settings)) {
             foreach ($role_settings as $role_dn => $settings) {
+                $role_dn = self::parse_ldap_vars($role_dn);
                 if (!empty($role_settings[$role_dn])) {
-                        $role_settings[$role_dn] = array_merge((array)$role_settings[$role_dn], $settings);
+                    $role_settings[$role_dn] = array_merge((array)$role_settings[$role_dn], $settings);
                 } else {
                     $role_settings[$role_dn] = $settings;
                 }