diff options
| author | Klap-in <klapinklapin@gmail.com> | 2013-07-21 23:10:32 +0200 |
|---|---|---|
| committer | Klap-in <klapinklapin@gmail.com> | 2013-07-21 23:10:32 +0200 |
| commit | b1ffadaa6963bbf83e61917c31e04c04c421ce9e (patch) | |
| tree | f9a1391d2ee6536473b1672e249c1b11a67a5b0e /lib/plugins/usermanager | |
| parent | fa3ed26bfbafa4d05ec77a799259d4a46baadd9a (diff) | |
| parent | fbd8067eeeb9f424981aad8b283e17f734c738c3 (diff) | |
| download | rpg-b1ffadaa6963bbf83e61917c31e04c04c421ce9e.tar.gz rpg-b1ffadaa6963bbf83e61917c31e04c04c421ce9e.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into fetchimagetokexternal
Diffstat (limited to 'lib/plugins/usermanager')
| -rw-r--r-- | lib/plugins/usermanager/admin.php | 4 | ||||
| -rw-r--r-- | lib/plugins/usermanager/lang/de-informal/lang.php | 1 | ||||
| -rw-r--r-- | lib/plugins/usermanager/lang/sv/lang.php | 1 |
3 files changed, 4 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')) diff --git a/lib/plugins/usermanager/lang/de-informal/lang.php b/lib/plugins/usermanager/lang/de-informal/lang.php index 07390854f..791cfa74f 100644 --- a/lib/plugins/usermanager/lang/de-informal/lang.php +++ b/lib/plugins/usermanager/lang/de-informal/lang.php @@ -9,6 +9,7 @@ * @author Christian Wichmann <nospam@zone0.de> * @author Pierre Corell <info@joomla-praxis.de> * @author Frank Loizzi <contact@software.bacal.de> + * @author Volker Bödker <volker@boedker.de> */ $lang['menu'] = 'Benutzerverwaltung'; $lang['noauth'] = '(Benutzeranmeldung ist nicht verfügbar)'; diff --git a/lib/plugins/usermanager/lang/sv/lang.php b/lib/plugins/usermanager/lang/sv/lang.php index bd747927e..f8b530d90 100644 --- a/lib/plugins/usermanager/lang/sv/lang.php +++ b/lib/plugins/usermanager/lang/sv/lang.php @@ -15,6 +15,7 @@ * @author Peter Åström <eaustreum@gmail.com> * @author Håkan Sandell <hakan.sandell@home.se> * @author mikael@mallander.net + * @author Smorkster Andersson smorkster@gmail.com */ $lang['menu'] = 'Hantera användare'; $lang['noauth'] = '(användarautentisering ej tillgänlig)'; |