diff options
| author | Klap-in <klapinklapin@gmail.com> | 2013-06-09 22:21:37 +0200 |
|---|---|---|
| committer | Klap-in <klapinklapin@gmail.com> | 2013-06-09 22:21:37 +0200 |
| commit | 3faed524fdb5c7c51a60a92e9715dd5425389c35 (patch) | |
| tree | b37b25628bdf2fde079c4f2800d2fc118d726d0e /inc/auth.php | |
| parent | 3e7e6067571e660cd835164c22d0973aa6343408 (diff) | |
| parent | 62765857f84626449d6c53b1a46c462a37e5083a (diff) | |
| download | rpg-3faed524fdb5c7c51a60a92e9715dd5425389c35.tar.gz rpg-3faed524fdb5c7c51a60a92e9715dd5425389c35.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into fetchftp
Diffstat (limited to 'inc/auth.php')
| -rw-r--r-- | inc/auth.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/auth.php b/inc/auth.php index 3f1f7925b..1f8489f03 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -54,7 +54,7 @@ function auth_setup() { } elseif ('auth' . $conf['authtype'] === $plugin) { // matches old auth backends (pre-Weatherwax) $auth = $plugin_controller->load('auth', $plugin); - msg('Your authtype setting is deprecated. You must set $conf[\'authtype\'] = ' . "auth" . $conf['authtype'] + msg('Your authtype setting is deprecated. You must set $conf[\'authtype\'] = "auth' . $conf['authtype'] . '"' . ' in your configuration (see <a href="https://www.dokuwiki.org/auth">Authentication Backends</a>)',-1,'','',MSG_ADMINS_ONLY); } } @@ -993,7 +993,7 @@ function act_resendpwd() { } // generate auth token - $token = md5(auth_cookiesalt().$user); //secret but user based + $token = md5(uniqid(mt_rand(), true)); // random secret $tfile = $conf['cachedir'].'/'.$token{0}.'/'.$token.'.pwauth'; $url = wl('', array('do'=> 'resendpwd', 'pwauth'=> $token), true, '&'); |