4 files changed, 33 insertions, 22 deletions

diff --git a/lib/plugins/admin.php b/lib/plugins/admin.php
index 0cf12ad93..22867a93d 100644
--- a/lib/plugins/admin.php
+++ b/lib/plugins/admin.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Admin Plugin Prototype
- * 
+ *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author     Christopher Smith <chris@jalakai.co.uk>
  */
@@ -17,27 +17,29 @@ require_once(DOKU_PLUGIN.'base.php');
  */
 class DokuWiki_Admin_Plugin extends DokuWiki_Plugin {
 
-  function getMenuText($language) {
-      $menutext = $this->getLang('menu');
-      if (!$menutext) {
-        $info = $this->getInfo();
-        $menutext = $info['name'].' ...';
-      }
-      return $menutext;
-  }
+    function getMenuText($language) {
+        $menutext = $this->getLang('menu');
+        if (!$menutext) {
+            $info = $this->getInfo();
+            $menutext = $info['name'].' ...';
+        }
+        return $menutext;
+    }
 
-  function getMenuSort() {
-    return 1000;
-  }
+    function getMenuSort() {
+        return 1000;
+    }
 
-  function handle() {
-    trigger_error('handle() not implemented in '.get_class($this), E_USER_WARNING); 
-  }
+    function handle() {
+        trigger_error('handle() not implemented in '.get_class($this), E_USER_WARNING);
+    }
 
-  function html() {
-    trigger_error('html() not implemented in '.get_class($this), E_USER_WARNING); 
-  }
-    
-  
+    function html() {
+        trigger_error('html() not implemented in '.get_class($this), E_USER_WARNING);
+    }
+
+    function forAdminOnly() {
+        return true;
+    }
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
\ No newline at end of file
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index 70109e5fb..a415ca464 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -87,7 +87,8 @@ $lang['autopasswd']  = 'Autogenerate passwords';
 $lang['authtype']    = 'Authentication backend';
 $lang['passcrypt']   = 'Password encryption method';
 $lang['defaultgroup']= 'Default group';
-$lang['superuser']   = 'Superuser';
+$lang['superuser']   = 'Superuser - a group or user with full access to all pages and functions regardless of the ACL settings';
+$lang['manager']     = 'Manager - a group or user with access to certain management functions';
 $lang['profileconfirm'] = 'Confirm profile changes with password';
 $lang['disableactions'] = 'Disable DokuWiki actions';
 $lang['disableactions_check'] = 'Check';
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index 38a24ebb8..3ef6c79b1 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -110,6 +110,7 @@ $meta['authtype']    = array('authtype');
 $meta['passcrypt']   = array('multichoice','_choices' => array('smd5','md5','sha1','ssha','crypt','mysql','my411'));
 $meta['defaultgroup']= array('string');
 $meta['superuser']   = array('string');
+$meta['manager']     = array('string');
 $meta['profileconfirm'] = array('onoff');
 $meta['registernotify'] = array('email');
 $meta['disableactions'] = array('disableactions',
diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php
index 879cd961c..b9c196297 100644
--- a/lib/plugins/revert/admin.php
+++ b/lib/plugins/revert/admin.php
@@ -33,6 +33,13 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin {
     }
 
     /**
+     * access for managers
+     */
+    function forAdminOnly(){
+        return false;
+    }
+
+    /**
      * return sort order for position in admin menu
      */
     function getMenuSort() {