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

Fixed issue with merge of access levels

Browse Source
This commit is contained in:
Djamil Legato
2018-05-16 12:24:25 -07:00
parent ffe5f6a5a0
commit af5f5888ca
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
login-ldap.php
View File

@@ -3,6 +3,7 @@ namespace Grav\Plugin;
use Grav\Common\Plugin; use Grav\Common\Plugin;
use Grav\Common\User\User; use Grav\Common\User\User;
use Grav\Common\Utils;
use Grav\Plugin\Login\Events\UserLoginEvent; use Grav\Plugin\Login\Events\UserLoginEvent;
use Grav\Plugin\Login\Login; use Grav\Plugin\Login\Login;
use Symfony\Component\Ldap\Ldap; use Symfony\Component\Ldap\Ldap;
@@ -209,7 +210,8 @@ class LoginLDAPPlugin extends Plugin
$groups_access = Yaml::parse($admin_access); $groups_access = Yaml::parse($admin_access);
foreach ($groups_access as $key => $group_access) { foreach ($groups_access as $key => $group_access) {
if (in_array($key, $user_groups)) { if (in_array($key, $user_groups)) {
$grav_user->merge(['access' => $group_access]); $access_levels = Utils::arrayMergeRecursiveUnique($grav_user->access, $group_access);
$grav_user->merge(['access' => $access_levels]);
} }
} }
} }