Knah-Tsaeb/dokuwiki-plugin-userhomepage
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix usage of raw ACL configuration file

Browse source
This commit is contained in:
picas 2016-05-14 14:07:52 +02:00
parent aaf074d18f
commit 314e093c93
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
action.php
View file

@ -174,7 +174,8 @@ class action_plugin_userhomepage extends DokuWiki_Action_Plugin{
if ($this->multiNsOk()) { if ($this->multiNsOk()) {
if ((!$this->getConf('no_acl')) && ($conf['useacl']) && ($this->userOk())) { if ((!$this->getConf('no_acl')) && ($conf['useacl']) && ($this->userOk())) {
$existingLines = file(DOKU_CONF.'acl.auth.php'); global $config_cascade;
$existingLines = file($config_cascade['acl']['default']);
$newLines = array(); $newLines = array();
// ACL // ACL
$acl = new admin_plugin_acl(); $acl = new admin_plugin_acl();
@ -455,7 +456,7 @@ class action_plugin_userhomepage extends DokuWiki_Action_Plugin{
$groups = str_replace(' ','', $groups); $groups = str_replace(' ','', $groups);
$groups = explode(',', $groups); $groups = explode(',', $groups);
$userGroups = $INFO['userinfo']['grps']; $userGroups = $INFO['userinfo']['grps'];
// If UHP is set to check user's group(s) // If UHP is set to check user's group(s)
if (($groups != null) and ($groups[0] != null) and ($userGroups != null)) { if (($groups != null) and ($groups[0] != null) and ($userGroups != null)) {
$test = array_intersect($groups, $userGroups); $test = array_intersect($groups, $userGroups);
// Proceed if user is member of at least one group set UHP's corresponding setting // Proceed if user is member of at least one group set UHP's corresponding setting