jannik/grav-plugin-login-ldap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update login-ldap.php

Browse Source 
In some rare occasions, the ldap setup can return null when reading the $attributes[$group_indentifier].

By checking that it isn't empty before shifting the array, we prevent the following error:

* array_shift expected parameter to be array, null given
This commit is contained in:
Miguel Pereira
2018-11-19 10:55:56 +01:00
committed by GitHub
parent 724fe87316
commit 97ee29eb37
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
login-ldap.php
View File

@@ -181,11 +181,16 @@ class LoginLDAPPlugin extends Plugin
foreach ($groups as $group) { foreach ($groups as $group) {
$attributes = $group->getAttributes(); $attributes = $group->getAttributes();
$user_group = array_shift($attributes[$group_indentifier]);
$user_groups[] = $user_group;
if ($this->config->get('plugins.login-ldap.store_ldap_data', false)) { // make sure we have an array to read
$userdata['ldap']['groups'][] = $user_group; if ( !empty($attributes) && !empty($attributes[$group_indentifier]) && is_array($attributes[$group_indentifier]) )
{
$user_group = array_shift($attributes[$group_indentifier]);
$user_groups[] = $user_group;
if ($this->config->get('plugins.login-ldap.store_ldap_data', false)) {
$userdata['ldap']['groups'][] = $user_group;
}
} }
} }
} }