diff options
| -rw-r--r-- | inc/auth/ldap.php | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/inc/auth/ldap.php b/inc/auth/ldap.php index ef933a5eb..e4a43835a 100644 --- a/inc/auth/ldap.php +++ b/inc/auth/ldap.php @@ -206,21 +206,23 @@ function auth_getUserData($user){ $info['name']= $user_result['cn'][0]; #overwrite if other attribs are specified. - foreach($cnf['mapping'] as $localkey => $key) { - if(is_array($key)) { - //use regexp to clean up user_result - list($key, $regexp) = each($key); - foreach($user_result[$key] as $grp){ - if (preg_match($regexp,$grp,$match)) { - if($localkey == 'grps') { - $info[$localkey][] = $match[1]; - } else { - $info[$localkey] = $match[1]; + if(is_array($cnf['mapping'])){ + foreach($cnf['mapping'] as $localkey => $key) { + if(is_array($key)) { + //use regexp to clean up user_result + list($key, $regexp) = each($key); + foreach($user_result[$key] as $grp){ + if (preg_match($regexp,$grp,$match)) { + if($localkey == 'grps') { + $info[$localkey][] = $match[1]; + } else { + $info[$localkey] = $match[1]; + } } } + } else { + $info[$localkey] = $user_result[$key][0]; } - } else { - $info[$localkey] = $user_result[$key][0]; } } |