mdaniels5757 / waca

includes/Pages/UserAuth/PageOAuth.php

Indentation +77 added lines, -77 removed lines

@@ -22,81 +22,81 @@
 
 class PageOAuth extends InternalPageBase
 {
-    /**
-     * Attach entry point
-     *
-     * must be posted, or will redirect to preferences
-     */
-    protected function attach()
-    {
-        if (!WebRequest::wasPosted()) {
-            $this->redirect('preferences');
-
-            return;
-        }
-
-        $database = $this->getDatabase();
-
-        $this->validateCSRFToken();
-
-        $oauthProtocolHelper = $this->getOAuthProtocolHelper();
-        $user = User::getCurrent($database);
-        $oauth = new OAuthUserHelper($user, $database, $oauthProtocolHelper, $this->getSiteConfiguration());
-
-        try {
-            $authoriseUrl = $oauth->getRequestToken();
-            $this->redirectUrl($authoriseUrl);
-        }
-        catch (CurlException $ex) {
-            throw new ApplicationLogicException($ex->getMessage(), 0, $ex);
-        }
-    }
-
-    /**
-     * Detach account entry point
-     * @throws Exception
-     */
-    protected function detach()
-    {
-        if ($this->getSiteConfiguration()->getEnforceOAuth()) {
-            throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
-        }
-
-        $database = $this->getDatabase();
-        $user = User::getCurrent($database);
-        $oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
-
-        try {
-            $oauth->refreshIdentity();
-        }
-        catch (CurlException $ex) {
-            // do nothing. The user's already revoked this access anyway.
-        }
-        catch (OAuthException $ex) {
-            // do nothing. The user's already revoked this access anyway.
-        }
-        catch (OptimisticLockFailedException $e) {
-            // do nothing. The user's already revoked this access anyway.
-        }
-
-        $oauth->detach();
-
-        // TODO: figure out why we need to force logout after a detach.
-        $user->setForcelogout(true);
-        $user->save();
-
-        // force the user to log out
-        Session::destroy();
-
-        $this->redirect('login');
-    }
-
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $this->redirect('preferences');
-    }
+	/**
+	 * Attach entry point
+	 *
+	 * must be posted, or will redirect to preferences
+	 */
+	protected function attach()
+	{
+		if (!WebRequest::wasPosted()) {
+			$this->redirect('preferences');
+
+			return;
+		}
+
+		$database = $this->getDatabase();
+
+		$this->validateCSRFToken();
+
+		$oauthProtocolHelper = $this->getOAuthProtocolHelper();
+		$user = User::getCurrent($database);
+		$oauth = new OAuthUserHelper($user, $database, $oauthProtocolHelper, $this->getSiteConfiguration());
+
+		try {
+			$authoriseUrl = $oauth->getRequestToken();
+			$this->redirectUrl($authoriseUrl);
+		}
+		catch (CurlException $ex) {
+			throw new ApplicationLogicException($ex->getMessage(), 0, $ex);
+		}
+	}
+
+	/**
+	 * Detach account entry point
+	 * @throws Exception
+	 */
+	protected function detach()
+	{
+		if ($this->getSiteConfiguration()->getEnforceOAuth()) {
+			throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
+		}
+
+		$database = $this->getDatabase();
+		$user = User::getCurrent($database);
+		$oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
+
+		try {
+			$oauth->refreshIdentity();
+		}
+		catch (CurlException $ex) {
+			// do nothing. The user's already revoked this access anyway.
+		}
+		catch (OAuthException $ex) {
+			// do nothing. The user's already revoked this access anyway.
+		}
+		catch (OptimisticLockFailedException $e) {
+			// do nothing. The user's already revoked this access anyway.
+		}
+
+		$oauth->detach();
+
+		// TODO: figure out why we need to force logout after a detach.
+		$user->setForcelogout(true);
+		$user->save();
+
+		// force the user to log out
+		Session::destroy();
+
+		$this->redirect('login');
+	}
+
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$this->redirect('preferences');
+	}
 }

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(), $this->getDomainAccessManager());
-            }
-        }
-    }
+		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(), $this->getDomainAccessManager());
+			}
+		}
+	}
 
-    /**
-     * @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(), $this->getDomainAccessManager());
             }
         }
@@ -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/PageReservation.php

Indentation +43 added lines, -43 removed lines

@@ -18,58 +18,58 @@
 
 class PageReservation 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);
+	/**
+	 * 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);
 
-        $closureDate = $request->getClosureDate();
+		$closureDate = $request->getClosureDate();
 
-        $date = new DateTime();
-        $date->modify("-7 days");
-        $oneweek = $date->format("Y-m-d H:i:s");
+		$date = new DateTime();
+		$date->modify("-7 days");
+		$oneweek = $date->format("Y-m-d H:i:s");
 
-        $currentUser = User::getCurrent($database);
-        if ($request->getStatus() == RequestStatus::CLOSED && $closureDate < $oneweek) {
-            if (!$this->barrierTest('reopenOldRequest', $currentUser, 'RequestData')) {
-                throw new ApplicationLogicException(
-                    "You are not allowed to reserve a request that has been closed for over a week.");
-            }
-        }
+		$currentUser = User::getCurrent($database);
+		if ($request->getStatus() == RequestStatus::CLOSED && $closureDate < $oneweek) {
+			if (!$this->barrierTest('reopenOldRequest', $currentUser, 'RequestData')) {
+				throw new ApplicationLogicException(
+					"You are not allowed to reserve a request that has been closed for over a week.");
+			}
+		}
 
-        if ($request->getReserved() !== null && $request->getReserved() != $currentUser->getId()) {
-            throw new ApplicationLogicException("Request is already reserved!");
-        }
+		if ($request->getReserved() !== null && $request->getReserved() != $currentUser->getId()) {
+			throw new ApplicationLogicException("Request is already reserved!");
+		}
 
-        if ($request->getReserved() === null) {
-            // Check the number of requests a user has reserved already
-            $doubleReserveCountQuery = $database->prepare("SELECT COUNT(*) FROM request WHERE reserved = :userid;");
-            $doubleReserveCountQuery->bindValue(":userid", $currentUser->getId());
-            $doubleReserveCountQuery->execute();
-            $doubleReserveCount = $doubleReserveCountQuery->fetchColumn();
-            $doubleReserveCountQuery->closeCursor();
+		if ($request->getReserved() === null) {
+			// Check the number of requests a user has reserved already
+			$doubleReserveCountQuery = $database->prepare("SELECT COUNT(*) FROM request WHERE reserved = :userid;");
+			$doubleReserveCountQuery->bindValue(":userid", $currentUser->getId());
+			$doubleReserveCountQuery->execute();
+			$doubleReserveCount = $doubleReserveCountQuery->fetchColumn();
+			$doubleReserveCountQuery->closeCursor();
 
-            // User already has at least one reserved.
-            if ($doubleReserveCount != 0) {
-                SessionAlert::warning("You have multiple requests reserved!");
-            }
+			// User already has at least one reserved.
+			if ($doubleReserveCount != 0) {
+				SessionAlert::warning("You have multiple requests reserved!");
+			}
 
-            $request->setReserved($currentUser->getId());
-            $request->setUpdateVersion(WebRequest::postInt('updateversion'));
-            $request->save();
+			$request->setReserved($currentUser->getId());
+			$request->setUpdateVersion(WebRequest::postInt('updateversion'));
+			$request->save();
 
-            Logger::reserve($database, $request);
+			Logger::reserve($database, $request);
 
-            $this->getNotificationHelper()->requestReserved($request);
+			$this->getNotificationHelper()->requestReserved($request);
 
-            SessionAlert::success("Reserved request {$request->getId()}.");
-        }
+			SessionAlert::success("Reserved request {$request->getId()}.");
+		}
 
-        $this->redirect('viewRequest', null, array('id' => $request->getId()));
-    }
+		$this->redirect('viewRequest', null, array('id' => $request->getId()));
+	}
 }

includes/Pages/RequestAction/PageManuallyConfirm.php

Indentation +35 added lines, -35 removed lines

@@ -15,39 +15,39 @@
 
 class PageManuallyConfirm extends RequestActionBase
 {
-    /**
-     * This endpoint manually confirms a request, bypassing email confirmation.
-     *
-     * Only administrators are allowed to do this, for obvious reasons.
-     *
-     * @throws ApplicationLogicException|OptimisticLockFailedException
-     */
-    protected function main()
-    {
-        // This method throws an error if we don't post
-        $this->checkPosted();
-
-        // Retrieve the database.
-        $database = $this->getDatabase();
-
-        // Find the request
-        // This method throws exceptions if there is an error with the request.
-        $request = $this->getRequest($database);
-        $version = WebRequest::postInt('version');
-
-        $request->setUpdateVersion($version);
-
-        // Mark the request as confirmed.
-        $request->setEmailConfirm("Confirmed");
-        $request->save();
-
-        // Log that the request was manually confirmed
-        Logger::manuallyConfirmRequest($database, $request);
-
-        // Notify the IRC channel
-        $this->getNotificationHelper()->requestReceived($request);
-
-        // Redirect back to the main request, now it should show the request.
-        $this->redirect('viewRequest', null, array('id' => $request->getId()));
-    }
+	/**
+	 * This endpoint manually confirms a request, bypassing email confirmation.
+	 *
+	 * Only administrators are allowed to do this, for obvious reasons.
+	 *
+	 * @throws ApplicationLogicException|OptimisticLockFailedException
+	 */
+	protected function main()
+	{
+		// This method throws an error if we don't post
+		$this->checkPosted();
+
+		// Retrieve the database.
+		$database = $this->getDatabase();
+
+		// Find the request
+		// This method throws exceptions if there is an error with the request.
+		$request = $this->getRequest($database);
+		$version = WebRequest::postInt('version');
+
+		$request->setUpdateVersion($version);
+
+		// Mark the request as confirmed.
+		$request->setEmailConfirm("Confirmed");
+		$request->save();
+
+		// Log that the request was manually confirmed
+		Logger::manuallyConfirmRequest($database, $request);
+
+		// Notify the IRC channel
+		$this->getNotificationHelper()->requestReceived($request);
+
+		// Redirect back to the main request, now it should show the request.
+		$this->redirect('viewRequest', null, array('id' => $request->getId()));
+	}
 }

includes/Pages/RequestAction/PageCloseRequest.php

Indentation +244 added lines, -244 removed lines

@@ -25,248 +25,248 @@
 
 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() === RequestStatus::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(RequestStatus::CLOSED);
-        $request->setQueue(null);
-        $request->setReserved(null);
-
-        Logger::closeRequest($database, $request, $template->getId(), null);
-
-        $request->save();
-
-        $this->processWelcome($template->getDefaultAction(), null);
-
-        // 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 ($template->getDefaultAction() === EmailTemplate::ACTION_CREATED && $this->checkAccountCreated($request)) {
-            $this->showConfirmation($request, $template, 'close-confirmations/account-created.tpl');
-
-            return true;
-        }
-
-        return false;
-    }
-
-    protected function checkAccountCreated(Request $request)
-    {
-        if (!WebRequest::postBoolean('createOverride')) {
-            $parameters = array(
-                'action'  => 'query',
-                'list'    => 'users',
-                'format'  => 'php',
-                'ususers' => $request->getName(),
-            );
-
-            // FIXME: domains!
-            /** @var Domain $domain */
-            $domain = Domain::getById(1, $this->getDatabase());
-
-            $content = $this->getHttpHelper()->get($domain->getWikiApiPath(), $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)
-    {
-        if (
-        ($request->getEmail() != $this->getSiteConfiguration()->getDataClearEmail()) &&
-        ($request->getIp() != $this->getSiteConfiguration()->getDataClearIp())
-        ) {
-            $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->assign('skipAutoWelcome', WebRequest::postBoolean('skipAutoWelcome') ? 'true' : 'false');
-
-        $this->skipAlerts();
-
-        $this->setTemplate($templateName);
-    }
-
-    /**
-     * @param string $action
-     * @param int|null   $parentTaskId
-     *
-     * @throws ApplicationLogicException
-     */
-    final protected function processWelcome(string $action, ?int $parentTaskId): void
-    {
-        $database = $this->getDatabase();
-        $currentUser = User::getCurrent($database);
-        $preferencesManager = PreferenceManager::getForCurrent($database);
-
-        if ($action !== EmailTemplate::ACTION_CREATED) {
-            return;
-        }
-
-        if ($preferencesManager->getPreference(PreferenceManager::PREF_WELCOMETEMPLATE) === null) {
-            return;
-        }
-
-        $oauth = new OAuthUserHelper($currentUser, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
-        if (!$oauth->canWelcome()) {
-            return;
-        }
-
-        if (WebRequest::postBoolean('skipAutoWelcome')) {
-            return;
-        }
-
-        $this->enqueueWelcomeTask($this->getRequest($database), $parentTaskId, $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() === RequestStatus::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(RequestStatus::CLOSED);
+		$request->setQueue(null);
+		$request->setReserved(null);
+
+		Logger::closeRequest($database, $request, $template->getId(), null);
+
+		$request->save();
+
+		$this->processWelcome($template->getDefaultAction(), null);
+
+		// 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 ($template->getDefaultAction() === EmailTemplate::ACTION_CREATED && $this->checkAccountCreated($request)) {
+			$this->showConfirmation($request, $template, 'close-confirmations/account-created.tpl');
+
+			return true;
+		}
+
+		return false;
+	}
+
+	protected function checkAccountCreated(Request $request)
+	{
+		if (!WebRequest::postBoolean('createOverride')) {
+			$parameters = array(
+				'action'  => 'query',
+				'list'    => 'users',
+				'format'  => 'php',
+				'ususers' => $request->getName(),
+			);
+
+			// FIXME: domains!
+			/** @var Domain $domain */
+			$domain = Domain::getById(1, $this->getDatabase());
+
+			$content = $this->getHttpHelper()->get($domain->getWikiApiPath(), $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)
+	{
+		if (
+		($request->getEmail() != $this->getSiteConfiguration()->getDataClearEmail()) &&
+		($request->getIp() != $this->getSiteConfiguration()->getDataClearIp())
+		) {
+			$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->assign('skipAutoWelcome', WebRequest::postBoolean('skipAutoWelcome') ? 'true' : 'false');
+
+		$this->skipAlerts();
+
+		$this->setTemplate($templateName);
+	}
+
+	/**
+	 * @param string $action
+	 * @param int|null   $parentTaskId
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	final protected function processWelcome(string $action, ?int $parentTaskId): void
+	{
+		$database = $this->getDatabase();
+		$currentUser = User::getCurrent($database);
+		$preferencesManager = PreferenceManager::getForCurrent($database);
+
+		if ($action !== EmailTemplate::ACTION_CREATED) {
+			return;
+		}
+
+		if ($preferencesManager->getPreference(PreferenceManager::PREF_WELCOMETEMPLATE) === null) {
+			return;
+		}
+
+		$oauth = new OAuthUserHelper($currentUser, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
+		if (!$oauth->canWelcome()) {
+			return;
+		}
+
+		if (WebRequest::postBoolean('skipAutoWelcome')) {
+			return;
+		}
+
+		$this->enqueueWelcomeTask($this->getRequest($database), $parentTaskId, $currentUser, $database);
+	}
 }

includes/Pages/RequestAction/RequestActionBase.php

Indentation +45 added lines, -45 removed lines

@@ -19,55 +19,55 @@
 
 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->setDomain(1); // FIXME: domains!
-        $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->setDomain(1); // FIXME: domains!
+		$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/PageDeferRequest.php

Indentation +81 added lines, -81 removed lines

@@ -21,85 +21,85 @@
 
 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');
-
-        // FIXME: domains!
-        $requestQueue = RequestQueue::getByApiName($database, $target, 1);
-
-        if ($requestQueue === false) {
-            throw new ApplicationLogicException('Defer target not valid');
-        }
-
-        if ($request->getQueue() == $requestQueue->getId() && $request->getStatus() == RequestStatus::OPEN) {
-            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");
-
-        if ($request->getStatus() == RequestStatus::CLOSED && $closureDate < $date) {
-            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->getEmail() === $this->getSiteConfiguration()->getDataClearEmail()) {
-            if (!$this->barrierTest('reopenClearedRequest', $currentUser, 'RequestData')) {
-                throw new ApplicationLogicException(
-                    "You are not allowed to re-open a request for which the private data has been purged.");
-            }
-        }
-
-        if ($request->getStatus() === RequestStatus::JOBQUEUE) {
-            /** @var JobQueue[] $pendingJobs */
-            // FIXME: domains
-            $pendingJobs = JobQueueSearchHelper::get($database, 1)
-                ->byRequest($request->getId())
-                ->statusIn([
-                    JobQueue::STATUS_QUEUED,
-                    JobQueue::STATUS_READY,
-                    JobQueue::STATUS_WAITING,
-                ])
-                ->fetch();
-
-            foreach ($pendingJobs as $job) {
-                $job->setStatus(JobQueue::STATUS_CANCELLED);
-                $job->setError('Cancelled by request deferral');
-                $job->save();
-
-                Logger::backgroundJobCancelled($database, $job);
-            }
-        }
-
-        $request->setReserved(null);
-        $request->setStatus(RequestStatus::OPEN);
-        $request->setQueue($requestQueue->getId());
-        $request->setUpdateVersion(WebRequest::postInt('updateversion'));
-        $request->save();
-
-        Logger::deferRequest($database, $request, $requestQueue->getLogName());
-
-        $this->getNotificationHelper()->requestDeferred($request);
-
-        $deto = htmlentities($requestQueue->getDisplayName(), ENT_COMPAT, 'UTF-8');
-        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');
+
+		// FIXME: domains!
+		$requestQueue = RequestQueue::getByApiName($database, $target, 1);
+
+		if ($requestQueue === false) {
+			throw new ApplicationLogicException('Defer target not valid');
+		}
+
+		if ($request->getQueue() == $requestQueue->getId() && $request->getStatus() == RequestStatus::OPEN) {
+			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");
+
+		if ($request->getStatus() == RequestStatus::CLOSED && $closureDate < $date) {
+			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->getEmail() === $this->getSiteConfiguration()->getDataClearEmail()) {
+			if (!$this->barrierTest('reopenClearedRequest', $currentUser, 'RequestData')) {
+				throw new ApplicationLogicException(
+					"You are not allowed to re-open a request for which the private data has been purged.");
+			}
+		}
+
+		if ($request->getStatus() === RequestStatus::JOBQUEUE) {
+			/** @var JobQueue[] $pendingJobs */
+			// FIXME: domains
+			$pendingJobs = JobQueueSearchHelper::get($database, 1)
+				->byRequest($request->getId())
+				->statusIn([
+					JobQueue::STATUS_QUEUED,
+					JobQueue::STATUS_READY,
+					JobQueue::STATUS_WAITING,
+				])
+				->fetch();
+
+			foreach ($pendingJobs as $job) {
+				$job->setStatus(JobQueue::STATUS_CANCELLED);
+				$job->setError('Cancelled by request deferral');
+				$job->save();
+
+				Logger::backgroundJobCancelled($database, $job);
+			}
+		}
+
+		$request->setReserved(null);
+		$request->setStatus(RequestStatus::OPEN);
+		$request->setQueue($requestQueue->getId());
+		$request->setUpdateVersion(WebRequest::postInt('updateversion'));
+		$request->save();
+
+		Logger::deferRequest($database, $request, $requestQueue->getLogName());
+
+		$this->getNotificationHelper()->requestDeferred($request);
+
+		$deto = htmlentities($requestQueue->getDisplayName(), ENT_COMPAT, 'UTF-8');
+		SessionAlert::success("Request {$request->getId()} deferred to {$deto}");
+
+		$this->redirect();
+	}
 }

includes/Pages/RequestAction/PageComment.php

Indentation +40 added lines, -40 removed lines

@@ -16,55 +16,55 @@
 
 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::postString('visibility') ?? 'user';
-        if ($visibility !== 'user' && $visibility !== 'admin' && $visibility !== 'checkuser') {
-            throw new ApplicationLogicException('Invalid comment visibility');
-        }
+		$visibility = WebRequest::postString('visibility') ?? 'user';
+		if ($visibility !== 'user' && $visibility !== 'admin' && $visibility !== 'checkuser') {
+			throw new ApplicationLogicException('Invalid comment visibility');
+		}
 
-        $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/PageCustomClose.php

Indentation +397 added lines, -397 removed lines

@@ -30,401 +30,401 @@
 
 class PageCustomClose extends PageCloseRequest
 {
-    use RequestData;
-
-    public const CREATE_OAUTH = 'created-oauth';
-    public const CREATE_BOT = 'created-bot';
-
-    protected function main()
-    {
-        $database = $this->getDatabase();
-
-        $request = $this->getRequest($database);
-        $currentUser = User::getCurrent($this->getDatabase());
-
-        if ($request->getStatus() === RequestStatus::CLOSED) {
-            throw new ApplicationLogicException('Request is already closed');
-        }
-
-        // Dual-mode page
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $success = $this->doCustomClose($currentUser, $request, $database);
-
-            if ($success) {
-                $this->redirect();
-            }
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->showCustomCloseForm($database, $request);
-        }
-    }
-
-    /**
-     * @param $database
-     *
-     * @return Request
-     * @throws ApplicationLogicException
-     */
-    protected function getRequest(PdoDatabase $database)
-    {
-        $requestId = WebRequest::getInt('request');
-        if ($requestId === null) {
-            throw new ApplicationLogicException('Request ID not found');
-        }
-
-        /** @var Request $request */
-        $request = Request::getById($requestId, $database);
-
-        if ($request === false) {
-            throw new ApplicationLogicException('Request not found');
-        }
-
-        return $request;
-    }
-
-    /**
-     * @param PdoDatabase $database
-     *
-     * @return EmailTemplate|null
-     */
-    protected function getTemplate(PdoDatabase $database)
-    {
-        $templateId = WebRequest::getInt('template');
-        if ($templateId === null) {
-            return null;
-        }
-
-        /** @var EmailTemplate $template */
-        $template = EmailTemplate::getById($templateId, $database);
-        if ($template === false || !$template->getActive()) {
-            return null;
-        }
-
-        return $template;
-    }
-
-    /**
-     * @param $database
-     * @param $request
-     *
-     * @throws Exception
-     */
-    protected function showCustomCloseForm(PdoDatabase $database, Request $request)
-    {
-        $this->setHtmlTitle("Custom close");
-
-        $currentUser = User::getCurrent($database);
-        $preferencesManager = PreferenceManager::getForCurrent($database);
-        $config = $this->getSiteConfiguration();
-
-        $allowedPrivateData = $this->isAllowedPrivateData($request, $currentUser);
-        if (!$allowedPrivateData) {
-            // we probably shouldn't be showing the user this form if they're not allowed to access private data...
-            throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
-        }
-
-        $template = $this->getTemplate($database);
-
-        // Preload data
-        $this->assign('defaultAction', '');
-        $this->assign('defaultQueue', null);
-        $this->assign('preloadText', '');
-        $this->assign('preloadTitle', '');
-
-        if ($template !== null) {
-            $this->assign('defaultAction', $template->getDefaultAction());
-            $this->assign('defaultQueue', $template->getQueue());
-            $this->assign('preloadText', $template->getText());
-            $this->assign('preloadTitle', $template->getName());
-        }
-
-        // Static data
-        $this->assign('requestQueues', $requestQueues = RequestQueue::getEnabledQueues($database));
-
-        // request data
-        $this->assign('requestId', $request->getIp());
-        $this->assign('updateVersion', $request->getUpdateVersion());
-        $this->setupBasicData($request, $config);
-        $this->setupReservationDetails($request->getReserved(), $database, $currentUser);
-        $this->setupPrivateData($request, $config);
-        $this->setupRelatedRequests($request, $config, $database);
-
-        // IP location
-        $trustedIp = $this->getXffTrustProvider()->getTrustedClientIp($request->getIp(), $request->getForwardedIp());
-        $this->assign('iplocation', $this->getLocationProvider()->getIpLocation($trustedIp));
-
-        // Confirmations
-        $this->assign('confirmEmailAlreadySent', $this->checkEmailAlreadySent($request));
-
-        $this->assign('canSkipCcMailingList', $this->barrierTest('skipCcMailingList', $currentUser));
-
-        $this->assign('allowWelcomeSkip', false);
-        $this->assign('forceWelcomeSkip', false);
-
-        $canOauthCreate = $this->barrierTest(PreferenceManager::CREATION_OAUTH, $currentUser, 'RequestCreation');
-        $canBotCreate = $this->barrierTest(PreferenceManager::CREATION_BOT, $currentUser, 'RequestCreation');
-
-        $oauth = new OAuthUserHelper($currentUser, $this->getDatabase(), $this->getOAuthProtocolHelper(), $config);
-
-        $welcomeTemplate = $preferencesManager->getPreference(PreferenceManager::PREF_WELCOMETEMPLATE);
-        if ($welcomeTemplate != 0) {
-            $this->assign('allowWelcomeSkip', true);
-
-            if (!$oauth->canWelcome()) {
-                $this->assign('forceWelcomeSkip', true);
-            }
-        }
-
-        $this->assign('preferredCreationMode', (int)$preferencesManager->getPreference(PreferenceManager::PREF_CREATION_MODE));
-
-        // disable options if there's a misconfiguration.
-        $canOauthCreate &= $oauth->canCreateAccount();
-        $canBotCreate &= $this->getSiteConfiguration()->getCreationBotPassword() !== null;
-
-        $this->assign('canOauthCreate', $canOauthCreate);
-        $this->assign('canBotCreate', $canBotCreate);
-
-        // template
-        $this->setTemplate('custom-close.tpl');
-    }
-
-    /**
-     * @param User        $currentUser
-     * @param Request     $request
-     * @param PdoDatabase $database
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function doCustomClose(User $currentUser, Request $request, PdoDatabase $database) : bool
-    {
-        $messageBody = WebRequest::postString('msgbody');
-        if ($messageBody === null || trim($messageBody) === '') {
-            throw new ApplicationLogicException('Message body cannot be blank');
-        }
-
-        $ccMailingList = true;
-        if ($this->barrierTest('skipCcMailingList', $currentUser)) {
-            $ccMailingList = WebRequest::postBoolean('ccMailingList');
-        }
-
-        if ($request->getStatus() === RequestStatus::CLOSED) {
-            throw new ApplicationLogicException('Request is already closed');
-        }
-
-        if (!(WebRequest::postBoolean('confirmEmailAlreadySent'))
-        ) {
-            throw new ApplicationLogicException('Not all confirmations checked');
-        }
-
-        $action = WebRequest::postString('action');
-
-        if ($action === EmailTemplate::ACTION_CREATED || $action === EmailTemplate::ACTION_NOT_CREATED) {
-
-            if ($action === EmailTemplate::ACTION_CREATED) {
-                if ($this->checkAccountCreated($request)) {
-                    $this->assignCSRFToken();
-                    $this->showCustomCloseForm($database, $request);
-
-                    $this->assign("preloadText", $messageBody);
-                    $this->assign('preloadAction', $action);
-                    $this->assign('ccMailingList', $ccMailingList);
-                    $this->assign('showNonExistentAccountWarning', true);
-                    $this->assign('skipAutoWelcome', WebRequest::postBoolean('skipAutoWelcome'));
-
-                    return false;
-                }
-            }
-
-            // Close request
-            $this->closeRequest($request, $database, $action, $messageBody);
-
-            $this->processWelcome($action, null);
-
-            // Send the mail after the save, since save can be rolled back
-            $this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
-
-            return true;
-        }
-
-        if ($action === self::CREATE_OAUTH || $action === self::CREATE_BOT) {
-            $this->processAutoCreation($currentUser, $action, $request, $messageBody, $ccMailingList);
-
-            return true;
-        }
-
-        if ($action === 'mail') {
-            $request->setReserved(null);
-            $request->setUpdateVersion(WebRequest::postInt('updateversion'));
-            $request->save();
-
-            // Perform the notifications and stuff *after* we've successfully saved, since the save can throw an OLE
-            // and be rolled back.
-
-            // Send mail
-            $this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
-
-            Logger::sentMail($database, $request, $messageBody);
-            Logger::unreserve($database, $request);
-
-            $this->getNotificationHelper()->sentMail($request);
-            SessionAlert::success("Sent mail to Request {$request->getId()}");
-
-            return true;
-        }
-
-        $targetQueue = RequestQueue::getByApiName($database, $action, 1);
-        if ($targetQueue !== false) {
-            // Defer to other state
-            $this->deferRequest($request, $database, $targetQueue, $messageBody);
-
-            // Send the mail after the save, since save can be rolled back
-            $this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
-
-            return true;
-        }
-
-        throw new ApplicationLogicException('Unknown action for custom close.');
-    }
-
-    /**
-     * @param Request     $request
-     * @param PdoDatabase $database
-     * @param string      $action
-     * @param string      $messageBody
-     *
-     * @throws Exception
-     * @throws OptimisticLockFailedException
-     */
-    protected function closeRequest(Request $request, PdoDatabase $database, $action, $messageBody)
-    {
-        $request->setStatus(RequestStatus::CLOSED);
-        $request->setQueue(null);
-        $request->setReserved(null);
-        $request->setUpdateVersion(WebRequest::postInt('updateversion'));
-        $request->save();
-
-        // Perform the notifications and stuff *after* we've successfully saved, since the save can throw an OLE and
-        // be rolled back.
-
-        if ($action == EmailTemplate::ACTION_CREATED) {
-            $logCloseType = 'custom-y';
-            $notificationCloseType = "Custom, Created";
-        }
-        else {
-            $logCloseType = 'custom-n';
-            $notificationCloseType = "Custom, Not Created";
-        }
-
-        Logger::closeRequest($database, $request, $logCloseType, $messageBody);
-        $this->getNotificationHelper()->requestClosed($request, $notificationCloseType);
-
-        $requestName = htmlentities($request->getName(), ENT_COMPAT, 'UTF-8');
-        SessionAlert::success("Request {$request->getId()} ({$requestName}) closed as {$notificationCloseType}.");
-    }
-
-    /**
-     * @param Request      $request
-     * @param PdoDatabase  $database
-     * @param RequestQueue $targetQueue
-     * @param string       $messageBody
-     *
-     * @throws OptimisticLockFailedException
-     */
-    protected function deferRequest(
-        Request $request,
-        PdoDatabase $database,
-        RequestQueue $targetQueue,
-        $messageBody
-    ) {
-        $request->setStatus(RequestStatus::OPEN);
-        $request->setQueue($targetQueue->getId());
-        $request->setReserved(null);
-        $request->setUpdateVersion(WebRequest::postInt('updateversion'));
-        $request->save();
-
-        // Perform the notifications and stuff *after* we've successfully saved, since the save can throw an OLE
-        // and be rolled back.
-
-        $deferToLog = $targetQueue->getLogName();
-        Logger::sentMail($database, $request, $messageBody);
-        Logger::deferRequest($database, $request, $deferToLog);
-
-        $this->getNotificationHelper()->requestDeferredWithMail($request);
-
-        $deferTo = htmlentities($targetQueue->getDisplayName(), ENT_COMPAT, 'UTF-8');
-        SessionAlert::success("Request {$request->getId()} deferred to $deferTo, sending an email.");
-    }
-
-    /**
-     * @param User    $currentUser
-     * @param string  $action
-     * @param Request $request
-     * @param string  $messageBody
-     * @param bool    $ccMailingList
-     *
-     * @throws AccessDeniedException
-     * @throws ApplicationLogicException
-     * @throws OptimisticLockFailedException
-     */
-    protected function processAutoCreation(User $currentUser, string $action, Request $request, string $messageBody, bool $ccMailingList): void
-    {
-        $db = $this->getDatabase();
-        $oauth = new OAuthUserHelper($currentUser, $db, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
-        $canOauthCreate = $this->barrierTest(PreferenceManager::CREATION_OAUTH, $currentUser, 'RequestCreation');
-        $canBotCreate = $this->barrierTest(PreferenceManager::CREATION_BOT, $currentUser, 'RequestCreation');
-        $canOauthCreate &= $oauth->canCreateAccount();
-        $canBotCreate &= $this->getSiteConfiguration()->getCreationBotPassword() !== null;
-
-        $creationTaskClass = null;
-
-        if ($action === self::CREATE_OAUTH) {
-            if (!$canOauthCreate) {
-                throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
-            }
-
-            $creationTaskClass = UserCreationTask::class;
-        }
-
-        if ($action === self::CREATE_BOT) {
-            if (!$canBotCreate) {
-                throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
-            }
-
-            $creationTaskClass = BotCreationTask::class;
-        }
-
-        if ($creationTaskClass === null) {
-            throw new ApplicationLogicException('Cannot determine creation mode');
-        }
-
-        $request->setStatus(RequestStatus::JOBQUEUE);
-        $request->setReserved(null);
-        $request->save();
-
-        $parameters = [
-            'emailText' => $messageBody,
-            'ccMailingList' => $ccMailingList
-        ];
-
-        $creationTask = new JobQueue();
-        $creationTask->setDomain(1); // FIXME: domains!
-        $creationTask->setTask($creationTaskClass);
-        $creationTask->setRequest($request->getId());
-        $creationTask->setTriggerUserId($currentUser->getId());
-        $creationTask->setParameters(json_encode($parameters));
-        $creationTask->setDatabase($db);
-        $creationTask->save();
-
-        $creationTaskId = $creationTask->getId();
-
-        Logger::enqueuedJobQueue($db, $request);
-        $this->getNotificationHelper()->requestCloseQueued($request, 'Custom, Created');
-
-        SessionAlert::success("Request {$request->getId()} has been queued for autocreation");
-
-        // forge this since it is actually a creation.
-        $this->processWelcome(EmailTemplate::ACTION_CREATED, $creationTaskId);
-    }
+	use RequestData;
+
+	public const CREATE_OAUTH = 'created-oauth';
+	public const CREATE_BOT = 'created-bot';
+
+	protected function main()
+	{
+		$database = $this->getDatabase();
+
+		$request = $this->getRequest($database);
+		$currentUser = User::getCurrent($this->getDatabase());
+
+		if ($request->getStatus() === RequestStatus::CLOSED) {
+			throw new ApplicationLogicException('Request is already closed');
+		}
+
+		// Dual-mode page
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$success = $this->doCustomClose($currentUser, $request, $database);
+
+			if ($success) {
+				$this->redirect();
+			}
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->showCustomCloseForm($database, $request);
+		}
+	}
+
+	/**
+	 * @param $database
+	 *
+	 * @return Request
+	 * @throws ApplicationLogicException
+	 */
+	protected function getRequest(PdoDatabase $database)
+	{
+		$requestId = WebRequest::getInt('request');
+		if ($requestId === null) {
+			throw new ApplicationLogicException('Request ID not found');
+		}
+
+		/** @var Request $request */
+		$request = Request::getById($requestId, $database);
+
+		if ($request === false) {
+			throw new ApplicationLogicException('Request not found');
+		}
+
+		return $request;
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 *
+	 * @return EmailTemplate|null
+	 */
+	protected function getTemplate(PdoDatabase $database)
+	{
+		$templateId = WebRequest::getInt('template');
+		if ($templateId === null) {
+			return null;
+		}
+
+		/** @var EmailTemplate $template */
+		$template = EmailTemplate::getById($templateId, $database);
+		if ($template === false || !$template->getActive()) {
+			return null;
+		}
+
+		return $template;
+	}
+
+	/**
+	 * @param $database
+	 * @param $request
+	 *
+	 * @throws Exception
+	 */
+	protected function showCustomCloseForm(PdoDatabase $database, Request $request)
+	{
+		$this->setHtmlTitle("Custom close");
+
+		$currentUser = User::getCurrent($database);
+		$preferencesManager = PreferenceManager::getForCurrent($database);
+		$config = $this->getSiteConfiguration();
+
+		$allowedPrivateData = $this->isAllowedPrivateData($request, $currentUser);
+		if (!$allowedPrivateData) {
+			// we probably shouldn't be showing the user this form if they're not allowed to access private data...
+			throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
+		}
+
+		$template = $this->getTemplate($database);
+
+		// Preload data
+		$this->assign('defaultAction', '');
+		$this->assign('defaultQueue', null);
+		$this->assign('preloadText', '');
+		$this->assign('preloadTitle', '');
+
+		if ($template !== null) {
+			$this->assign('defaultAction', $template->getDefaultAction());
+			$this->assign('defaultQueue', $template->getQueue());
+			$this->assign('preloadText', $template->getText());
+			$this->assign('preloadTitle', $template->getName());
+		}
+
+		// Static data
+		$this->assign('requestQueues', $requestQueues = RequestQueue::getEnabledQueues($database));
+
+		// request data
+		$this->assign('requestId', $request->getIp());
+		$this->assign('updateVersion', $request->getUpdateVersion());
+		$this->setupBasicData($request, $config);
+		$this->setupReservationDetails($request->getReserved(), $database, $currentUser);
+		$this->setupPrivateData($request, $config);
+		$this->setupRelatedRequests($request, $config, $database);
+
+		// IP location
+		$trustedIp = $this->getXffTrustProvider()->getTrustedClientIp($request->getIp(), $request->getForwardedIp());
+		$this->assign('iplocation', $this->getLocationProvider()->getIpLocation($trustedIp));
+
+		// Confirmations
+		$this->assign('confirmEmailAlreadySent', $this->checkEmailAlreadySent($request));
+
+		$this->assign('canSkipCcMailingList', $this->barrierTest('skipCcMailingList', $currentUser));
+
+		$this->assign('allowWelcomeSkip', false);
+		$this->assign('forceWelcomeSkip', false);
+
+		$canOauthCreate = $this->barrierTest(PreferenceManager::CREATION_OAUTH, $currentUser, 'RequestCreation');
+		$canBotCreate = $this->barrierTest(PreferenceManager::CREATION_BOT, $currentUser, 'RequestCreation');
+
+		$oauth = new OAuthUserHelper($currentUser, $this->getDatabase(), $this->getOAuthProtocolHelper(), $config);
+
+		$welcomeTemplate = $preferencesManager->getPreference(PreferenceManager::PREF_WELCOMETEMPLATE);
+		if ($welcomeTemplate != 0) {
+			$this->assign('allowWelcomeSkip', true);
+
+			if (!$oauth->canWelcome()) {
+				$this->assign('forceWelcomeSkip', true);
+			}
+		}
+
+		$this->assign('preferredCreationMode', (int)$preferencesManager->getPreference(PreferenceManager::PREF_CREATION_MODE));
+
+		// disable options if there's a misconfiguration.
+		$canOauthCreate &= $oauth->canCreateAccount();
+		$canBotCreate &= $this->getSiteConfiguration()->getCreationBotPassword() !== null;
+
+		$this->assign('canOauthCreate', $canOauthCreate);
+		$this->assign('canBotCreate', $canBotCreate);
+
+		// template
+		$this->setTemplate('custom-close.tpl');
+	}
+
+	/**
+	 * @param User        $currentUser
+	 * @param Request     $request
+	 * @param PdoDatabase $database
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function doCustomClose(User $currentUser, Request $request, PdoDatabase $database) : bool
+	{
+		$messageBody = WebRequest::postString('msgbody');
+		if ($messageBody === null || trim($messageBody) === '') {
+			throw new ApplicationLogicException('Message body cannot be blank');
+		}
+
+		$ccMailingList = true;
+		if ($this->barrierTest('skipCcMailingList', $currentUser)) {
+			$ccMailingList = WebRequest::postBoolean('ccMailingList');
+		}
+
+		if ($request->getStatus() === RequestStatus::CLOSED) {
+			throw new ApplicationLogicException('Request is already closed');
+		}
+
+		if (!(WebRequest::postBoolean('confirmEmailAlreadySent'))
+		) {
+			throw new ApplicationLogicException('Not all confirmations checked');
+		}
+
+		$action = WebRequest::postString('action');
+
+		if ($action === EmailTemplate::ACTION_CREATED || $action === EmailTemplate::ACTION_NOT_CREATED) {
+
+			if ($action === EmailTemplate::ACTION_CREATED) {
+				if ($this->checkAccountCreated($request)) {
+					$this->assignCSRFToken();
+					$this->showCustomCloseForm($database, $request);
+
+					$this->assign("preloadText", $messageBody);
+					$this->assign('preloadAction', $action);
+					$this->assign('ccMailingList', $ccMailingList);
+					$this->assign('showNonExistentAccountWarning', true);
+					$this->assign('skipAutoWelcome', WebRequest::postBoolean('skipAutoWelcome'));
+
+					return false;
+				}
+			}
+
+			// Close request
+			$this->closeRequest($request, $database, $action, $messageBody);
+
+			$this->processWelcome($action, null);
+
+			// Send the mail after the save, since save can be rolled back
+			$this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
+
+			return true;
+		}
+
+		if ($action === self::CREATE_OAUTH || $action === self::CREATE_BOT) {
+			$this->processAutoCreation($currentUser, $action, $request, $messageBody, $ccMailingList);
+
+			return true;
+		}
+
+		if ($action === 'mail') {
+			$request->setReserved(null);
+			$request->setUpdateVersion(WebRequest::postInt('updateversion'));
+			$request->save();
+
+			// Perform the notifications and stuff *after* we've successfully saved, since the save can throw an OLE
+			// and be rolled back.
+
+			// Send mail
+			$this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
+
+			Logger::sentMail($database, $request, $messageBody);
+			Logger::unreserve($database, $request);
+
+			$this->getNotificationHelper()->sentMail($request);
+			SessionAlert::success("Sent mail to Request {$request->getId()}");
+
+			return true;
+		}
+
+		$targetQueue = RequestQueue::getByApiName($database, $action, 1);
+		if ($targetQueue !== false) {
+			// Defer to other state
+			$this->deferRequest($request, $database, $targetQueue, $messageBody);
+
+			// Send the mail after the save, since save can be rolled back
+			$this->sendMail($request, $messageBody, $currentUser, $ccMailingList);
+
+			return true;
+		}
+
+		throw new ApplicationLogicException('Unknown action for custom close.');
+	}
+
+	/**
+	 * @param Request     $request
+	 * @param PdoDatabase $database
+	 * @param string      $action
+	 * @param string      $messageBody
+	 *
+	 * @throws Exception
+	 * @throws OptimisticLockFailedException
+	 */
+	protected function closeRequest(Request $request, PdoDatabase $database, $action, $messageBody)
+	{
+		$request->setStatus(RequestStatus::CLOSED);
+		$request->setQueue(null);
+		$request->setReserved(null);
+		$request->setUpdateVersion(WebRequest::postInt('updateversion'));
+		$request->save();
+
+		// Perform the notifications and stuff *after* we've successfully saved, since the save can throw an OLE and
+		// be rolled back.
+
+		if ($action == EmailTemplate::ACTION_CREATED) {
+			$logCloseType = 'custom-y';
+			$notificationCloseType = "Custom, Created";
+		}
+		else {
+			$logCloseType = 'custom-n';
+			$notificationCloseType = "Custom, Not Created";
+		}
+
+		Logger::closeRequest($database, $request, $logCloseType, $messageBody);
+		$this->getNotificationHelper()->requestClosed($request, $notificationCloseType);
+
+		$requestName = htmlentities($request->getName(), ENT_COMPAT, 'UTF-8');
+		SessionAlert::success("Request {$request->getId()} ({$requestName}) closed as {$notificationCloseType}.");
+	}
+
+	/**
+	 * @param Request      $request
+	 * @param PdoDatabase  $database
+	 * @param RequestQueue $targetQueue
+	 * @param string       $messageBody
+	 *
+	 * @throws OptimisticLockFailedException
+	 */
+	protected function deferRequest(
+		Request $request,
+		PdoDatabase $database,
+		RequestQueue $targetQueue,
+		$messageBody
+	) {
+		$request->setStatus(RequestStatus::OPEN);
+		$request->setQueue($targetQueue->getId());
+		$request->setReserved(null);
+		$request->setUpdateVersion(WebRequest::postInt('updateversion'));
+		$request->save();
+
+		// Perform the notifications and stuff *after* we've successfully saved, since the save can throw an OLE
+		// and be rolled back.
+
+		$deferToLog = $targetQueue->getLogName();
+		Logger::sentMail($database, $request, $messageBody);
+		Logger::deferRequest($database, $request, $deferToLog);
+
+		$this->getNotificationHelper()->requestDeferredWithMail($request);
+
+		$deferTo = htmlentities($targetQueue->getDisplayName(), ENT_COMPAT, 'UTF-8');
+		SessionAlert::success("Request {$request->getId()} deferred to $deferTo, sending an email.");
+	}
+
+	/**
+	 * @param User    $currentUser
+	 * @param string  $action
+	 * @param Request $request
+	 * @param string  $messageBody
+	 * @param bool    $ccMailingList
+	 *
+	 * @throws AccessDeniedException
+	 * @throws ApplicationLogicException
+	 * @throws OptimisticLockFailedException
+	 */
+	protected function processAutoCreation(User $currentUser, string $action, Request $request, string $messageBody, bool $ccMailingList): void
+	{
+		$db = $this->getDatabase();
+		$oauth = new OAuthUserHelper($currentUser, $db, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
+		$canOauthCreate = $this->barrierTest(PreferenceManager::CREATION_OAUTH, $currentUser, 'RequestCreation');
+		$canBotCreate = $this->barrierTest(PreferenceManager::CREATION_BOT, $currentUser, 'RequestCreation');
+		$canOauthCreate &= $oauth->canCreateAccount();
+		$canBotCreate &= $this->getSiteConfiguration()->getCreationBotPassword() !== null;
+
+		$creationTaskClass = null;
+
+		if ($action === self::CREATE_OAUTH) {
+			if (!$canOauthCreate) {
+				throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
+			}
+
+			$creationTaskClass = UserCreationTask::class;
+		}
+
+		if ($action === self::CREATE_BOT) {
+			if (!$canBotCreate) {
+				throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
+			}
+
+			$creationTaskClass = BotCreationTask::class;
+		}
+
+		if ($creationTaskClass === null) {
+			throw new ApplicationLogicException('Cannot determine creation mode');
+		}
+
+		$request->setStatus(RequestStatus::JOBQUEUE);
+		$request->setReserved(null);
+		$request->save();
+
+		$parameters = [
+			'emailText' => $messageBody,
+			'ccMailingList' => $ccMailingList
+		];
+
+		$creationTask = new JobQueue();
+		$creationTask->setDomain(1); // FIXME: domains!
+		$creationTask->setTask($creationTaskClass);
+		$creationTask->setRequest($request->getId());
+		$creationTask->setTriggerUserId($currentUser->getId());
+		$creationTask->setParameters(json_encode($parameters));
+		$creationTask->setDatabase($db);
+		$creationTask->save();
+
+		$creationTaskId = $creationTask->getId();
+
+		Logger::enqueuedJobQueue($db, $request);
+		$this->getNotificationHelper()->requestCloseQueued($request, 'Custom, Created');
+
+		SessionAlert::success("Request {$request->getId()} has been queued for autocreation");
+
+		// forge this since it is actually a creation.
+		$this->processWelcome(EmailTemplate::ACTION_CREATED, $creationTaskId);
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -54,8 +54,7 @@ 
             if ($success) {
                 $this->redirect();
             }
-        }
-        else {
+        } else {
             $this->assignCSRFToken();
             $this->showCustomCloseForm($database, $request);
         }
@@ -311,8 +310,7 @@ 
         if ($action == EmailTemplate::ACTION_CREATED) {
             $logCloseType = 'custom-y';
             $notificationCloseType = "Custom, Created";
-        }
-        else {
+        } else {
             $logCloseType = 'custom-n';
             $notificationCloseType = "Custom, Not Created";
         }