diff options
| author | Guy Brand <gb@unistra.fr> | 2013-03-06 14:08:08 +0100 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2013-03-06 14:08:08 +0100 |
| commit | 23678e344b4ddcad14254c106ecb93af174fdaa0 (patch) | |
| tree | a5c787e4d87313a7fb6f18cb4c78bf210d92d60c /lib/plugins/plugin/admin.php | |
| parent | 847cef0a6bfd2ff9dc54e1fc140f5ba0ece0017a (diff) | |
| parent | 5721a1547938df76003c6d91ea003dc1c70abd94 (diff) | |
| download | rpg-23678e344b4ddcad14254c106ecb93af174fdaa0.tar.gz rpg-23678e344b4ddcad14254c106ecb93af174fdaa0.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'lib/plugins/plugin/admin.php')
| -rw-r--r-- | lib/plugins/plugin/admin.php | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/lib/plugins/plugin/admin.php b/lib/plugins/plugin/admin.php index b2108f185..de4de6aef 100644 --- a/lib/plugins/plugin/admin.php +++ b/lib/plugins/plugin/admin.php @@ -33,6 +33,10 @@ class admin_plugin_plugin extends DokuWiki_Admin_Plugin { var $disabled = 0; var $plugin = ''; var $cmd = ''; + + /** + * @var ap_manage + */ var $handler = NULL; var $functions = array('delete','update',/*'settings',*/'info'); // require a plugin name @@ -43,28 +47,10 @@ class admin_plugin_plugin extends DokuWiki_Admin_Plugin { var $error = ''; function admin_plugin_plugin() { - global $conf; $this->disabled = plugin_isdisabled('plugin'); } /** - * return some info - */ - function getInfo(){ - $disabled = ($this->disabled) ? '(disabled)' : ''; - - return array( - 'author' => 'Christopher Smith', - 'email' => 'chris@jalakai.co.uk', - 'date' => '2009-11-11', - 'name' => 'Plugin Manager', - 'desc' => "Manage Plugins, including automated plugin installer $disabled", - 'url' => 'http://www.dokuwiki.org/plugin:plugin', - ); - } - - - /** * return sort order for position in admin menu */ function getMenuSort() { @@ -75,11 +61,12 @@ class admin_plugin_plugin extends DokuWiki_Admin_Plugin { * handle user request */ function handle() { + global $INPUT; // enable direct access to language strings $this->setupLocale(); - $fn = $_REQUEST['fn']; + $fn = $INPUT->param('fn'); if (is_array($fn)) { $this->cmd = key($fn); $this->plugin = is_array($fn[$this->cmd]) ? key($fn[$this->cmd]) : null; |