diff options
| author | Klap-in <klapinklapin@gmail.com> | 2013-06-09 21:22:12 +0200 |
|---|---|---|
| committer | Klap-in <klapinklapin@gmail.com> | 2013-06-09 21:22:12 +0200 |
| commit | 9b6fa49c06b538c53c9cf3e404ade82d6c003f79 (patch) | |
| tree | 68771b589052382f9e4824bf3a4857f5648fdf3d /inc/auth.php | |
| parent | a38a6f25d7e46f47a8f358bb16c766f5b96dae45 (diff) | |
| parent | 62765857f84626449d6c53b1a46c462a37e5083a (diff) | |
| download | rpg-9b6fa49c06b538c53c9cf3e404ade82d6c003f79.tar.gz rpg-9b6fa49c06b538c53c9cf3e404ade82d6c003f79.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into fetchimagetokexternal
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, '&'); |