mdaniels5757 / waca

includes/Pages/RequestAction/PageBreakReservation.php

Indentation +65 added lines, -65 removed lines

@@ -19,81 +19,81 @@
 
 class PageBreakReservation extends RequestActionBase
 {
-    protected function main()
-    {
-        $this->checkPosted();
-        $database = $this->getDatabase();
-        $request = $this->getRequest($database);
+	protected function main()
+	{
+		$this->checkPosted();
+		$database = $this->getDatabase();
+		$request = $this->getRequest($database);
 
-        if ($request->getReserved() === null) {
-            throw new ApplicationLogicException('Request is not reserved!');
-        }
+		if ($request->getReserved() === null) {
+			throw new ApplicationLogicException('Request is not reserved!');
+		}
 
-        $currentUser = User::getCurrent($database);
+		$currentUser = User::getCurrent($database);
 
-        if ($currentUser->getId() === $request->getReserved()) {
-            $this->doUnreserve($request, $database);
-        }
-        else {
-            // not the same user!
-            if ($this->barrierTest('force', $currentUser)) {
-                $this->doBreakReserve($request, $database);
-            }
-            else {
-                throw new AccessDeniedException($this->getSecurityManager());
-            }
-        }
-    }
+		if ($currentUser->getId() === $request->getReserved()) {
+			$this->doUnreserve($request, $database);
+		}
+		else {
+			// not the same user!
+			if ($this->barrierTest('force', $currentUser)) {
+				$this->doBreakReserve($request, $database);
+			}
+			else {
+				throw new AccessDeniedException($this->getSecurityManager());
+			}
+		}
+	}
 
-    /**
-     * @param Request     $request
-     * @param PdoDatabase $database
-     *
-     * @throws Exception
-     */
-    protected function doUnreserve(Request $request, PdoDatabase $database)
-    {
-        // same user! we allow people to unreserve their own stuff
-        $request->setReserved(null);
-        $request->setUpdateVersion(WebRequest::postInt('updateversion'));
-        $request->save();
+	/**
+	 * @param Request     $request
+	 * @param PdoDatabase $database
+	 *
+	 * @throws Exception
+	 */
+	protected function doUnreserve(Request $request, PdoDatabase $database)
+	{
+		// same user! we allow people to unreserve their own stuff
+		$request->setReserved(null);
+		$request->setUpdateVersion(WebRequest::postInt('updateversion'));
+		$request->save();
 
-        Logger::unreserve($database, $request);
-        $this->getNotificationHelper()->requestUnreserved($request);
+		Logger::unreserve($database, $request);
+		$this->getNotificationHelper()->requestUnreserved($request);
 
-        // Redirect home!
-        $this->redirect();
-    }
+		// Redirect home!
+		$this->redirect();
+	}
 
-    /**
-     * @param Request     $request
-     * @param PdoDatabase $database
-     *
-     * @throws Exception
-     */
-    protected function doBreakReserve(Request $request, PdoDatabase $database)
-    {
-        if (!WebRequest::postBoolean("confirm")) {
-            $this->assignCSRFToken();
+	/**
+	 * @param Request     $request
+	 * @param PdoDatabase $database
+	 *
+	 * @throws Exception
+	 */
+	protected function doBreakReserve(Request $request, PdoDatabase $database)
+	{
+		if (!WebRequest::postBoolean("confirm")) {
+			$this->assignCSRFToken();
 
-            $this->assign("request", $request->getId());
-            $this->assign("reservedUser", User::getById($request->getReserved(), $database));
-            $this->assign("updateversion", WebRequest::postInt('updateversion'));
+			$this->assign("request", $request->getId());
+			$this->assign("reservedUser", User::getById($request->getReserved(), $database));
+			$this->assign("updateversion", WebRequest::postInt('updateversion'));
 
-            $this->skipAlerts();
+			$this->skipAlerts();
 
-            $this->setTemplate("confirmations/breakreserve.tpl");
-        }
-        else {
-            $request->setReserved(null);
-            $request->setUpdateVersion(WebRequest::postInt('updateversion'));
-            $request->save();
+			$this->setTemplate("confirmations/breakreserve.tpl");
+		}
+		else {
+			$request->setReserved(null);
+			$request->setUpdateVersion(WebRequest::postInt('updateversion'));
+			$request->save();
 
-            Logger::breakReserve($database, $request);
-            $this->getNotificationHelper()->requestReserveBroken($request);
+			Logger::breakReserve($database, $request);
+			$this->getNotificationHelper()->requestReserveBroken($request);
 
-            // Redirect home!
-            $this->redirect();
-        }
-    }
+			// Redirect home!
+			$this->redirect();
+		}
+	}
 }

Braces +3 added lines, -6 removed lines

@@ -33,13 +33,11 @@ 
 
         if ($currentUser->getId() === $request->getReserved()) {
             $this->doUnreserve($request, $database);
-        }
-        else {
+        } else {
             // not the same user!
             if ($this->barrierTest('force', $currentUser)) {
                 $this->doBreakReserve($request, $database);
-            }
-            else {
+            } else {
                 throw new AccessDeniedException($this->getSecurityManager());
             }
         }
@@ -83,8 +81,7 @@ 
             $this->skipAlerts();
 
             $this->setTemplate("confirmations/breakreserve.tpl");
-        }
-        else {
+        } else {
             $request->setReserved(null);
             $request->setUpdateVersion(WebRequest::postInt('updateversion'));
             $request->save();

includes/Pages/RequestAction/RequestActionBase.php

Indentation +44 added lines, -44 removed lines

@@ -19,54 +19,54 @@
 
 abstract class RequestActionBase extends InternalPageBase
 {
-    /**
-     * @param PdoDatabase $database
-     *
-     * @return Request
-     * @throws ApplicationLogicException
-     */
-    protected function getRequest(PdoDatabase $database)
-    {
-        $requestId = WebRequest::postInt('request');
-        if ($requestId === null) {
-            throw new ApplicationLogicException('Request ID not found');
-        }
+	/**
+	 * @param PdoDatabase $database
+	 *
+	 * @return Request
+	 * @throws ApplicationLogicException
+	 */
+	protected function getRequest(PdoDatabase $database)
+	{
+		$requestId = WebRequest::postInt('request');
+		if ($requestId === null) {
+			throw new ApplicationLogicException('Request ID not found');
+		}
 
-        /** @var Request $request */
-        $request = Request::getById($requestId, $database);
+		/** @var Request $request */
+		$request = Request::getById($requestId, $database);
 
-        if ($request === false) {
-            throw new ApplicationLogicException('Request not found');
-        }
+		if ($request === false) {
+			throw new ApplicationLogicException('Request not found');
+		}
 
-        return $request;
-    }
+		return $request;
+	}
 
-    final protected function checkPosted()
-    {
-        // if the request was not posted, send the user away.
-        if (!WebRequest::wasPosted()) {
-            throw new ApplicationLogicException('This page does not support GET methods.');
-        }
+	final protected function checkPosted()
+	{
+		// if the request was not posted, send the user away.
+		if (!WebRequest::wasPosted()) {
+			throw new ApplicationLogicException('This page does not support GET methods.');
+		}
 
-        // validate the CSRF token
-        $this->validateCSRFToken();
-    }
+		// validate the CSRF token
+		$this->validateCSRFToken();
+	}
 
-    /**
-     * @param Request     $request
-     * @param             $parentTaskId
-     * @param User        $user
-     * @param PdoDatabase $database
-     */
-    protected function enqueueWelcomeTask(Request $request, $parentTaskId, User $user, PdoDatabase $database)
-    {
-        $welcomeTask = new JobQueue();
-        $welcomeTask->setTask(WelcomeUserTask::class);
-        $welcomeTask->setRequest($request->getId());
-        $welcomeTask->setParent($parentTaskId);
-        $welcomeTask->setTriggerUserId($user->getId());
-        $welcomeTask->setDatabase($database);
-        $welcomeTask->save();
-    }
+	/**
+	 * @param Request     $request
+	 * @param             $parentTaskId
+	 * @param User        $user
+	 * @param PdoDatabase $database
+	 */
+	protected function enqueueWelcomeTask(Request $request, $parentTaskId, User $user, PdoDatabase $database)
+	{
+		$welcomeTask = new JobQueue();
+		$welcomeTask->setTask(WelcomeUserTask::class);
+		$welcomeTask->setRequest($request->getId());
+		$welcomeTask->setParent($parentTaskId);
+		$welcomeTask->setTriggerUserId($user->getId());
+		$welcomeTask->setDatabase($database);
+		$welcomeTask->save();
+	}
 }
\ No newline at end of file

includes/Pages/RequestAction/PageComment.php

Indentation +37 added lines, -37 removed lines

@@ -15,52 +15,52 @@
 
 class PageComment extends RequestActionBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $this->checkPosted();
-        $database = $this->getDatabase();
-        $request = $this->getRequest($database);
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$this->checkPosted();
+		$database = $this->getDatabase();
+		$request = $this->getRequest($database);
 
-        $commentText = WebRequest::postString('comment');
-        if ($commentText === false || $commentText == '') {
-            $this->redirect('viewRequest', null, array('id' => $request->getId()));
+		$commentText = WebRequest::postString('comment');
+		if ($commentText === false || $commentText == '') {
+			$this->redirect('viewRequest', null, array('id' => $request->getId()));
 
-            return;
-        }
+			return;
+		}
 
-        //Look for and detect IPv4/IPv6 addresses in comment text, and warn the commenter.
-        $ipv4Regex = '/\b' . RegexConstants::IPV4 . '\b/';
-        $ipv6Regex = '/\b' . RegexConstants::IPV6 . '\b/';
+		//Look for and detect IPv4/IPv6 addresses in comment text, and warn the commenter.
+		$ipv4Regex = '/\b' . RegexConstants::IPV4 . '\b/';
+		$ipv6Regex = '/\b' . RegexConstants::IPV6 . '\b/';
 
-        $overridePolicy = WebRequest::postBoolean('privpol-check-override');
+		$overridePolicy = WebRequest::postBoolean('privpol-check-override');
 
-        if ((preg_match($ipv4Regex, $commentText) || preg_match($ipv6Regex, $commentText)) && !$overridePolicy) {
-            $this->assignCSRFToken();
-            $this->assign("request", $request);
-            $this->assign("comment", $commentText);
-            $this->skipAlerts();
-            $this->setTemplate("privpol-warning.tpl");
+		if ((preg_match($ipv4Regex, $commentText) || preg_match($ipv6Regex, $commentText)) && !$overridePolicy) {
+			$this->assignCSRFToken();
+			$this->assign("request", $request);
+			$this->assign("comment", $commentText);
+			$this->skipAlerts();
+			$this->setTemplate("privpol-warning.tpl");
 
-            return;
-        }
+			return;
+		}
 
-        $visibility = WebRequest::postBoolean('adminOnly') ? 'admin' : 'user';
+		$visibility = WebRequest::postBoolean('adminOnly') ? 'admin' : 'user';
 
-        $comment = new Comment();
-        $comment->setDatabase($database);
+		$comment = new Comment();
+		$comment->setDatabase($database);
 
-        $comment->setRequest($request->getId());
-        $comment->setVisibility($visibility);
-        $comment->setUser(User::getCurrent($database)->getId());
-        $comment->setComment($commentText);
+		$comment->setRequest($request->getId());
+		$comment->setVisibility($visibility);
+		$comment->setUser(User::getCurrent($database)->getId());
+		$comment->setComment($commentText);
 
-        $comment->save();
+		$comment->save();
 
-        $this->getNotificationHelper()->commentCreated($comment, $request);
-        $this->redirect('viewRequest', null, array('id' => $request->getId()));
-    }
+		$this->getNotificationHelper()->commentCreated($comment, $request);
+		$this->redirect('viewRequest', null, array('id' => $request->getId()));
+	}
 }

includes/Pages/RequestAction/PageDropRequest.php

Indentation +15 added lines, -15 removed lines

@@ -15,22 +15,22 @@
 
 class PageDropRequest extends PageCloseRequest
 {
-    protected function getTemplate(PdoDatabase $database)
-    {
-        return EmailTemplate::getDroppedTemplate();
-    }
+	protected function getTemplate(PdoDatabase $database)
+	{
+		return EmailTemplate::getDroppedTemplate();
+	}
 
-    protected function confirmEmailAlreadySent(Request $request, EmailTemplate $template)
-    {
-        return false;
-    }
+	protected function confirmEmailAlreadySent(Request $request, EmailTemplate $template)
+	{
+		return false;
+	}
 
-    protected function confirmAccountCreated(Request $request, EmailTemplate $template)
-    {
-        return false;
-    }
+	protected function confirmAccountCreated(Request $request, EmailTemplate $template)
+	{
+		return false;
+	}
 
-    protected function sendMail(Request $request, $mailText, User $currentUser, $ccMailingList)
-    {
-    }
+	protected function sendMail(Request $request, $mailText, User $currentUser, $ccMailingList)
+	{
+	}
 }
\ No newline at end of file

includes/Pages/RequestAction/PageCloseRequest.php

Indentation +227 added lines, -227 removed lines

@@ -21,231 +21,231 @@
 
 class PageCloseRequest extends RequestActionBase
 {
-    protected function main()
-    {
-        $this->processClose();
-    }
-
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @throws ApplicationLogicException
-     */
-    final protected function processClose()
-    {
-        $this->checkPosted();
-        $database = $this->getDatabase();
-
-        $currentUser = User::getCurrent($database);
-        $template = $this->getTemplate($database);
-        $request = $this->getRequest($database);
-        $request->setUpdateVersion(WebRequest::postInt('updateversion'));
-
-        if ($request->getStatus() === 'Closed') {
-            throw new ApplicationLogicException('Request is already closed');
-        }
-
-        if ($this->confirmEmailAlreadySent($request, $template)) {
-            return;
-        }
-
-        if ($this->checkReserveProtect($request, $currentUser)) {
-            return;
-        }
-
-        if ($this->confirmAccountCreated($request, $template)) {
-            return;
-        }
-
-        // I think we're good here...
-        $request->setStatus('Closed');
-        $request->setReserved(null);
-
-        Logger::closeRequest($database, $request, $template->getId(), null);
-
-        $request->save();
-
-        $this->processWelcome($template->getDefaultAction());
-
-        // Perform the notifications and stuff *after* we've successfully saved, since the save can throw an OLE and
-        // be rolled back.
-
-        $this->getNotificationHelper()->requestClosed($request, $template->getName());
-        $sanitisedTemplateName = htmlentities($template->getName(), ENT_COMPAT, 'UTF-8');
-        SessionAlert::success("Request {$request->getId()} has been closed as {$sanitisedTemplateName}");
-
-        $this->sendMail($request, $template->getText(), $currentUser, false);
-
-        $this->redirect();
-    }
-
-    /**
-     * @param PdoDatabase $database
-     *
-     * @return EmailTemplate
-     * @throws ApplicationLogicException
-     */
-    protected function getTemplate(PdoDatabase $database)
-    {
-        $templateId = WebRequest::postInt('template');
-        if ($templateId === null) {
-            throw new ApplicationLogicException('No template specified');
-        }
-
-        /** @var EmailTemplate $template */
-        $template = EmailTemplate::getById($templateId, $database);
-        if ($template === false || !$template->getActive()) {
-            throw new ApplicationLogicException('Invalid or inactive template specified');
-        }
-
-        return $template;
-    }
-
-    /**
-     * @param Request       $request
-     * @param EmailTemplate $template
-     *
-     * @return bool
-     */
-    protected function confirmEmailAlreadySent(Request $request, EmailTemplate $template)
-    {
-        if ($this->checkEmailAlreadySent($request)) {
-            $this->showConfirmation($request, $template, 'close-confirmations/email-sent.tpl');
-
-            return true;
-        }
-
-        return false;
-    }
-
-    protected function checkEmailAlreadySent(Request $request)
-    {
-        if ($request->getEmailSent() && !WebRequest::postBoolean('emailSentOverride')) {
-            return true;
-        }
-
-        return false;
-    }
-
-    protected function checkReserveProtect(Request $request, User $currentUser)
-    {
-        $reservationId = $request->getReserved();
-
-        if ($reservationId !== 0 && $reservationId !== null) {
-            if ($currentUser->getId() !== $reservationId) {
-                SessionAlert::error("Request is reserved by someone else.");
-                $this->redirect('/viewRequest', null, ['id' => $request->getId()] );
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param Request       $request
-     * @param EmailTemplate $template
-     *
-     * @return bool
-     * @throws Exception
-     */
-    protected function confirmAccountCreated(Request $request, EmailTemplate $template)
-    {
-        if ($this->checkAccountCreated($request, $template)) {
-            $this->showConfirmation($request, $template, 'close-confirmations/account-created.tpl');
-
-            return true;
-        }
-
-        return false;
-    }
-
-    protected function checkAccountCreated(Request $request, EmailTemplate $template)
-    {
-        if ($template->getDefaultAction() === EmailTemplate::CREATED && !WebRequest::postBoolean('createOverride')) {
-            $parameters = array(
-                'action'  => 'query',
-                'list'    => 'users',
-                'format'  => 'php',
-                'ususers' => $request->getName(),
-            );
-
-            $content = $this->getHttpHelper()->get($this->getSiteConfiguration()->getMediawikiWebServiceEndpoint(),
-                $parameters);
-
-            $apiResult = unserialize($content);
-            $exists = !isset($apiResult['query']['users']['0']['missing']);
-
-            if (!$exists) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param Request $request
-     * @param string  $mailText
-     * @param User    $currentUser
-     * @param boolean $ccMailingList
-     */
-    protected function sendMail(Request $request, $mailText, User $currentUser, $ccMailingList)
-    {
-        $requestEmailHelper = new RequestEmailHelper($this->getEmailHelper());
-        $requestEmailHelper->sendMail($request, $mailText, $currentUser, $ccMailingList);
-
-        $request->setEmailSent(true);
-        $request->save();
-    }
-
-    /**
-     * @param Request       $request
-     * @param EmailTemplate $template
-     * @param string        $templateName
-     *
-     * @throws Exception
-     * @return void
-     */
-    protected function showConfirmation(Request $request, EmailTemplate $template, $templateName)
-    {
-        $this->assignCSRFToken();
-
-        $this->assign('request', $request->getId());
-        $this->assign('template', $template->getId());
-
-        $this->assign('updateversion', $request->getUpdateVersion());
-
-        $this->assign('emailSentOverride', WebRequest::postBoolean('emailSentOverride') ? 'true' : 'false');
-        $this->assign('reserveOverride', WebRequest::postBoolean('reserveOverride') ? 'true' : 'false');
-        $this->assign('createOverride', WebRequest::postBoolean('createOverride') ? 'true' : 'false');
-
-        $this->skipAlerts();
-
-        $this->setTemplate($templateName);
-    }
-
-    /**
-     * @param string $action
-     *
-     * @throws ApplicationLogicException
-     */
-    final protected function processWelcome(string $action): void
-    {
-        $database = $this->getDatabase();
-        $currentUser = User::getCurrent($database);
-
-        if ($action !== EmailTemplate::CREATED) {
-            return;
-        }
-
-        if ($currentUser->getWelcomeTemplate() === null) {
-            return;
-        }
-
-        if (WebRequest::postBoolean('skipAutoWelcome')) {
-            return;
-        }
-
-        $this->enqueueWelcomeTask($this->getRequest($database), null, $currentUser, $database);
-    }
+	protected function main()
+	{
+		$this->processClose();
+	}
+
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @throws ApplicationLogicException
+	 */
+	final protected function processClose()
+	{
+		$this->checkPosted();
+		$database = $this->getDatabase();
+
+		$currentUser = User::getCurrent($database);
+		$template = $this->getTemplate($database);
+		$request = $this->getRequest($database);
+		$request->setUpdateVersion(WebRequest::postInt('updateversion'));
+
+		if ($request->getStatus() === 'Closed') {
+			throw new ApplicationLogicException('Request is already closed');
+		}
+
+		if ($this->confirmEmailAlreadySent($request, $template)) {
+			return;
+		}
+
+		if ($this->checkReserveProtect($request, $currentUser)) {
+			return;
+		}
+
+		if ($this->confirmAccountCreated($request, $template)) {
+			return;
+		}
+
+		// I think we're good here...
+		$request->setStatus('Closed');
+		$request->setReserved(null);
+
+		Logger::closeRequest($database, $request, $template->getId(), null);
+
+		$request->save();
+
+		$this->processWelcome($template->getDefaultAction());
+
+		// Perform the notifications and stuff *after* we've successfully saved, since the save can throw an OLE and
+		// be rolled back.
+
+		$this->getNotificationHelper()->requestClosed($request, $template->getName());
+		$sanitisedTemplateName = htmlentities($template->getName(), ENT_COMPAT, 'UTF-8');
+		SessionAlert::success("Request {$request->getId()} has been closed as {$sanitisedTemplateName}");
+
+		$this->sendMail($request, $template->getText(), $currentUser, false);
+
+		$this->redirect();
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 *
+	 * @return EmailTemplate
+	 * @throws ApplicationLogicException
+	 */
+	protected function getTemplate(PdoDatabase $database)
+	{
+		$templateId = WebRequest::postInt('template');
+		if ($templateId === null) {
+			throw new ApplicationLogicException('No template specified');
+		}
+
+		/** @var EmailTemplate $template */
+		$template = EmailTemplate::getById($templateId, $database);
+		if ($template === false || !$template->getActive()) {
+			throw new ApplicationLogicException('Invalid or inactive template specified');
+		}
+
+		return $template;
+	}
+
+	/**
+	 * @param Request       $request
+	 * @param EmailTemplate $template
+	 *
+	 * @return bool
+	 */
+	protected function confirmEmailAlreadySent(Request $request, EmailTemplate $template)
+	{
+		if ($this->checkEmailAlreadySent($request)) {
+			$this->showConfirmation($request, $template, 'close-confirmations/email-sent.tpl');
+
+			return true;
+		}
+
+		return false;
+	}
+
+	protected function checkEmailAlreadySent(Request $request)
+	{
+		if ($request->getEmailSent() && !WebRequest::postBoolean('emailSentOverride')) {
+			return true;
+		}
+
+		return false;
+	}
+
+	protected function checkReserveProtect(Request $request, User $currentUser)
+	{
+		$reservationId = $request->getReserved();
+
+		if ($reservationId !== 0 && $reservationId !== null) {
+			if ($currentUser->getId() !== $reservationId) {
+				SessionAlert::error("Request is reserved by someone else.");
+				$this->redirect('/viewRequest', null, ['id' => $request->getId()] );
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param Request       $request
+	 * @param EmailTemplate $template
+	 *
+	 * @return bool
+	 * @throws Exception
+	 */
+	protected function confirmAccountCreated(Request $request, EmailTemplate $template)
+	{
+		if ($this->checkAccountCreated($request, $template)) {
+			$this->showConfirmation($request, $template, 'close-confirmations/account-created.tpl');
+
+			return true;
+		}
+
+		return false;
+	}
+
+	protected function checkAccountCreated(Request $request, EmailTemplate $template)
+	{
+		if ($template->getDefaultAction() === EmailTemplate::CREATED && !WebRequest::postBoolean('createOverride')) {
+			$parameters = array(
+				'action'  => 'query',
+				'list'    => 'users',
+				'format'  => 'php',
+				'ususers' => $request->getName(),
+			);
+
+			$content = $this->getHttpHelper()->get($this->getSiteConfiguration()->getMediawikiWebServiceEndpoint(),
+				$parameters);
+
+			$apiResult = unserialize($content);
+			$exists = !isset($apiResult['query']['users']['0']['missing']);
+
+			if (!$exists) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param Request $request
+	 * @param string  $mailText
+	 * @param User    $currentUser
+	 * @param boolean $ccMailingList
+	 */
+	protected function sendMail(Request $request, $mailText, User $currentUser, $ccMailingList)
+	{
+		$requestEmailHelper = new RequestEmailHelper($this->getEmailHelper());
+		$requestEmailHelper->sendMail($request, $mailText, $currentUser, $ccMailingList);
+
+		$request->setEmailSent(true);
+		$request->save();
+	}
+
+	/**
+	 * @param Request       $request
+	 * @param EmailTemplate $template
+	 * @param string        $templateName
+	 *
+	 * @throws Exception
+	 * @return void
+	 */
+	protected function showConfirmation(Request $request, EmailTemplate $template, $templateName)
+	{
+		$this->assignCSRFToken();
+
+		$this->assign('request', $request->getId());
+		$this->assign('template', $template->getId());
+
+		$this->assign('updateversion', $request->getUpdateVersion());
+
+		$this->assign('emailSentOverride', WebRequest::postBoolean('emailSentOverride') ? 'true' : 'false');
+		$this->assign('reserveOverride', WebRequest::postBoolean('reserveOverride') ? 'true' : 'false');
+		$this->assign('createOverride', WebRequest::postBoolean('createOverride') ? 'true' : 'false');
+
+		$this->skipAlerts();
+
+		$this->setTemplate($templateName);
+	}
+
+	/**
+	 * @param string $action
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	final protected function processWelcome(string $action): void
+	{
+		$database = $this->getDatabase();
+		$currentUser = User::getCurrent($database);
+
+		if ($action !== EmailTemplate::CREATED) {
+			return;
+		}
+
+		if ($currentUser->getWelcomeTemplate() === null) {
+			return;
+		}
+
+		if (WebRequest::postBoolean('skipAutoWelcome')) {
+			return;
+		}
+
+		$this->enqueueWelcomeTask($this->getRequest($database), null, $currentUser, $database);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
         if ($reservationId !== 0 && $reservationId !== null) {
             if ($currentUser->getId() !== $reservationId) {
                 SessionAlert::error("Request is reserved by someone else.");
-                $this->redirect('/viewRequest', null, ['id' => $request->getId()] );
+                $this->redirect('/viewRequest', null, ['id' => $request->getId()]);
                 return true;
             }
         }

includes/Pages/RequestAction/PageCreateRequest.php

Indentation +149 added lines, -149 removed lines

@@ -33,153 +33,153 @@
  */
 class PageCreateRequest extends RequestActionBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     * @throws AccessDeniedException
-     * @throws ApplicationLogicException
-     */
-    protected function main()
-    {
-        $this->checkPosted();
-
-        $database = $this->getDatabase();
-
-        $request = $this->getRequest($database);
-        $template = $this->getTemplate($database);
-        $creationMode = $this->getCreationMode();
-        $user = User::getCurrent($database);
-
-        $secMgr = $this->getSecurityManager();
-        if ($secMgr->allows('RequestCreation', User::CREATION_BOT, $user) !== SecurityManager::ALLOWED
-            && $creationMode === 'bot'
-        ) {
-            throw new AccessDeniedException($secMgr);
-        }
-        elseif ($secMgr->allows('RequestCreation', User::CREATION_OAUTH, $user) !== SecurityManager::ALLOWED
-            && $creationMode === 'oauth'
-        ) {
-            throw new AccessDeniedException($secMgr);
-        }
-
-        if ($request->getEmailSent()) {
-            throw new ApplicationLogicException('This requester has already had an email sent to them. Please fall back to manual creation');
-        }
-
-        $request->setStatus(RequestStatus::JOBQUEUE);
-        $request->setReserved(null);
-        $request->save();
-
-        Logger::enqueuedJobQueue($database, $request);
-
-        $creationTaskId = $this->enqueueCreationTask($creationMode, $request, $template, $user, $database);
-
-        if ($user->getWelcomeTemplate() !== null && !WebRequest::postBoolean('skipAutoWelcome')) {
-            $this->enqueueWelcomeTask($request, $creationTaskId, $user, $database);
-        }
-
-        $this->getNotificationHelper()->requestCloseQueued($request, $template->getName());
-
-        SessionAlert::success("Request {$request->getId()} has been queued for autocreation");
-
-        $this->redirect();
-    }
-
-    protected function getCreationMode()
-    {
-        $creationMode = WebRequest::postString('mode');
-        if ($creationMode !== 'oauth' && $creationMode !== 'bot') {
-            throw new ApplicationLogicException('Unknown creation mode');
-        }
-
-        return $creationMode;
-    }
-
-    /**
-     * @param PdoDatabase $database
-     *
-     * @return EmailTemplate
-     * @throws ApplicationLogicException
-     */
-    protected function getTemplate(PdoDatabase $database)
-    {
-        $templateId = WebRequest::postInt('template');
-        if ($templateId === null) {
-            throw new ApplicationLogicException('No template specified');
-        }
-
-        /** @var EmailTemplate $template */
-        $template = EmailTemplate::getById($templateId, $database);
-        if ($template === false || !$template->getActive()) {
-            throw new ApplicationLogicException('Invalid or inactive template specified');
-        }
-
-        if ($template->getDefaultAction() !== EmailTemplate::CREATED) {
-            throw new ApplicationLogicException('Specified template is not a creation template!');
-        }
-
-        return $template;
-    }
-
-    /**
-     * @param PdoDatabase $database
-     *
-     * @return Request
-     * @throws ApplicationLogicException
-     */
-    protected function getRequest(PdoDatabase $database)
-    {
-        $request = parent::getRequest($database);
-
-        if ($request->getStatus() == RequestStatus::CLOSED) {
-            throw new ApplicationLogicException('Request is already closed');
-        }
-
-        return $request;
-    }
-
-    /**
-     * @param               $creationMode
-     * @param Request       $request
-     * @param EmailTemplate $template
-     * @param User          $user
-     *
-     * @param PdoDatabase   $database
-     *
-     * @return int
-     * @throws ApplicationLogicException
-     */
-    protected function enqueueCreationTask(
-        $creationMode,
-        Request $request,
-        EmailTemplate $template,
-        User $user,
-        PdoDatabase $database
-    ) {
-        $creationTaskClass = null;
-
-        if ($creationMode == "oauth") {
-            $creationTaskClass = UserCreationTask::class;
-        }
-
-        if ($creationMode == "bot") {
-            $creationTaskClass = BotCreationTask::class;
-        }
-
-        if ($creationTaskClass === null) {
-            throw new ApplicationLogicException('Cannot determine creation mode');
-        }
-
-        $creationTask = new JobQueue();
-        $creationTask->setTask($creationTaskClass);
-        $creationTask->setRequest($request->getId());
-        $creationTask->setEmailTemplate($template->getId());
-        $creationTask->setTriggerUserId($user->getId());
-        $creationTask->setDatabase($database);
-        $creationTask->save();
-
-        $creationTaskId = $creationTask->getId();
-
-        return $creationTaskId;
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 * @throws AccessDeniedException
+	 * @throws ApplicationLogicException
+	 */
+	protected function main()
+	{
+		$this->checkPosted();
+
+		$database = $this->getDatabase();
+
+		$request = $this->getRequest($database);
+		$template = $this->getTemplate($database);
+		$creationMode = $this->getCreationMode();
+		$user = User::getCurrent($database);
+
+		$secMgr = $this->getSecurityManager();
+		if ($secMgr->allows('RequestCreation', User::CREATION_BOT, $user) !== SecurityManager::ALLOWED
+			&& $creationMode === 'bot'
+		) {
+			throw new AccessDeniedException($secMgr);
+		}
+		elseif ($secMgr->allows('RequestCreation', User::CREATION_OAUTH, $user) !== SecurityManager::ALLOWED
+			&& $creationMode === 'oauth'
+		) {
+			throw new AccessDeniedException($secMgr);
+		}
+
+		if ($request->getEmailSent()) {
+			throw new ApplicationLogicException('This requester has already had an email sent to them. Please fall back to manual creation');
+		}
+
+		$request->setStatus(RequestStatus::JOBQUEUE);
+		$request->setReserved(null);
+		$request->save();
+
+		Logger::enqueuedJobQueue($database, $request);
+
+		$creationTaskId = $this->enqueueCreationTask($creationMode, $request, $template, $user, $database);
+
+		if ($user->getWelcomeTemplate() !== null && !WebRequest::postBoolean('skipAutoWelcome')) {
+			$this->enqueueWelcomeTask($request, $creationTaskId, $user, $database);
+		}
+
+		$this->getNotificationHelper()->requestCloseQueued($request, $template->getName());
+
+		SessionAlert::success("Request {$request->getId()} has been queued for autocreation");
+
+		$this->redirect();
+	}
+
+	protected function getCreationMode()
+	{
+		$creationMode = WebRequest::postString('mode');
+		if ($creationMode !== 'oauth' && $creationMode !== 'bot') {
+			throw new ApplicationLogicException('Unknown creation mode');
+		}
+
+		return $creationMode;
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 *
+	 * @return EmailTemplate
+	 * @throws ApplicationLogicException
+	 */
+	protected function getTemplate(PdoDatabase $database)
+	{
+		$templateId = WebRequest::postInt('template');
+		if ($templateId === null) {
+			throw new ApplicationLogicException('No template specified');
+		}
+
+		/** @var EmailTemplate $template */
+		$template = EmailTemplate::getById($templateId, $database);
+		if ($template === false || !$template->getActive()) {
+			throw new ApplicationLogicException('Invalid or inactive template specified');
+		}
+
+		if ($template->getDefaultAction() !== EmailTemplate::CREATED) {
+			throw new ApplicationLogicException('Specified template is not a creation template!');
+		}
+
+		return $template;
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 *
+	 * @return Request
+	 * @throws ApplicationLogicException
+	 */
+	protected function getRequest(PdoDatabase $database)
+	{
+		$request = parent::getRequest($database);
+
+		if ($request->getStatus() == RequestStatus::CLOSED) {
+			throw new ApplicationLogicException('Request is already closed');
+		}
+
+		return $request;
+	}
+
+	/**
+	 * @param               $creationMode
+	 * @param Request       $request
+	 * @param EmailTemplate $template
+	 * @param User          $user
+	 *
+	 * @param PdoDatabase   $database
+	 *
+	 * @return int
+	 * @throws ApplicationLogicException
+	 */
+	protected function enqueueCreationTask(
+		$creationMode,
+		Request $request,
+		EmailTemplate $template,
+		User $user,
+		PdoDatabase $database
+	) {
+		$creationTaskClass = null;
+
+		if ($creationMode == "oauth") {
+			$creationTaskClass = UserCreationTask::class;
+		}
+
+		if ($creationMode == "bot") {
+			$creationTaskClass = BotCreationTask::class;
+		}
+
+		if ($creationTaskClass === null) {
+			throw new ApplicationLogicException('Cannot determine creation mode');
+		}
+
+		$creationTask = new JobQueue();
+		$creationTask->setTask($creationTaskClass);
+		$creationTask->setRequest($request->getId());
+		$creationTask->setEmailTemplate($template->getId());
+		$creationTask->setTriggerUserId($user->getId());
+		$creationTask->setDatabase($database);
+		$creationTask->save();
+
+		$creationTaskId = $creationTask->getId();
+
+		return $creationTaskId;
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
             && $creationMode === 'bot'
         ) {
             throw new AccessDeniedException($secMgr);
-        }
-        elseif ($secMgr->allows('RequestCreation', User::CREATION_OAUTH, $user) !== SecurityManager::ALLOWED
+        } elseif ($secMgr->allows('RequestCreation', User::CREATION_OAUTH, $user) !== SecurityManager::ALLOWED
             && $creationMode === 'oauth'
         ) {
             throw new AccessDeniedException($secMgr);

includes/Pages/RequestAction/PageDeferRequest.php

Indentation +67 added lines, -67 removed lines

@@ -20,71 +20,71 @@
 
 class PageDeferRequest extends RequestActionBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @throws ApplicationLogicException
-     */
-    protected function main()
-    {
-        $this->checkPosted();
-        $database = $this->getDatabase();
-        $request = $this->getRequest($database);
-        $currentUser = User::getCurrent($database);
-
-        $target = WebRequest::postString('target');
-        $requestStates = $this->getSiteConfiguration()->getRequestStates();
-
-        if (!array_key_exists($target, $requestStates)) {
-            throw new ApplicationLogicException('Defer target not valid');
-        }
-
-        if ($request->getStatus() == $target) {
-            SessionAlert::warning('This request is already in the specified queue.');
-            $this->redirect('viewRequest', null, array('id' => $request->getId()));
-
-            return;
-        }
-
-        $closureDate = $request->getClosureDate();
-        $date = new DateTime();
-        $date->modify("-7 days");
-        $oneweek = $date->format("Y-m-d H:i:s");
-
-
-        if ($request->getStatus() == "Closed" && $closureDate < $oneweek) {
-            if (!$this->barrierTest('reopenOldRequest', $currentUser, 'RequestData')) {
-                throw new ApplicationLogicException(
-                    "You are not allowed to re-open a request that has been closed for over a week.");
-            }
-        }
-
-        if ($request->getStatus() === RequestStatus::JOBQUEUE) {
-            /** @var JobQueue[] $pendingJobs */
-            $pendingJobs = JobQueueSearchHelper::get($database)->byRequest($request->getId())->statusIn([
-                JobQueue::STATUS_READY,
-                JobQueue::STATUS_WAITING,
-            ])->fetch();
-
-            foreach ($pendingJobs as $job) {
-                $job->setStatus(JobQueue::STATUS_CANCELLED);
-                $job->setError('Cancelled by request deferral');
-                $job->save();
-            }
-        }
-
-        $request->setReserved(null);
-        $request->setStatus($target);
-        $request->setUpdateVersion(WebRequest::postInt('updateversion'));
-        $request->save();
-
-        $deto = $requestStates[$target]['deferto'];
-        $detolog = $requestStates[$target]['defertolog'];
-
-        Logger::deferRequest($database, $request, $detolog);
-
-        $this->getNotificationHelper()->requestDeferred($request);
-        SessionAlert::success("Request {$request->getId()} deferred to {$deto}");
-
-        $this->redirect();
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @throws ApplicationLogicException
+	 */
+	protected function main()
+	{
+		$this->checkPosted();
+		$database = $this->getDatabase();
+		$request = $this->getRequest($database);
+		$currentUser = User::getCurrent($database);
+
+		$target = WebRequest::postString('target');
+		$requestStates = $this->getSiteConfiguration()->getRequestStates();
+
+		if (!array_key_exists($target, $requestStates)) {
+			throw new ApplicationLogicException('Defer target not valid');
+		}
+
+		if ($request->getStatus() == $target) {
+			SessionAlert::warning('This request is already in the specified queue.');
+			$this->redirect('viewRequest', null, array('id' => $request->getId()));
+
+			return;
+		}
+
+		$closureDate = $request->getClosureDate();
+		$date = new DateTime();
+		$date->modify("-7 days");
+		$oneweek = $date->format("Y-m-d H:i:s");
+
+
+		if ($request->getStatus() == "Closed" && $closureDate < $oneweek) {
+			if (!$this->barrierTest('reopenOldRequest', $currentUser, 'RequestData')) {
+				throw new ApplicationLogicException(
+					"You are not allowed to re-open a request that has been closed for over a week.");
+			}
+		}
+
+		if ($request->getStatus() === RequestStatus::JOBQUEUE) {
+			/** @var JobQueue[] $pendingJobs */
+			$pendingJobs = JobQueueSearchHelper::get($database)->byRequest($request->getId())->statusIn([
+				JobQueue::STATUS_READY,
+				JobQueue::STATUS_WAITING,
+			])->fetch();
+
+			foreach ($pendingJobs as $job) {
+				$job->setStatus(JobQueue::STATUS_CANCELLED);
+				$job->setError('Cancelled by request deferral');
+				$job->save();
+			}
+		}
+
+		$request->setReserved(null);
+		$request->setStatus($target);
+		$request->setUpdateVersion(WebRequest::postInt('updateversion'));
+		$request->save();
+
+		$deto = $requestStates[$target]['deferto'];
+		$detolog = $requestStates[$target]['defertolog'];
+
+		Logger::deferRequest($database, $request, $detolog);
+
+		$this->getNotificationHelper()->requestDeferred($request);
+		SessionAlert::success("Request {$request->getId()} deferred to {$deto}");
+
+		$this->redirect();
+	}
 }

includes/Pages/Page404.php

Indentation +15 added lines, -15 removed lines

@@ -12,21 +12,21 @@
 
 class Page404 extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no actions are called.
-     */
-    protected function main()
-    {
-        if (!headers_sent()) {
-            header("HTTP/1.1 404 Not Found");
-        }
+	/**
+	 * Main function for this page, when no actions are called.
+	 */
+	protected function main()
+	{
+		if (!headers_sent()) {
+			header("HTTP/1.1 404 Not Found");
+		}
 
-        $this->skipAlerts();
-        $this->setTemplate("404.tpl");
-    }
+		$this->skipAlerts();
+		$this->setTemplate("404.tpl");
+	}
 
-    protected function isProtectedPage()
-    {
-        return false;
-    }
+	protected function isProtectedPage()
+	{
+		return false;
+	}
 }

includes/Pages/PageUserManagement.php

Indentation +561 added lines, -561 removed lines

@@ -24,565 +24,565 @@
  */
 class PageUserManagement extends InternalPageBase
 {
-    /** @var string */
-    private $adminMailingList = 'enwiki-acc-admins@googlegroups.com';
-
-    /**
-     * Main function for this page, when no specific actions are called.
-     */
-    protected function main()
-    {
-        $this->setHtmlTitle('User Management');
-
-        $database = $this->getDatabase();
-        $currentUser = User::getCurrent($database);
-
-        $userSearchRequest = WebRequest::getString('usersearch');
-        if ($userSearchRequest !== null) {
-            $searchedUser = User::getByUsername($userSearchRequest, $database);
-            if($searchedUser !== false) {
-                $this->redirect('statistics/users', 'detail', ['user' => $searchedUser->getId()]);
-                return;
-            }
-        }
-
-        // A bit hacky, but it's better than my last solution of creating an object for each user and passing that to
-        // the template. I still don't have a particularly good way of handling this.
-        OAuthUserHelper::prepareTokenCountStatement($database);
-
-        if (WebRequest::getBoolean("showAll")) {
-            $this->assign("showAll", true);
-
-            $suspendedUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_SUSPENDED)->fetch();
-            $this->assign("suspendedUsers", $suspendedUsers);
-
-            $declinedUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_DECLINED)->fetch();
-            $this->assign("declinedUsers", $declinedUsers);
-
-            UserSearchHelper::get($database)->getRoleMap($roleMap);
-        }
-        else {
-            $this->assign("showAll", false);
-            $this->assign("suspendedUsers", array());
-            $this->assign("declinedUsers", array());
-
-            UserSearchHelper::get($database)->statusIn(array('New', 'Active'))->getRoleMap($roleMap);
-        }
-
-        $newUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_NEW)->fetch();
-        $normalUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('user')->fetch();
-        $adminUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('admin')->fetch();
-        $checkUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('checkuser')->fetch();
-        $toolRoots = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('toolRoot')->fetch();
-        $this->assign('newUsers', $newUsers);
-        $this->assign('normalUsers', $normalUsers);
-        $this->assign('adminUsers', $adminUsers);
-        $this->assign('checkUsers', $checkUsers);
-        $this->assign('toolRoots', $toolRoots);
-
-        $this->assign('roles', $roleMap);
-
-        $this->addJs("/api.php?action=users&all=true&targetVariable=typeaheaddata");
-
-        $this->assign('canApprove', $this->barrierTest('approve', $currentUser));
-        $this->assign('canDecline', $this->barrierTest('decline', $currentUser));
-        $this->assign('canRename', $this->barrierTest('rename', $currentUser));
-        $this->assign('canEditUser', $this->barrierTest('editUser', $currentUser));
-        $this->assign('canSuspend', $this->barrierTest('suspend', $currentUser));
-        $this->assign('canEditRoles', $this->barrierTest('editRoles', $currentUser));
-
-        $this->setTemplate("usermanagement/main.tpl");
-    }
-
-    #region Access control
-
-    /**
-     * Action target for editing the roles assigned to a user
-     */
-    protected function editRoles()
-    {
-        $this->setHtmlTitle('User Management');
-        $database = $this->getDatabase();
-        $userId = WebRequest::getInt('user');
-
-        /** @var User $user */
-        $user = User::getById($userId, $database);
-
-        if ($user === false) {
-            throw new ApplicationLogicException('Sorry, the user you are trying to edit could not be found.');
-        }
-
-        $roleData = $this->getRoleData(UserRole::getForUser($user->getId(), $database));
-
-        // Dual-mode action
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-
-            $reason = WebRequest::postString('reason');
-            if ($reason === false || trim($reason) === '') {
-                throw new ApplicationLogicException('No reason specified for roles change');
-            }
-
-            /** @var UserRole[] $delete */
-            $delete = array();
-            /** @var string[] $delete */
-            $add = array();
-
-            foreach ($roleData as $name => $r) {
-                if ($r['allowEdit'] !== 1) {
-                    // not allowed, to touch this, so ignore it
-                    continue;
-                }
-
-                $newValue = WebRequest::postBoolean('role-' . $name) ? 1 : 0;
-                if ($newValue !== $r['active']) {
-                    if ($newValue === 0) {
-                        $delete[] = $r['object'];
-                    }
-
-                    if ($newValue === 1) {
-                        $add[] = $name;
-                    }
-                }
-            }
-
-            // Check there's something to do
-            if ((count($add) + count($delete)) === 0) {
-                $this->redirect('statistics/users', 'detail', array('user' => $user->getId()));
-                SessionAlert::warning('No changes made to roles.');
-
-                return;
-            }
-
-            $removed = array();
-
-            /** @var UserRole $d */
-            foreach ($delete as $d) {
-                $removed[] = $d->getRole();
-                $d->delete();
-            }
-
-            foreach ($add as $x) {
-                $a = new UserRole();
-                $a->setUser($user->getId());
-                $a->setRole($x);
-                $a->setDatabase($database);
-                $a->save();
-            }
-
-            Logger::userRolesEdited($database, $user, $reason, $add, $removed);
-
-            // dummy save for optimistic locking. If this fails, the entire txn will roll back.
-            $user->setUpdateVersion(WebRequest::postInt('updateversion'));
-            $user->save();
-
-            $this->getNotificationHelper()->userRolesEdited($user, $reason);
-            SessionAlert::quick('Roles changed for user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
-
-            $this->redirect('statistics/users', 'detail', array('user' => $user->getId()));
-
-            return;
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->setTemplate('usermanagement/roleedit.tpl');
-            $this->assign('user', $user);
-            $this->assign('roleData', $roleData);
-        }
-    }
-
-    /**
-     * Action target for suspending users
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function suspend()
-    {
-        $this->setHtmlTitle('User Management');
-
-        $database = $this->getDatabase();
-
-        $userId = WebRequest::getInt('user');
-
-        /** @var User $user */
-        $user = User::getById($userId, $database);
-
-        if ($user === false) {
-            throw new ApplicationLogicException('Sorry, the user you are trying to suspend could not be found.');
-        }
-
-        if ($user->isSuspended()) {
-            throw new ApplicationLogicException('Sorry, the user you are trying to suspend is already suspended.');
-        }
-
-        // Dual-mode action
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $reason = WebRequest::postString('reason');
-
-            if ($reason === null || trim($reason) === "") {
-                throw new ApplicationLogicException('No reason provided');
-            }
-
-            $user->setStatus(User::STATUS_SUSPENDED);
-            $user->setUpdateVersion(WebRequest::postInt('updateversion'));
-            $user->save();
-            Logger::suspendedUser($database, $user, $reason);
-
-            $this->getNotificationHelper()->userSuspended($user, $reason);
-            SessionAlert::quick('Suspended user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
-
-            // send email
-            $this->sendStatusChangeEmail(
-                'Your WP:ACC account has been suspended',
-                'usermanagement/emails/suspended.tpl',
-                $reason,
-                $user,
-                User::getCurrent($database)->getUsername()
-            );
-
-            $this->redirect('userManagement');
-
-            return;
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->setTemplate('usermanagement/changelevel-reason.tpl');
-            $this->assign('user', $user);
-            $this->assign('status', 'Suspended');
-            $this->assign("showReason", true);
-
-            if (WebRequest::getString('preload')) {
-                $this->assign('preload', WebRequest::getString('preload'));
-            }
-        }
-    }
-
-    /**
-     * Entry point for the decline action
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function decline()
-    {
-        $this->setHtmlTitle('User Management');
-
-        $database = $this->getDatabase();
-
-        $userId = WebRequest::getInt('user');
-        $user = User::getById($userId, $database);
-
-        if ($user === false) {
-            throw new ApplicationLogicException('Sorry, the user you are trying to decline could not be found.');
-        }
-
-        if (!$user->isNewUser()) {
-            throw new ApplicationLogicException('Sorry, the user you are trying to decline is not new.');
-        }
-
-        // Dual-mode action
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $reason = WebRequest::postString('reason');
-
-            if ($reason === null || trim($reason) === "") {
-                throw new ApplicationLogicException('No reason provided');
-            }
-
-            $user->setStatus(User::STATUS_DECLINED);
-            $user->setUpdateVersion(WebRequest::postInt('updateversion'));
-            $user->save();
-            Logger::declinedUser($database, $user, $reason);
-
-            $this->getNotificationHelper()->userDeclined($user, $reason);
-            SessionAlert::quick('Declined user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
-
-            // send email
-            $this->sendStatusChangeEmail(
-                'Your WP:ACC account has been declined',
-                'usermanagement/emails/declined.tpl',
-                $reason,
-                $user,
-                User::getCurrent($database)->getUsername()
-            );
-
-            $this->redirect('userManagement');
-
-            return;
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->setTemplate('usermanagement/changelevel-reason.tpl');
-            $this->assign('user', $user);
-            $this->assign('status', 'Declined');
-            $this->assign("showReason", true);
-        }
-    }
-
-    /**
-     * Entry point for the approve action
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function approve()
-    {
-        $this->setHtmlTitle('User Management');
-
-        $database = $this->getDatabase();
-
-        $userId = WebRequest::getInt('user');
-        $user = User::getById($userId, $database);
-
-        if ($user === false) {
-            throw new ApplicationLogicException('Sorry, the user you are trying to approve could not be found.');
-        }
-
-        if ($user->isActive()) {
-            throw new ApplicationLogicException('Sorry, the user you are trying to approve is already an active user.');
-        }
-
-        // Dual-mode action
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $user->setStatus(User::STATUS_ACTIVE);
-            $user->setUpdateVersion(WebRequest::postInt('updateversion'));
-            $user->save();
-            Logger::approvedUser($database, $user);
-
-            $this->getNotificationHelper()->userApproved($user);
-            SessionAlert::quick('Approved user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
-
-            // send email
-            $this->sendStatusChangeEmail(
-                'Your WP:ACC account has been approved',
-                'usermanagement/emails/approved.tpl',
-                null,
-                $user,
-                User::getCurrent($database)->getUsername()
-            );
-
-            $this->redirect("userManagement");
-
-            return;
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->setTemplate("usermanagement/changelevel-reason.tpl");
-            $this->assign("user", $user);
-            $this->assign("status", "Active");
-            $this->assign("showReason", false);
-        }
-    }
-
-    #endregion
-
-    #region Renaming / Editing
-
-    /**
-     * Entry point for the rename action
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function rename()
-    {
-        $this->setHtmlTitle('User Management');
-
-        $database = $this->getDatabase();
-
-        $userId = WebRequest::getInt('user');
-        $user = User::getById($userId, $database);
-
-        if ($user === false) {
-            throw new ApplicationLogicException('Sorry, the user you are trying to rename could not be found.');
-        }
-
-        // Dual-mode action
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $newUsername = WebRequest::postString('newname');
-
-            if ($newUsername === null || trim($newUsername) === "") {
-                throw new ApplicationLogicException('The new username cannot be empty');
-            }
-
-            if (User::getByUsername($newUsername, $database) != false) {
-                throw new ApplicationLogicException('The new username already exists');
-            }
-
-            $oldUsername = $user->getUsername();
-            $user->setUsername($newUsername);
-            $user->setUpdateVersion(WebRequest::postInt('updateversion'));
-
-            $user->save();
-
-            $logEntryData = serialize(array(
-                'old' => $oldUsername,
-                'new' => $newUsername,
-            ));
-
-            Logger::renamedUser($database, $user, $logEntryData);
-
-            SessionAlert::quick("Changed User "
-                . htmlentities($oldUsername, ENT_COMPAT, 'UTF-8')
-                . " name to "
-                . htmlentities($newUsername, ENT_COMPAT, 'UTF-8'));
-
-            $this->getNotificationHelper()->userRenamed($user, $oldUsername);
-
-            // send an email to the user.
-            $this->assign('targetUsername', $user->getUsername());
-            $this->assign('toolAdmin', User::getCurrent($database)->getUsername());
-            $this->assign('oldUsername', $oldUsername);
-            $this->assign('mailingList', $this->adminMailingList);
-
-            $this->getEmailHelper()->sendMail(
-                $user->getEmail(),
-                'Your username on WP:ACC has been changed',
-                $this->fetchTemplate('usermanagement/emails/renamed.tpl'),
-                array('Reply-To' => $this->adminMailingList)
-            );
-
-            $this->redirect("userManagement");
-
-            return;
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->setTemplate('usermanagement/renameuser.tpl');
-            $this->assign('user', $user);
-        }
-    }
-
-    /**
-     * Entry point for the edit action
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function editUser()
-    {
-        $this->setHtmlTitle('User Management');
-
-        $database = $this->getDatabase();
-
-        $userId = WebRequest::getInt('user');
-        $user = User::getById($userId, $database);
-        $oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
-
-        if ($user === false) {
-            throw new ApplicationLogicException('Sorry, the user you are trying to edit could not be found.');
-        }
-
-        // Dual-mode action
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $newEmail = WebRequest::postEmail('user_email');
-            $newOnWikiName = WebRequest::postString('user_onwikiname');
-
-            if ($newEmail === null) {
-                throw new ApplicationLogicException('Invalid email address');
-            }
-
-            if (!($oauth->isFullyLinked() || $oauth->isPartiallyLinked())) {
-                if (trim($newOnWikiName) == "") {
-                    throw new ApplicationLogicException('New on-wiki username cannot be blank');
-                }
-
-                $user->setOnWikiName($newOnWikiName);
-                $user->setWelcomeSig(WebRequest::postString('sig'));
-            }
-
-            $user->setEmail($newEmail);
-            $user->setCreationMode(WebRequest::postInt('creationmode'));
-
-            $user->setUpdateVersion(WebRequest::postInt('updateversion'));
-
-            $user->save();
-
-            Logger::userPreferencesChange($database, $user);
-            $this->getNotificationHelper()->userPrefChange($user);
-            SessionAlert::quick('Changes to user\'s preferences have been saved');
-
-            $this->redirect("userManagement");
-
-            return;
-        }
-        else {
-            $this->assignCSRFToken();
-            $oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(),
-                $this->getSiteConfiguration());
-            $this->setTemplate('usermanagement/edituser.tpl');
-            $this->assign('user', $user);
-            $this->assign('oauth', $oauth);
-
-            $this->assign('canManualCreate',
-                $this->barrierTest(User::CREATION_MANUAL, $user, 'RequestCreation'));
-            $this->assign('canOauthCreate',
-                $this->barrierTest(User::CREATION_OAUTH, $user, 'RequestCreation'));
-            $this->assign('canBotCreate',
-                $this->barrierTest(User::CREATION_BOT, $user, 'RequestCreation'));
-        }
-    }
-
-    #endregion
-
-    /**
-     * Sends a status change email to the user.
-     *
-     * @param string      $subject           The subject of the email
-     * @param string      $template          The smarty template to use
-     * @param string|null $reason            The reason for performing the status change
-     * @param User        $user              The user affected
-     * @param string      $toolAdminUsername The tool admin's username who is making the edit
-     */
-    private function sendStatusChangeEmail($subject, $template, $reason, $user, $toolAdminUsername)
-    {
-        $this->assign('targetUsername', $user->getUsername());
-        $this->assign('toolAdmin', $toolAdminUsername);
-        $this->assign('actionReason', $reason);
-        $this->assign('mailingList', $this->adminMailingList);
-
-        $this->getEmailHelper()->sendMail(
-            $user->getEmail(),
-            $subject,
-            $this->fetchTemplate($template),
-            array('Reply-To' => $this->adminMailingList)
-        );
-    }
-
-    /**
-     * @param UserRole[] $activeRoles
-     *
-     * @return array
-     */
-    private function getRoleData($activeRoles)
-    {
-        $availableRoles = $this->getSecurityManager()->getRoleConfiguration()->getAvailableRoles();
-
-        $currentUser = User::getCurrent($this->getDatabase());
-        $this->getSecurityManager()->getActiveRoles($currentUser, $userRoles, $inactiveRoles);
-
-        $initialValue = array('active' => 0, 'allowEdit' => 0, 'description' => '???', 'object' => null);
-
-        $roleData = array();
-        foreach ($availableRoles as $role => $data) {
-            $intersection = array_intersect($data['editableBy'], $userRoles);
-
-            $roleData[$role] = $initialValue;
-            $roleData[$role]['allowEdit'] = count($intersection) > 0 ? 1 : 0;
-            $roleData[$role]['description'] = $data['description'];
-        }
-
-        foreach ($activeRoles as $role) {
-            if (!isset($roleData[$role->getRole()])) {
-                // This value is no longer available in the configuration, allow changing (aka removing) it.
-                $roleData[$role->getRole()] = $initialValue;
-                $roleData[$role->getRole()]['allowEdit'] = 1;
-            }
-
-            $roleData[$role->getRole()]['object'] = $role;
-            $roleData[$role->getRole()]['active'] = 1;
-        }
-
-        return $roleData;
-    }
+	/** @var string */
+	private $adminMailingList = 'enwiki-acc-admins@googlegroups.com';
+
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 */
+	protected function main()
+	{
+		$this->setHtmlTitle('User Management');
+
+		$database = $this->getDatabase();
+		$currentUser = User::getCurrent($database);
+
+		$userSearchRequest = WebRequest::getString('usersearch');
+		if ($userSearchRequest !== null) {
+			$searchedUser = User::getByUsername($userSearchRequest, $database);
+			if($searchedUser !== false) {
+				$this->redirect('statistics/users', 'detail', ['user' => $searchedUser->getId()]);
+				return;
+			}
+		}
+
+		// A bit hacky, but it's better than my last solution of creating an object for each user and passing that to
+		// the template. I still don't have a particularly good way of handling this.
+		OAuthUserHelper::prepareTokenCountStatement($database);
+
+		if (WebRequest::getBoolean("showAll")) {
+			$this->assign("showAll", true);
+
+			$suspendedUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_SUSPENDED)->fetch();
+			$this->assign("suspendedUsers", $suspendedUsers);
+
+			$declinedUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_DECLINED)->fetch();
+			$this->assign("declinedUsers", $declinedUsers);
+
+			UserSearchHelper::get($database)->getRoleMap($roleMap);
+		}
+		else {
+			$this->assign("showAll", false);
+			$this->assign("suspendedUsers", array());
+			$this->assign("declinedUsers", array());
+
+			UserSearchHelper::get($database)->statusIn(array('New', 'Active'))->getRoleMap($roleMap);
+		}
+
+		$newUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_NEW)->fetch();
+		$normalUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('user')->fetch();
+		$adminUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('admin')->fetch();
+		$checkUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('checkuser')->fetch();
+		$toolRoots = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('toolRoot')->fetch();
+		$this->assign('newUsers', $newUsers);
+		$this->assign('normalUsers', $normalUsers);
+		$this->assign('adminUsers', $adminUsers);
+		$this->assign('checkUsers', $checkUsers);
+		$this->assign('toolRoots', $toolRoots);
+
+		$this->assign('roles', $roleMap);
+
+		$this->addJs("/api.php?action=users&all=true&targetVariable=typeaheaddata");
+
+		$this->assign('canApprove', $this->barrierTest('approve', $currentUser));
+		$this->assign('canDecline', $this->barrierTest('decline', $currentUser));
+		$this->assign('canRename', $this->barrierTest('rename', $currentUser));
+		$this->assign('canEditUser', $this->barrierTest('editUser', $currentUser));
+		$this->assign('canSuspend', $this->barrierTest('suspend', $currentUser));
+		$this->assign('canEditRoles', $this->barrierTest('editRoles', $currentUser));
+
+		$this->setTemplate("usermanagement/main.tpl");
+	}
+
+	#region Access control
+
+	/**
+	 * Action target for editing the roles assigned to a user
+	 */
+	protected function editRoles()
+	{
+		$this->setHtmlTitle('User Management');
+		$database = $this->getDatabase();
+		$userId = WebRequest::getInt('user');
+
+		/** @var User $user */
+		$user = User::getById($userId, $database);
+
+		if ($user === false) {
+			throw new ApplicationLogicException('Sorry, the user you are trying to edit could not be found.');
+		}
+
+		$roleData = $this->getRoleData(UserRole::getForUser($user->getId(), $database));
+
+		// Dual-mode action
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+
+			$reason = WebRequest::postString('reason');
+			if ($reason === false || trim($reason) === '') {
+				throw new ApplicationLogicException('No reason specified for roles change');
+			}
+
+			/** @var UserRole[] $delete */
+			$delete = array();
+			/** @var string[] $delete */
+			$add = array();
+
+			foreach ($roleData as $name => $r) {
+				if ($r['allowEdit'] !== 1) {
+					// not allowed, to touch this, so ignore it
+					continue;
+				}
+
+				$newValue = WebRequest::postBoolean('role-' . $name) ? 1 : 0;
+				if ($newValue !== $r['active']) {
+					if ($newValue === 0) {
+						$delete[] = $r['object'];
+					}
+
+					if ($newValue === 1) {
+						$add[] = $name;
+					}
+				}
+			}
+
+			// Check there's something to do
+			if ((count($add) + count($delete)) === 0) {
+				$this->redirect('statistics/users', 'detail', array('user' => $user->getId()));
+				SessionAlert::warning('No changes made to roles.');
+
+				return;
+			}
+
+			$removed = array();
+
+			/** @var UserRole $d */
+			foreach ($delete as $d) {
+				$removed[] = $d->getRole();
+				$d->delete();
+			}
+
+			foreach ($add as $x) {
+				$a = new UserRole();
+				$a->setUser($user->getId());
+				$a->setRole($x);
+				$a->setDatabase($database);
+				$a->save();
+			}
+
+			Logger::userRolesEdited($database, $user, $reason, $add, $removed);
+
+			// dummy save for optimistic locking. If this fails, the entire txn will roll back.
+			$user->setUpdateVersion(WebRequest::postInt('updateversion'));
+			$user->save();
+
+			$this->getNotificationHelper()->userRolesEdited($user, $reason);
+			SessionAlert::quick('Roles changed for user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
+
+			$this->redirect('statistics/users', 'detail', array('user' => $user->getId()));
+
+			return;
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->setTemplate('usermanagement/roleedit.tpl');
+			$this->assign('user', $user);
+			$this->assign('roleData', $roleData);
+		}
+	}
+
+	/**
+	 * Action target for suspending users
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function suspend()
+	{
+		$this->setHtmlTitle('User Management');
+
+		$database = $this->getDatabase();
+
+		$userId = WebRequest::getInt('user');
+
+		/** @var User $user */
+		$user = User::getById($userId, $database);
+
+		if ($user === false) {
+			throw new ApplicationLogicException('Sorry, the user you are trying to suspend could not be found.');
+		}
+
+		if ($user->isSuspended()) {
+			throw new ApplicationLogicException('Sorry, the user you are trying to suspend is already suspended.');
+		}
+
+		// Dual-mode action
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$reason = WebRequest::postString('reason');
+
+			if ($reason === null || trim($reason) === "") {
+				throw new ApplicationLogicException('No reason provided');
+			}
+
+			$user->setStatus(User::STATUS_SUSPENDED);
+			$user->setUpdateVersion(WebRequest::postInt('updateversion'));
+			$user->save();
+			Logger::suspendedUser($database, $user, $reason);
+
+			$this->getNotificationHelper()->userSuspended($user, $reason);
+			SessionAlert::quick('Suspended user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
+
+			// send email
+			$this->sendStatusChangeEmail(
+				'Your WP:ACC account has been suspended',
+				'usermanagement/emails/suspended.tpl',
+				$reason,
+				$user,
+				User::getCurrent($database)->getUsername()
+			);
+
+			$this->redirect('userManagement');
+
+			return;
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->setTemplate('usermanagement/changelevel-reason.tpl');
+			$this->assign('user', $user);
+			$this->assign('status', 'Suspended');
+			$this->assign("showReason", true);
+
+			if (WebRequest::getString('preload')) {
+				$this->assign('preload', WebRequest::getString('preload'));
+			}
+		}
+	}
+
+	/**
+	 * Entry point for the decline action
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function decline()
+	{
+		$this->setHtmlTitle('User Management');
+
+		$database = $this->getDatabase();
+
+		$userId = WebRequest::getInt('user');
+		$user = User::getById($userId, $database);
+
+		if ($user === false) {
+			throw new ApplicationLogicException('Sorry, the user you are trying to decline could not be found.');
+		}
+
+		if (!$user->isNewUser()) {
+			throw new ApplicationLogicException('Sorry, the user you are trying to decline is not new.');
+		}
+
+		// Dual-mode action
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$reason = WebRequest::postString('reason');
+
+			if ($reason === null || trim($reason) === "") {
+				throw new ApplicationLogicException('No reason provided');
+			}
+
+			$user->setStatus(User::STATUS_DECLINED);
+			$user->setUpdateVersion(WebRequest::postInt('updateversion'));
+			$user->save();
+			Logger::declinedUser($database, $user, $reason);
+
+			$this->getNotificationHelper()->userDeclined($user, $reason);
+			SessionAlert::quick('Declined user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
+
+			// send email
+			$this->sendStatusChangeEmail(
+				'Your WP:ACC account has been declined',
+				'usermanagement/emails/declined.tpl',
+				$reason,
+				$user,
+				User::getCurrent($database)->getUsername()
+			);
+
+			$this->redirect('userManagement');
+
+			return;
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->setTemplate('usermanagement/changelevel-reason.tpl');
+			$this->assign('user', $user);
+			$this->assign('status', 'Declined');
+			$this->assign("showReason", true);
+		}
+	}
+
+	/**
+	 * Entry point for the approve action
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function approve()
+	{
+		$this->setHtmlTitle('User Management');
+
+		$database = $this->getDatabase();
+
+		$userId = WebRequest::getInt('user');
+		$user = User::getById($userId, $database);
+
+		if ($user === false) {
+			throw new ApplicationLogicException('Sorry, the user you are trying to approve could not be found.');
+		}
+
+		if ($user->isActive()) {
+			throw new ApplicationLogicException('Sorry, the user you are trying to approve is already an active user.');
+		}
+
+		// Dual-mode action
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$user->setStatus(User::STATUS_ACTIVE);
+			$user->setUpdateVersion(WebRequest::postInt('updateversion'));
+			$user->save();
+			Logger::approvedUser($database, $user);
+
+			$this->getNotificationHelper()->userApproved($user);
+			SessionAlert::quick('Approved user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
+
+			// send email
+			$this->sendStatusChangeEmail(
+				'Your WP:ACC account has been approved',
+				'usermanagement/emails/approved.tpl',
+				null,
+				$user,
+				User::getCurrent($database)->getUsername()
+			);
+
+			$this->redirect("userManagement");
+
+			return;
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->setTemplate("usermanagement/changelevel-reason.tpl");
+			$this->assign("user", $user);
+			$this->assign("status", "Active");
+			$this->assign("showReason", false);
+		}
+	}
+
+	#endregion
+
+	#region Renaming / Editing
+
+	/**
+	 * Entry point for the rename action
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function rename()
+	{
+		$this->setHtmlTitle('User Management');
+
+		$database = $this->getDatabase();
+
+		$userId = WebRequest::getInt('user');
+		$user = User::getById($userId, $database);
+
+		if ($user === false) {
+			throw new ApplicationLogicException('Sorry, the user you are trying to rename could not be found.');
+		}
+
+		// Dual-mode action
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$newUsername = WebRequest::postString('newname');
+
+			if ($newUsername === null || trim($newUsername) === "") {
+				throw new ApplicationLogicException('The new username cannot be empty');
+			}
+
+			if (User::getByUsername($newUsername, $database) != false) {
+				throw new ApplicationLogicException('The new username already exists');
+			}
+
+			$oldUsername = $user->getUsername();
+			$user->setUsername($newUsername);
+			$user->setUpdateVersion(WebRequest::postInt('updateversion'));
+
+			$user->save();
+
+			$logEntryData = serialize(array(
+				'old' => $oldUsername,
+				'new' => $newUsername,
+			));
+
+			Logger::renamedUser($database, $user, $logEntryData);
+
+			SessionAlert::quick("Changed User "
+				. htmlentities($oldUsername, ENT_COMPAT, 'UTF-8')
+				. " name to "
+				. htmlentities($newUsername, ENT_COMPAT, 'UTF-8'));
+
+			$this->getNotificationHelper()->userRenamed($user, $oldUsername);
+
+			// send an email to the user.
+			$this->assign('targetUsername', $user->getUsername());
+			$this->assign('toolAdmin', User::getCurrent($database)->getUsername());
+			$this->assign('oldUsername', $oldUsername);
+			$this->assign('mailingList', $this->adminMailingList);
+
+			$this->getEmailHelper()->sendMail(
+				$user->getEmail(),
+				'Your username on WP:ACC has been changed',
+				$this->fetchTemplate('usermanagement/emails/renamed.tpl'),
+				array('Reply-To' => $this->adminMailingList)
+			);
+
+			$this->redirect("userManagement");
+
+			return;
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->setTemplate('usermanagement/renameuser.tpl');
+			$this->assign('user', $user);
+		}
+	}
+
+	/**
+	 * Entry point for the edit action
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function editUser()
+	{
+		$this->setHtmlTitle('User Management');
+
+		$database = $this->getDatabase();
+
+		$userId = WebRequest::getInt('user');
+		$user = User::getById($userId, $database);
+		$oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
+
+		if ($user === false) {
+			throw new ApplicationLogicException('Sorry, the user you are trying to edit could not be found.');
+		}
+
+		// Dual-mode action
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$newEmail = WebRequest::postEmail('user_email');
+			$newOnWikiName = WebRequest::postString('user_onwikiname');
+
+			if ($newEmail === null) {
+				throw new ApplicationLogicException('Invalid email address');
+			}
+
+			if (!($oauth->isFullyLinked() || $oauth->isPartiallyLinked())) {
+				if (trim($newOnWikiName) == "") {
+					throw new ApplicationLogicException('New on-wiki username cannot be blank');
+				}
+
+				$user->setOnWikiName($newOnWikiName);
+				$user->setWelcomeSig(WebRequest::postString('sig'));
+			}
+
+			$user->setEmail($newEmail);
+			$user->setCreationMode(WebRequest::postInt('creationmode'));
+
+			$user->setUpdateVersion(WebRequest::postInt('updateversion'));
+
+			$user->save();
+
+			Logger::userPreferencesChange($database, $user);
+			$this->getNotificationHelper()->userPrefChange($user);
+			SessionAlert::quick('Changes to user\'s preferences have been saved');
+
+			$this->redirect("userManagement");
+
+			return;
+		}
+		else {
+			$this->assignCSRFToken();
+			$oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(),
+				$this->getSiteConfiguration());
+			$this->setTemplate('usermanagement/edituser.tpl');
+			$this->assign('user', $user);
+			$this->assign('oauth', $oauth);
+
+			$this->assign('canManualCreate',
+				$this->barrierTest(User::CREATION_MANUAL, $user, 'RequestCreation'));
+			$this->assign('canOauthCreate',
+				$this->barrierTest(User::CREATION_OAUTH, $user, 'RequestCreation'));
+			$this->assign('canBotCreate',
+				$this->barrierTest(User::CREATION_BOT, $user, 'RequestCreation'));
+		}
+	}
+
+	#endregion
+
+	/**
+	 * Sends a status change email to the user.
+	 *
+	 * @param string      $subject           The subject of the email
+	 * @param string      $template          The smarty template to use
+	 * @param string|null $reason            The reason for performing the status change
+	 * @param User        $user              The user affected
+	 * @param string      $toolAdminUsername The tool admin's username who is making the edit
+	 */
+	private function sendStatusChangeEmail($subject, $template, $reason, $user, $toolAdminUsername)
+	{
+		$this->assign('targetUsername', $user->getUsername());
+		$this->assign('toolAdmin', $toolAdminUsername);
+		$this->assign('actionReason', $reason);
+		$this->assign('mailingList', $this->adminMailingList);
+
+		$this->getEmailHelper()->sendMail(
+			$user->getEmail(),
+			$subject,
+			$this->fetchTemplate($template),
+			array('Reply-To' => $this->adminMailingList)
+		);
+	}
+
+	/**
+	 * @param UserRole[] $activeRoles
+	 *
+	 * @return array
+	 */
+	private function getRoleData($activeRoles)
+	{
+		$availableRoles = $this->getSecurityManager()->getRoleConfiguration()->getAvailableRoles();
+
+		$currentUser = User::getCurrent($this->getDatabase());
+		$this->getSecurityManager()->getActiveRoles($currentUser, $userRoles, $inactiveRoles);
+
+		$initialValue = array('active' => 0, 'allowEdit' => 0, 'description' => '???', 'object' => null);
+
+		$roleData = array();
+		foreach ($availableRoles as $role => $data) {
+			$intersection = array_intersect($data['editableBy'], $userRoles);
+
+			$roleData[$role] = $initialValue;
+			$roleData[$role]['allowEdit'] = count($intersection) > 0 ? 1 : 0;
+			$roleData[$role]['description'] = $data['description'];
+		}
+
+		foreach ($activeRoles as $role) {
+			if (!isset($roleData[$role->getRole()])) {
+				// This value is no longer available in the configuration, allow changing (aka removing) it.
+				$roleData[$role->getRole()] = $initialValue;
+				$roleData[$role->getRole()]['allowEdit'] = 1;
+			}
+
+			$roleData[$role->getRole()]['object'] = $role;
+			$roleData[$role->getRole()]['active'] = 1;
+		}
+
+		return $roleData;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         $userSearchRequest = WebRequest::getString('usersearch');
         if ($userSearchRequest !== null) {
             $searchedUser = User::getByUsername($userSearchRequest, $database);
-            if($searchedUser !== false) {
+            if ($searchedUser !== false) {
                 $this->redirect('statistics/users', 'detail', ['user' => $searchedUser->getId()]);
                 return;
             }

Braces +7 added lines, -14 removed lines

@@ -60,8 +60,7 @@ 
             $this->assign("declinedUsers", $declinedUsers);
 
             UserSearchHelper::get($database)->getRoleMap($roleMap);
-        }
-        else {
+        } else {
             $this->assign("showAll", false);
             $this->assign("suspendedUsers", array());
             $this->assign("declinedUsers", array());
@@ -182,8 +181,7 @@ 
             $this->redirect('statistics/users', 'detail', array('user' => $user->getId()));
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/roleedit.tpl');
             $this->assign('user', $user);
@@ -244,8 +242,7 @@ 
             $this->redirect('userManagement');
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/changelevel-reason.tpl');
             $this->assign('user', $user);
@@ -309,8 +306,7 @@ 
             $this->redirect('userManagement');
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/changelevel-reason.tpl');
             $this->assign('user', $user);
@@ -364,8 +360,7 @@ 
             $this->redirect("userManagement");
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate("usermanagement/changelevel-reason.tpl");
             $this->assign("user", $user);
@@ -445,8 +440,7 @@ 
             $this->redirect("userManagement");
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->setTemplate('usermanagement/renameuser.tpl');
             $this->assign('user', $user);
@@ -505,8 +499,7 @@ 
             $this->redirect("userManagement");
 
             return;
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(),
                 $this->getSiteConfiguration());