summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <gohr@cosmocode.de>2014-12-03 16:50:16 +0100
committerAndreas Gohr <gohr@cosmocode.de>2014-12-03 16:50:43 +0100
commit48b5d5e92851161ee3b3ebc7bf5b6ae6d1f0914d (patch)
treee704ffa4683848e99310636c1b7f63f501789404
parent4766c1f0aaafeb23d5026904b802078cf82ebbe1 (diff)
downloadrpg-48b5d5e92851161ee3b3ebc7bf5b6ae6d1f0914d.tar.gz
rpg-48b5d5e92851161ee3b3ebc7bf5b6ae6d1f0914d.tar.bz2
warn about enabled, but not used auth plugins
-rw-r--r--lib/plugins/extension/helper/list.php5
-rw-r--r--lib/plugins/extension/lang/en/lang.php1
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php
index 9b1988d84..f7e6eb2ca 100644
--- a/lib/plugins/extension/helper/list.php
+++ b/lib/plugins/extension/helper/list.php
@@ -461,6 +461,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
* @return string The HTML code
*/
function make_actions(helper_plugin_extension_extension $extension) {
+ global $conf;
$return = '';
$errors = '';
@@ -492,6 +493,10 @@ class helper_plugin_extension_list extends DokuWiki_Plugin {
$errors .= '<p class="permerror">'.$this->getLang('git').'</p>';
}
+ if ($extension->isEnabled() && in_array('Auth', $extension->getTypes()) && $conf['auth'] != $extension->getID()) {
+ $errors .= '<p class="permerror">'.$this->getLang('auth').'</p>';
+ }
+
}else{
if (($canmod = $extension->canModify()) === true) {
if ($extension->getDownloadURL()) {
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 72c9b9e2d..fc8860c5d 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -94,6 +94,7 @@ $lang['noperms'] = 'Extension directory is not writable';
$lang['notplperms'] = 'Template directory is not writable';
$lang['nopluginperms'] = 'Plugin directory is not writable';
$lang['git'] = 'This extension was installed via git, you may not want to update it here.';
+$lang['auth'] = 'This auth plugin is not enabled in configuration, consider disabling it.';
$lang['install_url'] = 'Install from URL:';
$lang['install_upload'] = 'Upload Extension:';