mdaniels5757 / waca

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/PageUserManagement.php

Indentation +594 added lines, -594 removed lines

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

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

includes/Pages/PageJobQueue.php

Indentation +269 added lines, -269 removed lines

@@ -28,309 +28,309 @@
 
 class PageJobQueue extends PagedInternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $this->setHtmlTitle('Job Queue Management');
-
-        $this->prepareMaps();
-
-        $database = $this->getDatabase();
-
-        /** @var JobQueue[] $jobList */
-        // FIXME: domains
-        $jobList = JobQueueSearchHelper::get($database, 1)
-            ->statusIn([
-                JobQueue::STATUS_QUEUED,
-                JobQueue::STATUS_READY,
-                JobQueue::STATUS_WAITING,
-                JobQueue::STATUS_RUNNING,
-                JobQueue::STATUS_FAILED,
-            ])
-            ->notAcknowledged()
-            ->fetch();
-
-        $userIds = array();
-        $requestIds = array();
-
-        foreach ($jobList as $job) {
-            $userIds[] = $job->getTriggerUserId();
-            $requestIds[] = $job->getRequest();
-
-            $job->setDatabase($database);
-        }
-
-        $this->assign('canSeeAll', $this->barrierTest('all', User::getCurrent($database)));
-
-        $this->assign('users', UserSearchHelper::get($database)->inIds($userIds)->fetchMap('username'));
-        // FIXME: domains
-        $this->assign('requests', RequestSearchHelper::get($database, 1)->inIds($requestIds)->fetchMap('name'));
-
-        $this->assign('joblist', $jobList);
-        $this->setTemplate('jobqueue/main.tpl');
-    }
-
-    protected function all()
-    {
-        $this->setHtmlTitle('All Jobs');
-
-        $this->prepareMaps();
-
-        $database = $this->getDatabase();
-
-        // FIXME: domains
-        $searchHelper = JobQueueSearchHelper::get($database, 1);
-        $this->setSearchHelper($searchHelper);
-        $this->setupLimits();
-
-        $filterUser = WebRequest::getString('filterUser');
-        $filterTask = WebRequest::getString('filterTask');
-        $filterStatus = WebRequest::getString('filterStatus');
-        $filterRequest = WebRequest::getString('filterRequest');
-        $order = WebRequest::getString('order');
-
-        if ($filterUser !== null) {
-            $searchHelper->byUser(User::getByUsername($filterUser, $database)->getId());
-        }
-
-        if ($filterTask !== null) {
-            $searchHelper->byTask($filterTask);
-        }
-
-        if ($filterStatus !== null) {
-            $searchHelper->byStatus($filterStatus);
-        }
-
-        if ($filterRequest !== null) {
-            $searchHelper->byRequest($filterRequest);
-        }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$this->setHtmlTitle('Job Queue Management');
+
+		$this->prepareMaps();
+
+		$database = $this->getDatabase();
+
+		/** @var JobQueue[] $jobList */
+		// FIXME: domains
+		$jobList = JobQueueSearchHelper::get($database, 1)
+			->statusIn([
+				JobQueue::STATUS_QUEUED,
+				JobQueue::STATUS_READY,
+				JobQueue::STATUS_WAITING,
+				JobQueue::STATUS_RUNNING,
+				JobQueue::STATUS_FAILED,
+			])
+			->notAcknowledged()
+			->fetch();
+
+		$userIds = array();
+		$requestIds = array();
+
+		foreach ($jobList as $job) {
+			$userIds[] = $job->getTriggerUserId();
+			$requestIds[] = $job->getRequest();
+
+			$job->setDatabase($database);
+		}
+
+		$this->assign('canSeeAll', $this->barrierTest('all', User::getCurrent($database)));
+
+		$this->assign('users', UserSearchHelper::get($database)->inIds($userIds)->fetchMap('username'));
+		// FIXME: domains
+		$this->assign('requests', RequestSearchHelper::get($database, 1)->inIds($requestIds)->fetchMap('name'));
+
+		$this->assign('joblist', $jobList);
+		$this->setTemplate('jobqueue/main.tpl');
+	}
+
+	protected function all()
+	{
+		$this->setHtmlTitle('All Jobs');
+
+		$this->prepareMaps();
+
+		$database = $this->getDatabase();
+
+		// FIXME: domains
+		$searchHelper = JobQueueSearchHelper::get($database, 1);
+		$this->setSearchHelper($searchHelper);
+		$this->setupLimits();
+
+		$filterUser = WebRequest::getString('filterUser');
+		$filterTask = WebRequest::getString('filterTask');
+		$filterStatus = WebRequest::getString('filterStatus');
+		$filterRequest = WebRequest::getString('filterRequest');
+		$order = WebRequest::getString('order');
+
+		if ($filterUser !== null) {
+			$searchHelper->byUser(User::getByUsername($filterUser, $database)->getId());
+		}
+
+		if ($filterTask !== null) {
+			$searchHelper->byTask($filterTask);
+		}
+
+		if ($filterStatus !== null) {
+			$searchHelper->byStatus($filterStatus);
+		}
+
+		if ($filterRequest !== null) {
+			$searchHelper->byRequest($filterRequest);
+		}
         
-        if ($order === null) {
-            $searchHelper->newestFirst();
-        }
-
-        /** @var JobQueue[] $jobList */
-        $jobList = $searchHelper->getRecordCount($count)->fetch();
+		if ($order === null) {
+			$searchHelper->newestFirst();
+		}
+
+		/** @var JobQueue[] $jobList */
+		$jobList = $searchHelper->getRecordCount($count)->fetch();
 
-        $this->setupPageData($count, array(
-            'filterUser' => $filterUser,
-            'filterTask' => $filterTask,
-            'filterStatus' => $filterStatus,
-            'filterRequest' => $filterRequest,
-            'order' => $order,
-        ));
+		$this->setupPageData($count, array(
+			'filterUser' => $filterUser,
+			'filterTask' => $filterTask,
+			'filterStatus' => $filterStatus,
+			'filterRequest' => $filterRequest,
+			'order' => $order,
+		));
 
-        $userIds = array();
-        $requestIds = array();
+		$userIds = array();
+		$requestIds = array();
 
-        foreach ($jobList as $job) {
-            $userIds[] = $job->getTriggerUserId();
-            $requestIds[] = $job->getRequest();
+		foreach ($jobList as $job) {
+			$userIds[] = $job->getTriggerUserId();
+			$requestIds[] = $job->getRequest();
 
-            $job->setDatabase($database);
-        }
+			$job->setDatabase($database);
+		}
 
-        $this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database) {
-            return UserSearchHelper::get($database)->fetchColumn('username');
-        });
+		$this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database) {
+			return UserSearchHelper::get($database)->fetchColumn('username');
+		});
 
-        $this->assign('users', UserSearchHelper::get($database)->inIds($userIds)->fetchMap('username'));
-        // FIXME: domains!
-        $this->assign('requests', RequestSearchHelper::get($database, 1)->inIds($requestIds)->fetchMap('name'));
+		$this->assign('users', UserSearchHelper::get($database)->inIds($userIds)->fetchMap('username'));
+		// FIXME: domains!
+		$this->assign('requests', RequestSearchHelper::get($database, 1)->inIds($requestIds)->fetchMap('name'));
 
-        $this->assign('joblist', $jobList);
+		$this->assign('joblist', $jobList);
 
-        $this->addJs("/api.php?action=users&all=true&targetVariable=typeaheaddata");
+		$this->addJs("/api.php?action=users&all=true&targetVariable=typeaheaddata");
 
-        $this->setTemplate('jobqueue/all.tpl');
-    }
+		$this->setTemplate('jobqueue/all.tpl');
+	}
 
-    protected function view()
-    {
-        $jobId = WebRequest::getInt('id');
-        $database = $this->getDatabase();
+	protected function view()
+	{
+		$jobId = WebRequest::getInt('id');
+		$database = $this->getDatabase();
 
-        if ($jobId === null) {
-            throw new ApplicationLogicException('No job specified');
-        }
+		if ($jobId === null) {
+			throw new ApplicationLogicException('No job specified');
+		}
 
-        /** @var JobQueue $job */
-        $job = JobQueue::getById($jobId, $database);
+		/** @var JobQueue $job */
+		$job = JobQueue::getById($jobId, $database);
 
-        if ($job === false) {
-            throw new ApplicationLogicException('Could not find requested job');
-        }
+		if ($job === false) {
+			throw new ApplicationLogicException('Could not find requested job');
+		}
 
-        $this->prepareMaps();
+		$this->prepareMaps();
 
-        $this->assign('user', User::getById($job->getTriggerUserId(), $database));
-        $this->assign('request', Request::getById($job->getRequest(), $database));
-        $this->assign('emailTemplate', EmailTemplate::getById($job->getEmailTemplate(), $database));
-        $this->assign('parent', JobQueue::getById($job->getParent(), $database));
+		$this->assign('user', User::getById($job->getTriggerUserId(), $database));
+		$this->assign('request', Request::getById($job->getRequest(), $database));
+		$this->assign('emailTemplate', EmailTemplate::getById($job->getEmailTemplate(), $database));
+		$this->assign('parent', JobQueue::getById($job->getParent(), $database));
 
-        /** @var Log[] $logs */
-        // FIXME: domains
-        $logs = LogSearchHelper::get($database, 1)->byObjectType('JobQueue')
-            ->byObjectId($job->getId())->getRecordCount($logCount)->fetch();
-        if ($logCount === 0) {
-            $this->assign('log', array());
-        }
-        else {
-            list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration());
+		/** @var Log[] $logs */
+		// FIXME: domains
+		$logs = LogSearchHelper::get($database, 1)->byObjectType('JobQueue')
+			->byObjectId($job->getId())->getRecordCount($logCount)->fetch();
+		if ($logCount === 0) {
+			$this->assign('log', array());
+		}
+		else {
+			list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration());
 
-            $this->assign("log", $logData);
-            $this->assign("users", $users);
-        }
+			$this->assign("log", $logData);
+			$this->assign("users", $users);
+		}
 
-        $this->assignCSRFToken();
+		$this->assignCSRFToken();
 
-        $this->assign('job', $job);
+		$this->assign('job', $job);
 
-        $this->assign('canAcknowledge', $this->barrierTest('acknowledge', User::getCurrent($database)));
-        $this->assign('canRequeue', $this->barrierTest('requeue', User::getCurrent($database)));
-        $this->assign('canCancel', $this->barrierTest('cancel', User::getCurrent($database)));
+		$this->assign('canAcknowledge', $this->barrierTest('acknowledge', User::getCurrent($database)));
+		$this->assign('canRequeue', $this->barrierTest('requeue', User::getCurrent($database)));
+		$this->assign('canCancel', $this->barrierTest('cancel', User::getCurrent($database)));
 
-        if ($job->getTask() === UserCreationTask::class || $job->getTask() === BotCreationTask::class) {
-            if ($job->getEmailTemplate() === null) {
-                $params = json_decode($job->getParameters());
+		if ($job->getTask() === UserCreationTask::class || $job->getTask() === BotCreationTask::class) {
+			if ($job->getEmailTemplate() === null) {
+				$params = json_decode($job->getParameters());
 
-                if (isset($params->emailText)) {
-                    $this->assign("creationEmailText", $params->emailText);
-                }
-            }
-        }
+				if (isset($params->emailText)) {
+					$this->assign("creationEmailText", $params->emailText);
+				}
+			}
+		}
 
-        $this->setHtmlTitle('Job #{$job->getId()|escape}');
-        $this->setTemplate('jobqueue/view.tpl');
-    }
+		$this->setHtmlTitle('Job #{$job->getId()|escape}');
+		$this->setTemplate('jobqueue/view.tpl');
+	}
 
-    protected function acknowledge()
-    {
-        if (!WebRequest::wasPosted()) {
-            throw new ApplicationLogicException('This page does not support GET methods.');
-        }
+	protected function acknowledge()
+	{
+		if (!WebRequest::wasPosted()) {
+			throw new ApplicationLogicException('This page does not support GET methods.');
+		}
 
-        $this->validateCSRFToken();
+		$this->validateCSRFToken();
 
-        $jobId = WebRequest::postInt('job');
-        $database = $this->getDatabase();
+		$jobId = WebRequest::postInt('job');
+		$database = $this->getDatabase();
 
-        if ($jobId === null) {
-            throw new ApplicationLogicException('No job specified');
-        }
+		if ($jobId === null) {
+			throw new ApplicationLogicException('No job specified');
+		}
 
-        /** @var JobQueue $job */
-        $job = JobQueue::getById($jobId, $database);
+		/** @var JobQueue $job */
+		$job = JobQueue::getById($jobId, $database);
 
-        if ($job === false) {
-            throw new ApplicationLogicException('Could not find requested job');
-        }
+		if ($job === false) {
+			throw new ApplicationLogicException('Could not find requested job');
+		}
 
-        $job->setUpdateVersion(WebRequest::postInt('updateVersion'));
-        $job->setAcknowledged(true);
-        $job->save();
+		$job->setUpdateVersion(WebRequest::postInt('updateVersion'));
+		$job->setAcknowledged(true);
+		$job->save();
 
-        Logger::backgroundJobAcknowledged($database, $job);
+		Logger::backgroundJobAcknowledged($database, $job);
 
-        $this->redirect('jobQueue', 'view', array('id' => $jobId));
-    }
-
-    protected function cancel()
-    {
-        if (!WebRequest::wasPosted()) {
-            throw new ApplicationLogicException('This page does not support GET methods.');
-        }
-
-        $this->validateCSRFToken();
-
-        $jobId = WebRequest::postInt('job');
-        $database = $this->getDatabase();
-
-        if ($jobId === null) {
-            throw new ApplicationLogicException('No job specified');
-        }
-
-        /** @var JobQueue $job */
-        $job = JobQueue::getById($jobId, $database);
-
-        if ($job === false) {
-            throw new ApplicationLogicException('Could not find requested job');
-        }
-
-        if ($job->getStatus() !== JobQueue::STATUS_READY
-            && $job->getStatus() !== JobQueue::STATUS_QUEUED
-            && $job->getStatus() === JobQueue::STATUS_WAITING) {
-            throw new ApplicationLogicException('Cannot cancel job not queued for execution');
-        }
-
-        $job->setUpdateVersion(WebRequest::postInt('updateVersion'));
-        $job->setStatus(JobQueue::STATUS_CANCELLED);
-        $job->setError("Manually cancelled");
-        $job->setAcknowledged(null);
-        $job->save();
-
-        Logger::backgroundJobCancelled($this->getDatabase(), $job);
-
-        $this->redirect('jobQueue', 'view', array('id' => $jobId));
-    }
-
-    protected function requeue()
-    {
-        if (!WebRequest::wasPosted()) {
-            throw new ApplicationLogicException('This page does not support GET methods.');
-        }
+		$this->redirect('jobQueue', 'view', array('id' => $jobId));
+	}
+
+	protected function cancel()
+	{
+		if (!WebRequest::wasPosted()) {
+			throw new ApplicationLogicException('This page does not support GET methods.');
+		}
+
+		$this->validateCSRFToken();
+
+		$jobId = WebRequest::postInt('job');
+		$database = $this->getDatabase();
+
+		if ($jobId === null) {
+			throw new ApplicationLogicException('No job specified');
+		}
+
+		/** @var JobQueue $job */
+		$job = JobQueue::getById($jobId, $database);
+
+		if ($job === false) {
+			throw new ApplicationLogicException('Could not find requested job');
+		}
+
+		if ($job->getStatus() !== JobQueue::STATUS_READY
+			&& $job->getStatus() !== JobQueue::STATUS_QUEUED
+			&& $job->getStatus() === JobQueue::STATUS_WAITING) {
+			throw new ApplicationLogicException('Cannot cancel job not queued for execution');
+		}
+
+		$job->setUpdateVersion(WebRequest::postInt('updateVersion'));
+		$job->setStatus(JobQueue::STATUS_CANCELLED);
+		$job->setError("Manually cancelled");
+		$job->setAcknowledged(null);
+		$job->save();
+
+		Logger::backgroundJobCancelled($this->getDatabase(), $job);
+
+		$this->redirect('jobQueue', 'view', array('id' => $jobId));
+	}
+
+	protected function requeue()
+	{
+		if (!WebRequest::wasPosted()) {
+			throw new ApplicationLogicException('This page does not support GET methods.');
+		}
 
-        $this->validateCSRFToken();
+		$this->validateCSRFToken();
 
-        $jobId = WebRequest::postInt('job');
-        $database = $this->getDatabase();
-
-        if ($jobId === null) {
-            throw new ApplicationLogicException('No job specified');
-        }
-
-        /** @var JobQueue|false $job */
-        $job = JobQueue::getById($jobId, $database);
-
-        if ($job === false) {
-            throw new ApplicationLogicException('Could not find requested job');
-        }
-
-        $job->setStatus(JobQueue::STATUS_QUEUED);
-        $job->setUpdateVersion(WebRequest::postInt('updateVersion'));
-        $job->setAcknowledged(null);
-        $job->setError(null);
-        $job->save();
-
-        /** @var Request $request */
-        $request = Request::getById($job->getRequest(), $database);
-        $request->setStatus(RequestStatus::JOBQUEUE);
-        $request->save();
-
-        Logger::enqueuedJobQueue($database, $request);
-        Logger::backgroundJobRequeued($database, $job);
+		$jobId = WebRequest::postInt('job');
+		$database = $this->getDatabase();
+
+		if ($jobId === null) {
+			throw new ApplicationLogicException('No job specified');
+		}
+
+		/** @var JobQueue|false $job */
+		$job = JobQueue::getById($jobId, $database);
+
+		if ($job === false) {
+			throw new ApplicationLogicException('Could not find requested job');
+		}
+
+		$job->setStatus(JobQueue::STATUS_QUEUED);
+		$job->setUpdateVersion(WebRequest::postInt('updateVersion'));
+		$job->setAcknowledged(null);
+		$job->setError(null);
+		$job->save();
+
+		/** @var Request $request */
+		$request = Request::getById($job->getRequest(), $database);
+		$request->setStatus(RequestStatus::JOBQUEUE);
+		$request->save();
+
+		Logger::enqueuedJobQueue($database, $request);
+		Logger::backgroundJobRequeued($database, $job);
 
-        $this->redirect('jobQueue', 'view', array('id' => $jobId));
-    }
-
-    protected function prepareMaps()
-    {
-        $taskNameMap = JobQueue::getTaskDescriptions();
-
-        $statusDecriptionMap = array(
-            JobQueue::STATUS_CANCELLED => 'The job was cancelled',
-            JobQueue::STATUS_COMPLETE  => 'The job completed successfully',
-            JobQueue::STATUS_FAILED    => 'The job encountered an error',
-            JobQueue::STATUS_QUEUED    => 'The job is in the queue',
-            JobQueue::STATUS_READY     => 'The job is ready to be picked up by the next job runner execution',
-            JobQueue::STATUS_RUNNING   => 'The job is being run right now by the job runner',
-            JobQueue::STATUS_WAITING   => 'The job has been picked up by a job runner',
-            JobQueue::STATUS_HELD      => 'The job has manually held from processing',
-        );
-        $this->assign('taskNameMap', $taskNameMap);
-        $this->assign('statusDescriptionMap', $statusDecriptionMap);
-    }
+		$this->redirect('jobQueue', 'view', array('id' => $jobId));
+	}
+
+	protected function prepareMaps()
+	{
+		$taskNameMap = JobQueue::getTaskDescriptions();
+
+		$statusDecriptionMap = array(
+			JobQueue::STATUS_CANCELLED => 'The job was cancelled',
+			JobQueue::STATUS_COMPLETE  => 'The job completed successfully',
+			JobQueue::STATUS_FAILED    => 'The job encountered an error',
+			JobQueue::STATUS_QUEUED    => 'The job is in the queue',
+			JobQueue::STATUS_READY     => 'The job is ready to be picked up by the next job runner execution',
+			JobQueue::STATUS_RUNNING   => 'The job is being run right now by the job runner',
+			JobQueue::STATUS_WAITING   => 'The job has been picked up by a job runner',
+			JobQueue::STATUS_HELD      => 'The job has manually held from processing',
+		);
+		$this->assign('taskNameMap', $taskNameMap);
+		$this->assign('statusDescriptionMap', $statusDecriptionMap);
+	}
 }

includes/Pages/Request/PageRequestSubmitted.php

Indentation +12 added lines, -12 removed lines

@@ -12,17 +12,17 @@
 
 class PageRequestSubmitted extends PublicInterfacePageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        // clear any requests for client hints. Should have been done already prior to
-        // email confirmation, but this catches the case where email confirmation is
-        // disabled.
-        $this->headerQueue[] = "Accept-CH:";
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		// clear any requests for client hints. Should have been done already prior to
+		// email confirmation, but this catches the case where email confirmation is
+		// disabled.
+		$this->headerQueue[] = "Accept-CH:";
 
-        $this->setTemplate('request/email-confirmed.tpl');
-    }
+		$this->setTemplate('request/email-confirmed.tpl');
+	}
 }
\ No newline at end of file