summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2012-10-27 17:45:09 +0200
committerBart Visscher <bartv@thisnet.nl>2012-10-27 17:45:15 +0200
commitfecfeac55d762ec80c9305b55e7140588bfe5dd5 (patch)
tree19ff96d8a70542360060effb4dd088e33c5151ab /core
parentd6953fa5ed796699d82b82473317b700dfbcfa72 (diff)
downloadnextcloud-server-fecfeac55d762ec80c9305b55e7140588bfe5dd5.tar.gz
nextcloud-server-fecfeac55d762ec80c9305b55e7140588bfe5dd5.zip
Fix introduced style errors
Diffstat (limited to 'core')
-rw-r--r--core/lostpassword/controller.php12
-rw-r--r--core/routes.php2
2 files changed, 9 insertions, 5 deletions
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index e616fe7dff8..523520dc754 100644
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -8,14 +8,16 @@
class OC_Core_LostPassword_Controller {
protected static function displayLostPasswordPage($error, $requested) {
- OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => $error, 'requested' => $requested));
+ OC_Template::printGuestPage('core/lostpassword', 'lostpassword',
+ array('error' => $error, 'requested' => $requested));
}
protected static function displayResetPasswordPage($success, $args) {
$route_args = array();
$route_args['token'] = $args['token'];
$route_args['user'] = $args['user'];
- OC_Template::printGuestPage('core/lostpassword', 'resetpassword', array('success' => $success, 'args' => $route_args));
+ OC_Template::printGuestPage('core/lostpassword', 'resetpassword',
+ array('success' => $success, 'args' => $route_args));
}
protected static function checkToken($user, $token) {
@@ -29,10 +31,12 @@ class OC_Core_LostPassword_Controller {
public static function sendEmail($args) {
if (OC_User::userExists($_POST['user'])) {
$token = hash('sha256', OC_Util::generate_random_bytes(30).OC_Config::getValue('passwordsalt', ''));
- OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', hash('sha256', $token)); // Hash the token again to prevent timing attacks
+ 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', '');
if (!empty($email)) {
- $link = OC_Helper::linkToRoute('core_lostpassword_reset', array('user' => $_POST['user'], 'token' => $token));
+ $link = OC_Helper::linkToRoute('core_lostpassword_reset',
+ array('user' => $_POST['user'], 'token' => $token));
$link = OC_Helper::makeURLAbsolute($link);
$tmpl = new OC_Template('core/lostpassword', 'email');
diff --git a/core/routes.php b/core/routes.php
index 7cf27498846..186fa8ae562 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
-require_once('settings/routes.php');
+require_once 'settings/routes.php';
// Core ajax actions
// AppConfig