diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/plugins/config/admin.php | 2 | ||||
-rw-r--r-- | lib/plugins/config/lang/en/lang.php | 1 | ||||
-rw-r--r-- | lib/plugins/config/settings/config.metadata.php | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index bd579423b..5f628e687 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -79,7 +79,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { // save state & force a page reload to get the new settings to take effect $_SESSION['PLUGIN_CONFIG'] = array('state' => 'updated', 'time' => time()); $this->_close_session(); - header("Location: ".str_replace('&','&',wl($ID,'do=admin&page=config'))); + header("Location: ".wl($ID,array('do'=>'admin','page'=>'config'),true,'&')); exit(); } diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 736e4f048..c79c09381 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -54,6 +54,7 @@ $lang['mailguard'] = 'obfuscate email addresses'; //obfuscate email addresses $lang['useacl'] = 'use ACL'; //Use Access Control Lists to restrict access? $lang['openregister']= 'open register'; //Should users to be allowed to register? $lang['autopasswd'] = 'autogenerate passwords'; //autogenerate passwords and email them to user +$lang['resendpasswd']= 'allow resend password'; //allow resend password function? $lang['authtype'] = 'authentication backend'; //which authentication backend should be used $lang['passcrypt'] = 'password encryption'; //Used crypt method (smd5,md5,sha1,ssha,crypt,mysql,my411) $lang['defaultgroup']= 'default group'; //Default groups new Users are added to diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index c69bb8f36..48ce2db6a 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -103,6 +103,7 @@ $meta['mailguard'] = array('multichoice','_choices' => array('visible','hex',' $meta['useacl'] = array('onoff'); $meta['openregister']= array('onoff'); $meta['autopasswd'] = array('onoff'); +$meta['resendpasswd'] = array('onoff'); $meta['authtype'] = array('authtype'); $meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','sha1','ssha','crypt','mysql','my411')); $meta['defaultgroup']= array(''); |