Merge remote-tracking branch 'origin/master' into fetchimagetokexternal

2 files changed, 31 insertions, 0 deletions

diff --git a/lib/plugins/acl/remote.php b/lib/plugins/acl/remote.php
new file mode 100644
index 000000000..8f6dfbcd9
--- /dev/null
+++ b/lib/plugins/acl/remote.php
@@ -0,0 +1,30 @@
+<?php
+
+class remote_plugin_acl extends DokuWiki_Remote_Plugin {
+    function _getMethods() {
+        return array(
+            'addAcl' => array(
+                'args' => array('string','string','int'),
+                'return' => 'int',
+                'name' => 'addAcl',
+                'doc' => 'Adds a new ACL rule.'
+            ), 'delAcl' => array(
+                'args' => array('string','string'),
+                'return' => 'int',
+                'name' => 'delAcl',
+                'doc' => 'Delete an existing ACL rule.'
+            ),
+        );
+    }
+	
+    function addAcl($scope, $user, $level){
+        $apa = plugin_load('admin', 'acl'); 
+        return $apa->_acl_add($scope, $user, $level);
+    }
+	
+    function delAcl($scope, $user){
+        $apa = plugin_load('admin', 'acl'); 
+        return $apa->_acl_del($scope, $user);
+    }
+}
+
diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js
index c3763dc8d..0abb80d67 100644
--- a/lib/plugins/acl/script.js
+++ b/lib/plugins/acl/script.js
@@ -61,6 +61,7 @@ var dw_acl = {
      */
     loadinfo: function () {
         jQuery('#acl__info')
+            .attr('role', 'alert')
             .html('<img src="'+DOKU_BASE+'lib/images/throbber.gif" alt="..." />')
             .load(
                 DOKU_BASE + 'lib/plugins/acl/ajax.php',