nextcloud / server

lib/public/Mail/IEMailTemplate.php

Doc Comments +7 added lines, -1 removed lines

@@ -55,6 +55,7 @@ 
 	 * Adds a header to the email
 	 *
 	 * @since 12.0.0
+	 * @return void
 	 */
 	public function addHeader();
 
@@ -62,10 +63,11 @@ 
 	 * Adds a heading to the email
 	 *
 	 * @param string $title
-	 * @param string $plainTitle|bool Title that is used in the plain text email
+	 * @param string $plainTitle Title that is used in the plain text email
 	 *   if empty the $title is used, if false none will be used
 	 *
 	 * @since 12.0.0
+	 * @return void
 	 */
 	public function addHeading($title, $plainTitle = '');
 
@@ -77,6 +79,7 @@ 
 	 *   if empty the $text is used, if false none will be used
 	 *
 	 * @since 12.0.0
+	 * @return void
 	 */
 	public function addBodyText($text, $plainText = '');
 
@@ -91,6 +94,7 @@ 
 	 * @param string $plainTextRight Text of right button that is used in the plain text version - if empty the $textRight is used
 	 *
 	 * @since 12.0.0
+	 * @return void
 	 */
 	public function addBodyButtonGroup($textLeft, $urlLeft, $textRight, $urlRight, $plainTextLeft = '', $plainTextRight = '');
 
@@ -103,6 +107,7 @@ 
 	 * 		if empty the $text is used, if false none will be used
 	 *
 	 * @since 12.0.0
+	 * @return void
 	 */
 	public function addBodyButton($text, $url, $plainText = '');
 
@@ -112,6 +117,7 @@ 
 	 * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically generated email" will be used
 	 *
 	 * @since 12.0.0
+	 * @return void
 	 */
 	public function addFooter($text = '');
 

Indentation +74 added lines, -74 removed lines

@@ -51,85 +51,85 @@
  * @since 12.0.0
  */
 interface IEMailTemplate {
-	/**
-	 * Adds a header to the email
-	 *
-	 * @since 12.0.0
-	 */
-	public function addHeader();
+    /**
+     * Adds a header to the email
+     *
+     * @since 12.0.0
+     */
+    public function addHeader();
 
-	/**
-	 * Adds a heading to the email
-	 *
-	 * @param string $title
-	 * @param string $plainTitle|bool Title that is used in the plain text email
-	 *   if empty the $title is used, if false none will be used
-	 *
-	 * @since 12.0.0
-	 */
-	public function addHeading($title, $plainTitle = '');
+    /**
+     * Adds a heading to the email
+     *
+     * @param string $title
+     * @param string $plainTitle|bool Title that is used in the plain text email
+     *   if empty the $title is used, if false none will be used
+     *
+     * @since 12.0.0
+     */
+    public function addHeading($title, $plainTitle = '');
 
-	/**
-	 * Adds a paragraph to the body of the email
-	 *
-	 * @param string $text
-	 * @param string|bool $plainText Text that is used in the plain text email
-	 *   if empty the $text is used, if false none will be used
-	 *
-	 * @since 12.0.0
-	 */
-	public function addBodyText($text, $plainText = '');
+    /**
+     * Adds a paragraph to the body of the email
+     *
+     * @param string $text
+     * @param string|bool $plainText Text that is used in the plain text email
+     *   if empty the $text is used, if false none will be used
+     *
+     * @since 12.0.0
+     */
+    public function addBodyText($text, $plainText = '');
 
-	/**
-	 * Adds a button group of two buttons to the body of the email
-	 *
-	 * @param string $textLeft Text of left button
-	 * @param string $urlLeft URL of left button
-	 * @param string $textRight Text of right button
-	 * @param string $urlRight URL of right button
-	 * @param string $plainTextLeft Text of left button that is used in the plain text version - if empty the $textLeft is used
-	 * @param string $plainTextRight Text of right button that is used in the plain text version - if empty the $textRight is used
-	 *
-	 * @since 12.0.0
-	 */
-	public function addBodyButtonGroup($textLeft, $urlLeft, $textRight, $urlRight, $plainTextLeft = '', $plainTextRight = '');
+    /**
+     * Adds a button group of two buttons to the body of the email
+     *
+     * @param string $textLeft Text of left button
+     * @param string $urlLeft URL of left button
+     * @param string $textRight Text of right button
+     * @param string $urlRight URL of right button
+     * @param string $plainTextLeft Text of left button that is used in the plain text version - if empty the $textLeft is used
+     * @param string $plainTextRight Text of right button that is used in the plain text version - if empty the $textRight is used
+     *
+     * @since 12.0.0
+     */
+    public function addBodyButtonGroup($textLeft, $urlLeft, $textRight, $urlRight, $plainTextLeft = '', $plainTextRight = '');
 
-	/**
-	 * Adds a button to the body of the email
-	 *
-	 * @param string $text Text of button
-	 * @param string $url URL of button
-	 * @param string $plainText Text of button in plain text version
-	 * 		if empty the $text is used, if false none will be used
-	 *
-	 * @since 12.0.0
-	 */
-	public function addBodyButton($text, $url, $plainText = '');
+    /**
+     * Adds a button to the body of the email
+     *
+     * @param string $text Text of button
+     * @param string $url URL of button
+     * @param string $plainText Text of button in plain text version
+     * 		if empty the $text is used, if false none will be used
+     *
+     * @since 12.0.0
+     */
+    public function addBodyButton($text, $url, $plainText = '');
 
-	/**
-	 * Adds a logo and a text to the footer. <br> in the text will be replaced by new lines in the plain text email
-	 *
-	 * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically generated email" will be used
-	 *
-	 * @since 12.0.0
-	 */
-	public function addFooter($text = '');
+    /**
+     * Adds a logo and a text to the footer. <br> in the text will be replaced by new lines in the plain text email
+     *
+     * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically generated email" will be used
+     *
+     * @since 12.0.0
+     */
+    public function addFooter($text = '');
 
-	/**
-	 * Returns the rendered HTML email as string
-	 *
-	 * @return string
-	 *
-	 * @since 12.0.0
-	 */
-	public function renderHTML();
+    /**
+     * Returns the rendered HTML email as string
+     *
+     * @return string
+     *
+     * @since 12.0.0
+     */
+    public function renderHTML();
 
-	/**
-	 * Returns the rendered plain text email as string
-	 *
-	 * @return string
-	 *
-	 * @since 12.0.0
-	 */
-	public function renderText();
+    /**
+     * Returns the rendered plain text email as string
+     *
+     * @return string
+     *
+     * @since 12.0.0
+     */
+    public function renderText();
 }

core/Controller/LostController.php

Indentation +278 added lines, -278 removed lines

@@ -55,282 +55,282 @@
  */
 class LostController extends Controller {
 
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var Defaults */
-	protected $defaults;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var string */
-	protected $from;
-	/** @var IManager */
-	protected $encryptionManager;
-	/** @var IConfig */
-	protected $config;
-	/** @var ISecureRandom */
-	protected $secureRandom;
-	/** @var IMailer */
-	protected $mailer;
-	/** @var ITimeFactory */
-	protected $timeFactory;
-	/** @var ICrypto */
-	protected $crypto;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IURLGenerator $urlGenerator
-	 * @param IUserManager $userManager
-	 * @param Defaults $defaults
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 * @param ISecureRandom $secureRandom
-	 * @param string $defaultMailAddress
-	 * @param IManager $encryptionManager
-	 * @param IMailer $mailer
-	 * @param ITimeFactory $timeFactory
-	 * @param ICrypto $crypto
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IURLGenerator $urlGenerator,
-								IUserManager $userManager,
-								Defaults $defaults,
-								IL10N $l10n,
-								IConfig $config,
-								ISecureRandom $secureRandom,
-								$defaultMailAddress,
-								IManager $encryptionManager,
-								IMailer $mailer,
-								ITimeFactory $timeFactory,
-								ICrypto $crypto) {
-		parent::__construct($appName, $request);
-		$this->urlGenerator = $urlGenerator;
-		$this->userManager = $userManager;
-		$this->defaults = $defaults;
-		$this->l10n = $l10n;
-		$this->secureRandom = $secureRandom;
-		$this->from = $defaultMailAddress;
-		$this->encryptionManager = $encryptionManager;
-		$this->config = $config;
-		$this->mailer = $mailer;
-		$this->timeFactory = $timeFactory;
-		$this->crypto = $crypto;
-	}
-
-	/**
-	 * Someone wants to reset their password:
-	 *
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $token
-	 * @param string $userId
-	 * @return TemplateResponse
-	 */
-	public function resetform($token, $userId) {
-		try {
-			$this->checkPasswordResetToken($token, $userId);
-		} catch (\Exception $e) {
-			return new TemplateResponse(
-				'core', 'error', [
-					"errors" => array(array("error" => $e->getMessage()))
-				],
-				'guest'
-			);
-		}
-
-		return new TemplateResponse(
-			'core',
-			'lostpassword/resetpassword',
-			array(
-				'link' => $this->urlGenerator->linkToRouteAbsolute('core.lost.setPassword', array('userId' => $userId, 'token' => $token)),
-			),
-			'guest'
-		);
-	}
-
-	/**
-	 * @param string $token
-	 * @param string $userId
-	 * @throws \Exception
-	 */
-	protected function checkPasswordResetToken($token, $userId) {
-		$user = $this->userManager->get($userId);
-		if($user === null) {
-			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
-		}
-
-		try {
-			$encryptedToken = $this->config->getUserValue($userId, 'core', 'lostpassword', null);
-			$mailAddress = !is_null($user->getEMailAddress()) ? $user->getEMailAddress() : '';
-			$decryptedToken = $this->crypto->decrypt($encryptedToken, $mailAddress.$this->config->getSystemValue('secret'));
-		} catch (\Exception $e) {
-			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
-		}
-
-		$splittedToken = explode(':', $decryptedToken);
-		if(count($splittedToken) !== 2) {
-			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
-		}
-
-		if ($splittedToken[0] < ($this->timeFactory->getTime() - 60*60*12) ||
-			$user->getLastLogin() > $splittedToken[0]) {
-			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is expired'));
-		}
-
-		if (!hash_equals($splittedToken[1], $token)) {
-			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
-		}
-	}
-
-	/**
-	 * @param $message
-	 * @param array $additional
-	 * @return array
-	 */
-	private function error($message, array $additional=array()) {
-		return array_merge(array('status' => 'error', 'msg' => $message), $additional);
-	}
-
-	/**
-	 * @return array
-	 */
-	private function success() {
-		return array('status'=>'success');
-	}
-
-	/**
-	 * @PublicPage
-	 * @BruteForceProtection(action=passwordResetEmail)
-	 *
-	 * @param string $user
-	 * @return array
-	 */
-	public function email($user){
-		// FIXME: use HTTP error codes
-		try {
-			$this->sendEmail($user);
-		} catch (\Exception $e){
-			return $this->error($e->getMessage());
-		}
-
-		return $this->success();
-	}
-
-	/**
-	 * @PublicPage
-	 * @param string $token
-	 * @param string $userId
-	 * @param string $password
-	 * @param boolean $proceed
-	 * @return array
-	 */
-	public function setPassword($token, $userId, $password, $proceed) {
-		if ($this->encryptionManager->isEnabled() && !$proceed) {
-			return $this->error('', array('encryption' => true));
-		}
-
-		try {
-			$this->checkPasswordResetToken($token, $userId);
-			$user = $this->userManager->get($userId);
-
-			\OC_Hook::emit('\OC\Core\LostPassword\Controller\LostController', 'pre_passwordReset', array('uid' => $userId, 'password' => $password));
-
-			if (!$user->setPassword($password)) {
-				throw new \Exception();
-			}
-
-			\OC_Hook::emit('\OC\Core\LostPassword\Controller\LostController', 'post_passwordReset', array('uid' => $userId, 'password' => $password));
-
-			$this->config->deleteUserValue($userId, 'core', 'lostpassword');
-			@\OC_User::unsetMagicInCookie();
-		} catch (\Exception $e){
-			return $this->error($e->getMessage());
-		}
-
-		return $this->success();
-	}
-
-	/**
-	 * @param string $input
-	 * @throws \Exception
-	 */
-	protected function sendEmail($input) {
-		$user = $this->findUserByIdOrMail($input);
-		$email = $user->getEMailAddress();
-
-		if (empty($email)) {
-			throw new \Exception(
-				$this->l10n->t('Could not send reset email because there is no email address for this username. Please contact your administrator.')
-			);
-		}
-
-		// Generate the token. It is stored encrypted in the database with the
-		// secret being the users' email address appended with the system secret.
-		// This makes the token automatically invalidate once the user changes
-		// their email address.
-		$token = $this->secureRandom->generate(
-			21,
-			ISecureRandom::CHAR_DIGITS.
-			ISecureRandom::CHAR_LOWER.
-			ISecureRandom::CHAR_UPPER
-		);
-		$tokenValue = $this->timeFactory->getTime() .':'. $token;
-		$encryptedValue = $this->crypto->encrypt($tokenValue, $email . $this->config->getSystemValue('secret'));
-		$this->config->setUserValue($user->getUID(), 'core', 'lostpassword', $encryptedValue);
-
-		$link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', array('userId' => $user->getUID(), 'token' => $token));
-
-		$emailTemplate = $this->mailer->createEMailTemplate();
-
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading($this->l10n->t('Password reset'));
-
-		$emailTemplate->addBodyText(
-			$this->l10n->t('Click the following button to reset your password. If you have not requested the password reset, then ignore this email.'),
-			$this->l10n->t('Click the following link to reset your password. If you have not requested the password reset, then ignore this email.')
-		);
-
-		$emailTemplate->addBodyButton(
-			$this->l10n->t('Reset your password'),
-			$link,
-			false
-		);
-		$emailTemplate->addFooter();
-
-		try {
-			$message = $this->mailer->createMessage();
-			$message->setTo([$email => $user->getUID()]);
-			$message->setSubject($this->l10n->t('%s password reset', [$this->defaults->getName()]));
-			$message->setPlainBody($emailTemplate->renderText());
-			$message->setHtmlBody($emailTemplate->renderHTML());
-			$message->setFrom([$this->from => $this->defaults->getName()]);
-			$this->mailer->send($message);
-		} catch (\Exception $e) {
-			throw new \Exception($this->l10n->t(
-				'Couldn\'t send reset email. Please contact your administrator.'
-			));
-		}
-	}
-
-	/**
-	 * @param string $input
-	 * @return IUser
-	 * @throws \Exception
-	 */
-	protected function findUserByIdOrMail($input) {
-		$user = $this->userManager->get($input);
-		if ($user instanceof IUser) {
-			return $user;
-		}
-		$users = $this->userManager->getByEmail($input);
-		if (count($users) === 1) {
-			return $users[0];
-		}
-
-		throw new \InvalidArgumentException($this->l10n->t('Couldn\'t send reset email. Please make sure your username is correct.'));
-	}
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var Defaults */
+    protected $defaults;
+    /** @var IL10N */
+    protected $l10n;
+    /** @var string */
+    protected $from;
+    /** @var IManager */
+    protected $encryptionManager;
+    /** @var IConfig */
+    protected $config;
+    /** @var ISecureRandom */
+    protected $secureRandom;
+    /** @var IMailer */
+    protected $mailer;
+    /** @var ITimeFactory */
+    protected $timeFactory;
+    /** @var ICrypto */
+    protected $crypto;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IURLGenerator $urlGenerator
+     * @param IUserManager $userManager
+     * @param Defaults $defaults
+     * @param IL10N $l10n
+     * @param IConfig $config
+     * @param ISecureRandom $secureRandom
+     * @param string $defaultMailAddress
+     * @param IManager $encryptionManager
+     * @param IMailer $mailer
+     * @param ITimeFactory $timeFactory
+     * @param ICrypto $crypto
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IURLGenerator $urlGenerator,
+                                IUserManager $userManager,
+                                Defaults $defaults,
+                                IL10N $l10n,
+                                IConfig $config,
+                                ISecureRandom $secureRandom,
+                                $defaultMailAddress,
+                                IManager $encryptionManager,
+                                IMailer $mailer,
+                                ITimeFactory $timeFactory,
+                                ICrypto $crypto) {
+        parent::__construct($appName, $request);
+        $this->urlGenerator = $urlGenerator;
+        $this->userManager = $userManager;
+        $this->defaults = $defaults;
+        $this->l10n = $l10n;
+        $this->secureRandom = $secureRandom;
+        $this->from = $defaultMailAddress;
+        $this->encryptionManager = $encryptionManager;
+        $this->config = $config;
+        $this->mailer = $mailer;
+        $this->timeFactory = $timeFactory;
+        $this->crypto = $crypto;
+    }
+
+    /**
+     * Someone wants to reset their password:
+     *
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param string $token
+     * @param string $userId
+     * @return TemplateResponse
+     */
+    public function resetform($token, $userId) {
+        try {
+            $this->checkPasswordResetToken($token, $userId);
+        } catch (\Exception $e) {
+            return new TemplateResponse(
+                'core', 'error', [
+                    "errors" => array(array("error" => $e->getMessage()))
+                ],
+                'guest'
+            );
+        }
+
+        return new TemplateResponse(
+            'core',
+            'lostpassword/resetpassword',
+            array(
+                'link' => $this->urlGenerator->linkToRouteAbsolute('core.lost.setPassword', array('userId' => $userId, 'token' => $token)),
+            ),
+            'guest'
+        );
+    }
+
+    /**
+     * @param string $token
+     * @param string $userId
+     * @throws \Exception
+     */
+    protected function checkPasswordResetToken($token, $userId) {
+        $user = $this->userManager->get($userId);
+        if($user === null) {
+            throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
+        }
+
+        try {
+            $encryptedToken = $this->config->getUserValue($userId, 'core', 'lostpassword', null);
+            $mailAddress = !is_null($user->getEMailAddress()) ? $user->getEMailAddress() : '';
+            $decryptedToken = $this->crypto->decrypt($encryptedToken, $mailAddress.$this->config->getSystemValue('secret'));
+        } catch (\Exception $e) {
+            throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
+        }
+
+        $splittedToken = explode(':', $decryptedToken);
+        if(count($splittedToken) !== 2) {
+            throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
+        }
+
+        if ($splittedToken[0] < ($this->timeFactory->getTime() - 60*60*12) ||
+            $user->getLastLogin() > $splittedToken[0]) {
+            throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is expired'));
+        }
+
+        if (!hash_equals($splittedToken[1], $token)) {
+            throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
+        }
+    }
+
+    /**
+     * @param $message
+     * @param array $additional
+     * @return array
+     */
+    private function error($message, array $additional=array()) {
+        return array_merge(array('status' => 'error', 'msg' => $message), $additional);
+    }
+
+    /**
+     * @return array
+     */
+    private function success() {
+        return array('status'=>'success');
+    }
+
+    /**
+     * @PublicPage
+     * @BruteForceProtection(action=passwordResetEmail)
+     *
+     * @param string $user
+     * @return array
+     */
+    public function email($user){
+        // FIXME: use HTTP error codes
+        try {
+            $this->sendEmail($user);
+        } catch (\Exception $e){
+            return $this->error($e->getMessage());
+        }
+
+        return $this->success();
+    }
+
+    /**
+     * @PublicPage
+     * @param string $token
+     * @param string $userId
+     * @param string $password
+     * @param boolean $proceed
+     * @return array
+     */
+    public function setPassword($token, $userId, $password, $proceed) {
+        if ($this->encryptionManager->isEnabled() && !$proceed) {
+            return $this->error('', array('encryption' => true));
+        }
+
+        try {
+            $this->checkPasswordResetToken($token, $userId);
+            $user = $this->userManager->get($userId);
+
+            \OC_Hook::emit('\OC\Core\LostPassword\Controller\LostController', 'pre_passwordReset', array('uid' => $userId, 'password' => $password));
+
+            if (!$user->setPassword($password)) {
+                throw new \Exception();
+            }
+
+            \OC_Hook::emit('\OC\Core\LostPassword\Controller\LostController', 'post_passwordReset', array('uid' => $userId, 'password' => $password));
+
+            $this->config->deleteUserValue($userId, 'core', 'lostpassword');
+            @\OC_User::unsetMagicInCookie();
+        } catch (\Exception $e){
+            return $this->error($e->getMessage());
+        }
+
+        return $this->success();
+    }
+
+    /**
+     * @param string $input
+     * @throws \Exception
+     */
+    protected function sendEmail($input) {
+        $user = $this->findUserByIdOrMail($input);
+        $email = $user->getEMailAddress();
+
+        if (empty($email)) {
+            throw new \Exception(
+                $this->l10n->t('Could not send reset email because there is no email address for this username. Please contact your administrator.')
+            );
+        }
+
+        // Generate the token. It is stored encrypted in the database with the
+        // secret being the users' email address appended with the system secret.
+        // This makes the token automatically invalidate once the user changes
+        // their email address.
+        $token = $this->secureRandom->generate(
+            21,
+            ISecureRandom::CHAR_DIGITS.
+            ISecureRandom::CHAR_LOWER.
+            ISecureRandom::CHAR_UPPER
+        );
+        $tokenValue = $this->timeFactory->getTime() .':'. $token;
+        $encryptedValue = $this->crypto->encrypt($tokenValue, $email . $this->config->getSystemValue('secret'));
+        $this->config->setUserValue($user->getUID(), 'core', 'lostpassword', $encryptedValue);
+
+        $link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', array('userId' => $user->getUID(), 'token' => $token));
+
+        $emailTemplate = $this->mailer->createEMailTemplate();
+
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading($this->l10n->t('Password reset'));
+
+        $emailTemplate->addBodyText(
+            $this->l10n->t('Click the following button to reset your password. If you have not requested the password reset, then ignore this email.'),
+            $this->l10n->t('Click the following link to reset your password. If you have not requested the password reset, then ignore this email.')
+        );
+
+        $emailTemplate->addBodyButton(
+            $this->l10n->t('Reset your password'),
+            $link,
+            false
+        );
+        $emailTemplate->addFooter();
+
+        try {
+            $message = $this->mailer->createMessage();
+            $message->setTo([$email => $user->getUID()]);
+            $message->setSubject($this->l10n->t('%s password reset', [$this->defaults->getName()]));
+            $message->setPlainBody($emailTemplate->renderText());
+            $message->setHtmlBody($emailTemplate->renderHTML());
+            $message->setFrom([$this->from => $this->defaults->getName()]);
+            $this->mailer->send($message);
+        } catch (\Exception $e) {
+            throw new \Exception($this->l10n->t(
+                'Couldn\'t send reset email. Please contact your administrator.'
+            ));
+        }
+    }
+
+    /**
+     * @param string $input
+     * @return IUser
+     * @throws \Exception
+     */
+    protected function findUserByIdOrMail($input) {
+        $user = $this->userManager->get($input);
+        if ($user instanceof IUser) {
+            return $user;
+        }
+        $users = $this->userManager->getByEmail($input);
+        if (count($users) === 1) {
+            return $users[0];
+        }
+
+        throw new \InvalidArgumentException($this->l10n->t('Couldn\'t send reset email. Please make sure your username is correct.'));
+    }
 }

lib/private/Mail/EMailTemplate.php

Indentation +234 added lines, -234 removed lines

@@ -39,25 +39,25 @@ 
  * @package OC\Mail
  */
 class EMailTemplate implements IEMailTemplate {
-	/** @var Defaults */
-	protected $themingDefaults;
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-	/** @var IL10N */
-	protected $l10n;
-
-	/** @var string */
-	protected $htmlBody = '';
-	/** @var string */
-	protected $plainBody = '';
-	/** @var bool indicated if the footer is added */
-	protected $headerAdded = false;
-	/** @var bool indicated if the body is already opened */
-	protected $bodyOpened = false;
-	/** @var bool indicated if the footer is added */
-	protected $footerAdded = false;
-
-	protected $head = <<<EOF
+    /** @var Defaults */
+    protected $themingDefaults;
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+    /** @var IL10N */
+    protected $l10n;
+
+    /** @var string */
+    protected $htmlBody = '';
+    /** @var string */
+    protected $plainBody = '';
+    /** @var bool indicated if the footer is added */
+    protected $headerAdded = false;
+    /** @var bool indicated if the body is already opened */
+    protected $bodyOpened = false;
+    /** @var bool indicated if the footer is added */
+    protected $footerAdded = false;
+
+    protected $head = <<<EOF
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en" style="-webkit-font-smoothing:antialiased;background:#f3f3f3!important">
 <head>
@@ -75,7 +75,7 @@ 
 				<center data-parsed="" style="min-width:580px;width:100%">
 EOF;
 
-	protected $tail = <<<EOF
+    protected $tail = <<<EOF
 					</center>
 				</td>
 			</tr>
@@ -86,7 +86,7 @@ 
 </html>
 EOF;
 
-	protected $header = <<<EOF
+    protected $header = <<<EOF
 <table align="center" class="wrapper header float-center" style="Margin:0 auto;background:#8a8a8a;background-color:%s;border-collapse:collapse;border-spacing:0;float:none;margin:0 auto;padding:0;text-align:center;vertical-align:top;width:100%%">
 	<tr style="padding:0;text-align:left;vertical-align:top">
 		<td class="wrapper-inner" style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:20px;text-align:left;vertical-align:top;word-wrap:break-word">
@@ -119,7 +119,7 @@ 
 </table>
 EOF;
 
-	protected $heading = <<<EOF
+    protected $heading = <<<EOF
 <table align="center" class="container main-heading float-center" style="Margin:0 auto;background:0 0!important;border-collapse:collapse;border-spacing:0;float:none;margin:0 auto;padding:0;text-align:center;vertical-align:top;width:580px">
 	<tbody>
 	<tr style="padding:0;text-align:left;vertical-align:top">
@@ -138,7 +138,7 @@ 
 </table>
 EOF;
 
-	protected $bodyBegin = <<<EOF
+    protected $bodyBegin = <<<EOF
 <table align="center" class="wrapper content float-center" style="Margin:0 auto;border-collapse:collapse;border-spacing:0;float:none;margin:0 auto;padding:0;text-align:center;vertical-align:top;width:100%">
 	<tr style="padding:0;text-align:left;vertical-align:top">
 		<td class="wrapper-inner" style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word">
@@ -155,7 +155,7 @@ 
 						</table>
 EOF;
 
-	protected $bodyText = <<<EOF
+    protected $bodyText = <<<EOF
 <table class="row description" style="border-collapse:collapse;border-spacing:0;display:table;padding:0;position:relative;text-align:left;vertical-align:top;width:100%%">
 	<tbody>
 	<tr style="padding:0;text-align:left;vertical-align:top">
@@ -174,7 +174,7 @@ 
 </table>
 EOF;
 
-	protected $buttonGroup = <<<EOF
+    protected $buttonGroup = <<<EOF
 <table class="spacer" style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%%">
 	<tbody>
 	<tr style="padding:0;text-align:left;vertical-align:top">
@@ -227,7 +227,7 @@ 
 </table>
 EOF;
 
-	protected $button = <<<EOF
+    protected $button = <<<EOF
 <table class="spacer" style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%%">
 	<tbody>
 	<tr style="padding:0;text-align:left;vertical-align:top">
@@ -267,7 +267,7 @@ 
 </table>
 EOF;
 
-	protected $bodyEnd = <<<EOF
+    protected $bodyEnd = <<<EOF
 
 					</td>
 				</tr>
@@ -278,7 +278,7 @@ 
 </table>
 EOF;
 
-	protected $footer = <<<EOF
+    protected $footer = <<<EOF
 <table class="spacer float-center" style="Margin:0 auto;border-collapse:collapse;border-spacing:0;float:none;margin:0 auto;padding:0;text-align:center;vertical-align:top;width:100%%">
 	<tbody>
 	<tr style="padding:0;text-align:left;vertical-align:top">
@@ -304,210 +304,210 @@ 
 </table>
 EOF;
 
-	/**
-	 * @param Defaults $themingDefaults
-	 * @param IURLGenerator $urlGenerator
-	 * @param IL10N $l10n
-	 */
-	public function __construct(Defaults $themingDefaults,
-								IURLGenerator $urlGenerator,
-								IL10N $l10n) {
-		$this->themingDefaults = $themingDefaults;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-		$this->htmlBody .= $this->head;
-	}
-
-	/**
-	 * Adds a header to the email
-	 */
-	public function addHeader() {
-		if ($this->headerAdded) {
-			return;
-		}
-		$this->headerAdded = true;
-
-		$logoUrl = $this->urlGenerator->getAbsoluteURL($this->themingDefaults->getLogo());
-		$this->htmlBody .= vsprintf($this->header, [$this->themingDefaults->getColorPrimary(), $logoUrl, $this->themingDefaults->getName()]);
-	}
-
-	/**
-	 * Adds a heading to the email
-	 *
-	 * @param string $title
-	 * @param string $plainTitle|bool Title that is used in the plain text email
-	 *   if empty the $title is used, if false none will be used
-	 */
-	public function addHeading($title, $plainTitle = '') {
-		if ($this->footerAdded) {
-			return;
-		}
-		if ($plainTitle === '') {
-			$plainTitle = $title;
-		}
-
-		$this->htmlBody .= vsprintf($this->heading, [htmlspecialchars($title)]);
-		if ($plainTitle !== false) {
-			$this->plainBody .= $plainTitle . PHP_EOL . PHP_EOL;
-		}
-	}
-
-	/**
-	 * Adds a paragraph to the body of the email
-	 *
-	 * @param string $text
-	 * @param string|bool $plainText Text that is used in the plain text email
-	 *   if empty the $text is used, if false none will be used
-	 */
-	public function addBodyText($text, $plainText = '') {
-		if ($this->footerAdded) {
-			return;
-		}
-		if ($plainText === '') {
-			$plainText = $text;
-		}
-
-		if (!$this->bodyOpened) {
-			$this->htmlBody .= $this->bodyBegin;
-			$this->bodyOpened = true;
-		}
-
-		$this->htmlBody .= vsprintf($this->bodyText, [htmlspecialchars($text)]);
-		if ($plainText !== false) {
-			$this->plainBody .= $plainText . PHP_EOL . PHP_EOL;
-		}
-	}
-
-	/**
-	 * Adds a button group of two buttons to the body of the email
-	 *
-	 * @param string $textLeft Text of left button
-	 * @param string $urlLeft URL of left button
-	 * @param string $textRight Text of right button
-	 * @param string $urlRight URL of right button
-	 * @param string $plainTextLeft Text of left button that is used in the plain text version - if unset the $textLeft is used
-	 * @param string $plainTextRight Text of right button that is used in the plain text version - if unset the $textRight is used
-	 */
-	public function addBodyButtonGroup($textLeft,
-									   $urlLeft,
-									   $textRight,
-									   $urlRight,
-									   $plainTextLeft = '',
-									   $plainTextRight = '') {
-		if ($this->footerAdded) {
-			return;
-		}
-		if ($plainTextLeft === '') {
-			$plainTextLeft = $textLeft;
-		}
-
-		if ($plainTextRight === '') {
-			$plainTextRight = $textRight;
-		}
-
-		if (!$this->bodyOpened) {
-			$this->htmlBody .= $this->bodyBegin;
-			$this->bodyOpened = true;
-		}
-
-		$color = $this->themingDefaults->getColorPrimary();
-
-		$this->htmlBody .= vsprintf($this->buttonGroup, [$color, $color, $urlLeft, $color, htmlspecialchars($textLeft), $urlRight, htmlspecialchars($textRight)]);
-		$this->plainBody .= $plainTextLeft . ': ' . $urlLeft . PHP_EOL;
-		$this->plainBody .= $plainTextRight . ': ' . $urlRight . PHP_EOL . PHP_EOL;
-
-	}
-
-	/**
-	 * Adds a button to the body of the email
-	 *
-	 * @param string $text Text of button
-	 * @param string $url URL of button
-	 * @param string $plainText Text of button in plain text version
-	 * 		if empty the $text is used, if false none will be used
-	 *
-	 * @since 12.0.0
-	 */
-	public function addBodyButton($text, $url, $plainText = '') {
-		if ($this->footerAdded) {
-			return;
-		}
-
-		if (!$this->bodyOpened) {
-			$this->htmlBody .= $this->bodyBegin;
-			$this->bodyOpened = true;
-		}
-
-		if ($plainText === '') {
-			$plainText = $text;
-		}
-
-		$color = $this->themingDefaults->getColorPrimary();
-		$this->htmlBody .= vsprintf($this->button, [$color, $color, $url, $color, htmlspecialchars($text)]);
-
-		if ($plainText !== false) {
-			$this->plainBody .= $plainText . ': ';
-		}
-
-		$this->plainBody .=  $url . PHP_EOL;
-
-	}
-
-	/**
-	 * Adds a logo and a text to the footer. <br> in the text will be replaced by new lines in the plain text email
-	 *
-	 * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically generated email" will be used
-	 */
-	public function addFooter($text = '') {
-		if($text === '') {
-			$text = $this->themingDefaults->getName() . ' - ' . $this->themingDefaults->getSlogan() . '<br>' . $this->l10n->t('This is an automatically generated email, please do not reply.');
-		}
-
-		if ($this->footerAdded) {
-			return;
-		}
-		$this->footerAdded = true;
-
-		if ($this->bodyOpened) {
-			$this->htmlBody .= $this->bodyEnd;
-			$this->bodyOpened = false;
-		}
-
-		$this->htmlBody .= vsprintf($this->footer, [$text]);
-		$this->htmlBody .= $this->tail;
-		$this->plainBody .= PHP_EOL . '-- ' . PHP_EOL;
-		$this->plainBody .= str_replace('<br>', PHP_EOL, $text);
-	}
-
-	/**
-	 * Returns the rendered HTML email as string
-	 *
-	 * @return string
-	 */
-	public function renderHTML() {
-		if (!$this->footerAdded) {
-			$this->footerAdded = true;
-			if ($this->bodyOpened) {
-				$this->htmlBody .= $this->bodyEnd;
-			}
-			$this->htmlBody .= $this->tail;
-		}
-		return $this->htmlBody;
-	}
-
-	/**
-	 * Returns the rendered plain text email as string
-	 *
-	 * @return string
-	 */
-	public function renderText() {
-		if (!$this->footerAdded) {
-			$this->footerAdded = true;
-			if ($this->bodyOpened) {
-				$this->htmlBody .= $this->bodyEnd;
-			}
-			$this->htmlBody .= $this->tail;
-		}
-		return $this->plainBody;
-	}
+    /**
+     * @param Defaults $themingDefaults
+     * @param IURLGenerator $urlGenerator
+     * @param IL10N $l10n
+     */
+    public function __construct(Defaults $themingDefaults,
+                                IURLGenerator $urlGenerator,
+                                IL10N $l10n) {
+        $this->themingDefaults = $themingDefaults;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+        $this->htmlBody .= $this->head;
+    }
+
+    /**
+     * Adds a header to the email
+     */
+    public function addHeader() {
+        if ($this->headerAdded) {
+            return;
+        }
+        $this->headerAdded = true;
+
+        $logoUrl = $this->urlGenerator->getAbsoluteURL($this->themingDefaults->getLogo());
+        $this->htmlBody .= vsprintf($this->header, [$this->themingDefaults->getColorPrimary(), $logoUrl, $this->themingDefaults->getName()]);
+    }
+
+    /**
+     * Adds a heading to the email
+     *
+     * @param string $title
+     * @param string $plainTitle|bool Title that is used in the plain text email
+     *   if empty the $title is used, if false none will be used
+     */
+    public function addHeading($title, $plainTitle = '') {
+        if ($this->footerAdded) {
+            return;
+        }
+        if ($plainTitle === '') {
+            $plainTitle = $title;
+        }
+
+        $this->htmlBody .= vsprintf($this->heading, [htmlspecialchars($title)]);
+        if ($plainTitle !== false) {
+            $this->plainBody .= $plainTitle . PHP_EOL . PHP_EOL;
+        }
+    }
+
+    /**
+     * Adds a paragraph to the body of the email
+     *
+     * @param string $text
+     * @param string|bool $plainText Text that is used in the plain text email
+     *   if empty the $text is used, if false none will be used
+     */
+    public function addBodyText($text, $plainText = '') {
+        if ($this->footerAdded) {
+            return;
+        }
+        if ($plainText === '') {
+            $plainText = $text;
+        }
+
+        if (!$this->bodyOpened) {
+            $this->htmlBody .= $this->bodyBegin;
+            $this->bodyOpened = true;
+        }
+
+        $this->htmlBody .= vsprintf($this->bodyText, [htmlspecialchars($text)]);
+        if ($plainText !== false) {
+            $this->plainBody .= $plainText . PHP_EOL . PHP_EOL;
+        }
+    }
+
+    /**
+     * Adds a button group of two buttons to the body of the email
+     *
+     * @param string $textLeft Text of left button
+     * @param string $urlLeft URL of left button
+     * @param string $textRight Text of right button
+     * @param string $urlRight URL of right button
+     * @param string $plainTextLeft Text of left button that is used in the plain text version - if unset the $textLeft is used
+     * @param string $plainTextRight Text of right button that is used in the plain text version - if unset the $textRight is used
+     */
+    public function addBodyButtonGroup($textLeft,
+                                        $urlLeft,
+                                        $textRight,
+                                        $urlRight,
+                                        $plainTextLeft = '',
+                                        $plainTextRight = '') {
+        if ($this->footerAdded) {
+            return;
+        }
+        if ($plainTextLeft === '') {
+            $plainTextLeft = $textLeft;
+        }
+
+        if ($plainTextRight === '') {
+            $plainTextRight = $textRight;
+        }
+
+        if (!$this->bodyOpened) {
+            $this->htmlBody .= $this->bodyBegin;
+            $this->bodyOpened = true;
+        }
+
+        $color = $this->themingDefaults->getColorPrimary();
+
+        $this->htmlBody .= vsprintf($this->buttonGroup, [$color, $color, $urlLeft, $color, htmlspecialchars($textLeft), $urlRight, htmlspecialchars($textRight)]);
+        $this->plainBody .= $plainTextLeft . ': ' . $urlLeft . PHP_EOL;
+        $this->plainBody .= $plainTextRight . ': ' . $urlRight . PHP_EOL . PHP_EOL;
+
+    }
+
+    /**
+     * Adds a button to the body of the email
+     *
+     * @param string $text Text of button
+     * @param string $url URL of button
+     * @param string $plainText Text of button in plain text version
+     * 		if empty the $text is used, if false none will be used
+     *
+     * @since 12.0.0
+     */
+    public function addBodyButton($text, $url, $plainText = '') {
+        if ($this->footerAdded) {
+            return;
+        }
+
+        if (!$this->bodyOpened) {
+            $this->htmlBody .= $this->bodyBegin;
+            $this->bodyOpened = true;
+        }
+
+        if ($plainText === '') {
+            $plainText = $text;
+        }
+
+        $color = $this->themingDefaults->getColorPrimary();
+        $this->htmlBody .= vsprintf($this->button, [$color, $color, $url, $color, htmlspecialchars($text)]);
+
+        if ($plainText !== false) {
+            $this->plainBody .= $plainText . ': ';
+        }
+
+        $this->plainBody .=  $url . PHP_EOL;
+
+    }
+
+    /**
+     * Adds a logo and a text to the footer. <br> in the text will be replaced by new lines in the plain text email
+     *
+     * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically generated email" will be used
+     */
+    public function addFooter($text = '') {
+        if($text === '') {
+            $text = $this->themingDefaults->getName() . ' - ' . $this->themingDefaults->getSlogan() . '<br>' . $this->l10n->t('This is an automatically generated email, please do not reply.');
+        }
+
+        if ($this->footerAdded) {
+            return;
+        }
+        $this->footerAdded = true;
+
+        if ($this->bodyOpened) {
+            $this->htmlBody .= $this->bodyEnd;
+            $this->bodyOpened = false;
+        }
+
+        $this->htmlBody .= vsprintf($this->footer, [$text]);
+        $this->htmlBody .= $this->tail;
+        $this->plainBody .= PHP_EOL . '-- ' . PHP_EOL;
+        $this->plainBody .= str_replace('<br>', PHP_EOL, $text);
+    }
+
+    /**
+     * Returns the rendered HTML email as string
+     *
+     * @return string
+     */
+    public function renderHTML() {
+        if (!$this->footerAdded) {
+            $this->footerAdded = true;
+            if ($this->bodyOpened) {
+                $this->htmlBody .= $this->bodyEnd;
+            }
+            $this->htmlBody .= $this->tail;
+        }
+        return $this->htmlBody;
+    }
+
+    /**
+     * Returns the rendered plain text email as string
+     *
+     * @return string
+     */
+    public function renderText() {
+        if (!$this->footerAdded) {
+            $this->footerAdded = true;
+            if ($this->bodyOpened) {
+                $this->htmlBody .= $this->bodyEnd;
+            }
+            $this->htmlBody .= $this->tail;
+        }
+        return $this->plainBody;
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -348,7 +348,7 @@ 
 
 		$this->htmlBody .= vsprintf($this->heading, [htmlspecialchars($title)]);
 		if ($plainTitle !== false) {
-			$this->plainBody .= $plainTitle . PHP_EOL . PHP_EOL;
+			$this->plainBody .= $plainTitle.PHP_EOL.PHP_EOL;
 		}
 	}
 
@@ -374,7 +374,7 @@ 
 
 		$this->htmlBody .= vsprintf($this->bodyText, [htmlspecialchars($text)]);
 		if ($plainText !== false) {
-			$this->plainBody .= $plainText . PHP_EOL . PHP_EOL;
+			$this->plainBody .= $plainText.PHP_EOL.PHP_EOL;
 		}
 	}
 
@@ -413,8 +413,8 @@ 
 		$color = $this->themingDefaults->getColorPrimary();
 
 		$this->htmlBody .= vsprintf($this->buttonGroup, [$color, $color, $urlLeft, $color, htmlspecialchars($textLeft), $urlRight, htmlspecialchars($textRight)]);
-		$this->plainBody .= $plainTextLeft . ': ' . $urlLeft . PHP_EOL;
-		$this->plainBody .= $plainTextRight . ': ' . $urlRight . PHP_EOL . PHP_EOL;
+		$this->plainBody .= $plainTextLeft.': '.$urlLeft.PHP_EOL;
+		$this->plainBody .= $plainTextRight.': '.$urlRight.PHP_EOL.PHP_EOL;
 
 	}
 
@@ -446,10 +446,10 @@ 
 		$this->htmlBody .= vsprintf($this->button, [$color, $color, $url, $color, htmlspecialchars($text)]);
 
 		if ($plainText !== false) {
-			$this->plainBody .= $plainText . ': ';
+			$this->plainBody .= $plainText.': ';
 		}
 
-		$this->plainBody .=  $url . PHP_EOL;
+		$this->plainBody .= $url.PHP_EOL;
 
 	}
 
@@ -459,8 +459,8 @@ 
 	 * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically generated email" will be used
 	 */
 	public function addFooter($text = '') {
-		if($text === '') {
-			$text = $this->themingDefaults->getName() . ' - ' . $this->themingDefaults->getSlogan() . '<br>' . $this->l10n->t('This is an automatically generated email, please do not reply.');
+		if ($text === '') {
+			$text = $this->themingDefaults->getName().' - '.$this->themingDefaults->getSlogan().'<br>'.$this->l10n->t('This is an automatically generated email, please do not reply.');
 		}
 
 		if ($this->footerAdded) {
@@ -475,7 +475,7 @@ 
 
 		$this->htmlBody .= vsprintf($this->footer, [$text]);
 		$this->htmlBody .= $this->tail;
-		$this->plainBody .= PHP_EOL . '-- ' . PHP_EOL;
+		$this->plainBody .= PHP_EOL.'-- '.PHP_EOL;
 		$this->plainBody .= str_replace('<br>', PHP_EOL, $text);
 	}