Skip to content
Snippets Groups Projects
Commit 1fa1d6bc authored by Cyril Duchon-Doris's avatar Cyril Duchon-Doris
Browse files

Fixing bugs found by scrutinizer

parent 6d2588b6
No related branches found
No related tags found
No related merge requests found
......@@ -675,7 +675,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
}
/**
* return an array of all ACLs
* Returns an array of all ACLs
* (meant to be use by XMLRC API)
* Mostly a copy of _init_acl_config, consider refactoring ?
*
......@@ -685,15 +685,14 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
global $AUTH_ACL;
global $conf;
$acl_config = array();
$usersgroups = array();
// get special users and groups
$this->specials[] = '@ALL';
$this->specials[] = '@'.$conf['defaultgroup'];
if($conf['manager'] != '!!not set!!'){
$this->specials = array_merge($this->specials,
array_map('trim',
explode(',',$conf['manager'])));
array_map('trim',
explode(',',$conf['manager'])));
}
$this->specials = array_filter($this->specials);
$this->specials = array_unique($this->specials);
......
......@@ -16,8 +16,8 @@ class remote_plugin_acl extends DokuWiki_Remote_Plugin {
'args' => array(),
'return' => 'Array of ACLs {scope, user, permission}',
'name' => 'listAcl',
'doc' => 'Get the list of all ACLs'
)'addAcl' => array(
'doc' => 'Get the list of all ACLs',
),'addAcl' => array(
'args' => array('string','string','int'),
'return' => 'int',
'name' => 'addAcl',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment