From 1fa1d6bc7fa1341a5bfc484aa06aa1cbb886d1a5 Mon Sep 17 00:00:00 2001
From: Cyril Duchon-Doris <Cyril.Duchon-Doris@telecom-paristech.org>
Date: Tue, 24 Feb 2015 17:46:57 +0100
Subject: [PATCH] Fixing bugs found by scrutinizer
---
lib/plugins/acl/admin.php | 7 +++----
lib/plugins/acl/remote.php | 4 ++--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 51872cafb..3cb541726 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -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);
diff --git a/lib/plugins/acl/remote.php b/lib/plugins/acl/remote.php
index a3fe98a34..f90aae6de 100644
--- a/lib/plugins/acl/remote.php
+++ b/lib/plugins/acl/remote.php
@@ -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',
--
GitLab