Merge pull request #8 from kyed/patch-1

Update login-ldap.php (fix: array_shift expected parameter to be array, null given)
2018-11-29 08:33:41 -08:00
parent 724fe87316 97ee29eb37
commit 30edba01ed
1 changed files with 9 additions and 4 deletions
--- a/login-ldap.php
+++ b/login-ldap.php
@@ -181,6 +181,10 @@ class LoginLDAPPlugin extends Plugin

                    foreach ($groups as $group) {
                        $attributes = $group->getAttributes();
+                        
+                        // make sure we have an array to read
+                        if ( !empty($attributes) && !empty($attributes[$group_indentifier]) && is_array($attributes[$group_indentifier]) )
+                        {
                            $user_group = array_shift($attributes[$group_indentifier]);
                            $user_groups[] = $user_group;

@@ -189,6 +193,7 @@ class LoginLDAPPlugin extends Plugin
                            }
                        }
                    }
+                }

                // Merge the LDAP user data with Grav user
                $grav_user->merge($userdata);