nextcloud / server

settings/Mailer/NewUserMailHelper.php

Indentation +123 added lines, -123 removed lines

@@ -39,135 +39,135 @@
 use OCP\Security\ISecureRandom;
 
 class NewUserMailHelper {
-	/** @var Defaults */
-	private $themingDefaults;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var IMailer */
-	private $mailer;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var IConfig */
-	private $config;
-	/** @var ICrypto */
-	private $crypto;
-	/** @var string */
-	private $fromAddress;
+    /** @var Defaults */
+    private $themingDefaults;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IFactory */
+    private $l10nFactory;
+    /** @var IMailer */
+    private $mailer;
+    /** @var ISecureRandom */
+    private $secureRandom;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var IConfig */
+    private $config;
+    /** @var ICrypto */
+    private $crypto;
+    /** @var string */
+    private $fromAddress;
 
-	/**
-	 * @param Defaults $themingDefaults
-	 * @param IURLGenerator $urlGenerator
-	 * @param IFactory $l10nFactory
-	 * @param IMailer $mailer
-	 * @param ISecureRandom $secureRandom
-	 * @param ITimeFactory $timeFactory
-	 * @param IConfig $config
-	 * @param ICrypto $crypto
-	 * @param string $fromAddress
-	 */
-	public function __construct(Defaults $themingDefaults,
-								IURLGenerator $urlGenerator,
-								IFactory $l10nFactory,
-								IMailer $mailer,
-								ISecureRandom $secureRandom,
-								ITimeFactory $timeFactory,
-								IConfig $config,
-								ICrypto $crypto,
-								$fromAddress) {
-		$this->themingDefaults = $themingDefaults;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10nFactory = $l10nFactory;
-		$this->mailer = $mailer;
-		$this->secureRandom = $secureRandom;
-		$this->timeFactory = $timeFactory;
-		$this->config = $config;
-		$this->crypto = $crypto;
-		$this->fromAddress = $fromAddress;
-	}
+    /**
+     * @param Defaults $themingDefaults
+     * @param IURLGenerator $urlGenerator
+     * @param IFactory $l10nFactory
+     * @param IMailer $mailer
+     * @param ISecureRandom $secureRandom
+     * @param ITimeFactory $timeFactory
+     * @param IConfig $config
+     * @param ICrypto $crypto
+     * @param string $fromAddress
+     */
+    public function __construct(Defaults $themingDefaults,
+                                IURLGenerator $urlGenerator,
+                                IFactory $l10nFactory,
+                                IMailer $mailer,
+                                ISecureRandom $secureRandom,
+                                ITimeFactory $timeFactory,
+                                IConfig $config,
+                                ICrypto $crypto,
+                                $fromAddress) {
+        $this->themingDefaults = $themingDefaults;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10nFactory = $l10nFactory;
+        $this->mailer = $mailer;
+        $this->secureRandom = $secureRandom;
+        $this->timeFactory = $timeFactory;
+        $this->config = $config;
+        $this->crypto = $crypto;
+        $this->fromAddress = $fromAddress;
+    }
 
-	/**
-	 * @param IUser $user
-	 * @param bool $generatePasswordResetToken
-	 * @return IEMailTemplate
-	 */
-	public function generateTemplate(IUser $user, $generatePasswordResetToken = false) {
-		$userId = $user->getUID();
-		$lang = $this->config->getUserValue($userId, 'core', 'lang', 'en');
-		if (!$this->l10nFactory->languageExists('settings', $lang)) {
-			$lang = 'en';
-		}
+    /**
+     * @param IUser $user
+     * @param bool $generatePasswordResetToken
+     * @return IEMailTemplate
+     */
+    public function generateTemplate(IUser $user, $generatePasswordResetToken = false) {
+        $userId = $user->getUID();
+        $lang = $this->config->getUserValue($userId, 'core', 'lang', 'en');
+        if (!$this->l10nFactory->languageExists('settings', $lang)) {
+            $lang = 'en';
+        }
 
-		$l10n = $this->l10nFactory->get('settings', $lang);
+        $l10n = $this->l10nFactory->get('settings', $lang);
 
-		if ($generatePasswordResetToken) {
-			$token = $this->secureRandom->generate(
-				21,
-				ISecureRandom::CHAR_DIGITS .
-				ISecureRandom::CHAR_LOWER .
-				ISecureRandom::CHAR_UPPER
-			);
-			$tokenValue = $this->timeFactory->getTime() . ':' . $token;
-			$mailAddress = (null !== $user->getEMailAddress()) ? $user->getEMailAddress() : '';
-			$encryptedValue = $this->crypto->encrypt($tokenValue, $mailAddress . $this->config->getSystemValue('secret'));
-			$this->config->setUserValue($user->getUID(), 'core', 'lostpassword', $encryptedValue);
-			$link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', ['userId' => $user->getUID(), 'token' => $token]);
-		} else {
-			$link = $this->urlGenerator->getAbsoluteURL('/');
-		}
-		$displayName = $user->getDisplayName();
+        if ($generatePasswordResetToken) {
+            $token = $this->secureRandom->generate(
+                21,
+                ISecureRandom::CHAR_DIGITS .
+                ISecureRandom::CHAR_LOWER .
+                ISecureRandom::CHAR_UPPER
+            );
+            $tokenValue = $this->timeFactory->getTime() . ':' . $token;
+            $mailAddress = (null !== $user->getEMailAddress()) ? $user->getEMailAddress() : '';
+            $encryptedValue = $this->crypto->encrypt($tokenValue, $mailAddress . $this->config->getSystemValue('secret'));
+            $this->config->setUserValue($user->getUID(), 'core', 'lostpassword', $encryptedValue);
+            $link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', ['userId' => $user->getUID(), 'token' => $token]);
+        } else {
+            $link = $this->urlGenerator->getAbsoluteURL('/');
+        }
+        $displayName = $user->getDisplayName();
 
-		$emailTemplate = $this->mailer->createEMailTemplate('settings.Welcome', [
-			'link' => $link,
-			'displayname' => $displayName,
-			'userid' => $userId,
-			'instancename' => $this->themingDefaults->getName(),
-			'resetTokenGenerated' => $generatePasswordResetToken,
-		]);
+        $emailTemplate = $this->mailer->createEMailTemplate('settings.Welcome', [
+            'link' => $link,
+            'displayname' => $displayName,
+            'userid' => $userId,
+            'instancename' => $this->themingDefaults->getName(),
+            'resetTokenGenerated' => $generatePasswordResetToken,
+        ]);
 
-		$emailTemplate->setSubject($l10n->t('Your %s account was created', [$this->themingDefaults->getName()]));
-		$emailTemplate->addHeader();
-		if ($displayName === $userId) {
-			$emailTemplate->addHeading($l10n->t('Welcome aboard'));
-		} else {
-			$emailTemplate->addHeading($l10n->t('Welcome aboard %s', [$displayName]));
-		}
-		$emailTemplate->addBodyText($l10n->t('Welcome to your %s account, you can add, protect, and share your data.', [$this->themingDefaults->getName()]));
-		if($user->getBackendClassName() !== 'LDAP') {
-			$emailTemplate->addBodyText($l10n->t('Your username is: %s', [$userId]));
-		}
-		if ($generatePasswordResetToken) {
-			$leftButtonText = $l10n->t('Set your password');
-		} else {
-			$leftButtonText = $l10n->t('Go to %s', [$this->themingDefaults->getName()]);
-		}
-		$emailTemplate->addBodyButtonGroup(
-			$leftButtonText,
-			$link,
-			$l10n->t('Install Client'),
-			'https://nextcloud.com/install/#install-clients'
-		);
-		$emailTemplate->addFooter();
+        $emailTemplate->setSubject($l10n->t('Your %s account was created', [$this->themingDefaults->getName()]));
+        $emailTemplate->addHeader();
+        if ($displayName === $userId) {
+            $emailTemplate->addHeading($l10n->t('Welcome aboard'));
+        } else {
+            $emailTemplate->addHeading($l10n->t('Welcome aboard %s', [$displayName]));
+        }
+        $emailTemplate->addBodyText($l10n->t('Welcome to your %s account, you can add, protect, and share your data.', [$this->themingDefaults->getName()]));
+        if($user->getBackendClassName() !== 'LDAP') {
+            $emailTemplate->addBodyText($l10n->t('Your username is: %s', [$userId]));
+        }
+        if ($generatePasswordResetToken) {
+            $leftButtonText = $l10n->t('Set your password');
+        } else {
+            $leftButtonText = $l10n->t('Go to %s', [$this->themingDefaults->getName()]);
+        }
+        $emailTemplate->addBodyButtonGroup(
+            $leftButtonText,
+            $link,
+            $l10n->t('Install Client'),
+            'https://nextcloud.com/install/#install-clients'
+        );
+        $emailTemplate->addFooter();
 
-		return $emailTemplate;
-	}
+        return $emailTemplate;
+    }
 
-	/**
-	 * Sends a welcome mail to $user
-	 *
-	 * @param IUser $user
-	 * @param IEmailTemplate $emailTemplate
-	 * @throws \Exception If mail could not be sent
-	 */
-	public function sendMail(IUser $user,
-							 IEMailTemplate $emailTemplate) {
-		$message = $this->mailer->createMessage();
-		$message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
-		$message->setFrom([$this->fromAddress => $this->themingDefaults->getName()]);
-		$message->useTemplate($emailTemplate);
-		$this->mailer->send($message);
-	}
+    /**
+     * Sends a welcome mail to $user
+     *
+     * @param IUser $user
+     * @param IEmailTemplate $emailTemplate
+     * @throws \Exception If mail could not be sent
+     */
+    public function sendMail(IUser $user,
+                                IEMailTemplate $emailTemplate) {
+        $message = $this->mailer->createMessage();
+        $message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
+        $message->setFrom([$this->fromAddress => $this->themingDefaults->getName()]);
+        $message->useTemplate($emailTemplate);
+        $this->mailer->send($message);
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -106,13 +106,13 @@ 
 		if ($generatePasswordResetToken) {
 			$token = $this->secureRandom->generate(
 				21,
-				ISecureRandom::CHAR_DIGITS .
-				ISecureRandom::CHAR_LOWER .
+				ISecureRandom::CHAR_DIGITS.
+				ISecureRandom::CHAR_LOWER.
 				ISecureRandom::CHAR_UPPER
 			);
-			$tokenValue = $this->timeFactory->getTime() . ':' . $token;
+			$tokenValue = $this->timeFactory->getTime().':'.$token;
 			$mailAddress = (null !== $user->getEMailAddress()) ? $user->getEMailAddress() : '';
-			$encryptedValue = $this->crypto->encrypt($tokenValue, $mailAddress . $this->config->getSystemValue('secret'));
+			$encryptedValue = $this->crypto->encrypt($tokenValue, $mailAddress.$this->config->getSystemValue('secret'));
 			$this->config->setUserValue($user->getUID(), 'core', 'lostpassword', $encryptedValue);
 			$link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', ['userId' => $user->getUID(), 'token' => $token]);
 		} else {
@@ -136,7 +136,7 @@ 
 			$emailTemplate->addHeading($l10n->t('Welcome aboard %s', [$displayName]));
 		}
 		$emailTemplate->addBodyText($l10n->t('Welcome to your %s account, you can add, protect, and share your data.', [$this->themingDefaults->getName()]));
-		if($user->getBackendClassName() !== 'LDAP') {
+		if ($user->getBackendClassName() !== 'LDAP') {
 			$emailTemplate->addBodyText($l10n->t('Your username is: %s', [$userId]));
 		}
 		if ($generatePasswordResetToken) {