mdaniels5757 / waca

includes/Tasks/PagedInternalPageBase.php

Indentation +93 added lines, -93 removed lines

@@ -13,97 +13,97 @@
 
 abstract class PagedInternalPageBase extends InternalPageBase
 {
-    /** @var SearchHelperBase */
-    private $searchHelper;
-    private $page;
-    private $limit;
-
-    /**
-     * Sets up the pager with the current page, current limit, and total number of records.
-     *
-     * @param int   $count
-     * @param array $formParameters
-     */
-    protected function setupPageData($count, $formParameters)
-    {
-        $page = $this->page;
-        $limit = $this->limit;
-
-        // The number of pages on the pager to show. Must be odd
-        $pageLimit = 9;
-
-        $pageData = array(
-            // Can the user go to the previous page?
-            'canprev'   => $page != 1,
-            // Can the user go to the next page?
-            'cannext'   => ($page * $limit) < $count,
-            // Maximum page number
-            'maxpage'   => max(1, ceil($count / $limit)),
-            // Limit to the number of pages to display
-            'pagelimit' => $pageLimit,
-        );
-
-        // number of pages either side of the current to show
-        $pageMargin = (($pageLimit - 1) / 2);
-
-        // Calculate the number of pages either side to show - this is for situations like:
-        //  [1]  [2] [[3]] [4]  [5]  [6]  [7]  [8]  [9] - where you can't just use the page margin calculated
-        $pageData['lowpage'] = max(1, $page - $pageMargin);
-        $pageData['hipage'] = min($pageData['maxpage'], $page + $pageMargin);
-        $pageCount = ($pageData['hipage'] - $pageData['lowpage']) + 1;
-
-        if ($pageCount < $pageLimit) {
-            if ($pageData['lowpage'] == 1 && $pageData['hipage'] < $pageData['maxpage']) {
-                $pageData['hipage'] = min($pageLimit, $pageData['maxpage']);
-            }
-            elseif ($pageData['lowpage'] > 1 && $pageData['hipage'] == $pageData['maxpage']) {
-                $pageData['lowpage'] = max(1, $pageData['maxpage'] - $pageLimit + 1);
-            }
-        }
-
-        // Put the range of pages into the page data
-        $pageData['pages'] = range($pageData['lowpage'], $pageData['hipage']);
-
-        $this->assign("pagedata", $pageData);
-
-        $this->assign("limit", $limit);
-        $this->assign("page", $page);
-
-        $this->setupFormParameters($formParameters);
-    }
-
-    protected function setSearchHelper(SearchHelperBase $searchHelper)
-    {
-        $this->searchHelper = $searchHelper;
-    }
-
-    protected function setupLimits()
-    {
-        $limit = WebRequest::getInt('limit');
-        if ($limit === null) {
-            $limit = 100;
-        }
-
-        $page = WebRequest::getInt('page');
-        if ($page === null) {
-            $page = 1;
-        }
-
-        $offset = ($page - 1) * $limit;
-
-        $this->searchHelper->limit($limit, $offset);
-
-        $this->page = $page;
-        $this->limit = $limit;
-    }
-
-    private function setupFormParameters($formParameters)
-    {
-        $formParameters['limit'] = $this->limit;
-        $this->assign('searchParamsUrl', http_build_query($formParameters, '', '&amp;'));
-
-        foreach ($formParameters as $key => $value)  {
-            $this->assign($key, $value);
-        }
-    }
+	/** @var SearchHelperBase */
+	private $searchHelper;
+	private $page;
+	private $limit;
+
+	/**
+	 * Sets up the pager with the current page, current limit, and total number of records.
+	 *
+	 * @param int   $count
+	 * @param array $formParameters
+	 */
+	protected function setupPageData($count, $formParameters)
+	{
+		$page = $this->page;
+		$limit = $this->limit;
+
+		// The number of pages on the pager to show. Must be odd
+		$pageLimit = 9;
+
+		$pageData = array(
+			// Can the user go to the previous page?
+			'canprev'   => $page != 1,
+			// Can the user go to the next page?
+			'cannext'   => ($page * $limit) < $count,
+			// Maximum page number
+			'maxpage'   => max(1, ceil($count / $limit)),
+			// Limit to the number of pages to display
+			'pagelimit' => $pageLimit,
+		);
+
+		// number of pages either side of the current to show
+		$pageMargin = (($pageLimit - 1) / 2);
+
+		// Calculate the number of pages either side to show - this is for situations like:
+		//  [1]  [2] [[3]] [4]  [5]  [6]  [7]  [8]  [9] - where you can't just use the page margin calculated
+		$pageData['lowpage'] = max(1, $page - $pageMargin);
+		$pageData['hipage'] = min($pageData['maxpage'], $page + $pageMargin);
+		$pageCount = ($pageData['hipage'] - $pageData['lowpage']) + 1;
+
+		if ($pageCount < $pageLimit) {
+			if ($pageData['lowpage'] == 1 && $pageData['hipage'] < $pageData['maxpage']) {
+				$pageData['hipage'] = min($pageLimit, $pageData['maxpage']);
+			}
+			elseif ($pageData['lowpage'] > 1 && $pageData['hipage'] == $pageData['maxpage']) {
+				$pageData['lowpage'] = max(1, $pageData['maxpage'] - $pageLimit + 1);
+			}
+		}
+
+		// Put the range of pages into the page data
+		$pageData['pages'] = range($pageData['lowpage'], $pageData['hipage']);
+
+		$this->assign("pagedata", $pageData);
+
+		$this->assign("limit", $limit);
+		$this->assign("page", $page);
+
+		$this->setupFormParameters($formParameters);
+	}
+
+	protected function setSearchHelper(SearchHelperBase $searchHelper)
+	{
+		$this->searchHelper = $searchHelper;
+	}
+
+	protected function setupLimits()
+	{
+		$limit = WebRequest::getInt('limit');
+		if ($limit === null) {
+			$limit = 100;
+		}
+
+		$page = WebRequest::getInt('page');
+		if ($page === null) {
+			$page = 1;
+		}
+
+		$offset = ($page - 1) * $limit;
+
+		$this->searchHelper->limit($limit, $offset);
+
+		$this->page = $page;
+		$this->limit = $limit;
+	}
+
+	private function setupFormParameters($formParameters)
+	{
+		$formParameters['limit'] = $this->limit;
+		$this->assign('searchParamsUrl', http_build_query($formParameters, '', '&amp;'));
+
+		foreach ($formParameters as $key => $value)  {
+			$this->assign($key, $value);
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
         $formParameters['limit'] = $this->limit;
         $this->assign('searchParamsUrl', http_build_query($formParameters, '', '&'));
 
-        foreach ($formParameters as $key => $value)  {
+        foreach ($formParameters as $key => $value) {
             $this->assign($key, $value);
         }
     }

Braces +2 added lines, -3 removed lines

@@ -55,8 +55,7 @@ 
         if ($pageCount < $pageLimit) {
             if ($pageData['lowpage'] == 1 && $pageData['hipage'] < $pageData['maxpage']) {
                 $pageData['hipage'] = min($pageLimit, $pageData['maxpage']);
-            }
-            elseif ($pageData['lowpage'] > 1 && $pageData['hipage'] == $pageData['maxpage']) {
+            } elseif ($pageData['lowpage'] > 1 && $pageData['hipage'] == $pageData['maxpage']) {
                 $pageData['lowpage'] = max(1, $pageData['maxpage'] - $pageLimit + 1);
             }
         }
@@ -102,7 +101,7 @@ 
         $formParameters['limit'] = $this->limit;
         $this->assign('searchParamsUrl', http_build_query($formParameters, '', '&amp;'));
 
-        foreach ($formParameters as $key => $value)  {
+        foreach ($formParameters as $key => $value) {
             $this->assign($key, $value);
         }
     }

includes/Tasks/ITask.php

Indentation +145 added lines, -145 removed lines

@@ -23,149 +23,149 @@
 
 interface ITask
 {
-    /**
-     * @return IEmailHelper
-     */
-    public function getEmailHelper();
-
-    /**
-     * @param IEmailHelper $emailHelper
-     *
-     * @return void
-     */
-    public function setEmailHelper($emailHelper);
-
-    /**
-     * @return HttpHelper
-     */
-    public function getHttpHelper();
-
-    /**
-     * @param HttpHelper $httpHelper
-     *
-     * @return void
-     */
-    public function setHttpHelper($httpHelper);
-
-    /**
-     * @return WikiTextHelper
-     */
-    public function getWikiTextHelper();
-
-    /**
-     * @param WikiTextHelper $wikiTextHelper
-     *
-     * @return void
-     */
-    public function setWikiTextHelper($wikiTextHelper);
-
-    /**
-     * @return ILocationProvider
-     */
-    public function getLocationProvider();
-
-    /**
-     * @param ILocationProvider $locationProvider
-     *
-     * @return void
-     */
-    public function setLocationProvider(ILocationProvider $locationProvider);
-
-    /**
-     * @return IXffTrustProvider
-     */
-    public function getXffTrustProvider();
-
-    /**
-     * @param IXffTrustProvider $xffTrustProvider
-     *
-     * @return void
-     */
-    public function setXffTrustProvider(IXffTrustProvider $xffTrustProvider);
-
-    /**
-     * @return IRDnsProvider
-     */
-    public function getRdnsProvider();
-
-    /**
-     * @param IRDnsProvider $rdnsProvider
-     *
-     * @return void
-     */
-    public function setRdnsProvider($rdnsProvider);
-
-    /**
-     * @return IAntiSpoofProvider
-     */
-    public function getAntiSpoofProvider();
-
-    /**
-     * @param IAntiSpoofProvider $antiSpoofProvider
-     *
-     * @return void
-     */
-    public function setAntiSpoofProvider($antiSpoofProvider);
-
-    /**
-     * @return PdoDatabase
-     */
-    public function getDatabase();
-
-    /**
-     * @param PdoDatabase $database
-     *
-     * @return void
-     */
-    public function setDatabase($database);
-
-    /**
-     * @return IOAuthProtocolHelper
-     */
-    public function getOAuthProtocolHelper();
-
-    /**
-     * @param IOAuthProtocolHelper $oauthProtocolHelper
-     *
-     * @return void
-     */
-    public function setOAuthProtocolHelper($oauthProtocolHelper);
-
-    /**
-     * @return void
-     */
-    public function execute();
-
-    /**
-     * Sets the site configuration object for this page
-     *
-     * @param SiteConfiguration $configuration
-     *
-     * @return void
-     */
-    public function setSiteConfiguration($configuration);
-
-    /**
-     * @return IrcNotificationHelper
-     */
-    public function getNotificationHelper();
-
-    /**
-     * @param IrcNotificationHelper $notificationHelper
-     *
-     * @return void
-     */
-    public function setNotificationHelper($notificationHelper);
-
-    /**
-     * @return TorExitProvider
-     */
-    public function getTorExitProvider();
-
-    /**
-     * @param TorExitProvider $torExitProvider
-     *
-     * @return void
-     */
-    public function setTorExitProvider($torExitProvider);
+	/**
+	 * @return IEmailHelper
+	 */
+	public function getEmailHelper();
+
+	/**
+	 * @param IEmailHelper $emailHelper
+	 *
+	 * @return void
+	 */
+	public function setEmailHelper($emailHelper);
+
+	/**
+	 * @return HttpHelper
+	 */
+	public function getHttpHelper();
+
+	/**
+	 * @param HttpHelper $httpHelper
+	 *
+	 * @return void
+	 */
+	public function setHttpHelper($httpHelper);
+
+	/**
+	 * @return WikiTextHelper
+	 */
+	public function getWikiTextHelper();
+
+	/**
+	 * @param WikiTextHelper $wikiTextHelper
+	 *
+	 * @return void
+	 */
+	public function setWikiTextHelper($wikiTextHelper);
+
+	/**
+	 * @return ILocationProvider
+	 */
+	public function getLocationProvider();
+
+	/**
+	 * @param ILocationProvider $locationProvider
+	 *
+	 * @return void
+	 */
+	public function setLocationProvider(ILocationProvider $locationProvider);
+
+	/**
+	 * @return IXffTrustProvider
+	 */
+	public function getXffTrustProvider();
+
+	/**
+	 * @param IXffTrustProvider $xffTrustProvider
+	 *
+	 * @return void
+	 */
+	public function setXffTrustProvider(IXffTrustProvider $xffTrustProvider);
+
+	/**
+	 * @return IRDnsProvider
+	 */
+	public function getRdnsProvider();
+
+	/**
+	 * @param IRDnsProvider $rdnsProvider
+	 *
+	 * @return void
+	 */
+	public function setRdnsProvider($rdnsProvider);
+
+	/**
+	 * @return IAntiSpoofProvider
+	 */
+	public function getAntiSpoofProvider();
+
+	/**
+	 * @param IAntiSpoofProvider $antiSpoofProvider
+	 *
+	 * @return void
+	 */
+	public function setAntiSpoofProvider($antiSpoofProvider);
+
+	/**
+	 * @return PdoDatabase
+	 */
+	public function getDatabase();
+
+	/**
+	 * @param PdoDatabase $database
+	 *
+	 * @return void
+	 */
+	public function setDatabase($database);
+
+	/**
+	 * @return IOAuthProtocolHelper
+	 */
+	public function getOAuthProtocolHelper();
+
+	/**
+	 * @param IOAuthProtocolHelper $oauthProtocolHelper
+	 *
+	 * @return void
+	 */
+	public function setOAuthProtocolHelper($oauthProtocolHelper);
+
+	/**
+	 * @return void
+	 */
+	public function execute();
+
+	/**
+	 * Sets the site configuration object for this page
+	 *
+	 * @param SiteConfiguration $configuration
+	 *
+	 * @return void
+	 */
+	public function setSiteConfiguration($configuration);
+
+	/**
+	 * @return IrcNotificationHelper
+	 */
+	public function getNotificationHelper();
+
+	/**
+	 * @param IrcNotificationHelper $notificationHelper
+	 *
+	 * @return void
+	 */
+	public function setNotificationHelper($notificationHelper);
+
+	/**
+	 * @return TorExitProvider
+	 */
+	public function getTorExitProvider();
+
+	/**
+	 * @param TorExitProvider $torExitProvider
+	 *
+	 * @return void
+	 */
+	public function setTorExitProvider($torExitProvider);
 }
\ No newline at end of file

includes/Tasks/XmlApiPageBase.php

Indentation +73 added lines, -73 removed lines

@@ -17,77 +17,77 @@
 
 abstract class XmlApiPageBase extends ApiPageBase implements IXmlApiAction
 {
-    /**
-     * API result document
-     * @var DOMDocument
-     */
-    protected $document;
-
-    public function __construct()
-    {
-        $this->document = new DOMDocument('1.0');
-    }
-
-    /**
-     * Main function for this page, when no specific actions are called.
-     *
-     * @throws ApiException
-     * @return void
-     */
-    final protected function main()
-    {
-        if (headers_sent()) {
-            throw new ApiException('Headers have already been sent - this indicates a bug in the application!');
-        }
-
-        header("Content-Type: text/xml");
-
-        // javascript access control
-        $httpOrigin = WebRequest::origin();
-
-        if ($httpOrigin !== null) {
-            $CORSallowed = $this->getSiteConfiguration()->getCrossOriginResourceSharingHosts();
-
-            if (in_array($httpOrigin, $CORSallowed)) {
-                header("Access-Control-Allow-Origin: " . $httpOrigin);
-            }
-        }
-
-        $responseData = $this->runApiPage();
-
-        ob_end_clean();
-        print($responseData);
-        ob_start();
-    }
-
-    /**
-     * Method that runs API action
-     *
-     * @param DOMElement $apiDocument
-     *
-     * @return DOMElement
-     */
-    abstract public function executeApiAction(DOMElement $apiDocument);
-
-    /**
-     * @return string
-     */
-    final public function runApiPage()
-    {
-        $apiDocument = $this->document->createElement("api");
-
-        try {
-            $apiDocument = $this->executeApiAction($apiDocument);
-        }
-            /** @noinspection PhpRedundantCatchClauseInspection */
-        catch (ApiException $ex) {
-            $exception = $this->document->createElement("error");
-            $exception->setAttribute("message", $ex->getMessage());
-            $apiDocument->appendChild($exception);
-        }
-
-        $this->document->appendChild($apiDocument);
-
-        return $this->document->saveXML();
-    }
+	/**
+	 * API result document
+	 * @var DOMDocument
+	 */
+	protected $document;
+
+	public function __construct()
+	{
+		$this->document = new DOMDocument('1.0');
+	}
+
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 *
+	 * @throws ApiException
+	 * @return void
+	 */
+	final protected function main()
+	{
+		if (headers_sent()) {
+			throw new ApiException('Headers have already been sent - this indicates a bug in the application!');
+		}
+
+		header("Content-Type: text/xml");
+
+		// javascript access control
+		$httpOrigin = WebRequest::origin();
+
+		if ($httpOrigin !== null) {
+			$CORSallowed = $this->getSiteConfiguration()->getCrossOriginResourceSharingHosts();
+
+			if (in_array($httpOrigin, $CORSallowed)) {
+				header("Access-Control-Allow-Origin: " . $httpOrigin);
+			}
+		}
+
+		$responseData = $this->runApiPage();
+
+		ob_end_clean();
+		print($responseData);
+		ob_start();
+	}
+
+	/**
+	 * Method that runs API action
+	 *
+	 * @param DOMElement $apiDocument
+	 *
+	 * @return DOMElement
+	 */
+	abstract public function executeApiAction(DOMElement $apiDocument);
+
+	/**
+	 * @return string
+	 */
+	final public function runApiPage()
+	{
+		$apiDocument = $this->document->createElement("api");
+
+		try {
+			$apiDocument = $this->executeApiAction($apiDocument);
+		}
+			/** @noinspection PhpRedundantCatchClauseInspection */
+		catch (ApiException $ex) {
+			$exception = $this->document->createElement("error");
+			$exception->setAttribute("message", $ex->getMessage());
+			$apiDocument->appendChild($exception);
+		}
+
+		$this->document->appendChild($apiDocument);
+
+		return $this->document->saveXML();
+	}
 }

includes/Tasks/JsonApiPageBase.php

Indentation +54 added lines, -54 removed lines

@@ -14,68 +14,68 @@
 
 abstract class JsonApiPageBase extends ApiPageBase implements IJsonApiAction
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     *
-     * @return void
-     * @throws ApiException
-     */
-    final protected function main()
-    {
-        if (headers_sent()) {
-            throw new ApiException('Headers have already been sent - this indicates a bug in the application!');
-        }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 *
+	 * @return void
+	 * @throws ApiException
+	 */
+	final protected function main()
+	{
+		if (headers_sent()) {
+			throw new ApiException('Headers have already been sent - this indicates a bug in the application!');
+		}
 
-        // javascript access control
-        $httpOrigin = WebRequest::origin();
+		// javascript access control
+		$httpOrigin = WebRequest::origin();
 
-        if ($httpOrigin !== null) {
-            $CORSallowed = $this->getSiteConfiguration()->getCrossOriginResourceSharingHosts();
+		if ($httpOrigin !== null) {
+			$CORSallowed = $this->getSiteConfiguration()->getCrossOriginResourceSharingHosts();
 
-            if (in_array($httpOrigin, $CORSallowed)) {
-                header("Access-Control-Allow-Origin: " . $httpOrigin);
-            }
-        }
+			if (in_array($httpOrigin, $CORSallowed)) {
+				header("Access-Control-Allow-Origin: " . $httpOrigin);
+			}
+		}
 
-        $responseData = $this->runApiPage();
+		$responseData = $this->runApiPage();
 
-        ob_end_clean();
-        print($responseData);
-        ob_start();
-    }
+		ob_end_clean();
+		print($responseData);
+		ob_start();
+	}
 
-    /**
-     * Method that runs API action
-     *
-     * @return object|array The modified API document
-     */
-    public abstract function executeApiAction();
+	/**
+	 * Method that runs API action
+	 *
+	 * @return object|array The modified API document
+	 */
+	public abstract function executeApiAction();
 
-    /**
-     * @return string
-     */
-    final public function runApiPage()
-    {
-        try {
-            $apiDocument = $this->executeApiAction();
-        }
-            /** @noinspection PhpRedundantCatchClauseInspection */
-        catch (ApiException $ex) {
-            $apiDocument = [
-                'error' => $ex->getMessage(),
-            ];
-        }
+	/**
+	 * @return string
+	 */
+	final public function runApiPage()
+	{
+		try {
+			$apiDocument = $this->executeApiAction();
+		}
+			/** @noinspection PhpRedundantCatchClauseInspection */
+		catch (ApiException $ex) {
+			$apiDocument = [
+				'error' => $ex->getMessage(),
+			];
+		}
 
-        $data = json_encode($apiDocument, JSON_UNESCAPED_UNICODE);
+		$data = json_encode($apiDocument, JSON_UNESCAPED_UNICODE);
 
-        $targetVar = WebRequest::getString('targetVariable');
-        if ($targetVar !== null && preg_match('/^[a-z]+$/', $targetVar)) {
-            $data = $targetVar . ' = ' . $data . ';';
-            header("Content-Type: text/javascript");
-        } else {
-            header("Content-Type: application/json");
-        }
+		$targetVar = WebRequest::getString('targetVariable');
+		if ($targetVar !== null && preg_match('/^[a-z]+$/', $targetVar)) {
+			$data = $targetVar . ' = ' . $data . ';';
+			header("Content-Type: text/javascript");
+		} else {
+			header("Content-Type: application/json");
+		}
 
-        return $data;
-    }
+		return $data;
+	}
 }

includes/ConsoleTasks/RunJobQueueTask.php

Indentation +114 added lines, -114 removed lines

@@ -21,118 +21,118 @@
 
 class RunJobQueueTask extends ConsoleTaskBase
 {
-    private $taskList = array(
-        WelcomeUserTask::class,
-        BotCreationTask::class,
-        UserCreationTask::class
-    );
-
-    public function execute()
-    {
-        $database = $this->getDatabase();
-
-        // ensure we're running inside a tx here.
-        if (!$database->hasActiveTransaction()) {
-            $database->beginTransaction();
-        }
-
-        $sql = 'SELECT * FROM jobqueue WHERE status = :status ORDER BY enqueue LIMIT :lim';
-        $statement = $database->prepare($sql);
-        $statement->execute(array(':status' => JobQueue::STATUS_READY, ':lim' => 10));
-        /** @var JobQueue[] $queuedJobs */
-        $queuedJobs = $statement->fetchAll(PDO::FETCH_CLASS, JobQueue::class);
-
-        // mark all the jobs as running, and commit the txn so we're not holding onto long-running transactions.
-        // We'll re-lock the row when we get to it.
-        foreach ($queuedJobs as $job) {
-            $job->setDatabase($database);
-            $job->setStatus(JobQueue::STATUS_WAITING);
-            $job->setError(null);
-            $job->setAcknowledged(null);
-            $job->save();
-        }
-
-        $database->commit();
-
-        set_error_handler(array(RunJobQueueTask::class, 'errorHandler'), E_ALL);
-
-        foreach ($queuedJobs as $job) {
-            try {
-                // refresh from the database
-                /** @var JobQueue $job */
-                $job = JobQueue::getById($job->getId(), $database);
-
-                if ($job->getStatus() !== JobQueue::STATUS_WAITING) {
-                    continue;
-                }
-
-                $database->beginTransaction();
-                $job->setStatus(JobQueue::STATUS_RUNNING);
-                $job->save();
-                $database->commit();
-
-                $database->beginTransaction();
-
-                // re-lock the job
-                $job->setStatus(JobQueue::STATUS_RUNNING);
-                $job->save();
-
-                // validate we're allowed to run the requested task (whitelist)
-                if (!in_array($job->getTask(), $this->taskList)) {
-                    throw new ApplicationLogicException('Job task not registered');
-                }
-
-                // Create a task.
-                $taskName = $job->getTask();
-
-                if(!class_exists($taskName)) {
-                    throw new ApplicationLogicException('Job task does not exist');
-                }
-
-                /** @var BackgroundTaskBase $task */
-                $task = new $taskName;
-
-                $this->setupTask($task, $job);
-                $task->run();
-            }
-            catch (Exception $ex) {
-                $database->rollBack();
-                $database->beginTransaction();
-
-                /** @var JobQueue $job */
-                $job = JobQueue::getById($job->getId(), $database);
-                $job->setDatabase($database);
-                $job->setStatus(JobQueue::STATUS_FAILED);
-                $job->setError($ex->getMessage());
-                $job->setAcknowledged(0);
-                $job->save();
-
-                Logger::backgroundJobIssue($this->getDatabase(), $job);
-
-                $database->commit();
-            }
-            finally {
-                $database->commit();
-            }
-        }
-    }
-
-    /**
-     * @param BackgroundTaskBase $task
-     * @param JobQueue           $job
-     */
-    private function setupTask(BackgroundTaskBase $task, JobQueue $job)
-    {
-        $task->setJob($job);
-        $task->setDatabase($this->getDatabase());
-        $task->setHttpHelper($this->getHttpHelper());
-        $task->setOauthProtocolHelper($this->getOAuthProtocolHelper());
-        $task->setEmailHelper($this->getEmailHelper());
-        $task->setSiteConfiguration($this->getSiteConfiguration());
-        $task->setNotificationHelper($this->getNotificationHelper());
-    }
-
-    public static function errorHandler($errno, $errstr, $errfile, $errline) {
-        throw new Exception($errfile . "@" . $errline . ": " . $errstr);
-    }
+	private $taskList = array(
+		WelcomeUserTask::class,
+		BotCreationTask::class,
+		UserCreationTask::class
+	);
+
+	public function execute()
+	{
+		$database = $this->getDatabase();
+
+		// ensure we're running inside a tx here.
+		if (!$database->hasActiveTransaction()) {
+			$database->beginTransaction();
+		}
+
+		$sql = 'SELECT * FROM jobqueue WHERE status = :status ORDER BY enqueue LIMIT :lim';
+		$statement = $database->prepare($sql);
+		$statement->execute(array(':status' => JobQueue::STATUS_READY, ':lim' => 10));
+		/** @var JobQueue[] $queuedJobs */
+		$queuedJobs = $statement->fetchAll(PDO::FETCH_CLASS, JobQueue::class);
+
+		// mark all the jobs as running, and commit the txn so we're not holding onto long-running transactions.
+		// We'll re-lock the row when we get to it.
+		foreach ($queuedJobs as $job) {
+			$job->setDatabase($database);
+			$job->setStatus(JobQueue::STATUS_WAITING);
+			$job->setError(null);
+			$job->setAcknowledged(null);
+			$job->save();
+		}
+
+		$database->commit();
+
+		set_error_handler(array(RunJobQueueTask::class, 'errorHandler'), E_ALL);
+
+		foreach ($queuedJobs as $job) {
+			try {
+				// refresh from the database
+				/** @var JobQueue $job */
+				$job = JobQueue::getById($job->getId(), $database);
+
+				if ($job->getStatus() !== JobQueue::STATUS_WAITING) {
+					continue;
+				}
+
+				$database->beginTransaction();
+				$job->setStatus(JobQueue::STATUS_RUNNING);
+				$job->save();
+				$database->commit();
+
+				$database->beginTransaction();
+
+				// re-lock the job
+				$job->setStatus(JobQueue::STATUS_RUNNING);
+				$job->save();
+
+				// validate we're allowed to run the requested task (whitelist)
+				if (!in_array($job->getTask(), $this->taskList)) {
+					throw new ApplicationLogicException('Job task not registered');
+				}
+
+				// Create a task.
+				$taskName = $job->getTask();
+
+				if(!class_exists($taskName)) {
+					throw new ApplicationLogicException('Job task does not exist');
+				}
+
+				/** @var BackgroundTaskBase $task */
+				$task = new $taskName;
+
+				$this->setupTask($task, $job);
+				$task->run();
+			}
+			catch (Exception $ex) {
+				$database->rollBack();
+				$database->beginTransaction();
+
+				/** @var JobQueue $job */
+				$job = JobQueue::getById($job->getId(), $database);
+				$job->setDatabase($database);
+				$job->setStatus(JobQueue::STATUS_FAILED);
+				$job->setError($ex->getMessage());
+				$job->setAcknowledged(0);
+				$job->save();
+
+				Logger::backgroundJobIssue($this->getDatabase(), $job);
+
+				$database->commit();
+			}
+			finally {
+				$database->commit();
+			}
+		}
+	}
+
+	/**
+	 * @param BackgroundTaskBase $task
+	 * @param JobQueue           $job
+	 */
+	private function setupTask(BackgroundTaskBase $task, JobQueue $job)
+	{
+		$task->setJob($job);
+		$task->setDatabase($this->getDatabase());
+		$task->setHttpHelper($this->getHttpHelper());
+		$task->setOauthProtocolHelper($this->getOAuthProtocolHelper());
+		$task->setEmailHelper($this->getEmailHelper());
+		$task->setSiteConfiguration($this->getSiteConfiguration());
+		$task->setNotificationHelper($this->getNotificationHelper());
+	}
+
+	public static function errorHandler($errno, $errstr, $errfile, $errline) {
+		throw new Exception($errfile . "@" . $errline . ": " . $errstr);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
                 // Create a task.
                 $taskName = $job->getTask();
 
-                if(!class_exists($taskName)) {
+                if (!class_exists($taskName)) {
                     throw new ApplicationLogicException('Job task does not exist');
                 }
 

Braces +2 added lines, -1 removed lines

@@ -132,7 +132,8 @@
         $task->setNotificationHelper($this->getNotificationHelper());
     }
 
-    public static function errorHandler($errno, $errstr, $errfile, $errline) {
+    public static function errorHandler($errno, $errstr, $errfile, $errline)
+    {
         throw new Exception($errfile . "@" . $errline . ": " . $errstr);
     }
 }

includes/ConsoleTasks/RefreshOAuthDataTask.php

Indentation +31 added lines, -31 removed lines

@@ -17,35 +17,35 @@
 
 class RefreshOAuthDataTask extends ConsoleTaskBase
 {
-    public function execute()
-    {
-        $database = $this->getDatabase();
-
-        $idList = $database
-            ->query('SELECT user FROM oauthtoken WHERE type = \'access\' AND expiry IS NULL')
-            ->fetchAll(PDO::FETCH_COLUMN);
-
-        if (count($idList) > 0) {
-            /** @var User[] $users */
-            $users = UserSearchHelper::get($database)->inIds($idList)->fetch();
-
-            $expiredStatement = $database
-                ->prepare('UPDATE oauthtoken SET expiry = CURRENT_TIMESTAMP() WHERE user = :u AND type = \'access\'');
-
-            foreach ($users as $u) {
-                $oauth = new OAuthUserHelper($u, $database, $this->getOAuthProtocolHelper(),
-                    $this->getSiteConfiguration());
-
-                try {
-                    $oauth->refreshIdentity();
-                }
-                catch (OAuthException $ex) {
-                    $expiredStatement->execute(array(':u' => $u->getId()));
-                }
-            }
-        }
-
-        $this->getDatabase()
-            ->exec('DELETE FROM oauthtoken WHERE expiry IS NOT NULL AND expiry < NOW() AND type = \'request\'');
-    }
+	public function execute()
+	{
+		$database = $this->getDatabase();
+
+		$idList = $database
+			->query('SELECT user FROM oauthtoken WHERE type = \'access\' AND expiry IS NULL')
+			->fetchAll(PDO::FETCH_COLUMN);
+
+		if (count($idList) > 0) {
+			/** @var User[] $users */
+			$users = UserSearchHelper::get($database)->inIds($idList)->fetch();
+
+			$expiredStatement = $database
+				->prepare('UPDATE oauthtoken SET expiry = CURRENT_TIMESTAMP() WHERE user = :u AND type = \'access\'');
+
+			foreach ($users as $u) {
+				$oauth = new OAuthUserHelper($u, $database, $this->getOAuthProtocolHelper(),
+					$this->getSiteConfiguration());
+
+				try {
+					$oauth->refreshIdentity();
+				}
+				catch (OAuthException $ex) {
+					$expiredStatement->execute(array(':u' => $u->getId()));
+				}
+			}
+		}
+
+		$this->getDatabase()
+			->exec('DELETE FROM oauthtoken WHERE expiry IS NOT NULL AND expiry < NOW() AND type = \'request\'');
+	}
 }
\ No newline at end of file

includes/ConsoleTasks/ClearOAuthDataTask.php

Indentation +12 added lines, -12 removed lines

@@ -14,19 +14,19 @@
 
 class ClearOAuthDataTask extends ConsoleTaskBase
 {
-    public function execute()
-    {
-        $database = $this->getDatabase();
+	public function execute()
+	{
+		$database = $this->getDatabase();
 
-        $users = UserSearchHelper::get($database)->inIds(
-            $database->query('SELECT user FROM oauthtoken WHERE type = \'access\'')->fetchColumn());
+		$users = UserSearchHelper::get($database)->inIds(
+			$database->query('SELECT user FROM oauthtoken WHERE type = \'access\'')->fetchColumn());
 
-        foreach ($users as $u){
-            $oauth = new OAuthUserHelper($u, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
-            $oauth->detach();
-        }
+		foreach ($users as $u){
+			$oauth = new OAuthUserHelper($u, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
+			$oauth->detach();
+		}
 
-        $database->exec('DELETE FROM oauthtoken');
-        $database->exec('DELETE FROM oauthidentity');
-    }
+		$database->exec('DELETE FROM oauthtoken');
+		$database->exec('DELETE FROM oauthidentity');
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         $users = UserSearchHelper::get($database)->inIds(
             $database->query('SELECT user FROM oauthtoken WHERE type = \'access\'')->fetchColumn());
 
-        foreach ($users as $u){
+        foreach ($users as $u) {
             $oauth = new OAuthUserHelper($u, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
             $oauth->detach();
         }

Braces +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         $users = UserSearchHelper::get($database)->inIds(
             $database->query('SELECT user FROM oauthtoken WHERE type = \'access\'')->fetchColumn());
 
-        foreach ($users as $u){
+        foreach ($users as $u) {
             $oauth = new OAuthUserHelper($u, $database, $this->getOAuthProtocolHelper(), $this->getSiteConfiguration());
             $oauth->detach();
         }

includes/ConsoleTasks/RegenerateStylesheetsTask.php

Indentation +18 added lines, -18 removed lines

@@ -13,26 +13,26 @@
 
 class RegenerateStylesheetsTask extends ConsoleTaskBase
 {
-    const RESOURCES_GENERATED = 'resources/generated';
+	const RESOURCES_GENERATED = 'resources/generated';
 
-    public function execute()
-    {
-        $scss = new Compiler();
-        $scss->setImportPaths('resources/scss');
+	public function execute()
+	{
+		$scss = new Compiler();
+		$scss->setImportPaths('resources/scss');
 
-        if (!$this->getSiteConfiguration()->getDebuggingTraceEnabled()) {
-            $scss->setFormatter('ScssPhp\\ScssPhp\\Formatter\\Compressed');
-            $scss->setSourceMap(Compiler::SOURCE_MAP_INLINE);
-        }
+		if (!$this->getSiteConfiguration()->getDebuggingTraceEnabled()) {
+			$scss->setFormatter('ScssPhp\\ScssPhp\\Formatter\\Compressed');
+			$scss->setSourceMap(Compiler::SOURCE_MAP_INLINE);
+		}
 
-        if (!is_dir(self::RESOURCES_GENERATED)) {
-            mkdir(self::RESOURCES_GENERATED);
-        }
+		if (!is_dir(self::RESOURCES_GENERATED)) {
+			mkdir(self::RESOURCES_GENERATED);
+		}
 
-        foreach (['bootstrap-main', 'bootstrap-alt'] as $file) {
-            file_put_contents(
-                self::RESOURCES_GENERATED . '/' . $file . '.css',
-                $scss->compile('/*! Do not edit this auto-generated file! */ @import "' . $file . '";'));
-        }
-    }
+		foreach (['bootstrap-main', 'bootstrap-alt'] as $file) {
+			file_put_contents(
+				self::RESOURCES_GENERATED . '/' . $file . '.css',
+				$scss->compile('/*! Do not edit this auto-generated file! */ @import "' . $file . '";'));
+		}
+	}
 }

includes/ConsoleTasks/PrecacheGeolocationTask.php

Indentation +53 added lines, -53 removed lines

@@ -14,30 +14,30 @@ 
 
 class PrecacheGeolocationTask extends ConsoleTaskBase
 {
-    public function execute()
-    {
-        $database = $this->getDatabase();
-        $locationProvider = $this->getLocationProvider();
+	public function execute()
+	{
+		$database = $this->getDatabase();
+		$locationProvider = $this->getLocationProvider();
 
-        while (true) {
-            echo "Beginning txn\n";
-            $database->beginTransaction();
+		while (true) {
+			echo "Beginning txn\n";
+			$database->beginTransaction();
 
-            try {
-                echo ". Fetching data...\n";
+			try {
+				echo ". Fetching data...\n";
 
-                // fetch a bunch of un-geolocated IPs from the database.
-                // Note we have to parse the forwardedip field in the database so we can test against the geolocation
-                // table.
-                //
-                // This guarantees we get ten unlocated IPs back, unless there actually aren't 10 available.
-                //
-                // Alternatives include downloading a small set of forwarded IPs, splitting it in PHP, constructing an
-                // IN() clause dynamically, sending that back to the database to check if there are geolocation entries,
-                // then repeating until we have 10 to process - and the fact that we'd have to potentially retrieve all
-                // IPs from the database before we find any at all. This way keeps all of that legwork in the database,
-                // at the cost of a more complex query.
-                $statement = $database->query(<<<SQL
+				// fetch a bunch of un-geolocated IPs from the database.
+				// Note we have to parse the forwardedip field in the database so we can test against the geolocation
+				// table.
+				//
+				// This guarantees we get ten unlocated IPs back, unless there actually aren't 10 available.
+				//
+				// Alternatives include downloading a small set of forwarded IPs, splitting it in PHP, constructing an
+				// IN() clause dynamically, sending that back to the database to check if there are geolocation entries,
+				// then repeating until we have 10 to process - and the fact that we'd have to potentially retrieve all
+				// IPs from the database before we find any at all. This way keeps all of that legwork in the database,
+				// at the cost of a more complex query.
+				$statement = $database->query(<<<SQL
                     SELECT /* PrecacheGeolocationTask */ p.prox
                     FROM (
                       SELECT trim(substring_index(substring_index(r.forwardedip, ',', n.n), ',', -1)) prox
@@ -54,42 +54,42 @@ 
                     WHERE NOT EXISTS (SELECT 1 FROM geolocation g WHERE g.address = p.prox FOR UPDATE)
                     LIMIT 10;
 SQL
-                );
+				);
 
-                $missingIps = $statement->fetchAll(PDO::FETCH_COLUMN);
+				$missingIps = $statement->fetchAll(PDO::FETCH_COLUMN);
 
-                $count = count($missingIps);
-                if ($count === 0) {
-                    echo ". Found nothing to do.\n";
-                    break;
-                }
+				$count = count($missingIps);
+				if ($count === 0) {
+					echo ". Found nothing to do.\n";
+					break;
+				}
 
-                echo ". Picked {$count} IP addresses\n";
+				echo ". Picked {$count} IP addresses\n";
 
-                foreach ($missingIps as $ip) {
-                    echo ". . Getting location for {$ip}...\n";
-                    $data = json_encode($locationProvider->getIpLocation($ip));
-                    echo ". . . {$data}\n";
-                }
+				foreach ($missingIps as $ip) {
+					echo ". . Getting location for {$ip}...\n";
+					$data = json_encode($locationProvider->getIpLocation($ip));
+					echo ". . . {$data}\n";
+				}
 
-                echo ". IP location fetch complete.\n";
-                $database->commit();
-                echo ". Committed txn.\n";
-            }
-            catch (Exception $ex) {
-                echo ". Encountered exception: " . $ex->getMessage() . "\n";
-                $database->rollBack();
-                echo ". Rolled back txn\n";
-                throw $ex;
-            }
-            finally {
-                if ($database->hasActiveTransaction()) {
-                    $database->rollBack();
-                    echo ". Rolled back txn\n";
-                }
-            }
-        }
+				echo ". IP location fetch complete.\n";
+				$database->commit();
+				echo ". Committed txn.\n";
+			}
+			catch (Exception $ex) {
+				echo ". Encountered exception: " . $ex->getMessage() . "\n";
+				$database->rollBack();
+				echo ". Rolled back txn\n";
+				throw $ex;
+			}
+			finally {
+				if ($database->hasActiveTransaction()) {
+					$database->rollBack();
+					echo ". Rolled back txn\n";
+				}
+			}
+		}
 
-        echo "Done.\n";
-    }
+		echo "Done.\n";
+	}
 }
\ No newline at end of file