diff options
author | Anika Henke <anika@selfthinker.org> | 2011-09-10 20:11:29 +0100 |
---|---|---|
committer | Anika Henke <anika@selfthinker.org> | 2011-09-10 20:23:40 +0100 |
commit | 29d511bfa507384ae0872f75fb54acb44b1e915e (patch) | |
tree | bd9b3138f288fbc6786f3b28c7f3d438bf79c36f /lib | |
parent | 28b19f13203b5263ad89854a9c1df221975e4c38 (diff) | |
parent | a95a7bf3a77d3c38a54af67b2f7584c480381691 (diff) | |
download | rpg-29d511bfa507384ae0872f75fb54acb44b1e915e.tar.gz rpg-29d511bfa507384ae0872f75fb54acb44b1e915e.tar.bz2 |
Merge branch 'plugincontroller' of git://github.com/piyushmishra/dokuwiki into plugincontroller
This adds support for the config_cascade when enabling/disabling plugins,
making farming easier.
The changes have been implemented by Piyush Mishra and are a part of the
new extension manager which will follow later. It's the result of a
Google Summer of Code project, the official project page can be found at
http://www.google-melange.com/gsoc/project/google/gsoc2011/piyushmishra/26001
Thanks to Piyush for the work and Google for sponsoring it!
Conflicts:
inc/lang/en/lang.php
Diffstat (limited to 'lib')
-rw-r--r-- | lib/plugins/acl/admin.php | 14 | ||||
-rw-r--r-- | lib/plugins/acl/plugin.info.txt | 6 | ||||
-rw-r--r-- | lib/plugins/config/admin.php | 15 | ||||
-rw-r--r-- | lib/plugins/config/plugin.info.txt | 6 | ||||
-rw-r--r-- | lib/plugins/info/plugin.info.txt | 6 | ||||
-rw-r--r-- | lib/plugins/revert/admin.php | 14 | ||||
-rw-r--r-- | lib/plugins/revert/plugin.info.txt | 6 | ||||
-rw-r--r-- | lib/plugins/usermanager/admin.php | 14 | ||||
-rw-r--r-- | lib/plugins/usermanager/plugin.info.txt | 6 |
9 files changed, 30 insertions, 57 deletions
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index 53f6db0cc..a6b0624bc 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -31,20 +31,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { var $specials = array(); /** - * return some info - */ - function getInfo(){ - return array( - 'author' => 'Andreas Gohr', - 'email' => 'andi@splitbrain.org', - 'date' => '2011-04-16', - 'name' => 'ACL Manager', - 'desc' => 'Manage Page Access Control Lists', - 'url' => 'http://dokuwiki.org/plugin:acl', - ); - } - - /** * return prompt for admin menu */ function getMenuText($language) { diff --git a/lib/plugins/acl/plugin.info.txt b/lib/plugins/acl/plugin.info.txt new file mode 100644 index 000000000..f108a2390 --- /dev/null +++ b/lib/plugins/acl/plugin.info.txt @@ -0,0 +1,6 @@ +author Andreas Gohr +email andi@splitbrain.org +date 2011-04-16 +name ACL Manager +desc Manage Page Access Control Lists +url http://dokuwiki.org/plugin:acl diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index e24f3b87b..64906171d 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -32,21 +32,6 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { var $_session_started = false; var $_localised_prompts = false; - /** - * return some info - */ - function getInfo(){ - - return array( - 'author' => 'Christopher Smith', - 'email' => 'chris@jalakai.co.uk', - 'date' => '2007-08-05', - 'name' => 'Configuration Manager', - 'desc' => "Manage Dokuwiki's Configuration Settings", - 'url' => 'http://dokuwiki.org/plugin:config', - ); - } - function getMenuSort() { return 100; } /** diff --git a/lib/plugins/config/plugin.info.txt b/lib/plugins/config/plugin.info.txt new file mode 100644 index 000000000..ace4889b6 --- /dev/null +++ b/lib/plugins/config/plugin.info.txt @@ -0,0 +1,6 @@ +author Christopher Smith +email chris@jalakai.co.uk +date 2007-08-05 +name Configuration Manager +desc Manage Dokuwiki's Configuration Settings +url http://dokuwiki.org/plugin:config diff --git a/lib/plugins/info/plugin.info.txt b/lib/plugins/info/plugin.info.txt new file mode 100644 index 000000000..2432225f1 --- /dev/null +++ b/lib/plugins/info/plugin.info.txt @@ -0,0 +1,6 @@ +author Andreas Gohr +email andi@splitbrain.org +date 2008-09-12 +name Info Plugin +desc Displays information about various DokuWiki internals +url http://dokuwiki.org/plugin:info diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php index e188e2488..2aaf1395f 100644 --- a/lib/plugins/revert/admin.php +++ b/lib/plugins/revert/admin.php @@ -21,20 +21,6 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin { } /** - * return some info - */ - function getInfo(){ - return array( - 'author' => 'Andreas Gohr', - 'email' => 'andi@splitbrain.org', - 'date' => '2008-12-10', - 'name' => 'Revert Manager', - 'desc' => 'Allows you to mass revert recent edits', - 'url' => 'http://dokuwiki.org/plugin:revert', - ); - } - - /** * access for managers */ function forAdminOnly(){ diff --git a/lib/plugins/revert/plugin.info.txt b/lib/plugins/revert/plugin.info.txt new file mode 100644 index 000000000..5bb6f3413 --- /dev/null +++ b/lib/plugins/revert/plugin.info.txt @@ -0,0 +1,6 @@ +author Andreas Gohr +email andi@splitbrain.org +date 2008-12-10 +name Revert Manager +desc Allows you to mass revert recent edits +url http://dokuwiki.org/plugin:revert diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index e40ee9b7e..8e90be093 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -51,20 +51,6 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { } } - /** - * return some info - */ - function getInfo(){ - - return array( - 'author' => 'Chris Smith', - 'email' => 'chris@jalakai.co.uk', - 'date' => '2008-09-17', - 'name' => 'User Manager', - 'desc' => 'Manage users '.$this->disabled, - 'url' => 'http://dokuwiki.org/plugin:usermanager', - ); - } /** * return prompt for admin menu */ diff --git a/lib/plugins/usermanager/plugin.info.txt b/lib/plugins/usermanager/plugin.info.txt new file mode 100644 index 000000000..7ec5fafd5 --- /dev/null +++ b/lib/plugins/usermanager/plugin.info.txt @@ -0,0 +1,6 @@ +author Chris Smith +email chris@jalakai.co.uk +date 2008-09-17 +name User Manager +desc Manage users +url http://dokuwiki.org/plugin:usermanager |