mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use the namespaced variation of the classname.

This commit is contained in:
Bart Visscher 2013-09-02 21:22:18 +02:00
parent e68b5f8b0d
commit 5539b9e843
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
core/lostpassword/controller.php
View File

@ -5,11 +5,12 @@
* later. * later.
* See the COPYING-README file. * See the COPYING-README file.
*/ */
namespace OC\Core\LostPassword;
class OC_Core_LostPassword_Controller { class Controller {
protected static function displayLostPasswordPage($error, $requested) { protected static function displayLostPasswordPage($error, $requested) {
$isEncrypted = OC_App::isEnabled('files_encryption'); $isEncrypted = \OC_App::isEnabled('files_encryption');
OC_Template::printGuestPage('core/lostpassword', 'lostpassword', \OC_Template::printGuestPage('core/lostpassword', 'lostpassword',
array('error' => $error, array('error' => $error,
'requested' => $requested, 'requested' => $requested,
'isEncrypted' => $isEncrypted)); 'isEncrypted' => $isEncrypted));
@ -19,12 +20,12 @@ class OC_Core_LostPassword_Controller {
$route_args = array(); $route_args = array();
$route_args['token'] = $args['token']; $route_args['token'] = $args['token'];
$route_args['user'] = $args['user']; $route_args['user'] = $args['user'];
OC_Template::printGuestPage('core/lostpassword', 'resetpassword', \OC_Template::printGuestPage('core/lostpassword', 'resetpassword',
array('success' => $success, 'args' => $route_args)); array('success' => $success, 'args' => $route_args));
} }
protected static function checkToken($user, $token) { protected static function checkToken($user, $token) {
return OC_Preferences::getValue($user, 'owncloud', 'lostpassword') === hash('sha256', $token); return \OC_Preferences::getValue($user, 'owncloud', 'lostpassword') === hash('sha256', $token);
} }
public static function index($args) { public static function index($args) {
@ -33,7 +34,7 @@ class OC_Core_LostPassword_Controller {
public static function sendEmail($args) { public static function sendEmail($args) {
$isEncrypted = OC_App::isEnabled('files_encryption'); $isEncrypted = \OC_App::isEnabled('files_encryption');
if(!$isEncrypted || isset($_POST['continue'])) { if(!$isEncrypted || isset($_POST['continue'])) {
$continue = true; $continue = true;
@ -41,26 +42,26 @@ class OC_Core_LostPassword_Controller {
$continue = false; $continue = false;
} }
if (OC_User::userExists($_POST['user']) && $continue) { 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::generate_random_bytes(30).\OC_Config::getValue('passwordsalt', ''));
OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', \OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword',
hash('sha256', $token)); // Hash the token again to prevent timing attacks hash('sha256', $token)); // Hash the token again to prevent timing attacks
$email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', ''); $email = \OC_Preferences::getValue($_POST['user'], 'settings', 'email', '');
if (!empty($email)) { if (!empty($email)) {
$link = OC_Helper::linkToRoute('core_lostpassword_reset', $link = \OC_Helper::linkToRoute('core_lostpassword_reset',
array('user' => $_POST['user'], 'token' => $token)); array('user' => $_POST['user'], 'token' => $token));
$link = OC_Helper::makeURLAbsolute($link); $link = \OC_Helper::makeURLAbsolute($link);
$tmpl = new OC_Template('core/lostpassword', 'email'); $tmpl = new \OC_Template('core/lostpassword', 'email');
$tmpl->assign('link', $link, false); $tmpl->assign('link', $link, false);
$msg = $tmpl->fetchPage(); $msg = $tmpl->fetchPage();
$l = OC_L10N::get('core'); $l = \OC_L10N::get('core');
$from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply'); $from = \OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
try { try {
$defaults = new OC_Defaults(); $defaults = new \OC_Defaults();
OC_Mail::send($email, $_POST['user'], $l->t('%s password reset', array($defaults->getName())), $msg, $from, $defaults->getName()); \OC_Mail::send($email, $_POST['user'], $l->t('%s password reset', array($defaults->getName())), $msg, $from, $defaults->getName());
} catch (Exception $e) { } catch (Exception $e) {
OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.'); \OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.');
} }
self::displayLostPasswordPage(false, true); self::displayLostPasswordPage(false, true);
} else { } else {
@ -84,9 +85,9 @@ class OC_Core_LostPassword_Controller {
public static function resetPassword($args) { public static function resetPassword($args) {
if (self::checkToken($args['user'], $args['token'])) { if (self::checkToken($args['user'], $args['token'])) {
if (isset($_POST['password'])) { if (isset($_POST['password'])) {
if (OC_User::setPassword($args['user'], $_POST['password'])) { if (\OC_User::setPassword($args['user'], $_POST['password'])) {
OC_Preferences::deleteKey($args['user'], 'owncloud', 'lostpassword'); \OC_Preferences::deleteKey($args['user'], 'owncloud', 'lostpassword');
OC_User::unsetMagicInCookie(); \OC_User::unsetMagicInCookie();
self::displayResetPasswordPage(true, $args); self::displayResetPasswordPage(true, $args);
} else { } else {
self::displayResetPasswordPage(false, $args); self::displayResetPasswordPage(false, $args);

9
core/routes.php
View File

@ -44,19 +44,18 @@ $this->create('core_ajax_routes', '/core/routes.json')
->action('OC_Router', 'JSRoutes'); ->action('OC_Router', 'JSRoutes');
$this->create('core_ajax_preview', '/core/preview.png') $this->create('core_ajax_preview', '/core/preview.png')
->actionInclude('core/ajax/preview.php'); ->actionInclude('core/ajax/preview.php');
OC::$CLASSPATH['OC_Core_LostPassword_Controller'] = 'core/lostpassword/controller.php';
$this->create('core_lostpassword_index', '/lostpassword/') $this->create('core_lostpassword_index', '/lostpassword/')
->get() ->get()
->action('OC_Core_LostPassword_Controller', 'index'); ->action('OC\Core\LostPassword\Controller', 'index');
$this->create('core_lostpassword_send_email', '/lostpassword/') $this->create('core_lostpassword_send_email', '/lostpassword/')
->post() ->post()
->action('OC_Core_LostPassword_Controller', 'sendEmail'); ->action('OC\Core\LostPassword\Controller', 'sendEmail');
$this->create('core_lostpassword_reset', '/lostpassword/reset/{token}/{user}') $this->create('core_lostpassword_reset', '/lostpassword/reset/{token}/{user}')
->get() ->get()
->action('OC_Core_LostPassword_Controller', 'reset'); ->action('OC\Core\LostPassword\Controller', 'reset');
$this->create('core_lostpassword_reset_password', '/lostpassword/reset/{token}/{user}') $this->create('core_lostpassword_reset_password', '/lostpassword/reset/{token}/{user}')
->post() ->post()
->action('OC_Core_LostPassword_Controller', 'resetPassword'); ->action('OC\Core\LostPassword\Controller', 'resetPassword');
// Not specifically routed // Not specifically routed
$this->create('app_css', '/apps/{app}/{file}') $this->create('app_css', '/apps/{app}/{file}')