summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2013-06-16 10:10:05 -0700
committerAndreas Gohr <andi@splitbrain.org>2013-06-16 10:10:05 -0700
commit3394e804f34fc2636c519d9ec6e10e342adf520d (patch)
tree79429bb2f5fef2915a284d7b6c3be0bd073727d5 /lib
parent81ee3b1c4ea669b4278fc1160162c686b82e559c (diff)
parent987c8d26bbfec753f50b50e8f16e0f5579a93e11 (diff)
downloadrpg-3394e804f34fc2636c519d9ec6e10e342adf520d.tar.gz
rpg-3394e804f34fc2636c519d9ec6e10e342adf520d.tar.bz2
Merge pull request #230 from splitbrain/pwgen-event
AUTH_PASSWORD_GENERATE event added
Diffstat (limited to 'lib')
-rw-r--r--lib/plugins/usermanager/admin.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 01f4a4cdb..445836a50 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -355,7 +355,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
if ($this->_auth->canDo('modPass')){
if (empty($pass)){
if($INPUT->has('usernotify')){
- $pass = auth_pwgen();
+ $pass = auth_pwgen($user);
} else {
msg($this->lang['add_fail'], -1);
return false;
@@ -496,7 +496,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
// generate password if left empty and notification is on
if($INPUT->has('usernotify') && empty($newpass)){
- $newpass = auth_pwgen();
+ $newpass = auth_pwgen($olduser);
}
if (!empty($newpass) && $this->_auth->canDo('modPass'))