mdaniels5757 / waca

includes/Pages/Statistics/StatsUsers.php

Indentation +93 added lines, -93 removed lines

@@ -25,13 +25,13 @@ 
 
 class StatsUsers extends InternalPageBase
 {
-    public function main()
-    {
-        $this->setHtmlTitle('Users :: Statistics');
+	public function main()
+	{
+		$this->setHtmlTitle('Users :: Statistics');
 
-        $database = $this->getDatabase();
+		$database = $this->getDatabase();
 
-        $query = <<<SQL
+		$query = <<<SQL
 SELECT
     u.id
     , u.username
@@ -47,34 +47,34 @@ 
 WHERE u.status = 'Active'
 SQL;
 
-        $users = $database->query($query)->fetchAll(PDO::FETCH_ASSOC);
-        $this->assign('users', $users);
+		$users = $database->query($query)->fetchAll(PDO::FETCH_ASSOC);
+		$this->assign('users', $users);
 
-        $this->assign('statsPageTitle', 'Account Creation Tool users');
-        $this->setTemplate("statistics/users.tpl");
-    }
+		$this->assign('statsPageTitle', 'Account Creation Tool users');
+		$this->setTemplate("statistics/users.tpl");
+	}
 
-    /**
-     * Entry point for the detail action.
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function detail()
-    {
-        $userId = WebRequest::getInt('user');
-        if ($userId === null) {
-            throw new ApplicationLogicException("User not found");
-        }
+	/**
+	 * Entry point for the detail action.
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function detail()
+	{
+		$userId = WebRequest::getInt('user');
+		if ($userId === null) {
+			throw new ApplicationLogicException("User not found");
+		}
 
-        $database = $this->getDatabase();
+		$database = $this->getDatabase();
 
-        $user = User::getById($userId, $database);
-        if ($user == false) {
-            throw new ApplicationLogicException('User not found');
-        }
+		$user = User::getById($userId, $database);
+		if ($user == false) {
+			throw new ApplicationLogicException('User not found');
+		}
 
 
-        $activitySummary = $database->prepare(<<<SQL
+		$activitySummary = $database->prepare(<<<SQL
 SELECT COALESCE(closes.mail_desc, log.action) AS action, COUNT(*) AS count
 FROM log
 INNER JOIN user ON log.user = user.id
@@ -82,14 +82,14 @@ 
 WHERE user.username = :username
 GROUP BY action;
 SQL
-        );
-        $activitySummary->execute(array(":username" => $user->getUsername()));
-        $activitySummaryData = $activitySummary->fetchAll(PDO::FETCH_ASSOC);
+		);
+		$activitySummary->execute(array(":username" => $user->getUsername()));
+		$activitySummaryData = $activitySummary->fetchAll(PDO::FETCH_ASSOC);
 
-        $this->assign("user", $user);
-        $this->assign("activity", $activitySummaryData);
+		$this->assign("user", $user);
+		$this->assign("activity", $activitySummaryData);
 
-        $usersCreatedQuery = $database->prepare(<<<SQL
+		$usersCreatedQuery = $database->prepare(<<<SQL
 SELECT log.timestamp time, request.name name, request.id id
 FROM log
 INNER JOIN request ON (request.id = log.objectid AND log.objecttype = 'Request')
@@ -100,12 +100,12 @@ 
     AND (emailtemplate.defaultaction = :created OR log.action = 'Closed custom-y')
 ORDER BY log.timestamp;
 SQL
-        );
-        $usersCreatedQuery->execute(array(":username" => $user->getUsername(), ':created' => EmailTemplate::ACTION_CREATED));
-        $usersCreated = $usersCreatedQuery->fetchAll(PDO::FETCH_ASSOC);
-        $this->assign("created", $usersCreated);
+		);
+		$usersCreatedQuery->execute(array(":username" => $user->getUsername(), ':created' => EmailTemplate::ACTION_CREATED));
+		$usersCreated = $usersCreatedQuery->fetchAll(PDO::FETCH_ASSOC);
+		$this->assign("created", $usersCreated);
 
-        $usersNotCreatedQuery = $database->prepare(<<<SQL
+		$usersNotCreatedQuery = $database->prepare(<<<SQL
 SELECT log.timestamp time, request.name name, request.id id
 FROM log
 JOIN request ON request.id = log.objectid AND log.objecttype = 'Request'
@@ -116,59 +116,59 @@ 
     AND (emailtemplate.defaultaction = :created OR log.action = 'Closed custom-n' OR log.action = 'Closed 0')
 ORDER BY log.timestamp;
 SQL
-        );
-        $usersNotCreatedQuery->execute(array(":username" => $user->getUsername(), ':created' => EmailTemplate::ACTION_NOT_CREATED));
-        $usersNotCreated = $usersNotCreatedQuery->fetchAll(PDO::FETCH_ASSOC);
-        $this->assign("notcreated", $usersNotCreated);
-
-        /** @var Log[] $logs */
-        $logs = LogSearchHelper::get($database, Domain::getCurrent($database)->getId())
-            ->byObjectType('User')
-            ->byObjectId($user->getId())
-            ->getRecordCount($logCount)
-            ->fetch();
-
-        if ($logCount === 0) {
-            $this->assign('accountlog', array());
-        }
-        else {
-            list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration(), $this->getSecurityManager());
-
-            $this->assign("accountlog", $logData);
-            $this->assign("users", $users);
-        }
-
-        $currentUser = User::getCurrent($database);
-        $this->assign('canApprove', $this->barrierTest('approve', $currentUser, PageUserManagement::class));
-        $this->assign('canDeactivate', $this->barrierTest('deactivate', $currentUser, PageUserManagement::class));
-        $this->assign('canRename', $this->barrierTest('rename', $currentUser, PageUserManagement::class));
-        $this->assign('canEditUser', $this->barrierTest('editUser', $currentUser, PageUserManagement::class));
-        $this->assign('canEditRoles', $this->barrierTest('editRoles', $currentUser, PageUserManagement::class));
-
-        $oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
-        $this->assign('oauth', $oauth);
-
-        if ($user->getForceIdentified() === null) {
-            $idVerifier = new IdentificationVerifier($this->getHttpHelper(), $this->getSiteConfiguration(), $this->getDatabase());
-            $this->assign('identificationStatus', $idVerifier->isUserIdentified($user->getOnWikiName()) ? 'detected' : 'missing');
-        }
-        else {
-            $this->assign('identificationStatus', $user->getForceIdentified() == 1 ? 'forced-on' : 'forced-off');
-        }
-
-        if ($oauth->isFullyLinked()) {
-            $this->assign('identity', $oauth->getIdentity(true));
-            $this->assign('identityExpired', $oauth->identityExpired());
-        }
-
-        $this->assign('statsPageTitle', 'Account Creation Tool users');
-
-        // FIXME: domains!
-        /** @var Domain $domain */
-        $domain = Domain::getById(1, $this->getDatabase());
-        $this->assign('mediawikiScriptPath', $domain->getWikiArticlePath());
-
-        $this->setHtmlTitle('{$user->getUsername()|escape} :: Users :: Statistics');
-        $this->setTemplate("statistics/userdetail.tpl");
-    }
+		);
+		$usersNotCreatedQuery->execute(array(":username" => $user->getUsername(), ':created' => EmailTemplate::ACTION_NOT_CREATED));
+		$usersNotCreated = $usersNotCreatedQuery->fetchAll(PDO::FETCH_ASSOC);
+		$this->assign("notcreated", $usersNotCreated);
+
+		/** @var Log[] $logs */
+		$logs = LogSearchHelper::get($database, Domain::getCurrent($database)->getId())
+			->byObjectType('User')
+			->byObjectId($user->getId())
+			->getRecordCount($logCount)
+			->fetch();
+
+		if ($logCount === 0) {
+			$this->assign('accountlog', array());
+		}
+		else {
+			list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration(), $this->getSecurityManager());
+
+			$this->assign("accountlog", $logData);
+			$this->assign("users", $users);
+		}
+
+		$currentUser = User::getCurrent($database);
+		$this->assign('canApprove', $this->barrierTest('approve', $currentUser, PageUserManagement::class));
+		$this->assign('canDeactivate', $this->barrierTest('deactivate', $currentUser, PageUserManagement::class));
+		$this->assign('canRename', $this->barrierTest('rename', $currentUser, PageUserManagement::class));
+		$this->assign('canEditUser', $this->barrierTest('editUser', $currentUser, PageUserManagement::class));
+		$this->assign('canEditRoles', $this->barrierTest('editRoles', $currentUser, PageUserManagement::class));
+
+		$oauth = new OAuthUserHelper($user, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
+		$this->assign('oauth', $oauth);
+
+		if ($user->getForceIdentified() === null) {
+			$idVerifier = new IdentificationVerifier($this->getHttpHelper(), $this->getSiteConfiguration(), $this->getDatabase());
+			$this->assign('identificationStatus', $idVerifier->isUserIdentified($user->getOnWikiName()) ? 'detected' : 'missing');
+		}
+		else {
+			$this->assign('identificationStatus', $user->getForceIdentified() == 1 ? 'forced-on' : 'forced-off');
+		}
+
+		if ($oauth->isFullyLinked()) {
+			$this->assign('identity', $oauth->getIdentity(true));
+			$this->assign('identityExpired', $oauth->identityExpired());
+		}
+
+		$this->assign('statsPageTitle', 'Account Creation Tool users');
+
+		// FIXME: domains!
+		/** @var Domain $domain */
+		$domain = Domain::getById(1, $this->getDatabase());
+		$this->assign('mediawikiScriptPath', $domain->getWikiArticlePath());
+
+		$this->setHtmlTitle('{$user->getUsername()|escape} :: Users :: Statistics');
+		$this->setTemplate("statistics/userdetail.tpl");
+	}
 }

includes/Pages/RequestAction/PageCreateRequest.php

Indentation +152 added lines, -152 removed lines

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

includes/Pages/PageListFlaggedComments.php

Indentation +108 added lines, -108 removed lines

@@ -18,112 +18,112 @@
 
 class PageListFlaggedComments extends InternalPageBase
 {
-    /**
-     * @inheritDoc
-     */
-    protected function main()
-    {
-        $this->setHtmlTitle('Flagged comments');
-        $this->setTemplate('flagged-comments.tpl');
-
-        $database = $this->getDatabase();
-        $this->assignCSRFToken();
-
-        /** @var Comment[] $commentObjects */
-        $commentObjects = Comment::getFlaggedComments($database, 1); // FIXME: domains
-        $comments = [];
-
-        $currentUser = User::getCurrent($database);
-
-        $seeRestrictedComments = $this->barrierTest('seeRestrictedComments', $currentUser, 'RequestData');
-        $seeCheckuserComments = $this->barrierTest('seeCheckuserComments', $currentUser, 'RequestData');
-        $alwaysSeePrivateData = $this->barrierTest('alwaysSeePrivateData', $currentUser, 'RequestData');
-
-        foreach ($commentObjects as $object) {
-            $data = [
-                'visibility'    => $object->getVisibility(),
-                'hidden'        => false,
-                'hiddenText'    => false,
-            ];
-
-            if (!$alwaysSeePrivateData) {
-                // tl;dr: This is a stupid configuration, but let's account for it anyway.
-                //
-                // Flagged comments are treated as private data. If you don't have the privilege
-                // RequestData::alwaysSeePrivateData, then we can't show you the content of the comments here.
-                // This page is forced to degrade into basically a list of requests, seriously hampering the usefulness
-                // of this page. Still, we need to handle the case where we have access to this page, but not access
-                // to private data.
-                // At the time of writing, this case does not exist in the current role configuration, but for the role
-                // configuration to be free of assumptions, we need this code.
-
-                /** @var Request $request */
-                $request = Request::getById($object->getRequest(), $database);
-
-                if ($request->getReserved() === $currentUser->getId()) {
-                    $data['hiddenText'] = false;
-                }
-                else {
-                    $data['hiddenText'] = true;
-                }
-            }
-
-            if ($object->getVisibility() == 'requester' || $object->getVisibility() == 'user') {
-                $data['hidden'] = false;
-            }
-            elseif ($object->getVisibility() == 'admin') {
-                if ($seeRestrictedComments) {
-                    $data['hidden'] = false;
-                }
-                else {
-                    $data['hidden'] = true;
-                }
-            }
-            elseif ($object->getVisibility() == 'checkuser') {
-                if ($seeCheckuserComments) {
-                    $data['hidden'] = false;
-                }
-                else {
-                    $data['hidden'] = true;
-                }
-            }
-
-            $this->copyCommentData($object, $data, $database);
-
-            $comments[] = $data;
-        }
-
-        $this->assign('comments', $comments);
-        $this->assign('seeRestrictedComments', $seeRestrictedComments);
-        $this->assign('seeCheckuserComments', $seeCheckuserComments);
-
-        $this->assign('editOthersComments', $this->barrierTest('editOthers', $currentUser, PageEditComment::class));
-        $this->assign('editComments', $this->barrierTest(RoleConfigurationBase::MAIN, $currentUser, PageEditComment::class));
-        $this->assign('canUnflag', $this->barrierTest('unflag', $currentUser, PageFlagComment::class) && $this->barrierTest(RoleConfigurationBase::MAIN, $currentUser, PageFlagComment::class));
-    }
-
-    private function copyCommentData(Comment $object, array &$data, PdoDatabase $database): void
-    {
-        if ($data['hidden']) {
-            // All details hidden, so don't copy anything.
-            return;
-        }
-
-        /** @var Request $request */
-        $request = Request::getById($object->getRequest(), $database);
-
-        if (!$data['hiddenText']) {
-            // Comment text is hidden, but presence of the comment is visible.
-            $data['comment'] = $object->getComment();
-        }
-
-        $data['id'] = $object->getId();
-        $data['updateversion'] = $object->getUpdateVersion();
-        $data['time'] = $object->getTime();
-        $data['requestid'] = $object->getRequest();
-        $data['request'] = $request->getName();
-        $data['requeststatus'] = $request->getStatus();
-        $data['userid'] = $object->getUser();
-        $data['user'] = User::getById($object->getUser(), $database)->getUsername();
-    }
+	/**
+	 * @inheritDoc
+	 */
+	protected function main()
+	{
+		$this->setHtmlTitle('Flagged comments');
+		$this->setTemplate('flagged-comments.tpl');
+
+		$database = $this->getDatabase();
+		$this->assignCSRFToken();
+
+		/** @var Comment[] $commentObjects */
+		$commentObjects = Comment::getFlaggedComments($database, 1); // FIXME: domains
+		$comments = [];
+
+		$currentUser = User::getCurrent($database);
+
+		$seeRestrictedComments = $this->barrierTest('seeRestrictedComments', $currentUser, 'RequestData');
+		$seeCheckuserComments = $this->barrierTest('seeCheckuserComments', $currentUser, 'RequestData');
+		$alwaysSeePrivateData = $this->barrierTest('alwaysSeePrivateData', $currentUser, 'RequestData');
+
+		foreach ($commentObjects as $object) {
+			$data = [
+				'visibility'    => $object->getVisibility(),
+				'hidden'        => false,
+				'hiddenText'    => false,
+			];
+
+			if (!$alwaysSeePrivateData) {
+				// tl;dr: This is a stupid configuration, but let's account for it anyway.
+				//
+				// Flagged comments are treated as private data. If you don't have the privilege
+				// RequestData::alwaysSeePrivateData, then we can't show you the content of the comments here.
+				// This page is forced to degrade into basically a list of requests, seriously hampering the usefulness
+				// of this page. Still, we need to handle the case where we have access to this page, but not access
+				// to private data.
+				// At the time of writing, this case does not exist in the current role configuration, but for the role
+				// configuration to be free of assumptions, we need this code.
+
+				/** @var Request $request */
+				$request = Request::getById($object->getRequest(), $database);
+
+				if ($request->getReserved() === $currentUser->getId()) {
+					$data['hiddenText'] = false;
+				}
+				else {
+					$data['hiddenText'] = true;
+				}
+			}
+
+			if ($object->getVisibility() == 'requester' || $object->getVisibility() == 'user') {
+				$data['hidden'] = false;
+			}
+			elseif ($object->getVisibility() == 'admin') {
+				if ($seeRestrictedComments) {
+					$data['hidden'] = false;
+				}
+				else {
+					$data['hidden'] = true;
+				}
+			}
+			elseif ($object->getVisibility() == 'checkuser') {
+				if ($seeCheckuserComments) {
+					$data['hidden'] = false;
+				}
+				else {
+					$data['hidden'] = true;
+				}
+			}
+
+			$this->copyCommentData($object, $data, $database);
+
+			$comments[] = $data;
+		}
+
+		$this->assign('comments', $comments);
+		$this->assign('seeRestrictedComments', $seeRestrictedComments);
+		$this->assign('seeCheckuserComments', $seeCheckuserComments);
+
+		$this->assign('editOthersComments', $this->barrierTest('editOthers', $currentUser, PageEditComment::class));
+		$this->assign('editComments', $this->barrierTest(RoleConfigurationBase::MAIN, $currentUser, PageEditComment::class));
+		$this->assign('canUnflag', $this->barrierTest('unflag', $currentUser, PageFlagComment::class) && $this->barrierTest(RoleConfigurationBase::MAIN, $currentUser, PageFlagComment::class));
+	}
+
+	private function copyCommentData(Comment $object, array &$data, PdoDatabase $database): void
+	{
+		if ($data['hidden']) {
+			// All details hidden, so don't copy anything.
+			return;
+		}
+
+		/** @var Request $request */
+		$request = Request::getById($object->getRequest(), $database);
+
+		if (!$data['hiddenText']) {
+			// Comment text is hidden, but presence of the comment is visible.
+			$data['comment'] = $object->getComment();
+		}
+
+		$data['id'] = $object->getId();
+		$data['updateversion'] = $object->getUpdateVersion();
+		$data['time'] = $object->getTime();
+		$data['requestid'] = $object->getRequest();
+		$data['request'] = $request->getName();
+		$data['requeststatus'] = $request->getStatus();
+		$data['userid'] = $object->getUser();
+		$data['user'] = User::getById($object->getUser(), $database)->getUsername();
+	}
 }
\ No newline at end of file

includes/SiteConfiguration.php

Indentation +1110 added lines, -1110 removed lines

@@ -18,1114 +18,1114 @@
  */
 class SiteConfiguration
 {
-    private $baseUrl = 'https://accounts.wmflabs.org';
-    private $filePath = __DIR__ . '/..';
-    private $schemaVersion = 51;
-    private $debuggingTraceEnabled = false;
-    private $debuggingCssBreakpointsEnabled = false;
-    private $dataClearIp = '127.0.0.1';
-    private $dataClearEmail = 'acc@toolserver.org';
-    private $dataClearInterval = '15 DAY';
-    private $forceIdentification = true;
-    private $identificationCacheExpiry = '1 DAY';
-    private $metaWikimediaWebServiceEndpoint = 'https://meta.wikimedia.org/w/api.php';
-    private $enforceOAuth = false;
-    private $emailConfirmationEnabled = true;
-    private $emailConfirmationExpiryDays = 7;
-    private $miserModeLimit = 25;
-    private $squidList = array();
-    private $useStrictTransportSecurity = false;
-    private $userAgent = 'Wikipedia-ACC Tool/0.1 (+https://accounts.wmflabs.org/internal.php/team)';
-    private $curlDisableVerifyPeer = false;
-    private $useOAuthSignup = true;
-    private $oauthConsumerToken;
-    /** @var array */
-    private $oauthLegacyConsumerTokens;
-    private $oauthConsumerSecret;
-    private $oauthIdentityGraceTime = '24 hours';
-    private $oauthMediaWikiCanonicalServer = 'https://en.wikipedia.org';
-    private $xffTrustedHostsFile = '../TrustedXFF/trusted-hosts.txt';
-    private $crossOriginResourceSharingHosts = array(
-        "https://en.wikipedia.org",
-        "https://meta.wikimedia.org",
-    );
-    private $ircNotificationsEnabled = true;
-    private $ircNotificationsInstance = 'Development';
-    private $errorLog = 'errorlog';
-    private $titleBlacklistEnabled = false;
-    /** @var null|string $locationProviderApiKey */
-    private $locationProviderApiKey = null;
-    private $torExitPaths = array();
-    private $creationBotUsername = '';
-    private $creationBotPassword = '';
-    private $curlCookieJar = __DIR__ . '/../../cookies.txt';
-    private $yubicoApiId = 0;
-    private $yubicoApiKey = "";
-    private $totpEncryptionKey = "1234";
-    private $identificationNoticeboardPage = 'Access to nonpublic personal data policy/Noticeboard';
-    private $identificationNoticeboardWebserviceEndpoint = 'https://meta.wikimedia.org/w/api.php';
-    private $registrationAllowed = true;
-    private $cspReportUri = null;
-    private $resourceCacheEpoch = 1;
-    private $commonEmailDomains = ['gmail.com', 'hotmail.com', 'outlook.com'];
-    private $banMaxIpBlockRange = [4 => 20, 6 => 48];
-    private $banMaxIpRange = [4 => 16, 6 => 32];
-    private $jobQueueBatchSize = 10;
-    private $amqpConfiguration = ['host' => 'localhost', 'port' => 5672, 'user' => 'guest', 'password' => 'guest', 'vhost' => '/', 'exchange' => '', 'tls' => false];
-    private $emailSender = 'accounts@wmflabs.org';
-    private $acceptClientHints = [];
-    private string $cookiePath = '/';
-    private string $cookieSessionName = 'ACC';
-    private array $offline = ['offline' => false, 'reason' => '', 'culprit' => ''];
-    private array $databaseConfig = [
-        'datasource' => 'mysql:host=localhost;dbname=waca',
-        'username' => 'waca',
-        'password' => 'waca'
-    ];
-    private string $privacyStatementPath = '';
-
-    /**
-     * Gets the base URL of the tool
-     *
-     * If the internal page of the tool is at http://localhost/path/internal.php, this would be set to
-     * http://localhost/path
-     * @return string
-     */
-    public function getBaseUrl()
-    {
-        return $this->baseUrl;
-    }
-
-    /**
-     * @param string $baseUrl
-     *
-     * @return SiteConfiguration
-     */
-    public function setBaseUrl($baseUrl)
-    {
-        $this->baseUrl = $baseUrl;
-
-        return $this;
-    }
-
-    /**
-     * Path on disk to the directory containing the tool's code
-     * @return string
-     */
-    public function getFilePath()
-    {
-        return $this->filePath;
-    }
-
-    /**
-     * @param string $filePath
-     *
-     * @return SiteConfiguration
-     */
-    public function setFilePath($filePath)
-    {
-        $this->filePath = $filePath;
-
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getSchemaVersion()
-    {
-        return $this->schemaVersion;
-    }
-
-    /**
-     * @param int $schemaVersion
-     *
-     * @return SiteConfiguration
-     */
-    public function setSchemaVersion($schemaVersion)
-    {
-        $this->schemaVersion = $schemaVersion;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getDebuggingTraceEnabled()
-    {
-        return $this->debuggingTraceEnabled;
-    }
-
-    /**
-     * @param mixed $debuggingTraceEnabled
-     *
-     * @return SiteConfiguration
-     */
-    public function setDebuggingTraceEnabled($debuggingTraceEnabled)
-    {
-        $this->debuggingTraceEnabled = $debuggingTraceEnabled;
-
-        return $this;
-    }
-
-    public function getDebuggingCssBreakpointsEnabled() : bool
-    {
-        return $this->debuggingCssBreakpointsEnabled;
-    }
-
-    public function setDebuggingCssBreakpointsEnabled(bool $debuggingCssBreakpointsEnabled) : SiteConfiguration
-    {
-        $this->debuggingCssBreakpointsEnabled = $debuggingCssBreakpointsEnabled;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDataClearIp()
-    {
-        return $this->dataClearIp;
-    }
-
-    /**
-     * @param string $dataClearIp
-     *
-     * @return SiteConfiguration
-     */
-    public function setDataClearIp($dataClearIp)
-    {
-        $this->dataClearIp = $dataClearIp;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDataClearEmail()
-    {
-        return $this->dataClearEmail;
-    }
-
-    /**
-     * @param string $dataClearEmail
-     *
-     * @return SiteConfiguration
-     */
-    public function setDataClearEmail($dataClearEmail)
-    {
-        $this->dataClearEmail = $dataClearEmail;
-
-        return $this;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function getForceIdentification()
-    {
-        return $this->forceIdentification;
-    }
-
-    /**
-     * @param boolean $forceIdentification
-     *
-     * @return SiteConfiguration
-     */
-    public function setForceIdentification($forceIdentification)
-    {
-        $this->forceIdentification = $forceIdentification;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getIdentificationCacheExpiry()
-    {
-        return $this->identificationCacheExpiry;
-    }
-
-    /**
-     * @param string $identificationCacheExpiry
-     *
-     * @return SiteConfiguration
-     */
-    public function setIdentificationCacheExpiry($identificationCacheExpiry)
-    {
-        $this->identificationCacheExpiry = $identificationCacheExpiry;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMetaWikimediaWebServiceEndpoint()
-    {
-        return $this->metaWikimediaWebServiceEndpoint;
-    }
-
-    /**
-     * @param string $metaWikimediaWebServiceEndpoint
-     *
-     * @return SiteConfiguration
-     */
-    public function setMetaWikimediaWebServiceEndpoint($metaWikimediaWebServiceEndpoint)
-    {
-        $this->metaWikimediaWebServiceEndpoint = $metaWikimediaWebServiceEndpoint;
-
-        return $this;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function getEnforceOAuth()
-    {
-        return $this->enforceOAuth;
-    }
-
-    /**
-     * @param boolean $enforceOAuth
-     *
-     * @return SiteConfiguration
-     */
-    public function setEnforceOAuth($enforceOAuth)
-    {
-        $this->enforceOAuth = $enforceOAuth;
-
-        return $this;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function getEmailConfirmationEnabled()
-    {
-        return $this->emailConfirmationEnabled;
-    }
-
-    /**
-     * @param boolean $emailConfirmationEnabled
-     *
-     * @return $this
-     */
-    public function setEmailConfirmationEnabled($emailConfirmationEnabled)
-    {
-        $this->emailConfirmationEnabled = $emailConfirmationEnabled;
-
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getMiserModeLimit()
-    {
-        return $this->miserModeLimit;
-    }
-
-    /**
-     * @param int $miserModeLimit
-     *
-     * @return SiteConfiguration
-     */
-    public function setMiserModeLimit($miserModeLimit)
-    {
-        $this->miserModeLimit = $miserModeLimit;
-
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getSquidList()
-    {
-        return $this->squidList;
-    }
-
-    /**
-     * @param array $squidList
-     *
-     * @return SiteConfiguration
-     */
-    public function setSquidList($squidList)
-    {
-        $this->squidList = $squidList;
-
-        return $this;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function getUseStrictTransportSecurity()
-    {
-        return $this->useStrictTransportSecurity;
-    }
-
-    /**
-     * @param boolean $useStrictTransportSecurity
-     *
-     * @return SiteConfiguration
-     */
-    public function setUseStrictTransportSecurity($useStrictTransportSecurity)
-    {
-        $this->useStrictTransportSecurity = $useStrictTransportSecurity;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUserAgent()
-    {
-        return $this->userAgent;
-    }
-
-    /**
-     * @param string $userAgent
-     *
-     * @return SiteConfiguration
-     */
-    public function setUserAgent($userAgent)
-    {
-        $this->userAgent = $userAgent;
-
-        return $this;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function getCurlDisableVerifyPeer()
-    {
-        return $this->curlDisableVerifyPeer;
-    }
-
-    /**
-     * @param boolean $curlDisableVerifyPeer
-     *
-     * @return SiteConfiguration
-     */
-    public function setCurlDisableVerifyPeer($curlDisableVerifyPeer)
-    {
-        $this->curlDisableVerifyPeer = $curlDisableVerifyPeer;
-
-        return $this;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function getUseOAuthSignup()
-    {
-        return $this->useOAuthSignup;
-    }
-
-    /**
-     * @param boolean $useOAuthSignup
-     *
-     * @return SiteConfiguration
-     */
-    public function setUseOAuthSignup($useOAuthSignup)
-    {
-        $this->useOAuthSignup = $useOAuthSignup;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getOAuthConsumerToken()
-    {
-        return $this->oauthConsumerToken;
-    }
-
-    /**
-     * @param mixed $oauthConsumerToken
-     *
-     * @return SiteConfiguration
-     */
-    public function setOAuthConsumerToken($oauthConsumerToken)
-    {
-        $this->oauthConsumerToken = $oauthConsumerToken;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getOAuthConsumerSecret()
-    {
-        return $this->oauthConsumerSecret;
-    }
-
-    /**
-     * @param mixed $oauthConsumerSecret
-     *
-     * @return SiteConfiguration
-     */
-    public function setOAuthConsumerSecret($oauthConsumerSecret)
-    {
-        $this->oauthConsumerSecret = $oauthConsumerSecret;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDataClearInterval()
-    {
-        return $this->dataClearInterval;
-    }
-
-    /**
-     * @param string $dataClearInterval
-     *
-     * @return SiteConfiguration
-     */
-    public function setDataClearInterval($dataClearInterval)
-    {
-        $this->dataClearInterval = $dataClearInterval;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getXffTrustedHostsFile()
-    {
-        return $this->xffTrustedHostsFile;
-    }
-
-    /**
-     * @param string $xffTrustedHostsFile
-     *
-     * @return SiteConfiguration
-     */
-    public function setXffTrustedHostsFile($xffTrustedHostsFile)
-    {
-        $this->xffTrustedHostsFile = $xffTrustedHostsFile;
-
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getCrossOriginResourceSharingHosts()
-    {
-        return $this->crossOriginResourceSharingHosts;
-    }
-
-    /**
-     * @param array $crossOriginResourceSharingHosts
-     *
-     * @return SiteConfiguration
-     */
-    public function setCrossOriginResourceSharingHosts($crossOriginResourceSharingHosts)
-    {
-        $this->crossOriginResourceSharingHosts = $crossOriginResourceSharingHosts;
-
-        return $this;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function getIrcNotificationsEnabled()
-    {
-        return $this->ircNotificationsEnabled;
-    }
-
-    /**
-     * @param boolean $ircNotificationsEnabled
-     *
-     * @return SiteConfiguration
-     */
-    public function setIrcNotificationsEnabled($ircNotificationsEnabled)
-    {
-        $this->ircNotificationsEnabled = $ircNotificationsEnabled;
-
-        return $this;
-    }
-
-    /**
-     * @param string $errorLog
-     *
-     * @return SiteConfiguration
-     */
-    public function setErrorLog($errorLog)
-    {
-        $this->errorLog = $errorLog;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getErrorLog()
-    {
-        return $this->errorLog;
-    }
-
-    /**
-     * @param int $emailConfirmationExpiryDays
-     *
-     * @return SiteConfiguration
-     */
-    public function setEmailConfirmationExpiryDays($emailConfirmationExpiryDays)
-    {
-        $this->emailConfirmationExpiryDays = $emailConfirmationExpiryDays;
-
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getEmailConfirmationExpiryDays()
-    {
-        return $this->emailConfirmationExpiryDays;
-    }
-
-    /**
-     * @param string $ircNotificationsInstance
-     *
-     * @return SiteConfiguration
-     */
-    public function setIrcNotificationsInstance($ircNotificationsInstance)
-    {
-        $this->ircNotificationsInstance = $ircNotificationsInstance;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getIrcNotificationsInstance()
-    {
-        return $this->ircNotificationsInstance;
-    }
-
-    /**
-     * @param boolean $titleBlacklistEnabled
-     *
-     * @return SiteConfiguration
-     */
-    public function setTitleBlacklistEnabled($titleBlacklistEnabled)
-    {
-        $this->titleBlacklistEnabled = $titleBlacklistEnabled;
-
-        return $this;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function getTitleBlacklistEnabled()
-    {
-        return $this->titleBlacklistEnabled;
-    }
-
-    /**
-     * @param string|null $locationProviderApiKey
-     *
-     * @return SiteConfiguration
-     */
-    public function setLocationProviderApiKey($locationProviderApiKey)
-    {
-        $this->locationProviderApiKey = $locationProviderApiKey;
-
-        return $this;
-    }
-
-    /**
-     * @return null|string
-     */
-    public function getLocationProviderApiKey()
-    {
-        return $this->locationProviderApiKey;
-    }
-
-    /**
-     * @param array $torExitPaths
-     *
-     * @return SiteConfiguration
-     */
-    public function setTorExitPaths($torExitPaths)
-    {
-        $this->torExitPaths = $torExitPaths;
-
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getTorExitPaths()
-    {
-        return $this->torExitPaths;
-    }
-
-    /**
-     * @param string $oauthIdentityGraceTime
-     *
-     * @return SiteConfiguration
-     */
-    public function setOauthIdentityGraceTime($oauthIdentityGraceTime)
-    {
-        $this->oauthIdentityGraceTime = $oauthIdentityGraceTime;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getOauthIdentityGraceTime()
-    {
-        return $this->oauthIdentityGraceTime;
-    }
-
-    /**
-     * @param string $oauthMediaWikiCanonicalServer
-     *
-     * @return SiteConfiguration
-     */
-    public function setOauthMediaWikiCanonicalServer($oauthMediaWikiCanonicalServer)
-    {
-        $this->oauthMediaWikiCanonicalServer = $oauthMediaWikiCanonicalServer;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getOauthMediaWikiCanonicalServer()
-    {
-        return $this->oauthMediaWikiCanonicalServer;
-    }
-
-    /**
-     * @param string $creationBotUsername
-     *
-     * @return SiteConfiguration
-     */
-    public function setCreationBotUsername($creationBotUsername)
-    {
-        $this->creationBotUsername = $creationBotUsername;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCreationBotUsername()
-    {
-        return $this->creationBotUsername;
-    }
-
-    /**
-     * @param string $creationBotPassword
-     *
-     * @return SiteConfiguration
-     */
-    public function setCreationBotPassword($creationBotPassword)
-    {
-        $this->creationBotPassword = $creationBotPassword;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCreationBotPassword()
-    {
-        return $this->creationBotPassword;
-    }
-
-    /**
-     * @param string|null $curlCookieJar
-     *
-     * @return SiteConfiguration
-     */
-    public function setCurlCookieJar($curlCookieJar)
-    {
-        $this->curlCookieJar = $curlCookieJar;
-
-        return $this;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getCurlCookieJar()
-    {
-        return $this->curlCookieJar;
-    }
-
-    public function getYubicoApiId()
-    {
-        return $this->yubicoApiId;
-    }
-
-    public function setYubicoApiId($id)
-    {
-        $this->yubicoApiId = $id;
-
-        return $this;
-    }
-
-    public function getYubicoApiKey()
-    {
-        return $this->yubicoApiKey;
-    }
-
-    public function setYubicoApiKey($key)
-    {
-        $this->yubicoApiKey = $key;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTotpEncryptionKey()
-    {
-        return $this->totpEncryptionKey;
-    }
-
-    /**
-     * @param string $totpEncryptionKey
-     *
-     * @return SiteConfiguration
-     */
-    public function setTotpEncryptionKey($totpEncryptionKey)
-    {
-        $this->totpEncryptionKey = $totpEncryptionKey;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getIdentificationNoticeboardPage()
-    {
-        return $this->identificationNoticeboardPage;
-    }
-
-    /**
-     * @param string $identificationNoticeboardPage
-     *
-     * @return SiteConfiguration
-     */
-    public function setIdentificationNoticeboardPage($identificationNoticeboardPage)
-    {
-        $this->identificationNoticeboardPage = $identificationNoticeboardPage;
-
-        return $this;
-    }
-
-    public function setIdentificationNoticeboardWebserviceEndpoint(string $identificationNoticeboardWebserviceEndpoint
-    ): SiteConfiguration {
-        $this->identificationNoticeboardWebserviceEndpoint = $identificationNoticeboardWebserviceEndpoint;
-
-        return $this;
-    }
-
-    public function getIdentificationNoticeboardWebserviceEndpoint(): string
-    {
-        return $this->identificationNoticeboardWebserviceEndpoint;
-    }
-
-    public function isRegistrationAllowed(): bool
-    {
-        return $this->registrationAllowed;
-    }
-
-    public function setRegistrationAllowed(bool $registrationAllowed): SiteConfiguration
-    {
-        $this->registrationAllowed = $registrationAllowed;
-
-        return $this;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getCspReportUri()
-    {
-        return $this->cspReportUri;
-    }
-
-    /**
-     * @param string|null $cspReportUri
-     *
-     * @return SiteConfiguration
-     */
-    public function setCspReportUri($cspReportUri)
-    {
-        $this->cspReportUri = $cspReportUri;
-
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getResourceCacheEpoch(): int
-    {
-        return $this->resourceCacheEpoch;
-    }
-
-    /**
-     * @param int $resourceCacheEpoch
-     *
-     * @return SiteConfiguration
-     */
-    public function setResourceCacheEpoch(int $resourceCacheEpoch): SiteConfiguration
-    {
-        $this->resourceCacheEpoch = $resourceCacheEpoch;
-
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getCommonEmailDomains(): array
-    {
-        return $this->commonEmailDomains;
-    }
-
-    /**
-     * @param array $commonEmailDomains
-     *
-     * @return SiteConfiguration
-     */
-    public function setCommonEmailDomains(array $commonEmailDomains): SiteConfiguration
-    {
-        $this->commonEmailDomains = $commonEmailDomains;
-
-        return $this;
-    }
-
-    /**
-     * @param int[] $banMaxIpBlockRange
-     *
-     * @return SiteConfiguration
-     */
-    public function setBanMaxIpBlockRange(array $banMaxIpBlockRange): SiteConfiguration
-    {
-        $this->banMaxIpBlockRange = $banMaxIpBlockRange;
-
-        return $this;
-    }
-
-    /**
-     * @return int[]
-     */
-    public function getBanMaxIpBlockRange(): array
-    {
-        return $this->banMaxIpBlockRange;
-    }
-
-    /**
-     * @param int[] $banMaxIpRange
-     *
-     * @return SiteConfiguration
-     */
-    public function setBanMaxIpRange(array $banMaxIpRange): SiteConfiguration
-    {
-        $this->banMaxIpRange = $banMaxIpRange;
-
-        return $this;
-    }
-
-    /**
-     * @return int[]
-     */
-    public function getBanMaxIpRange(): array
-    {
-        return $this->banMaxIpRange;
-    }
-
-    /**
-     * @param array $oauthLegacyConsumerTokens
-     *
-     * @return SiteConfiguration
-     */
-    public function setOauthLegacyConsumerTokens(array $oauthLegacyConsumerTokens): SiteConfiguration
-    {
-        $this->oauthLegacyConsumerTokens = $oauthLegacyConsumerTokens;
-
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getOauthLegacyConsumerTokens(): array
-    {
-        return $this->oauthLegacyConsumerTokens;
-    }
-
-    /**
-     * @return int
-     */
-    public function getJobQueueBatchSize(): int
-    {
-        return $this->jobQueueBatchSize;
-    }
-
-    /**
-     * @param int $jobQueueBatchSize
-     *
-     * @return SiteConfiguration
-     */
-    public function setJobQueueBatchSize(int $jobQueueBatchSize): SiteConfiguration
-    {
-        $this->jobQueueBatchSize = $jobQueueBatchSize;
-
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getAmqpConfiguration(): array
-    {
-        return $this->amqpConfiguration;
-    }
-
-    /**
-     * @param array $amqpConfiguration
-     *
-     * @return SiteConfiguration
-     */
-    public function setAmqpConfiguration(array $amqpConfiguration): SiteConfiguration
-    {
-        $this->amqpConfiguration = $amqpConfiguration;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEmailSender(): string
-    {
-        return $this->emailSender;
-    }
-
-    /**
-     * @param string $emailSender
-     *
-     * @return SiteConfiguration
-     */
-    public function setEmailSender(string $emailSender): SiteConfiguration
-    {
-        $this->emailSender = $emailSender;
-
-        return $this;
-    }
-
-    /**
-     * @param array $acceptClientHints
-     *
-     * @return SiteConfiguration
-     */
-    public function setAcceptClientHints(array $acceptClientHints): SiteConfiguration
-    {
-        $this->acceptClientHints = $acceptClientHints;
-
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getAcceptClientHints(): array
-    {
-        return $this->acceptClientHints;
-    }
-
-    public function setCookiePath(string $cookiePath): SiteConfiguration
-    {
-        $this->cookiePath = $cookiePath;
-
-        return $this;
-    }
-
-    public function getCookiePath(): string
-    {
-        return $this->cookiePath;
-    }
-
-    public function setCookieSessionName(string $cookieSessionName): SiteConfiguration
-    {
-        $this->cookieSessionName = $cookieSessionName;
-
-        return $this;
-    }
-
-    public function getCookieSessionName(): string
-    {
-        return $this->cookieSessionName;
-    }
-
-    public function setOffline(array $offline): SiteConfiguration
-    {
-        $this->offline = $offline;
-
-        return $this;
-    }
-
-    public function getOffline(): array
-    {
-        return $this->offline;
-    }
-
-    public function setDatabaseConfig(array $databaseConfig): SiteConfiguration
-    {
-        $this->databaseConfig = $databaseConfig;
-
-        return $this;
-    }
-
-    public function getDatabaseConfig(): array
-    {
-        return $this->databaseConfig;
-    }
-
-    public function getPrivacyStatementPath(): string
-    {
-        return $this->privacyStatementPath;
-    }
-
-    public function setPrivacyStatementPath(string $privacyStatementPath): SiteConfiguration
-    {
-        $this->privacyStatementPath = $privacyStatementPath;
-
-        return $this;
-    }
+	private $baseUrl = 'https://accounts.wmflabs.org';
+	private $filePath = __DIR__ . '/..';
+	private $schemaVersion = 51;
+	private $debuggingTraceEnabled = false;
+	private $debuggingCssBreakpointsEnabled = false;
+	private $dataClearIp = '127.0.0.1';
+	private $dataClearEmail = 'acc@toolserver.org';
+	private $dataClearInterval = '15 DAY';
+	private $forceIdentification = true;
+	private $identificationCacheExpiry = '1 DAY';
+	private $metaWikimediaWebServiceEndpoint = 'https://meta.wikimedia.org/w/api.php';
+	private $enforceOAuth = false;
+	private $emailConfirmationEnabled = true;
+	private $emailConfirmationExpiryDays = 7;
+	private $miserModeLimit = 25;
+	private $squidList = array();
+	private $useStrictTransportSecurity = false;
+	private $userAgent = 'Wikipedia-ACC Tool/0.1 (+https://accounts.wmflabs.org/internal.php/team)';
+	private $curlDisableVerifyPeer = false;
+	private $useOAuthSignup = true;
+	private $oauthConsumerToken;
+	/** @var array */
+	private $oauthLegacyConsumerTokens;
+	private $oauthConsumerSecret;
+	private $oauthIdentityGraceTime = '24 hours';
+	private $oauthMediaWikiCanonicalServer = 'https://en.wikipedia.org';
+	private $xffTrustedHostsFile = '../TrustedXFF/trusted-hosts.txt';
+	private $crossOriginResourceSharingHosts = array(
+		"https://en.wikipedia.org",
+		"https://meta.wikimedia.org",
+	);
+	private $ircNotificationsEnabled = true;
+	private $ircNotificationsInstance = 'Development';
+	private $errorLog = 'errorlog';
+	private $titleBlacklistEnabled = false;
+	/** @var null|string $locationProviderApiKey */
+	private $locationProviderApiKey = null;
+	private $torExitPaths = array();
+	private $creationBotUsername = '';
+	private $creationBotPassword = '';
+	private $curlCookieJar = __DIR__ . '/../../cookies.txt';
+	private $yubicoApiId = 0;
+	private $yubicoApiKey = "";
+	private $totpEncryptionKey = "1234";
+	private $identificationNoticeboardPage = 'Access to nonpublic personal data policy/Noticeboard';
+	private $identificationNoticeboardWebserviceEndpoint = 'https://meta.wikimedia.org/w/api.php';
+	private $registrationAllowed = true;
+	private $cspReportUri = null;
+	private $resourceCacheEpoch = 1;
+	private $commonEmailDomains = ['gmail.com', 'hotmail.com', 'outlook.com'];
+	private $banMaxIpBlockRange = [4 => 20, 6 => 48];
+	private $banMaxIpRange = [4 => 16, 6 => 32];
+	private $jobQueueBatchSize = 10;
+	private $amqpConfiguration = ['host' => 'localhost', 'port' => 5672, 'user' => 'guest', 'password' => 'guest', 'vhost' => '/', 'exchange' => '', 'tls' => false];
+	private $emailSender = 'accounts@wmflabs.org';
+	private $acceptClientHints = [];
+	private string $cookiePath = '/';
+	private string $cookieSessionName = 'ACC';
+	private array $offline = ['offline' => false, 'reason' => '', 'culprit' => ''];
+	private array $databaseConfig = [
+		'datasource' => 'mysql:host=localhost;dbname=waca',
+		'username' => 'waca',
+		'password' => 'waca'
+	];
+	private string $privacyStatementPath = '';
+
+	/**
+	 * Gets the base URL of the tool
+	 *
+	 * If the internal page of the tool is at http://localhost/path/internal.php, this would be set to
+	 * http://localhost/path
+	 * @return string
+	 */
+	public function getBaseUrl()
+	{
+		return $this->baseUrl;
+	}
+
+	/**
+	 * @param string $baseUrl
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setBaseUrl($baseUrl)
+	{
+		$this->baseUrl = $baseUrl;
+
+		return $this;
+	}
+
+	/**
+	 * Path on disk to the directory containing the tool's code
+	 * @return string
+	 */
+	public function getFilePath()
+	{
+		return $this->filePath;
+	}
+
+	/**
+	 * @param string $filePath
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setFilePath($filePath)
+	{
+		$this->filePath = $filePath;
+
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getSchemaVersion()
+	{
+		return $this->schemaVersion;
+	}
+
+	/**
+	 * @param int $schemaVersion
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setSchemaVersion($schemaVersion)
+	{
+		$this->schemaVersion = $schemaVersion;
+
+		return $this;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getDebuggingTraceEnabled()
+	{
+		return $this->debuggingTraceEnabled;
+	}
+
+	/**
+	 * @param mixed $debuggingTraceEnabled
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setDebuggingTraceEnabled($debuggingTraceEnabled)
+	{
+		$this->debuggingTraceEnabled = $debuggingTraceEnabled;
+
+		return $this;
+	}
+
+	public function getDebuggingCssBreakpointsEnabled() : bool
+	{
+		return $this->debuggingCssBreakpointsEnabled;
+	}
+
+	public function setDebuggingCssBreakpointsEnabled(bool $debuggingCssBreakpointsEnabled) : SiteConfiguration
+	{
+		$this->debuggingCssBreakpointsEnabled = $debuggingCssBreakpointsEnabled;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDataClearIp()
+	{
+		return $this->dataClearIp;
+	}
+
+	/**
+	 * @param string $dataClearIp
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setDataClearIp($dataClearIp)
+	{
+		$this->dataClearIp = $dataClearIp;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDataClearEmail()
+	{
+		return $this->dataClearEmail;
+	}
+
+	/**
+	 * @param string $dataClearEmail
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setDataClearEmail($dataClearEmail)
+	{
+		$this->dataClearEmail = $dataClearEmail;
+
+		return $this;
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public function getForceIdentification()
+	{
+		return $this->forceIdentification;
+	}
+
+	/**
+	 * @param boolean $forceIdentification
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setForceIdentification($forceIdentification)
+	{
+		$this->forceIdentification = $forceIdentification;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getIdentificationCacheExpiry()
+	{
+		return $this->identificationCacheExpiry;
+	}
+
+	/**
+	 * @param string $identificationCacheExpiry
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setIdentificationCacheExpiry($identificationCacheExpiry)
+	{
+		$this->identificationCacheExpiry = $identificationCacheExpiry;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getMetaWikimediaWebServiceEndpoint()
+	{
+		return $this->metaWikimediaWebServiceEndpoint;
+	}
+
+	/**
+	 * @param string $metaWikimediaWebServiceEndpoint
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setMetaWikimediaWebServiceEndpoint($metaWikimediaWebServiceEndpoint)
+	{
+		$this->metaWikimediaWebServiceEndpoint = $metaWikimediaWebServiceEndpoint;
+
+		return $this;
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public function getEnforceOAuth()
+	{
+		return $this->enforceOAuth;
+	}
+
+	/**
+	 * @param boolean $enforceOAuth
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setEnforceOAuth($enforceOAuth)
+	{
+		$this->enforceOAuth = $enforceOAuth;
+
+		return $this;
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public function getEmailConfirmationEnabled()
+	{
+		return $this->emailConfirmationEnabled;
+	}
+
+	/**
+	 * @param boolean $emailConfirmationEnabled
+	 *
+	 * @return $this
+	 */
+	public function setEmailConfirmationEnabled($emailConfirmationEnabled)
+	{
+		$this->emailConfirmationEnabled = $emailConfirmationEnabled;
+
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getMiserModeLimit()
+	{
+		return $this->miserModeLimit;
+	}
+
+	/**
+	 * @param int $miserModeLimit
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setMiserModeLimit($miserModeLimit)
+	{
+		$this->miserModeLimit = $miserModeLimit;
+
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getSquidList()
+	{
+		return $this->squidList;
+	}
+
+	/**
+	 * @param array $squidList
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setSquidList($squidList)
+	{
+		$this->squidList = $squidList;
+
+		return $this;
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public function getUseStrictTransportSecurity()
+	{
+		return $this->useStrictTransportSecurity;
+	}
+
+	/**
+	 * @param boolean $useStrictTransportSecurity
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setUseStrictTransportSecurity($useStrictTransportSecurity)
+	{
+		$this->useStrictTransportSecurity = $useStrictTransportSecurity;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUserAgent()
+	{
+		return $this->userAgent;
+	}
+
+	/**
+	 * @param string $userAgent
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setUserAgent($userAgent)
+	{
+		$this->userAgent = $userAgent;
+
+		return $this;
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public function getCurlDisableVerifyPeer()
+	{
+		return $this->curlDisableVerifyPeer;
+	}
+
+	/**
+	 * @param boolean $curlDisableVerifyPeer
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setCurlDisableVerifyPeer($curlDisableVerifyPeer)
+	{
+		$this->curlDisableVerifyPeer = $curlDisableVerifyPeer;
+
+		return $this;
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public function getUseOAuthSignup()
+	{
+		return $this->useOAuthSignup;
+	}
+
+	/**
+	 * @param boolean $useOAuthSignup
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setUseOAuthSignup($useOAuthSignup)
+	{
+		$this->useOAuthSignup = $useOAuthSignup;
+
+		return $this;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getOAuthConsumerToken()
+	{
+		return $this->oauthConsumerToken;
+	}
+
+	/**
+	 * @param mixed $oauthConsumerToken
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setOAuthConsumerToken($oauthConsumerToken)
+	{
+		$this->oauthConsumerToken = $oauthConsumerToken;
+
+		return $this;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getOAuthConsumerSecret()
+	{
+		return $this->oauthConsumerSecret;
+	}
+
+	/**
+	 * @param mixed $oauthConsumerSecret
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setOAuthConsumerSecret($oauthConsumerSecret)
+	{
+		$this->oauthConsumerSecret = $oauthConsumerSecret;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDataClearInterval()
+	{
+		return $this->dataClearInterval;
+	}
+
+	/**
+	 * @param string $dataClearInterval
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setDataClearInterval($dataClearInterval)
+	{
+		$this->dataClearInterval = $dataClearInterval;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getXffTrustedHostsFile()
+	{
+		return $this->xffTrustedHostsFile;
+	}
+
+	/**
+	 * @param string $xffTrustedHostsFile
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setXffTrustedHostsFile($xffTrustedHostsFile)
+	{
+		$this->xffTrustedHostsFile = $xffTrustedHostsFile;
+
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getCrossOriginResourceSharingHosts()
+	{
+		return $this->crossOriginResourceSharingHosts;
+	}
+
+	/**
+	 * @param array $crossOriginResourceSharingHosts
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setCrossOriginResourceSharingHosts($crossOriginResourceSharingHosts)
+	{
+		$this->crossOriginResourceSharingHosts = $crossOriginResourceSharingHosts;
+
+		return $this;
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public function getIrcNotificationsEnabled()
+	{
+		return $this->ircNotificationsEnabled;
+	}
+
+	/**
+	 * @param boolean $ircNotificationsEnabled
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setIrcNotificationsEnabled($ircNotificationsEnabled)
+	{
+		$this->ircNotificationsEnabled = $ircNotificationsEnabled;
+
+		return $this;
+	}
+
+	/**
+	 * @param string $errorLog
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setErrorLog($errorLog)
+	{
+		$this->errorLog = $errorLog;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getErrorLog()
+	{
+		return $this->errorLog;
+	}
+
+	/**
+	 * @param int $emailConfirmationExpiryDays
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setEmailConfirmationExpiryDays($emailConfirmationExpiryDays)
+	{
+		$this->emailConfirmationExpiryDays = $emailConfirmationExpiryDays;
+
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getEmailConfirmationExpiryDays()
+	{
+		return $this->emailConfirmationExpiryDays;
+	}
+
+	/**
+	 * @param string $ircNotificationsInstance
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setIrcNotificationsInstance($ircNotificationsInstance)
+	{
+		$this->ircNotificationsInstance = $ircNotificationsInstance;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getIrcNotificationsInstance()
+	{
+		return $this->ircNotificationsInstance;
+	}
+
+	/**
+	 * @param boolean $titleBlacklistEnabled
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setTitleBlacklistEnabled($titleBlacklistEnabled)
+	{
+		$this->titleBlacklistEnabled = $titleBlacklistEnabled;
+
+		return $this;
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public function getTitleBlacklistEnabled()
+	{
+		return $this->titleBlacklistEnabled;
+	}
+
+	/**
+	 * @param string|null $locationProviderApiKey
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setLocationProviderApiKey($locationProviderApiKey)
+	{
+		$this->locationProviderApiKey = $locationProviderApiKey;
+
+		return $this;
+	}
+
+	/**
+	 * @return null|string
+	 */
+	public function getLocationProviderApiKey()
+	{
+		return $this->locationProviderApiKey;
+	}
+
+	/**
+	 * @param array $torExitPaths
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setTorExitPaths($torExitPaths)
+	{
+		$this->torExitPaths = $torExitPaths;
+
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getTorExitPaths()
+	{
+		return $this->torExitPaths;
+	}
+
+	/**
+	 * @param string $oauthIdentityGraceTime
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setOauthIdentityGraceTime($oauthIdentityGraceTime)
+	{
+		$this->oauthIdentityGraceTime = $oauthIdentityGraceTime;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getOauthIdentityGraceTime()
+	{
+		return $this->oauthIdentityGraceTime;
+	}
+
+	/**
+	 * @param string $oauthMediaWikiCanonicalServer
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setOauthMediaWikiCanonicalServer($oauthMediaWikiCanonicalServer)
+	{
+		$this->oauthMediaWikiCanonicalServer = $oauthMediaWikiCanonicalServer;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getOauthMediaWikiCanonicalServer()
+	{
+		return $this->oauthMediaWikiCanonicalServer;
+	}
+
+	/**
+	 * @param string $creationBotUsername
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setCreationBotUsername($creationBotUsername)
+	{
+		$this->creationBotUsername = $creationBotUsername;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getCreationBotUsername()
+	{
+		return $this->creationBotUsername;
+	}
+
+	/**
+	 * @param string $creationBotPassword
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setCreationBotPassword($creationBotPassword)
+	{
+		$this->creationBotPassword = $creationBotPassword;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getCreationBotPassword()
+	{
+		return $this->creationBotPassword;
+	}
+
+	/**
+	 * @param string|null $curlCookieJar
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setCurlCookieJar($curlCookieJar)
+	{
+		$this->curlCookieJar = $curlCookieJar;
+
+		return $this;
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getCurlCookieJar()
+	{
+		return $this->curlCookieJar;
+	}
+
+	public function getYubicoApiId()
+	{
+		return $this->yubicoApiId;
+	}
+
+	public function setYubicoApiId($id)
+	{
+		$this->yubicoApiId = $id;
+
+		return $this;
+	}
+
+	public function getYubicoApiKey()
+	{
+		return $this->yubicoApiKey;
+	}
+
+	public function setYubicoApiKey($key)
+	{
+		$this->yubicoApiKey = $key;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getTotpEncryptionKey()
+	{
+		return $this->totpEncryptionKey;
+	}
+
+	/**
+	 * @param string $totpEncryptionKey
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setTotpEncryptionKey($totpEncryptionKey)
+	{
+		$this->totpEncryptionKey = $totpEncryptionKey;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getIdentificationNoticeboardPage()
+	{
+		return $this->identificationNoticeboardPage;
+	}
+
+	/**
+	 * @param string $identificationNoticeboardPage
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setIdentificationNoticeboardPage($identificationNoticeboardPage)
+	{
+		$this->identificationNoticeboardPage = $identificationNoticeboardPage;
+
+		return $this;
+	}
+
+	public function setIdentificationNoticeboardWebserviceEndpoint(string $identificationNoticeboardWebserviceEndpoint
+	): SiteConfiguration {
+		$this->identificationNoticeboardWebserviceEndpoint = $identificationNoticeboardWebserviceEndpoint;
+
+		return $this;
+	}
+
+	public function getIdentificationNoticeboardWebserviceEndpoint(): string
+	{
+		return $this->identificationNoticeboardWebserviceEndpoint;
+	}
+
+	public function isRegistrationAllowed(): bool
+	{
+		return $this->registrationAllowed;
+	}
+
+	public function setRegistrationAllowed(bool $registrationAllowed): SiteConfiguration
+	{
+		$this->registrationAllowed = $registrationAllowed;
+
+		return $this;
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getCspReportUri()
+	{
+		return $this->cspReportUri;
+	}
+
+	/**
+	 * @param string|null $cspReportUri
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setCspReportUri($cspReportUri)
+	{
+		$this->cspReportUri = $cspReportUri;
+
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getResourceCacheEpoch(): int
+	{
+		return $this->resourceCacheEpoch;
+	}
+
+	/**
+	 * @param int $resourceCacheEpoch
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setResourceCacheEpoch(int $resourceCacheEpoch): SiteConfiguration
+	{
+		$this->resourceCacheEpoch = $resourceCacheEpoch;
+
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getCommonEmailDomains(): array
+	{
+		return $this->commonEmailDomains;
+	}
+
+	/**
+	 * @param array $commonEmailDomains
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setCommonEmailDomains(array $commonEmailDomains): SiteConfiguration
+	{
+		$this->commonEmailDomains = $commonEmailDomains;
+
+		return $this;
+	}
+
+	/**
+	 * @param int[] $banMaxIpBlockRange
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setBanMaxIpBlockRange(array $banMaxIpBlockRange): SiteConfiguration
+	{
+		$this->banMaxIpBlockRange = $banMaxIpBlockRange;
+
+		return $this;
+	}
+
+	/**
+	 * @return int[]
+	 */
+	public function getBanMaxIpBlockRange(): array
+	{
+		return $this->banMaxIpBlockRange;
+	}
+
+	/**
+	 * @param int[] $banMaxIpRange
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setBanMaxIpRange(array $banMaxIpRange): SiteConfiguration
+	{
+		$this->banMaxIpRange = $banMaxIpRange;
+
+		return $this;
+	}
+
+	/**
+	 * @return int[]
+	 */
+	public function getBanMaxIpRange(): array
+	{
+		return $this->banMaxIpRange;
+	}
+
+	/**
+	 * @param array $oauthLegacyConsumerTokens
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setOauthLegacyConsumerTokens(array $oauthLegacyConsumerTokens): SiteConfiguration
+	{
+		$this->oauthLegacyConsumerTokens = $oauthLegacyConsumerTokens;
+
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getOauthLegacyConsumerTokens(): array
+	{
+		return $this->oauthLegacyConsumerTokens;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getJobQueueBatchSize(): int
+	{
+		return $this->jobQueueBatchSize;
+	}
+
+	/**
+	 * @param int $jobQueueBatchSize
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setJobQueueBatchSize(int $jobQueueBatchSize): SiteConfiguration
+	{
+		$this->jobQueueBatchSize = $jobQueueBatchSize;
+
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getAmqpConfiguration(): array
+	{
+		return $this->amqpConfiguration;
+	}
+
+	/**
+	 * @param array $amqpConfiguration
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setAmqpConfiguration(array $amqpConfiguration): SiteConfiguration
+	{
+		$this->amqpConfiguration = $amqpConfiguration;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getEmailSender(): string
+	{
+		return $this->emailSender;
+	}
+
+	/**
+	 * @param string $emailSender
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setEmailSender(string $emailSender): SiteConfiguration
+	{
+		$this->emailSender = $emailSender;
+
+		return $this;
+	}
+
+	/**
+	 * @param array $acceptClientHints
+	 *
+	 * @return SiteConfiguration
+	 */
+	public function setAcceptClientHints(array $acceptClientHints): SiteConfiguration
+	{
+		$this->acceptClientHints = $acceptClientHints;
+
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getAcceptClientHints(): array
+	{
+		return $this->acceptClientHints;
+	}
+
+	public function setCookiePath(string $cookiePath): SiteConfiguration
+	{
+		$this->cookiePath = $cookiePath;
+
+		return $this;
+	}
+
+	public function getCookiePath(): string
+	{
+		return $this->cookiePath;
+	}
+
+	public function setCookieSessionName(string $cookieSessionName): SiteConfiguration
+	{
+		$this->cookieSessionName = $cookieSessionName;
+
+		return $this;
+	}
+
+	public function getCookieSessionName(): string
+	{
+		return $this->cookieSessionName;
+	}
+
+	public function setOffline(array $offline): SiteConfiguration
+	{
+		$this->offline = $offline;
+
+		return $this;
+	}
+
+	public function getOffline(): array
+	{
+		return $this->offline;
+	}
+
+	public function setDatabaseConfig(array $databaseConfig): SiteConfiguration
+	{
+		$this->databaseConfig = $databaseConfig;
+
+		return $this;
+	}
+
+	public function getDatabaseConfig(): array
+	{
+		return $this->databaseConfig;
+	}
+
+	public function getPrivacyStatementPath(): string
+	{
+		return $this->privacyStatementPath;
+	}
+
+	public function setPrivacyStatementPath(string $privacyStatementPath): SiteConfiguration
+	{
+		$this->privacyStatementPath = $privacyStatementPath;
+
+		return $this;
+	}
 }