mdaniels5757 / waca

includes/Offline.php

Indentation +47 added lines, -47 removed lines

@@ -18,58 +18,58 @@
  */
 class Offline
 {
-    /**
-     * Determines if the tool is offline
-     * @return bool
-     */
-    public static function isOffline(SiteConfiguration $configuration): bool
-    {
-        return (bool)$configuration->getOffline()['offline'];
-    }
+	/**
+	 * Determines if the tool is offline
+	 * @return bool
+	 */
+	public static function isOffline(SiteConfiguration $configuration): bool
+	{
+		return (bool)$configuration->getOffline()['offline'];
+	}
 
-    /**
-     * Gets the offline message
-     *
-     * @throws SmartyException
-     */
-    public static function getOfflineMessage(bool $external, SiteConfiguration $configuration, ?string $message = null): string
-    {
-        $baseurl = $configuration->getBaseUrl();
-        $culprit = $configuration->getOffline()['culprit'];
-        $reason = $configuration->getOffline()['reason'];
+	/**
+	 * Gets the offline message
+	 *
+	 * @throws SmartyException
+	 */
+	public static function getOfflineMessage(bool $external, SiteConfiguration $configuration, ?string $message = null): string
+	{
+		$baseurl = $configuration->getBaseUrl();
+		$culprit = $configuration->getOffline()['culprit'];
+		$reason = $configuration->getOffline()['reason'];
 
-        $smarty = new Smarty();
-        $smarty->assign("baseurl", $baseurl);
-        $smarty->assign("resourceCacheEpoch", 0);
-        $smarty->assign("alerts", []);
-        $smarty->assign("toolversion", Environment::getToolVersion());
-        $smarty->assign("onlineusers", []);
+		$smarty = new Smarty();
+		$smarty->assign("baseurl", $baseurl);
+		$smarty->assign("resourceCacheEpoch", 0);
+		$smarty->assign("alerts", []);
+		$smarty->assign("toolversion", Environment::getToolVersion());
+		$smarty->assign("onlineusers", []);
 
-        if (!headers_sent()) {
-            header("HTTP/1.1 503 Service Unavailable");
-        }
+		if (!headers_sent()) {
+			header("HTTP/1.1 503 Service Unavailable");
+		}
 
-        if ($external) {
-            return $smarty->fetch("offline/external.tpl");
-        }
-        else {
-            $hideCulprit = true;
+		if ($external) {
+			return $smarty->fetch("offline/external.tpl");
+		}
+		else {
+			$hideCulprit = true;
 
-            // Use the provided message if possible
-            if ($message === null) {
-                $hideCulprit = false;
-                $message = $reason;
-            }
+			// Use the provided message if possible
+			if ($message === null) {
+				$hideCulprit = false;
+				$message = $reason;
+			}
 
-            $smarty->assign("hideCulprit", $hideCulprit);
-            $smarty->assign("dontUseDbCulprit", $culprit);
-            $smarty->assign("dontUseDbReason", $message);
-            $smarty->assign("alerts", []);
-            $smarty->assign('currentUser', User::getCommunity());
-            $smarty->assign('skin', 'main');
-            $smarty->assign('currentDomain', null);
+			$smarty->assign("hideCulprit", $hideCulprit);
+			$smarty->assign("dontUseDbCulprit", $culprit);
+			$smarty->assign("dontUseDbReason", $message);
+			$smarty->assign("alerts", []);
+			$smarty->assign('currentUser', User::getCommunity());
+			$smarty->assign('skin', 'main');
+			$smarty->assign('currentDomain', null);
 
-            return $smarty->fetch("offline/internal.tpl");
-        }
-    }
+			return $smarty->fetch("offline/internal.tpl");
+		}
+	}
 }

includes/Fragments/RequestData.php

Indentation +358 added lines, -358 removed lines

@@ -27,364 +27,364 @@
 
 trait RequestData
 {
-    /** @return SiteConfiguration */
-    protected abstract function getSiteConfiguration();
-
-    /**
-     * @var array Array of IP address classed as 'private' by RFC1918.
-     */
-    protected static $rfc1918ips = array(
-        "10.0.0.0"    => "10.255.255.255",
-        "172.16.0.0"  => "172.31.255.255",
-        "192.168.0.0" => "192.168.255.255",
-        "169.254.0.0" => "169.254.255.255",
-        "127.0.0.0"   => "127.255.255.255",
-    );
-
-    /**
-     * Gets a request object
-     *
-     * @param PdoDatabase $database  The database connection
-     * @param int|null    $requestId The ID of the request to retrieve
-     *
-     * @return Request
-     * @throws ApplicationLogicException
-     */
-    protected function getRequest(PdoDatabase $database, $requestId)
-    {
-        if ($requestId === null) {
-            throw new ApplicationLogicException("No request specified");
-        }
-
-        $request = Request::getById($requestId, $database);
-        if ($request === false || !is_a($request, Request::class)) {
-            throw new ApplicationLogicException('Could not load the requested request!');
-        }
-
-        return $request;
-    }
-
-    /**
-     * Returns a value stating whether the user is allowed to see private data or not
-     *
-     * @param Request $request
-     * @param User    $currentUser
-     *
-     * @return bool
-     * @category Security-Critical
-     */
-    protected function isAllowedPrivateData(Request $request, User $currentUser)
-    {
-        // Test the main security barrier for private data access using SecurityManager
-        if ($this->barrierTest('alwaysSeePrivateData', $currentUser, 'RequestData')) {
-            // Tool admins/check-users can always see private data
-            return true;
-        }
-
-        // reserving user is allowed to see the data
-        if ($currentUser->getId() === $request->getReserved()
-            && $request->getReserved() !== null
-            && $this->barrierTest('seePrivateDataWhenReserved', $currentUser, 'RequestData')
-        ) {
-            return true;
-        }
-
-        // user has the reveal hash
-        if (WebRequest::getString('hash') === $request->getRevealHash()
-            && $this->barrierTest('seePrivateDataWithHash', $currentUser, 'RequestData')
-        ) {
-            return true;
-        }
-
-        // nope. Not allowed.
-        return false;
-    }
-
-    /**
-     * Tests the security barrier for a specified action.
-     *
-     * Don't use within templates
-     *
-     * @param string      $action
-     *
-     * @param User        $user
-     * @param null|string $pageName
-     *
-     * @return bool
-     * @category Security-Critical
-     */
-    abstract protected function barrierTest($action, User $user, $pageName = null);
-
-    /**
-     * Gets the name of the route that has been passed from the request router.
-     * @return string
-     */
-    abstract protected function getRouteName();
-
-    abstract protected function getSecurityManager(): ISecurityManager;
-
-    /**
-     * Sets the name of the template this page should display.
-     *
-     * @param string $name
-     */
-    abstract protected function setTemplate($name);
-
-    /** @return IXffTrustProvider */
-    abstract protected function getXffTrustProvider();
-
-    /** @return ILocationProvider */
-    abstract protected function getLocationProvider();
-
-    /** @return IRDnsProvider */
-    abstract protected function getRdnsProvider();
-
-    /**
-     * Assigns a Smarty variable
-     *
-     * @param  array|string $name  the template variable name(s)
-     * @param  mixed        $value the value to assign
-     */
-    abstract protected function assign($name, $value);
-
-    /**
-     * @param int|null    $requestReservationId
-     * @param PdoDatabase $database
-     * @param User        $currentUser
-     */
-    protected function setupReservationDetails($requestReservationId, PdoDatabase $database, User $currentUser)
-    {
-        $requestIsReserved = $requestReservationId !== null;
-        $this->assign('requestIsReserved', $requestIsReserved);
-        $this->assign('requestIsReservedByMe', false);
-
-        if ($requestIsReserved) {
-            $this->assign('requestReservedByName', User::getById($requestReservationId, $database)->getUsername());
-            $this->assign('requestReservedById', $requestReservationId);
-
-            if ($requestReservationId === $currentUser->getId()) {
-                $this->assign('requestIsReservedByMe', true);
-            }
-        }
-
-        $this->assign('canBreakReservation', $this->barrierTest('force', $currentUser, PageBreakReservation::class));
-    }
-
-    /**
-     * Adds private request data to Smarty. DO NOT USE WITHOUT FIRST CHECKING THAT THE USER IS AUTHORISED!
-     *
-     * @param Request           $request
-     * @param SiteConfiguration $configuration
-     */
-    protected function setupPrivateData(
-        $request,
-        SiteConfiguration $configuration
-    ) {
-        $xffProvider = $this->getXffTrustProvider();
-
-        $this->assign('requestEmail', $request->getEmail());
-        $emailDomain = explode("@", $request->getEmail())[1];
-        $this->assign("emailurl", $emailDomain);
-        $this->assign('commonEmailDomain', in_array(strtolower($emailDomain), $configuration->getCommonEmailDomains())
-            || $request->getEmail() === $this->getSiteConfiguration()->getDataClearEmail());
-
-        $trustedIp = $xffProvider->getTrustedClientIp($request->getIp(), $request->getForwardedIp());
-        $this->assign('requestTrustedIp', $trustedIp);
-        $this->assign('requestTrustedIpProtocol', $this->getIpProtocol($trustedIp));
-        $this->assign('requestRealIp', $request->getIp());
-        $this->assign('requestForwardedIp', $request->getForwardedIp());
-
-        $trustedIpLocation = $this->getLocationProvider()->getIpLocation($trustedIp);
-        $this->assign('requestTrustedIpLocation', $trustedIpLocation);
-
-        $this->assign('requestHasForwardedIp', $request->getForwardedIp() !== null);
-
-        $this->setupForwardedIpData($request);
-    }
-
-    /**
-     * Adds related request data to Smarty. DO NOT USE WITHOUT FIRST CHECKING THAT THE USER IS AUTHORISED!
-     *
-     * @param Request           $request
-     * @param SiteConfiguration $configuration
-     * @param PdoDatabase       $database
-     */
-    protected function setupRelatedRequests(
-        Request $request,
-        SiteConfiguration $configuration,
-        PdoDatabase $database)
-    {
-        $this->assign('canSeeRelatedRequests', true);
-
-        // TODO: Do we want to return results from other domains?
-        $relatedEmailRequests = RequestSearchHelper::get($database, null)
-            ->byEmailAddress($request->getEmail())
-            ->withConfirmedEmail()
-            ->excludingPurgedData($configuration)
-            ->excludingRequest($request->getId())
-            ->fetch();
-
-        $this->assign('requestRelatedEmailRequestsCount', count($relatedEmailRequests));
-        $this->assign('requestRelatedEmailRequests', $relatedEmailRequests);
-
-        $trustedIp = $this->getXffTrustProvider()->getTrustedClientIp($request->getIp(), $request->getForwardedIp());
-
-        // TODO: Do we want to return results from other domains?
-        $relatedIpRequests = RequestSearchHelper::get($database, null)
-            ->byIp($trustedIp)
-            ->withConfirmedEmail()
-            ->excludingPurgedData($configuration)
-            ->excludingRequest($request->getId())
-            ->fetch();
-
-        $this->assign('requestRelatedIpRequestsCount', count($relatedIpRequests));
-        $this->assign('requestRelatedIpRequests', $relatedIpRequests);
-    }
-
-    /**
-     * Adds checkuser request data to Smarty. DO NOT USE WITHOUT FIRST CHECKING THAT THE USER IS AUTHORISED!
-     *
-     * @param Request $request
-     */
-    protected function setupCheckUserData(Request $request)
-    {
-        $this->assign('requestUserAgent', $request->getUserAgent());
-
-        $data = \Waca\DataObjects\RequestData::getForRequest($request->getId(), $request->getDatabase(), \Waca\DataObjects\RequestData::TYPE_CLIENTHINT);
-        $this->assign('requestClientHints', $data);
-    }
-
-    /**
-     * Sets up the basic data for this request, and adds it to Smarty
-     *
-     * @param Request           $request
-     * @param SiteConfiguration $config
-     */
-    protected function setupBasicData(Request $request, SiteConfiguration $config)
-    {
-        $this->assign('requestId', $request->getId());
-        $this->assign('updateVersion', $request->getUpdateVersion());
-        $this->assign('requestName', $request->getName());
-        $this->assign('requestDate', $request->getDate());
-        $this->assign('requestStatus', $request->getStatus());
-
-        $this->assign('requestQueue', null);
-        if ($request->getQueue() !== null) {
-            /** @var RequestQueue $queue */
-            $queue = RequestQueue::getById($request->getQueue(), $this->getDatabase());
-            $this->assign('requestQueue', $queue->getHeader());
-            $this->assign('requestQueueApiName', $queue->getApiName());
-        }
-
-        $this->assign('canPreviewForm', $this->barrierTest('view', User::getCurrent($this->getDatabase()), PageRequestFormManagement::class));
-        $this->assign('originForm', $request->getOriginFormObject());
-
-        $isClosed = $request->getStatus() === RequestStatus::CLOSED || $request->getStatus() === RequestStatus::JOBQUEUE;
-        $this->assign('requestIsClosed', $isClosed);
+	/** @return SiteConfiguration */
+	protected abstract function getSiteConfiguration();
+
+	/**
+	 * @var array Array of IP address classed as 'private' by RFC1918.
+	 */
+	protected static $rfc1918ips = array(
+		"10.0.0.0"    => "10.255.255.255",
+		"172.16.0.0"  => "172.31.255.255",
+		"192.168.0.0" => "192.168.255.255",
+		"169.254.0.0" => "169.254.255.255",
+		"127.0.0.0"   => "127.255.255.255",
+	);
+
+	/**
+	 * Gets a request object
+	 *
+	 * @param PdoDatabase $database  The database connection
+	 * @param int|null    $requestId The ID of the request to retrieve
+	 *
+	 * @return Request
+	 * @throws ApplicationLogicException
+	 */
+	protected function getRequest(PdoDatabase $database, $requestId)
+	{
+		if ($requestId === null) {
+			throw new ApplicationLogicException("No request specified");
+		}
+
+		$request = Request::getById($requestId, $database);
+		if ($request === false || !is_a($request, Request::class)) {
+			throw new ApplicationLogicException('Could not load the requested request!');
+		}
+
+		return $request;
+	}
+
+	/**
+	 * Returns a value stating whether the user is allowed to see private data or not
+	 *
+	 * @param Request $request
+	 * @param User    $currentUser
+	 *
+	 * @return bool
+	 * @category Security-Critical
+	 */
+	protected function isAllowedPrivateData(Request $request, User $currentUser)
+	{
+		// Test the main security barrier for private data access using SecurityManager
+		if ($this->barrierTest('alwaysSeePrivateData', $currentUser, 'RequestData')) {
+			// Tool admins/check-users can always see private data
+			return true;
+		}
+
+		// reserving user is allowed to see the data
+		if ($currentUser->getId() === $request->getReserved()
+			&& $request->getReserved() !== null
+			&& $this->barrierTest('seePrivateDataWhenReserved', $currentUser, 'RequestData')
+		) {
+			return true;
+		}
+
+		// user has the reveal hash
+		if (WebRequest::getString('hash') === $request->getRevealHash()
+			&& $this->barrierTest('seePrivateDataWithHash', $currentUser, 'RequestData')
+		) {
+			return true;
+		}
+
+		// nope. Not allowed.
+		return false;
+	}
+
+	/**
+	 * Tests the security barrier for a specified action.
+	 *
+	 * Don't use within templates
+	 *
+	 * @param string      $action
+	 *
+	 * @param User        $user
+	 * @param null|string $pageName
+	 *
+	 * @return bool
+	 * @category Security-Critical
+	 */
+	abstract protected function barrierTest($action, User $user, $pageName = null);
+
+	/**
+	 * Gets the name of the route that has been passed from the request router.
+	 * @return string
+	 */
+	abstract protected function getRouteName();
+
+	abstract protected function getSecurityManager(): ISecurityManager;
+
+	/**
+	 * Sets the name of the template this page should display.
+	 *
+	 * @param string $name
+	 */
+	abstract protected function setTemplate($name);
+
+	/** @return IXffTrustProvider */
+	abstract protected function getXffTrustProvider();
+
+	/** @return ILocationProvider */
+	abstract protected function getLocationProvider();
+
+	/** @return IRDnsProvider */
+	abstract protected function getRdnsProvider();
+
+	/**
+	 * Assigns a Smarty variable
+	 *
+	 * @param  array|string $name  the template variable name(s)
+	 * @param  mixed        $value the value to assign
+	 */
+	abstract protected function assign($name, $value);
+
+	/**
+	 * @param int|null    $requestReservationId
+	 * @param PdoDatabase $database
+	 * @param User        $currentUser
+	 */
+	protected function setupReservationDetails($requestReservationId, PdoDatabase $database, User $currentUser)
+	{
+		$requestIsReserved = $requestReservationId !== null;
+		$this->assign('requestIsReserved', $requestIsReserved);
+		$this->assign('requestIsReservedByMe', false);
+
+		if ($requestIsReserved) {
+			$this->assign('requestReservedByName', User::getById($requestReservationId, $database)->getUsername());
+			$this->assign('requestReservedById', $requestReservationId);
+
+			if ($requestReservationId === $currentUser->getId()) {
+				$this->assign('requestIsReservedByMe', true);
+			}
+		}
+
+		$this->assign('canBreakReservation', $this->barrierTest('force', $currentUser, PageBreakReservation::class));
+	}
+
+	/**
+	 * Adds private request data to Smarty. DO NOT USE WITHOUT FIRST CHECKING THAT THE USER IS AUTHORISED!
+	 *
+	 * @param Request           $request
+	 * @param SiteConfiguration $configuration
+	 */
+	protected function setupPrivateData(
+		$request,
+		SiteConfiguration $configuration
+	) {
+		$xffProvider = $this->getXffTrustProvider();
+
+		$this->assign('requestEmail', $request->getEmail());
+		$emailDomain = explode("@", $request->getEmail())[1];
+		$this->assign("emailurl", $emailDomain);
+		$this->assign('commonEmailDomain', in_array(strtolower($emailDomain), $configuration->getCommonEmailDomains())
+			|| $request->getEmail() === $this->getSiteConfiguration()->getDataClearEmail());
+
+		$trustedIp = $xffProvider->getTrustedClientIp($request->getIp(), $request->getForwardedIp());
+		$this->assign('requestTrustedIp', $trustedIp);
+		$this->assign('requestTrustedIpProtocol', $this->getIpProtocol($trustedIp));
+		$this->assign('requestRealIp', $request->getIp());
+		$this->assign('requestForwardedIp', $request->getForwardedIp());
+
+		$trustedIpLocation = $this->getLocationProvider()->getIpLocation($trustedIp);
+		$this->assign('requestTrustedIpLocation', $trustedIpLocation);
+
+		$this->assign('requestHasForwardedIp', $request->getForwardedIp() !== null);
+
+		$this->setupForwardedIpData($request);
+	}
+
+	/**
+	 * Adds related request data to Smarty. DO NOT USE WITHOUT FIRST CHECKING THAT THE USER IS AUTHORISED!
+	 *
+	 * @param Request           $request
+	 * @param SiteConfiguration $configuration
+	 * @param PdoDatabase       $database
+	 */
+	protected function setupRelatedRequests(
+		Request $request,
+		SiteConfiguration $configuration,
+		PdoDatabase $database)
+	{
+		$this->assign('canSeeRelatedRequests', true);
+
+		// TODO: Do we want to return results from other domains?
+		$relatedEmailRequests = RequestSearchHelper::get($database, null)
+			->byEmailAddress($request->getEmail())
+			->withConfirmedEmail()
+			->excludingPurgedData($configuration)
+			->excludingRequest($request->getId())
+			->fetch();
+
+		$this->assign('requestRelatedEmailRequestsCount', count($relatedEmailRequests));
+		$this->assign('requestRelatedEmailRequests', $relatedEmailRequests);
+
+		$trustedIp = $this->getXffTrustProvider()->getTrustedClientIp($request->getIp(), $request->getForwardedIp());
+
+		// TODO: Do we want to return results from other domains?
+		$relatedIpRequests = RequestSearchHelper::get($database, null)
+			->byIp($trustedIp)
+			->withConfirmedEmail()
+			->excludingPurgedData($configuration)
+			->excludingRequest($request->getId())
+			->fetch();
+
+		$this->assign('requestRelatedIpRequestsCount', count($relatedIpRequests));
+		$this->assign('requestRelatedIpRequests', $relatedIpRequests);
+	}
+
+	/**
+	 * Adds checkuser request data to Smarty. DO NOT USE WITHOUT FIRST CHECKING THAT THE USER IS AUTHORISED!
+	 *
+	 * @param Request $request
+	 */
+	protected function setupCheckUserData(Request $request)
+	{
+		$this->assign('requestUserAgent', $request->getUserAgent());
+
+		$data = \Waca\DataObjects\RequestData::getForRequest($request->getId(), $request->getDatabase(), \Waca\DataObjects\RequestData::TYPE_CLIENTHINT);
+		$this->assign('requestClientHints', $data);
+	}
+
+	/**
+	 * Sets up the basic data for this request, and adds it to Smarty
+	 *
+	 * @param Request           $request
+	 * @param SiteConfiguration $config
+	 */
+	protected function setupBasicData(Request $request, SiteConfiguration $config)
+	{
+		$this->assign('requestId', $request->getId());
+		$this->assign('updateVersion', $request->getUpdateVersion());
+		$this->assign('requestName', $request->getName());
+		$this->assign('requestDate', $request->getDate());
+		$this->assign('requestStatus', $request->getStatus());
+
+		$this->assign('requestQueue', null);
+		if ($request->getQueue() !== null) {
+			/** @var RequestQueue $queue */
+			$queue = RequestQueue::getById($request->getQueue(), $this->getDatabase());
+			$this->assign('requestQueue', $queue->getHeader());
+			$this->assign('requestQueueApiName', $queue->getApiName());
+		}
+
+		$this->assign('canPreviewForm', $this->barrierTest('view', User::getCurrent($this->getDatabase()), PageRequestFormManagement::class));
+		$this->assign('originForm', $request->getOriginFormObject());
+
+		$isClosed = $request->getStatus() === RequestStatus::CLOSED || $request->getStatus() === RequestStatus::JOBQUEUE;
+		$this->assign('requestIsClosed', $isClosed);
 		$isHospital = $request->getStatus() === RequestStatus::HOSPITAL;
 		$this->assign('requestIsHospital', $isHospital);
-    }
-
-    /**
-     * Sets up the forwarded IP data for this request and adds it to Smarty
-     *
-     * @param Request $request
-     */
-    protected function setupForwardedIpData(Request $request)
-    {
-        if ($request->getForwardedIp() !== null) {
-            $requestProxyData = array(); // Initialize array to store data to be output in Smarty template.
-            $proxyIndex = 0;
-
-            // Assuming [client] <=> [proxy1] <=> [proxy2] <=> [proxy3] <=> [us], we will see an XFF header of [client],
-            // [proxy1], [proxy2], and our actual IP will be [proxy3]
-            $proxies = explode(",", $request->getForwardedIp());
-            $proxies[] = $request->getIp();
-
-            // Origin is the supposed "client" IP.
-            $origin = $proxies[0];
-            $this->assign("forwardedOrigin", $origin);
-
-            // We step through the servers in reverse order, from closest to furthest
-            $proxies = array_reverse($proxies);
-
-            // By default, we have trust, because the first in the chain is now REMOTE_ADDR, which is hardest to spoof.
-            $trust = true;
-
-            /**
-             * @var int    $index     The zero-based index of the proxy.
-             * @var string $proxyData The proxy IP address (although possibly not!)
-             */
-            foreach ($proxies as $index => $proxyData) {
-                $proxyAddress = trim($proxyData);
-                $requestProxyData[$proxyIndex]['ip'] = $proxyAddress;
-                $requestProxyData[$proxyIndex]['protocol'] = $this->getIpProtocol($proxyAddress);
-
-                // get data on this IP.
-                $thisProxyIsTrusted = $this->getXffTrustProvider()->isTrusted($proxyAddress);
-
-                $proxyIsInPrivateRange = $this->getXffTrustProvider()
-                    ->ipInRange(self::$rfc1918ips, $proxyAddress);
-
-                if (!$proxyIsInPrivateRange) {
-                    $proxyReverseDns = $this->getRdnsProvider()->getReverseDNS($proxyAddress);
-                    $proxyLocation = $this->getLocationProvider()->getIpLocation($proxyAddress);
-                }
-                else {
-                    // this is going to fail, so why bother trying?
-                    $proxyReverseDns = false;
-                    $proxyLocation = false;
-                }
-
-                // current trust chain status BEFORE this link
-                $preLinkTrust = $trust;
-
-                // is *this* link trusted? Note, this will be true even if there is an untrusted link before this!
-                $requestProxyData[$proxyIndex]['trustedlink'] = $thisProxyIsTrusted;
-
-                // set the trust status of the chain to this point
-                $trust = $trust & $thisProxyIsTrusted;
-
-                // If this is the origin address, and the chain was trusted before this point, then we can trust
-                // the origin.
-                if ($preLinkTrust && $proxyAddress == $origin) {
-                    // if this is the origin, then we are at the last point in the chain.
-                    // @todo: this is probably the cause of some bugs when an IP appears twice - we're missing a check
-                    // to see if this is *really* the last in the chain, rather than just the same IP as it.
-                    $trust = true;
-                }
-
-                $requestProxyData[$proxyIndex]['trust'] = $trust;
-
-                $requestProxyData[$proxyIndex]['rdnsfailed'] = $proxyReverseDns === false;
-                $requestProxyData[$proxyIndex]['rdns'] = $proxyReverseDns;
-                $requestProxyData[$proxyIndex]['routable'] = !$proxyIsInPrivateRange;
-
-                $requestProxyData[$proxyIndex]['location'] = $proxyLocation;
-
-                if ($proxyReverseDns === $proxyAddress && $proxyIsInPrivateRange === false) {
-                    $requestProxyData[$proxyIndex]['rdns'] = null;
-                }
-
-                $showLinks = (!$trust || $proxyAddress == $origin) && !$proxyIsInPrivateRange;
-                $requestProxyData[$proxyIndex]['showlinks'] = $showLinks;
-
-                $proxyIndex++;
-            }
-
-            $this->assign("requestProxyData", $requestProxyData);
-        }
-    }
-
-    private function getIpProtocol(string $ip): ?int
-    {
-        if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-            return 4;
-        }
-        if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-            return 6;
-        }
-
-        return null;
-    }
+	}
+
+	/**
+	 * Sets up the forwarded IP data for this request and adds it to Smarty
+	 *
+	 * @param Request $request
+	 */
+	protected function setupForwardedIpData(Request $request)
+	{
+		if ($request->getForwardedIp() !== null) {
+			$requestProxyData = array(); // Initialize array to store data to be output in Smarty template.
+			$proxyIndex = 0;
+
+			// Assuming [client] <=> [proxy1] <=> [proxy2] <=> [proxy3] <=> [us], we will see an XFF header of [client],
+			// [proxy1], [proxy2], and our actual IP will be [proxy3]
+			$proxies = explode(",", $request->getForwardedIp());
+			$proxies[] = $request->getIp();
+
+			// Origin is the supposed "client" IP.
+			$origin = $proxies[0];
+			$this->assign("forwardedOrigin", $origin);
+
+			// We step through the servers in reverse order, from closest to furthest
+			$proxies = array_reverse($proxies);
+
+			// By default, we have trust, because the first in the chain is now REMOTE_ADDR, which is hardest to spoof.
+			$trust = true;
+
+			/**
+			 * @var int    $index     The zero-based index of the proxy.
+			 * @var string $proxyData The proxy IP address (although possibly not!)
+			 */
+			foreach ($proxies as $index => $proxyData) {
+				$proxyAddress = trim($proxyData);
+				$requestProxyData[$proxyIndex]['ip'] = $proxyAddress;
+				$requestProxyData[$proxyIndex]['protocol'] = $this->getIpProtocol($proxyAddress);
+
+				// get data on this IP.
+				$thisProxyIsTrusted = $this->getXffTrustProvider()->isTrusted($proxyAddress);
+
+				$proxyIsInPrivateRange = $this->getXffTrustProvider()
+					->ipInRange(self::$rfc1918ips, $proxyAddress);
+
+				if (!$proxyIsInPrivateRange) {
+					$proxyReverseDns = $this->getRdnsProvider()->getReverseDNS($proxyAddress);
+					$proxyLocation = $this->getLocationProvider()->getIpLocation($proxyAddress);
+				}
+				else {
+					// this is going to fail, so why bother trying?
+					$proxyReverseDns = false;
+					$proxyLocation = false;
+				}
+
+				// current trust chain status BEFORE this link
+				$preLinkTrust = $trust;
+
+				// is *this* link trusted? Note, this will be true even if there is an untrusted link before this!
+				$requestProxyData[$proxyIndex]['trustedlink'] = $thisProxyIsTrusted;
+
+				// set the trust status of the chain to this point
+				$trust = $trust & $thisProxyIsTrusted;
+
+				// If this is the origin address, and the chain was trusted before this point, then we can trust
+				// the origin.
+				if ($preLinkTrust && $proxyAddress == $origin) {
+					// if this is the origin, then we are at the last point in the chain.
+					// @todo: this is probably the cause of some bugs when an IP appears twice - we're missing a check
+					// to see if this is *really* the last in the chain, rather than just the same IP as it.
+					$trust = true;
+				}
+
+				$requestProxyData[$proxyIndex]['trust'] = $trust;
+
+				$requestProxyData[$proxyIndex]['rdnsfailed'] = $proxyReverseDns === false;
+				$requestProxyData[$proxyIndex]['rdns'] = $proxyReverseDns;
+				$requestProxyData[$proxyIndex]['routable'] = !$proxyIsInPrivateRange;
+
+				$requestProxyData[$proxyIndex]['location'] = $proxyLocation;
+
+				if ($proxyReverseDns === $proxyAddress && $proxyIsInPrivateRange === false) {
+					$requestProxyData[$proxyIndex]['rdns'] = null;
+				}
+
+				$showLinks = (!$trust || $proxyAddress == $origin) && !$proxyIsInPrivateRange;
+				$requestProxyData[$proxyIndex]['showlinks'] = $showLinks;
+
+				$proxyIndex++;
+			}
+
+			$this->assign("requestProxyData", $requestProxyData);
+		}
+	}
+
+	private function getIpProtocol(string $ip): ?int
+	{
+		if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+			return 4;
+		}
+		if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+			return 6;
+		}
+
+		return null;
+	}
 }

includes/API/Actions/MetricsAction.php

Indentation +64 added lines, -64 removed lines

@@ -18,57 +18,57 @@ 
  */
 class MetricsAction extends TextApiPageBase implements IApiAction
 {
-    private array $metrics = [];
+	private array $metrics = [];
 
-    private function defineMetric(string $name, string $help, string $type = 'gauge'): void
-    {
-        $this->metrics[$name] = ['help' => $help, 'type' => $type, 'values' => []];
-    }
+	private function defineMetric(string $name, string $help, string $type = 'gauge'): void
+	{
+		$this->metrics[$name] = ['help' => $help, 'type' => $type, 'values' => []];
+	}
 
-    private function setMetric(string $name, array $labels = [], int $value = 0): void
-    {
-        $calculatedLabel = '';
+	private function setMetric(string $name, array $labels = [], int $value = 0): void
+	{
+		$calculatedLabel = '';
 
-        if (count($labels) > 0) {
-            ksort($labels);
+		if (count($labels) > 0) {
+			ksort($labels);
 
-            $labelData = [];
-            foreach ($labels as $label => $labelValue) {
-                $labelData[] = $label . '="' . $labelValue . '"';
-            }
+			$labelData = [];
+			foreach ($labels as $label => $labelValue) {
+				$labelData[] = $label . '="' . $labelValue . '"';
+			}
 
-            $calculatedLabel = '{' . implode(',', $labelData) . '}';
-        }
+			$calculatedLabel = '{' . implode(',', $labelData) . '}';
+		}
 
-        $this->metrics[$name]['values'][$calculatedLabel] = $value;
-    }
+		$this->metrics[$name]['values'][$calculatedLabel] = $value;
+	}
 
-    public function runApiPage(): string
-    {
-        $this->defineMetric('acc_users', 'Number of users');
-        $statement = $this->getDatabase()->query('SELECT status, COUNT(*) AS count FROM user GROUP BY status;');
+	public function runApiPage(): string
+	{
+		$this->defineMetric('acc_users', 'Number of users');
+		$statement = $this->getDatabase()->query('SELECT status, COUNT(*) AS count FROM user GROUP BY status;');
 
-        foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
-            $this->setMetric('acc_users', ['status' => $row['status']], $row['count']);
-        }
-        $statement->closeCursor();
+		foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
+			$this->setMetric('acc_users', ['status' => $row['status']], $row['count']);
+		}
+		$statement->closeCursor();
 
-        $this->defineMetric('acc_active_domain_users', 'Number of active users in each domain');
-        $statement = $this->getDatabase()->query('
+		$this->defineMetric('acc_active_domain_users', 'Number of active users in each domain');
+		$statement = $this->getDatabase()->query('
             SELECT d.shortname, COUNT(1) AS count FROM userdomain ud 
             INNER JOIN user u ON ud.user = u.id
             INNER JOIN domain d on ud.domain = d.id
             WHERE u.status = \'Active\'
             GROUP BY d.shortname;');
 
-        foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
-            $this->setMetric('acc_active_domain_users', ['domain' => $row['shortname']], $row['count']);
-        }
-        $statement->closeCursor();
+		foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
+			$this->setMetric('acc_active_domain_users', ['domain' => $row['shortname']], $row['count']);
+		}
+		$statement->closeCursor();
 
 
-        $this->defineMetric('acc_active_domain_roles', 'Number of active users in each role');
-        $statement = $this->getDatabase()->query('
+		$this->defineMetric('acc_active_domain_roles', 'Number of active users in each role');
+		$statement = $this->getDatabase()->query('
             SELECT coalesce(d.shortname, \'\') AS domain, ur.role, COUNT(1) AS count
             FROM userrole ur
             INNER JOIN user u ON ur.user = u.id
@@ -76,53 +76,53 @@ 
             WHERE u.status = \'Active\' AND ur.role <> \'user\'
             GROUP BY d.shortname, ur.role;');
 
-        foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
-            $this->setMetric('acc_active_domain_roles', ['domain' => $row['domain'], 'role' => $row['role']], $row['count']);
-        }
-        $statement->closeCursor();
+		foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
+			$this->setMetric('acc_active_domain_roles', ['domain' => $row['domain'], 'role' => $row['role']], $row['count']);
+		}
+		$statement->closeCursor();
 
 
-        $this->defineMetric('acc_active_domain_bans', 'Number of active bans in each domain');
-        $statement = $this->getDatabase()->query('
+		$this->defineMetric('acc_active_domain_bans', 'Number of active bans in each domain');
+		$statement = $this->getDatabase()->query('
             SELECT coalesce(d.shortname, \'\') AS domain, COUNT(1) AS count
             FROM ban b LEFT JOIN domain d ON b.domain = d.id
             WHERE (b.duration > UNIX_TIMESTAMP() OR b.duration is null) AND b.active = 1
             GROUP BY d.shortname;');
 
-        foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
-            $this->setMetric('acc_active_domain_bans', ['domain' => $row['domain'], 'role' => $row['role']], $row['count']);
-        }
-        $statement->closeCursor();
+		foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
+			$this->setMetric('acc_active_domain_bans', ['domain' => $row['domain'], 'role' => $row['role']], $row['count']);
+		}
+		$statement->closeCursor();
 
 
-        $this->defineMetric('acc_queued_requests', 'Number of requests in each queue');
-        $statement = $this->getDatabase()->query('
+		$this->defineMetric('acc_queued_requests', 'Number of requests in each queue');
+		$statement = $this->getDatabase()->query('
             SELECT r.status, d.shortname, rq.header, COUNT(1) as count FROM request r
             INNER JOIN domain d on r.domain = d.id
             LEFT JOIN requestqueue rq ON r.queue = rq.id
             WHERE r.status <> \'Closed\' AND r.emailconfirm = \'Confirmed\'
             GROUP BY r.status, d.shortname, rq.header;');
 
-        foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
-            $this->setMetric('acc_queued_requests', ['status' => $row['status'], 'shortname' => $row['shortname'], 'queue' => $row['header']], $row['count']);
-        }
-        $statement->closeCursor();
+		foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
+			$this->setMetric('acc_queued_requests', ['status' => $row['status'], 'shortname' => $row['shortname'], 'queue' => $row['header']], $row['count']);
+		}
+		$statement->closeCursor();
 
-        return $this->writeMetrics();
-    }
+		return $this->writeMetrics();
+	}
 
-    private function writeMetrics() : string
-    {
-        $data = '';
+	private function writeMetrics() : string
+	{
+		$data = '';
 
-        foreach ($this->metrics as $name => $metricData) {
-            $data .= "# HELP {$name} {$metricData['help']}\n";
-            $data .= "# TYPE {$name} {$metricData['type']}\n";
-            foreach ($metricData['values'] as $label => $value) {
-                $data .= "{$name}{$label} {$value}\n";
-            }
-        }
+		foreach ($this->metrics as $name => $metricData) {
+			$data .= "# HELP {$name} {$metricData['help']}\n";
+			$data .= "# TYPE {$name} {$metricData['type']}\n";
+			foreach ($metricData['values'] as $label => $value) {
+				$data .= "{$name}{$label} {$value}\n";
+			}
+		}
 
-        return $data;
-    }
+		return $data;
+	}
 }

includes/SiteConfiguration.php

Indentation +1124 added lines, -1124 removed lines

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

includes/Pages/PageViewRequest.php

Indentation +375 added lines, -375 removed lines

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

redir.php

Indentation +37 added lines, -37 removed lines

@@ -8,53 +8,53 @@
  ******************************************************************************/
 
 $toolList = array(
-    'tparis-pcount'      => '//tools.wmflabs.org/supercount/index.php?user=%DATA%&project=en.wikipedia',
-    'guc'                => '//tools.wmflabs.org/guc/?by=date&user=%DATA%',
-    'oq-whois'           => 'https://whois.domaintools.com/%DATA%',
-    'tl-whois'           => 'https://tools.wmflabs.org/whois/gateway.py?lookup=true&ip=%DATA%',
-    'honeypot'           => 'https://www.projecthoneypot.org/ip_%DATA%',
-    'stopforumspam'      => 'https://www.stopforumspam.com/ipcheck/%DATA%',
-    'spur'               => 'https://app.spur.us/context?q=%DATA%',
-    'google'             => 'https://www.google.com/search?q=%DATA%',
-    'domain'             => 'https://%DATA%/',
-    'rangefinder'        => 'https://tools.wmflabs.org/rangeblockfinder/?ip=%DATA%',
-    'ipcheck'            => 'https://ipcheck.toolforge.org/index.php?ip=%DATA%',
-    'bgpview'            => 'https://bgpview.io/ip/%DATA%',
-    'bullseye'           => 'https://bullseye.toolforge.org/ip/%DATA%',
-    'ipalyzer'           => 'https://ipalyzer.com/%DATA%'
+	'tparis-pcount'      => '//tools.wmflabs.org/supercount/index.php?user=%DATA%&project=en.wikipedia',
+	'guc'                => '//tools.wmflabs.org/guc/?by=date&user=%DATA%',
+	'oq-whois'           => 'https://whois.domaintools.com/%DATA%',
+	'tl-whois'           => 'https://tools.wmflabs.org/whois/gateway.py?lookup=true&ip=%DATA%',
+	'honeypot'           => 'https://www.projecthoneypot.org/ip_%DATA%',
+	'stopforumspam'      => 'https://www.stopforumspam.com/ipcheck/%DATA%',
+	'spur'               => 'https://app.spur.us/context?q=%DATA%',
+	'google'             => 'https://www.google.com/search?q=%DATA%',
+	'domain'             => 'https://%DATA%/',
+	'rangefinder'        => 'https://tools.wmflabs.org/rangeblockfinder/?ip=%DATA%',
+	'ipcheck'            => 'https://ipcheck.toolforge.org/index.php?ip=%DATA%',
+	'bgpview'            => 'https://bgpview.io/ip/%DATA%',
+	'bullseye'           => 'https://bullseye.toolforge.org/ip/%DATA%',
+	'ipalyzer'           => 'https://ipalyzer.com/%DATA%'
 );
 
 if (!isset($_GET['tool'])
-    || !isset($toolList[$_GET['tool']])
-    || !isset($_GET['data'])
+	|| !isset($toolList[$_GET['tool']])
+	|| !isset($_GET['data'])
 ) {
-    header("HTTP/1.1 403 Forbidden");
+	header("HTTP/1.1 403 Forbidden");
 
-    return;
+	return;
 }
 
 if (isset($_GET['round2'])) {
-    $data = $_GET['data'];
-    $tool = $_GET['tool'];
+	$data = $_GET['data'];
+	$tool = $_GET['tool'];
 
-    if ($tool === 'domain') {
-        // quick security check - if you want to exploit something, you better be sure your exploit resolves via dns.
-        // this is not intended to catch everything, just as a quick sanity check.
-        if (gethostbyname($data) == $data) {
-            echo 'Error resolving hostname, it doesn\'t look like this domain exists.';
-            die();
-        }
-    }
-    elseif (filter_var($data, FILTER_VALIDATE_IP) !== false) {
-        // IP address, we don't need to encode it.
-        // It *should* already be safe.
-    }
-    else {
-        $data = urlencode($data);
-    }
+	if ($tool === 'domain') {
+		// quick security check - if you want to exploit something, you better be sure your exploit resolves via dns.
+		// this is not intended to catch everything, just as a quick sanity check.
+		if (gethostbyname($data) == $data) {
+			echo 'Error resolving hostname, it doesn\'t look like this domain exists.';
+			die();
+		}
+	}
+	elseif (filter_var($data, FILTER_VALIDATE_IP) !== false) {
+		// IP address, we don't need to encode it.
+		// It *should* already be safe.
+	}
+	else {
+		$data = urlencode($data);
+	}
 
-    echo '<script>window.location.href=' . json_encode(str_replace("%DATA%", $data, $toolList[$tool])) . '</script>';
+	echo '<script>window.location.href=' . json_encode(str_replace("%DATA%", $data, $toolList[$tool])) . '</script>';
 }
 else {
-    header("Location: " . $_SERVER["REQUEST_URI"] . "&round2=true");
+	header("Location: " . $_SERVER["REQUEST_URI"] . "&round2=true");
 }

Braces +3 added lines, -6 removed lines

@@ -44,17 +44,14 @@
             echo 'Error resolving hostname, it doesn\'t look like this domain exists.';
             die();
         }
-    }
-    elseif (filter_var($data, FILTER_VALIDATE_IP) !== false) {
+    } elseif (filter_var($data, FILTER_VALIDATE_IP) !== false) {
         // IP address, we don't need to encode it.
         // It *should* already be safe.
-    }
-    else {
+    } else {
         $data = urlencode($data);
     }
 
     echo '<script>window.location.href=' . json_encode(str_replace("%DATA%", $data, $toolList[$tool])) . '</script>';
-}
-else {
+} else {
     header("Location: " . $_SERVER["REQUEST_URI"] . "&round2=true");
 }

smarty-plugins/modifier.cidr.php

Indentation +37 added lines, -37 removed lines

@@ -17,48 +17,48 @@
  * @return string
  */
 function smarty_modifier_cidr(string $ipAddress, ?int $cidr): string {
-    if (filter_var($ipAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-        if ($cidr === null) {
-            $cidr = 32;
-        }
+	if (filter_var($ipAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+		if ($cidr === null) {
+			$cidr = 32;
+		}
 
-        if ($cidr < 0 || $cidr > 32) {
-            throw new InvalidArgumentException("Invalid CIDR prefix for IPv4: $cidr");
-        }
+		if ($cidr < 0 || $cidr > 32) {
+			throw new InvalidArgumentException("Invalid CIDR prefix for IPv4: $cidr");
+		}
 
-        $ipLong = ip2long($ipAddress);
-        $mask = -1 << (32 - $cidr);
-        $network = $ipLong & $mask;
+		$ipLong = ip2long($ipAddress);
+		$mask = -1 << (32 - $cidr);
+		$network = $ipLong & $mask;
 
-        return long2ip($network);
-    }
-    elseif (filter_var($ipAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-        if ($cidr === null) {
-            $cidr = 64;
-        }
+		return long2ip($network);
+	}
+	elseif (filter_var($ipAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+		if ($cidr === null) {
+			$cidr = 64;
+		}
 
-        if ($cidr < 0 || $cidr > 128) {
-            throw new InvalidArgumentException("Invalid CIDR prefix for IPv6: $cidr");
-        }
+		if ($cidr < 0 || $cidr > 128) {
+			throw new InvalidArgumentException("Invalid CIDR prefix for IPv6: $cidr");
+		}
 
-        $ipBin = inet_pton($ipAddress);
-        $prefix = $cidr;
-        $bin = '';
-        for ($i = 0; $i < strlen($ipBin); $i++) {
-            $bits = 8;
-            if ($prefix < 8) {
-                $bits = $prefix;
-            }
-            $mask = $bits === 0 ? 0 : (0xFF << (8 - $bits)) & 0xFF;
-            $bin .= chr(ord($ipBin[$i]) & $mask);
-            $prefix -= $bits;
-            if ($prefix <= 0) {
-                $prefix = 0;
-            }
-        }
+		$ipBin = inet_pton($ipAddress);
+		$prefix = $cidr;
+		$bin = '';
+		for ($i = 0; $i < strlen($ipBin); $i++) {
+			$bits = 8;
+			if ($prefix < 8) {
+				$bits = $prefix;
+			}
+			$mask = $bits === 0 ? 0 : (0xFF << (8 - $bits)) & 0xFF;
+			$bin .= chr(ord($ipBin[$i]) & $mask);
+			$prefix -= $bits;
+			if ($prefix <= 0) {
+				$prefix = 0;
+			}
+		}
 
-        return inet_ntop($bin);
-    }
+		return inet_ntop($bin);
+	}
 
-    throw new InvalidArgumentException("Invalid IP address: $ipAddress");
+	throw new InvalidArgumentException("Invalid IP address: $ipAddress");
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -31,8 +31,7 @@
         $network = $ipLong & $mask;
 
         return long2ip($network);
-    }
-    elseif (filter_var($ipAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+    } elseif (filter_var($ipAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
         if ($cidr === null) {
             $cidr = 64;
         }