nextcloud / server

lib/private/Lockdown/LockdownManager.php

Indentation +43 added lines, -43 removed lines

@@ -24,56 +24,56 @@
 use OCP\Lockdown\ILockdownManager;
 
 class LockdownManager implements ILockdownManager {
-	/** @var ISession */
-	private $sessionCallback;
+    /** @var ISession */
+    private $sessionCallback;
 
-	private $enabled = false;
+    private $enabled = false;
 
-	/** @var array|null */
-	private $scope;
+    /** @var array|null */
+    private $scope;
 
-	/**
-	 * LockdownManager constructor.
-	 *
-	 * @param callable $sessionCallback we need to inject the session lazily to avoid dependency loops
-	 */
-	public function __construct(callable $sessionCallback) {
-		$this->sessionCallback = $sessionCallback;
-	}
+    /**
+     * LockdownManager constructor.
+     *
+     * @param callable $sessionCallback we need to inject the session lazily to avoid dependency loops
+     */
+    public function __construct(callable $sessionCallback) {
+        $this->sessionCallback = $sessionCallback;
+    }
 
 
-	public function enable() {
-		$this->enabled = true;
-	}
+    public function enable() {
+        $this->enabled = true;
+    }
 
-	/**
-	 * @return ISession
-	 */
-	private function getSession() {
-		$callback = $this->sessionCallback;
-		return $callback();
-	}
+    /**
+     * @return ISession
+     */
+    private function getSession() {
+        $callback = $this->sessionCallback;
+        return $callback();
+    }
 
-	private function getScopeAsArray() {
-		if (!$this->scope) {
-			$session = $this->getSession();
-			$sessionScope = $session->get('token_scope');
-			if ($sessionScope) {
-				$this->scope = $sessionScope;
-			}
-		}
-		return $this->scope;
-	}
+    private function getScopeAsArray() {
+        if (!$this->scope) {
+            $session = $this->getSession();
+            $sessionScope = $session->get('token_scope');
+            if ($sessionScope) {
+                $this->scope = $sessionScope;
+            }
+        }
+        return $this->scope;
+    }
 
-	public function setToken(IToken $token) {
-		$this->scope = $token->getScopeAsArray();
-		$session = $this->getSession();
-		$session->set('token_scope', $this->scope);
-		$this->enable();
-	}
+    public function setToken(IToken $token) {
+        $this->scope = $token->getScopeAsArray();
+        $session = $this->getSession();
+        $session->set('token_scope', $this->scope);
+        $this->enable();
+    }
 
-	public function canAccessFilesystem() {
-		$scope = $this->getScopeAsArray();
-		return !$scope || $scope['filesystem'];
-	}
+    public function canAccessFilesystem() {
+        $scope = $this->getScopeAsArray();
+        return !$scope || $scope['filesystem'];
+    }
 }

apps/user_ldap/lib/Controller/RenewPasswordController.php

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
 	 * @return TemplateResponse|RedirectResponse
 	 */
 	public function showRenewPasswordForm($user) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+		if ($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
 			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
 		}
 		$parameters = [];
@@ -129,7 +129,7 @@ 
 	 * @return RedirectResponse
 	 */
 	public function tryRenewPassword($user, $oldPassword, $newPassword) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+		if ($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
 			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
 		}
 		$args = !is_null($user) ? ['user' => $user] : [];

Indentation +129 added lines, -129 removed lines

@@ -37,144 +37,144 @@
 use OCP\IUserManager;
 
 class RenewPasswordController extends Controller {
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IConfig */
-	private $config;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var ISession */
-	private $session;
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IConfig */
+    private $config;
+    /** @var IL10N */
+    protected $l10n;
+    /** @var ISession */
+    private $session;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param IURLGenerator $urlGenerator
-	 */
-	function __construct($appName, IRequest $request, IUserManager $userManager, 
-		IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) {
-		parent::__construct($appName, $request);
-		$this->userManager = $userManager;
-		$this->config = $config;
-		$this->l10n = $l10n;
-		$this->session = $session;
-		$this->urlGenerator = $urlGenerator;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param IURLGenerator $urlGenerator
+     */
+    function __construct($appName, IRequest $request, IUserManager $userManager, 
+        IConfig $config, IL10N $l10n, ISession $session, IURLGenerator $urlGenerator) {
+        parent::__construct($appName, $request);
+        $this->userManager = $userManager;
+        $this->config = $config;
+        $this->l10n = $l10n;
+        $this->session = $session;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @return RedirectResponse
-	 */
-	public function cancel() {
-		return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @return RedirectResponse
+     */
+    public function cancel() {
+        return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @UseSession
-	 *
-	 * @param string $user
-	 *
-	 * @return TemplateResponse|RedirectResponse
-	 */
-	public function showRenewPasswordForm($user) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
-			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-		}
-		$parameters = [];
-		$renewPasswordMessages = $this->session->get('renewPasswordMessages');
-		$errors = [];
-		$messages = [];
-		if (is_array($renewPasswordMessages)) {
-			list($errors, $messages) = $renewPasswordMessages;
-		}
-		$this->session->remove('renewPasswordMessages');
-		foreach ($errors as $value) {
-			$parameters[$value] = true;
-		}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @UseSession
+     *
+     * @param string $user
+     *
+     * @return TemplateResponse|RedirectResponse
+     */
+    public function showRenewPasswordForm($user) {
+        if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+            return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+        }
+        $parameters = [];
+        $renewPasswordMessages = $this->session->get('renewPasswordMessages');
+        $errors = [];
+        $messages = [];
+        if (is_array($renewPasswordMessages)) {
+            list($errors, $messages) = $renewPasswordMessages;
+        }
+        $this->session->remove('renewPasswordMessages');
+        foreach ($errors as $value) {
+            $parameters[$value] = true;
+        }
 
-		$parameters['messages'] = $messages;
-		$parameters['user'] = $user;
+        $parameters['messages'] = $messages;
+        $parameters['user'] = $user;
 
-		$parameters['canResetPassword'] = true;
-		$parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', '');
-		if (!$parameters['resetPasswordLink']) {
-			$userObj = $this->userManager->get($user);
-			if ($userObj instanceof IUser) {
-				$parameters['canResetPassword'] = $userObj->canChangePassword();
-			}
-		}
-		$parameters['cancelLink'] = $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm');
+        $parameters['canResetPassword'] = true;
+        $parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', '');
+        if (!$parameters['resetPasswordLink']) {
+            $userObj = $this->userManager->get($user);
+            if ($userObj instanceof IUser) {
+                $parameters['canResetPassword'] = $userObj->canChangePassword();
+            }
+        }
+        $parameters['cancelLink'] = $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm');
 
-		return new TemplateResponse(
-			$this->appName, 'renewpassword', $parameters, 'guest'
-		);
-	}
+        return new TemplateResponse(
+            $this->appName, 'renewpassword', $parameters, 'guest'
+        );
+    }
 
-	/**
-	 * @PublicPage
-	 * @UseSession
-	 *
-	 * @param string $user
-	 * @param string $oldPassword
-	 * @param string $newPassword
-	 *
-	 * @return RedirectResponse
-	 */
-	public function tryRenewPassword($user, $oldPassword, $newPassword) {
-		if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
-			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-		}
-		$args = !is_null($user) ? ['user' => $user] : [];
-		$loginResult = $this->userManager->checkPassword($user, $oldPassword);
-		if ($loginResult === false) {
-			$this->session->set('renewPasswordMessages', [
-				['invalidpassword'], []
-			]);
-			return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
-		}
+    /**
+     * @PublicPage
+     * @UseSession
+     *
+     * @param string $user
+     * @param string $oldPassword
+     * @param string $newPassword
+     *
+     * @return RedirectResponse
+     */
+    public function tryRenewPassword($user, $oldPassword, $newPassword) {
+        if($this->config->getUserValue($user, 'user_ldap', 'needsPasswordReset') !== 'true') {
+            return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+        }
+        $args = !is_null($user) ? ['user' => $user] : [];
+        $loginResult = $this->userManager->checkPassword($user, $oldPassword);
+        if ($loginResult === false) {
+            $this->session->set('renewPasswordMessages', [
+                ['invalidpassword'], []
+            ]);
+            return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
+        }
 		
-		try {
-			if (!is_null($newPassword) && \OC_User::setPassword($user, $newPassword)) {
-				$this->session->set('loginMessages', [
-					[], [$this->l10n->t("Please login with the new password")]
-				]);
-				$this->config->setUserValue($user, 'user_ldap', 'needsPasswordReset', 'false');
-				return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
-			} else {
-				$this->session->set('renewPasswordMessages', [
-					['internalexception'], []
-				]);
-			}
-		} catch (HintException $e) {
-			$this->session->set('renewPasswordMessages', [
-				[], [$e->getHint()]
-			]);
-		}
+        try {
+            if (!is_null($newPassword) && \OC_User::setPassword($user, $newPassword)) {
+                $this->session->set('loginMessages', [
+                    [], [$this->l10n->t("Please login with the new password")]
+                ]);
+                $this->config->setUserValue($user, 'user_ldap', 'needsPasswordReset', 'false');
+                return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
+            } else {
+                $this->session->set('renewPasswordMessages', [
+                    ['internalexception'], []
+                ]);
+            }
+        } catch (HintException $e) {
+            $this->session->set('renewPasswordMessages', [
+                [], [$e->getHint()]
+            ]);
+        }
 
-		return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
-	}
+        return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @UseSession
-	 *
-	 * @return RedirectResponse
-	 */
-	public function showLoginFormInvalidPassword($user) {
-		$args = !is_null($user) ? ['user' => $user] : [];
-		$this->session->set('loginMessages', [
-			['invalidpassword'], []
-		]);
-		return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @UseSession
+     *
+     * @return RedirectResponse
+     */
+    public function showLoginFormInvalidPassword($user) {
+        $args = !is_null($user) ? ['user' => $user] : [];
+        $this->session->set('loginMessages', [
+            ['invalidpassword'], []
+        ]);
+        return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
+    }
 
 }

settings/Mailer/NewUserMailHelper.php

Spacing +4 added lines, -4 removed lines

@@ -102,13 +102,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 {

Indentation +121 added lines, -121 removed lines

@@ -39,133 +39,133 @@
 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()]));
-		$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()]));
+        $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);
+    }
 }

apps/dav/lib/CalDAV/PublicCalendarObject.php

Indentation +7 added lines, -7 removed lines

@@ -23,11 +23,11 @@
 
 class PublicCalendarObject extends CalendarObject {
 
-	/**
-	 * public calendars are always shared
-	 * @return bool
-	 */
-	protected function isShared() {
-		return true;
-	}
+    /**
+     * public calendars are always shared
+     * @return bool
+     */
+    protected function isShared() {
+        return true;
+    }
 }
\ No newline at end of file

apps/dav/lib/CalDAV/PublicCalendar.php

Indentation +54 added lines, -54 removed lines

@@ -25,63 +25,63 @@
 
 class PublicCalendar extends Calendar {
 
-	/**
-	 * @param string $name
-	 * @throws NotFound
-	 * @return PublicCalendarObject
-	 */
-	public function getChild($name) {
-		$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
+    /**
+     * @param string $name
+     * @throws NotFound
+     * @return PublicCalendarObject
+     */
+    public function getChild($name) {
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
 
-		if (!$obj) {
-			throw new NotFound('Calendar object not found');
-		}
-		if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
-			throw new NotFound('Calendar object not found');
-		}
-		$obj['acl'] = $this->getChildACL();
+        if (!$obj) {
+            throw new NotFound('Calendar object not found');
+        }
+        if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
+            throw new NotFound('Calendar object not found');
+        }
+        $obj['acl'] = $this->getChildACL();
 
-		return new PublicCalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
-	}
+        return new PublicCalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
+    }
 
-	/**
-	 * @return PublicCalendarObject[]
-	 */
-	public function getChildren() {
-		$objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
-		$children = [];
-		foreach ($objs as $obj) {
-			if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
-				continue;
-			}
-			$obj['acl'] = $this->getChildACL();
-			$children[] = new PublicCalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
-		}
-		return $children;
-	}
+    /**
+     * @return PublicCalendarObject[]
+     */
+    public function getChildren() {
+        $objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
+        $children = [];
+        foreach ($objs as $obj) {
+            if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
+                continue;
+            }
+            $obj['acl'] = $this->getChildACL();
+            $children[] = new PublicCalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
+        }
+        return $children;
+    }
 
-	/**
-	 * @param string[] $paths
-	 * @return PublicCalendarObject[]
-	 */
-	public function getMultipleChildren(array $paths) {
-		$objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths);
-		$children = [];
-		foreach ($objs as $obj) {
-			if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
-				continue;
-			}
-			$obj['acl'] = $this->getChildACL();
-			$children[] = new PublicCalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
-		}
-		return $children;
-	}
+    /**
+     * @param string[] $paths
+     * @return PublicCalendarObject[]
+     */
+    public function getMultipleChildren(array $paths) {
+        $objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths);
+        $children = [];
+        foreach ($objs as $obj) {
+            if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
+                continue;
+            }
+            $obj['acl'] = $this->getChildACL();
+            $children[] = new PublicCalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
+        }
+        return $children;
+    }
 
-	/**
-	 * public calendars are always shared
-	 * @return bool
-	 */
-	protected function isShared() {
-		return true;
-	}
+    /**
+     * public calendars are always shared
+     * @return bool
+     */
+    protected function isShared() {
+        return true;
+    }
 }
\ No newline at end of file

lib/public/Contacts/ContactsMenu/IProvider.php

Indentation +6 added lines, -6 removed lines

@@ -29,10 +29,10 @@
  */
 interface IProvider {
 
-	/**
-	 * @since 12.0
-	 * @param IEntry $entry
-	 * @return void
-	 */
-	public function process(IEntry $entry);
+    /**
+     * @since 12.0
+     * @param IEntry $entry
+     * @return void
+     */
+    public function process(IEntry $entry);
 }

lib/public/Share/IShareHelper.php

Indentation +6 added lines, -6 removed lines

@@ -32,10 +32,10 @@
  */
 interface IShareHelper {
 
-	/**
-	 * @param Node $node
-	 * @return array [ users => [Mapping $uid => $pathForUser], remotes => [Mapping $cloudId => $pathToMountRoot]]
-	 * @since 12
-	 */
-	public function getPathsForAccessList(Node $node);
+    /**
+     * @param Node $node
+     * @return array [ users => [Mapping $uid => $pathForUser], remotes => [Mapping $cloudId => $pathToMountRoot]]
+     * @since 12
+     */
+    public function getPathsForAccessList(Node $node);
 }

apps/sharebymail/lib/Capabilities.php

Indentation +20 added lines, -20 removed lines

@@ -27,24 +27,24 @@
 
 class Capabilities implements ICapability {
 
-	/**
-	 * Function an app uses to return the capabilities
-	 *
-	 * @return array Array containing the apps capabilities
-	 * @since 8.2.0
-	 */
-	public function getCapabilities() {
-		return [
-			'files_sharing' =>
-				[
-					'sharebymail' =>
-						[
-							'enabled' => true,
-							'upload_files_drop' => ['enabled' => true],
-							'password' => ['enabled' => true],
-							'expire_date' => ['enabled' => true]
-						]
-				]
-		];
-	}
+    /**
+     * Function an app uses to return the capabilities
+     *
+     * @return array Array containing the apps capabilities
+     * @since 8.2.0
+     */
+    public function getCapabilities() {
+        return [
+            'files_sharing' =>
+                [
+                    'sharebymail' =>
+                        [
+                            'enabled' => true,
+                            'upload_files_drop' => ['enabled' => true],
+                            'password' => ['enabled' => true],
+                            'expire_date' => ['enabled' => true]
+                        ]
+                ]
+        ];
+    }
 }

lib/private/Share20/ShareHelper.php

Indentation +183 added lines, -183 removed lines

@@ -31,187 +31,187 @@
 
 class ShareHelper implements IShareHelper {
 
-	/** @var IManager */
-	private $shareManager;
-
-	public function __construct(IManager $shareManager) {
-		$this->shareManager = $shareManager;
-	}
-
-	/**
-	 * @param Node $node
-	 * @return array [ users => [Mapping $uid => $pathForUser], remotes => [Mapping $cloudId => $pathToMountRoot]]
-	 */
-	public function getPathsForAccessList(Node $node) {
-		$result = [
-			'users' => [],
-			'remotes' => [],
-		];
-
-		$accessList = $this->shareManager->getAccessList($node, true, true);
-		if (!empty($accessList['users'])) {
-			$result['users'] = $this->getPathsForUsers($node, $accessList['users']);
-		}
-		if (!empty($accessList['remote'])) {
-			$result['remotes'] = $this->getPathsForRemotes($node, $accessList['remote']);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Sample:
-	 * $users = [
-	 *   'test1' => ['node_id' => 16, 'node_path' => '/foo'],
-	 *   'test2' => ['node_id' => 23, 'node_path' => '/bar'],
-	 *   'test3' => ['node_id' => 42, 'node_path' => '/cat'],
-	 *   'test4' => ['node_id' => 48, 'node_path' => '/dog'],
-	 * ];
-	 *
-	 * Node tree:
-	 * - SixTeen is the parent of TwentyThree
-	 * - TwentyThree is the parent of FortyTwo
-	 * - FortyEight does not exist
-	 *
-	 * $return = [
-	 *   'test1' => '/foo/TwentyThree/FortyTwo',
-	 *   'test2' => '/bar/FortyTwo',
-	 *   'test3' => '/cat',
-	 * ],
-	 *
-	 * @param Node $node
-	 * @param array[] $users
-	 * @return array
-	 */
-	protected function getPathsForUsers(Node $node, array $users) {
-		/** @var array[] $byId */
-		$byId = [];
-		/** @var array[] $results */
-		$results = [];
-
-		foreach ($users as $uid => $info) {
-			if (!isset($byId[$info['node_id']])) {
-				$byId[$info['node_id']] = [];
-			}
-			$byId[$info['node_id']][$uid] = $info['node_path'];
-		}
-
-		try {
-			if (isset($byId[$node->getId()])) {
-				foreach ($byId[$node->getId()] as $uid => $path) {
-					$results[$uid] = $path;
-				}
-				unset($byId[$node->getId()]);
-			}
-		} catch (NotFoundException $e) {
-			return $results;
-		} catch (InvalidPathException $e) {
-			return $results;
-		}
-
-		if (empty($byId)) {
-			return $results;
-		}
-
-		$item = $node;
-		$appendix = '/' . $node->getName();
-		while (!empty($byId)) {
-			try {
-				/** @var Node $item */
-				$item = $item->getParent();
-
-				if (!empty($byId[$item->getId()])) {
-					foreach ($byId[$item->getId()] as $uid => $path) {
-						$results[$uid] = $path . $appendix;
-					}
-					unset($byId[$item->getId()]);
-				}
-
-				$appendix = '/' . $item->getName() . $appendix;
-			} catch (NotFoundException $e) {
-				return $results;
-			} catch (InvalidPathException $e) {
-				return $results;
-			} catch (NotPermittedException $e) {
-				return $results;
-			}
-		}
-
-		return $results;
-	}
-
-	/**
-	 * Sample:
-	 * $remotes = [
-	 *   'test1' => ['node_id' => 16, 'token' => 't1'],
-	 *   'test2' => ['node_id' => 23, 'token' => 't2'],
-	 *   'test3' => ['node_id' => 42, 'token' => 't3'],
-	 *   'test4' => ['node_id' => 48, 'token' => 't4'],
-	 * ];
-	 *
-	 * Node tree:
-	 * - SixTeen is the parent of TwentyThree
-	 * - TwentyThree is the parent of FortyTwo
-	 * - FortyEight does not exist
-	 *
-	 * $return = [
-	 *   'test1' => ['token' => 't1', 'node_path' => '/SixTeen'],
-	 *   'test2' => ['token' => 't2', 'node_path' => '/SixTeen/TwentyThree'],
-	 *   'test3' => ['token' => 't3', 'node_path' => '/SixTeen/TwentyThree/FortyTwo'],
-	 * ],
-	 *
-	 * @param Node $node
-	 * @param array[] $remotes
-	 * @return array
-	 */
-	protected function getPathsForRemotes(Node $node, array $remotes) {
-		/** @var array[] $byId */
-		$byId = [];
-		/** @var array[] $results */
-		$results = [];
-
-		foreach ($remotes as $cloudId => $info) {
-			if (!isset($byId[$info['node_id']])) {
-				$byId[$info['node_id']] = [];
-			}
-			$byId[$info['node_id']][$cloudId] = $info['token'];
-		}
-
-		$item = $node;
-		while (!empty($byId)) {
-			try {
-				if (!empty($byId[$item->getId()])) {
-					$path = $this->getMountedPath($item);
-					foreach ($byId[$item->getId()] as $uid => $token) {
-						$results[$uid] = [
-							'node_path' => $path,
-							'token' => $token,
-						];
-					}
-					unset($byId[$item->getId()]);
-				}
-
-				/** @var Node $item */
-				$item = $item->getParent();
-			} catch (NotFoundException $e) {
-				return $results;
-			} catch (InvalidPathException $e) {
-				return $results;
-			} catch (NotPermittedException $e) {
-				return $results;
-			}
-		}
-
-		return $results;
-	}
-
-	/**
-	 * @param Node $node
-	 * @return string
-	 */
-	protected function getMountedPath(Node $node) {
-		$path = $node->getPath();
-		$sections = explode('/', $path, 4);
-		return '/' . $sections[3];
-	}
+    /** @var IManager */
+    private $shareManager;
+
+    public function __construct(IManager $shareManager) {
+        $this->shareManager = $shareManager;
+    }
+
+    /**
+     * @param Node $node
+     * @return array [ users => [Mapping $uid => $pathForUser], remotes => [Mapping $cloudId => $pathToMountRoot]]
+     */
+    public function getPathsForAccessList(Node $node) {
+        $result = [
+            'users' => [],
+            'remotes' => [],
+        ];
+
+        $accessList = $this->shareManager->getAccessList($node, true, true);
+        if (!empty($accessList['users'])) {
+            $result['users'] = $this->getPathsForUsers($node, $accessList['users']);
+        }
+        if (!empty($accessList['remote'])) {
+            $result['remotes'] = $this->getPathsForRemotes($node, $accessList['remote']);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Sample:
+     * $users = [
+     *   'test1' => ['node_id' => 16, 'node_path' => '/foo'],
+     *   'test2' => ['node_id' => 23, 'node_path' => '/bar'],
+     *   'test3' => ['node_id' => 42, 'node_path' => '/cat'],
+     *   'test4' => ['node_id' => 48, 'node_path' => '/dog'],
+     * ];
+     *
+     * Node tree:
+     * - SixTeen is the parent of TwentyThree
+     * - TwentyThree is the parent of FortyTwo
+     * - FortyEight does not exist
+     *
+     * $return = [
+     *   'test1' => '/foo/TwentyThree/FortyTwo',
+     *   'test2' => '/bar/FortyTwo',
+     *   'test3' => '/cat',
+     * ],
+     *
+     * @param Node $node
+     * @param array[] $users
+     * @return array
+     */
+    protected function getPathsForUsers(Node $node, array $users) {
+        /** @var array[] $byId */
+        $byId = [];
+        /** @var array[] $results */
+        $results = [];
+
+        foreach ($users as $uid => $info) {
+            if (!isset($byId[$info['node_id']])) {
+                $byId[$info['node_id']] = [];
+            }
+            $byId[$info['node_id']][$uid] = $info['node_path'];
+        }
+
+        try {
+            if (isset($byId[$node->getId()])) {
+                foreach ($byId[$node->getId()] as $uid => $path) {
+                    $results[$uid] = $path;
+                }
+                unset($byId[$node->getId()]);
+            }
+        } catch (NotFoundException $e) {
+            return $results;
+        } catch (InvalidPathException $e) {
+            return $results;
+        }
+
+        if (empty($byId)) {
+            return $results;
+        }
+
+        $item = $node;
+        $appendix = '/' . $node->getName();
+        while (!empty($byId)) {
+            try {
+                /** @var Node $item */
+                $item = $item->getParent();
+
+                if (!empty($byId[$item->getId()])) {
+                    foreach ($byId[$item->getId()] as $uid => $path) {
+                        $results[$uid] = $path . $appendix;
+                    }
+                    unset($byId[$item->getId()]);
+                }
+
+                $appendix = '/' . $item->getName() . $appendix;
+            } catch (NotFoundException $e) {
+                return $results;
+            } catch (InvalidPathException $e) {
+                return $results;
+            } catch (NotPermittedException $e) {
+                return $results;
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * Sample:
+     * $remotes = [
+     *   'test1' => ['node_id' => 16, 'token' => 't1'],
+     *   'test2' => ['node_id' => 23, 'token' => 't2'],
+     *   'test3' => ['node_id' => 42, 'token' => 't3'],
+     *   'test4' => ['node_id' => 48, 'token' => 't4'],
+     * ];
+     *
+     * Node tree:
+     * - SixTeen is the parent of TwentyThree
+     * - TwentyThree is the parent of FortyTwo
+     * - FortyEight does not exist
+     *
+     * $return = [
+     *   'test1' => ['token' => 't1', 'node_path' => '/SixTeen'],
+     *   'test2' => ['token' => 't2', 'node_path' => '/SixTeen/TwentyThree'],
+     *   'test3' => ['token' => 't3', 'node_path' => '/SixTeen/TwentyThree/FortyTwo'],
+     * ],
+     *
+     * @param Node $node
+     * @param array[] $remotes
+     * @return array
+     */
+    protected function getPathsForRemotes(Node $node, array $remotes) {
+        /** @var array[] $byId */
+        $byId = [];
+        /** @var array[] $results */
+        $results = [];
+
+        foreach ($remotes as $cloudId => $info) {
+            if (!isset($byId[$info['node_id']])) {
+                $byId[$info['node_id']] = [];
+            }
+            $byId[$info['node_id']][$cloudId] = $info['token'];
+        }
+
+        $item = $node;
+        while (!empty($byId)) {
+            try {
+                if (!empty($byId[$item->getId()])) {
+                    $path = $this->getMountedPath($item);
+                    foreach ($byId[$item->getId()] as $uid => $token) {
+                        $results[$uid] = [
+                            'node_path' => $path,
+                            'token' => $token,
+                        ];
+                    }
+                    unset($byId[$item->getId()]);
+                }
+
+                /** @var Node $item */
+                $item = $item->getParent();
+            } catch (NotFoundException $e) {
+                return $results;
+            } catch (InvalidPathException $e) {
+                return $results;
+            } catch (NotPermittedException $e) {
+                return $results;
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * @param Node $node
+     * @return string
+     */
+    protected function getMountedPath(Node $node) {
+        $path = $node->getPath();
+        $sections = explode('/', $path, 4);
+        return '/' . $sections[3];
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -114,7 +114,7 @@ 
 		}
 
 		$item = $node;
-		$appendix = '/' . $node->getName();
+		$appendix = '/'.$node->getName();
 		while (!empty($byId)) {
 			try {
 				/** @var Node $item */
@@ -122,12 +122,12 @@ 
 
 				if (!empty($byId[$item->getId()])) {
 					foreach ($byId[$item->getId()] as $uid => $path) {
-						$results[$uid] = $path . $appendix;
+						$results[$uid] = $path.$appendix;
 					}
 					unset($byId[$item->getId()]);
 				}
 
-				$appendix = '/' . $item->getName() . $appendix;
+				$appendix = '/'.$item->getName().$appendix;
 			} catch (NotFoundException $e) {
 				return $results;
 			} catch (InvalidPathException $e) {
@@ -212,6 +212,6 @@ 
 	protected function getMountedPath(Node $node) {
 		$path = $node->getPath();
 		$sections = explode('/', $path, 4);
-		return '/' . $sections[3];
+		return '/'.$sections[3];
 	}
 }