mdaniels5757 / waca

includes/Exceptions/NotIdentifiedException.php

Indentation +37 added lines, -37 removed lines

@@ -19,50 +19,50 @@
 
 class NotIdentifiedException extends ReadableException
 {
-    use NavigationMenuAccessControl;
+	use NavigationMenuAccessControl;
 
-    private ISecurityManager $securityManager;
-    private IDomainAccessManager $domainAccessManager;
+	private ISecurityManager $securityManager;
+	private IDomainAccessManager $domainAccessManager;
 
-    public function __construct(ISecurityManager $securityManager, IDomainAccessManager $domainAccessManager)
-    {
-        $this->securityManager = $securityManager;
-        $this->domainAccessManager = $domainAccessManager;
-    }
+	public function __construct(ISecurityManager $securityManager, IDomainAccessManager $domainAccessManager)
+	{
+		$this->securityManager = $securityManager;
+		$this->domainAccessManager = $domainAccessManager;
+	}
 
-    /**
-     * Returns a readable HTML error message that's displayable to the user using templates.
-     * @return string
-     */
-    public function getReadableError()
-    {
-        if (!headers_sent()) {
-            header("HTTP/1.1 403 Forbidden");
-        }
+	/**
+	 * Returns a readable HTML error message that's displayable to the user using templates.
+	 * @return string
+	 */
+	public function getReadableError()
+	{
+		if (!headers_sent()) {
+			header("HTTP/1.1 403 Forbidden");
+		}
 
-        $this->setUpSmarty();
+		$this->setUpSmarty();
 
-        // uck. We should still be able to access the database in this situation though.
-        $database = PdoDatabase::getDatabaseConnection($this->getSiteConfiguration());
-        $currentUser = User::getCurrent($database);
-        $this->assign('skin', PreferenceManager::getForCurrent($database)->getPreference(PreferenceManager::PREF_SKIN));
-        $this->assign('currentUser', $currentUser);
-        $this->assign('currentDomain', Domain::getCurrent($database));
+		// uck. We should still be able to access the database in this situation though.
+		$database = PdoDatabase::getDatabaseConnection($this->getSiteConfiguration());
+		$currentUser = User::getCurrent($database);
+		$this->assign('skin', PreferenceManager::getForCurrent($database)->getPreference(PreferenceManager::PREF_SKIN));
+		$this->assign('currentUser', $currentUser);
+		$this->assign('currentDomain', Domain::getCurrent($database));
 
-        if ($this->securityManager !== null) {
-            $this->setupNavMenuAccess($currentUser);
-        }
+		if ($this->securityManager !== null) {
+			$this->setupNavMenuAccess($currentUser);
+		}
 
-        return $this->fetchTemplate("exception/not-identified.tpl");
-    }
+		return $this->fetchTemplate("exception/not-identified.tpl");
+	}
 
-    protected function getSecurityManager(): ISecurityManager
-    {
-        return $this->securityManager;
-    }
+	protected function getSecurityManager(): ISecurityManager
+	{
+		return $this->securityManager;
+	}
 
-    public function getDomainAccessManager(): IDomainAccessManager
-    {
-        return $this->domainAccessManager;
-    }
+	public function getDomainAccessManager(): IDomainAccessManager
+	{
+		return $this->domainAccessManager;
+	}
 }
\ No newline at end of file

includes/Pages/PageLog.php

Indentation +60 added lines, -60 removed lines

@@ -18,64 +18,64 @@
 
 class PageLog extends PagedInternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     */
-    protected function main()
-    {
-        $this->setHtmlTitle('Logs');
-
-        $filterUser = WebRequest::getString('filterUser');
-        $filterAction = WebRequest::getString('filterAction');
-        $filterObjectType = WebRequest::getString('filterObjectType');
-        $filterObjectId = WebRequest::getInt('filterObjectId');
-
-        $database = $this->getDatabase();
-
-        if (!array_key_exists($filterObjectType, LogHelper::getObjectTypes())) {
-            $filterObjectType = null;
-        }
-
-        $this->addJs("/api.php?action=users&all=true&targetVariable=typeaheaddata");
-
-        // FIXME: domains
-        $logSearch = LogSearchHelper::get($database, 1);
-
-        if ($filterUser !== null) {
-            $userObj = User::getByUsername($filterUser, $database);
-            if ($userObj !== false) {
-                $logSearch->byUser($userObj->getId());
-            }
-            else {
-                $logSearch->byUser(-1);
-            }
-        }
-        if ($filterAction !== null) {
-            $logSearch->byAction($filterAction);
-        }
-        if ($filterObjectType !== null) {
-            $logSearch->byObjectType($filterObjectType);
-        }
-        if ($filterObjectId !== null) {
-            $logSearch->byObjectId($filterObjectId);
-        }
-
-        $this->setSearchHelper($logSearch);
-        $this->setupLimits();
-
-        /** @var Log[] $logs */
-        $logs = $logSearch->getRecordCount($count)->fetch();
-
-        list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration(), $this->getSecurityManager());
-
-        $this->setupPageData($count, array('filterUser' => $filterUser, 'filterAction' => $filterAction, 'filterObjectType' => $filterObjectType, 'filterObjectId' => $filterObjectId));
-
-        $this->assign("logs", $logData);
-        $this->assign("users", $users);
-
-        $this->assign('allLogActions', LogHelper::getLogActions($this->getDatabase()));
-        $this->assign('allObjectTypes', LogHelper::getObjectTypes());
-
-        $this->setTemplate("logs/main.tpl");
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 */
+	protected function main()
+	{
+		$this->setHtmlTitle('Logs');
+
+		$filterUser = WebRequest::getString('filterUser');
+		$filterAction = WebRequest::getString('filterAction');
+		$filterObjectType = WebRequest::getString('filterObjectType');
+		$filterObjectId = WebRequest::getInt('filterObjectId');
+
+		$database = $this->getDatabase();
+
+		if (!array_key_exists($filterObjectType, LogHelper::getObjectTypes())) {
+			$filterObjectType = null;
+		}
+
+		$this->addJs("/api.php?action=users&all=true&targetVariable=typeaheaddata");
+
+		// FIXME: domains
+		$logSearch = LogSearchHelper::get($database, 1);
+
+		if ($filterUser !== null) {
+			$userObj = User::getByUsername($filterUser, $database);
+			if ($userObj !== false) {
+				$logSearch->byUser($userObj->getId());
+			}
+			else {
+				$logSearch->byUser(-1);
+			}
+		}
+		if ($filterAction !== null) {
+			$logSearch->byAction($filterAction);
+		}
+		if ($filterObjectType !== null) {
+			$logSearch->byObjectType($filterObjectType);
+		}
+		if ($filterObjectId !== null) {
+			$logSearch->byObjectId($filterObjectId);
+		}
+
+		$this->setSearchHelper($logSearch);
+		$this->setupLimits();
+
+		/** @var Log[] $logs */
+		$logs = $logSearch->getRecordCount($count)->fetch();
+
+		list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration(), $this->getSecurityManager());
+
+		$this->setupPageData($count, array('filterUser' => $filterUser, 'filterAction' => $filterAction, 'filterObjectType' => $filterObjectType, 'filterObjectId' => $filterObjectId));
+
+		$this->assign("logs", $logData);
+		$this->assign("users", $users);
+
+		$this->assign('allLogActions', LogHelper::getLogActions($this->getDatabase()));
+		$this->assign('allObjectTypes', LogHelper::getObjectTypes());
+
+		$this->setTemplate("logs/main.tpl");
+	}
 }

includes/Pages/PageJobQueue.php

Indentation +269 added lines, -269 removed lines

@@ -29,309 +29,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(), $this->getSecurityManager());
+		/** @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->getSecurityManager());
 
-            $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/PageUserManagement.php

Indentation +574 added lines, -574 removed lines

@@ -30,578 +30,578 @@
  */
 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);
-
-            $deactivatedUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_DEACTIVATED)->fetch();
-            $this->assign('deactivatedUsers', $deactivatedUsers);
-
-            UserSearchHelper::get($database)->getRoleMap($roleMap);
-        }
-        else {
-            $this->assign("showAll", false);
-            $this->assign('deactivatedUsers', 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();
-        $stewards = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('steward')->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('stewards', $stewards);
-        $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('canDeactivate', $this->barrierTest('deactivate', $currentUser));
-        $this->assign('canRename', $this->barrierTest('rename', $currentUser));
-        $this->assign('canEditUser', $this->barrierTest('editUser', $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
-     *
-     * @throws ApplicationLogicException
-     * @throws SmartyException
-     * @throws OptimisticLockFailedException
-     * @throws Exception
-     */
-    protected function editRoles(): void
-    {
-        $this->setHtmlTitle('User Management');
-        $database = $this->getDatabase();
-        $domain = Domain::getCurrent($database);
-        $userId = WebRequest::getInt('user');
-
-        /** @var User|false $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, $domain->getId()));
-
-        // 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[] $add */
-            $add = array();
-
-            /** @var UserRole[] $globalDelete */
-            $globalDelete = array();
-            /** @var string[] $globalAdd */
-            $globalAdd = 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) {
-                        if ($r['globalOnly']) {
-                            $globalDelete[] = $r['object'];
-                        }
-                        else {
-                            $delete[] = $r['object'];
-                        }
-                    }
-
-                    if ($newValue === 1) {
-                        if ($r['globalOnly']) {
-                            $globalAdd[] = $name;
-                        }
-                        else {
-                            $add[] = $name;
-                        }
-                    }
-                }
-            }
-
-            // Check there's something to do
-            if ((count($add) + count($delete) + count($globalAdd) + count($globalDelete)) === 0) {
-                $this->redirect('statistics/users', 'detail', array('user' => $user->getId()));
-                SessionAlert::warning('No changes made to roles.');
-
-                return;
-            }
-
-            $removed = array();
-            $globalRemoved = array();
-
-            foreach ($delete as $d) {
-                $removed[] = $d->getRole();
-                $d->delete();
-            }
-
-            foreach ($globalDelete as $d) {
-                $globalRemoved[] = $d->getRole();
-                $d->delete();
-            }
-
-            foreach ($add as $x) {
-                $a = new UserRole();
-                $a->setUser($user->getId());
-                $a->setRole($x);
-                $a->setDomain($domain->getId());
-                $a->setDatabase($database);
-                $a->save();
-            }
-
-            foreach ($globalAdd as $x) {
-                $a = new UserRole();
-                $a->setUser($user->getId());
-                $a->setRole($x);
-                $a->setDomain(null);
-                $a->setDatabase($database);
-                $a->save();
-            }
-
-            if ((count($add) + count($delete)) > 0) {
-                Logger::userRolesEdited($database, $user, $reason, $add, $removed, $domain->getId());
-            }
-
-            if ((count($globalAdd) + count($globalDelete)) > 0) {
-                Logger::userGlobalRolesEdited($database, $user, $reason, $globalAdd, $globalRemoved);
-            }
-
-            // 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()));
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->setTemplate('usermanagement/roleedit.tpl');
-            $this->assign('user', $user);
-            $this->assign('roleData', $roleData);
-        }
-    }
-
-    /**
-     * Action target for deactivating users
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function deactivate()
-    {
-        $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 deactivate could not be found.');
-        }
-
-        if ($user->isDeactivated()) {
-            throw new ApplicationLogicException('Sorry, the user you are trying to deactivate is already deactivated.');
-        }
-
-        // 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_DEACTIVATED);
-            $user->setUpdateVersion(WebRequest::postInt('updateversion'));
-            $user->save();
-            Logger::deactivatedUser($database, $user, $reason);
-
-            $this->getNotificationHelper()->userDeactivated($user);
-            SessionAlert::quick('Deactivated user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
-
-            // send email
-            $this->sendStatusChangeEmail(
-                'Your WP:ACC account has been deactivated',
-                'usermanagement/emails/deactivated.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', User::STATUS_DEACTIVATED);
-            $this->assign("showReason", true);
-
-            if (WebRequest::getString('preload')) {
-                $this->assign('preload', WebRequest::getString('preload'));
-            }
-        }
-    }
-
-    /**
-     * 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'));
-
-            $prefs->setLocalPreference(PreferenceManager::ADMIN_PREF_PREVENT_REACTIVATION, WebRequest::postBoolean('preventReactivation'));
-
-            $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('preventReactivation', $prefs->getPreference(PreferenceManager::ADMIN_PREF_PREVENT_REACTIVATION) ?? false);
-
-            $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()->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'];
-            $roleData[$role]['globalOnly'] = $data['globalOnly'];
-        }
-
-        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);
+
+			$deactivatedUsers = UserSearchHelper::get($database)->byStatus(User::STATUS_DEACTIVATED)->fetch();
+			$this->assign('deactivatedUsers', $deactivatedUsers);
+
+			UserSearchHelper::get($database)->getRoleMap($roleMap);
+		}
+		else {
+			$this->assign("showAll", false);
+			$this->assign('deactivatedUsers', 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();
+		$stewards = UserSearchHelper::get($database)->byStatus(User::STATUS_ACTIVE)->byRole('steward')->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('stewards', $stewards);
+		$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('canDeactivate', $this->barrierTest('deactivate', $currentUser));
+		$this->assign('canRename', $this->barrierTest('rename', $currentUser));
+		$this->assign('canEditUser', $this->barrierTest('editUser', $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
+	 *
+	 * @throws ApplicationLogicException
+	 * @throws SmartyException
+	 * @throws OptimisticLockFailedException
+	 * @throws Exception
+	 */
+	protected function editRoles(): void
+	{
+		$this->setHtmlTitle('User Management');
+		$database = $this->getDatabase();
+		$domain = Domain::getCurrent($database);
+		$userId = WebRequest::getInt('user');
+
+		/** @var User|false $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, $domain->getId()));
+
+		// 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[] $add */
+			$add = array();
+
+			/** @var UserRole[] $globalDelete */
+			$globalDelete = array();
+			/** @var string[] $globalAdd */
+			$globalAdd = 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) {
+						if ($r['globalOnly']) {
+							$globalDelete[] = $r['object'];
+						}
+						else {
+							$delete[] = $r['object'];
+						}
+					}
+
+					if ($newValue === 1) {
+						if ($r['globalOnly']) {
+							$globalAdd[] = $name;
+						}
+						else {
+							$add[] = $name;
+						}
+					}
+				}
+			}
+
+			// Check there's something to do
+			if ((count($add) + count($delete) + count($globalAdd) + count($globalDelete)) === 0) {
+				$this->redirect('statistics/users', 'detail', array('user' => $user->getId()));
+				SessionAlert::warning('No changes made to roles.');
+
+				return;
+			}
+
+			$removed = array();
+			$globalRemoved = array();
+
+			foreach ($delete as $d) {
+				$removed[] = $d->getRole();
+				$d->delete();
+			}
+
+			foreach ($globalDelete as $d) {
+				$globalRemoved[] = $d->getRole();
+				$d->delete();
+			}
+
+			foreach ($add as $x) {
+				$a = new UserRole();
+				$a->setUser($user->getId());
+				$a->setRole($x);
+				$a->setDomain($domain->getId());
+				$a->setDatabase($database);
+				$a->save();
+			}
+
+			foreach ($globalAdd as $x) {
+				$a = new UserRole();
+				$a->setUser($user->getId());
+				$a->setRole($x);
+				$a->setDomain(null);
+				$a->setDatabase($database);
+				$a->save();
+			}
+
+			if ((count($add) + count($delete)) > 0) {
+				Logger::userRolesEdited($database, $user, $reason, $add, $removed, $domain->getId());
+			}
+
+			if ((count($globalAdd) + count($globalDelete)) > 0) {
+				Logger::userGlobalRolesEdited($database, $user, $reason, $globalAdd, $globalRemoved);
+			}
+
+			// 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()));
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->setTemplate('usermanagement/roleedit.tpl');
+			$this->assign('user', $user);
+			$this->assign('roleData', $roleData);
+		}
+	}
+
+	/**
+	 * Action target for deactivating users
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function deactivate()
+	{
+		$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 deactivate could not be found.');
+		}
+
+		if ($user->isDeactivated()) {
+			throw new ApplicationLogicException('Sorry, the user you are trying to deactivate is already deactivated.');
+		}
+
+		// 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_DEACTIVATED);
+			$user->setUpdateVersion(WebRequest::postInt('updateversion'));
+			$user->save();
+			Logger::deactivatedUser($database, $user, $reason);
+
+			$this->getNotificationHelper()->userDeactivated($user);
+			SessionAlert::quick('Deactivated user ' . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'));
+
+			// send email
+			$this->sendStatusChangeEmail(
+				'Your WP:ACC account has been deactivated',
+				'usermanagement/emails/deactivated.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', User::STATUS_DEACTIVATED);
+			$this->assign("showReason", true);
+
+			if (WebRequest::getString('preload')) {
+				$this->assign('preload', WebRequest::getString('preload'));
+			}
+		}
+	}
+
+	/**
+	 * 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'));
+
+			$prefs->setLocalPreference(PreferenceManager::ADMIN_PREF_PREVENT_REACTIVATION, WebRequest::postBoolean('preventReactivation'));
+
+			$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('preventReactivation', $prefs->getPreference(PreferenceManager::ADMIN_PREF_PREVENT_REACTIVATION) ?? false);
+
+			$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()->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'];
+			$roleData[$role]['globalOnly'] = $data['globalOnly'];
+		}
+
+		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/PageViewRequest.php

Indentation +365 added lines, -365 removed lines

@@ -33,369 +33,369 @@
 
 class PageViewRequest extends InternalPageBase
 {
-    use RequestData;
-
-    const STATUS_SYMBOL_OPEN = '&#927';
-    const STATUS_SYMBOL_ACCEPTED = '&#x2611';
-    const STATUS_SYMBOL_REJECTED = '&#x2612';
-
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @throws ApplicationLogicException
-     */
-    protected function main()
-    {
-        // set up csrf protection
-        $this->assignCSRFToken();
-
-        // get some useful objects
-        $database = $this->getDatabase();
-        $request = $this->getRequest($database, WebRequest::getInt('id'));
-        $config = $this->getSiteConfiguration();
-        $currentUser = User::getCurrent($database);
-
-        // FIXME: domains!
-        /** @var Domain $domain */
-        $domain = Domain::getById(1, $this->getDatabase());
-        $this->assign('mediawikiScriptPath', $domain->getWikiArticlePath());
-
-        // Shows a page if the email is not confirmed.
-        if ($request->getEmailConfirm() !== 'Confirmed') {
-            // Show a banner if the user can manually confirm the request
-            $viewConfirm = $this->barrierTest(RoleConfigurationBase::MAIN, $currentUser, PageManuallyConfirm::class);
-
-            // If the request is purged, there's nothing to confirm!
-            if ($request->getEmail() === $this->getSiteConfiguration()->getDataClearEmail()) {
-                $viewConfirm = false;
-            }
-
-            // Render
-            $this->setTemplate("view-request/not-confirmed.tpl");
-            $this->assign("requestId", $request->getId());
-            $this->assign("requestVersion", $request->getUpdateVersion());
-            $this->assign('canViewConfirmButton', $viewConfirm);
-
-            // Make sure to return, to prevent the leaking of other information.
-            return;
-        }
-
-        $this->setupBasicData($request, $config);
-
-        $this->setupUsernameData($request);
-
-        $this->setupTitle($request);
-
-        $this->setupReservationDetails($request->getReserved(), $database, $currentUser);
-        $this->setupGeneralData($database);
-
-        $this->assign('requestDataCleared', false);
-        if ($request->getEmail() === $this->getSiteConfiguration()->getDataClearEmail()) {
-            $this->assign('requestDataCleared', true);
-        }
-
-        $allowedPrivateData = $this->isAllowedPrivateData($request, $currentUser);
-
-        $this->setupCreationTypes($currentUser);
-
-        $this->setupLogData($request, $database, $allowedPrivateData);
-
-        $this->addJs("/api.php?action=templates&targetVariable=templateconfirms");
-
-        $this->assign('showRevealLink', false);
-        if ($request->getReserved() === $currentUser->getId() ||
-            $this->barrierTest('alwaysSeeHash', $currentUser, 'RequestData')
-        ) {
-            $this->assign('showRevealLink', true);
-            $this->assign('revealHash', $request->getRevealHash());
-        }
-
-        $this->assign('canSeeRelatedRequests', false);
-        if ($allowedPrivateData || $this->barrierTest('seeRelatedRequests', $currentUser, 'RequestData')) {
-            $this->setupRelatedRequests($request, $config, $database);
-        }
-
-        $this->assign('canCreateLocalAccount', $this->barrierTest('createLocalAccount', $currentUser, 'RequestData'));
-
-        $closureDate = $request->getClosureDate();
-        $date = new DateTime();
-        $date->modify("-7 days");
-        if ($request->getStatus() == "Closed" && $closureDate < $date) {
-            $this->assign('isOldRequest', true);
-        }
-        $this->assign('canResetOldRequest', $this->barrierTest('reopenOldRequest', $currentUser, 'RequestData'));
-        $this->assign('canResetPurgedRequest', $this->barrierTest('reopenClearedRequest', $currentUser, 'RequestData'));
-
-        $this->assign('requestEmailSent', $request->getEmailSent());
-
-        if ($allowedPrivateData) {
-            $this->setTemplate('view-request/main-with-data.tpl');
-            $this->setupPrivateData($request, $config);
-            $this->assign('canSetBan', $this->barrierTest('set', $currentUser, PageBan::class));
-            $this->assign('canSeeCheckuserData', $this->barrierTest('seeUserAgentData', $currentUser, 'RequestData'));
-
-            if ($this->barrierTest('seeUserAgentData', $currentUser, 'RequestData')) {
-                $this->setTemplate('view-request/main-with-checkuser-data.tpl');
-                $this->setupCheckUserData($request);
-            }
-        }
-        else {
-            $this->setTemplate('view-request/main.tpl');
-        }
-    }
-
-    /**
-     * @param Request $request
-     */
-    protected function setupTitle(Request $request)
-    {
-        $statusSymbol = self::STATUS_SYMBOL_OPEN;
-        if ($request->getStatus() === RequestStatus::CLOSED) {
-            if ($request->getWasCreated()) {
-                $statusSymbol = self::STATUS_SYMBOL_ACCEPTED;
-            }
-            else {
-                $statusSymbol = self::STATUS_SYMBOL_REJECTED;
-            }
-        }
-
-        $this->setHtmlTitle($statusSymbol . ' #' . $request->getId());
-    }
-
-    /**
-     * Sets up data unrelated to the request, such as the email template information
-     *
-     * @param PdoDatabase $database
-     */
-    protected function setupGeneralData(PdoDatabase $database)
-    {
-        $this->assign('createAccountReason', 'Requested account at [[WP:ACC]], request #');
-
-        // FIXME: domains
-        /** @var Domain $domain */
-        $domain = Domain::getById(1, $database);
-        $this->assign('defaultRequestState', RequestQueue::getDefaultQueue($database, 1)->getApiName());
-        $this->assign('activeRequestQueues', RequestQueue::getEnabledQueues($database));
-
-        /** @var EmailTemplate $createdTemplate */
-        $createdTemplate = EmailTemplate::getById($domain->getDefaultClose(), $database);
-
-        $this->assign('createdHasJsQuestion', $createdTemplate->getJsquestion() != '');
-        $this->assign('createdId', $createdTemplate->getId());
-        $this->assign('createdName', $createdTemplate->getName());
-
-        $preferenceManager = PreferenceManager::getForCurrent($database);
-        $skipJsAborts = $preferenceManager->getPreference(PreferenceManager::PREF_SKIP_JS_ABORT);
-        $preferredCreationMode = (int)$preferenceManager->getPreference(PreferenceManager::PREF_CREATION_MODE);
-        $this->assign('skipJsAborts', $skipJsAborts);
-        $this->assign('preferredCreationMode', $preferredCreationMode);
-
-        $createReasons = EmailTemplate::getActiveNonpreloadTemplates(
-            EmailTemplate::ACTION_CREATED,
-            $database,
-            $domain->getId(),
-            $domain->getDefaultClose());
-        $this->assign("createReasons", $createReasons);
-
-        $declineReasons = EmailTemplate::getActiveNonpreloadTemplates(
-            EmailTemplate::ACTION_NOT_CREATED,
-            $database,
-            $domain->getId());
-        $this->assign("declineReasons", $declineReasons);
-
-        $allCreateReasons = EmailTemplate::getAllActiveTemplates(
-            EmailTemplate::ACTION_CREATED,
-            $database,
-            $domain->getId());
-        $this->assign("allCreateReasons", $allCreateReasons);
-
-        $allDeclineReasons = EmailTemplate::getAllActiveTemplates(
-            EmailTemplate::ACTION_NOT_CREATED,
-            $database,
-            $domain->getId());
-        $this->assign("allDeclineReasons", $allDeclineReasons);
-
-        $allOtherReasons = EmailTemplate::getAllActiveTemplates(
-            false,
-            $database,
-            $domain->getId());
-        $this->assign("allOtherReasons", $allOtherReasons);
-    }
-
-    private function setupLogData(Request $request, PdoDatabase $database, bool $allowedPrivateData)
-    {
-        $currentUser = User::getCurrent($database);
-
-        $logs = LogHelper::getRequestLogsWithComments($request->getId(), $database, $this->getSecurityManager());
-        $requestLogs = array();
-
-        /** @var User[] $nameCache */
-        $nameCache = array();
-
-        $editableComments = $this->barrierTest('editOthers', $currentUser, PageEditComment::class);
-
-        $canFlag = $this->barrierTest(RoleConfigurationBase::MAIN, $currentUser, PageFlagComment::class);
-        $canUnflag = $this->barrierTest('unflag', $currentUser, PageFlagComment::class);
-
-        /** @var Log|Comment $entry */
-        foreach ($logs as $entry) {
-            // both log and comment have a 'user' field
-            if (!array_key_exists($entry->getUser(), $nameCache)) {
-                $entryUser = User::getById($entry->getUser(), $database);
-                $nameCache[$entry->getUser()] = $entryUser;
-            }
-
-            if ($entry instanceof Comment) {
-                // Determine if the comment contains private information.
-                // Private defined as flagged or restricted visibility, but only when the user isn't allowed
-                // to see private data
-                $commentIsRestricted =
-                    ($entry->getFlagged()
-                        || $entry->getVisibility() == 'admin' || $entry->getVisibility() == 'checkuser')
-                    && !$allowedPrivateData;
-
-                // Only allow comment editing if the user is able to edit comments or this is the user's own comment,
-                // but only when they're allowed to see the comment itself.
-                $commentIsEditable = ($editableComments || $entry->getUser() == $currentUser->getId())
-                    && !$commentIsRestricted;
-
-                // Flagging/unflagging can only be done if you can see the comment
-                $canFlagThisComment = $canFlag
-                    && (
-                        (!$entry->getFlagged() && !$commentIsRestricted)
-                        || ($entry->getFlagged() && $canUnflag && $commentIsEditable)
-                    );
-
-                $requestLogs[] = array(
-                    'type'          => 'comment',
-                    'security'      => $entry->getVisibility(),
-                    'user'          => $entry->getVisibility() == 'requester' ? $request->getName() : $nameCache[$entry->getUser()]->getUsername(),
-                    'userid'        => $entry->getUser() == -1 ? null : $entry->getUser(),
-                    'entry'         => null,
-                    'time'          => $entry->getTime(),
-                    'canedit'       => $commentIsEditable,
-                    'id'            => $entry->getId(),
-                    'comment'       => $entry->getComment(),
-                    'flagged'       => $entry->getFlagged(),
-                    'canflag'       => $canFlagThisComment,
-                    'updateversion' => $entry->getUpdateVersion(),
-                    'edited'        => $entry->getEdited(),
-                    'hidden'        => $commentIsRestricted
-                );
-            }
-
-            if ($entry instanceof Log) {
-                $invalidUserId = $entry->getUser() === -1 || $entry->getUser() === 0;
-                $entryUser = $invalidUserId ? User::getCommunity() : $nameCache[$entry->getUser()];
-
-                $entryComment = $entry->getComment();
-
-                if ($entry->getAction() === 'JobIssueRequest' || $entry->getAction() === 'JobCompletedRequest') {
-                    $data = unserialize($entry->getComment());
-                    /** @var JobQueue $job */
-                    $job = JobQueue::getById($data['job'], $database);
-                    $requestLogs[] = array(
-                        'type'     => 'joblog',
-                        'security' => 'user',
-                        'userid'   => $entry->getUser() == -1 ? null : $entry->getUser(),
-                        'user'     => $entryUser->getUsername(),
-                        'entry'    => LogHelper::getLogDescription($entry),
-                        'time'     => $entry->getTimestamp(),
-                        'canedit'  => false,
-                        'id'       => $entry->getId(),
-                        'jobId'    => $job->getId(),
-                        'jobDesc'  => JobQueue::getTaskDescriptions()[$job->getTask()],
-                    );
-                }
-                else {
-                    $requestLogs[] = array(
-                        'type'     => 'log',
-                        'security' => 'user',
-                        'userid'   => $entry->getUser() == -1 ? null : $entry->getUser(),
-                        'user'     => $entryUser->getUsername(),
-                        'entry'    => LogHelper::getLogDescription($entry),
-                        'time'     => $entry->getTimestamp(),
-                        'canedit'  => false,
-                        'id'       => $entry->getId(),
-                        'comment'  => $entryComment,
-                    );
-                }
-            }
-        }
-
-        $this->addJs("/api.php?action=users&targetVariable=typeaheaddata");
-
-        $this->assign("requestLogs", $requestLogs);
-    }
-
-    /**
-     * @param Request $request
-     */
-    protected function setupUsernameData(Request $request)
-    {
-        $blacklistData = $this->getBlacklistHelper()->isBlacklisted($request->getName());
-
-        $this->assign('requestIsBlacklisted', $blacklistData !== false);
-        $this->assign('requestBlacklist', $blacklistData);
-
-        try {
-            $spoofs = $this->getAntiSpoofProvider()->getSpoofs($request->getName());
-        }
-        catch (Exception $ex) {
-            $spoofs = $ex->getMessage();
-        }
-
-        $this->assign("spoofs", $spoofs);
-    }
-
-    private function setupCreationTypes(User $user)
-    {
-        $this->assign('allowWelcomeSkip', false);
-        $this->assign('forceWelcomeSkip', false);
-
-        $database = $this->getDatabase();
-        $preferenceManager = PreferenceManager::getForCurrent($database);
-
-        $oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
-
-        $welcomeTemplate = $preferenceManager->getPreference(PreferenceManager::PREF_WELCOMETEMPLATE);
-
-        if ($welcomeTemplate != null) {
-            $this->assign('allowWelcomeSkip', true);
-
-            if (!$oauth->canWelcome()) {
-                $this->assign('forceWelcomeSkip', true);
-            }
-        }
-
-        // test credentials
-        $canManualCreate = $this->barrierTest(PreferenceManager::CREATION_MANUAL, $user, 'RequestCreation');
-        $canOauthCreate = $this->barrierTest(PreferenceManager::CREATION_OAUTH, $user, 'RequestCreation');
-        $canBotCreate = $this->barrierTest(PreferenceManager::CREATION_BOT, $user, 'RequestCreation');
-
-        $this->assign('canManualCreate', $canManualCreate);
-        $this->assign('canOauthCreate', $canOauthCreate);
-        $this->assign('canBotCreate', $canBotCreate);
-
-        // show/hide the type radio buttons
-        $creationHasChoice = count(array_filter([$canManualCreate, $canOauthCreate, $canBotCreate])) > 1;
-
-        $creationModePreference = $preferenceManager->getPreference(PreferenceManager::PREF_CREATION_MODE);
-        if (!$this->barrierTest($creationModePreference, $user, 'RequestCreation')) {
-            // user is not allowed to use their default. Force a choice.
-            $creationHasChoice = true;
-        }
-
-        $this->assign('creationHasChoice', $creationHasChoice);
-
-        // determine problems in creation types
-        $this->assign('botProblem', false);
-        if ($canBotCreate && $this->getSiteConfiguration()->getCreationBotPassword() === null) {
-            $this->assign('botProblem', true);
-        }
-
-        $this->assign('oauthProblem', false);
-        if ($canOauthCreate && !$oauth->canCreateAccount()) {
-            $this->assign('oauthProblem', true);
-        }
-    }
+	use RequestData;
+
+	const STATUS_SYMBOL_OPEN = '&#927';
+	const STATUS_SYMBOL_ACCEPTED = '&#x2611';
+	const STATUS_SYMBOL_REJECTED = '&#x2612';
+
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @throws ApplicationLogicException
+	 */
+	protected function main()
+	{
+		// set up csrf protection
+		$this->assignCSRFToken();
+
+		// get some useful objects
+		$database = $this->getDatabase();
+		$request = $this->getRequest($database, WebRequest::getInt('id'));
+		$config = $this->getSiteConfiguration();
+		$currentUser = User::getCurrent($database);
+
+		// FIXME: domains!
+		/** @var Domain $domain */
+		$domain = Domain::getById(1, $this->getDatabase());
+		$this->assign('mediawikiScriptPath', $domain->getWikiArticlePath());
+
+		// Shows a page if the email is not confirmed.
+		if ($request->getEmailConfirm() !== 'Confirmed') {
+			// Show a banner if the user can manually confirm the request
+			$viewConfirm = $this->barrierTest(RoleConfigurationBase::MAIN, $currentUser, PageManuallyConfirm::class);
+
+			// If the request is purged, there's nothing to confirm!
+			if ($request->getEmail() === $this->getSiteConfiguration()->getDataClearEmail()) {
+				$viewConfirm = false;
+			}
+
+			// Render
+			$this->setTemplate("view-request/not-confirmed.tpl");
+			$this->assign("requestId", $request->getId());
+			$this->assign("requestVersion", $request->getUpdateVersion());
+			$this->assign('canViewConfirmButton', $viewConfirm);
+
+			// Make sure to return, to prevent the leaking of other information.
+			return;
+		}
+
+		$this->setupBasicData($request, $config);
+
+		$this->setupUsernameData($request);
+
+		$this->setupTitle($request);
+
+		$this->setupReservationDetails($request->getReserved(), $database, $currentUser);
+		$this->setupGeneralData($database);
+
+		$this->assign('requestDataCleared', false);
+		if ($request->getEmail() === $this->getSiteConfiguration()->getDataClearEmail()) {
+			$this->assign('requestDataCleared', true);
+		}
+
+		$allowedPrivateData = $this->isAllowedPrivateData($request, $currentUser);
+
+		$this->setupCreationTypes($currentUser);
+
+		$this->setupLogData($request, $database, $allowedPrivateData);
+
+		$this->addJs("/api.php?action=templates&targetVariable=templateconfirms");
+
+		$this->assign('showRevealLink', false);
+		if ($request->getReserved() === $currentUser->getId() ||
+			$this->barrierTest('alwaysSeeHash', $currentUser, 'RequestData')
+		) {
+			$this->assign('showRevealLink', true);
+			$this->assign('revealHash', $request->getRevealHash());
+		}
+
+		$this->assign('canSeeRelatedRequests', false);
+		if ($allowedPrivateData || $this->barrierTest('seeRelatedRequests', $currentUser, 'RequestData')) {
+			$this->setupRelatedRequests($request, $config, $database);
+		}
+
+		$this->assign('canCreateLocalAccount', $this->barrierTest('createLocalAccount', $currentUser, 'RequestData'));
+
+		$closureDate = $request->getClosureDate();
+		$date = new DateTime();
+		$date->modify("-7 days");
+		if ($request->getStatus() == "Closed" && $closureDate < $date) {
+			$this->assign('isOldRequest', true);
+		}
+		$this->assign('canResetOldRequest', $this->barrierTest('reopenOldRequest', $currentUser, 'RequestData'));
+		$this->assign('canResetPurgedRequest', $this->barrierTest('reopenClearedRequest', $currentUser, 'RequestData'));
+
+		$this->assign('requestEmailSent', $request->getEmailSent());
+
+		if ($allowedPrivateData) {
+			$this->setTemplate('view-request/main-with-data.tpl');
+			$this->setupPrivateData($request, $config);
+			$this->assign('canSetBan', $this->barrierTest('set', $currentUser, PageBan::class));
+			$this->assign('canSeeCheckuserData', $this->barrierTest('seeUserAgentData', $currentUser, 'RequestData'));
+
+			if ($this->barrierTest('seeUserAgentData', $currentUser, 'RequestData')) {
+				$this->setTemplate('view-request/main-with-checkuser-data.tpl');
+				$this->setupCheckUserData($request);
+			}
+		}
+		else {
+			$this->setTemplate('view-request/main.tpl');
+		}
+	}
+
+	/**
+	 * @param Request $request
+	 */
+	protected function setupTitle(Request $request)
+	{
+		$statusSymbol = self::STATUS_SYMBOL_OPEN;
+		if ($request->getStatus() === RequestStatus::CLOSED) {
+			if ($request->getWasCreated()) {
+				$statusSymbol = self::STATUS_SYMBOL_ACCEPTED;
+			}
+			else {
+				$statusSymbol = self::STATUS_SYMBOL_REJECTED;
+			}
+		}
+
+		$this->setHtmlTitle($statusSymbol . ' #' . $request->getId());
+	}
+
+	/**
+	 * Sets up data unrelated to the request, such as the email template information
+	 *
+	 * @param PdoDatabase $database
+	 */
+	protected function setupGeneralData(PdoDatabase $database)
+	{
+		$this->assign('createAccountReason', 'Requested account at [[WP:ACC]], request #');
+
+		// FIXME: domains
+		/** @var Domain $domain */
+		$domain = Domain::getById(1, $database);
+		$this->assign('defaultRequestState', RequestQueue::getDefaultQueue($database, 1)->getApiName());
+		$this->assign('activeRequestQueues', RequestQueue::getEnabledQueues($database));
+
+		/** @var EmailTemplate $createdTemplate */
+		$createdTemplate = EmailTemplate::getById($domain->getDefaultClose(), $database);
+
+		$this->assign('createdHasJsQuestion', $createdTemplate->getJsquestion() != '');
+		$this->assign('createdId', $createdTemplate->getId());
+		$this->assign('createdName', $createdTemplate->getName());
+
+		$preferenceManager = PreferenceManager::getForCurrent($database);
+		$skipJsAborts = $preferenceManager->getPreference(PreferenceManager::PREF_SKIP_JS_ABORT);
+		$preferredCreationMode = (int)$preferenceManager->getPreference(PreferenceManager::PREF_CREATION_MODE);
+		$this->assign('skipJsAborts', $skipJsAborts);
+		$this->assign('preferredCreationMode', $preferredCreationMode);
+
+		$createReasons = EmailTemplate::getActiveNonpreloadTemplates(
+			EmailTemplate::ACTION_CREATED,
+			$database,
+			$domain->getId(),
+			$domain->getDefaultClose());
+		$this->assign("createReasons", $createReasons);
+
+		$declineReasons = EmailTemplate::getActiveNonpreloadTemplates(
+			EmailTemplate::ACTION_NOT_CREATED,
+			$database,
+			$domain->getId());
+		$this->assign("declineReasons", $declineReasons);
+
+		$allCreateReasons = EmailTemplate::getAllActiveTemplates(
+			EmailTemplate::ACTION_CREATED,
+			$database,
+			$domain->getId());
+		$this->assign("allCreateReasons", $allCreateReasons);
+
+		$allDeclineReasons = EmailTemplate::getAllActiveTemplates(
+			EmailTemplate::ACTION_NOT_CREATED,
+			$database,
+			$domain->getId());
+		$this->assign("allDeclineReasons", $allDeclineReasons);
+
+		$allOtherReasons = EmailTemplate::getAllActiveTemplates(
+			false,
+			$database,
+			$domain->getId());
+		$this->assign("allOtherReasons", $allOtherReasons);
+	}
+
+	private function setupLogData(Request $request, PdoDatabase $database, bool $allowedPrivateData)
+	{
+		$currentUser = User::getCurrent($database);
+
+		$logs = LogHelper::getRequestLogsWithComments($request->getId(), $database, $this->getSecurityManager());
+		$requestLogs = array();
+
+		/** @var User[] $nameCache */
+		$nameCache = array();
+
+		$editableComments = $this->barrierTest('editOthers', $currentUser, PageEditComment::class);
+
+		$canFlag = $this->barrierTest(RoleConfigurationBase::MAIN, $currentUser, PageFlagComment::class);
+		$canUnflag = $this->barrierTest('unflag', $currentUser, PageFlagComment::class);
+
+		/** @var Log|Comment $entry */
+		foreach ($logs as $entry) {
+			// both log and comment have a 'user' field
+			if (!array_key_exists($entry->getUser(), $nameCache)) {
+				$entryUser = User::getById($entry->getUser(), $database);
+				$nameCache[$entry->getUser()] = $entryUser;
+			}
+
+			if ($entry instanceof Comment) {
+				// Determine if the comment contains private information.
+				// Private defined as flagged or restricted visibility, but only when the user isn't allowed
+				// to see private data
+				$commentIsRestricted =
+					($entry->getFlagged()
+						|| $entry->getVisibility() == 'admin' || $entry->getVisibility() == 'checkuser')
+					&& !$allowedPrivateData;
+
+				// Only allow comment editing if the user is able to edit comments or this is the user's own comment,
+				// but only when they're allowed to see the comment itself.
+				$commentIsEditable = ($editableComments || $entry->getUser() == $currentUser->getId())
+					&& !$commentIsRestricted;
+
+				// Flagging/unflagging can only be done if you can see the comment
+				$canFlagThisComment = $canFlag
+					&& (
+						(!$entry->getFlagged() && !$commentIsRestricted)
+						|| ($entry->getFlagged() && $canUnflag && $commentIsEditable)
+					);
+
+				$requestLogs[] = array(
+					'type'          => 'comment',
+					'security'      => $entry->getVisibility(),
+					'user'          => $entry->getVisibility() == 'requester' ? $request->getName() : $nameCache[$entry->getUser()]->getUsername(),
+					'userid'        => $entry->getUser() == -1 ? null : $entry->getUser(),
+					'entry'         => null,
+					'time'          => $entry->getTime(),
+					'canedit'       => $commentIsEditable,
+					'id'            => $entry->getId(),
+					'comment'       => $entry->getComment(),
+					'flagged'       => $entry->getFlagged(),
+					'canflag'       => $canFlagThisComment,
+					'updateversion' => $entry->getUpdateVersion(),
+					'edited'        => $entry->getEdited(),
+					'hidden'        => $commentIsRestricted
+				);
+			}
+
+			if ($entry instanceof Log) {
+				$invalidUserId = $entry->getUser() === -1 || $entry->getUser() === 0;
+				$entryUser = $invalidUserId ? User::getCommunity() : $nameCache[$entry->getUser()];
+
+				$entryComment = $entry->getComment();
+
+				if ($entry->getAction() === 'JobIssueRequest' || $entry->getAction() === 'JobCompletedRequest') {
+					$data = unserialize($entry->getComment());
+					/** @var JobQueue $job */
+					$job = JobQueue::getById($data['job'], $database);
+					$requestLogs[] = array(
+						'type'     => 'joblog',
+						'security' => 'user',
+						'userid'   => $entry->getUser() == -1 ? null : $entry->getUser(),
+						'user'     => $entryUser->getUsername(),
+						'entry'    => LogHelper::getLogDescription($entry),
+						'time'     => $entry->getTimestamp(),
+						'canedit'  => false,
+						'id'       => $entry->getId(),
+						'jobId'    => $job->getId(),
+						'jobDesc'  => JobQueue::getTaskDescriptions()[$job->getTask()],
+					);
+				}
+				else {
+					$requestLogs[] = array(
+						'type'     => 'log',
+						'security' => 'user',
+						'userid'   => $entry->getUser() == -1 ? null : $entry->getUser(),
+						'user'     => $entryUser->getUsername(),
+						'entry'    => LogHelper::getLogDescription($entry),
+						'time'     => $entry->getTimestamp(),
+						'canedit'  => false,
+						'id'       => $entry->getId(),
+						'comment'  => $entryComment,
+					);
+				}
+			}
+		}
+
+		$this->addJs("/api.php?action=users&targetVariable=typeaheaddata");
+
+		$this->assign("requestLogs", $requestLogs);
+	}
+
+	/**
+	 * @param Request $request
+	 */
+	protected function setupUsernameData(Request $request)
+	{
+		$blacklistData = $this->getBlacklistHelper()->isBlacklisted($request->getName());
+
+		$this->assign('requestIsBlacklisted', $blacklistData !== false);
+		$this->assign('requestBlacklist', $blacklistData);
+
+		try {
+			$spoofs = $this->getAntiSpoofProvider()->getSpoofs($request->getName());
+		}
+		catch (Exception $ex) {
+			$spoofs = $ex->getMessage();
+		}
+
+		$this->assign("spoofs", $spoofs);
+	}
+
+	private function setupCreationTypes(User $user)
+	{
+		$this->assign('allowWelcomeSkip', false);
+		$this->assign('forceWelcomeSkip', false);
+
+		$database = $this->getDatabase();
+		$preferenceManager = PreferenceManager::getForCurrent($database);
+
+		$oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
+
+		$welcomeTemplate = $preferenceManager->getPreference(PreferenceManager::PREF_WELCOMETEMPLATE);
+
+		if ($welcomeTemplate != null) {
+			$this->assign('allowWelcomeSkip', true);
+
+			if (!$oauth->canWelcome()) {
+				$this->assign('forceWelcomeSkip', true);
+			}
+		}
+
+		// test credentials
+		$canManualCreate = $this->barrierTest(PreferenceManager::CREATION_MANUAL, $user, 'RequestCreation');
+		$canOauthCreate = $this->barrierTest(PreferenceManager::CREATION_OAUTH, $user, 'RequestCreation');
+		$canBotCreate = $this->barrierTest(PreferenceManager::CREATION_BOT, $user, 'RequestCreation');
+
+		$this->assign('canManualCreate', $canManualCreate);
+		$this->assign('canOauthCreate', $canOauthCreate);
+		$this->assign('canBotCreate', $canBotCreate);
+
+		// show/hide the type radio buttons
+		$creationHasChoice = count(array_filter([$canManualCreate, $canOauthCreate, $canBotCreate])) > 1;
+
+		$creationModePreference = $preferenceManager->getPreference(PreferenceManager::PREF_CREATION_MODE);
+		if (!$this->barrierTest($creationModePreference, $user, 'RequestCreation')) {
+			// user is not allowed to use their default. Force a choice.
+			$creationHasChoice = true;
+		}
+
+		$this->assign('creationHasChoice', $creationHasChoice);
+
+		// determine problems in creation types
+		$this->assign('botProblem', false);
+		if ($canBotCreate && $this->getSiteConfiguration()->getCreationBotPassword() === null) {
+			$this->assign('botProblem', true);
+		}
+
+		$this->assign('oauthProblem', false);
+		if ($canOauthCreate && !$oauth->canCreateAccount()) {
+			$this->assign('oauthProblem', true);
+		}
+	}
 }

includes/Pages/PageDomainSwitch.php

Indentation +35 added lines, -35 removed lines

@@ -19,48 +19,48 @@
 
 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;
+		}
 
-        try {
-            $this->getDomainAccessManager()->switchDomain($currentUser, $newDomain);
-        }
-        catch(DomainSwitchNotAllowedException $ex){
-            throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
-        }
+		try {
+			$this->getDomainAccessManager()->switchDomain($currentUser, $newDomain);
+		}
+		catch(DomainSwitchNotAllowedException $ex){
+			throw new AccessDeniedException($this->getSecurityManager(), $this->getDomainAccessManager());
+		}
 
-        // 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/UserAuth/PageUserReactivate.php

Indentation +45 added lines, -45 removed lines

@@ -22,58 +22,58 @@
 
 class PageUserReactivate extends InternalPageBase
 {
-    use LogEntryLookup;
+	use LogEntryLookup;
 
-    /**
-     * @throws ApplicationLogicException
-     * @throws Exception
-     */
-    protected function main()
-    {
-        $db = $this->getDatabase();
-        $currentUser = User::getCurrent($db);
+	/**
+	 * @throws ApplicationLogicException
+	 * @throws Exception
+	 */
+	protected function main()
+	{
+		$db = $this->getDatabase();
+		$currentUser = User::getCurrent($db);
 
-        // *Only* deactivated users should be able to access this.
-        // Redirect anyone else away.
-        if (!$currentUser->isDeactivated()) {
-            $this->redirect();
-            return;
-        }
+		// *Only* deactivated users should be able to access this.
+		// Redirect anyone else away.
+		if (!$currentUser->isDeactivated()) {
+			$this->redirect();
+			return;
+		}
 
-        $ableToAppeal = true;
-        $prefs = new PreferenceManager($db, $currentUser->getId(), Domain::getCurrent($db)->getId());
-        if ($prefs->getPreference(PreferenceManager::ADMIN_PREF_PREVENT_REACTIVATION) ?? false) {
-            $ableToAppeal = false;
-        }
+		$ableToAppeal = true;
+		$prefs = new PreferenceManager($db, $currentUser->getId(), Domain::getCurrent($db)->getId());
+		if ($prefs->getPreference(PreferenceManager::ADMIN_PREF_PREVENT_REACTIVATION) ?? false) {
+			$ableToAppeal = false;
+		}
 
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
 
-            $reason = WebRequest::postString('reason');
-            $updateVersion = WebRequest::postInt('updateVersion');
+			$reason = WebRequest::postString('reason');
+			$updateVersion = WebRequest::postInt('updateVersion');
 
-            if (!$ableToAppeal) {
-                throw new ApplicationLogicException('Appeal is disabled');
-            }
+			if (!$ableToAppeal) {
+				throw new ApplicationLogicException('Appeal is disabled');
+			}
 
-            if ($reason === null || trim($reason) === '') {
-                throw new ApplicationLogicException('The reason field cannot be empty.');
-            }
+			if ($reason === null || trim($reason) === '') {
+				throw new ApplicationLogicException('The reason field cannot be empty.');
+			}
 
-            Logger::requestedReactivation($db, $currentUser, $reason);
-            $currentUser->setStatus(User::STATUS_NEW);
-            $currentUser->setUpdateVersion($updateVersion);
-            $currentUser->save();
+			Logger::requestedReactivation($db, $currentUser, $reason);
+			$currentUser->setStatus(User::STATUS_NEW);
+			$currentUser->setUpdateVersion($updateVersion);
+			$currentUser->save();
 
-            SessionAlert::success('Reactivation request has been saved. Please wait for a response from the tool admin team.');
-            $this->redirect();
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->assign('deactivationReason', $this->getLogEntry('DeactivatedUser', $currentUser, $db));
-            $this->assign('updateVersion', $currentUser->getUpdateVersion());
-            $this->assign('ableToAppeal', $ableToAppeal);
-            $this->setTemplate('reactivate.tpl');
-        }
-    }
+			SessionAlert::success('Reactivation request has been saved. Please wait for a response from the tool admin team.');
+			$this->redirect();
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->assign('deactivationReason', $this->getLogEntry('DeactivatedUser', $currentUser, $db));
+			$this->assign('updateVersion', $currentUser->getUpdateVersion());
+			$this->assign('ableToAppeal', $ableToAppeal);
+			$this->setTemplate('reactivate.tpl');
+		}
+	}
 }
\ No newline at end of file

includes/Pages/UserAuth/PagePreferences.php

Indentation +166 added lines, -166 removed lines

@@ -21,170 +21,170 @@
 
 class PagePreferences extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $this->setHtmlTitle('Preferences');
-
-        $enforceOAuth = $this->getSiteConfiguration()->getEnforceOAuth();
-        $database = $this->getDatabase();
-        $user = User::getCurrent($database);
-        $preferencesManager = PreferenceManager::getForCurrent($database);
-
-        // Dual mode
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-
-            $this->setPreference($preferencesManager,PreferenceManager::PREF_EMAIL_SIGNATURE, 'emailSignature');
-            $this->setPreferenceWithValue($preferencesManager,PreferenceManager::PREF_SKIP_JS_ABORT, 'skipJsAbort', WebRequest::postBoolean('skipJsAbort') ? 1 : 0);
-            $this->setPreferenceWithValue($preferencesManager,PreferenceManager::PREF_QUEUE_HELP, 'showQueueHelp', WebRequest::postBoolean('showQueueHelp') ? 1 : 0);
-            $this->setCreationMode($user, $preferencesManager);
-            $this->setSkin($preferencesManager);
-            $preferencesManager->setGlobalPreference(PreferenceManager::PREF_DEFAULT_DOMAIN, WebRequest::postInt('defaultDomain'));
-
-            $email = WebRequest::postEmail('email');
-            if ($email !== null) {
-                $user->setEmail($email);
-            }
-
-            $user->save();
-            SessionAlert::success("Preferences updated!");
-
-            if ($this->barrierTest(RoleConfigurationBase::MAIN, $user, PageMain::class)) {
-                $this->redirect('');
-            }
-            else {
-                $this->redirect('preferences');
-            }
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->setTemplate('preferences/prefs.tpl');
-
-            // FIXME: domains!
-            /** @var Domain $domain */
-            $domain = Domain::getById(1, $this->getDatabase());
-            $this->assign('mediawikiScriptPath', $domain->getWikiArticlePath());
-
-            $this->assign("enforceOAuth", $enforceOAuth);
-
-            $this->assignPreference($preferencesManager, PreferenceManager::PREF_EMAIL_SIGNATURE, 'emailSignature', false);
-            $this->assignPreference($preferencesManager, PreferenceManager::PREF_CREATION_MODE, 'creationMode', false);
-            $this->assignPreference($preferencesManager, PreferenceManager::PREF_SKIN, 'skin', true);
-            $this->assignPreference($preferencesManager, PreferenceManager::PREF_SKIP_JS_ABORT, 'skipJsAbort', false);
-            $this->assignPreference($preferencesManager, PreferenceManager::PREF_QUEUE_HELP, 'showQueueHelp', false, true);
-            $this->assignPreference($preferencesManager, PreferenceManager::PREF_DEFAULT_DOMAIN, 'defaultDomain', true);
-
-            $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'));
-
-            $oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(),
-                $this->getSiteConfiguration());
-            $this->assign('oauth', $oauth);
-
-            $identity = null;
-            if ($oauth->isFullyLinked()) {
-                $identity = $oauth->getIdentity(true);
-            }
-
-            $this->assign('identity', $identity);
-            $this->assign('graceTime', $this->getSiteConfiguration()->getOauthIdentityGraceTime());
-        }
-    }
-
-    private function assignPreference(
-        PreferenceManager $preferencesManager,
-        string $preference,
-        string $fieldName,
-        bool $defaultGlobal,
-        $defaultValue = null
-    ): void {
-        $this->assign($fieldName, $preferencesManager->getPreference($preference) ?? $defaultValue);
-        $this->assign($fieldName . 'Global', $preferencesManager->isGlobalPreference($preference) ?? $defaultGlobal);
-    }
-
-    private function setPreferenceWithValue(
-        PreferenceManager $preferencesManager,
-        string $preferenceName,
-        string $fieldName,
-        $value
-    ): void {
-        $globalDefinition = WebRequest::postBoolean($fieldName . 'Global');
-        if ($globalDefinition) {
-            $preferencesManager->setGlobalPreference($preferenceName, $value);
-        }
-        else {
-            $preferencesManager->setLocalPreference($preferenceName, $value);
-        }
-    }
-
-    private function setPreference(
-        PreferenceManager $preferencesManager,
-        string $preferenceName,
-        string $fieldName
-    ): void {
-        $this->setPreferenceWithValue($preferencesManager, $preferenceName, $fieldName, WebRequest::postString($fieldName));
-    }
-
-    protected function refreshOAuth()
-    {
-        if (!WebRequest::wasPosted()) {
-            $this->redirect('preferences');
-
-            return;
-        }
-
-        $database = $this->getDatabase();
-        $oauth = new OAuthUserHelper(User::getCurrent($database), $database, $this->getOAuthProtocolHelper(),
-            $this->getSiteConfiguration());
-
-        // token is for old consumer, run through the approval workflow again
-        if ($oauth->getIdentity(true)->getAudience() !== $this->getSiteConfiguration()->getOAuthConsumerToken()) {
-            $authoriseUrl = $oauth->getRequestToken();
-            $this->redirectUrl($authoriseUrl);
-
-            return;
-        }
-
-        if ($oauth->isFullyLinked()) {
-            $oauth->refreshIdentity();
-        }
-
-        $this->redirect('preferences');
-
-        return;
-    }
-
-    private function setCreationMode(User $user, PreferenceManager $preferenceManager)
-    {
-        // if the user is selecting a creation mode that they are not allowed, do nothing.
-        // this has the side effect of allowing them to keep a selected mode that either has been changed for them,
-        // or that they have kept from when they previously had certain access.
-        // This setting is only settable locally, as ACLs may change between domains.
-        $creationMode = WebRequest::postInt('creationMode');
-
-        if ($creationMode === null) {
-            return;
-        }
-
-        if ($this->barrierTest($creationMode, $user, 'RequestCreation')) {
-            $preferenceManager->setLocalPreference(PreferenceManager::PREF_CREATION_MODE, WebRequest::postString('creationMode'));
-        }
-    }
-
-    private function setSkin(PreferenceManager $preferencesManager): void
-    {
-        $newSkin = WebRequest::postString('skin');
-        $allowedSkins = ['main', 'alt', 'auto'];
-        if (in_array($newSkin, $allowedSkins)) {
-            $this->setPreference($preferencesManager, PreferenceManager::PREF_SKIN, 'skin');
-        }
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$this->setHtmlTitle('Preferences');
+
+		$enforceOAuth = $this->getSiteConfiguration()->getEnforceOAuth();
+		$database = $this->getDatabase();
+		$user = User::getCurrent($database);
+		$preferencesManager = PreferenceManager::getForCurrent($database);
+
+		// Dual mode
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+
+			$this->setPreference($preferencesManager,PreferenceManager::PREF_EMAIL_SIGNATURE, 'emailSignature');
+			$this->setPreferenceWithValue($preferencesManager,PreferenceManager::PREF_SKIP_JS_ABORT, 'skipJsAbort', WebRequest::postBoolean('skipJsAbort') ? 1 : 0);
+			$this->setPreferenceWithValue($preferencesManager,PreferenceManager::PREF_QUEUE_HELP, 'showQueueHelp', WebRequest::postBoolean('showQueueHelp') ? 1 : 0);
+			$this->setCreationMode($user, $preferencesManager);
+			$this->setSkin($preferencesManager);
+			$preferencesManager->setGlobalPreference(PreferenceManager::PREF_DEFAULT_DOMAIN, WebRequest::postInt('defaultDomain'));
+
+			$email = WebRequest::postEmail('email');
+			if ($email !== null) {
+				$user->setEmail($email);
+			}
+
+			$user->save();
+			SessionAlert::success("Preferences updated!");
+
+			if ($this->barrierTest(RoleConfigurationBase::MAIN, $user, PageMain::class)) {
+				$this->redirect('');
+			}
+			else {
+				$this->redirect('preferences');
+			}
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->setTemplate('preferences/prefs.tpl');
+
+			// FIXME: domains!
+			/** @var Domain $domain */
+			$domain = Domain::getById(1, $this->getDatabase());
+			$this->assign('mediawikiScriptPath', $domain->getWikiArticlePath());
+
+			$this->assign("enforceOAuth", $enforceOAuth);
+
+			$this->assignPreference($preferencesManager, PreferenceManager::PREF_EMAIL_SIGNATURE, 'emailSignature', false);
+			$this->assignPreference($preferencesManager, PreferenceManager::PREF_CREATION_MODE, 'creationMode', false);
+			$this->assignPreference($preferencesManager, PreferenceManager::PREF_SKIN, 'skin', true);
+			$this->assignPreference($preferencesManager, PreferenceManager::PREF_SKIP_JS_ABORT, 'skipJsAbort', false);
+			$this->assignPreference($preferencesManager, PreferenceManager::PREF_QUEUE_HELP, 'showQueueHelp', false, true);
+			$this->assignPreference($preferencesManager, PreferenceManager::PREF_DEFAULT_DOMAIN, 'defaultDomain', true);
+
+			$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'));
+
+			$oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(),
+				$this->getSiteConfiguration());
+			$this->assign('oauth', $oauth);
+
+			$identity = null;
+			if ($oauth->isFullyLinked()) {
+				$identity = $oauth->getIdentity(true);
+			}
+
+			$this->assign('identity', $identity);
+			$this->assign('graceTime', $this->getSiteConfiguration()->getOauthIdentityGraceTime());
+		}
+	}
+
+	private function assignPreference(
+		PreferenceManager $preferencesManager,
+		string $preference,
+		string $fieldName,
+		bool $defaultGlobal,
+		$defaultValue = null
+	): void {
+		$this->assign($fieldName, $preferencesManager->getPreference($preference) ?? $defaultValue);
+		$this->assign($fieldName . 'Global', $preferencesManager->isGlobalPreference($preference) ?? $defaultGlobal);
+	}
+
+	private function setPreferenceWithValue(
+		PreferenceManager $preferencesManager,
+		string $preferenceName,
+		string $fieldName,
+		$value
+	): void {
+		$globalDefinition = WebRequest::postBoolean($fieldName . 'Global');
+		if ($globalDefinition) {
+			$preferencesManager->setGlobalPreference($preferenceName, $value);
+		}
+		else {
+			$preferencesManager->setLocalPreference($preferenceName, $value);
+		}
+	}
+
+	private function setPreference(
+		PreferenceManager $preferencesManager,
+		string $preferenceName,
+		string $fieldName
+	): void {
+		$this->setPreferenceWithValue($preferencesManager, $preferenceName, $fieldName, WebRequest::postString($fieldName));
+	}
+
+	protected function refreshOAuth()
+	{
+		if (!WebRequest::wasPosted()) {
+			$this->redirect('preferences');
+
+			return;
+		}
+
+		$database = $this->getDatabase();
+		$oauth = new OAuthUserHelper(User::getCurrent($database), $database, $this->getOAuthProtocolHelper(),
+			$this->getSiteConfiguration());
+
+		// token is for old consumer, run through the approval workflow again
+		if ($oauth->getIdentity(true)->getAudience() !== $this->getSiteConfiguration()->getOAuthConsumerToken()) {
+			$authoriseUrl = $oauth->getRequestToken();
+			$this->redirectUrl($authoriseUrl);
+
+			return;
+		}
+
+		if ($oauth->isFullyLinked()) {
+			$oauth->refreshIdentity();
+		}
+
+		$this->redirect('preferences');
+
+		return;
+	}
+
+	private function setCreationMode(User $user, PreferenceManager $preferenceManager)
+	{
+		// if the user is selecting a creation mode that they are not allowed, do nothing.
+		// this has the side effect of allowing them to keep a selected mode that either has been changed for them,
+		// or that they have kept from when they previously had certain access.
+		// This setting is only settable locally, as ACLs may change between domains.
+		$creationMode = WebRequest::postInt('creationMode');
+
+		if ($creationMode === null) {
+			return;
+		}
+
+		if ($this->barrierTest($creationMode, $user, 'RequestCreation')) {
+			$preferenceManager->setLocalPreference(PreferenceManager::PREF_CREATION_MODE, WebRequest::postString('creationMode'));
+		}
+	}
+
+	private function setSkin(PreferenceManager $preferencesManager): void
+	{
+		$newSkin = WebRequest::postString('skin');
+		$allowedSkins = ['main', 'alt', 'auto'];
+		if (in_array($newSkin, $allowedSkins)) {
+			$this->setPreference($preferencesManager, PreferenceManager::PREF_SKIN, 'skin');
+		}
+	}
 }

includes/Pages/Statistics/StatsMain.php

Indentation +87 added lines, -87 removed lines

@@ -15,102 +15,102 @@
 
 class StatsMain extends InternalPageBase
 {
-    public function main()
-    {
-        $this->setHtmlTitle('Statistics');
-
-        $this->assign('statsPageTitle', 'Account Creation Statistics');
-
-        $statsPages = array(
-            'fastCloses'       => 'Requests closed less than 30 seconds after reservation in the past 3 months',
-            'inactiveUsers'    => 'Inactive tool users',
-            'monthlyStats'     => 'Monthly Statistics',
-            'reservedRequests' => 'All currently reserved requests',
-            'templateStats'    => 'Template Stats',
-            'topCreators'      => 'Top Account Creators',
-            'users'            => 'Account Creation Tool users',
-        );
-
-        $this->generateSmallStatsTable();
-
-        $this->assign('statsPages', $statsPages);
-
-        $graphList = array('day', '2day', '4day', 'week', '2week', 'month', '3month');
-        $this->assign('graphList', $graphList);
-
-        $this->setTemplate('statistics/main.tpl');
-    }
-
-    /**
-     * Gets the relevant statistics from the database for the small statistics table
-     */
-    private function generateSmallStatsTable()
-    {
-        $database = $this->getDatabase();
-        $requestsQuery = <<<'SQL'
+	public function main()
+	{
+		$this->setHtmlTitle('Statistics');
+
+		$this->assign('statsPageTitle', 'Account Creation Statistics');
+
+		$statsPages = array(
+			'fastCloses'       => 'Requests closed less than 30 seconds after reservation in the past 3 months',
+			'inactiveUsers'    => 'Inactive tool users',
+			'monthlyStats'     => 'Monthly Statistics',
+			'reservedRequests' => 'All currently reserved requests',
+			'templateStats'    => 'Template Stats',
+			'topCreators'      => 'Top Account Creators',
+			'users'            => 'Account Creation Tool users',
+		);
+
+		$this->generateSmallStatsTable();
+
+		$this->assign('statsPages', $statsPages);
+
+		$graphList = array('day', '2day', '4day', 'week', '2week', 'month', '3month');
+		$this->assign('graphList', $graphList);
+
+		$this->setTemplate('statistics/main.tpl');
+	}
+
+	/**
+	 * Gets the relevant statistics from the database for the small statistics table
+	 */
+	private function generateSmallStatsTable()
+	{
+		$database = $this->getDatabase();
+		$requestsQuery = <<<'SQL'
 SELECT COUNT(*) FROM request WHERE status = :status AND queue = :queue AND emailconfirm = 'Confirmed';
 SQL;
-        $requestsStatement = $database->prepare($requestsQuery);
+		$requestsStatement = $database->prepare($requestsQuery);
 
-        $requestStateData = array();
+		$requestStateData = array();
 
-        foreach (RequestQueue::getEnabledQueues($database) as $queue) {
-            $requestsStatement->execute(array(
-                ':status' => RequestStatus::OPEN,
-                ':queue'  => $queue->getId(),
-            ));
-            $requestCount = $requestsStatement->fetchColumn();
-            $requestsStatement->closeCursor();
-            $headerText = $queue->getHeader();
-            $requestStateData[$headerText] = $requestCount;
-        }
+		foreach (RequestQueue::getEnabledQueues($database) as $queue) {
+			$requestsStatement->execute(array(
+				':status' => RequestStatus::OPEN,
+				':queue'  => $queue->getId(),
+			));
+			$requestCount = $requestsStatement->fetchColumn();
+			$requestsStatement->closeCursor();
+			$headerText = $queue->getHeader();
+			$requestStateData[$headerText] = $requestCount;
+		}
 
-        $this->assign('requestCountData', $requestStateData);
+		$this->assign('requestCountData', $requestStateData);
 
-        // Unconfirmed requests
-        $unconfirmedStatement = $database->query(<<<SQL
+		// Unconfirmed requests
+		$unconfirmedStatement = $database->query(<<<SQL
 SELECT COUNT(*) FROM request WHERE emailconfirm != 'Confirmed' AND emailconfirm != '';
 SQL
-        );
-        $unconfirmed = $unconfirmedStatement->fetchColumn();
-        $unconfirmedStatement->closeCursor();
-        $this->assign('statsUnconfirmed', $unconfirmed);
-
-        $userRoleStatement = $database->prepare('SELECT COUNT(*) FROM user INNER JOIN userrole ON user.id = userrole.user WHERE userrole.role = :role AND user.status = \'Active\';');
-
-        // Admin users
-        $userRoleStatement->execute(array(':role' => 'admin'));
-        $adminUsers = $userRoleStatement->fetchColumn();
-        $userRoleStatement->closeCursor();
-        $this->assign('statsAdminUsers', $adminUsers);
-
-        // Users
-        $userRoleStatement->execute(array(':role' => 'user'));
-        $users = $userRoleStatement->fetchColumn();
-        $userRoleStatement->closeCursor();
-        $this->assign('statsUsers', $users);
-
-        $userStatusStatement = $database->prepare('SELECT COUNT(*) FROM user WHERE status = :status;');
+		);
+		$unconfirmed = $unconfirmedStatement->fetchColumn();
+		$unconfirmedStatement->closeCursor();
+		$this->assign('statsUnconfirmed', $unconfirmed);
+
+		$userRoleStatement = $database->prepare('SELECT COUNT(*) FROM user INNER JOIN userrole ON user.id = userrole.user WHERE userrole.role = :role AND user.status = \'Active\';');
+
+		// Admin users
+		$userRoleStatement->execute(array(':role' => 'admin'));
+		$adminUsers = $userRoleStatement->fetchColumn();
+		$userRoleStatement->closeCursor();
+		$this->assign('statsAdminUsers', $adminUsers);
+
+		// Users
+		$userRoleStatement->execute(array(':role' => 'user'));
+		$users = $userRoleStatement->fetchColumn();
+		$userRoleStatement->closeCursor();
+		$this->assign('statsUsers', $users);
+
+		$userStatusStatement = $database->prepare('SELECT COUNT(*) FROM user WHERE status = :status;');
         
-        // Deactivated users
-        $userStatusStatement->execute(array(':status' => 'Deactivated'));
-        $deactivatedUsers = $userStatusStatement->fetchColumn();
-        $userStatusStatement->closeCursor();
-        $this->assign('statsDeactivatedUsers', $deactivatedUsers);
-
-        // New users
-        $userStatusStatement->execute(array(':status' => 'New'));
-        $newUsers = $userStatusStatement->fetchColumn();
-        $userStatusStatement->closeCursor();
-        $this->assign('statsNewUsers', $newUsers);
-
-        // Most comments on a request
-        $mostCommentsStatement = $database->query(<<<SQL
+		// Deactivated users
+		$userStatusStatement->execute(array(':status' => 'Deactivated'));
+		$deactivatedUsers = $userStatusStatement->fetchColumn();
+		$userStatusStatement->closeCursor();
+		$this->assign('statsDeactivatedUsers', $deactivatedUsers);
+
+		// New users
+		$userStatusStatement->execute(array(':status' => 'New'));
+		$newUsers = $userStatusStatement->fetchColumn();
+		$userStatusStatement->closeCursor();
+		$this->assign('statsNewUsers', $newUsers);
+
+		// Most comments on a request
+		$mostCommentsStatement = $database->query(<<<SQL
 SELECT request FROM comment GROUP BY request ORDER BY COUNT(*) DESC LIMIT 1;
 SQL
-        );
-        $mostComments = $mostCommentsStatement->fetchColumn();
-        $mostCommentsStatement->closeCursor();
-        $this->assign('mostComments', $mostComments);
-    }
+		);
+		$mostComments = $mostCommentsStatement->fetchColumn();
+		$mostCommentsStatement->closeCursor();
+		$this->assign('mostComments', $mostComments);
+	}
 }