mdaniels5757 / waca

smarty-plugins/function.defaultsort.php

Indentation +15 added lines, -15 removed lines

@@ -19,24 +19,24 @@
  */
 function smarty_function_defaultsort($params, Template $template)
 {
-    if (empty($params['id'])) {
-        return "";
-    }
+	if (empty($params['id'])) {
+		return "";
+	}
 
-    $attr = 'data-sortname="' . htmlspecialchars($params['id'], ENT_QUOTES) . '"';
+	$attr = 'data-sortname="' . htmlspecialchars($params['id'], ENT_QUOTES) . '"';
 
-    if (empty($params['req'])) {
-        return $attr;
-    }
+	if (empty($params['req'])) {
+		return $attr;
+	}
 
-    if ($params['dir'] !== 'asc' && $params['dir'] !== 'desc') {
-        $params['dir'] = 'asc';
-    }
+	if ($params['dir'] !== 'asc' && $params['dir'] !== 'desc') {
+		$params['dir'] = 'asc';
+	}
 
-    $sort = '';
-    if ($params['req'] === $params['id']) {
-        $sort = ' data-defaultsort="' . htmlspecialchars($params['dir'], ENT_QUOTES) . '"';
-    }
+	$sort = '';
+	if ($params['req'] === $params['id']) {
+		$sort = ' data-defaultsort="' . htmlspecialchars($params['dir'], ENT_QUOTES) . '"';
+	}
 
-    return $attr . $sort;
+	return $attr . $sort;
 }

includes/WebStart.php

Braces +1 added lines, -2 removed lines

@@ -91,8 +91,7 @@
 
                 if ($siteConfiguration->getTitleBlacklistEnabled()) {
                     $page->setBlacklistHelper(new BlacklistHelper($httpHelper, $database, $siteConfiguration));
-                }
-                else {
+                } else {
                     $page->setBlacklistHelper(new FakeBlacklistHelper());
                 }
             }

Indentation +210 added lines, -210 removed lines

@@ -35,214 +35,214 @@
  */
 class WebStart extends ApplicationBase
 {
-    /**
-     * @var IRequestRouter $requestRouter The request router to use. Note that different entry points have different
-     *                                    routers and hence different URL mappings
-     */
-    private $requestRouter;
-    /**
-     * @var bool $isPublic Determines whether to use public interface objects or internal interface objects
-     */
-    private bool $isPublic = false;
-
-    /**
-     * WebStart constructor.
-     *
-     * @param SiteConfiguration $configuration The site configuration
-     * @param IRequestRouter    $router        The request router to use
-     */
-    public function __construct(SiteConfiguration $configuration, IRequestRouter $router)
-    {
-        parent::__construct($configuration);
-
-        $this->requestRouter = $router;
-    }
-
-    /**
-     * @param ITask             $page
-     * @param SiteConfiguration $siteConfiguration
-     * @param PdoDatabase       $database
-     *
-     * @return void
-     */
-    protected function setupHelpers(
-        ITask $page,
-        SiteConfiguration $siteConfiguration,
-        PdoDatabase $database
-    ) {
-        parent::setupHelpers($page, $siteConfiguration, $database);
-
-        if ($page instanceof PageBase) {
-            $page->setTokenManager(new TokenManager());
-            $page->setCspManager(new ContentSecurityPolicyManager($siteConfiguration));
-
-            if ($page instanceof InternalPageBase) {
-                $page->setTypeAheadHelper(new TypeAheadHelper());
-
-                $httpHelper = $page->getHttpHelper();
-
-                $userAccessLoader = new UserAccessLoader();
-                $domainAccessManager = new DomainAccessManager($userAccessLoader);
-
-                $identificationVerifier = new IdentificationVerifier($httpHelper, $siteConfiguration, $database);
-
-                $roleConfiguration = new RoleConfiguration($siteConfiguration->getGlobalDenyRole());
-                $page->setSecurityManager(new SecurityManager($identificationVerifier, $roleConfiguration, $userAccessLoader));
-                $page->setDomainAccessManager($domainAccessManager);
-
-                if ($siteConfiguration->getTitleBlacklistEnabled()) {
-                    $page->setBlacklistHelper(new BlacklistHelper($httpHelper, $database, $siteConfiguration));
-                }
-                else {
-                    $page->setBlacklistHelper(new FakeBlacklistHelper());
-                }
-            }
-        }
-    }
-
-    /**
-     * Application entry point.
-     *
-     * Sets up the environment and runs the application, performing any global cleanup operations when done.
-     */
-    public function run()
-    {
-        try {
-            if ($this->setupEnvironment()) {
-                $this->main();
-            }
-        }
-        catch (EnvironmentException $ex) {
-            ob_end_clean();
-            print Offline::getOfflineMessage($this->isPublic(), $this->getConfiguration(), $ex->getMessage());
-        }
-            /** @noinspection PhpRedundantCatchClauseInspection */
-        catch (ReadableException $ex) {
-            ob_end_clean();
-            print $ex->getReadableError();
-        }
-        finally {
-            $this->cleanupEnvironment();
-        }
-    }
-
-    /**
-     * Environment setup
-     *
-     * This method initialises the tool environment. If the tool cannot be initialised correctly, it will return false
-     * and shut down prematurely.
-     *
-     * @return bool
-     * @throws EnvironmentException
-     */
-    protected function setupEnvironment()
-    {
-        // initialise global exception handler
-        set_exception_handler(array(ExceptionHandler::class, 'exceptionHandler'));
-        set_error_handler(array(ExceptionHandler::class, 'errorHandler'), E_RECOVERABLE_ERROR);
-
-        // start output buffering if necessary
-        if (ob_get_level() === 0) {
-            ob_start();
-        }
-
-        // initialise super-global providers
-        WebRequest::setGlobalStateProvider(new GlobalStateProvider());
-
-        if (Offline::isOffline($this->getConfiguration())) {
-            print Offline::getOfflineMessage($this->isPublic(), $this->getConfiguration());
-            ob_end_flush();
-
-            return false;
-        }
-
-        // Call parent setup
-        if (!parent::setupEnvironment()) {
-            return false;
-        }
-
-        // Start up sessions
-        ini_set('session.cookie_path', $this->getConfiguration()->getCookiePath());
-        ini_set('session.name', $this->getConfiguration()->getCookieSessionName());
-        Session::start();
-
-        // Check the user is allowed to be logged in still. This must be before we call any user-loading functions and
-        // get the current user cached.
-        // I'm not sure if this function call being here is particularly a good thing, but it's part of starting up a
-        // session I suppose.
-        $this->checkForceLogout();
-
-        // environment initialised!
-        return true;
-    }
-
-    /**
-     * Main application logic
-     */
-    protected function main()
-    {
-        // Get the right route for the request
-        $page = $this->requestRouter->route();
-
-        $siteConfiguration = $this->getConfiguration();
-        $database = PdoDatabase::getDatabaseConnection($this->getConfiguration());
-
-        $this->setupHelpers($page, $siteConfiguration, $database);
-
-        // run the route code for the request.
-        $page->execute();
-    }
-
-    /**
-     * Any cleanup tasks should go here
-     *
-     * Note that we need to be very careful here, as exceptions may have been thrown and handled.
-     * This should *only* be for cleaning up, no logic should go here.
-     */
-    protected function cleanupEnvironment()
-    {
-        // Clean up anything we splurged after sending the page.
-        if (ob_get_level() > 0) {
-            for ($i = ob_get_level(); $i > 0; $i--) {
-                ob_end_clean();
-            }
-        }
-    }
-
-    private function checkForceLogout()
-    {
-        $database = PdoDatabase::getDatabaseConnection($this->getConfiguration());
-
-        $sessionUserId = WebRequest::getSessionUserId();
-        iF ($sessionUserId === null) {
-            return;
-        }
-
-        // Note, User::getCurrent() caches it's result, which we *really* don't want to trigger.
-        $currentUser = User::getById($sessionUserId, $database);
-
-        if ($currentUser === false) {
-            // Umm... this user has a session cookie with a userId set, but no user exists...
-            Session::restart();
-
-            $currentUser = User::getCurrent($database);
-        }
-
-        if ($currentUser->getForceLogout()) {
-            Session::restart();
-
-            $currentUser->setForceLogout(false);
-            $currentUser->save();
-        }
-    }
-
-    public function isPublic(): bool
-    {
-        return $this->isPublic;
-    }
-
-    public function setPublic(bool $isPublic): void
-    {
-        $this->isPublic = $isPublic;
-    }
+	/**
+	 * @var IRequestRouter $requestRouter The request router to use. Note that different entry points have different
+	 *                                    routers and hence different URL mappings
+	 */
+	private $requestRouter;
+	/**
+	 * @var bool $isPublic Determines whether to use public interface objects or internal interface objects
+	 */
+	private bool $isPublic = false;
+
+	/**
+	 * WebStart constructor.
+	 *
+	 * @param SiteConfiguration $configuration The site configuration
+	 * @param IRequestRouter    $router        The request router to use
+	 */
+	public function __construct(SiteConfiguration $configuration, IRequestRouter $router)
+	{
+		parent::__construct($configuration);
+
+		$this->requestRouter = $router;
+	}
+
+	/**
+	 * @param ITask             $page
+	 * @param SiteConfiguration $siteConfiguration
+	 * @param PdoDatabase       $database
+	 *
+	 * @return void
+	 */
+	protected function setupHelpers(
+		ITask $page,
+		SiteConfiguration $siteConfiguration,
+		PdoDatabase $database
+	) {
+		parent::setupHelpers($page, $siteConfiguration, $database);
+
+		if ($page instanceof PageBase) {
+			$page->setTokenManager(new TokenManager());
+			$page->setCspManager(new ContentSecurityPolicyManager($siteConfiguration));
+
+			if ($page instanceof InternalPageBase) {
+				$page->setTypeAheadHelper(new TypeAheadHelper());
+
+				$httpHelper = $page->getHttpHelper();
+
+				$userAccessLoader = new UserAccessLoader();
+				$domainAccessManager = new DomainAccessManager($userAccessLoader);
+
+				$identificationVerifier = new IdentificationVerifier($httpHelper, $siteConfiguration, $database);
+
+				$roleConfiguration = new RoleConfiguration($siteConfiguration->getGlobalDenyRole());
+				$page->setSecurityManager(new SecurityManager($identificationVerifier, $roleConfiguration, $userAccessLoader));
+				$page->setDomainAccessManager($domainAccessManager);
+
+				if ($siteConfiguration->getTitleBlacklistEnabled()) {
+					$page->setBlacklistHelper(new BlacklistHelper($httpHelper, $database, $siteConfiguration));
+				}
+				else {
+					$page->setBlacklistHelper(new FakeBlacklistHelper());
+				}
+			}
+		}
+	}
+
+	/**
+	 * Application entry point.
+	 *
+	 * Sets up the environment and runs the application, performing any global cleanup operations when done.
+	 */
+	public function run()
+	{
+		try {
+			if ($this->setupEnvironment()) {
+				$this->main();
+			}
+		}
+		catch (EnvironmentException $ex) {
+			ob_end_clean();
+			print Offline::getOfflineMessage($this->isPublic(), $this->getConfiguration(), $ex->getMessage());
+		}
+			/** @noinspection PhpRedundantCatchClauseInspection */
+		catch (ReadableException $ex) {
+			ob_end_clean();
+			print $ex->getReadableError();
+		}
+		finally {
+			$this->cleanupEnvironment();
+		}
+	}
+
+	/**
+	 * Environment setup
+	 *
+	 * This method initialises the tool environment. If the tool cannot be initialised correctly, it will return false
+	 * and shut down prematurely.
+	 *
+	 * @return bool
+	 * @throws EnvironmentException
+	 */
+	protected function setupEnvironment()
+	{
+		// initialise global exception handler
+		set_exception_handler(array(ExceptionHandler::class, 'exceptionHandler'));
+		set_error_handler(array(ExceptionHandler::class, 'errorHandler'), E_RECOVERABLE_ERROR);
+
+		// start output buffering if necessary
+		if (ob_get_level() === 0) {
+			ob_start();
+		}
+
+		// initialise super-global providers
+		WebRequest::setGlobalStateProvider(new GlobalStateProvider());
+
+		if (Offline::isOffline($this->getConfiguration())) {
+			print Offline::getOfflineMessage($this->isPublic(), $this->getConfiguration());
+			ob_end_flush();
+
+			return false;
+		}
+
+		// Call parent setup
+		if (!parent::setupEnvironment()) {
+			return false;
+		}
+
+		// Start up sessions
+		ini_set('session.cookie_path', $this->getConfiguration()->getCookiePath());
+		ini_set('session.name', $this->getConfiguration()->getCookieSessionName());
+		Session::start();
+
+		// Check the user is allowed to be logged in still. This must be before we call any user-loading functions and
+		// get the current user cached.
+		// I'm not sure if this function call being here is particularly a good thing, but it's part of starting up a
+		// session I suppose.
+		$this->checkForceLogout();
+
+		// environment initialised!
+		return true;
+	}
+
+	/**
+	 * Main application logic
+	 */
+	protected function main()
+	{
+		// Get the right route for the request
+		$page = $this->requestRouter->route();
+
+		$siteConfiguration = $this->getConfiguration();
+		$database = PdoDatabase::getDatabaseConnection($this->getConfiguration());
+
+		$this->setupHelpers($page, $siteConfiguration, $database);
+
+		// run the route code for the request.
+		$page->execute();
+	}
+
+	/**
+	 * Any cleanup tasks should go here
+	 *
+	 * Note that we need to be very careful here, as exceptions may have been thrown and handled.
+	 * This should *only* be for cleaning up, no logic should go here.
+	 */
+	protected function cleanupEnvironment()
+	{
+		// Clean up anything we splurged after sending the page.
+		if (ob_get_level() > 0) {
+			for ($i = ob_get_level(); $i > 0; $i--) {
+				ob_end_clean();
+			}
+		}
+	}
+
+	private function checkForceLogout()
+	{
+		$database = PdoDatabase::getDatabaseConnection($this->getConfiguration());
+
+		$sessionUserId = WebRequest::getSessionUserId();
+		iF ($sessionUserId === null) {
+			return;
+		}
+
+		// Note, User::getCurrent() caches it's result, which we *really* don't want to trigger.
+		$currentUser = User::getById($sessionUserId, $database);
+
+		if ($currentUser === false) {
+			// Umm... this user has a session cookie with a userId set, but no user exists...
+			Session::restart();
+
+			$currentUser = User::getCurrent($database);
+		}
+
+		if ($currentUser->getForceLogout()) {
+			Session::restart();
+
+			$currentUser->setForceLogout(false);
+			$currentUser->save();
+		}
+	}
+
+	public function isPublic(): bool
+	{
+		return $this->isPublic;
+	}
+
+	public function setPublic(bool $isPublic): void
+	{
+		$this->isPublic = $isPublic;
+	}
 }

includes/Router/RequestRouter.php

Indentation +483 added lines, -483 removed lines

@@ -73,487 +73,487 @@
  */
 class RequestRouter implements IRequestRouter
 {
-    /**
-     * This is the core routing table for the application. The basic idea is:
-     *
-     *      array(
-     *          "foo" =>
-     *              array(
-     *                  "class"   => PageFoo::class,
-     *                  "actions" => array("bar", "other")
-     *              ),
-     * );
-     *
-     * Things to note:
-     *     - If no page is requested, we go to PageMain. PageMain can't have actions defined.
-     *
-     *     - If a page is defined and requested, but no action is requested, go to that page's main() method
-     *     - If a page is defined and requested, and an action is defined and requested, go to that action's method.
-     *     - If a page is defined and requested, and an action NOT defined and requested, go to Page404 and it's main()
-     *       method.
-     *     - If a page is NOT defined and requested, go to Page404 and it's main() method.
-     *
-     *     - Query parameters are ignored.
-     *
-     * The key point here is request routing with validation that this is allowed, before we start hitting the
-     * filesystem through the AutoLoader, and opening random files. Also, so that we validate the action requested
-     * before we start calling random methods through the web UI.
-     *
-     * Examples:
-     * /internal.php                => returns instance of PageMain, routed to main()
-     * /internal.php?query          => returns instance of PageMain, routed to main()
-     * /internal.php/foo            => returns instance of PageFoo, routed to main()
-     * /internal.php/foo?query      => returns instance of PageFoo, routed to main()
-     * /internal.php/foo/bar        => returns instance of PageFoo, routed to bar()
-     * /internal.php/foo/bar?query  => returns instance of PageFoo, routed to bar()
-     * /internal.php/foo/baz        => returns instance of Page404, routed to main()
-     * /internal.php/foo/baz?query  => returns instance of Page404, routed to main()
-     * /internal.php/bar            => returns instance of Page404, routed to main()
-     * /internal.php/bar?query      => returns instance of Page404, routed to main()
-     * /internal.php/bar/baz        => returns instance of Page404, routed to main()
-     * /internal.php/bar/baz?query  => returns instance of Page404, routed to main()
-     *
-     * Take care when changing this - a lot of places rely on the array key for redirects and other links. If you need
-     * to change the key, then you'll likely have to update a lot of files.
-     *
-     * @var array
-     */
-    private $routeMap = array(
-
-        //////////////////////////////////////////////////////////////////////////////////////////////////
-        // Login and registration
-        'logout'                      =>
-            array(
-                'class'   => PageLogout::class,
-                'actions' => array(),
-            ),
-        'login'                       =>
-            array(
-                'class'   => PagePasswordLogin::class,
-                'actions' => array(),
-            ),
-        'login/otp'                   =>
-            array(
-                'class'   => PageOtpLogin::class,
-                'actions' => array(),
-            ),
-        'forgotPassword'              =>
-            array(
-                'class'   => PageForgotPassword::class,
-                'actions' => array('reset'),
-            ),
-        'register'                    =>
-            array(
-                'class'   => PageRegisterOption::class,
-                'actions' => array(),
-            ),
-        'register/standard'           =>
-            array(
-                'class'   => PageRegisterStandard::class,
-                'actions' => array('done'),
-            ),
-        'domainSwitch'                =>
-            array(
-                'class'   => PageDomainSwitch::class,
-                'actions' => array(),
-            ),
-        'login/reactivate'            =>
-            array(
-                'class'   => PageUserReactivate::class,
-                'actions' => array(),
-            ),
-
-        //////////////////////////////////////////////////////////////////////////////////////////////////
-        // Discovery
-        'search'                      =>
-            array(
-                'class'   => PageSearch::class,
-                'actions' => array(),
-            ),
-        'logs'                        =>
-            array(
-                'class'   => PageLog::class,
-                'actions' => array(),
-            ),
-
-        //////////////////////////////////////////////////////////////////////////////////////////////////
-        // Administration
-        'bans'                        =>
-            array(
-                'class'   => PageBan::class,
-                'actions' => array('set', 'remove', 'show', 'replace'),
-            ),
-        'userManagement'              =>
-            array(
-                'class'   => PageUserManagement::class,
-                'actions' => array(
-                    'approve',
-                    'deactivate',
-                    'rename',
-                    'editUser',
-                    'editRoles',
-                ),
-            ),
-        'siteNotice'                  =>
-            array(
-                'class'   => PageSiteNotice::class,
-                'actions' => array(),
-            ),
-        'emailManagement'             =>
-            array(
-                'class'   => PageEmailManagement::class,
-                'actions' => array('create', 'edit', 'view'),
-            ),
-        'queueManagement'             =>
-            array(
-                'class'   => PageQueueManagement::class,
-                'actions' => array('create', 'edit'),
-            ),
-        'requestFormManagement'       =>
-            array(
-                'class'   => PageRequestFormManagement::class,
-                'actions' => array('create', 'edit', 'view', 'preview'),
-            ),
-        'jobQueue'                    =>
-            array(
-                'class'   => PageJobQueue::class,
-                'actions' => array('acknowledge', 'requeue', 'view', 'all', 'cancel'),
-            ),
-        'domainManagement'            =>
-            array(
-                'class'   => PageDomainManagement::class,
-                'actions' => array('create', 'edit'),
-            ),
-        'flaggedComments'             =>
-            array(
-                'class'   => PageListFlaggedComments::class,
-                'actions' => array(),
-            ),
-
-        //////////////////////////////////////////////////////////////////////////////////////////////////
-        // Personal preferences
-        'preferences'                 =>
-            array(
-                'class'   => PagePreferences::class,
-                'actions' => array(
-                    'refreshOAuth'
-                ),
-            ),
-        'changePassword'              =>
-            array(
-                'class'   => PageChangePassword::class,
-                'actions' => array(),
-            ),
-        'multiFactor'                 =>
-            array(
-                'class'   => PageMultiFactor::class,
-                'actions' => array(
-                    'scratch',
-                    'enableYubikeyOtp',
-                    'disableYubikeyOtp',
-                    'enableTotp',
-                    'disableTotp',
-                ),
-            ),
-        'oauth'                       =>
-            array(
-                'class'   => PageOAuth::class,
-                'actions' => array('detach', 'attach'),
-            ),
-        'oauth/callback'              =>
-            array(
-                'class'   => PageOAuthCallback::class,
-                'actions' => array('authorise', 'create'),
-            ),
-
-        //////////////////////////////////////////////////////////////////////////////////////////////////
-        // Welcomer configuration
-        'welcomeTemplates'            =>
-            array(
-                'class'   => PageWelcomeTemplateManagement::class,
-                'actions' => array('select', 'edit', 'delete', 'add', 'view'),
-            ),
-
-        //////////////////////////////////////////////////////////////////////////////////////////////////
-        // Statistics
-        'statistics'                  =>
-            array(
-                'class'   => StatsMain::class,
-                'actions' => array(),
-            ),
-        'statistics/fastCloses'       =>
-            array(
-                'class'   => StatsFastCloses::class,
-                'actions' => array(),
-            ),
-        'statistics/inactiveUsers'    =>
-            array(
-                'class'   => StatsInactiveUsers::class,
-                'actions' => array(),
-            ),
-        'statistics/monthlyStats'     =>
-            array(
-                'class'   => StatsMonthlyStats::class,
-                'actions' => array(),
-            ),
-        'statistics/reservedRequests' =>
-            array(
-                'class'   => StatsReservedRequests::class,
-                'actions' => array(),
-            ),
-        'statistics/templateStats'    =>
-            array(
-                'class'   => StatsTemplateStats::class,
-                'actions' => array(),
-            ),
-        'statistics/topCreators'      =>
-            array(
-                'class'   => StatsTopCreators::class,
-                'actions' => array(),
-            ),
-        'statistics/users'            =>
-            array(
-                'class'   => StatsUsers::class,
-                'actions' => array('detail'),
-            ),
-
-        //////////////////////////////////////////////////////////////////////////////////////////////////
-        // Zoom page
-        'viewRequest'                 =>
-            array(
-                'class'   => PageViewRequest::class,
-                'actions' => array(),
-            ),
-        'viewRequest/confirm'         =>
-            array(
-                'class'   => PageManuallyConfirm::class,
-                'actions' => array(),
-            ),
-        'viewRequest/reserve'         =>
-            array(
-                'class'   => PageReservation::class,
-                'actions' => array(),
-            ),
-        'viewRequest/breakReserve'    =>
-            array(
-                'class'   => PageBreakReservation::class,
-                'actions' => array(),
-            ),
-        'viewRequest/defer'           =>
-            array(
-                'class'   => PageDeferRequest::class,
-                'actions' => array(),
-            ),
-        'viewRequest/comment'         =>
-            array(
-                'class'   => PageComment::class,
-                'actions' => array(),
-            ),
-        'viewRequest/sendToUser'      =>
-            array(
-                'class'   => PageSendToUser::class,
-                'actions' => array(),
-            ),
-        'viewRequest/close'           =>
-            array(
-                'class'   => PageCloseRequest::class,
-                'actions' => array(),
-            ),
-        'viewRequest/create'          =>
-            array(
-                'class'   => PageCreateRequest::class,
-                'actions' => array(),
-            ),
-        'viewRequest/drop'            =>
-            array(
-                'class'   => PageDropRequest::class,
-                'actions' => array(),
-            ),
-        'viewRequest/custom'          =>
-            array(
-                'class'   => PageCustomClose::class,
-                'actions' => array(),
-            ),
-        'editComment'                 =>
-            array(
-                'class'   => PageEditComment::class,
-                'actions' => array(),
-            ),
-        'flagComment'                 =>
-            array(
-                'class'   => PageFlagComment::class,
-                'actions' => array(),
-            ),
-
-        //////////////////////////////////////////////////////////////////////////////////////////////////
-        // Misc stuff
-        'team'                        =>
-            array(
-                'class'   => PageTeam::class,
-                'actions' => array(),
-            ),
-        'requestList'                 =>
-            array(
-                'class'   => PageExpandedRequestList::class,
-                'actions' => array(),
-            ),
-        'xffdemo'                     =>
-            array(
-                'class'   => PageXffDemo::class,
-                'actions' => array(),
-            ),
-        'errorLog'                    =>
-            array(
-                'class'   => PageErrorLogViewer::class,
-                'actions' => array('remove', 'view'),
-            ),
-        'privacy'                     =>
-            array(
-                'class'   => PagePrivacy::class,
-                'actions' => array(),
-            ),
-    );
-
-    /**
-     * @return IRoutedTask
-     * @throws Exception
-     */
-    final public function route()
-    {
-        $pathInfo = WebRequest::pathInfo();
-
-        list($pageClass, $action) = $this->getRouteFromPath($pathInfo);
-
-        /** @var IRoutedTask $page */
-        $page = new $pageClass();
-
-        // Dynamic creation, so we've got to be careful here. We can't use built-in language type protection, so
-        // let's use our own.
-        if (!($page instanceof IRoutedTask)) {
-            throw new Exception('Expected a page, but this is not a page.');
-        }
-
-        // OK, I'm happy at this point that we know we're running a page, and we know it's probably what we want if it
-        // inherits PageBase and has been created from the routing map.
-        $page->setRoute($action);
-
-        return $page;
-    }
-
-    /**
-     * @param $pathInfo
-     *
-     * @return array
-     */
-    public function getRouteFromPath($pathInfo)
-    {
-        if (count($pathInfo) === 0) {
-            // No pathInfo, so no page to load. Load the main page.
-            return $this->getDefaultRoute();
-        }
-        elseif (count($pathInfo) === 1) {
-            // Exactly one path info segment, it's got to be a page.
-            $classSegment = $pathInfo[0];
-
-            return $this->routeSinglePathSegment($classSegment);
-        }
-
-        // OK, we have two or more segments now.
-        if (count($pathInfo) > 2) {
-            // Let's handle more than two, and collapse it down into two.
-            $requestedAction = array_pop($pathInfo);
-            $classSegment = implode('/', $pathInfo);
-        }
-        else {
-            // Two path info segments.
-            $classSegment = $pathInfo[0];
-            $requestedAction = $pathInfo[1];
-        }
-
-        $routeMap = $this->routePathSegments($classSegment, $requestedAction);
-
-        if ($routeMap[0] === Page404::class) {
-            $routeMap = $this->routeSinglePathSegment($classSegment . '/' . $requestedAction);
-        }
-
-        return $routeMap;
-    }
-
-    /**
-     * @param $classSegment
-     *
-     * @return array
-     */
-    final protected function routeSinglePathSegment($classSegment)
-    {
-        $routeMap = $this->getRouteMap();
-        if (array_key_exists($classSegment, $routeMap)) {
-            // Route exists, but we don't have an action in path info, so default to main.
-            $pageClass = $routeMap[$classSegment]['class'];
-            $action = 'main';
-
-            return array($pageClass, $action);
-        }
-        else {
-            // Doesn't exist in map. Fall back to 404
-            $pageClass = Page404::class;
-            $action = "main";
-
-            return array($pageClass, $action);
-        }
-    }
-
-    /**
-     * @param $classSegment
-     * @param $requestedAction
-     *
-     * @return array
-     */
-    final protected function routePathSegments($classSegment, $requestedAction)
-    {
-        $routeMap = $this->getRouteMap();
-        if (array_key_exists($classSegment, $routeMap)) {
-            // Route exists, but we don't have an action in path info, so default to main.
-
-            if (isset($routeMap[$classSegment]['actions'])
-                && array_search($requestedAction, $routeMap[$classSegment]['actions']) !== false
-            ) {
-                // Action exists in allowed action list. Allow both the page and the action
-                $pageClass = $routeMap[$classSegment]['class'];
-                $action = $requestedAction;
-
-                return array($pageClass, $action);
-            }
-            else {
-                // Valid page, invalid action. 404 our way out.
-                $pageClass = Page404::class;
-                $action = 'main';
-
-                return array($pageClass, $action);
-            }
-        }
-        else {
-            // Class doesn't exist in map. Fall back to 404
-            $pageClass = Page404::class;
-            $action = 'main';
-
-            return array($pageClass, $action);
-        }
-    }
-
-    /**
-     * @return array
-     */
-    protected function getRouteMap()
-    {
-        return $this->routeMap;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getDefaultRoute()
-    {
-        return array(PageMain::class, "main");
-    }
+	/**
+	 * This is the core routing table for the application. The basic idea is:
+	 *
+	 *      array(
+	 *          "foo" =>
+	 *              array(
+	 *                  "class"   => PageFoo::class,
+	 *                  "actions" => array("bar", "other")
+	 *              ),
+	 * );
+	 *
+	 * Things to note:
+	 *     - If no page is requested, we go to PageMain. PageMain can't have actions defined.
+	 *
+	 *     - If a page is defined and requested, but no action is requested, go to that page's main() method
+	 *     - If a page is defined and requested, and an action is defined and requested, go to that action's method.
+	 *     - If a page is defined and requested, and an action NOT defined and requested, go to Page404 and it's main()
+	 *       method.
+	 *     - If a page is NOT defined and requested, go to Page404 and it's main() method.
+	 *
+	 *     - Query parameters are ignored.
+	 *
+	 * The key point here is request routing with validation that this is allowed, before we start hitting the
+	 * filesystem through the AutoLoader, and opening random files. Also, so that we validate the action requested
+	 * before we start calling random methods through the web UI.
+	 *
+	 * Examples:
+	 * /internal.php                => returns instance of PageMain, routed to main()
+	 * /internal.php?query          => returns instance of PageMain, routed to main()
+	 * /internal.php/foo            => returns instance of PageFoo, routed to main()
+	 * /internal.php/foo?query      => returns instance of PageFoo, routed to main()
+	 * /internal.php/foo/bar        => returns instance of PageFoo, routed to bar()
+	 * /internal.php/foo/bar?query  => returns instance of PageFoo, routed to bar()
+	 * /internal.php/foo/baz        => returns instance of Page404, routed to main()
+	 * /internal.php/foo/baz?query  => returns instance of Page404, routed to main()
+	 * /internal.php/bar            => returns instance of Page404, routed to main()
+	 * /internal.php/bar?query      => returns instance of Page404, routed to main()
+	 * /internal.php/bar/baz        => returns instance of Page404, routed to main()
+	 * /internal.php/bar/baz?query  => returns instance of Page404, routed to main()
+	 *
+	 * Take care when changing this - a lot of places rely on the array key for redirects and other links. If you need
+	 * to change the key, then you'll likely have to update a lot of files.
+	 *
+	 * @var array
+	 */
+	private $routeMap = array(
+
+		//////////////////////////////////////////////////////////////////////////////////////////////////
+		// Login and registration
+		'logout'                      =>
+			array(
+				'class'   => PageLogout::class,
+				'actions' => array(),
+			),
+		'login'                       =>
+			array(
+				'class'   => PagePasswordLogin::class,
+				'actions' => array(),
+			),
+		'login/otp'                   =>
+			array(
+				'class'   => PageOtpLogin::class,
+				'actions' => array(),
+			),
+		'forgotPassword'              =>
+			array(
+				'class'   => PageForgotPassword::class,
+				'actions' => array('reset'),
+			),
+		'register'                    =>
+			array(
+				'class'   => PageRegisterOption::class,
+				'actions' => array(),
+			),
+		'register/standard'           =>
+			array(
+				'class'   => PageRegisterStandard::class,
+				'actions' => array('done'),
+			),
+		'domainSwitch'                =>
+			array(
+				'class'   => PageDomainSwitch::class,
+				'actions' => array(),
+			),
+		'login/reactivate'            =>
+			array(
+				'class'   => PageUserReactivate::class,
+				'actions' => array(),
+			),
+
+		//////////////////////////////////////////////////////////////////////////////////////////////////
+		// Discovery
+		'search'                      =>
+			array(
+				'class'   => PageSearch::class,
+				'actions' => array(),
+			),
+		'logs'                        =>
+			array(
+				'class'   => PageLog::class,
+				'actions' => array(),
+			),
+
+		//////////////////////////////////////////////////////////////////////////////////////////////////
+		// Administration
+		'bans'                        =>
+			array(
+				'class'   => PageBan::class,
+				'actions' => array('set', 'remove', 'show', 'replace'),
+			),
+		'userManagement'              =>
+			array(
+				'class'   => PageUserManagement::class,
+				'actions' => array(
+					'approve',
+					'deactivate',
+					'rename',
+					'editUser',
+					'editRoles',
+				),
+			),
+		'siteNotice'                  =>
+			array(
+				'class'   => PageSiteNotice::class,
+				'actions' => array(),
+			),
+		'emailManagement'             =>
+			array(
+				'class'   => PageEmailManagement::class,
+				'actions' => array('create', 'edit', 'view'),
+			),
+		'queueManagement'             =>
+			array(
+				'class'   => PageQueueManagement::class,
+				'actions' => array('create', 'edit'),
+			),
+		'requestFormManagement'       =>
+			array(
+				'class'   => PageRequestFormManagement::class,
+				'actions' => array('create', 'edit', 'view', 'preview'),
+			),
+		'jobQueue'                    =>
+			array(
+				'class'   => PageJobQueue::class,
+				'actions' => array('acknowledge', 'requeue', 'view', 'all', 'cancel'),
+			),
+		'domainManagement'            =>
+			array(
+				'class'   => PageDomainManagement::class,
+				'actions' => array('create', 'edit'),
+			),
+		'flaggedComments'             =>
+			array(
+				'class'   => PageListFlaggedComments::class,
+				'actions' => array(),
+			),
+
+		//////////////////////////////////////////////////////////////////////////////////////////////////
+		// Personal preferences
+		'preferences'                 =>
+			array(
+				'class'   => PagePreferences::class,
+				'actions' => array(
+					'refreshOAuth'
+				),
+			),
+		'changePassword'              =>
+			array(
+				'class'   => PageChangePassword::class,
+				'actions' => array(),
+			),
+		'multiFactor'                 =>
+			array(
+				'class'   => PageMultiFactor::class,
+				'actions' => array(
+					'scratch',
+					'enableYubikeyOtp',
+					'disableYubikeyOtp',
+					'enableTotp',
+					'disableTotp',
+				),
+			),
+		'oauth'                       =>
+			array(
+				'class'   => PageOAuth::class,
+				'actions' => array('detach', 'attach'),
+			),
+		'oauth/callback'              =>
+			array(
+				'class'   => PageOAuthCallback::class,
+				'actions' => array('authorise', 'create'),
+			),
+
+		//////////////////////////////////////////////////////////////////////////////////////////////////
+		// Welcomer configuration
+		'welcomeTemplates'            =>
+			array(
+				'class'   => PageWelcomeTemplateManagement::class,
+				'actions' => array('select', 'edit', 'delete', 'add', 'view'),
+			),
+
+		//////////////////////////////////////////////////////////////////////////////////////////////////
+		// Statistics
+		'statistics'                  =>
+			array(
+				'class'   => StatsMain::class,
+				'actions' => array(),
+			),
+		'statistics/fastCloses'       =>
+			array(
+				'class'   => StatsFastCloses::class,
+				'actions' => array(),
+			),
+		'statistics/inactiveUsers'    =>
+			array(
+				'class'   => StatsInactiveUsers::class,
+				'actions' => array(),
+			),
+		'statistics/monthlyStats'     =>
+			array(
+				'class'   => StatsMonthlyStats::class,
+				'actions' => array(),
+			),
+		'statistics/reservedRequests' =>
+			array(
+				'class'   => StatsReservedRequests::class,
+				'actions' => array(),
+			),
+		'statistics/templateStats'    =>
+			array(
+				'class'   => StatsTemplateStats::class,
+				'actions' => array(),
+			),
+		'statistics/topCreators'      =>
+			array(
+				'class'   => StatsTopCreators::class,
+				'actions' => array(),
+			),
+		'statistics/users'            =>
+			array(
+				'class'   => StatsUsers::class,
+				'actions' => array('detail'),
+			),
+
+		//////////////////////////////////////////////////////////////////////////////////////////////////
+		// Zoom page
+		'viewRequest'                 =>
+			array(
+				'class'   => PageViewRequest::class,
+				'actions' => array(),
+			),
+		'viewRequest/confirm'         =>
+			array(
+				'class'   => PageManuallyConfirm::class,
+				'actions' => array(),
+			),
+		'viewRequest/reserve'         =>
+			array(
+				'class'   => PageReservation::class,
+				'actions' => array(),
+			),
+		'viewRequest/breakReserve'    =>
+			array(
+				'class'   => PageBreakReservation::class,
+				'actions' => array(),
+			),
+		'viewRequest/defer'           =>
+			array(
+				'class'   => PageDeferRequest::class,
+				'actions' => array(),
+			),
+		'viewRequest/comment'         =>
+			array(
+				'class'   => PageComment::class,
+				'actions' => array(),
+			),
+		'viewRequest/sendToUser'      =>
+			array(
+				'class'   => PageSendToUser::class,
+				'actions' => array(),
+			),
+		'viewRequest/close'           =>
+			array(
+				'class'   => PageCloseRequest::class,
+				'actions' => array(),
+			),
+		'viewRequest/create'          =>
+			array(
+				'class'   => PageCreateRequest::class,
+				'actions' => array(),
+			),
+		'viewRequest/drop'            =>
+			array(
+				'class'   => PageDropRequest::class,
+				'actions' => array(),
+			),
+		'viewRequest/custom'          =>
+			array(
+				'class'   => PageCustomClose::class,
+				'actions' => array(),
+			),
+		'editComment'                 =>
+			array(
+				'class'   => PageEditComment::class,
+				'actions' => array(),
+			),
+		'flagComment'                 =>
+			array(
+				'class'   => PageFlagComment::class,
+				'actions' => array(),
+			),
+
+		//////////////////////////////////////////////////////////////////////////////////////////////////
+		// Misc stuff
+		'team'                        =>
+			array(
+				'class'   => PageTeam::class,
+				'actions' => array(),
+			),
+		'requestList'                 =>
+			array(
+				'class'   => PageExpandedRequestList::class,
+				'actions' => array(),
+			),
+		'xffdemo'                     =>
+			array(
+				'class'   => PageXffDemo::class,
+				'actions' => array(),
+			),
+		'errorLog'                    =>
+			array(
+				'class'   => PageErrorLogViewer::class,
+				'actions' => array('remove', 'view'),
+			),
+		'privacy'                     =>
+			array(
+				'class'   => PagePrivacy::class,
+				'actions' => array(),
+			),
+	);
+
+	/**
+	 * @return IRoutedTask
+	 * @throws Exception
+	 */
+	final public function route()
+	{
+		$pathInfo = WebRequest::pathInfo();
+
+		list($pageClass, $action) = $this->getRouteFromPath($pathInfo);
+
+		/** @var IRoutedTask $page */
+		$page = new $pageClass();
+
+		// Dynamic creation, so we've got to be careful here. We can't use built-in language type protection, so
+		// let's use our own.
+		if (!($page instanceof IRoutedTask)) {
+			throw new Exception('Expected a page, but this is not a page.');
+		}
+
+		// OK, I'm happy at this point that we know we're running a page, and we know it's probably what we want if it
+		// inherits PageBase and has been created from the routing map.
+		$page->setRoute($action);
+
+		return $page;
+	}
+
+	/**
+	 * @param $pathInfo
+	 *
+	 * @return array
+	 */
+	public function getRouteFromPath($pathInfo)
+	{
+		if (count($pathInfo) === 0) {
+			// No pathInfo, so no page to load. Load the main page.
+			return $this->getDefaultRoute();
+		}
+		elseif (count($pathInfo) === 1) {
+			// Exactly one path info segment, it's got to be a page.
+			$classSegment = $pathInfo[0];
+
+			return $this->routeSinglePathSegment($classSegment);
+		}
+
+		// OK, we have two or more segments now.
+		if (count($pathInfo) > 2) {
+			// Let's handle more than two, and collapse it down into two.
+			$requestedAction = array_pop($pathInfo);
+			$classSegment = implode('/', $pathInfo);
+		}
+		else {
+			// Two path info segments.
+			$classSegment = $pathInfo[0];
+			$requestedAction = $pathInfo[1];
+		}
+
+		$routeMap = $this->routePathSegments($classSegment, $requestedAction);
+
+		if ($routeMap[0] === Page404::class) {
+			$routeMap = $this->routeSinglePathSegment($classSegment . '/' . $requestedAction);
+		}
+
+		return $routeMap;
+	}
+
+	/**
+	 * @param $classSegment
+	 *
+	 * @return array
+	 */
+	final protected function routeSinglePathSegment($classSegment)
+	{
+		$routeMap = $this->getRouteMap();
+		if (array_key_exists($classSegment, $routeMap)) {
+			// Route exists, but we don't have an action in path info, so default to main.
+			$pageClass = $routeMap[$classSegment]['class'];
+			$action = 'main';
+
+			return array($pageClass, $action);
+		}
+		else {
+			// Doesn't exist in map. Fall back to 404
+			$pageClass = Page404::class;
+			$action = "main";
+
+			return array($pageClass, $action);
+		}
+	}
+
+	/**
+	 * @param $classSegment
+	 * @param $requestedAction
+	 *
+	 * @return array
+	 */
+	final protected function routePathSegments($classSegment, $requestedAction)
+	{
+		$routeMap = $this->getRouteMap();
+		if (array_key_exists($classSegment, $routeMap)) {
+			// Route exists, but we don't have an action in path info, so default to main.
+
+			if (isset($routeMap[$classSegment]['actions'])
+				&& array_search($requestedAction, $routeMap[$classSegment]['actions']) !== false
+			) {
+				// Action exists in allowed action list. Allow both the page and the action
+				$pageClass = $routeMap[$classSegment]['class'];
+				$action = $requestedAction;
+
+				return array($pageClass, $action);
+			}
+			else {
+				// Valid page, invalid action. 404 our way out.
+				$pageClass = Page404::class;
+				$action = 'main';
+
+				return array($pageClass, $action);
+			}
+		}
+		else {
+			// Class doesn't exist in map. Fall back to 404
+			$pageClass = Page404::class;
+			$action = 'main';
+
+			return array($pageClass, $action);
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getRouteMap()
+	{
+		return $this->routeMap;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getDefaultRoute()
+	{
+		return array(PageMain::class, "main");
+	}
 }

includes/Router/ApiRequestRouter.php

Indentation +45 added lines, -45 removed lines

@@ -24,52 +24,52 @@
 
 class ApiRequestRouter implements IRequestRouter
 {
-    /**
-     * @return string[]
-     */
-    public static function getActionList()
-    {
-        return array('count', 'status', 'stats', 'help', 'monitor', 'metrics');
-    }
+	/**
+	 * @return string[]
+	 */
+	public static function getActionList()
+	{
+		return array('count', 'status', 'stats', 'help', 'monitor', 'metrics');
+	}
 
-    /**
-     * @return IRoutedTask
-     * @throws Exception
-     */
-    public function route()
-    {
-        $requestAction = WebRequest::getString('action');
+	/**
+	 * @return IRoutedTask
+	 * @throws Exception
+	 */
+	public function route()
+	{
+		$requestAction = WebRequest::getString('action');
 
-        switch ($requestAction) {
-            case "count":
-                $result = new CountAction();
-                break;
-            case "status":
-                $result = new StatusAction();
-                break;
-            case "stats":
-                $result = new StatsAction();
-                break;
-            case "help":
-                $result = new HelpAction();
-                break;
-            case "monitor":
-                $result = new MonitorAction();
-                break;
-            case "users":
-                $result = new JsUsersAction();
-                break;
-            case "templates":
-                $result = new JsTemplateConfirmsAction();
-                break;
-            case 'metrics':
-                $result = new MetricsAction();
-                break;
-            default:
-                $result = new UnknownAction();
-                break;
-        }
+		switch ($requestAction) {
+			case "count":
+				$result = new CountAction();
+				break;
+			case "status":
+				$result = new StatusAction();
+				break;
+			case "stats":
+				$result = new StatsAction();
+				break;
+			case "help":
+				$result = new HelpAction();
+				break;
+			case "monitor":
+				$result = new MonitorAction();
+				break;
+			case "users":
+				$result = new JsUsersAction();
+				break;
+			case "templates":
+				$result = new JsTemplateConfirmsAction();
+				break;
+			case 'metrics':
+				$result = new MetricsAction();
+				break;
+			default:
+				$result = new UnknownAction();
+				break;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 }

includes/ConsoleTasks/AutoFlagCommentsTask.php

Indentation +18 added lines, -18 removed lines

@@ -17,11 +17,11 @@ 
 
 class AutoFlagCommentsTask extends ConsoleTaskBase
 {
-    public function execute()
-    {
-        $database = $this->getDatabase();
+	public function execute()
+	{
+		$database = $this->getDatabase();
 
-        $query = $database->prepare(<<<'SQL'
+		$query = $database->prepare(<<<'SQL'
 select c.id, r.domain
 from comment c
 inner join request r on r.id = c.request
@@ -81,22 +81,22 @@ 
 and c.comment not like '%[redacted]%'
 ;
 SQL
-        );
+		);
 
-        $success = $query->execute();
+		$success = $query->execute();
 
-        if (!$success) {
-            throw new Exception('Error in transaction: Could not load data.');
-        }
+		if (!$success) {
+			throw new Exception('Error in transaction: Could not load data.');
+		}
 
-        $data = $query->fetchAll(PDO::FETCH_ASSOC);
-        foreach ($data as $row) {
-            /** @var Comment $dataObject */
-            $dataObject = Comment::getById($row['id'], $database);
+		$data = $query->fetchAll(PDO::FETCH_ASSOC);
+		foreach ($data as $row) {
+			/** @var Comment $dataObject */
+			$dataObject = Comment::getById($row['id'], $database);
 
-            Logger::flaggedComment($database, $dataObject, $row['domain']);
-            $dataObject->setFlagged(true);
-            $dataObject->save();
-        }
-    }
+			Logger::flaggedComment($database, $dataObject, $row['domain']);
+			$dataObject->setFlagged(true);
+			$dataObject->save();
+		}
+	}
 }
\ No newline at end of file

includes/Helpers/IrcNotificationHelper.php

Indentation +493 added lines, -493 removed lines

@@ -32,500 +32,500 @@
  */
 class IrcNotificationHelper
 {
-    /** @var bool $notificationsEnabled */
-    private $notificationsEnabled;
-    /** @var User $currentUser */
-    private $currentUser;
-    /** @var string $instanceName */
-    private $instanceName;
-    /** @var string */
-    private $baseUrl;
-    /** @var SiteConfiguration */
-    private $siteConfiguration;
-    /** @var PdoDatabase */
-    private $primaryDatabase;
-
-    /**
-     * IrcNotificationHelper constructor.
-     *
-     * @param SiteConfiguration $siteConfiguration
-     * @param PdoDatabase       $primaryDatabase
-     */
-    public function __construct(
-        SiteConfiguration $siteConfiguration,
-        PdoDatabase $primaryDatabase
-    ) {
-        $this->siteConfiguration = $siteConfiguration;
-        $this->primaryDatabase = $primaryDatabase;
-
-        $this->notificationsEnabled = $siteConfiguration->getIrcNotificationsEnabled();
-        $this->instanceName = $siteConfiguration->getIrcNotificationsInstance();
-        $this->baseUrl = $siteConfiguration->getBaseUrl();
-
-        $this->currentUser = User::getCurrent($primaryDatabase);
-    }
-
-    /**
-     * Send a notification
-     *
-     * This method does some *basic* filtering for IRC safety, and then delivers the message to an AMQP queue manager.
-     * It is the responsibility of the queue manager and consumer to handle message delivery to IRC, message routing to
-     * the correct channel, and message expiry.
-     *
-     * It's also arguably the responsibility of the consumer to ensure the message is *safe* for delivery to IRC.
-     *
-     * As of Feb 2022, the message consumer is stwalkerster's IRC bot Helpmebot.
-     *
-     * @param string $message The text to send
-     */
-    protected function send($message)
-    {
-        $instanceName = $this->instanceName;
-
-        if (!$this->notificationsEnabled) {
-            return;
-        }
-
-        $blacklist = array("DCC", "CCTP", "PRIVMSG");
-        $message = str_replace($blacklist, "(IRC Blacklist)", $message); // Lets stop DCC etc
-
-        $msg = $message;
-        if ($instanceName !== null && mb_strlen($instanceName) > 0) {
-            $msg = IrcColourCode::RESET . IrcColourCode::BOLD . "[$instanceName]" . IrcColourCode::RESET . ": $message";
-        }
-
-        // FIXME: domains!
-        /** @var Domain $domain */
-        $domain = Domain::getById(1, $this->primaryDatabase);
-
-        try {
-            $amqpSiteConfig = $this->siteConfiguration->getAmqpConfiguration();
-
-            $amqpConnectionConfig = new AMQPConnectionConfig();
-            $amqpConnectionConfig->setHost($amqpSiteConfig['host']);
-            $amqpConnectionConfig->setPort($amqpSiteConfig['port']);
-            $amqpConnectionConfig->setUser($amqpSiteConfig['user']);
-            $amqpConnectionConfig->setPassword($amqpSiteConfig['password']);
-            $amqpConnectionConfig->setVhost($amqpSiteConfig['vhost']);
-
-            if ($amqpSiteConfig['tls']) {
-                $amqpConnectionConfig->setIsSecure(true);
-                $amqpConnectionConfig->setSslVerify(true);
-            }
-            else {
-                $amqpConnectionConfig->setIsSecure(false);
-            }
-
-            $connection = AMQPConnectionFactory::create($amqpConnectionConfig);
-            $channel = $connection->channel();
-
-            $msg = new AMQPMessage(substr($msg, 0, 512));
-            $msg->set('user_id', $amqpSiteConfig['user']);
-            $msg->set('app_id', $this->siteConfiguration->getUserAgent());
-            $msg->set('content_type', 'text/plain');
+	/** @var bool $notificationsEnabled */
+	private $notificationsEnabled;
+	/** @var User $currentUser */
+	private $currentUser;
+	/** @var string $instanceName */
+	private $instanceName;
+	/** @var string */
+	private $baseUrl;
+	/** @var SiteConfiguration */
+	private $siteConfiguration;
+	/** @var PdoDatabase */
+	private $primaryDatabase;
+
+	/**
+	 * IrcNotificationHelper constructor.
+	 *
+	 * @param SiteConfiguration $siteConfiguration
+	 * @param PdoDatabase       $primaryDatabase
+	 */
+	public function __construct(
+		SiteConfiguration $siteConfiguration,
+		PdoDatabase $primaryDatabase
+	) {
+		$this->siteConfiguration = $siteConfiguration;
+		$this->primaryDatabase = $primaryDatabase;
+
+		$this->notificationsEnabled = $siteConfiguration->getIrcNotificationsEnabled();
+		$this->instanceName = $siteConfiguration->getIrcNotificationsInstance();
+		$this->baseUrl = $siteConfiguration->getBaseUrl();
+
+		$this->currentUser = User::getCurrent($primaryDatabase);
+	}
+
+	/**
+	 * Send a notification
+	 *
+	 * This method does some *basic* filtering for IRC safety, and then delivers the message to an AMQP queue manager.
+	 * It is the responsibility of the queue manager and consumer to handle message delivery to IRC, message routing to
+	 * the correct channel, and message expiry.
+	 *
+	 * It's also arguably the responsibility of the consumer to ensure the message is *safe* for delivery to IRC.
+	 *
+	 * As of Feb 2022, the message consumer is stwalkerster's IRC bot Helpmebot.
+	 *
+	 * @param string $message The text to send
+	 */
+	protected function send($message)
+	{
+		$instanceName = $this->instanceName;
+
+		if (!$this->notificationsEnabled) {
+			return;
+		}
+
+		$blacklist = array("DCC", "CCTP", "PRIVMSG");
+		$message = str_replace($blacklist, "(IRC Blacklist)", $message); // Lets stop DCC etc
+
+		$msg = $message;
+		if ($instanceName !== null && mb_strlen($instanceName) > 0) {
+			$msg = IrcColourCode::RESET . IrcColourCode::BOLD . "[$instanceName]" . IrcColourCode::RESET . ": $message";
+		}
+
+		// FIXME: domains!
+		/** @var Domain $domain */
+		$domain = Domain::getById(1, $this->primaryDatabase);
+
+		try {
+			$amqpSiteConfig = $this->siteConfiguration->getAmqpConfiguration();
+
+			$amqpConnectionConfig = new AMQPConnectionConfig();
+			$amqpConnectionConfig->setHost($amqpSiteConfig['host']);
+			$amqpConnectionConfig->setPort($amqpSiteConfig['port']);
+			$amqpConnectionConfig->setUser($amqpSiteConfig['user']);
+			$amqpConnectionConfig->setPassword($amqpSiteConfig['password']);
+			$amqpConnectionConfig->setVhost($amqpSiteConfig['vhost']);
+
+			if ($amqpSiteConfig['tls']) {
+				$amqpConnectionConfig->setIsSecure(true);
+				$amqpConnectionConfig->setSslVerify(true);
+			}
+			else {
+				$amqpConnectionConfig->setIsSecure(false);
+			}
+
+			$connection = AMQPConnectionFactory::create($amqpConnectionConfig);
+			$channel = $connection->channel();
+
+			$msg = new AMQPMessage(substr($msg, 0, 512));
+			$msg->set('user_id', $amqpSiteConfig['user']);
+			$msg->set('app_id', $this->siteConfiguration->getUserAgent());
+			$msg->set('content_type', 'text/plain');
             
-            $channel->basic_publish($msg, $amqpSiteConfig['exchange'], $domain->getNotificationTarget());
-            $channel->close();
-        }
-        catch (Exception $ex) {
-            // OK, so we failed to send the notification - that db might be down?
-            // This is non-critical, so silently fail.
-            ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
-
-            // Disable notifications for remainder of request.
-            $this->notificationsEnabled = false;
-        }
-    }
-
-    #region user management
-
-    /**
-     * send a new user notification
-     *
-     * @param User $user
-     */
-    public function userNew(User $user)
-    {
-        $this->send("New user: {$user->getUsername()}");
-    }
-
-    /**
-     * send an approved notification
-     *
-     * @param User $user
-     */
-    public function userApproved(User $user)
-    {
-        $this->send("{$user->getUsername()} approved by " . $this->currentUser->getUsername());
-    }
-
-    /**
-     * send a deactivated notification
-     *
-     * @param User   $user
-     */
-    public function userDeactivated(User $user)
-    {
-        $this->send("{$user->getUsername()} deactivated by " . $this->currentUser->getUsername());
-    }
-
-    /**
-     * Send a preference change notification
-     *
-     * @param User $user
-     */
-    public function userPrefChange(User $user)
-    {
-        $this->send("{$user->getUsername()}'s preferences were changed by " . $this->currentUser->getUsername());
-    }
-
-    /**
-     * Send a user renamed notification
-     *
-     * @param User   $user
-     * @param string $old
-     */
-    public function userRenamed(User $user, $old)
-    {
-        $this->send($this->currentUser->getUsername() . " renamed $old to {$user->getUsername()}");
-    }
-
-    /**
-     * @param User   $user
-     * @param string $reason
-     */
-    public function userRolesEdited(User $user, $reason)
-    {
-        $currentUser = $this->currentUser->getUsername();
-        $this->send("Active roles for {$user->getUsername()} changed by " . $currentUser . " ($reason)");
-    }
-
-    #endregion
-
-    #region Site Notice
-
-    /**
-     * Summary of siteNoticeEdited
-     */
-    public function siteNoticeEdited()
-    {
-        $this->send("Site notice edited by " . $this->currentUser->getUsername());
-    }
-    #endregion
-
-    #region Welcome Templates
-    /**
-     * Summary of welcomeTemplateCreated
-     *
-     * @param WelcomeTemplate $template
-     */
-    public function welcomeTemplateCreated(WelcomeTemplate $template)
-    {
-        $this->send("Welcome template {$template->getId()} created by " . $this->currentUser->getUsername());
-    }
-
-    /**
-     * Summary of welcomeTemplateDeleted
-     *
-     * @param int $templateid
-     */
-    public function welcomeTemplateDeleted($templateid)
-    {
-        $this->send("Welcome template {$templateid} deleted by " . $this->currentUser->getUsername());
-    }
-
-    /**
-     * Summary of welcomeTemplateEdited
-     *
-     * @param WelcomeTemplate $template
-     */
-    public function welcomeTemplateEdited(WelcomeTemplate $template)
-    {
-        $this->send("Welcome template {$template->getId()} edited by " . $this->currentUser->getUsername());
-    }
-
-    #endregion
-
-    #region bans
-    /**
-     * Summary of banned
-     *
-     * @param Ban $ban
-     */
-    public function banned(Ban $ban)
-    {
-        if ($ban->getDuration() === null) {
-            $duration = "indefinitely";
-        }
-        else {
-            $duration = "until " . date("F j, Y, g:i a", $ban->getDuration());
-        }
-
-        $username = $this->currentUser->getUsername();
-
-        if ($ban->getVisibility() == 'user') {
-            $this->send("Ban {$ban->getId()} set by {$username} for '{$ban->getReason()}' {$duration}");
-        }
-        else {
-            $this->send("Ban {$ban->getId()} set by {$username} {$duration}");
-        }
-    }
-
-    /**
-     * Summary of unbanned
-     *
-     * @param Ban    $ban
-     * @param string $unbanReason
-     */
-    public function unbanned(Ban $ban, $unbanReason)
-    {
-        $this->send("Ban {$ban->getId()} unbanned by " . $this->currentUser
-                ->getUsername() . " (" . $unbanReason . ")");
-    }
-
-    #endregion
-
-    #region request management
-
-    /**
-     * Summary of requestReceived
-     *
-     * @param Request $request
-     */
-    public function requestReceived(Request $request)
-    {
-        $this->send(
-            IrcColourCode::DARK_GREY . "[["
-            . IrcColourCode::DARK_GREEN . "acc:"
-            . IrcColourCode::ORANGE . $request->getId()
-            . IrcColourCode::DARK_GREY . "]]"
-            . IrcColourCode::RED . " N "
-            . IrcColourCode::DARK_BLUE . $this->baseUrl . "/internal.php/viewRequest?id={$request->getId()} "
-            . IrcColourCode::DARK_RED . "* "
-            . IrcColourCode::DARK_GREEN . $request->getName()
-            . IrcColourCode::DARK_RED . " * "
-            . IrcColourCode::RESET
-        );
-    }
-
-    /**
-     * Summary of requestDeferred
-     *
-     * @param Request $request
-     */
-    public function requestDeferred(Request $request)
-    {
-        /** @var RequestQueue $queue */
-        $queue = RequestQueue::getById($request->getQueue(), $request->getDatabase());
-
-        $deferTo = $queue->getDisplayName();
-        $username = $this->currentUser->getUsername();
-
-        $this->send("Request {$request->getId()} ({$request->getName()}) deferred to {$deferTo} by {$username}");
-    }
-
-    /**
-     *
-     * Summary of requestDeferredWithMail
-     *
-     * @param Request $request
-     */
-    public function requestDeferredWithMail(Request $request)
-    {
-        /** @var RequestQueue $queue */
-        $queue = RequestQueue::getById($request->getQueue(), $request->getDatabase());
-
-        $deferTo = $queue->getDisplayName();
-        $username = $this->currentUser->getUsername();
-        $id = $request->getId();
-        $name = $request->getName();
-
-        $this->send("Request {$id} ({$name}) deferred to {$deferTo} with an email by {$username}");
-    }
-
-    /**
-     * Summary of requestClosed
-     *
-     * @param Request $request
-     * @param string  $closetype
-     */
-    public function requestClosed(Request $request, $closetype)
-    {
-        $username = $this->currentUser->getUsername();
-
-        $this->send("Request {$request->getId()} ({$request->getName()}) closed ($closetype) by {$username}");
-    }
-
-    /**
-     * Summary of requestClosed
-     *
-     * @param Request $request
-     * @param string  $closetype
-     */
-    public function requestCloseQueued(Request $request, $closetype)
-    {
-        $username = $this->currentUser->getUsername();
-
-        $this->send("Request {$request->getId()} ({$request->getName()}) queued for creation ($closetype) by {$username}");
-    }
-
-    /**
-     * Summary of requestClosed
-     *
-     * @param Request $request
-     * @param User    $triggerUser
-     */
-    public function requestCreationFailed(Request $request, User $triggerUser)
-    {
-        $this->send("Request {$request->getId()} ({$request->getName()}) failed auto-creation for {$triggerUser->getUsername()}, and was sent to the hospital queue.");
-    }
-
-    /**
-     * @param Request $request
-     * @param User    $triggerUser
-     */
-    public function requestWelcomeFailed(Request $request, User $triggerUser)
-    {
-        $this->send("Request {$request->getId()} ({$request->getName()}) failed welcome for {$triggerUser->getUsername()}.");
-    }
-
-    /**
-     * Summary of sentMail
-     *
-     * @param Request $request
-     */
-    public function sentMail(Request $request)
-    {
-        $this->send($this->currentUser->getUsername()
-            . " sent an email related to Request {$request->getId()} ({$request->getName()})");
-    }
-
-    #endregion
-
-    #region reservations
-
-    /**
-     * Summary of requestReserved
-     *
-     * @param Request $request
-     */
-    public function requestReserved(Request $request)
-    {
-        $username = $this->currentUser->getUsername();
-
-        $this->send("Request {$request->getId()} ({$request->getName()}) reserved by {$username}");
-    }
-
-    /**
-     * Summary of requestReserveBroken
-     *
-     * @param Request $request
-     */
-    public function requestReserveBroken(Request $request)
-    {
-        $username = $this->currentUser->getUsername();
-
-        $this->send("Reservation on request {$request->getId()} ({$request->getName()}) broken by {$username}");
-    }
-
-    /**
-     * Summary of requestUnreserved
-     *
-     * @param Request $request
-     */
-    public function requestUnreserved(Request $request)
-    {
-        $this->send("Request {$request->getId()} ({$request->getName()}) is no longer being handled.");
-    }
-
-    /**
-     * Summary of requestReservationSent
-     *
-     * @param Request $request
-     * @param User    $target
-     */
-    public function requestReservationSent(Request $request, User $target)
-    {
-        $username = $this->currentUser->getUsername();
-
-        $this->send(
-            "Reservation of request {$request->getId()} ({$request->getName()}) sent to {$target->getUsername()} by "
-            . $username);
-    }
-
-    #endregion
-
-    #region comments
-
-    /**
-     * Summary of commentCreated
-     *
-     * @param Comment $comment
-     * @param Request $request
-     */
-    public function commentCreated(Comment $comment, Request $request)
-    {
-        $username = $this->currentUser->getUsername();
-        switch ($comment->getVisibility()) {
-            case 'admin':
-                $visibility = " with visibility 'admin'";
-                break;
-            case 'checkuser':
-                $visibility = " with visibility 'checkuser'";
-                break;
-            default:
-                $visibility = "";
-                break;
-        }
-
-        $this->send("{$username} posted a comment on request {$request->getId()} ({$request->getName()}){$visibility}");
-    }
-
-    /**
-     * Summary of commentEdited
-     *
-     * @param Comment $comment
-     * @param Request $request
-     */
-    public function commentEdited(Comment $comment, Request $request)
-    {
-        $username = $this->currentUser->getUsername();
-
-        $this->send(<<<TAG
+			$channel->basic_publish($msg, $amqpSiteConfig['exchange'], $domain->getNotificationTarget());
+			$channel->close();
+		}
+		catch (Exception $ex) {
+			// OK, so we failed to send the notification - that db might be down?
+			// This is non-critical, so silently fail.
+			ExceptionHandler::logExceptionToDisk($ex, $this->siteConfiguration);
+
+			// Disable notifications for remainder of request.
+			$this->notificationsEnabled = false;
+		}
+	}
+
+	#region user management
+
+	/**
+	 * send a new user notification
+	 *
+	 * @param User $user
+	 */
+	public function userNew(User $user)
+	{
+		$this->send("New user: {$user->getUsername()}");
+	}
+
+	/**
+	 * send an approved notification
+	 *
+	 * @param User $user
+	 */
+	public function userApproved(User $user)
+	{
+		$this->send("{$user->getUsername()} approved by " . $this->currentUser->getUsername());
+	}
+
+	/**
+	 * send a deactivated notification
+	 *
+	 * @param User   $user
+	 */
+	public function userDeactivated(User $user)
+	{
+		$this->send("{$user->getUsername()} deactivated by " . $this->currentUser->getUsername());
+	}
+
+	/**
+	 * Send a preference change notification
+	 *
+	 * @param User $user
+	 */
+	public function userPrefChange(User $user)
+	{
+		$this->send("{$user->getUsername()}'s preferences were changed by " . $this->currentUser->getUsername());
+	}
+
+	/**
+	 * Send a user renamed notification
+	 *
+	 * @param User   $user
+	 * @param string $old
+	 */
+	public function userRenamed(User $user, $old)
+	{
+		$this->send($this->currentUser->getUsername() . " renamed $old to {$user->getUsername()}");
+	}
+
+	/**
+	 * @param User   $user
+	 * @param string $reason
+	 */
+	public function userRolesEdited(User $user, $reason)
+	{
+		$currentUser = $this->currentUser->getUsername();
+		$this->send("Active roles for {$user->getUsername()} changed by " . $currentUser . " ($reason)");
+	}
+
+	#endregion
+
+	#region Site Notice
+
+	/**
+	 * Summary of siteNoticeEdited
+	 */
+	public function siteNoticeEdited()
+	{
+		$this->send("Site notice edited by " . $this->currentUser->getUsername());
+	}
+	#endregion
+
+	#region Welcome Templates
+	/**
+	 * Summary of welcomeTemplateCreated
+	 *
+	 * @param WelcomeTemplate $template
+	 */
+	public function welcomeTemplateCreated(WelcomeTemplate $template)
+	{
+		$this->send("Welcome template {$template->getId()} created by " . $this->currentUser->getUsername());
+	}
+
+	/**
+	 * Summary of welcomeTemplateDeleted
+	 *
+	 * @param int $templateid
+	 */
+	public function welcomeTemplateDeleted($templateid)
+	{
+		$this->send("Welcome template {$templateid} deleted by " . $this->currentUser->getUsername());
+	}
+
+	/**
+	 * Summary of welcomeTemplateEdited
+	 *
+	 * @param WelcomeTemplate $template
+	 */
+	public function welcomeTemplateEdited(WelcomeTemplate $template)
+	{
+		$this->send("Welcome template {$template->getId()} edited by " . $this->currentUser->getUsername());
+	}
+
+	#endregion
+
+	#region bans
+	/**
+	 * Summary of banned
+	 *
+	 * @param Ban $ban
+	 */
+	public function banned(Ban $ban)
+	{
+		if ($ban->getDuration() === null) {
+			$duration = "indefinitely";
+		}
+		else {
+			$duration = "until " . date("F j, Y, g:i a", $ban->getDuration());
+		}
+
+		$username = $this->currentUser->getUsername();
+
+		if ($ban->getVisibility() == 'user') {
+			$this->send("Ban {$ban->getId()} set by {$username} for '{$ban->getReason()}' {$duration}");
+		}
+		else {
+			$this->send("Ban {$ban->getId()} set by {$username} {$duration}");
+		}
+	}
+
+	/**
+	 * Summary of unbanned
+	 *
+	 * @param Ban    $ban
+	 * @param string $unbanReason
+	 */
+	public function unbanned(Ban $ban, $unbanReason)
+	{
+		$this->send("Ban {$ban->getId()} unbanned by " . $this->currentUser
+				->getUsername() . " (" . $unbanReason . ")");
+	}
+
+	#endregion
+
+	#region request management
+
+	/**
+	 * Summary of requestReceived
+	 *
+	 * @param Request $request
+	 */
+	public function requestReceived(Request $request)
+	{
+		$this->send(
+			IrcColourCode::DARK_GREY . "[["
+			. IrcColourCode::DARK_GREEN . "acc:"
+			. IrcColourCode::ORANGE . $request->getId()
+			. IrcColourCode::DARK_GREY . "]]"
+			. IrcColourCode::RED . " N "
+			. IrcColourCode::DARK_BLUE . $this->baseUrl . "/internal.php/viewRequest?id={$request->getId()} "
+			. IrcColourCode::DARK_RED . "* "
+			. IrcColourCode::DARK_GREEN . $request->getName()
+			. IrcColourCode::DARK_RED . " * "
+			. IrcColourCode::RESET
+		);
+	}
+
+	/**
+	 * Summary of requestDeferred
+	 *
+	 * @param Request $request
+	 */
+	public function requestDeferred(Request $request)
+	{
+		/** @var RequestQueue $queue */
+		$queue = RequestQueue::getById($request->getQueue(), $request->getDatabase());
+
+		$deferTo = $queue->getDisplayName();
+		$username = $this->currentUser->getUsername();
+
+		$this->send("Request {$request->getId()} ({$request->getName()}) deferred to {$deferTo} by {$username}");
+	}
+
+	/**
+	 *
+	 * Summary of requestDeferredWithMail
+	 *
+	 * @param Request $request
+	 */
+	public function requestDeferredWithMail(Request $request)
+	{
+		/** @var RequestQueue $queue */
+		$queue = RequestQueue::getById($request->getQueue(), $request->getDatabase());
+
+		$deferTo = $queue->getDisplayName();
+		$username = $this->currentUser->getUsername();
+		$id = $request->getId();
+		$name = $request->getName();
+
+		$this->send("Request {$id} ({$name}) deferred to {$deferTo} with an email by {$username}");
+	}
+
+	/**
+	 * Summary of requestClosed
+	 *
+	 * @param Request $request
+	 * @param string  $closetype
+	 */
+	public function requestClosed(Request $request, $closetype)
+	{
+		$username = $this->currentUser->getUsername();
+
+		$this->send("Request {$request->getId()} ({$request->getName()}) closed ($closetype) by {$username}");
+	}
+
+	/**
+	 * Summary of requestClosed
+	 *
+	 * @param Request $request
+	 * @param string  $closetype
+	 */
+	public function requestCloseQueued(Request $request, $closetype)
+	{
+		$username = $this->currentUser->getUsername();
+
+		$this->send("Request {$request->getId()} ({$request->getName()}) queued for creation ($closetype) by {$username}");
+	}
+
+	/**
+	 * Summary of requestClosed
+	 *
+	 * @param Request $request
+	 * @param User    $triggerUser
+	 */
+	public function requestCreationFailed(Request $request, User $triggerUser)
+	{
+		$this->send("Request {$request->getId()} ({$request->getName()}) failed auto-creation for {$triggerUser->getUsername()}, and was sent to the hospital queue.");
+	}
+
+	/**
+	 * @param Request $request
+	 * @param User    $triggerUser
+	 */
+	public function requestWelcomeFailed(Request $request, User $triggerUser)
+	{
+		$this->send("Request {$request->getId()} ({$request->getName()}) failed welcome for {$triggerUser->getUsername()}.");
+	}
+
+	/**
+	 * Summary of sentMail
+	 *
+	 * @param Request $request
+	 */
+	public function sentMail(Request $request)
+	{
+		$this->send($this->currentUser->getUsername()
+			. " sent an email related to Request {$request->getId()} ({$request->getName()})");
+	}
+
+	#endregion
+
+	#region reservations
+
+	/**
+	 * Summary of requestReserved
+	 *
+	 * @param Request $request
+	 */
+	public function requestReserved(Request $request)
+	{
+		$username = $this->currentUser->getUsername();
+
+		$this->send("Request {$request->getId()} ({$request->getName()}) reserved by {$username}");
+	}
+
+	/**
+	 * Summary of requestReserveBroken
+	 *
+	 * @param Request $request
+	 */
+	public function requestReserveBroken(Request $request)
+	{
+		$username = $this->currentUser->getUsername();
+
+		$this->send("Reservation on request {$request->getId()} ({$request->getName()}) broken by {$username}");
+	}
+
+	/**
+	 * Summary of requestUnreserved
+	 *
+	 * @param Request $request
+	 */
+	public function requestUnreserved(Request $request)
+	{
+		$this->send("Request {$request->getId()} ({$request->getName()}) is no longer being handled.");
+	}
+
+	/**
+	 * Summary of requestReservationSent
+	 *
+	 * @param Request $request
+	 * @param User    $target
+	 */
+	public function requestReservationSent(Request $request, User $target)
+	{
+		$username = $this->currentUser->getUsername();
+
+		$this->send(
+			"Reservation of request {$request->getId()} ({$request->getName()}) sent to {$target->getUsername()} by "
+			. $username);
+	}
+
+	#endregion
+
+	#region comments
+
+	/**
+	 * Summary of commentCreated
+	 *
+	 * @param Comment $comment
+	 * @param Request $request
+	 */
+	public function commentCreated(Comment $comment, Request $request)
+	{
+		$username = $this->currentUser->getUsername();
+		switch ($comment->getVisibility()) {
+			case 'admin':
+				$visibility = " with visibility 'admin'";
+				break;
+			case 'checkuser':
+				$visibility = " with visibility 'checkuser'";
+				break;
+			default:
+				$visibility = "";
+				break;
+		}
+
+		$this->send("{$username} posted a comment on request {$request->getId()} ({$request->getName()}){$visibility}");
+	}
+
+	/**
+	 * Summary of commentEdited
+	 *
+	 * @param Comment $comment
+	 * @param Request $request
+	 */
+	public function commentEdited(Comment $comment, Request $request)
+	{
+		$username = $this->currentUser->getUsername();
+
+		$this->send(<<<TAG
 Comment {$comment->getId()} on request {$request->getId()} ({$request->getName()}) edited by {$username}
 TAG
-        );
-    }
-
-    public function alertFlaggedComments(int $count)
-    {
-        $this->send("There are ${count} flagged comments on closed requests currently awaiting redaction.");
-    }
-
-    #endregion
-
-    #region email management (close reasons)
-
-    /**
-     * Summary of emailCreated
-     *
-     * @param EmailTemplate $template
-     */
-    public function emailCreated(EmailTemplate $template)
-    {
-        $username = $this->currentUser->getUsername();
-        $this->send("Email {$template->getId()} ({$template->getName()}) created by " . $username);
-    }
-
-    /**
-     * Summary of emailEdited
-     *
-     * @param EmailTemplate $template
-     */
-    public function emailEdited(EmailTemplate $template)
-    {
-        $username = $this->currentUser->getUsername();
-        $this->send("Email {$template->getId()} ({$template->getName()}) edited by " . $username);
-    }
-    #endregion
+		);
+	}
+
+	public function alertFlaggedComments(int $count)
+	{
+		$this->send("There are ${count} flagged comments on closed requests currently awaiting redaction.");
+	}
+
+	#endregion
+
+	#region email management (close reasons)
+
+	/**
+	 * Summary of emailCreated
+	 *
+	 * @param EmailTemplate $template
+	 */
+	public function emailCreated(EmailTemplate $template)
+	{
+		$username = $this->currentUser->getUsername();
+		$this->send("Email {$template->getId()} ({$template->getName()}) created by " . $username);
+	}
+
+	/**
+	 * Summary of emailEdited
+	 *
+	 * @param EmailTemplate $template
+	 */
+	public function emailEdited(EmailTemplate $template)
+	{
+		$username = $this->currentUser->getUsername();
+		$this->send("Email {$template->getId()} ({$template->getName()}) edited by " . $username);
+	}
+	#endregion
 }

includes/Helpers/Logger.php

Indentation +423 added lines, -423 removed lines

@@ -35,427 +35,427 @@
  */
 class Logger
 {
-    /**
-     * @param PdoDatabase $database
-     * @param Request     $object
-     */
-    public static function emailConfirmed(PdoDatabase $database, Request $object)
-    {
-        self::createLogEntry($database, $object, "Email Confirmed", null, User::getCommunity());
-    }
-
-    /**
-     * @param PdoDatabase $database
-     * @param DataObject  $object
-     * @param string      $logAction
-     * @param null|string $comment
-     * @param User|null   $user
-     * @param int|null    $domain
-     *
-     * @throws Exception
-     */
-    private static function createLogEntry(
-        PdoDatabase $database,
-        DataObject $object,
-        $logAction,
-        $comment = null,
-        $user = null,
-        ?int $domain = null
-    ) {
-        if ($user == null) {
-            $user = User::getCurrent($database);
-        }
-
-        $objectType = get_class($object);
-        if (strpos($objectType, 'Waca\\DataObjects\\') !== false) {
-            $objectType = str_replace('Waca\\DataObjects\\', '', $objectType);
-        }
-
-        $log = new Log();
-
-        if ($domain !== null) {
-            $log->setDomain($domain);
-        }
-        elseif (method_exists($object, 'getDomain')) {
-            $log->setDomain($object->getDomain());
-        }
-
-        $log->setDatabase($database);
-        $log->setAction($logAction);
-        $log->setObjectId($object->getId());
-        $log->setObjectType($objectType);
-        $log->setUser($user);
-        $log->setComment($comment);
-        $log->save();
-    }
-
-    #region Users
-
-    /**
-     * @throws Exception
-     */
-    public static function newUser(PdoDatabase $database, User $user)
-    {
-        self::createLogEntry($database, $user, 'Registered', null, User::getCommunity());
-    }
-
-    /**
-     * @throws Exception
-     */
-    public static function approvedUser(PdoDatabase $database, User $object)
-    {
-        self::createLogEntry($database, $object, "Approved");
-    }
-
-    /**
-     * @throws Exception
-     */
-    public static function deactivatedUser(PdoDatabase $database, User $object, string $comment)
-    {
-        self::createLogEntry($database, $object, 'DeactivatedUser', $comment);
-    }
-
-    /**
-     * @throws Exception
-     */
-    public static function requestedReactivation(PdoDatabase $database, User $object, string $comment)
-    {
-        self::createLogEntry($database, $object, 'RequestedReactivation', $comment);
-    }
-
-    /**
-     * @throws Exception
-     */
-    public static function renamedUser(PdoDatabase $database, User $object, string $comment)
-    {
-        self::createLogEntry($database, $object, "Renamed", $comment);
-    }
-
-    /**
-     * @throws Exception
-     */
-    public static function userPreferencesChange(PdoDatabase $database, User $object)
-    {
-        self::createLogEntry($database, $object, "Prefchange");
-    }
-
-    /**
-     * @throws Exception
-     */
-    public static function userRolesEdited(
-        PdoDatabase $database,
-        User $object,
-        string $reason,
-        array $added,
-        array $removed,
-        int $domain
-    ) {
-        $logData = serialize(array(
-            'added'   => $added,
-            'removed' => $removed,
-            'reason'  => $reason,
-        ));
-
-        self::createLogEntry($database, $object, "RoleChange", $logData, null, $domain);
-    }
-
-    /**
-     * @throws Exception
-     */
-    public static function userGlobalRolesEdited(
-        PdoDatabase $database,
-        User $object,
-        string $reason,
-        array $added,
-        array $removed
-    ): void {
-        $logData = serialize(array(
-            'added' => $added,
-            'removed' => $removed,
-            'reason' => $reason,
-        ));
-
-        self::createLogEntry($database, $object, "GlobalRoleChange", $logData);
-    }
-
-    #endregion
-
-    /**
-     * @param PdoDatabase $database
-     * @param SiteNotice  $object
-     */
-    public static function siteNoticeEdited(PdoDatabase $database, SiteNotice $object)
-    {
-        self::createLogEntry($database, $object, "Edited");
-    }
-
-    #region Welcome Templates
-
-    /**
-     * @param PdoDatabase     $database
-     * @param WelcomeTemplate $object
-     */
-    public static function welcomeTemplateCreated(PdoDatabase $database, WelcomeTemplate $object)
-    {
-        self::createLogEntry($database, $object, "CreatedTemplate");
-    }
-
-    /**
-     * @param PdoDatabase     $database
-     * @param WelcomeTemplate $object
-     */
-    public static function welcomeTemplateEdited(PdoDatabase $database, WelcomeTemplate $object)
-    {
-        self::createLogEntry($database, $object, "EditedTemplate");
-    }
-
-    /**
-     * @param PdoDatabase     $database
-     * @param WelcomeTemplate $object
-     */
-    public static function welcomeTemplateDeleted(PdoDatabase $database, WelcomeTemplate $object)
-    {
-        self::createLogEntry($database, $object, "DeletedTemplate");
-    }
-
-    #endregion
-
-    #region Bans
-
-    /**
-     * @param PdoDatabase $database
-     * @param Ban         $object
-     * @param string      $reason
-     */
-    public static function banned(PdoDatabase $database, Ban $object, $reason)
-    {
-        self::createLogEntry($database, $object, "Banned", $reason);
-    }
-
-    /**
-     * @param PdoDatabase $database
-     * @param Ban         $object
-     * @param string      $reason
-     */
-    public static function unbanned(PdoDatabase $database, Ban $object, $reason)
-    {
-        self::createLogEntry($database, $object, "Unbanned", $reason);
-    }
-
-    public static function banReplaced(PdoDatabase $database, Ban $object)
-    {
-        self::createLogEntry($database, $object, "BanReplaced");
-    }
-
-    #endregion
-
-    #region Requests
-
-    /**
-     * @param PdoDatabase $database
-     * @param Request     $object
-     * @param string      $target
-     */
-    public static function deferRequest(PdoDatabase $database, Request $object, $target)
-    {
-        self::createLogEntry($database, $object, "Deferred to $target");
-    }
-
-    /**
-     * @param PdoDatabase $database
-     * @param Request     $object
-     * @param integer     $target
-     * @param string      $comment
-     * @param User|null   $logUser
-     */
-    public static function closeRequest(PdoDatabase $database, Request $object, $target, $comment, User $logUser = null)
-    {
-        self::createLogEntry($database, $object, "Closed $target", $comment, $logUser);
-    }
-
-    public static function manuallyConfirmRequest(PdoDatabase $database, Request $object)
-    {
-        self::createLogEntry($database, $object, "Manually Confirmed");
-    }
-
-    /**
-     * @param PdoDatabase $database
-     * @param Request     $object
-     */
-    public static function reserve(PdoDatabase $database, Request $object)
-    {
-        self::createLogEntry($database, $object, "Reserved");
-    }
-
-    /**
-     * @param PdoDatabase $database
-     * @param Request     $object
-     */
-    public static function breakReserve(PdoDatabase $database, Request $object)
-    {
-        self::createLogEntry($database, $object, "BreakReserve");
-    }
-
-    /**
-     * @param PdoDatabase $database
-     * @param Request     $object
-     */
-    public static function unreserve(PdoDatabase $database, Request $object)
-    {
-        self::createLogEntry($database, $object, "Unreserved");
-    }
-
-    /**
-     * @param PdoDatabase $database
-     * @param Comment     $object
-     * @param Request     $request
-     */
-    public static function editComment(PdoDatabase $database, Comment $object, Request $request)
-    {
-        self::createLogEntry($database, $request, "EditComment-r");
-        self::createLogEntry($database, $object, "EditComment-c", null, null, $request->getDomain());
-    }
-
-    /**
-     * @param PdoDatabase $database
-     * @param Comment     $object
-     */
-    public static function flaggedComment(PdoDatabase $database, Comment $object, int $domain)
-    {
-        self::createLogEntry($database, $object, "FlaggedComment", null, null, $domain);
-    }
-
-    /**
-     * @param PdoDatabase $database
-     * @param Comment     $object
-     */
-    public static function unflaggedComment(PdoDatabase $database, Comment $object, int $domain)
-    {
-        self::createLogEntry($database, $object, "UnflaggedComment", null, null, $domain);
-    }
-
-    /**
-     * @param PdoDatabase $database
-     * @param Request     $object
-     * @param User        $target
-     */
-    public static function sendReservation(PdoDatabase $database, Request $object, User $target)
-    {
-        self::createLogEntry($database, $object, "SendReserved");
-        self::createLogEntry($database, $object, "ReceiveReserved", null, $target);
-    }
-
-    /**
-     * @param PdoDatabase $database
-     * @param Request     $object
-     * @param string      $comment
-     */
-    public static function sentMail(PdoDatabase $database, Request $object, $comment)
-    {
-        self::createLogEntry($database, $object, "SentMail", $comment);
-    }
-
-    /**
-     * @param PdoDatabase $database
-     * @param Request     $object
-     */
-    public static function enqueuedJobQueue(PdoDatabase $database, Request $object)
-    {
-        self::createLogEntry($database, $object, 'EnqueuedJobQueue');
-    }
-
-    public static function hospitalised(PdoDatabase $database, Request $object)
-    {
-        self::createLogEntry($database, $object, 'Hospitalised');
-    }
-    #endregion
-
-    #region Email templates
-
-    /**
-     * @param PdoDatabase   $database
-     * @param EmailTemplate $object
-     */
-    public static function createEmail(PdoDatabase $database, EmailTemplate $object)
-    {
-        self::createLogEntry($database, $object, "CreatedEmail");
-    }
-
-    /**
-     * @param PdoDatabase   $database
-     * @param EmailTemplate $object
-     */
-    public static function editedEmail(PdoDatabase $database, EmailTemplate $object)
-    {
-        self::createLogEntry($database, $object, "EditedEmail");
-    }
-
-    #endregion
-
-    #region Display
-
-    #endregion
-
-    #region Automation
-
-    public static function backgroundJobComplete(PdoDatabase $database, JobQueue $job)
-    {
-        self::createLogEntry($database, $job, 'JobCompleted', null, User::getCommunity());
-    }
-
-    public static function backgroundJobIssue(PdoDatabase $database, JobQueue $job)
-    {
-        $data = array('status' => $job->getStatus(), 'error' => $job->getError());
-        self::createLogEntry($database, $job, 'JobIssue', serialize($data), User::getCommunity());
-    }
-
-    public static function backgroundJobCancelled(PdoDatabase $database, JobQueue $job)
-    {
-        self::createLogEntry($database, $job, 'JobCancelled', $job->getError());
-    }
-
-    public static function backgroundJobRequeued(PdoDatabase $database, JobQueue $job)
-    {
-        self::createLogEntry($database, $job, 'JobRequeued');
-    }
-
-    public static function backgroundJobAcknowledged(PdoDatabase $database, JobQueue $job, $comment = null)
-    {
-        self::createLogEntry($database, $job, 'JobAcknowledged', $comment);
-    }
-    #endregion
-
-    #region Request Queues
-    public static function requestQueueCreated(PdoDatabase $database, RequestQueue $queue)
-    {
-        self::createLogEntry($database, $queue, 'QueueCreated');
-    }
-
-    public static function requestQueueEdited(PdoDatabase $database, RequestQueue $queue)
-    {
-        self::createLogEntry($database, $queue, 'QueueEdited');
-    }
-    #endregion
-    #region Domains
-    public static function domainCreated(PdoDatabase $database, Domain $domain)
-    {
-        self::createLogEntry($database, $domain, 'DomainCreated');
-    }
-
-    public static function domainEdited(PdoDatabase $database, Domain $domain)
-    {
-        self::createLogEntry($database, $domain, 'DomainEdited');
-    }
-    #endregion
-    #region Request Forms
-    public static function requestFormCreated(PdoDatabase $database, RequestForm $requestForm)
-    {
-        self::createLogEntry($database, $requestForm, 'RequestFormCreated');
-    }
-
-    public static function requestFormEdited(PdoDatabase $database, RequestForm $requestForm)
-    {
-        self::createLogEntry($database, $requestForm, 'RequestFormEdited');
-    }
-    #endregion
+	/**
+	 * @param PdoDatabase $database
+	 * @param Request     $object
+	 */
+	public static function emailConfirmed(PdoDatabase $database, Request $object)
+	{
+		self::createLogEntry($database, $object, "Email Confirmed", null, User::getCommunity());
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param DataObject  $object
+	 * @param string      $logAction
+	 * @param null|string $comment
+	 * @param User|null   $user
+	 * @param int|null    $domain
+	 *
+	 * @throws Exception
+	 */
+	private static function createLogEntry(
+		PdoDatabase $database,
+		DataObject $object,
+		$logAction,
+		$comment = null,
+		$user = null,
+		?int $domain = null
+	) {
+		if ($user == null) {
+			$user = User::getCurrent($database);
+		}
+
+		$objectType = get_class($object);
+		if (strpos($objectType, 'Waca\\DataObjects\\') !== false) {
+			$objectType = str_replace('Waca\\DataObjects\\', '', $objectType);
+		}
+
+		$log = new Log();
+
+		if ($domain !== null) {
+			$log->setDomain($domain);
+		}
+		elseif (method_exists($object, 'getDomain')) {
+			$log->setDomain($object->getDomain());
+		}
+
+		$log->setDatabase($database);
+		$log->setAction($logAction);
+		$log->setObjectId($object->getId());
+		$log->setObjectType($objectType);
+		$log->setUser($user);
+		$log->setComment($comment);
+		$log->save();
+	}
+
+	#region Users
+
+	/**
+	 * @throws Exception
+	 */
+	public static function newUser(PdoDatabase $database, User $user)
+	{
+		self::createLogEntry($database, $user, 'Registered', null, User::getCommunity());
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public static function approvedUser(PdoDatabase $database, User $object)
+	{
+		self::createLogEntry($database, $object, "Approved");
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public static function deactivatedUser(PdoDatabase $database, User $object, string $comment)
+	{
+		self::createLogEntry($database, $object, 'DeactivatedUser', $comment);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public static function requestedReactivation(PdoDatabase $database, User $object, string $comment)
+	{
+		self::createLogEntry($database, $object, 'RequestedReactivation', $comment);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public static function renamedUser(PdoDatabase $database, User $object, string $comment)
+	{
+		self::createLogEntry($database, $object, "Renamed", $comment);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public static function userPreferencesChange(PdoDatabase $database, User $object)
+	{
+		self::createLogEntry($database, $object, "Prefchange");
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public static function userRolesEdited(
+		PdoDatabase $database,
+		User $object,
+		string $reason,
+		array $added,
+		array $removed,
+		int $domain
+	) {
+		$logData = serialize(array(
+			'added'   => $added,
+			'removed' => $removed,
+			'reason'  => $reason,
+		));
+
+		self::createLogEntry($database, $object, "RoleChange", $logData, null, $domain);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public static function userGlobalRolesEdited(
+		PdoDatabase $database,
+		User $object,
+		string $reason,
+		array $added,
+		array $removed
+	): void {
+		$logData = serialize(array(
+			'added' => $added,
+			'removed' => $removed,
+			'reason' => $reason,
+		));
+
+		self::createLogEntry($database, $object, "GlobalRoleChange", $logData);
+	}
+
+	#endregion
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param SiteNotice  $object
+	 */
+	public static function siteNoticeEdited(PdoDatabase $database, SiteNotice $object)
+	{
+		self::createLogEntry($database, $object, "Edited");
+	}
+
+	#region Welcome Templates
+
+	/**
+	 * @param PdoDatabase     $database
+	 * @param WelcomeTemplate $object
+	 */
+	public static function welcomeTemplateCreated(PdoDatabase $database, WelcomeTemplate $object)
+	{
+		self::createLogEntry($database, $object, "CreatedTemplate");
+	}
+
+	/**
+	 * @param PdoDatabase     $database
+	 * @param WelcomeTemplate $object
+	 */
+	public static function welcomeTemplateEdited(PdoDatabase $database, WelcomeTemplate $object)
+	{
+		self::createLogEntry($database, $object, "EditedTemplate");
+	}
+
+	/**
+	 * @param PdoDatabase     $database
+	 * @param WelcomeTemplate $object
+	 */
+	public static function welcomeTemplateDeleted(PdoDatabase $database, WelcomeTemplate $object)
+	{
+		self::createLogEntry($database, $object, "DeletedTemplate");
+	}
+
+	#endregion
+
+	#region Bans
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param Ban         $object
+	 * @param string      $reason
+	 */
+	public static function banned(PdoDatabase $database, Ban $object, $reason)
+	{
+		self::createLogEntry($database, $object, "Banned", $reason);
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param Ban         $object
+	 * @param string      $reason
+	 */
+	public static function unbanned(PdoDatabase $database, Ban $object, $reason)
+	{
+		self::createLogEntry($database, $object, "Unbanned", $reason);
+	}
+
+	public static function banReplaced(PdoDatabase $database, Ban $object)
+	{
+		self::createLogEntry($database, $object, "BanReplaced");
+	}
+
+	#endregion
+
+	#region Requests
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param Request     $object
+	 * @param string      $target
+	 */
+	public static function deferRequest(PdoDatabase $database, Request $object, $target)
+	{
+		self::createLogEntry($database, $object, "Deferred to $target");
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param Request     $object
+	 * @param integer     $target
+	 * @param string      $comment
+	 * @param User|null   $logUser
+	 */
+	public static function closeRequest(PdoDatabase $database, Request $object, $target, $comment, User $logUser = null)
+	{
+		self::createLogEntry($database, $object, "Closed $target", $comment, $logUser);
+	}
+
+	public static function manuallyConfirmRequest(PdoDatabase $database, Request $object)
+	{
+		self::createLogEntry($database, $object, "Manually Confirmed");
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param Request     $object
+	 */
+	public static function reserve(PdoDatabase $database, Request $object)
+	{
+		self::createLogEntry($database, $object, "Reserved");
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param Request     $object
+	 */
+	public static function breakReserve(PdoDatabase $database, Request $object)
+	{
+		self::createLogEntry($database, $object, "BreakReserve");
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param Request     $object
+	 */
+	public static function unreserve(PdoDatabase $database, Request $object)
+	{
+		self::createLogEntry($database, $object, "Unreserved");
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param Comment     $object
+	 * @param Request     $request
+	 */
+	public static function editComment(PdoDatabase $database, Comment $object, Request $request)
+	{
+		self::createLogEntry($database, $request, "EditComment-r");
+		self::createLogEntry($database, $object, "EditComment-c", null, null, $request->getDomain());
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param Comment     $object
+	 */
+	public static function flaggedComment(PdoDatabase $database, Comment $object, int $domain)
+	{
+		self::createLogEntry($database, $object, "FlaggedComment", null, null, $domain);
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param Comment     $object
+	 */
+	public static function unflaggedComment(PdoDatabase $database, Comment $object, int $domain)
+	{
+		self::createLogEntry($database, $object, "UnflaggedComment", null, null, $domain);
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param Request     $object
+	 * @param User        $target
+	 */
+	public static function sendReservation(PdoDatabase $database, Request $object, User $target)
+	{
+		self::createLogEntry($database, $object, "SendReserved");
+		self::createLogEntry($database, $object, "ReceiveReserved", null, $target);
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param Request     $object
+	 * @param string      $comment
+	 */
+	public static function sentMail(PdoDatabase $database, Request $object, $comment)
+	{
+		self::createLogEntry($database, $object, "SentMail", $comment);
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 * @param Request     $object
+	 */
+	public static function enqueuedJobQueue(PdoDatabase $database, Request $object)
+	{
+		self::createLogEntry($database, $object, 'EnqueuedJobQueue');
+	}
+
+	public static function hospitalised(PdoDatabase $database, Request $object)
+	{
+		self::createLogEntry($database, $object, 'Hospitalised');
+	}
+	#endregion
+
+	#region Email templates
+
+	/**
+	 * @param PdoDatabase   $database
+	 * @param EmailTemplate $object
+	 */
+	public static function createEmail(PdoDatabase $database, EmailTemplate $object)
+	{
+		self::createLogEntry($database, $object, "CreatedEmail");
+	}
+
+	/**
+	 * @param PdoDatabase   $database
+	 * @param EmailTemplate $object
+	 */
+	public static function editedEmail(PdoDatabase $database, EmailTemplate $object)
+	{
+		self::createLogEntry($database, $object, "EditedEmail");
+	}
+
+	#endregion
+
+	#region Display
+
+	#endregion
+
+	#region Automation
+
+	public static function backgroundJobComplete(PdoDatabase $database, JobQueue $job)
+	{
+		self::createLogEntry($database, $job, 'JobCompleted', null, User::getCommunity());
+	}
+
+	public static function backgroundJobIssue(PdoDatabase $database, JobQueue $job)
+	{
+		$data = array('status' => $job->getStatus(), 'error' => $job->getError());
+		self::createLogEntry($database, $job, 'JobIssue', serialize($data), User::getCommunity());
+	}
+
+	public static function backgroundJobCancelled(PdoDatabase $database, JobQueue $job)
+	{
+		self::createLogEntry($database, $job, 'JobCancelled', $job->getError());
+	}
+
+	public static function backgroundJobRequeued(PdoDatabase $database, JobQueue $job)
+	{
+		self::createLogEntry($database, $job, 'JobRequeued');
+	}
+
+	public static function backgroundJobAcknowledged(PdoDatabase $database, JobQueue $job, $comment = null)
+	{
+		self::createLogEntry($database, $job, 'JobAcknowledged', $comment);
+	}
+	#endregion
+
+	#region Request Queues
+	public static function requestQueueCreated(PdoDatabase $database, RequestQueue $queue)
+	{
+		self::createLogEntry($database, $queue, 'QueueCreated');
+	}
+
+	public static function requestQueueEdited(PdoDatabase $database, RequestQueue $queue)
+	{
+		self::createLogEntry($database, $queue, 'QueueEdited');
+	}
+	#endregion
+	#region Domains
+	public static function domainCreated(PdoDatabase $database, Domain $domain)
+	{
+		self::createLogEntry($database, $domain, 'DomainCreated');
+	}
+
+	public static function domainEdited(PdoDatabase $database, Domain $domain)
+	{
+		self::createLogEntry($database, $domain, 'DomainEdited');
+	}
+	#endregion
+	#region Request Forms
+	public static function requestFormCreated(PdoDatabase $database, RequestForm $requestForm)
+	{
+		self::createLogEntry($database, $requestForm, 'RequestFormCreated');
+	}
+
+	public static function requestFormEdited(PdoDatabase $database, RequestForm $requestForm)
+	{
+		self::createLogEntry($database, $requestForm, 'RequestFormEdited');
+	}
+	#endregion
 }

includes/Helpers/PreferenceManager.php

Indentation +186 added lines, -186 removed lines

@@ -18,172 +18,172 @@ 
 
 class PreferenceManager
 {
-    const PREF_WELCOMETEMPLATE = 'welcomeTemplate';
-    const PREF_SKIP_JS_ABORT = 'skipJsAbort';
-    const PREF_EMAIL_SIGNATURE = 'emailSignature';
-    const PREF_CREATION_MODE = 'creationMode';
-    const PREF_SKIN = 'skin';
-    const PREF_DEFAULT_DOMAIN = 'defaultDomain';
-    const PREF_QUEUE_HELP = 'showQueueHelp';
-
-    const ADMIN_PREF_PREVENT_REACTIVATION = 'preventReactivation';
-
-    const CREATION_MANUAL = 0;
-    const CREATION_OAUTH = 1;
-    const CREATION_BOT = 2;
-    /** @var PdoDatabase */
-    private $database;
-    /** @var int */
-    private $user;
-    /** @var ?int */
-    private $domain;
-    /** @var PreferenceManager|null */
-    private static $currentUser = null;
-    private $cachedPreferences = null;
-
-    public function __construct(PdoDatabase $database, int $user, ?int $domain)
-    {
-        $this->database = $database;
-        $this->user = $user;
-        $this->domain = $domain;
-    }
-
-    public static function getForCurrent(PdoDatabase $database): PreferenceManager
-    {
-        if (self::$currentUser === null) {
-            $user = User::getCurrent($database)->getId();
-            $domain = WebRequest::getSessionDomain();
-
-            self::$currentUser = new self($database, $user, $domain);
-        }
-
-        return self::$currentUser;
-    }
-
-    public function setLocalPreference(string $preference, $value): void
-    {
-        if ($this->cachedPreferences === null) {
-            $this->loadPreferences();
-        }
-
-        if ($this->cachedPreferences[$preference]['value'] == $value
-            && $this->cachedPreferences[$preference]['global'] === false) {
-            return;
-        }
-
-        $localPreference = UserPreference::getLocalPreference($this->database, $this->user, $preference, $this->domain);
-        if ($localPreference === false) {
-            $localPreference = new UserPreference();
-            $localPreference->setDatabase($this->database);
-            $localPreference->setDomain($this->domain);
-            $localPreference->setUser($this->user);
-            $localPreference->setPreference($preference);
-        }
-
-        $localPreference->setValue($value);
-        $localPreference->save();
-
-        $this->cachedPreferences[$preference] = [
-            'value'  => $value,
-            'global' => false,
-        ];
-    }
-
-    public function setGlobalPreference(string $preference, $value): void
-    {
-        if ($this->cachedPreferences === null) {
-            $this->loadPreferences();
-        }
-
-        if ($this->cachedPreferences[$preference]['value'] == $value
-            && $this->cachedPreferences[$preference]['global'] === true) {
-            return;
-        }
-
-        $this->deleteLocalPreference($preference);
-
-        $globalPreference = UserPreference::getGlobalPreference($this->database, $this->user, $preference);
-        if ($globalPreference === false) {
-            $globalPreference = new UserPreference();
-            $globalPreference->setDatabase($this->database);
-            $globalPreference->setDomain(null);
-            $globalPreference->setUser($this->user);
-            $globalPreference->setPreference($preference);
-        }
-
-        $globalPreference->setValue($value);
-        $globalPreference->save();
-
-        $this->cachedPreferences[$preference] = [
-            'value'  => $value,
-            'global' => true,
-        ];
-    }
-
-    public function getPreference(string $preference)
-    {
-        if ($this->cachedPreferences === null) {
-            $this->loadPreferences();
-        }
-
-        if (!isset($this->cachedPreferences[$preference])) {
-            return null;
-        }
-
-        return $this->cachedPreferences[$preference]['value'];
-    }
-
-    public function isGlobalPreference(string $preference) : ?bool
-    {
-        if ($this->cachedPreferences === null) {
-            $this->loadPreferences();
-        }
-
-        if (!isset($this->cachedPreferences[$preference])) {
-            return null;
-        }
-
-        return $this->cachedPreferences[$preference]['global'];
-    }
-
-    protected function deleteLocalPreference(string $preference): void
-    {
-        $getStatement = $this->database->prepare('SELECT * FROM userpreference WHERE preference = :preference AND USER = :user AND domain = :domain');
-        $getStatement->execute([
-            ':user'       => $this->user,
-            ':preference' => $preference,
-            ':domain'     => $this->domain
-        ]);
-
-        $localPreference = $getStatement->fetchObject(UserPreference::class);
-        if ($localPreference !== false) {
-            $localPreference->setDatabase($this->database);
-            $localPreference->delete();
-        }
-    }
-
-    protected function loadPreferences(): void
-    {
-        /**
-         * OK, this is a bit of a complicated query.
-         * It's designed to get all the preferences defined for a user in a specified domain, falling back to globally
-         * defined preferences if a local preference isn't set. As such, this query is the *heart* of how global
-         * preferences work.
-         *
-         * Starting with the WHERE, we filter rows:
-         *   a) where the row's domain is the domain we're looking for
-         *   b) where the row's domain is null, thus it's a global setting
-         *   c) if we don't have a domain we're looking for, fall back to global only
-         *
-         * The MAX(...) OVER(...) is a window function, *not* an aggregate. It basically takes the max of all selected
-         * rows' domain columns, grouped by the preference column. Since any number N < null, this highlights all the
-         * correct settings (local has precedence over global) such that prefpart == domain.
-         *
-         * -1 is used to represent null in the COALESCE() calls, since domain.id is an unsigned int hence -1 is an
-         * impossible value
-         */
-        $sql = /** @lang SQL */
-            <<<'EOF'
+	const PREF_WELCOMETEMPLATE = 'welcomeTemplate';
+	const PREF_SKIP_JS_ABORT = 'skipJsAbort';
+	const PREF_EMAIL_SIGNATURE = 'emailSignature';
+	const PREF_CREATION_MODE = 'creationMode';
+	const PREF_SKIN = 'skin';
+	const PREF_DEFAULT_DOMAIN = 'defaultDomain';
+	const PREF_QUEUE_HELP = 'showQueueHelp';
+
+	const ADMIN_PREF_PREVENT_REACTIVATION = 'preventReactivation';
+
+	const CREATION_MANUAL = 0;
+	const CREATION_OAUTH = 1;
+	const CREATION_BOT = 2;
+	/** @var PdoDatabase */
+	private $database;
+	/** @var int */
+	private $user;
+	/** @var ?int */
+	private $domain;
+	/** @var PreferenceManager|null */
+	private static $currentUser = null;
+	private $cachedPreferences = null;
+
+	public function __construct(PdoDatabase $database, int $user, ?int $domain)
+	{
+		$this->database = $database;
+		$this->user = $user;
+		$this->domain = $domain;
+	}
+
+	public static function getForCurrent(PdoDatabase $database): PreferenceManager
+	{
+		if (self::$currentUser === null) {
+			$user = User::getCurrent($database)->getId();
+			$domain = WebRequest::getSessionDomain();
+
+			self::$currentUser = new self($database, $user, $domain);
+		}
+
+		return self::$currentUser;
+	}
+
+	public function setLocalPreference(string $preference, $value): void
+	{
+		if ($this->cachedPreferences === null) {
+			$this->loadPreferences();
+		}
+
+		if ($this->cachedPreferences[$preference]['value'] == $value
+			&& $this->cachedPreferences[$preference]['global'] === false) {
+			return;
+		}
+
+		$localPreference = UserPreference::getLocalPreference($this->database, $this->user, $preference, $this->domain);
+		if ($localPreference === false) {
+			$localPreference = new UserPreference();
+			$localPreference->setDatabase($this->database);
+			$localPreference->setDomain($this->domain);
+			$localPreference->setUser($this->user);
+			$localPreference->setPreference($preference);
+		}
+
+		$localPreference->setValue($value);
+		$localPreference->save();
+
+		$this->cachedPreferences[$preference] = [
+			'value'  => $value,
+			'global' => false,
+		];
+	}
+
+	public function setGlobalPreference(string $preference, $value): void
+	{
+		if ($this->cachedPreferences === null) {
+			$this->loadPreferences();
+		}
+
+		if ($this->cachedPreferences[$preference]['value'] == $value
+			&& $this->cachedPreferences[$preference]['global'] === true) {
+			return;
+		}
+
+		$this->deleteLocalPreference($preference);
+
+		$globalPreference = UserPreference::getGlobalPreference($this->database, $this->user, $preference);
+		if ($globalPreference === false) {
+			$globalPreference = new UserPreference();
+			$globalPreference->setDatabase($this->database);
+			$globalPreference->setDomain(null);
+			$globalPreference->setUser($this->user);
+			$globalPreference->setPreference($preference);
+		}
+
+		$globalPreference->setValue($value);
+		$globalPreference->save();
+
+		$this->cachedPreferences[$preference] = [
+			'value'  => $value,
+			'global' => true,
+		];
+	}
+
+	public function getPreference(string $preference)
+	{
+		if ($this->cachedPreferences === null) {
+			$this->loadPreferences();
+		}
+
+		if (!isset($this->cachedPreferences[$preference])) {
+			return null;
+		}
+
+		return $this->cachedPreferences[$preference]['value'];
+	}
+
+	public function isGlobalPreference(string $preference) : ?bool
+	{
+		if ($this->cachedPreferences === null) {
+			$this->loadPreferences();
+		}
+
+		if (!isset($this->cachedPreferences[$preference])) {
+			return null;
+		}
+
+		return $this->cachedPreferences[$preference]['global'];
+	}
+
+	protected function deleteLocalPreference(string $preference): void
+	{
+		$getStatement = $this->database->prepare('SELECT * FROM userpreference WHERE preference = :preference AND USER = :user AND domain = :domain');
+		$getStatement->execute([
+			':user'       => $this->user,
+			':preference' => $preference,
+			':domain'     => $this->domain
+		]);
+
+		$localPreference = $getStatement->fetchObject(UserPreference::class);
+		if ($localPreference !== false) {
+			$localPreference->setDatabase($this->database);
+			$localPreference->delete();
+		}
+	}
+
+	protected function loadPreferences(): void
+	{
+		/**
+		 * OK, this is a bit of a complicated query.
+		 * It's designed to get all the preferences defined for a user in a specified domain, falling back to globally
+		 * defined preferences if a local preference isn't set. As such, this query is the *heart* of how global
+		 * preferences work.
+		 *
+		 * Starting with the WHERE, we filter rows:
+		 *   a) where the row's domain is the domain we're looking for
+		 *   b) where the row's domain is null, thus it's a global setting
+		 *   c) if we don't have a domain we're looking for, fall back to global only
+		 *
+		 * The MAX(...) OVER(...) is a window function, *not* an aggregate. It basically takes the max of all selected
+		 * rows' domain columns, grouped by the preference column. Since any number N < null, this highlights all the
+		 * correct settings (local has precedence over global) such that prefpart == domain.
+		 *
+		 * -1 is used to represent null in the COALESCE() calls, since domain.id is an unsigned int hence -1 is an
+		 * impossible value
+		 */
+		$sql = /** @lang SQL */
+			<<<'EOF'
 WITH allprefs AS (
     SELECT up.domain, up.preference, MAX(up.domain) OVER (PARTITION BY up.preference) AS prefpart, up.value, CASE WHEN up.domain IS NULL THEN 1 END AS isglobal
     FROM userpreference up
@@ -194,24 +194,24 @@ 
 FROM allprefs p
 WHERE COALESCE(p.prefpart, -1) = COALESCE(p.domain, -1);
 EOF;
-        $statement = $this->database->prepare($sql);
-
-        $statement->execute([
-            ':domain'  => $this->domain,
-            ':domainc' => $this->domain,
-            ':user'    => $this->user,
-        ]);
-
-        $rawPrefs = $statement->fetchAll(PDO::FETCH_ASSOC);
-        $prefs = [];
-
-        foreach ($rawPrefs as $p) {
-            $prefs[$p['preference']] = [
-                'value'  => $p['value'],
-                'global' => $p['isglobal'] == 1,
-            ];
-        }
-
-        $this->cachedPreferences = $prefs;
-    }
+		$statement = $this->database->prepare($sql);
+
+		$statement->execute([
+			':domain'  => $this->domain,
+			':domainc' => $this->domain,
+			':user'    => $this->user,
+		]);
+
+		$rawPrefs = $statement->fetchAll(PDO::FETCH_ASSOC);
+		$prefs = [];
+
+		foreach ($rawPrefs as $p) {
+			$prefs[$p['preference']] = [
+				'value'  => $p['value'],
+				'global' => $p['isglobal'] == 1,
+			];
+		}
+
+		$this->cachedPreferences = $prefs;
+	}
 }

includes/Helpers/BanHelper.php

Indentation +161 added lines, -161 removed lines

@@ -21,64 +21,64 @@ 
 
 class BanHelper implements IBanHelper
 {
-    /** @var PdoDatabase */
-    private $database;
-    /** @var IXffTrustProvider */
-    private $xffTrustProvider;
-    /** @var Ban[][] */
-    private $banCache = [];
-
-    private ?ISecurityManager $securityManager;
-
-    public function __construct(
-        PdoDatabase $database,
-        IXffTrustProvider $xffTrustProvider,
-        ?ISecurityManager $securityManager
-    ) {
-        $this->database = $database;
-        $this->xffTrustProvider = $xffTrustProvider;
-        $this->securityManager = $securityManager;
-    }
-
-    public function isBlockBanned(Request $request): bool
-    {
-        if (!isset($this->banCache[$request->getId()])) {
-            $this->banCache[$request->getId()] = $this->getBansForRequestFromDatabase($request);
-        }
-
-        foreach ($this->banCache[$request->getId()] as $ban) {
-            if ($ban->getAction() === Ban::ACTION_BLOCK) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param Request $request
-     *
-     * @return Ban[]
-     */
-    public function getBans(Request $request): array
-    {
-        if (!isset($this->banCache[$request->getId()])) {
-            $this->banCache[$request->getId()] = $this->getBansForRequestFromDatabase($request);
-        }
-
-        return $this->banCache[$request->getId()];
-    }
-
-    public function getBansByTarget(
-        ?string $name,
-        ?string $email,
-        ?string $ip,
-        ?int $mask,
-        ?string $useragent,
-        int $domain
-    ) {
-        /** @noinspection SqlConstantCondition */
-        $query = <<<SQL
+	/** @var PdoDatabase */
+	private $database;
+	/** @var IXffTrustProvider */
+	private $xffTrustProvider;
+	/** @var Ban[][] */
+	private $banCache = [];
+
+	private ?ISecurityManager $securityManager;
+
+	public function __construct(
+		PdoDatabase $database,
+		IXffTrustProvider $xffTrustProvider,
+		?ISecurityManager $securityManager
+	) {
+		$this->database = $database;
+		$this->xffTrustProvider = $xffTrustProvider;
+		$this->securityManager = $securityManager;
+	}
+
+	public function isBlockBanned(Request $request): bool
+	{
+		if (!isset($this->banCache[$request->getId()])) {
+			$this->banCache[$request->getId()] = $this->getBansForRequestFromDatabase($request);
+		}
+
+		foreach ($this->banCache[$request->getId()] as $ban) {
+			if ($ban->getAction() === Ban::ACTION_BLOCK) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param Request $request
+	 *
+	 * @return Ban[]
+	 */
+	public function getBans(Request $request): array
+	{
+		if (!isset($this->banCache[$request->getId()])) {
+			$this->banCache[$request->getId()] = $this->getBansForRequestFromDatabase($request);
+		}
+
+		return $this->banCache[$request->getId()];
+	}
+
+	public function getBansByTarget(
+		?string $name,
+		?string $email,
+		?string $ip,
+		?int $mask,
+		?string $useragent,
+		int $domain
+	) {
+		/** @noinspection SqlConstantCondition */
+		$query = <<<SQL
 SELECT * FROM ban 
 WHERE 1 = 1
   AND ((name IS NULL AND :nname IS NULL) OR name = :name)
@@ -91,85 +91,85 @@ 
   AND (domain IS NULL OR domain = :domain);
 SQL;
 
-        $statement = $this->database->prepare($query);
-        $statement->execute([
-            ':name'       => $name,
-            ':nname'      => $name,
-            ':email'      => $email,
-            ':nemail'     => $email,
-            ':ip'         => $ip,
-            ':nip'        => $ip,
-            ':ipmask'     => $mask,
-            ':nipmask'    => $mask,
-            ':useragent'  => $useragent,
-            ':nuseragent' => $useragent,
-            ':domain'     => $domain,
-        ]);
-
-        $result = array();
-
-        /** @var Ban $v */
-        foreach ($statement->fetchAll(PDO::FETCH_CLASS, Ban::class) as $v) {
-            $v->setDatabase($this->database);
-            $result[] = $v;
-        }
-
-        return $result;
-    }
-
-    public function isActive(Ban $ban): bool
-    {
-        if (!$ban->isActive()) {
-            return false;
-        }
-
-        if ($ban->getDuration() !== null && $ban->getDuration() < time()) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function canUnban(Ban $ban): bool
-    {
-        if ($this->securityManager === null) {
-            return false;
-        }
-
-        if (!$this->isActive($ban)) {
-            return false;
-        }
-
-        $user = User::getCurrent($this->database);
-
-        $allowed = true;
-        $allowed = $allowed && ($ban->getName() === null || $this->securityManager->allows('BanType', 'name', $user) === ISecurityManager::ALLOWED);
-        $allowed = $allowed && ($ban->getEmail() === null || $this->securityManager->allows('BanType', 'email', $user) === ISecurityManager::ALLOWED);
-        $allowed = $allowed && ($ban->getIp() === null || $this->securityManager->allows('BanType', 'ip', $user) === ISecurityManager::ALLOWED);
-        $allowed = $allowed && ($ban->getUseragent() === null || $this->securityManager->allows('BanType', 'useragent', $user) === ISecurityManager::ALLOWED);
-
-        if ($ban->getDomain() === null) {
-            $allowed &= $this->securityManager->allows('BanType', 'global', $user) === ISecurityManager::ALLOWED;
-        }
-        else {
-            $currentDomain = Domain::getCurrent($this->database);
-            $allowed &= $currentDomain->getId() === $ban->getDomain();
-        }
-
-        $allowed = $allowed && $this->securityManager->allows('BanVisibility', $ban->getVisibility(), $user) === ISecurityManager::ALLOWED;
-
-        return $allowed;
-    }
-
-    /**
-     * @param Request $request
-     *
-     * @return Ban[]
-     */
-    private function getBansForRequestFromDatabase(Request $request): array
-    {
-        /** @noinspection SqlConstantCondition - included for clarity of code */
-        $query = <<<SQL
+		$statement = $this->database->prepare($query);
+		$statement->execute([
+			':name'       => $name,
+			':nname'      => $name,
+			':email'      => $email,
+			':nemail'     => $email,
+			':ip'         => $ip,
+			':nip'        => $ip,
+			':ipmask'     => $mask,
+			':nipmask'    => $mask,
+			':useragent'  => $useragent,
+			':nuseragent' => $useragent,
+			':domain'     => $domain,
+		]);
+
+		$result = array();
+
+		/** @var Ban $v */
+		foreach ($statement->fetchAll(PDO::FETCH_CLASS, Ban::class) as $v) {
+			$v->setDatabase($this->database);
+			$result[] = $v;
+		}
+
+		return $result;
+	}
+
+	public function isActive(Ban $ban): bool
+	{
+		if (!$ban->isActive()) {
+			return false;
+		}
+
+		if ($ban->getDuration() !== null && $ban->getDuration() < time()) {
+			return false;
+		}
+
+		return true;
+	}
+
+	public function canUnban(Ban $ban): bool
+	{
+		if ($this->securityManager === null) {
+			return false;
+		}
+
+		if (!$this->isActive($ban)) {
+			return false;
+		}
+
+		$user = User::getCurrent($this->database);
+
+		$allowed = true;
+		$allowed = $allowed && ($ban->getName() === null || $this->securityManager->allows('BanType', 'name', $user) === ISecurityManager::ALLOWED);
+		$allowed = $allowed && ($ban->getEmail() === null || $this->securityManager->allows('BanType', 'email', $user) === ISecurityManager::ALLOWED);
+		$allowed = $allowed && ($ban->getIp() === null || $this->securityManager->allows('BanType', 'ip', $user) === ISecurityManager::ALLOWED);
+		$allowed = $allowed && ($ban->getUseragent() === null || $this->securityManager->allows('BanType', 'useragent', $user) === ISecurityManager::ALLOWED);
+
+		if ($ban->getDomain() === null) {
+			$allowed &= $this->securityManager->allows('BanType', 'global', $user) === ISecurityManager::ALLOWED;
+		}
+		else {
+			$currentDomain = Domain::getCurrent($this->database);
+			$allowed &= $currentDomain->getId() === $ban->getDomain();
+		}
+
+		$allowed = $allowed && $this->securityManager->allows('BanVisibility', $ban->getVisibility(), $user) === ISecurityManager::ALLOWED;
+
+		return $allowed;
+	}
+
+	/**
+	 * @param Request $request
+	 *
+	 * @return Ban[]
+	 */
+	private function getBansForRequestFromDatabase(Request $request): array
+	{
+		/** @noinspection SqlConstantCondition - included for clarity of code */
+		$query = <<<SQL
 SELECT b.* FROM ban b
 LEFT JOIN netmask n ON 1 = 1
     AND n.cidr = b.ipmask
@@ -191,28 +191,28 @@ 
     AND (b.domain IS NULL OR b.domain = :domain)
 SQL;
 
-        $statement = $this->database->prepare($query);
-        $trustedIp = $this->xffTrustProvider->getTrustedClientIp($request->getIp(), $request->getForwardedIp());
-
-        $statement->execute([
-            ':name'      => $request->getName(),
-            ':email'     => $request->getEmail(),
-            ':useragent' => $request->getUserAgent(),
-            ':domain'    => $request->getDomain(),
-            ':ip4'       => $trustedIp,
-            ':ip6h'      => $trustedIp,
-            ':ip6l'      => $trustedIp,
-        ]);
-
-        /** @var Ban[] $result */
-        $result = [];
-
-        /** @var Ban $v */
-        foreach ($statement->fetchAll(PDO::FETCH_CLASS, Ban::class) as $v) {
-            $v->setDatabase($this->database);
-            $result[] = $v;
-        }
-
-        return $result;
-    }
+		$statement = $this->database->prepare($query);
+		$trustedIp = $this->xffTrustProvider->getTrustedClientIp($request->getIp(), $request->getForwardedIp());
+
+		$statement->execute([
+			':name'      => $request->getName(),
+			':email'     => $request->getEmail(),
+			':useragent' => $request->getUserAgent(),
+			':domain'    => $request->getDomain(),
+			':ip4'       => $trustedIp,
+			':ip6h'      => $trustedIp,
+			':ip6l'      => $trustedIp,
+		]);
+
+		/** @var Ban[] $result */
+		$result = [];
+
+		/** @var Ban $v */
+		foreach ($statement->fetchAll(PDO::FETCH_CLASS, Ban::class) as $v) {
+			$v->setDatabase($this->database);
+			$result[] = $v;
+		}
+
+		return $result;
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -150,8 +150,7 @@
 
         if ($ban->getDomain() === null) {
             $allowed &= $this->securityManager->allows('BanType', 'global', $user) === ISecurityManager::ALLOWED;
-        }
-        else {
+        } else {
             $currentDomain = Domain::getCurrent($this->database);
             $allowed &= $currentDomain->getId() === $ban->getDomain();
         }