diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-04 20:46:32 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-04 20:46:32 +0200 |
| commit | e43e8b0db8d1c9935ac49d37255e934e310798c7 (patch) | |
| tree | d228f608b83e1c04ef5b97b0fe4b0a15282343b7 /core/lostpassword | |
| parent | 5539b9e843dbd4125ba9bbb3de79d47ef48e059b (diff) | |
| parent | 09187f3b3b30e6f810c6afff7332615ed472154e (diff) | |
| download | nextcloud-server-e43e8b0db8d1c9935ac49d37255e934e310798c7.tar.gz nextcloud-server-e43e8b0db8d1c9935ac49d37255e934e310798c7.zip | |
Merge branch 'master' into rename-lostpassword-controller
Conflicts:
core/lostpassword/controller.php
Diffstat (limited to 'core/lostpassword')
| -rw-r--r-- | core/lostpassword/controller.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php index 66e4de5f54c..3c8099591a1 100644 --- a/core/lostpassword/controller.php +++ b/core/lostpassword/controller.php @@ -43,7 +43,7 @@ class Controller { } if (\OC_User::userExists($_POST['user']) && $continue) { - $token = hash('sha256', \OC_Util::generate_random_bytes(30).\OC_Config::getValue('passwordsalt', '')); + $token = hash('sha256', \OC_Util::generateRandomBytes(30).\OC_Config::getValue('passwordsalt', '')); \OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', hash('sha256', $token)); // Hash the token again to prevent timing attacks $email = \OC_Preferences::getValue($_POST['user'], 'settings', 'email', ''); |