1 files changed, 195 insertions, 188 deletions

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index cc2b0e0af2..f8739f4e33 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -36,222 +36,229 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * Controller for user registration.
  */
-class RegisterController extends AbstractBaseController {
-	/**
-	 * Show a registration page.
-	 *
-	 * @param Request $request
-	 *
-	 * @return Response
-	 * @throws NotFoundHttpException
-	 */
-	public function registerPage(Request $request): Response {
-		$this->checkRegistrationAllowed();
+class RegisterController extends AbstractBaseController
+{
+    /**
+     * Show a registration page.
+     *
+     * @param Request $request
+     *
+     * @return Response
+     * @throws NotFoundHttpException
+     */
+    public function registerPage(Request $request): Response
+    {
+        $this->checkRegistrationAllowed();
 
-		$comments = $request->get('comments', '');
-		$email    = $request->get('email', '');
-		$realname = $request->get('realname', '');
-		$username = $request->get('username', '');
+        $comments = $request->get('comments', '');
+        $email    = $request->get('email', '');
+        $realname = $request->get('realname', '');
+        $username = $request->get('username', '');
 
-		$show_caution = Site::getPreference('SHOW_REGISTER_CAUTION') === '1';
+        $show_caution = Site::getPreference('SHOW_REGISTER_CAUTION') === '1';
 
-		$title = I18N::translate('Request a new user account');
+        $title = I18N::translate('Request a new user account');
 
-		return $this->viewResponse('register-page', [
-			'comments'     => $comments,
-			'email'        => $email,
-			'realname'     => $realname,
-			'show_caution' => $show_caution,
-			'title'        => $title,
-			'username'     => $username,
-		]);
-	}
+        return $this->viewResponse('register-page', [
+            'comments'     => $comments,
+            'email'        => $email,
+            'realname'     => $realname,
+            'show_caution' => $show_caution,
+            'title'        => $title,
+            'username'     => $username,
+        ]);
+    }
 
-	/**
-	 * Perform a registration.
-	 *
-	 * @param Request $request
-	 *
-	 * @return Response
-	 * @throws NotFoundHttpException
-	 */
-	public function registerAction(Request $request): Response {
-		/** @var Tree $tree */
-		$tree = $request->attributes->get('tree');
+    /**
+     * Perform a registration.
+     *
+     * @param Request $request
+     *
+     * @return Response
+     * @throws NotFoundHttpException
+     */
+    public function registerAction(Request $request): Response
+    {
+        /** @var Tree $tree */
+        $tree = $request->attributes->get('tree');
 
-		$this->checkRegistrationAllowed();
+        $this->checkRegistrationAllowed();
 
-		$comments  = $request->get('comments', '');
-		$email     = $request->get('email', '');
-		$password1 = $request->get('password1', '');
-		$password2 = $request->get('password2', '');
-		$realname  = $request->get('realname', '');
-		$username  = $request->get('username', '');
+        $comments  = $request->get('comments', '');
+        $email     = $request->get('email', '');
+        $password1 = $request->get('password1', '');
+        $password2 = $request->get('password2', '');
+        $realname  = $request->get('realname', '');
+        $username  = $request->get('username', '');
 
-		try {
-			$this->doValidateRegistration($username, $email, $realname, $comments, $password1, $password2);
-		} catch (Exception $ex) {
-			FlashMessages::addMessage($ex->getMessage(), 'danger');
+        try {
+            $this->doValidateRegistration($username, $email, $realname, $comments, $password1, $password2);
+        } catch (Exception $ex) {
+            FlashMessages::addMessage($ex->getMessage(), 'danger');
 
-			return new RedirectResponse(route('register', [
-				'comments' => $comments,
-				'email'    => $email,
-				'realname' => $realname,
-				'username' => $username,
-			]));
-		}
+            return new RedirectResponse(route('register', [
+                'comments' => $comments,
+                'email'    => $email,
+                'realname' => $realname,
+                'username' => $username,
+            ]));
+        }
 
-		Log::addAuthenticationLog('User registration requested for: ' . $username);
+        Log::addAuthenticationLog('User registration requested for: ' . $username);
 
-		$user = User::create($username, $realname, $email, $password1);
-		$user
-			->setPreference('language', WT_LOCALE)
-			->setPreference('verified', '0')
-			->setPreference('verified_by_admin', 0)
-			->setPreference('reg_timestamp', date('U'))
-			->setPreference('reg_hashcode', md5(Uuid::uuid4()->toString()))
-			->setPreference('contactmethod', 'messaging2')
-			->setPreference('comment', $comments)
-			->setPreference('visibleonline', '1')
-			->setPreference('auto_accept', '0')
-			->setPreference('canadmin', '0')
-			->setPreference('sessiontime', '0');
+        $user = User::create($username, $realname, $email, $password1);
+        $user
+            ->setPreference('language', WT_LOCALE)
+            ->setPreference('verified', '0')
+            ->setPreference('verified_by_admin', 0)
+            ->setPreference('reg_timestamp', date('U'))
+            ->setPreference('reg_hashcode', md5(Uuid::uuid4()->toString()))
+            ->setPreference('contactmethod', 'messaging2')
+            ->setPreference('comment', $comments)
+            ->setPreference('visibleonline', '1')
+            ->setPreference('auto_accept', '0')
+            ->setPreference('canadmin', '0')
+            ->setPreference('sessiontime', '0');
 
-		// Create a dummy user, so we can send messages from the tree.
-		$sender = new User((object) [
-			'user_id'   => null,
-			'user_name' => '',
-			'real_name' => $tree->getTitle(),
-			'email'     => $tree->getPreference('WEBTREES_EMAIL'),
-		]);
+        // Create a dummy user, so we can send messages from the tree.
+        $sender = new User((object)[
+            'user_id'   => null,
+            'user_name' => '',
+            'real_name' => $tree->getTitle(),
+            'email'     => $tree->getPreference('WEBTREES_EMAIL'),
+        ]);
 
-		// Send a verification message to the user.
-		Mail::send($sender, $user, $sender, /* I18N: %s is a server name/URL */
-			I18N::translate('Your registration at %s', WT_BASE_URL), view('emails/register-user-text', [
-				'user' => $user,
-			]), view('emails/register-user-html', [
-				'user' => $user,
-			]));
+        // Send a verification message to the user.
+        Mail::send($sender, $user, $sender, /* I18N: %s is a server name/URL */
+            I18N::translate('Your registration at %s', WT_BASE_URL), view('emails/register-user-text', [
+                'user' => $user,
+            ]), view('emails/register-user-html', [
+                'user' => $user,
+            ]));
 
-		// Tell the genealogy contact about the registration.
-		$webmaster = User::find((int) $tree->getPreference('WEBMASTER_USER_ID'));
+        // Tell the genealogy contact about the registration.
+        $webmaster = User::find((int)$tree->getPreference('WEBMASTER_USER_ID'));
 
-		if ($webmaster !== null) {
-			I18N::init($webmaster->getPreference('language'));
+        if ($webmaster !== null) {
+            I18N::init($webmaster->getPreference('language'));
 
-			Mail::send($sender, $webmaster, $user, /* I18N: %s is a server name/URL */
-				I18N::translate('New registration at %s', WT_BASE_URL . ' ' . $tree->getTitle()), view('emails/register-notify-text', [
-					'user'     => $user,
-					'comments' => $comments,
-				]), view('emails/register-notify-html', [
-					'user'     => $user,
-					'comments' => $comments,
-				])
-			);
+            Mail::send($sender, $webmaster, $user, /* I18N: %s is a server name/URL */
+                I18N::translate('New registration at %s', WT_BASE_URL . ' ' . $tree->getTitle()), view('emails/register-notify-text', [
+                    'user'     => $user,
+                    'comments' => $comments,
+                ]), view('emails/register-notify-html', [
+                    'user'     => $user,
+                    'comments' => $comments,
+                ])
+            );
 
-			$mail1_method = $webmaster->getPreference('contact_method');
-			if ($mail1_method !== 'messaging3' && $mail1_method !== 'mailto' && $mail1_method !== 'none') {
-				Database::prepare("INSERT INTO `##message` (sender, ip_address, user_id, subject, body) VALUES (? ,? ,? ,? ,?)")->execute([
-					$user->getEmail(),
-					$request->getClientIp(),
-					$webmaster->getUserId(),
-					/* I18N: %s is a server name/URL */
-					I18N::translate('New registration at %s', $tree->getTitle()),
-					view('emails/register-notify-text', [
-						'user'     => $user,
-						'comments' => $comments,
-					]),
-				]);
-			}
-		}
+            $mail1_method = $webmaster->getPreference('contact_method');
+            if ($mail1_method !== 'messaging3' && $mail1_method !== 'mailto' && $mail1_method !== 'none') {
+                Database::prepare("INSERT INTO `##message` (sender, ip_address, user_id, subject, body) VALUES (? ,? ,? ,? ,?)")->execute([
+                    $user->getEmail(),
+                    $request->getClientIp(),
+                    $webmaster->getUserId(),
+                    /* I18N: %s is a server name/URL */
+                    I18N::translate('New registration at %s', $tree->getTitle()),
+                    view('emails/register-notify-text', [
+                        'user'     => $user,
+                        'comments' => $comments,
+                    ]),
+                ]);
+            }
+        }
 
-		$title = I18N::translate('Request a new user account');
+        $title = I18N::translate('Request a new user account');
 
-		return $this->viewResponse('register-success-page', [
-			'title' => $title,
-			'user'  => $user,
-		]);
-	}
+        return $this->viewResponse('register-success-page', [
+            'title' => $title,
+            'user'  => $user,
+        ]);
+    }
 
-	/**
-	 * Check the registration details.
-	 *
-	 * @param string $username
-	 * @param string $email
-	 * @param string $realname
-	 * @param string $comments
-	 * @param string $password1
-	 * @param string $password2
-	 *
-	 * @throws Exception
-	 */
-	private function doValidateRegistration(string $username, string $email, string $realname, string $comments, string $password1, string $password2) {
-		// All fields are required
-		if ($username === '' || $email === '' || $realname === '' || $comments === '' || $password1 === '' || $password2 === '') {
-			throw new Exception(I18N::translate('All fields must be completed.'));
-		}
+    /**
+     * Check the registration details.
+     *
+     * @param string $username
+     * @param string $email
+     * @param string $realname
+     * @param string $comments
+     * @param string $password1
+     * @param string $password2
+     *
+     * @throws Exception
+     */
+    private function doValidateRegistration(string $username, string $email, string $realname, string $comments, string $password1, string $password2)
+    {
+        // All fields are required
+        if ($username === '' || $email === '' || $realname === '' || $comments === '' || $password1 === '' || $password2 === '') {
+            throw new Exception(I18N::translate('All fields must be completed.'));
+        }
 
-		// Username already exists
-		if (User::findByUserName($username) !== null) {
-			throw new Exception(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'.$username));
-		}
+        // Username already exists
+        if (User::findByUserName($username) !== null) {
+            throw new Exception(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.' . $username));
+        }
 
-		// Email already exists
-		if (User::findByEmail($email) !== null) {
-			throw new Exception(I18N::translate('Duplicate email address. A user with that email already exists.'));
-		}
+        // Email already exists
+        if (User::findByEmail($email) !== null) {
+            throw new Exception(I18N::translate('Duplicate email address. A user with that email already exists.'));
+        }
 
-		// No external links
-		if (preg_match('/(?!' . preg_quote(WT_BASE_URL, '/') . ')(((?:http|https):\/\/)[a-zA-Z0-9.-]+)/', $comments, $match)) {
-			throw new Exception(I18N::translate('You are not allowed to send messages that contain external links.') . ' ' . I18N::translate('You should delete the “%1$s” from “%2$s” and try again.', e($match[2]), e($match[1])));
-		}
+        // No external links
+        if (preg_match('/(?!' . preg_quote(WT_BASE_URL, '/') . ')(((?:http|https):\/\/)[a-zA-Z0-9.-]+)/', $comments, $match)) {
+            throw new Exception(I18N::translate('You are not allowed to send messages that contain external links.') . ' ' . I18N::translate('You should delete the “%1$s” from “%2$s” and try again.', e($match[2]), e($match[1])));
+        }
 
-		if ($password1 !== $password2) {
-			throw new Exception('The passwords do not match.');
-		}
-	}
+        if ($password1 !== $password2) {
+            throw new Exception('The passwords do not match.');
+        }
+    }
 
-	/**
-	 * Show an email verification page.
-	 *
-	 * @param Request $request
-	 *
-	 * @return Response
-	 * @throws NotFoundHttpException
-	 */
-	public function verifyPage(Request $request): Response {
-		$this->checkRegistrationAllowed();
+    /**
+     * Show an email verification page.
+     *
+     * @param Request $request
+     *
+     * @return Response
+     * @throws NotFoundHttpException
+     */
+    public function verifyPage(Request $request): Response
+    {
+        $this->checkRegistrationAllowed();
 
-		$title = I18N::translate('User verification');
+        $title = I18N::translate('User verification');
 
-		return $this->viewResponse('register-page', [
-			'title' => $title,
-		]);
-	}
+        return $this->viewResponse('register-page', [
+            'title' => $title,
+        ]);
+    }
 
-	/**
-	 * Perform a registration.
-	 *
-	 * @param Request $request
-	 *
-	 * @return RedirectResponse
-	 * @throws NotFoundHttpException
-	 */
-	public function verifyAction(Request $request): RedirectResponse {
-		$this->checkRegistrationAllowed();
+    /**
+     * Perform a registration.
+     *
+     * @param Request $request
+     *
+     * @return RedirectResponse
+     * @throws NotFoundHttpException
+     */
+    public function verifyAction(Request $request): RedirectResponse
+    {
+        $this->checkRegistrationAllowed();
 
-		return new RedirectResponse(route('tree-page'));
-	}
+        return new RedirectResponse(route('tree-page'));
+    }
 
-	/**
-	 * Check that visitors are allowed to register on this site.
-	 *
-	 * @return void
-	 * @throws NotFoundHttpException
-	 */
-	private function checkRegistrationAllowed() {
-		if (Site::getPreference('USE_REGISTRATION_MODULE') !== '1') {
-			throw new NotFoundHttpException;
-		}
-	}
+    /**
+     * Check that visitors are allowed to register on this site.
+     *
+     * @return void
+     * @throws NotFoundHttpException
+     */
+    private function checkRegistrationAllowed()
+    {
+        if (Site::getPreference('USE_REGISTRATION_MODULE') !== '1') {
+            throw new NotFoundHttpException;
+        }
+    }
 }