mdaniels5757 / waca

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);
+	}
 }

includes/Pages/RequestAction/PageCreateRequest.php

Indentation +152 added lines, -152 removed lines

@@ -34,156 +34,156 @@
  */
 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);
-        $preferencesManager = PreferenceManager::getForCurrent($database);
-
-        $secMgr = $this->getSecurityManager();
-        if ($secMgr->allows('RequestCreation', PreferenceManager::CREATION_BOT, $user) !== SecurityManager::ALLOWED
-            && $creationMode === 'bot'
-        ) {
-            throw new AccessDeniedException($secMgr, $this->getDomainAccessManager());
-        }
-        elseif ($secMgr->allows('RequestCreation', PreferenceManager::CREATION_OAUTH, $user) !== SecurityManager::ALLOWED
-            && $creationMode === 'oauth'
-        ) {
-            throw new AccessDeniedException($secMgr, $this->getDomainAccessManager());
-        }
-
-        if ($request->getEmailSent()) {
-            throw new ApplicationLogicException('This requester has already had an email sent to them. Please fall back to manual creation or a custom close');
-        }
-
-        $request->setStatus(RequestStatus::JOBQUEUE);
-        $request->setReserved(null);
-        $request->save();
-
-        Logger::enqueuedJobQueue($database, $request);
-
-        $creationTaskId = $this->enqueueCreationTask($creationMode, $request, $template, $user, $database);
-
-        $welcomeTemplate = $preferencesManager->getPreference(PreferenceManager::PREF_WELCOMETEMPLATE);
-        if ($welcomeTemplate !== 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::ACTION_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->setDomain(1); // FIXME: domains!
-        $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);
+		$preferencesManager = PreferenceManager::getForCurrent($database);
+
+		$secMgr = $this->getSecurityManager();
+		if ($secMgr->allows('RequestCreation', PreferenceManager::CREATION_BOT, $user) !== SecurityManager::ALLOWED
+			&& $creationMode === 'bot'
+		) {
+			throw new AccessDeniedException($secMgr, $this->getDomainAccessManager());
+		}
+		elseif ($secMgr->allows('RequestCreation', PreferenceManager::CREATION_OAUTH, $user) !== SecurityManager::ALLOWED
+			&& $creationMode === 'oauth'
+		) {
+			throw new AccessDeniedException($secMgr, $this->getDomainAccessManager());
+		}
+
+		if ($request->getEmailSent()) {
+			throw new ApplicationLogicException('This requester has already had an email sent to them. Please fall back to manual creation or a custom close');
+		}
+
+		$request->setStatus(RequestStatus::JOBQUEUE);
+		$request->setReserved(null);
+		$request->save();
+
+		Logger::enqueuedJobQueue($database, $request);
+
+		$creationTaskId = $this->enqueueCreationTask($creationMode, $request, $template, $user, $database);
+
+		$welcomeTemplate = $preferencesManager->getPreference(PreferenceManager::PREF_WELCOMETEMPLATE);
+		if ($welcomeTemplate !== 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::ACTION_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->setDomain(1); // FIXME: domains!
+		$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;
+	}
 }

includes/Pages/PageDomainManagement.php

Indentation +156 added lines, -156 removed lines

@@ -19,160 +19,160 @@
 
 class PageDomainManagement extends InternalPageBase
 {
-    protected function main()
-    {
-        $this->setHtmlTitle('Domain Management');
-
-        $database = $this->getDatabase();
-        $currentUser = User::getCurrent($database);
-
-        /** @var Domain[] $domains */
-        $domains = Domain::getAll($database);
-
-        $templates = [];
-        foreach ($domains as $domain) {
-            if ($domain->getDefaultClose() !== null) {
-                $templates[$domain->getDefaultClose()] = EmailTemplate::getById($domain->getDefaultClose(), $database);
-            }
-        }
-
-        $canEdit = $this->barrierTest('edit', $currentUser);
-        $canEditAll = $this->barrierTest('editAll', $currentUser);
-        $canCreate = $this->barrierTest('create', $currentUser);
-        $this->assign('canEdit', $canEdit);
-        $this->assign('canEditAll', $canEditAll);
-        $this->assign('canCreate', $canCreate);
-
-        $this->assign('domains', $domains);
-        $this->assign('closeTemplates', $templates);
-        $this->assign('currentDomain', Domain::getCurrent($database));
-        $this->setTemplate('domain-management/main.tpl');
-    }
-
-    protected function create()
-    {
-        $this->setHtmlTitle('Domain Management');
-        $database = $this->getDatabase();
-        $currentUser = User::getCurrent($database);
-
-        // quickly check the user is allowed to edit all fields. If not, then they shouldn't be allowed to create
-        // new domains either. With any luck, a competent developer would never grant create without editAll to a role
-        // anyway, so this will never be hit.
-        if (!$this->barrierTest('editAll', $currentUser)) {
-            throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
-        }
-
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-
-            $domain = new Domain();
-            $domain->setDatabase($database);
-
-            $domain->setShortName(WebRequest::postString('shortName'));
-            $domain->setLongName(WebRequest::postString('longName'));
-            $domain->setWikiArticlePath(WebRequest::postString('articlePath'));
-            $domain->setWikiApiPath(WebRequest::postString('apiPath'));
-            $domain->setEnabled(WebRequest::postBoolean('enabled'));
-            $domain->setDefaultLanguage(WebRequest::postString('defaultLanguage'));
-            $domain->setDefaultClose(null);
-            $domain->setEmailReplyAddress(WebRequest::postString('emailReplyTo'));
-            $domain->setNotificationTarget(WebRequest::postString('notificationTarget'));
-            $domain->setLocalDocumentation(WebRequest::postString('localDocumentation'));
-
-            $domain->save();
-
-            Logger::domainCreated($database, $domain);
-            $this->redirect('domainManagement');
-        }
-        else {
-            $this->assignCSRFToken();
-
-            $this->assign('shortName', '');
-            $this->assign('longName', '');
-            $this->assign('articlePath', '');
-            $this->assign('apiPath', '');
-            $this->assign('enabled', false);
-            $this->assign('defaultLanguage', 'en');
-            $this->assign('emailReplyTo', '');
-            $this->assign('notificationTarget', '');
-            $this->assign('localDocumentation', '');
-
-            $this->assign('createMode', true);
-            $this->assign('canEditAll', true);
-
-            $this->setTemplate('domain-management/edit.tpl');
-        }
-    }
-
-    protected function edit()
-    {
-        $this->setHtmlTitle('Domain Management');
-        $database = $this->getDatabase();
-        $currentUser = User::getCurrent($database);
-
-        $canEditAll = $this->barrierTest('editAll', $currentUser);
-
-        /** @var Domain $domain */
-        $domain = Domain::getById(WebRequest::getInt('domain'), $database);
-
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-
-            $domain->setLongName(WebRequest::postString('longName'));
-            $domain->setDefaultLanguage(WebRequest::postString('defaultLanguage'));
-            $domain->setLocalDocumentation(WebRequest::postString('localDocumentation'));
-
-            /** @var EmailTemplate|false $template */
-            $template = EmailTemplate::getById(WebRequest::postInt('defaultClose'), $database);
-            if ($template !== false
-                && $template->getActive()
-                && $template->getPreloadOnly() === false
-                && $template->getDefaultAction() === EmailTemplate::ACTION_CREATED) {
-                $domain->setDefaultClose(WebRequest::postInt('defaultClose'));
-            }
-            else {
-                SessionAlert::warning("Chosen email template is not valid for use as the default creation template");
-            }
-
-            if ($canEditAll) {
-                $domain->setWikiArticlePath(WebRequest::postString('articlePath'));
-                $domain->setWikiApiPath(WebRequest::postString('apiPath'));
-                $domain->setEnabled(WebRequest::postBoolean('enabled'));
-                $domain->setEmailReplyAddress(WebRequest::postString('emailReplyTo'));
-                $domain->setNotificationTarget(WebRequest::postString('notificationTarget'));
-            }
-
-            $domain->save();
-
-            Logger::domainEdited($database, $domain);
-            $this->redirect('domainManagement');
-        }
-        else {
-            $this->assignCSRFToken();
-
-            $templates = EmailTemplate::getActiveNonpreloadTemplates(
-                EmailTemplate::ACTION_CREATED,
-                $database,
-                $domain->getId());
-
-            $this->assign('closeTemplates', $templates);
-
-            $this->assign('shortName', $domain->getShortName());
-            $this->assign('longName', $domain->getLongName());
-            $this->assign('articlePath', $domain->getWikiArticlePath());
-            $this->assign('apiPath', $domain->getWikiApiPath());
-            $this->assign('enabled', $domain->isEnabled());
-            $this->assign('defaultClose', $domain->getDefaultClose());
-            $this->assign('defaultLanguage', $domain->getDefaultLanguage());
-            $this->assign('emailReplyTo', $domain->getEmailReplyAddress());
-            $this->assign('notificationTarget', $domain->getNotificationTarget());
-            $this->assign('localDocumentation', $domain->getLocalDocumentation());
-
-
-            $this->assign('createMode', false);
-            $this->assign('canEditAll', $canEditAll);
-
-            $this->setTemplate('domain-management/edit.tpl');
-        }
-    }
+	protected function main()
+	{
+		$this->setHtmlTitle('Domain Management');
+
+		$database = $this->getDatabase();
+		$currentUser = User::getCurrent($database);
+
+		/** @var Domain[] $domains */
+		$domains = Domain::getAll($database);
+
+		$templates = [];
+		foreach ($domains as $domain) {
+			if ($domain->getDefaultClose() !== null) {
+				$templates[$domain->getDefaultClose()] = EmailTemplate::getById($domain->getDefaultClose(), $database);
+			}
+		}
+
+		$canEdit = $this->barrierTest('edit', $currentUser);
+		$canEditAll = $this->barrierTest('editAll', $currentUser);
+		$canCreate = $this->barrierTest('create', $currentUser);
+		$this->assign('canEdit', $canEdit);
+		$this->assign('canEditAll', $canEditAll);
+		$this->assign('canCreate', $canCreate);
+
+		$this->assign('domains', $domains);
+		$this->assign('closeTemplates', $templates);
+		$this->assign('currentDomain', Domain::getCurrent($database));
+		$this->setTemplate('domain-management/main.tpl');
+	}
+
+	protected function create()
+	{
+		$this->setHtmlTitle('Domain Management');
+		$database = $this->getDatabase();
+		$currentUser = User::getCurrent($database);
+
+		// quickly check the user is allowed to edit all fields. If not, then they shouldn't be allowed to create
+		// new domains either. With any luck, a competent developer would never grant create without editAll to a role
+		// anyway, so this will never be hit.
+		if (!$this->barrierTest('editAll', $currentUser)) {
+			throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
+		}
+
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+
+			$domain = new Domain();
+			$domain->setDatabase($database);
+
+			$domain->setShortName(WebRequest::postString('shortName'));
+			$domain->setLongName(WebRequest::postString('longName'));
+			$domain->setWikiArticlePath(WebRequest::postString('articlePath'));
+			$domain->setWikiApiPath(WebRequest::postString('apiPath'));
+			$domain->setEnabled(WebRequest::postBoolean('enabled'));
+			$domain->setDefaultLanguage(WebRequest::postString('defaultLanguage'));
+			$domain->setDefaultClose(null);
+			$domain->setEmailReplyAddress(WebRequest::postString('emailReplyTo'));
+			$domain->setNotificationTarget(WebRequest::postString('notificationTarget'));
+			$domain->setLocalDocumentation(WebRequest::postString('localDocumentation'));
+
+			$domain->save();
+
+			Logger::domainCreated($database, $domain);
+			$this->redirect('domainManagement');
+		}
+		else {
+			$this->assignCSRFToken();
+
+			$this->assign('shortName', '');
+			$this->assign('longName', '');
+			$this->assign('articlePath', '');
+			$this->assign('apiPath', '');
+			$this->assign('enabled', false);
+			$this->assign('defaultLanguage', 'en');
+			$this->assign('emailReplyTo', '');
+			$this->assign('notificationTarget', '');
+			$this->assign('localDocumentation', '');
+
+			$this->assign('createMode', true);
+			$this->assign('canEditAll', true);
+
+			$this->setTemplate('domain-management/edit.tpl');
+		}
+	}
+
+	protected function edit()
+	{
+		$this->setHtmlTitle('Domain Management');
+		$database = $this->getDatabase();
+		$currentUser = User::getCurrent($database);
+
+		$canEditAll = $this->barrierTest('editAll', $currentUser);
+
+		/** @var Domain $domain */
+		$domain = Domain::getById(WebRequest::getInt('domain'), $database);
+
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+
+			$domain->setLongName(WebRequest::postString('longName'));
+			$domain->setDefaultLanguage(WebRequest::postString('defaultLanguage'));
+			$domain->setLocalDocumentation(WebRequest::postString('localDocumentation'));
+
+			/** @var EmailTemplate|false $template */
+			$template = EmailTemplate::getById(WebRequest::postInt('defaultClose'), $database);
+			if ($template !== false
+				&& $template->getActive()
+				&& $template->getPreloadOnly() === false
+				&& $template->getDefaultAction() === EmailTemplate::ACTION_CREATED) {
+				$domain->setDefaultClose(WebRequest::postInt('defaultClose'));
+			}
+			else {
+				SessionAlert::warning("Chosen email template is not valid for use as the default creation template");
+			}
+
+			if ($canEditAll) {
+				$domain->setWikiArticlePath(WebRequest::postString('articlePath'));
+				$domain->setWikiApiPath(WebRequest::postString('apiPath'));
+				$domain->setEnabled(WebRequest::postBoolean('enabled'));
+				$domain->setEmailReplyAddress(WebRequest::postString('emailReplyTo'));
+				$domain->setNotificationTarget(WebRequest::postString('notificationTarget'));
+			}
+
+			$domain->save();
+
+			Logger::domainEdited($database, $domain);
+			$this->redirect('domainManagement');
+		}
+		else {
+			$this->assignCSRFToken();
+
+			$templates = EmailTemplate::getActiveNonpreloadTemplates(
+				EmailTemplate::ACTION_CREATED,
+				$database,
+				$domain->getId());
+
+			$this->assign('closeTemplates', $templates);
+
+			$this->assign('shortName', $domain->getShortName());
+			$this->assign('longName', $domain->getLongName());
+			$this->assign('articlePath', $domain->getWikiArticlePath());
+			$this->assign('apiPath', $domain->getWikiApiPath());
+			$this->assign('enabled', $domain->isEnabled());
+			$this->assign('defaultClose', $domain->getDefaultClose());
+			$this->assign('defaultLanguage', $domain->getDefaultLanguage());
+			$this->assign('emailReplyTo', $domain->getEmailReplyAddress());
+			$this->assign('notificationTarget', $domain->getNotificationTarget());
+			$this->assign('localDocumentation', $domain->getLocalDocumentation());
+
+
+			$this->assign('createMode', false);
+			$this->assign('canEditAll', $canEditAll);
+
+			$this->setTemplate('domain-management/edit.tpl');
+		}
+	}
 }

includes/Pages/PageDomainSwitch.php

Indentation +30 added lines, -30 removed lines

@@ -16,43 +16,43 @@
 
 class PageDomainSwitch extends InternalPageBase
 {
-    /**
-     * @inheritDoc
-     */
-    protected function main()
-    {
-        if (!WebRequest::wasPosted()) {
-            $this->redirect('/');
+	/**
+	 * @inheritDoc
+	 */
+	protected function main()
+	{
+		if (!WebRequest::wasPosted()) {
+			$this->redirect('/');
 
-            return;
-        }
+			return;
+		}
 
-        $database = $this->getDatabase();
-        $currentUser = User::getCurrent($database);
+		$database = $this->getDatabase();
+		$currentUser = User::getCurrent($database);
 
-        /** @var Domain|false $newDomain */
-        $newDomain = Domain::getById(WebRequest::postInt('newdomain'), $database);
+		/** @var Domain|false $newDomain */
+		$newDomain = Domain::getById(WebRequest::postInt('newdomain'), $database);
 
-        if ($newDomain === false) {
-            $this->redirect('/');
+		if ($newDomain === false) {
+			$this->redirect('/');
 
-            return;
-        }
+			return;
+		}
 
-        $this->getDomainAccessManager()->switchDomain($currentUser, $newDomain);
+		$this->getDomainAccessManager()->switchDomain($currentUser, $newDomain);
 
-        // try to stay on the same page if possible.
-        // This only checks basic ACLs and not domain privileges, so this may still result in a 403.
+		// try to stay on the same page if possible.
+		// This only checks basic ACLs and not domain privileges, so this may still result in a 403.
 
-        $referrer = WebRequest::postString('referrer');
-        $priorPath = explode('/', $referrer);
-        $router = new RequestRouter();
-        $route = $router->getRouteFromPath($priorPath);
+		$referrer = WebRequest::postString('referrer');
+		$priorPath = explode('/', $referrer);
+		$router = new RequestRouter();
+		$route = $router->getRouteFromPath($priorPath);
 
-        if ($this->barrierTest($route[1], $currentUser, $route[0])) {
-            $this->redirect('/' . $referrer);
-        } else {
-            $this->redirect('/');
-        }
-    }
+		if ($this->barrierTest($route[1], $currentUser, $route[0])) {
+			$this->redirect('/' . $referrer);
+		} else {
+			$this->redirect('/');
+		}
+	}
 }
\ No newline at end of file

includes/Pages/PageSearch.php

Indentation +195 added lines, -195 removed lines

@@ -20,199 +20,199 @@
 
 class PageSearch extends PagedInternalPageBase
 {
-    use RequestListData;
-
-    /**
-     * Main function for this page, when no specific actions are called.
-     */
-    protected function main()
-    {
-        $this->setHtmlTitle('Search');
-
-        $database = $this->getDatabase();
-        $currentUser = User::getCurrent($database);
-
-        $this->assign('canSearchByComment', $this->barrierTest('byComment', $currentUser));
-        $this->assign('canSearchByEmail', $this->barrierTest('byEmail', $currentUser));
-        $this->assign('canSearchByIp', $this->barrierTest('byIp', $currentUser));
-        $this->assign('canSearchByName', $this->barrierTest('byName', $currentUser));
-        $this->assign('canSeeNonConfirmed', $this->barrierTest('allowNonConfirmed', $currentUser));
-
-        $this->setTemplate('search/main.tpl');
-
-        // Dual-mode page
-        if (WebRequest::getString('type') !== null) {
-            $searchType = WebRequest::getString('type');
-            $searchTerm = WebRequest::getString('term');
-
-            $excludeNonConfirmed = true;
-            if ($this->barrierTest('allowNonConfirmed', $currentUser)) {
-                $excludeNonConfirmed = WebRequest::getBoolean('excludeNonConfirmed');
-            }
-
-            $formParameters = [
-                'term' => $searchTerm,
-                'type' => $searchType,
-            ];
-
-            if ($excludeNonConfirmed) {
-                $formParameters['excludeNonConfirmed'] = true;
-            }
-
-            // FIXME: domains
-            $requestSearch = RequestSearchHelper::get($database, 1);
-            $this->setSearchHelper($requestSearch);
-            $this->setupLimits();
-
-            $validationError = "";
-            if (!$this->validateSearchParameters($searchType, $searchTerm, $validationError)) {
-                SessionAlert::error($validationError, "Search error");
-
-                $this->setupPageData(0, $formParameters);
-                $this->assign('hasResultset', false);
-
-                return;
-            }
-
-            // searchType known to be sane from the validate step above
-            if (!$this->barrierTest('by' . ucfirst($searchType), User::getCurrent($this->getDatabase()))) {
-                // only accessible by url munging, don't care about the UX
-                throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
-            }
-
-            if ($excludeNonConfirmed) {
-                $requestSearch->withConfirmedEmail();
-            }
-
-            switch ($searchType) {
-                case 'name':
-                    $this->getNameSearchResults($requestSearch, $searchTerm);
-                    break;
-                case 'email':
-                    $this->getEmailSearchResults($requestSearch, $searchTerm);
-                    break;
-                case 'ip':
-                    $this->getIpSearchResults($requestSearch, $searchTerm);
-                    break;
-                case 'comment':
-                    $this->getCommentSearchResults($requestSearch, $searchTerm);
-                    break;
-            }
-
-            /** @var Request[] $results */
-            $results = $requestSearch->getRecordCount($count)->fetch();
-            $this->setupPageData($count, $formParameters);
-
-            // deal with results
-            $this->assign('requests', $this->prepareRequestData($results));
-            $this->assign('resultCount', count($results));
-            $this->assign('hasResultset', true);
-
-            list($defaultSort, $defaultSortDirection) = WebRequest::requestListDefaultSort();
-            $this->assign('defaultSort', $defaultSort);
-            $this->assign('defaultSortDirection', $defaultSortDirection);
-        }
-        else {
-            $this->assign('type', 'name');
-            $this->assign('hasResultset', false);
-            $this->assign('limit', 50);
-            $this->assign('excludeNonConfirmed', true);
-        }
-    }
-
-    /**
-     * Gets search results by name
-     *
-     * @param RequestSearchHelper $searchHelper
-     * @param string              $searchTerm
-     */
-    private function getNameSearchResults(RequestSearchHelper $searchHelper, string $searchTerm)
-    {
-        $padded = '%' . $searchTerm . '%';
-        $searchHelper->byName($padded);
-    }
-
-    /**
-     * Gets search results by comment
-     *
-     * @param RequestSearchHelper $searchHelper
-     * @param string              $searchTerm
-     */
-    private function getCommentSearchResults(RequestSearchHelper $searchHelper, string $searchTerm)
-    {
-        $padded = '%' . $searchTerm . '%';
-        $searchHelper->byComment($padded);
-
-        $currentUser = User::getCurrent($this->getDatabase());
-        $commentSecurity = ['requester', 'user'];
-
-        if ($this->barrierTest('seeRestrictedComments', $currentUser, 'RequestData')) {
-            $commentSecurity[] = 'admin';
-        }
-
-        if ($this->barrierTest('seeCheckuserComments', $currentUser, 'RequestData')) {
-            $commentSecurity[] = 'checkuser';
-        }
-
-        $searchHelper->byCommentSecurity($commentSecurity);
-    }
-
-    /**
-     * Gets search results by email
-     *
-     * @param RequestSearchHelper $searchHelper
-     * @param string              $searchTerm
-     *
-     * @throws ApplicationLogicException
-     */
-    private function getEmailSearchResults(RequestSearchHelper $searchHelper, string $searchTerm)
-    {
-        if ($searchTerm === "@") {
-            throw new ApplicationLogicException('The search term "@" is not valid for email address searches!');
-        }
-
-        $padded = '%' . $searchTerm . '%';
-
-        $searchHelper->byEmailAddress($padded)->excludingPurgedData($this->getSiteConfiguration());
-    }
-
-    /**
-     * Gets search results by IP address or XFF IP address
-     *
-     * @param RequestSearchHelper $searchHelper
-     * @param string              $searchTerm
-     */
-    private function getIpSearchResults(RequestSearchHelper $searchHelper, string $searchTerm)
-    {
-        $searchHelper
-            ->byIp($searchTerm)
-            ->excludingPurgedData($this->getSiteConfiguration());
-    }
-
-    /**
-     * @param string $searchType
-     * @param string $searchTerm
-     *
-     * @param string $errorMessage
-     *
-     * @return bool true if parameters are valid
-     */
-    protected function validateSearchParameters($searchType, $searchTerm, &$errorMessage)
-    {
-        if (!in_array($searchType, array('name', 'email', 'ip', 'comment'))) {
-            $errorMessage = 'Unknown search type';
-
-            return false;
-        }
-
-        if ($searchTerm === '%' || $searchTerm === '' || $searchTerm === null) {
-            $errorMessage = 'No search term specified entered';
-
-            return false;
-        }
-
-        $errorMessage = "";
-
-        return true;
-    }
+	use RequestListData;
+
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 */
+	protected function main()
+	{
+		$this->setHtmlTitle('Search');
+
+		$database = $this->getDatabase();
+		$currentUser = User::getCurrent($database);
+
+		$this->assign('canSearchByComment', $this->barrierTest('byComment', $currentUser));
+		$this->assign('canSearchByEmail', $this->barrierTest('byEmail', $currentUser));
+		$this->assign('canSearchByIp', $this->barrierTest('byIp', $currentUser));
+		$this->assign('canSearchByName', $this->barrierTest('byName', $currentUser));
+		$this->assign('canSeeNonConfirmed', $this->barrierTest('allowNonConfirmed', $currentUser));
+
+		$this->setTemplate('search/main.tpl');
+
+		// Dual-mode page
+		if (WebRequest::getString('type') !== null) {
+			$searchType = WebRequest::getString('type');
+			$searchTerm = WebRequest::getString('term');
+
+			$excludeNonConfirmed = true;
+			if ($this->barrierTest('allowNonConfirmed', $currentUser)) {
+				$excludeNonConfirmed = WebRequest::getBoolean('excludeNonConfirmed');
+			}
+
+			$formParameters = [
+				'term' => $searchTerm,
+				'type' => $searchType,
+			];
+
+			if ($excludeNonConfirmed) {
+				$formParameters['excludeNonConfirmed'] = true;
+			}
+
+			// FIXME: domains
+			$requestSearch = RequestSearchHelper::get($database, 1);
+			$this->setSearchHelper($requestSearch);
+			$this->setupLimits();
+
+			$validationError = "";
+			if (!$this->validateSearchParameters($searchType, $searchTerm, $validationError)) {
+				SessionAlert::error($validationError, "Search error");
+
+				$this->setupPageData(0, $formParameters);
+				$this->assign('hasResultset', false);
+
+				return;
+			}
+
+			// searchType known to be sane from the validate step above
+			if (!$this->barrierTest('by' . ucfirst($searchType), User::getCurrent($this->getDatabase()))) {
+				// only accessible by url munging, don't care about the UX
+				throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
+			}
+
+			if ($excludeNonConfirmed) {
+				$requestSearch->withConfirmedEmail();
+			}
+
+			switch ($searchType) {
+				case 'name':
+					$this->getNameSearchResults($requestSearch, $searchTerm);
+					break;
+				case 'email':
+					$this->getEmailSearchResults($requestSearch, $searchTerm);
+					break;
+				case 'ip':
+					$this->getIpSearchResults($requestSearch, $searchTerm);
+					break;
+				case 'comment':
+					$this->getCommentSearchResults($requestSearch, $searchTerm);
+					break;
+			}
+
+			/** @var Request[] $results */
+			$results = $requestSearch->getRecordCount($count)->fetch();
+			$this->setupPageData($count, $formParameters);
+
+			// deal with results
+			$this->assign('requests', $this->prepareRequestData($results));
+			$this->assign('resultCount', count($results));
+			$this->assign('hasResultset', true);
+
+			list($defaultSort, $defaultSortDirection) = WebRequest::requestListDefaultSort();
+			$this->assign('defaultSort', $defaultSort);
+			$this->assign('defaultSortDirection', $defaultSortDirection);
+		}
+		else {
+			$this->assign('type', 'name');
+			$this->assign('hasResultset', false);
+			$this->assign('limit', 50);
+			$this->assign('excludeNonConfirmed', true);
+		}
+	}
+
+	/**
+	 * Gets search results by name
+	 *
+	 * @param RequestSearchHelper $searchHelper
+	 * @param string              $searchTerm
+	 */
+	private function getNameSearchResults(RequestSearchHelper $searchHelper, string $searchTerm)
+	{
+		$padded = '%' . $searchTerm . '%';
+		$searchHelper->byName($padded);
+	}
+
+	/**
+	 * Gets search results by comment
+	 *
+	 * @param RequestSearchHelper $searchHelper
+	 * @param string              $searchTerm
+	 */
+	private function getCommentSearchResults(RequestSearchHelper $searchHelper, string $searchTerm)
+	{
+		$padded = '%' . $searchTerm . '%';
+		$searchHelper->byComment($padded);
+
+		$currentUser = User::getCurrent($this->getDatabase());
+		$commentSecurity = ['requester', 'user'];
+
+		if ($this->barrierTest('seeRestrictedComments', $currentUser, 'RequestData')) {
+			$commentSecurity[] = 'admin';
+		}
+
+		if ($this->barrierTest('seeCheckuserComments', $currentUser, 'RequestData')) {
+			$commentSecurity[] = 'checkuser';
+		}
+
+		$searchHelper->byCommentSecurity($commentSecurity);
+	}
+
+	/**
+	 * Gets search results by email
+	 *
+	 * @param RequestSearchHelper $searchHelper
+	 * @param string              $searchTerm
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	private function getEmailSearchResults(RequestSearchHelper $searchHelper, string $searchTerm)
+	{
+		if ($searchTerm === "@") {
+			throw new ApplicationLogicException('The search term "@" is not valid for email address searches!');
+		}
+
+		$padded = '%' . $searchTerm . '%';
+
+		$searchHelper->byEmailAddress($padded)->excludingPurgedData($this->getSiteConfiguration());
+	}
+
+	/**
+	 * Gets search results by IP address or XFF IP address
+	 *
+	 * @param RequestSearchHelper $searchHelper
+	 * @param string              $searchTerm
+	 */
+	private function getIpSearchResults(RequestSearchHelper $searchHelper, string $searchTerm)
+	{
+		$searchHelper
+			->byIp($searchTerm)
+			->excludingPurgedData($this->getSiteConfiguration());
+	}
+
+	/**
+	 * @param string $searchType
+	 * @param string $searchTerm
+	 *
+	 * @param string $errorMessage
+	 *
+	 * @return bool true if parameters are valid
+	 */
+	protected function validateSearchParameters($searchType, $searchTerm, &$errorMessage)
+	{
+		if (!in_array($searchType, array('name', 'email', 'ip', 'comment'))) {
+			$errorMessage = 'Unknown search type';
+
+			return false;
+		}
+
+		if ($searchTerm === '%' || $searchTerm === '' || $searchTerm === null) {
+			$errorMessage = 'No search term specified entered';
+
+			return false;
+		}
+
+		$errorMessage = "";
+
+		return true;
+	}
 }

includes/Pages/PageEmailManagement.php

Indentation +202 added lines, -202 removed lines

@@ -21,206 +21,206 @@
 
 class PageEmailManagement extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $this->setHtmlTitle('Close Emails');
-
-        // Get all active email templates
-        // FIXME: domains!
-        $activeTemplates = EmailTemplate::getAllActiveTemplates(null, $this->getDatabase(), 1);
-        $inactiveTemplates = EmailTemplate::getAllInactiveTemplates($this->getDatabase(), 1);
-
-        $this->assign('activeTemplates', $activeTemplates);
-        $this->assign('inactiveTemplates', $inactiveTemplates);
-
-        $user = User::getCurrent($this->getDatabase());
-        $this->assign('canCreate', $this->barrierTest('create', $user));
-        $this->assign('canEdit', $this->barrierTest('edit', $user));
-
-        $this->setTemplate('email-management/main.tpl');
-    }
-
-    protected function view()
-    {
-        $this->setHtmlTitle('Close Emails');
-
-        $database = $this->getDatabase();
-        $template = $this->getTemplate($database);
-
-        // FIXME: domains!
-        /** @var Domain $domain */
-        $domain = Domain::getById(1, $database);
-
-        $this->assign('id', $template->getId());
-        $this->assign('emailTemplate', $template);
-        $this->assign('createdid', $domain->getDefaultClose());
-
-        $this->setTemplate('email-management/view.tpl');
-    }
-
-    /**
-     * @param PdoDatabase $database
-     *
-     * @return EmailTemplate
-     * @throws ApplicationLogicException
-     */
-    protected function getTemplate(PdoDatabase $database)
-    {
-        $templateId = WebRequest::getInt('id');
-        if ($templateId === null) {
-            throw new ApplicationLogicException('Template not specified');
-        }
-        $template = EmailTemplate::getById($templateId, $database);
-        if ($template === false || !is_a($template, EmailTemplate::class)) {
-            throw new ApplicationLogicException('Template not found');
-        }
-
-        return $template;
-    }
-
-    protected function edit()
-    {
-        $this->setHtmlTitle('Close Emails');
-
-        $database = $this->getDatabase();
-        $template = $this->getTemplate($database);
-
-        // FIXME: domains!
-        /** @var Domain $domain */
-        $domain = Domain::getById(1, $database);
-
-        $createdId = $domain->getDefaultClose();
-
-        $requestQueues = RequestQueue::getEnabledQueues($database);
-
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-
-            $this->modifyTemplateData($template, $template->getId() === $createdId);
-
-            $other = EmailTemplate::getByName($template->getName(), $database, $domain->getId());
-            if ($other !== false && $other->getId() !== $template->getId()) {
-                throw new ApplicationLogicException('A template with this name already exists');
-            }
-
-            // optimistically lock on load of edit form
-            $updateVersion = WebRequest::postInt('updateversion');
-            $template->setUpdateVersion($updateVersion);
-
-            $template->save();
-            Logger::editedEmail($database, $template);
-            $this->getNotificationHelper()->emailEdited($template);
-            SessionAlert::success("Email template has been saved successfully.");
-
-            $this->redirect('emailManagement');
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->assign('id', $template->getId());
-            $this->assign('emailTemplate', $template);
-            $this->assign('createdid', $createdId);
-            $this->assign('requestQueues', $requestQueues);
-
-            $this->setTemplate('email-management/edit.tpl');
-        }
-    }
-
-    /**
-     * @throws ApplicationLogicException
-     */
-    private function modifyTemplateData(EmailTemplate $template, bool $isDefaultTemplate): void
-    {
-        $name = WebRequest::postString('name');
-        if ($name === null || $name === '') {
-            throw new ApplicationLogicException('Name not specified');
-        }
-
-        $template->setName($name);
-
-        $text = WebRequest::postString('text');
-        if ($text === null || $text === '') {
-            throw new ApplicationLogicException('Text not specified');
-        }
-
-        $template->setText($text);
-
-        $jsquestion = WebRequest::postString('jsquestion');
-        if ($jsquestion === null || $jsquestion === '') {
-            throw new ApplicationLogicException('JS question not specified');
-        }
-        $template->setJsquestion($jsquestion);
-
-        if ($isDefaultTemplate) {
-            $template->setDefaultAction(EmailTemplate::ACTION_CREATED);
-            $template->setActive(true);
-            $template->setPreloadOnly(false);
-        }
-        else {
-            $defaultAction = WebRequest::postString('defaultaction');
-            switch ($defaultAction) {
-                case EmailTemplate::ACTION_NONE:
-                case EmailTemplate::ACTION_CREATED:
-                case EmailTemplate::ACTION_NOT_CREATED:
-                    $template->setDefaultAction($defaultAction);
-                    $template->setQueue(null);
-                    break;
-                default:
-                    $template->setDefaultAction(EmailTemplate::ACTION_DEFER);
-                    // FIXME: domains!
-                    $queue = RequestQueue::getByApiName($this->getDatabase(), $defaultAction, 1);
-                    $template->setQueue($queue->getId());
-                    break;
-            }
-
-            $template->setActive(WebRequest::postBoolean('active'));
-            $template->setPreloadOnly(WebRequest::postBoolean('preloadonly'));
-        }
-    }
-
-    protected function create()
-    {
-        $this->setHtmlTitle('Close Emails');
-
-        $database = $this->getDatabase();
-
-        $requestQueues = RequestQueue::getEnabledQueues($database);
-
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $template = new EmailTemplate();
-            $template->setDatabase($database);
-
-            // FIXME: domains!
-            $template->setDomain(1);
-
-            $this->modifyTemplateData($template, false);
-
-            $other = EmailTemplate::getByName($template->getName(), $database, $template->getDomain());
-            if ($other !== false) {
-                throw new ApplicationLogicException('A template with this name already exists');
-            }
-
-            $template->save();
-
-            Logger::createEmail($database, $template);
-            $this->getNotificationHelper()->emailCreated($template);
-
-            SessionAlert::success("Email template has been saved successfully.");
-
-            $this->redirect('emailManagement');
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->assign('id', -1);
-            $this->assign('emailTemplate', new EmailTemplate());
-            $this->assign('createdid', -2);
-
-            $this->assign('requestQueues', $requestQueues);
-            $this->setTemplate('email-management/edit.tpl');
-        }
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$this->setHtmlTitle('Close Emails');
+
+		// Get all active email templates
+		// FIXME: domains!
+		$activeTemplates = EmailTemplate::getAllActiveTemplates(null, $this->getDatabase(), 1);
+		$inactiveTemplates = EmailTemplate::getAllInactiveTemplates($this->getDatabase(), 1);
+
+		$this->assign('activeTemplates', $activeTemplates);
+		$this->assign('inactiveTemplates', $inactiveTemplates);
+
+		$user = User::getCurrent($this->getDatabase());
+		$this->assign('canCreate', $this->barrierTest('create', $user));
+		$this->assign('canEdit', $this->barrierTest('edit', $user));
+
+		$this->setTemplate('email-management/main.tpl');
+	}
+
+	protected function view()
+	{
+		$this->setHtmlTitle('Close Emails');
+
+		$database = $this->getDatabase();
+		$template = $this->getTemplate($database);
+
+		// FIXME: domains!
+		/** @var Domain $domain */
+		$domain = Domain::getById(1, $database);
+
+		$this->assign('id', $template->getId());
+		$this->assign('emailTemplate', $template);
+		$this->assign('createdid', $domain->getDefaultClose());
+
+		$this->setTemplate('email-management/view.tpl');
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 *
+	 * @return EmailTemplate
+	 * @throws ApplicationLogicException
+	 */
+	protected function getTemplate(PdoDatabase $database)
+	{
+		$templateId = WebRequest::getInt('id');
+		if ($templateId === null) {
+			throw new ApplicationLogicException('Template not specified');
+		}
+		$template = EmailTemplate::getById($templateId, $database);
+		if ($template === false || !is_a($template, EmailTemplate::class)) {
+			throw new ApplicationLogicException('Template not found');
+		}
+
+		return $template;
+	}
+
+	protected function edit()
+	{
+		$this->setHtmlTitle('Close Emails');
+
+		$database = $this->getDatabase();
+		$template = $this->getTemplate($database);
+
+		// FIXME: domains!
+		/** @var Domain $domain */
+		$domain = Domain::getById(1, $database);
+
+		$createdId = $domain->getDefaultClose();
+
+		$requestQueues = RequestQueue::getEnabledQueues($database);
+
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+
+			$this->modifyTemplateData($template, $template->getId() === $createdId);
+
+			$other = EmailTemplate::getByName($template->getName(), $database, $domain->getId());
+			if ($other !== false && $other->getId() !== $template->getId()) {
+				throw new ApplicationLogicException('A template with this name already exists');
+			}
+
+			// optimistically lock on load of edit form
+			$updateVersion = WebRequest::postInt('updateversion');
+			$template->setUpdateVersion($updateVersion);
+
+			$template->save();
+			Logger::editedEmail($database, $template);
+			$this->getNotificationHelper()->emailEdited($template);
+			SessionAlert::success("Email template has been saved successfully.");
+
+			$this->redirect('emailManagement');
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->assign('id', $template->getId());
+			$this->assign('emailTemplate', $template);
+			$this->assign('createdid', $createdId);
+			$this->assign('requestQueues', $requestQueues);
+
+			$this->setTemplate('email-management/edit.tpl');
+		}
+	}
+
+	/**
+	 * @throws ApplicationLogicException
+	 */
+	private function modifyTemplateData(EmailTemplate $template, bool $isDefaultTemplate): void
+	{
+		$name = WebRequest::postString('name');
+		if ($name === null || $name === '') {
+			throw new ApplicationLogicException('Name not specified');
+		}
+
+		$template->setName($name);
+
+		$text = WebRequest::postString('text');
+		if ($text === null || $text === '') {
+			throw new ApplicationLogicException('Text not specified');
+		}
+
+		$template->setText($text);
+
+		$jsquestion = WebRequest::postString('jsquestion');
+		if ($jsquestion === null || $jsquestion === '') {
+			throw new ApplicationLogicException('JS question not specified');
+		}
+		$template->setJsquestion($jsquestion);
+
+		if ($isDefaultTemplate) {
+			$template->setDefaultAction(EmailTemplate::ACTION_CREATED);
+			$template->setActive(true);
+			$template->setPreloadOnly(false);
+		}
+		else {
+			$defaultAction = WebRequest::postString('defaultaction');
+			switch ($defaultAction) {
+				case EmailTemplate::ACTION_NONE:
+				case EmailTemplate::ACTION_CREATED:
+				case EmailTemplate::ACTION_NOT_CREATED:
+					$template->setDefaultAction($defaultAction);
+					$template->setQueue(null);
+					break;
+				default:
+					$template->setDefaultAction(EmailTemplate::ACTION_DEFER);
+					// FIXME: domains!
+					$queue = RequestQueue::getByApiName($this->getDatabase(), $defaultAction, 1);
+					$template->setQueue($queue->getId());
+					break;
+			}
+
+			$template->setActive(WebRequest::postBoolean('active'));
+			$template->setPreloadOnly(WebRequest::postBoolean('preloadonly'));
+		}
+	}
+
+	protected function create()
+	{
+		$this->setHtmlTitle('Close Emails');
+
+		$database = $this->getDatabase();
+
+		$requestQueues = RequestQueue::getEnabledQueues($database);
+
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$template = new EmailTemplate();
+			$template->setDatabase($database);
+
+			// FIXME: domains!
+			$template->setDomain(1);
+
+			$this->modifyTemplateData($template, false);
+
+			$other = EmailTemplate::getByName($template->getName(), $database, $template->getDomain());
+			if ($other !== false) {
+				throw new ApplicationLogicException('A template with this name already exists');
+			}
+
+			$template->save();
+
+			Logger::createEmail($database, $template);
+			$this->getNotificationHelper()->emailCreated($template);
+
+			SessionAlert::success("Email template has been saved successfully.");
+
+			$this->redirect('emailManagement');
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->assign('id', -1);
+			$this->assign('emailTemplate', new EmailTemplate());
+			$this->assign('createdid', -2);
+
+			$this->assign('requestQueues', $requestQueues);
+			$this->setTemplate('email-management/edit.tpl');
+		}
+	}
 }

includes/Pages/PageQueueManagement.php

Indentation +187 added lines, -187 removed lines

@@ -18,191 +18,191 @@
 
 class PageQueueManagement extends InternalPageBase
 {
-    /** @var RequestQueueHelper */
-    private $helper;
-
-    public function __construct()
-    {
-        $this->helper = new RequestQueueHelper();
-    }
-
-    protected function main()
-    {
-        $this->setHtmlTitle('Request Queue Management');
-
-        $database = $this->getDatabase();
-        $queues = RequestQueue::getAllQueues($database);
-
-        $this->assign('queues', $queues);
-
-        $user = User::getCurrent($database);
-        $this->assign('canCreate', $this->barrierTest('create', $user));
-        $this->assign('canEdit', $this->barrierTest('edit', $user));
-
-        $this->setTemplate('queue-management/main.tpl');
-    }
-
-    protected function create()
-    {
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-            $database = $this->getDatabase();
-
-            $queue = new RequestQueue();
-
-            $queue->setDatabase($database);
-            $queue->setDomain(1); // FIXME: domain
-
-            $queue->setHeader(WebRequest::postString('header'));
-            $queue->setDisplayName(WebRequest::postString('displayName'));
-            $queue->setApiName(WebRequest::postString('apiName'));
-            $queue->setEnabled(WebRequest::postBoolean('enabled'));
-            $queue->setDefault(WebRequest::postBoolean('default') && WebRequest::postBoolean('enabled'));
-            $queue->setDefaultAntispoof(WebRequest::postBoolean('antispoof') && WebRequest::postBoolean('enabled'));
-            $queue->setDefaultTitleBlacklist(WebRequest::postBoolean('titleblacklist') && WebRequest::postBoolean('enabled'));
-            $queue->setHelp(WebRequest::postString('help'));
-            $queue->setLogName(WebRequest::postString('logName'));
-
-            $proceed = true;
-
-            if (RequestQueue::getByApiName($database, $queue->getApiName(), 1) !== false) {
-                // FIXME: domain
-                SessionAlert::error("The chosen API name is already in use. Please choose another.");
-                $proceed = false;
-            }
-
-            if (preg_match('/^[A-Za-z][a-zA-Z0-9_-]*$/', $queue->getApiName()) !== 1) {
-                SessionAlert::error("The chosen API name contains invalid characters");
-                $proceed = false;
-            }
-
-            if (RequestQueue::getByDisplayName($database, $queue->getDisplayName(), 1) !== false) {
-                // FIXME: domain
-                SessionAlert::error("The chosen target display name is already in use. Please choose another.");
-                $proceed = false;
-            }
-
-            if (RequestQueue::getByHeader($database, $queue->getHeader(), 1) !== false) {
-                // FIXME: domain
-                SessionAlert::error("The chosen header is already in use. Please choose another.");
-                $proceed = false;
-            }
-
-            if ($proceed) {
-                $queue->save();
-                Logger::requestQueueCreated($database, $queue);
-                $this->redirect('queueManagement');
-            }
-            else {
-                $this->populateFromObject($queue);
-
-                $this->assign('createMode', true);
-                $this->setTemplate('queue-management/edit.tpl');
-            }
-        }
-        else {
-            $this->assign('header', null);
-            $this->assign('displayName', null);
-            $this->assign('apiName', null);
-            $this->assign('enabled', false);
-            $this->assign('antispoof', false);
-            $this->assign('isTarget', false);
-            $this->assign('titleblacklist', false);
-            $this->assign('default', false);
-            $this->assign('help', null);
-            $this->assign('logName', null);
-
-            $this->assignCSRFToken();
-            $this->assign('createMode', true);
-            $this->setTemplate('queue-management/edit.tpl');
-        }
-    }
-
-    protected function edit()
-    {
-        $database = $this->getDatabase();
-
-        $id = WebRequest::getInt('queue');
-        if ($id === null) {
-            $this->redirect('queueManagement');
-
-            return;
-        }
-
-        /** @var RequestQueue $queue */
-        $queue = RequestQueue::getById($id, $database);
-
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-
-            $this->helper->configureDefaults(
-                $queue,
-                WebRequest::postBoolean('enabled'),
-                WebRequest::postBoolean('default'),
-                WebRequest::postBoolean('antispoof'),
-                WebRequest::postBoolean('titleblacklist'),
-                $this->helper->isEmailTemplateTarget($queue, $this->getDatabase()) || $this->helper->isRequestFormTarget($queue, $this->getDatabase()));
-
-            $queue->setHeader(WebRequest::postString('header'));
-            $queue->setDisplayName(WebRequest::postString('displayName'));
-            $queue->setHelp(WebRequest::postString('help'));
-
-            $proceed = true;
-
-            $foundRequestQueue = RequestQueue::getByDisplayName($database, $queue->getDisplayName(), 1);
-            if ($foundRequestQueue !== false && $foundRequestQueue->getId() !== $queue->getId()) {
-                // FIXME: domain
-                SessionAlert::error("The chosen target display name is already in use. Please choose another.");
-                $proceed = false;
-            }
-
-            $foundRequestQueue = RequestQueue::getByHeader($database, $queue->getHeader(), 1);
-            if ($foundRequestQueue !== false && $foundRequestQueue->getId() !== $queue->getId()) {
-                // FIXME: domain
-                SessionAlert::error("The chosen header is already in use. Please choose another.");
-                $proceed = false;
-            }
-
-            if ($proceed) {
-                Logger::requestQueueEdited($database, $queue);
-                $queue->save();
-                $this->redirect('queueManagement');
-            }
-            else {
-                $this->populateFromObject($queue);
-
-                $this->assign('createMode', false);
-                $this->setTemplate('queue-management/edit.tpl');
-            }
-        }
-        else {
-            $this->populateFromObject($queue);
-
-            $this->assign('createMode', false);
-            $this->setTemplate('queue-management/edit.tpl');
-        }
-    }
-
-    /**
-     * @param RequestQueue $queue
-     */
-    protected function populateFromObject(RequestQueue $queue): void
-    {
-        $this->assignCSRFToken();
-
-        $this->assign('header', $queue->getHeader());
-        $this->assign('displayName', $queue->getDisplayName());
-        $this->assign('apiName', $queue->getApiName());
-        $this->assign('enabled', $queue->isEnabled());
-        $this->assign('default', $queue->isDefault());
-        $this->assign('antispoof', $queue->isDefaultAntispoof());
-        $this->assign('titleblacklist', $queue->isDefaultTitleBlacklist());
-        $this->assign('help', $queue->getHelp());
-        $this->assign('logName', $queue->getLogName());
-
-        $isQueueTarget = $this->helper->isEmailTemplateTarget($queue, $this->getDatabase());
-        $isFormTarget = $this->helper->isRequestFormTarget($queue, $this->getDatabase());
-        $this->assign('isTarget', $isQueueTarget);
-        $this->assign('isFormTarget', $isFormTarget);
-    }
+	/** @var RequestQueueHelper */
+	private $helper;
+
+	public function __construct()
+	{
+		$this->helper = new RequestQueueHelper();
+	}
+
+	protected function main()
+	{
+		$this->setHtmlTitle('Request Queue Management');
+
+		$database = $this->getDatabase();
+		$queues = RequestQueue::getAllQueues($database);
+
+		$this->assign('queues', $queues);
+
+		$user = User::getCurrent($database);
+		$this->assign('canCreate', $this->barrierTest('create', $user));
+		$this->assign('canEdit', $this->barrierTest('edit', $user));
+
+		$this->setTemplate('queue-management/main.tpl');
+	}
+
+	protected function create()
+	{
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+			$database = $this->getDatabase();
+
+			$queue = new RequestQueue();
+
+			$queue->setDatabase($database);
+			$queue->setDomain(1); // FIXME: domain
+
+			$queue->setHeader(WebRequest::postString('header'));
+			$queue->setDisplayName(WebRequest::postString('displayName'));
+			$queue->setApiName(WebRequest::postString('apiName'));
+			$queue->setEnabled(WebRequest::postBoolean('enabled'));
+			$queue->setDefault(WebRequest::postBoolean('default') && WebRequest::postBoolean('enabled'));
+			$queue->setDefaultAntispoof(WebRequest::postBoolean('antispoof') && WebRequest::postBoolean('enabled'));
+			$queue->setDefaultTitleBlacklist(WebRequest::postBoolean('titleblacklist') && WebRequest::postBoolean('enabled'));
+			$queue->setHelp(WebRequest::postString('help'));
+			$queue->setLogName(WebRequest::postString('logName'));
+
+			$proceed = true;
+
+			if (RequestQueue::getByApiName($database, $queue->getApiName(), 1) !== false) {
+				// FIXME: domain
+				SessionAlert::error("The chosen API name is already in use. Please choose another.");
+				$proceed = false;
+			}
+
+			if (preg_match('/^[A-Za-z][a-zA-Z0-9_-]*$/', $queue->getApiName()) !== 1) {
+				SessionAlert::error("The chosen API name contains invalid characters");
+				$proceed = false;
+			}
+
+			if (RequestQueue::getByDisplayName($database, $queue->getDisplayName(), 1) !== false) {
+				// FIXME: domain
+				SessionAlert::error("The chosen target display name is already in use. Please choose another.");
+				$proceed = false;
+			}
+
+			if (RequestQueue::getByHeader($database, $queue->getHeader(), 1) !== false) {
+				// FIXME: domain
+				SessionAlert::error("The chosen header is already in use. Please choose another.");
+				$proceed = false;
+			}
+
+			if ($proceed) {
+				$queue->save();
+				Logger::requestQueueCreated($database, $queue);
+				$this->redirect('queueManagement');
+			}
+			else {
+				$this->populateFromObject($queue);
+
+				$this->assign('createMode', true);
+				$this->setTemplate('queue-management/edit.tpl');
+			}
+		}
+		else {
+			$this->assign('header', null);
+			$this->assign('displayName', null);
+			$this->assign('apiName', null);
+			$this->assign('enabled', false);
+			$this->assign('antispoof', false);
+			$this->assign('isTarget', false);
+			$this->assign('titleblacklist', false);
+			$this->assign('default', false);
+			$this->assign('help', null);
+			$this->assign('logName', null);
+
+			$this->assignCSRFToken();
+			$this->assign('createMode', true);
+			$this->setTemplate('queue-management/edit.tpl');
+		}
+	}
+
+	protected function edit()
+	{
+		$database = $this->getDatabase();
+
+		$id = WebRequest::getInt('queue');
+		if ($id === null) {
+			$this->redirect('queueManagement');
+
+			return;
+		}
+
+		/** @var RequestQueue $queue */
+		$queue = RequestQueue::getById($id, $database);
+
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+
+			$this->helper->configureDefaults(
+				$queue,
+				WebRequest::postBoolean('enabled'),
+				WebRequest::postBoolean('default'),
+				WebRequest::postBoolean('antispoof'),
+				WebRequest::postBoolean('titleblacklist'),
+				$this->helper->isEmailTemplateTarget($queue, $this->getDatabase()) || $this->helper->isRequestFormTarget($queue, $this->getDatabase()));
+
+			$queue->setHeader(WebRequest::postString('header'));
+			$queue->setDisplayName(WebRequest::postString('displayName'));
+			$queue->setHelp(WebRequest::postString('help'));
+
+			$proceed = true;
+
+			$foundRequestQueue = RequestQueue::getByDisplayName($database, $queue->getDisplayName(), 1);
+			if ($foundRequestQueue !== false && $foundRequestQueue->getId() !== $queue->getId()) {
+				// FIXME: domain
+				SessionAlert::error("The chosen target display name is already in use. Please choose another.");
+				$proceed = false;
+			}
+
+			$foundRequestQueue = RequestQueue::getByHeader($database, $queue->getHeader(), 1);
+			if ($foundRequestQueue !== false && $foundRequestQueue->getId() !== $queue->getId()) {
+				// FIXME: domain
+				SessionAlert::error("The chosen header is already in use. Please choose another.");
+				$proceed = false;
+			}
+
+			if ($proceed) {
+				Logger::requestQueueEdited($database, $queue);
+				$queue->save();
+				$this->redirect('queueManagement');
+			}
+			else {
+				$this->populateFromObject($queue);
+
+				$this->assign('createMode', false);
+				$this->setTemplate('queue-management/edit.tpl');
+			}
+		}
+		else {
+			$this->populateFromObject($queue);
+
+			$this->assign('createMode', false);
+			$this->setTemplate('queue-management/edit.tpl');
+		}
+	}
+
+	/**
+	 * @param RequestQueue $queue
+	 */
+	protected function populateFromObject(RequestQueue $queue): void
+	{
+		$this->assignCSRFToken();
+
+		$this->assign('header', $queue->getHeader());
+		$this->assign('displayName', $queue->getDisplayName());
+		$this->assign('apiName', $queue->getApiName());
+		$this->assign('enabled', $queue->isEnabled());
+		$this->assign('default', $queue->isDefault());
+		$this->assign('antispoof', $queue->isDefaultAntispoof());
+		$this->assign('titleblacklist', $queue->isDefaultTitleBlacklist());
+		$this->assign('help', $queue->getHelp());
+		$this->assign('logName', $queue->getLogName());
+
+		$isQueueTarget = $this->helper->isEmailTemplateTarget($queue, $this->getDatabase());
+		$isFormTarget = $this->helper->isRequestFormTarget($queue, $this->getDatabase());
+		$this->assign('isTarget', $isQueueTarget);
+		$this->assign('isFormTarget', $isFormTarget);
+	}
 }
\ No newline at end of file

includes/Pages/Registration/PageRegisterOption.php

Indentation +14 added lines, -14 removed lines

@@ -13,19 +13,19 @@
 
 class PageRegisterOption extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $this->assign('allowRegistration', $this->getSiteConfiguration()->isRegistrationAllowed());
-        $this->assign('domains', Domain::getAll($this->getDatabase()));
-        $this->setTemplate('registration/option.tpl');
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$this->assign('allowRegistration', $this->getSiteConfiguration()->isRegistrationAllowed());
+		$this->assign('domains', Domain::getAll($this->getDatabase()));
+		$this->setTemplate('registration/option.tpl');
+	}
 
-    protected function isProtectedPage()
-    {
-        return false;
-    }
+	protected function isProtectedPage()
+	{
+		return false;
+	}
 }

includes/Pages/Registration/PageRegisterBase.php

Indentation +252 added lines, -252 removed lines

@@ -24,255 +24,255 @@
 
 abstract class PageRegisterBase extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @throws AccessDeniedException
-     * @throws ApplicationLogicException
-     * @throws Exception
-     */
-    protected function main()
-    {
-        $useOAuthSignup = $this->getSiteConfiguration()->getUseOAuthSignup();
-        if (!$this->getSiteConfiguration()->isRegistrationAllowed()) {
-            throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
-        }
-
-        // Dual-mode page
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-
-            try {
-                $this->handlePost($useOAuthSignup);
-            }
-            catch (ApplicationLogicException $ex) {
-                SessionAlert::error($ex->getMessage());
-
-                $this->getDatabase()->rollBack();
-
-                $this->assignCSRFToken();
-                $this->assign("useOAuthSignup", $useOAuthSignup);
-                $this->applyErrorValues();
-                $this->setTemplate($this->getRegistrationTemplate());
-                $this->addJs("/vendor/dropbox/zxcvbn/dist/zxcvbn.js");
-            }
-        }
-        else {
-            $domain = WebRequest::getString('d');
-            if ($domain === null) {
-                throw new ApplicationLogicException("No domain specified.");
-            }
-
-            /** @var Domain|false $domainObject */
-            $domainObject = Domain::getByShortName($domain, $this->getDatabase());
-            if ($domainObject === false || !$domainObject->isEnabled()) {
-                throw new ApplicationLogicException("Unknown domain or domain not enabled.");
-            }
-
-            $this->assign('localDocumentation', $domainObject->getLocalDocumentation());
-
-            $this->assignCSRFToken();
-            $this->assign("useOAuthSignup", $useOAuthSignup);
-            $this->setTemplate($this->getRegistrationTemplate());
-            $this->addJs("/vendor/dropbox/zxcvbn/dist/zxcvbn.js");
-        }
-    }
-
-    protected abstract function getRegistrationTemplate();
-
-    protected function isProtectedPage()
-    {
-        return false;
-    }
-
-    /**
-     * @param string $emailAddress
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function validateUniqueEmail($emailAddress)
-    {
-        $query = 'SELECT COUNT(id) FROM user WHERE email = :email';
-        $statement = $this->getDatabase()->prepare($query);
-        $statement->execute(array(':email' => $emailAddress));
-
-        if ($statement->fetchColumn() > 0) {
-            throw new ApplicationLogicException('That email address is already in use on this system.');
-        }
-
-        $statement->closeCursor();
-    }
-
-    /**
-     * @param $emailAddress
-     * @param $password
-     * @param $username
-     * @param $useOAuthSignup
-     * @param $confirmationId
-     * @param $onwikiUsername
-     * @param Domain|false $domainObject
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function validateRequest(
-        $emailAddress,
-        $password,
-        $username,
-        $useOAuthSignup,
-        $confirmationId,
-        $onwikiUsername,
-        $domainObject
-    ) {
-        if (!WebRequest::postBoolean('guidelines')) {
-            throw new ApplicationLogicException('You must read the interface guidelines before your request may be submitted.');
-        }
-
-        if ($domainObject === false) {
-            throw new ApplicationLogicException('The chosen wiki does not exist on this tool.');
-        }
-
-        if (!$domainObject->isEnabled()) {
-            throw new ApplicationLogicException('The chosen wiki is not currently enabled on this tool.');
-        }
-
-        $this->validateGeneralInformation($emailAddress, $password, $username);
-        $this->validateUniqueEmail($emailAddress);
-        $this->validateNonOAuthFields($useOAuthSignup, $confirmationId, $onwikiUsername);
-    }
-
-    /**
-     * @param $useOAuthSignup
-     * @param $confirmationId
-     * @param $onwikiUsername
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function validateNonOAuthFields($useOAuthSignup, $confirmationId, $onwikiUsername)
-    {
-        if (!$useOAuthSignup) {
-            if ($confirmationId === null || $confirmationId <= 0) {
-                throw new ApplicationLogicException('Please enter the revision id of your confirmation edit.');
-            }
-
-            if ($onwikiUsername === null) {
-                throw new ApplicationLogicException('Please specify your on-wiki username.');
-            }
-        }
-    }
-
-    /**
-     * @param $emailAddress
-     * @param $password
-     * @param $username
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function validateGeneralInformation($emailAddress, $password, $username)
-    {
-        if ($emailAddress === null) {
-            throw new ApplicationLogicException('Your email address appears to be invalid!');
-        }
-
-        if ($password !== WebRequest::postString('newpasswordconfirm')) {
-            throw new ApplicationLogicException('Your passwords did not match, please try again.');
-        }
-
-        if (User::getByUsername($username, $this->getDatabase()) !== false) {
-            throw new ApplicationLogicException('That username is already in use on this system.');
-        }
-    }
-
-    /**
-     * @param $useOAuthSignup
-     *
-     * @throws ApplicationLogicException
-     * @throws Exception
-     */
-    protected function handlePost($useOAuthSignup)
-    {
-        // Get the data
-        $emailAddress = WebRequest::postEmail('email');
-        $password = WebRequest::postString('newpassword');
-        $username = WebRequest::postString('name');
-
-        // Only set if OAuth is disabled
-        $confirmationId = WebRequest::postInt('conf_revid');
-        $onwikiUsername = WebRequest::postString('wname');
-
-        $database = $this->getDatabase();
-        $domain = WebRequest::getString('d');
-        $domainObject = Domain::getByShortName($domain, $database);
-
-        // Do some validation
-        $this->validateRequest($emailAddress, $password, $username, $useOAuthSignup, $confirmationId,
-            $onwikiUsername, $domainObject);
-
-        $user = new User();
-        $user->setDatabase($database);
-
-        $user->setUsername($username);
-        $user->setEmail($emailAddress);
-
-        if (!$useOAuthSignup) {
-            $user->setOnWikiName($onwikiUsername);
-            $user->setConfirmationDiff($confirmationId);
-        }
-
-        $user->save();
-
-        $passwordCredentialProvider = new PasswordCredentialProvider($database, $this->getSiteConfiguration());
-        $passwordCredentialProvider->setCredential($user, 1, $password);
-
-        $defaultRole = $this->getDefaultRole();
-
-        $role = new UserRole();
-        $role->setDatabase($database);
-        $role->setUser($user->getId());
-        $role->setRole($defaultRole);
-        $role->setDomain($domainObject->getId()); // FIXME: domains
-        $role->save();
-
-        // Log now to get the signup date.
-        Logger::newUser($database, $user);
-        Logger::userRolesEdited($database, $user, 'Registration', array($defaultRole), array(), $domainObject->getId());
-
-        $userDomain = new UserDomain();
-        $userDomain->setDatabase($database);
-        $userDomain->setUser($user->getId());
-        $userDomain->setDomain($domainObject->getId());
-        $userDomain->save();
-
-        if ($useOAuthSignup) {
-            $oauthProtocolHelper = $this->getOAuthProtocolHelper();
-            $oauth = new OAuthUserHelper($user, $database, $oauthProtocolHelper, $this->getSiteConfiguration());
-
-            $authoriseUrl = $oauth->getRequestToken();
-            WebRequest::setOAuthPartialLogin($user);
-            $this->redirectUrl($authoriseUrl);
-        }
-        else {
-            // only notify if we're not using the oauth signup.
-            $this->getNotificationHelper()->userNew($user);
-            WebRequest::setLoggedInUser($user);
-            $this->getDomainAccessManager()->switchToDefaultDomain($user);
-            $this->redirect('preferences');
-        }
-    }
-
-    protected abstract function getDefaultRole();
-
-    /**
-     * Entry point for registration complete
-     * @throws Exception
-     */
-    protected function done()
-    {
-        $this->setTemplate('registration/alert-registrationcomplete.tpl');
-    }
-
-    protected function applyErrorValues()
-    {
-        $this->assign('tplUsername', WebRequest::postString('name'));
-        $this->assign('tplEmail', WebRequest::postString('email'));
-        $this->assign('tplWikipediaUsername', WebRequest::postString('wname'));
-        $this->assign('tplConfRevId', WebRequest::postInt('conf_revid'));
-    }}
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @throws AccessDeniedException
+	 * @throws ApplicationLogicException
+	 * @throws Exception
+	 */
+	protected function main()
+	{
+		$useOAuthSignup = $this->getSiteConfiguration()->getUseOAuthSignup();
+		if (!$this->getSiteConfiguration()->isRegistrationAllowed()) {
+			throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
+		}
+
+		// Dual-mode page
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+
+			try {
+				$this->handlePost($useOAuthSignup);
+			}
+			catch (ApplicationLogicException $ex) {
+				SessionAlert::error($ex->getMessage());
+
+				$this->getDatabase()->rollBack();
+
+				$this->assignCSRFToken();
+				$this->assign("useOAuthSignup", $useOAuthSignup);
+				$this->applyErrorValues();
+				$this->setTemplate($this->getRegistrationTemplate());
+				$this->addJs("/vendor/dropbox/zxcvbn/dist/zxcvbn.js");
+			}
+		}
+		else {
+			$domain = WebRequest::getString('d');
+			if ($domain === null) {
+				throw new ApplicationLogicException("No domain specified.");
+			}
+
+			/** @var Domain|false $domainObject */
+			$domainObject = Domain::getByShortName($domain, $this->getDatabase());
+			if ($domainObject === false || !$domainObject->isEnabled()) {
+				throw new ApplicationLogicException("Unknown domain or domain not enabled.");
+			}
+
+			$this->assign('localDocumentation', $domainObject->getLocalDocumentation());
+
+			$this->assignCSRFToken();
+			$this->assign("useOAuthSignup", $useOAuthSignup);
+			$this->setTemplate($this->getRegistrationTemplate());
+			$this->addJs("/vendor/dropbox/zxcvbn/dist/zxcvbn.js");
+		}
+	}
+
+	protected abstract function getRegistrationTemplate();
+
+	protected function isProtectedPage()
+	{
+		return false;
+	}
+
+	/**
+	 * @param string $emailAddress
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function validateUniqueEmail($emailAddress)
+	{
+		$query = 'SELECT COUNT(id) FROM user WHERE email = :email';
+		$statement = $this->getDatabase()->prepare($query);
+		$statement->execute(array(':email' => $emailAddress));
+
+		if ($statement->fetchColumn() > 0) {
+			throw new ApplicationLogicException('That email address is already in use on this system.');
+		}
+
+		$statement->closeCursor();
+	}
+
+	/**
+	 * @param $emailAddress
+	 * @param $password
+	 * @param $username
+	 * @param $useOAuthSignup
+	 * @param $confirmationId
+	 * @param $onwikiUsername
+	 * @param Domain|false $domainObject
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function validateRequest(
+		$emailAddress,
+		$password,
+		$username,
+		$useOAuthSignup,
+		$confirmationId,
+		$onwikiUsername,
+		$domainObject
+	) {
+		if (!WebRequest::postBoolean('guidelines')) {
+			throw new ApplicationLogicException('You must read the interface guidelines before your request may be submitted.');
+		}
+
+		if ($domainObject === false) {
+			throw new ApplicationLogicException('The chosen wiki does not exist on this tool.');
+		}
+
+		if (!$domainObject->isEnabled()) {
+			throw new ApplicationLogicException('The chosen wiki is not currently enabled on this tool.');
+		}
+
+		$this->validateGeneralInformation($emailAddress, $password, $username);
+		$this->validateUniqueEmail($emailAddress);
+		$this->validateNonOAuthFields($useOAuthSignup, $confirmationId, $onwikiUsername);
+	}
+
+	/**
+	 * @param $useOAuthSignup
+	 * @param $confirmationId
+	 * @param $onwikiUsername
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function validateNonOAuthFields($useOAuthSignup, $confirmationId, $onwikiUsername)
+	{
+		if (!$useOAuthSignup) {
+			if ($confirmationId === null || $confirmationId <= 0) {
+				throw new ApplicationLogicException('Please enter the revision id of your confirmation edit.');
+			}
+
+			if ($onwikiUsername === null) {
+				throw new ApplicationLogicException('Please specify your on-wiki username.');
+			}
+		}
+	}
+
+	/**
+	 * @param $emailAddress
+	 * @param $password
+	 * @param $username
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function validateGeneralInformation($emailAddress, $password, $username)
+	{
+		if ($emailAddress === null) {
+			throw new ApplicationLogicException('Your email address appears to be invalid!');
+		}
+
+		if ($password !== WebRequest::postString('newpasswordconfirm')) {
+			throw new ApplicationLogicException('Your passwords did not match, please try again.');
+		}
+
+		if (User::getByUsername($username, $this->getDatabase()) !== false) {
+			throw new ApplicationLogicException('That username is already in use on this system.');
+		}
+	}
+
+	/**
+	 * @param $useOAuthSignup
+	 *
+	 * @throws ApplicationLogicException
+	 * @throws Exception
+	 */
+	protected function handlePost($useOAuthSignup)
+	{
+		// Get the data
+		$emailAddress = WebRequest::postEmail('email');
+		$password = WebRequest::postString('newpassword');
+		$username = WebRequest::postString('name');
+
+		// Only set if OAuth is disabled
+		$confirmationId = WebRequest::postInt('conf_revid');
+		$onwikiUsername = WebRequest::postString('wname');
+
+		$database = $this->getDatabase();
+		$domain = WebRequest::getString('d');
+		$domainObject = Domain::getByShortName($domain, $database);
+
+		// Do some validation
+		$this->validateRequest($emailAddress, $password, $username, $useOAuthSignup, $confirmationId,
+			$onwikiUsername, $domainObject);
+
+		$user = new User();
+		$user->setDatabase($database);
+
+		$user->setUsername($username);
+		$user->setEmail($emailAddress);
+
+		if (!$useOAuthSignup) {
+			$user->setOnWikiName($onwikiUsername);
+			$user->setConfirmationDiff($confirmationId);
+		}
+
+		$user->save();
+
+		$passwordCredentialProvider = new PasswordCredentialProvider($database, $this->getSiteConfiguration());
+		$passwordCredentialProvider->setCredential($user, 1, $password);
+
+		$defaultRole = $this->getDefaultRole();
+
+		$role = new UserRole();
+		$role->setDatabase($database);
+		$role->setUser($user->getId());
+		$role->setRole($defaultRole);
+		$role->setDomain($domainObject->getId()); // FIXME: domains
+		$role->save();
+
+		// Log now to get the signup date.
+		Logger::newUser($database, $user);
+		Logger::userRolesEdited($database, $user, 'Registration', array($defaultRole), array(), $domainObject->getId());
+
+		$userDomain = new UserDomain();
+		$userDomain->setDatabase($database);
+		$userDomain->setUser($user->getId());
+		$userDomain->setDomain($domainObject->getId());
+		$userDomain->save();
+
+		if ($useOAuthSignup) {
+			$oauthProtocolHelper = $this->getOAuthProtocolHelper();
+			$oauth = new OAuthUserHelper($user, $database, $oauthProtocolHelper, $this->getSiteConfiguration());
+
+			$authoriseUrl = $oauth->getRequestToken();
+			WebRequest::setOAuthPartialLogin($user);
+			$this->redirectUrl($authoriseUrl);
+		}
+		else {
+			// only notify if we're not using the oauth signup.
+			$this->getNotificationHelper()->userNew($user);
+			WebRequest::setLoggedInUser($user);
+			$this->getDomainAccessManager()->switchToDefaultDomain($user);
+			$this->redirect('preferences');
+		}
+	}
+
+	protected abstract function getDefaultRole();
+
+	/**
+	 * Entry point for registration complete
+	 * @throws Exception
+	 */
+	protected function done()
+	{
+		$this->setTemplate('registration/alert-registrationcomplete.tpl');
+	}
+
+	protected function applyErrorValues()
+	{
+		$this->assign('tplUsername', WebRequest::postString('name'));
+		$this->assign('tplEmail', WebRequest::postString('email'));
+		$this->assign('tplWikipediaUsername', WebRequest::postString('wname'));
+		$this->assign('tplConfRevId', WebRequest::postInt('conf_revid'));
+	}}