mdaniels5757 / waca

includes/API/Actions/StatusAction.php

Indentation +71 added lines, -71 removed lines

@@ -20,12 +20,12 @@ 
  */
 class StatusAction extends XmlApiPageBase implements IXmlApiAction
 {
-    public function executeApiAction(DOMElement $apiDocument)
-    {
-        $statusElement = $this->document->createElement("status");
-        $apiDocument->appendChild($statusElement);
+	public function executeApiAction(DOMElement $apiDocument)
+	{
+		$statusElement = $this->document->createElement("status");
+		$apiDocument->appendChild($statusElement);
 
-        $query = $this->getDatabase()->prepare(<<<SQL
+		$query = $this->getDatabase()->prepare(<<<SQL
             SELECT /* Api/StatusAction */ COUNT(*) AS count
             FROM request
             WHERE
@@ -33,87 +33,87 @@ 
                 AND queue = :queue
                 AND emailconfirm = 'Confirmed';
 SQL
-        );
-
-        $allQueues = RequestQueue::getAllQueues($this->getDatabase());
-
-        foreach ($allQueues as $value) {
-            $query->bindValue(":pstatus", RequestStatus::OPEN);
-            $query->bindValue(":queue", $value->getId());
-            $query->execute();
-            $sus = $query->fetchColumn();
-            $statusElement->setAttribute($value->getApiName(), $sus);
-            $query->closeCursor();
-        }
-
-        // hospital queue
-        // FIXME: domains
-        $search = RequestSearchHelper::get($this->getDatabase(), 1)->isHospitalised();
-
-        if ($this->getSiteConfiguration()->getEmailConfirmationEnabled()) {
-            $search->withConfirmedEmail();
-        }
-        $search->getRecordCount($hospitalCount);
-        $statusElement->setAttribute('x-hospital', $hospitalCount);
-
-        // job queue
-        // FIXME: domains
-        $search = RequestSearchHelper::get($this->getDatabase(), 1)
-            ->byStatus(RequestStatus::JOBQUEUE);
-
-        if ($this->getSiteConfiguration()->getEmailConfirmationEnabled()) {
-            $search->withConfirmedEmail();
-        }
-
-        $search->getRecordCount($jobQueueRequestCount);
-        $statusElement->setAttribute('x-jobqueue', $jobQueueRequestCount);
-
-        // bans
-        $query = $this->getDatabase()->prepare(<<<SQL
+		);
+
+		$allQueues = RequestQueue::getAllQueues($this->getDatabase());
+
+		foreach ($allQueues as $value) {
+			$query->bindValue(":pstatus", RequestStatus::OPEN);
+			$query->bindValue(":queue", $value->getId());
+			$query->execute();
+			$sus = $query->fetchColumn();
+			$statusElement->setAttribute($value->getApiName(), $sus);
+			$query->closeCursor();
+		}
+
+		// hospital queue
+		// FIXME: domains
+		$search = RequestSearchHelper::get($this->getDatabase(), 1)->isHospitalised();
+
+		if ($this->getSiteConfiguration()->getEmailConfirmationEnabled()) {
+			$search->withConfirmedEmail();
+		}
+		$search->getRecordCount($hospitalCount);
+		$statusElement->setAttribute('x-hospital', $hospitalCount);
+
+		// job queue
+		// FIXME: domains
+		$search = RequestSearchHelper::get($this->getDatabase(), 1)
+			->byStatus(RequestStatus::JOBQUEUE);
+
+		if ($this->getSiteConfiguration()->getEmailConfirmationEnabled()) {
+			$search->withConfirmedEmail();
+		}
+
+		$search->getRecordCount($jobQueueRequestCount);
+		$statusElement->setAttribute('x-jobqueue', $jobQueueRequestCount);
+
+		// bans
+		$query = $this->getDatabase()->prepare(<<<SQL
             SELECT /* Api/StatusAction */ COUNT(*) AS count
             FROM ban
             WHERE
                 (duration > UNIX_TIMESTAMP() OR duration is null)
                 AND active = 1;
 SQL
-        );
+		);
 
-        $query->execute();
-        $sus = $query->fetchColumn();
-        $statusElement->setAttribute("bans", $sus);
-        $query->closeCursor();
+		$query->execute();
+		$sus = $query->fetchColumn();
+		$statusElement->setAttribute("bans", $sus);
+		$query->closeCursor();
 
-        $query = $this->getDatabase()->prepare(<<<SQL
+		$query = $this->getDatabase()->prepare(<<<SQL
 SELECT /* Api/StatusAction */ COUNT(*) AS count
 FROM user WHERE status = :ulevel;
 SQL
-        );
+		);
 
-        $query->bindValue(":ulevel", "New");
-        $query->execute();
-        $sus = $query->fetchColumn();
-        $statusElement->setAttribute("usernew", $sus);
-        $query->closeCursor();
+		$query->bindValue(":ulevel", "New");
+		$query->execute();
+		$sus = $query->fetchColumn();
+		$statusElement->setAttribute("usernew", $sus);
+		$query->closeCursor();
 
-        $query = $this->getDatabase()->prepare(<<<SQL
+		$query = $this->getDatabase()->prepare(<<<SQL
 select /* Api/StatusAction */ COUNT(*) from user u
 inner join userrole ur on u.id = ur.user
 where u.status = 'Active' and ur.role = :ulevel
 SQL
-        );
-
-        $query->bindValue(":ulevel", "admin");
-        $query->execute();
-        $sus = $query->fetchColumn();
-        $statusElement->setAttribute("useradmin", $sus);
-        $query->closeCursor();
-
-        $query->bindValue(":ulevel", "user");
-        $query->execute();
-        $sus = $query->fetchColumn();
-        $statusElement->setAttribute("user", $sus);
-        $query->closeCursor();
-
-        return $apiDocument;
-    }
+		);
+
+		$query->bindValue(":ulevel", "admin");
+		$query->execute();
+		$sus = $query->fetchColumn();
+		$statusElement->setAttribute("useradmin", $sus);
+		$query->closeCursor();
+
+		$query->bindValue(":ulevel", "user");
+		$query->execute();
+		$sus = $query->fetchColumn();
+		$statusElement->setAttribute("user", $sus);
+		$query->closeCursor();
+
+		return $apiDocument;
+	}
 }

includes/API/Actions/JsUsersAction.php

Indentation +9 added lines, -9 removed lines

@@ -16,16 +16,16 @@
 
 class JsUsersAction extends JsonApiPageBase implements IJsonApiAction
 {
-    public function executeApiAction()
-    {
-        $userSearchHelper = UserSearchHelper::get($this->getDatabase());
+	public function executeApiAction()
+	{
+		$userSearchHelper = UserSearchHelper::get($this->getDatabase());
 
-        if (WebRequest::getString('all') === null) {
-            $userSearchHelper->byStatus(User::STATUS_ACTIVE);
+		if (WebRequest::getString('all') === null) {
+			$userSearchHelper->byStatus(User::STATUS_ACTIVE);
 
-        }
+		}
 
-        $dataset = $userSearchHelper->fetchColumn('username');
-        return $dataset;
-    }
+		$dataset = $userSearchHelper->fetchColumn('username');
+		return $dataset;
+	}
 }

includes/API/Actions/JsTemplateConfirmsAction.php

Indentation +13 added lines, -13 removed lines

@@ -14,19 +14,19 @@
 
 class JsTemplateConfirmsAction extends JsonApiPageBase implements IJsonApiAction
 {
-    public function executeApiAction()
-    {
-        /** @var EmailTemplate[] $templates */
-        // FIXME: domains!
-        $templates = EmailTemplate::getAllActiveTemplates(null, $this->getDatabase(), 1);
+	public function executeApiAction()
+	{
+		/** @var EmailTemplate[] $templates */
+		// FIXME: domains!
+		$templates = EmailTemplate::getAllActiveTemplates(null, $this->getDatabase(), 1);
 
-        $dataset = [];
-        foreach ($templates as $tpl) {
-            if ($tpl->getJsquestion() != "") {
-                $dataset[$tpl->getId()] = $tpl->getJsquestion();
-            }
-        }
+		$dataset = [];
+		foreach ($templates as $tpl) {
+			if ($tpl->getJsquestion() != "") {
+				$dataset[$tpl->getId()] = $tpl->getJsquestion();
+			}
+		}
 
-        return $dataset;
-    }
+		return $dataset;
+	}
 }

includes/Router/PublicRequestRouter.php

Braces +1 added lines, -2 removed lines

@@ -59,8 +59,7 @@
         if (count($pathInfo) === 3 && $pathInfo[0] === 'r') {
             // this request should be routed to the dynamic request form handler
             return [PageRequestAccount::class, 'dynamic'];
-        }
-        else {
+        } else {
             return parent::getRouteFromPath($pathInfo);
         }
     }

Indentation +53 added lines, -53 removed lines

@@ -17,59 +17,59 @@
 
 class PublicRequestRouter extends RequestRouter
 {
-    /**
-     * Gets the route map to be used by this request router.
-     *
-     * @return array
-     */
-    protected function getRouteMap()
-    {
-        return array(
-            // Page showing a message stating the request has been submitted to our internal queues
-            'requestSubmitted'          =>
-                array(
-                    'class'   => PageRequestSubmitted::class,
-                    'actions' => array(),
-                ),
-            // Page showing a message stating that email confirmation is required to continue
-            'emailConfirmationRequired' =>
-                array(
-                    'class'   => PageEmailConfirmationRequired::class,
-                    'actions' => array(),
-                ),
-            // Action page which handles email confirmation
-            'confirmEmail'              =>
-                array(
-                    'class'   => PageConfirmEmail::class,
-                    'actions' => array(),
-                ),
-            // Page showing the privacy statement
-            'privacy'                   =>
-                array(
-                    'class'   => PagePublicPrivacy::class,
-                    'actions' => array(),
-                ),
-        );
-    }
+	/**
+	 * Gets the route map to be used by this request router.
+	 *
+	 * @return array
+	 */
+	protected function getRouteMap()
+	{
+		return array(
+			// Page showing a message stating the request has been submitted to our internal queues
+			'requestSubmitted'          =>
+				array(
+					'class'   => PageRequestSubmitted::class,
+					'actions' => array(),
+				),
+			// Page showing a message stating that email confirmation is required to continue
+			'emailConfirmationRequired' =>
+				array(
+					'class'   => PageEmailConfirmationRequired::class,
+					'actions' => array(),
+				),
+			// Action page which handles email confirmation
+			'confirmEmail'              =>
+				array(
+					'class'   => PageConfirmEmail::class,
+					'actions' => array(),
+				),
+			// Page showing the privacy statement
+			'privacy'                   =>
+				array(
+					'class'   => PagePublicPrivacy::class,
+					'actions' => array(),
+				),
+		);
+	}
 
-    /**
-     * Gets the default route if no explicit route is requested.
-     *
-     * @return callable
-     */
-    protected function getDefaultRoute()
-    {
-        return array(PageRequestAccount::class, 'main');
-    }
+	/**
+	 * Gets the default route if no explicit route is requested.
+	 *
+	 * @return callable
+	 */
+	protected function getDefaultRoute()
+	{
+		return array(PageRequestAccount::class, 'main');
+	}
 
-    public function getRouteFromPath($pathInfo): array
-    {
-        if (count($pathInfo) === 3 && $pathInfo[0] === 'r') {
-            // this request should be routed to the dynamic request form handler
-            return [PageRequestAccount::class, 'dynamic'];
-        }
-        else {
-            return parent::getRouteFromPath($pathInfo);
-        }
-    }
+	public function getRouteFromPath($pathInfo): array
+	{
+		if (count($pathInfo) === 3 && $pathInfo[0] === 'r') {
+			// this request should be routed to the dynamic request form handler
+			return [PageRequestAccount::class, 'dynamic'];
+		}
+		else {
+			return parent::getRouteFromPath($pathInfo);
+		}
+	}
 }
\ No newline at end of file

includes/Background/Task/BotCreationTask.php

Indentation +14 added lines, -14 removed lines

@@ -17,20 +17,20 @@
 
 class BotCreationTask extends CreationTaskBase
 {
-    /**
-     * @return IMediaWikiClient
-     */
-    protected function getMediaWikiClient()
-    {
-        // FIXME: domains!
-        /** @var Domain $domain */
-        $domain = Domain::getById(1, $this->getDatabase());
+	/**
+	 * @return IMediaWikiClient
+	 */
+	protected function getMediaWikiClient()
+	{
+		// FIXME: domains!
+		/** @var Domain $domain */
+		$domain = Domain::getById(1, $this->getDatabase());
 
-        return new BotMediaWikiClient($this->getSiteConfiguration(), $domain);
-    }
+		return new BotMediaWikiClient($this->getSiteConfiguration(), $domain);
+	}
 
-    protected function getCreationReason(Request $request, User $user)
-    {
-        return parent::getCreationReason($request, $user) . ', on behalf of [[User:' . $user->getOnWikiName() . ']]';
-    }
+	protected function getCreationReason(Request $request, User $user)
+	{
+		return parent::getCreationReason($request, $user) . ', on behalf of [[User:' . $user->getOnWikiName() . ']]';
+	}
 }
\ No newline at end of file

includes/Background/Task/WelcomeUserTask.php

Indentation +73 added lines, -73 removed lines

@@ -19,77 +19,77 @@
 
 class WelcomeUserTask extends BackgroundTaskBase
 {
-    /** @var Request */
-    private $request;
-
-    public function execute()
-    {
-        $database = $this->getDatabase();
-        $this->request = $this->getRequest();
-        $user = $this->getTriggerUser();
-        //FIXME: domains
-        $userPrefs = new PreferenceManager($database, $user->getId(), 1);
-
-        $welcomeTemplate = $userPrefs->getPreference(PreferenceManager::PREF_WELCOMETEMPLATE);
-
-        if ($welcomeTemplate === null) {
-            $this->markFailed('Welcome template not specified');
-
-            return;
-        }
-
-        /** @var WelcomeTemplate $template */
-        $template = WelcomeTemplate::getById($welcomeTemplate, $database);
-
-        if ($template === false) {
-            $this->markFailed('Welcome template missing');
-
-            return;
-        }
-
-        $oauth = new OAuthUserHelper($user, $database, $this->getOauthProtocolHelper(),
-            $this->getSiteConfiguration());
-        $mediaWikiHelper = new MediaWikiHelper($oauth, $this->getSiteConfiguration());
-
-        if ($this->request->getStatus() !== RequestStatus::CLOSED) {
-            $this->markFailed('Request is currently open');
-
-            return;
-        }
-
-        if (!$mediaWikiHelper->checkAccountExists($this->request->getName())) {
-            $this->markFailed('Account does not exist!');
-
-            return;
-        }
-
-        $this->performWelcome($template, $this->request, $user, $mediaWikiHelper);
-        $this->markComplete();
-    }
-
-    /**
-     * Performs the welcome
-     *
-     * @param WelcomeTemplate $template
-     * @param Request         $request
-     * @param User            $user             The user who triggered the job
-     * @param MediaWikiHelper $mediaWikiHelper
-     */
-    private function performWelcome(
-        WelcomeTemplate $template,
-        Request $request,
-        User $user,
-        MediaWikiHelper $mediaWikiHelper
-    ) {
-        $templateText = $template->getBotCodeForWikiSave($request->getName(), $user->getOnWikiName());
-
-        $mediaWikiHelper->addTalkPageMessage($request->getName(), $template->getSectionHeader(), 'Welcoming user created through [[WP:ACC]]', $templateText);
-    }
-
-    protected function markFailed($reason = null, bool $acknowledged = false)
-    {
-        $this->getNotificationHelper()->requestWelcomeFailed($this->request, $this->getTriggerUser());
-
-        parent::markFailed($reason, $acknowledged);
-    }
+	/** @var Request */
+	private $request;
+
+	public function execute()
+	{
+		$database = $this->getDatabase();
+		$this->request = $this->getRequest();
+		$user = $this->getTriggerUser();
+		//FIXME: domains
+		$userPrefs = new PreferenceManager($database, $user->getId(), 1);
+
+		$welcomeTemplate = $userPrefs->getPreference(PreferenceManager::PREF_WELCOMETEMPLATE);
+
+		if ($welcomeTemplate === null) {
+			$this->markFailed('Welcome template not specified');
+
+			return;
+		}
+
+		/** @var WelcomeTemplate $template */
+		$template = WelcomeTemplate::getById($welcomeTemplate, $database);
+
+		if ($template === false) {
+			$this->markFailed('Welcome template missing');
+
+			return;
+		}
+
+		$oauth = new OAuthUserHelper($user, $database, $this->getOauthProtocolHelper(),
+			$this->getSiteConfiguration());
+		$mediaWikiHelper = new MediaWikiHelper($oauth, $this->getSiteConfiguration());
+
+		if ($this->request->getStatus() !== RequestStatus::CLOSED) {
+			$this->markFailed('Request is currently open');
+
+			return;
+		}
+
+		if (!$mediaWikiHelper->checkAccountExists($this->request->getName())) {
+			$this->markFailed('Account does not exist!');
+
+			return;
+		}
+
+		$this->performWelcome($template, $this->request, $user, $mediaWikiHelper);
+		$this->markComplete();
+	}
+
+	/**
+	 * Performs the welcome
+	 *
+	 * @param WelcomeTemplate $template
+	 * @param Request         $request
+	 * @param User            $user             The user who triggered the job
+	 * @param MediaWikiHelper $mediaWikiHelper
+	 */
+	private function performWelcome(
+		WelcomeTemplate $template,
+		Request $request,
+		User $user,
+		MediaWikiHelper $mediaWikiHelper
+	) {
+		$templateText = $template->getBotCodeForWikiSave($request->getName(), $user->getOnWikiName());
+
+		$mediaWikiHelper->addTalkPageMessage($request->getName(), $template->getSectionHeader(), 'Welcoming user created through [[WP:ACC]]', $templateText);
+	}
+
+	protected function markFailed($reason = null, bool $acknowledged = false)
+	{
+		$this->getNotificationHelper()->requestWelcomeFailed($this->request, $this->getTriggerUser());
+
+		parent::markFailed($reason, $acknowledged);
+	}
 }
\ No newline at end of file

includes/Background/CreationTaskBase.php

Indentation +152 added lines, -152 removed lines

@@ -21,156 +21,156 @@
 
 abstract class CreationTaskBase extends BackgroundTaskBase
 {
-    /** @var Request */
-    private $request;
-    /**
-     * @var MediaWikiHelper
-     * Don't use this directly.
-     */
-    private $mwHelper = null;
-
-    public function execute()
-    {
-        $this->request = $this->getRequest();
-        $user = $this->getTriggerUser();
-        $parameters = $this->getParameters();
-
-        if ($this->request->getStatus() !== RequestStatus::JOBQUEUE) {
-            $this->markCancelled('Request is not deferred to the job queue');
-
-            return;
-        }
-
-        if ($this->request->getEmailSent() != 0 && !isset($parameters->emailText)) {
-            $this->markFailed('Request has already been sent a templated email');
-
-            return;
-        }
-
-        if ($this->request->getEmail() === $this->getSiteConfiguration()->getDataClearEmail()) {
-            $this->markFailed('Private data of request has been purged.');
-
-            return;
-        }
-
-        $emailText = null;
-        $ccMailingList = null;
-        $logTarget = null;
-
-        if (isset($parameters->emailText) && isset($parameters->ccMailingList)) {
-            $emailText = $parameters->emailText;
-            $ccMailingList = $parameters->ccMailingList;
-            $logTarget = "custom-y";
-        }
-
-        if ($this->getEmailTemplate() !== null) {
-            $emailText = $this->getEmailTemplate()->getText();
-            $ccMailingList = false;
-            $logTarget = $this->getEmailTemplate()->getId();
-        }
-
-        if ($emailText === null || $ccMailingList === null) {
-            $this->markFailed('Unable to get closure email text');
-
-            return;
-        }
-
-        try {
-            $this->performCreation($user);
-
-            $this->request->setStatus(RequestStatus::CLOSED);
-            $this->request->setQueue(null);
-            $this->request->setReserved(null);
-            $this->request->setEmailSent(true);
-            $this->request->save();
-
-            // Log the closure as the user
-            $logComment = $this->getEmailTemplate() === null ? $emailText : null;
-            Logger::closeRequest($this->getDatabase(), $this->request, $logTarget, $logComment, $this->getTriggerUser());
-
-            $requestEmailHelper = new RequestEmailHelper($this->getEmailHelper());
-            $requestEmailHelper->sendMail($this->request, $emailText, $this->getTriggerUser(), $ccMailingList);
-        }
-        catch (Exception $ex) {
-            if (mb_strlen($ex->getMessage()) > 255) {
-                ExceptionHandler::logExceptionToDisk($ex, $this->getSiteConfiguration());
-            }
-
-            $this->markFailed(substr($ex->getMessage(), 0, 255));
-
-            return;
-        }
-
-        $this->markComplete();
-    }
-
-    /**
-     * @return IMediaWikiClient
-     */
-    protected abstract function getMediaWikiClient();
-
-    protected function getMediaWikiHelper()
-    {
-        if ($this->mwHelper === null) {
-            $this->mwHelper = new MediaWikiHelper($this->getMediaWikiClient(), $this->getSiteConfiguration());
-        }
-
-        return $this->mwHelper;
-    }
-
-    /** @noinspection PhpUnusedParameterInspection */
-    protected function getCreationReason(Request $request, User $user)
-    {
-        return 'Requested account at [[WP:ACC]], request #' . $request->getId();
-    }
-
-    /**
-     * @param string $name
-     *
-     * @return bool
-     */
-    protected function checkAccountExists($name)
-    {
-        return $this->getMediaWikiHelper()->checkAccountExists($name);
-    }
-
-    protected function markFailed($reason = null, bool $acknowledged = false)
-    {
-        $this->request->setStatus(RequestStatus::HOSPITAL);
-        $this->request->setQueue(null);
-        $this->request->save();
-
-        $this->getNotificationHelper()->requestCreationFailed($this->request, $this->getTriggerUser());
-
-        Logger::hospitalised($this->getDatabase(), $this->request);
-
-        // auto-acknowledge failed creation tasks, as these land in the hospital queue anyway.
-        parent::markFailed($reason, true);
-        Logger::backgroundJobAcknowledged($this->getDatabase(), $this->getJob(), "Auto-acknowledged due to request deferral to hospital queue");
-    }
-
-    /**
-     * @param $user
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function performCreation($user)
-    {
-        $mw = $this->getMediaWikiHelper();
-
-        $reason = $this->getCreationReason($this->request, $user);
-
-        if ($this->checkAccountExists($this->request->getName())) {
-            throw new ApplicationLogicException('Account already exists');
-        }
-
-        $mw->createAccount($this->request->getName(), $this->request->getEmail(), $reason);
-
-        if (!$this->checkAccountExists($this->request->getName())) {
-            throw new ApplicationLogicException('Account creation appeared to succeed but account does not exist.');
-        }
-
-        $this->request->setStatus(RequestStatus::CLOSED);
-        $this->request->save();
-    }
+	/** @var Request */
+	private $request;
+	/**
+	 * @var MediaWikiHelper
+	 * Don't use this directly.
+	 */
+	private $mwHelper = null;
+
+	public function execute()
+	{
+		$this->request = $this->getRequest();
+		$user = $this->getTriggerUser();
+		$parameters = $this->getParameters();
+
+		if ($this->request->getStatus() !== RequestStatus::JOBQUEUE) {
+			$this->markCancelled('Request is not deferred to the job queue');
+
+			return;
+		}
+
+		if ($this->request->getEmailSent() != 0 && !isset($parameters->emailText)) {
+			$this->markFailed('Request has already been sent a templated email');
+
+			return;
+		}
+
+		if ($this->request->getEmail() === $this->getSiteConfiguration()->getDataClearEmail()) {
+			$this->markFailed('Private data of request has been purged.');
+
+			return;
+		}
+
+		$emailText = null;
+		$ccMailingList = null;
+		$logTarget = null;
+
+		if (isset($parameters->emailText) && isset($parameters->ccMailingList)) {
+			$emailText = $parameters->emailText;
+			$ccMailingList = $parameters->ccMailingList;
+			$logTarget = "custom-y";
+		}
+
+		if ($this->getEmailTemplate() !== null) {
+			$emailText = $this->getEmailTemplate()->getText();
+			$ccMailingList = false;
+			$logTarget = $this->getEmailTemplate()->getId();
+		}
+
+		if ($emailText === null || $ccMailingList === null) {
+			$this->markFailed('Unable to get closure email text');
+
+			return;
+		}
+
+		try {
+			$this->performCreation($user);
+
+			$this->request->setStatus(RequestStatus::CLOSED);
+			$this->request->setQueue(null);
+			$this->request->setReserved(null);
+			$this->request->setEmailSent(true);
+			$this->request->save();
+
+			// Log the closure as the user
+			$logComment = $this->getEmailTemplate() === null ? $emailText : null;
+			Logger::closeRequest($this->getDatabase(), $this->request, $logTarget, $logComment, $this->getTriggerUser());
+
+			$requestEmailHelper = new RequestEmailHelper($this->getEmailHelper());
+			$requestEmailHelper->sendMail($this->request, $emailText, $this->getTriggerUser(), $ccMailingList);
+		}
+		catch (Exception $ex) {
+			if (mb_strlen($ex->getMessage()) > 255) {
+				ExceptionHandler::logExceptionToDisk($ex, $this->getSiteConfiguration());
+			}
+
+			$this->markFailed(substr($ex->getMessage(), 0, 255));
+
+			return;
+		}
+
+		$this->markComplete();
+	}
+
+	/**
+	 * @return IMediaWikiClient
+	 */
+	protected abstract function getMediaWikiClient();
+
+	protected function getMediaWikiHelper()
+	{
+		if ($this->mwHelper === null) {
+			$this->mwHelper = new MediaWikiHelper($this->getMediaWikiClient(), $this->getSiteConfiguration());
+		}
+
+		return $this->mwHelper;
+	}
+
+	/** @noinspection PhpUnusedParameterInspection */
+	protected function getCreationReason(Request $request, User $user)
+	{
+		return 'Requested account at [[WP:ACC]], request #' . $request->getId();
+	}
+
+	/**
+	 * @param string $name
+	 *
+	 * @return bool
+	 */
+	protected function checkAccountExists($name)
+	{
+		return $this->getMediaWikiHelper()->checkAccountExists($name);
+	}
+
+	protected function markFailed($reason = null, bool $acknowledged = false)
+	{
+		$this->request->setStatus(RequestStatus::HOSPITAL);
+		$this->request->setQueue(null);
+		$this->request->save();
+
+		$this->getNotificationHelper()->requestCreationFailed($this->request, $this->getTriggerUser());
+
+		Logger::hospitalised($this->getDatabase(), $this->request);
+
+		// auto-acknowledge failed creation tasks, as these land in the hospital queue anyway.
+		parent::markFailed($reason, true);
+		Logger::backgroundJobAcknowledged($this->getDatabase(), $this->getJob(), "Auto-acknowledged due to request deferral to hospital queue");
+	}
+
+	/**
+	 * @param $user
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function performCreation($user)
+	{
+		$mw = $this->getMediaWikiHelper();
+
+		$reason = $this->getCreationReason($this->request, $user);
+
+		if ($this->checkAccountExists($this->request->getName())) {
+			throw new ApplicationLogicException('Account already exists');
+		}
+
+		$mw->createAccount($this->request->getName(), $this->request->getEmail(), $reason);
+
+		if (!$this->checkAccountExists($this->request->getName())) {
+			throw new ApplicationLogicException('Account creation appeared to succeed but account does not exist.');
+		}
+
+		$this->request->setStatus(RequestStatus::CLOSED);
+		$this->request->save();
+	}
 }
\ No newline at end of file

includes/Background/BackgroundTaskBase.php

Indentation +264 added lines, -264 removed lines

@@ -23,268 +23,268 @@
 
 abstract class BackgroundTaskBase
 {
-    /** @var JobQueue */
-    private $job;
-    /** @var PdoDatabase */
-    private $database;
-    /** @var IOAuthProtocolHelper */
-    private $oauthProtocolHelper;
-    /** @var SiteConfiguration */
-    private $siteConfiguration;
-    /** @var IEmailHelper */
-    private $emailHelper;
-    /** @var HttpHelper */
-    private $httpHelper;
-    /** @var IrcNotificationHelper */
-    private $notificationHelper;
-    /** @var User */
-    private $triggerUser;
-    /** @var Request */
-    private $request;
-    /** @var EmailTemplate */
-    private $emailTemplate = null;
-    /** @var mixed */
-    private $parameters;
-
-    /**
-     * @return JobQueue
-     */
-    public function getJob()
-    {
-        return $this->job;
-    }
-
-    /**
-     * @param JobQueue $job
-     */
-    public function setJob(JobQueue $job)
-    {
-        $this->job = $job;
-    }
-
-    /**
-     * @return PdoDatabase
-     */
-    public function getDatabase()
-    {
-        return $this->database;
-    }
-
-    /**
-     * @param PdoDatabase $database
-     */
-    public function setDatabase(PdoDatabase $database)
-    {
-        $this->database = $database;
-    }
-
-    /**
-     * @return IOAuthProtocolHelper
-     */
-    public function getOauthProtocolHelper()
-    {
-        return $this->oauthProtocolHelper;
-    }
-
-    /**
-     * @param IOAuthProtocolHelper $oauthProtocolHelper
-     */
-    public function setOauthProtocolHelper(IOAuthProtocolHelper $oauthProtocolHelper)
-    {
-        $this->oauthProtocolHelper = $oauthProtocolHelper;
-    }
-
-    /**
-     * @return SiteConfiguration
-     */
-    public function getSiteConfiguration()
-    {
-        return $this->siteConfiguration;
-    }
-
-    /**
-     * @param SiteConfiguration $siteConfiguration
-     */
-    public function setSiteConfiguration(SiteConfiguration $siteConfiguration)
-    {
-        $this->siteConfiguration = $siteConfiguration;
-    }
-
-    /**
-     * @return HttpHelper
-     */
-    public function getHttpHelper()
-    {
-        return $this->httpHelper;
-    }
-
-    /**
-     * @param HttpHelper $httpHelper
-     */
-    public function setHttpHelper(HttpHelper $httpHelper)
-    {
-        $this->httpHelper = $httpHelper;
-    }
-
-    /**
-     * @return IEmailHelper
-     */
-    public function getEmailHelper()
-    {
-        return $this->emailHelper;
-    }
-
-    /**
-     * @param IEmailHelper $emailHelper
-     */
-    public function setEmailHelper(IEmailHelper $emailHelper)
-    {
-        $this->emailHelper = $emailHelper;
-    }
-
-    /**
-     * @return IrcNotificationHelper
-     */
-    public function getNotificationHelper()
-    {
-        return $this->notificationHelper;
-    }
-
-    /**
-     * @param IrcNotificationHelper $notificationHelper
-     */
-    public function setNotificationHelper($notificationHelper)
-    {
-        $this->notificationHelper = $notificationHelper;
-    }
-
-    /**
-     * @return void
-     */
-    protected abstract function execute();
-
-    public function run()
-    {
-        $this->triggerUser = User::getById($this->job->getTriggerUserId(), $this->getDatabase());
-
-        if ($this->triggerUser === false) {
-            throw new ApplicationLogicException('Cannot locate trigger user');
-        }
-
-        $this->request = Request::getById($this->job->getRequest(), $this->getDatabase());
-
-        if ($this->request === false) {
-            throw new ApplicationLogicException('Cannot locate request');
-        }
-
-        if ($this->job->getEmailTemplate() !== null) {
-            $this->emailTemplate = EmailTemplate::getById($this->job->getEmailTemplate(), $this->getDatabase());
-
-            if ($this->emailTemplate === false) {
-                throw new ApplicationLogicException('Cannot locate email template');
-            }
-        }
-
-        if ($this->job->getParameters() !== null) {
-            $this->parameters = json_decode($this->job->getParameters());
-
-            if (json_last_error() !== JSON_ERROR_NONE) {
-                throw new ApplicationLogicException('JSON decode: ' . json_last_error_msg());
-            }
-        }
-
-        // Should we wait for a parent job?
-        if ($this->job->getParent() !== null) {
-            /** @var JobQueue $parentJob */
-            $parentJob = JobQueue::getById($this->job->getParent(), $this->getDatabase());
-
-            if ($parentJob === false) {
-                $this->markFailed("Parent job could not be found");
-                return;
-            }
-
-            switch ($parentJob->getStatus()) {
-                case JobQueue::STATUS_CANCELLED:
-                case JobQueue::STATUS_FAILED:
-                    $this->markCancelled('Parent job failed/cancelled');
-                    return;
-                case JobQueue::STATUS_WAITING:
-                case JobQueue::STATUS_READY:
-                case JobQueue::STATUS_QUEUED:
-                case JobQueue::STATUS_RUNNING:
-                case JobQueue::STATUS_HELD:
-                    // Defer to next execution
-                    $this->job->setStatus(JobQueue::STATUS_READY);
-                    $this->job->save();
-                    return;
-                case JobQueue::STATUS_COMPLETE:
-                    // do nothing
-                    break;
-            }
-        }
-
-        $this->execute();
-    }
-
-    protected function markComplete()
-    {
-        $this->job->setStatus(JobQueue::STATUS_COMPLETE);
-        $this->job->setError(null);
-        $this->job->setAcknowledged(null);
-        $this->job->save();
-
-        Logger::backgroundJobComplete($this->getDatabase(), $this->getJob());
-    }
-
-    protected function markCancelled($reason = null)
-    {
-        $this->job->setStatus(JobQueue::STATUS_CANCELLED);
-        $this->job->setError($reason);
-        $this->job->setAcknowledged(null);
-        $this->job->save();
-
-        Logger::backgroundJobIssue($this->getDatabase(), $this->getJob());
-    }
-
-    protected function markFailed($reason = null, bool $acknowledged = false)
-    {
-        $this->job->setStatus(JobQueue::STATUS_FAILED);
-        $this->job->setError($reason);
-        $this->job->setAcknowledged($acknowledged ? 1 : 0);
-        $this->job->save();
-
-        Logger::backgroundJobIssue($this->getDatabase(), $this->getJob());
-    }
-
-    /**
-     * @return User
-     */
-    public function getTriggerUser()
-    {
-        return $this->triggerUser;
-    }
-
-    /**
-     * @return Request
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * @return EmailTemplate
-     */
-    public function getEmailTemplate()
-    {
-        return $this->emailTemplate;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getParameters()
-    {
-        return $this->parameters;
-    }
+	/** @var JobQueue */
+	private $job;
+	/** @var PdoDatabase */
+	private $database;
+	/** @var IOAuthProtocolHelper */
+	private $oauthProtocolHelper;
+	/** @var SiteConfiguration */
+	private $siteConfiguration;
+	/** @var IEmailHelper */
+	private $emailHelper;
+	/** @var HttpHelper */
+	private $httpHelper;
+	/** @var IrcNotificationHelper */
+	private $notificationHelper;
+	/** @var User */
+	private $triggerUser;
+	/** @var Request */
+	private $request;
+	/** @var EmailTemplate */
+	private $emailTemplate = null;
+	/** @var mixed */
+	private $parameters;
+
+	/**
+	 * @return JobQueue
+	 */
+	public function getJob()
+	{
+		return $this->job;
+	}
+
+	/**
+	 * @param JobQueue $job
+	 */
+	public function setJob(JobQueue $job)
+	{
+		$this->job = $job;
+	}
+
+	/**
+	 * @return PdoDatabase
+	 */
+	public function getDatabase()
+	{
+		return $this->database;
+	}
+
+	/**
+	 * @param PdoDatabase $database
+	 */
+	public function setDatabase(PdoDatabase $database)
+	{
+		$this->database = $database;
+	}
+
+	/**
+	 * @return IOAuthProtocolHelper
+	 */
+	public function getOauthProtocolHelper()
+	{
+		return $this->oauthProtocolHelper;
+	}
+
+	/**
+	 * @param IOAuthProtocolHelper $oauthProtocolHelper
+	 */
+	public function setOauthProtocolHelper(IOAuthProtocolHelper $oauthProtocolHelper)
+	{
+		$this->oauthProtocolHelper = $oauthProtocolHelper;
+	}
+
+	/**
+	 * @return SiteConfiguration
+	 */
+	public function getSiteConfiguration()
+	{
+		return $this->siteConfiguration;
+	}
+
+	/**
+	 * @param SiteConfiguration $siteConfiguration
+	 */
+	public function setSiteConfiguration(SiteConfiguration $siteConfiguration)
+	{
+		$this->siteConfiguration = $siteConfiguration;
+	}
+
+	/**
+	 * @return HttpHelper
+	 */
+	public function getHttpHelper()
+	{
+		return $this->httpHelper;
+	}
+
+	/**
+	 * @param HttpHelper $httpHelper
+	 */
+	public function setHttpHelper(HttpHelper $httpHelper)
+	{
+		$this->httpHelper = $httpHelper;
+	}
+
+	/**
+	 * @return IEmailHelper
+	 */
+	public function getEmailHelper()
+	{
+		return $this->emailHelper;
+	}
+
+	/**
+	 * @param IEmailHelper $emailHelper
+	 */
+	public function setEmailHelper(IEmailHelper $emailHelper)
+	{
+		$this->emailHelper = $emailHelper;
+	}
+
+	/**
+	 * @return IrcNotificationHelper
+	 */
+	public function getNotificationHelper()
+	{
+		return $this->notificationHelper;
+	}
+
+	/**
+	 * @param IrcNotificationHelper $notificationHelper
+	 */
+	public function setNotificationHelper($notificationHelper)
+	{
+		$this->notificationHelper = $notificationHelper;
+	}
+
+	/**
+	 * @return void
+	 */
+	protected abstract function execute();
+
+	public function run()
+	{
+		$this->triggerUser = User::getById($this->job->getTriggerUserId(), $this->getDatabase());
+
+		if ($this->triggerUser === false) {
+			throw new ApplicationLogicException('Cannot locate trigger user');
+		}
+
+		$this->request = Request::getById($this->job->getRequest(), $this->getDatabase());
+
+		if ($this->request === false) {
+			throw new ApplicationLogicException('Cannot locate request');
+		}
+
+		if ($this->job->getEmailTemplate() !== null) {
+			$this->emailTemplate = EmailTemplate::getById($this->job->getEmailTemplate(), $this->getDatabase());
+
+			if ($this->emailTemplate === false) {
+				throw new ApplicationLogicException('Cannot locate email template');
+			}
+		}
+
+		if ($this->job->getParameters() !== null) {
+			$this->parameters = json_decode($this->job->getParameters());
+
+			if (json_last_error() !== JSON_ERROR_NONE) {
+				throw new ApplicationLogicException('JSON decode: ' . json_last_error_msg());
+			}
+		}
+
+		// Should we wait for a parent job?
+		if ($this->job->getParent() !== null) {
+			/** @var JobQueue $parentJob */
+			$parentJob = JobQueue::getById($this->job->getParent(), $this->getDatabase());
+
+			if ($parentJob === false) {
+				$this->markFailed("Parent job could not be found");
+				return;
+			}
+
+			switch ($parentJob->getStatus()) {
+				case JobQueue::STATUS_CANCELLED:
+				case JobQueue::STATUS_FAILED:
+					$this->markCancelled('Parent job failed/cancelled');
+					return;
+				case JobQueue::STATUS_WAITING:
+				case JobQueue::STATUS_READY:
+				case JobQueue::STATUS_QUEUED:
+				case JobQueue::STATUS_RUNNING:
+				case JobQueue::STATUS_HELD:
+					// Defer to next execution
+					$this->job->setStatus(JobQueue::STATUS_READY);
+					$this->job->save();
+					return;
+				case JobQueue::STATUS_COMPLETE:
+					// do nothing
+					break;
+			}
+		}
+
+		$this->execute();
+	}
+
+	protected function markComplete()
+	{
+		$this->job->setStatus(JobQueue::STATUS_COMPLETE);
+		$this->job->setError(null);
+		$this->job->setAcknowledged(null);
+		$this->job->save();
+
+		Logger::backgroundJobComplete($this->getDatabase(), $this->getJob());
+	}
+
+	protected function markCancelled($reason = null)
+	{
+		$this->job->setStatus(JobQueue::STATUS_CANCELLED);
+		$this->job->setError($reason);
+		$this->job->setAcknowledged(null);
+		$this->job->save();
+
+		Logger::backgroundJobIssue($this->getDatabase(), $this->getJob());
+	}
+
+	protected function markFailed($reason = null, bool $acknowledged = false)
+	{
+		$this->job->setStatus(JobQueue::STATUS_FAILED);
+		$this->job->setError($reason);
+		$this->job->setAcknowledged($acknowledged ? 1 : 0);
+		$this->job->save();
+
+		Logger::backgroundJobIssue($this->getDatabase(), $this->getJob());
+	}
+
+	/**
+	 * @return User
+	 */
+	public function getTriggerUser()
+	{
+		return $this->triggerUser;
+	}
+
+	/**
+	 * @return Request
+	 */
+	public function getRequest()
+	{
+		return $this->request;
+	}
+
+	/**
+	 * @return EmailTemplate
+	 */
+	public function getEmailTemplate()
+	{
+		return $this->emailTemplate;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getParameters()
+	{
+		return $this->parameters;
+	}
 }

includes/Helpers/MediaWikiHelper.php

Indentation +266 added lines, -266 removed lines

@@ -15,270 +15,270 @@
 
 class MediaWikiHelper
 {
-    /**
-     * @var IMediaWikiClient
-     */
-    private $mediaWikiClient;
-    /**
-     * @var SiteConfiguration
-     */
-    private $siteConfiguration;
-
-    /**
-     * MediaWikiHelper constructor.
-     *
-     * @param IMediaWikiClient  $mediaWikiClient
-     * @param SiteConfiguration $siteConfiguration
-     */
-    public function __construct(IMediaWikiClient $mediaWikiClient, SiteConfiguration $siteConfiguration)
-    {
-        $this->mediaWikiClient = $mediaWikiClient;
-        $this->siteConfiguration = $siteConfiguration;
-    }
-
-    /**
-     * @todo handle override antispoof and titleblacklist issues
-     *
-     * @param string $username
-     * @param string $emailAddress
-     * @param string $reason
-     *
-     * @throws Exception
-     * @throws MediaWikiApiException
-     */
-    public function createAccount($username, $emailAddress, $reason)
-    {
-        // get token
-        $tokenParams = array(
-            'action' => 'query',
-            'meta'   => 'tokens',
-            'type'   => 'createaccount',
-        );
-
-        $response = $this->mediaWikiClient->doApiCall($tokenParams, 'POST');
-
-        if (isset($response->error)) {
-            throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
-        }
-
-        $token = $response->query->tokens->createaccounttoken;
-
-        $callback = $this->siteConfiguration->getBaseUrl() . '/internal.php/oauth/createCallback';
-
-        $checkboxFields = array();
-        $requiredFields = array();
-        $this->getCreationFieldData($requiredFields, $checkboxFields);
-
-        $apiCallData = array(
-            'action'              => 'createaccount',
-            'createreturnurl'     => $callback,
-            'createtoken'         => $token,
-            'createmessageformat' => 'html',
-        );
-
-        $createParams = array_fill_keys($requiredFields, '') + $apiCallData;
-
-        $createParams['username'] = $username;
-        $createParams['mailpassword'] = true;
-        $createParams['email'] = $emailAddress;
-        $createParams['reason'] = $reason;
-
-        $createResponse = $this->mediaWikiClient->doApiCall($createParams, 'POST');
-
-        if (isset($createResponse->error)) {
-            throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
-        }
-
-        if (!isset($createResponse->createaccount) || !isset($createResponse->createaccount->status)) {
-            throw new MediaWikiApiException('Unknown error creating account');
-        }
-
-        if ($createResponse->createaccount->status === 'FAIL') {
-            throw new MediaWikiApiException($createResponse->createaccount->message);
-        }
-
-        if ($createResponse->createaccount->status === 'PASS') {
-            // success!
-            return;
-        }
-
-        throw new Exception('API result reported status of ' . $createResponse->createaccount->status);
-    }
-
-    /**
-     * @param string $username
-     * @param string $title
-     * @param        $summary
-     * @param string $message
-     * @param bool   $createOnly
-     *
-     * @throws MediaWikiApiException
-     */
-    public function addTalkPageMessage($username, $title, $summary, $message, $createOnly = true)
-    {
-        // get token
-        $tokenParams = array(
-            'action' => 'query',
-            'meta'   => 'tokens',
-            'type'   => 'csrf',
-        );
-
-        $response = $this->mediaWikiClient->doApiCall($tokenParams, 'POST');
-
-        if (isset($response->error)) {
-            throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
-        }
-
-        $token = $response->query->tokens->csrftoken;
-
-        if ($token === null) {
-            throw new MediaWikiApiException('Edit token could not be acquired');
-        }
-
-        $editParameters = array(
-            'action'       => 'edit',
-            'title'        => 'User talk:' . $username,
-            'section'      => 'new',
-            'sectiontitle' => $title,
-            'summary'      => $summary,
-            'text'         => $message,
-            'token'        => $token,
-        );
-
-        if ($createOnly) {
-            $editParameters['createonly'] = true;
-        }
-
-        $response = $this->mediaWikiClient->doApiCall($editParameters, 'POST');
-
-        if (!isset($response->edit)) {
-            if (isset($response->error)) {
-                throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
-            }
-
-            throw new MediaWikiApiException('Unknown error encountered during editing.');
-        }
-
-        $editResponse = $response->edit;
-        if ($editResponse->result === "Success") {
-            return;
-        }
-
-        throw new MediaWikiApiException('Edit status unsuccessful: ' . $editResponse->result);
-    }
-
-    public function getCreationFieldData(&$requiredFields, &$checkboxFields)
-    {
-        // get token
-        $params = array(
-            'action'         => 'query',
-            'meta'           => 'authmanagerinfo',
-            'amirequestsfor' => 'create',
-        );
-
-        $response = $this->mediaWikiClient->doApiCall($params, 'GET');
-
-        if (isset($response->error)) {
-            throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
-        }
-
-        $requests = $response->query->authmanagerinfo->requests;
-
-        // We don't want to deal with these providers ever.
-        $discardList = array(
-            // Requires a username and password
-            'MediaWiki\\Auth\\PasswordAuthenticationRequest',
-        );
-
-        // We require these providers to function
-        $requireList = array(
-            'MediaWiki\\Auth\\TemporaryPasswordAuthenticationRequest',
-            'MediaWiki\\Auth\\UsernameAuthenticationRequest',
-            'MediaWiki\\Auth\\UserDataAuthenticationRequest',
-            'MediaWiki\\Auth\\CreationReasonAuthenticationRequest',
-        );
-
-        $requiredFields = array();
-        // Keep checkbox fields separate, since "required" actually means optional as absent == false.
-        $checkboxFields = array();
-
-        foreach ($requests as $req) {
-            // Immediately discard anything that is on the discard list.
-            if (in_array($req->id, $discardList)) {
-                continue;
-            }
-
-            $required = false;
-
-            if ($req->required === 'primary-required' && !in_array($req->id, $requireList)) {
-                // Only want one.
-                continue;
-            }
-
-            if (in_array($req->id, $requireList)) {
-                unset($requireList[$req->id]);
-                $required = true;
-            }
-
-            if ($req->required === 'required') {
-                $required = true;
-            }
-
-            if ($required) {
-                foreach ($req->fields as $name => $data) {
-                    if ($data->type === 'checkbox') {
-                        $checkboxFields[] = $name;
-                    }
-                    else {
-                        $requiredFields[] = $name;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * @param string $username
-     * @return bool
-     */
-    public function checkAccountExists($username)
-    {
-        $parameters = array(
-            'action'  => 'query',
-            'list'    => 'users',
-            'format'  => 'php',
-            'ususers' => $username,
-        );
-
-        $apiResult = $this->mediaWikiClient->doApiCall($parameters, 'GET');
-
-        $entry = $apiResult->query->users[0];
-        $exists = !isset($entry->missing);
-
-        return $exists;
-    }
-
-    /**
-     * Gets the HTML for the provided wiki-markup
-     *
-     * @param string $wikiText
-     *
-     * @return string
-     */
-    public function getHtmlForWikiText($wikiText)
-    {
-        $parameters = array(
-            'action'             => 'parse',
-            'pst'                => true,
-            'contentmodel'       => 'wikitext',
-            'disablelimitreport' => true,
-            'disabletoc'         => true,
-            'disableeditsection' => true,
-            'text'               => $wikiText,
-        );
-
-        $apiResult = $this->mediaWikiClient->doApiCall($parameters, 'GET');
-
-        return $apiResult->parse->text->{'*'};
-    }
+	/**
+	 * @var IMediaWikiClient
+	 */
+	private $mediaWikiClient;
+	/**
+	 * @var SiteConfiguration
+	 */
+	private $siteConfiguration;
+
+	/**
+	 * MediaWikiHelper constructor.
+	 *
+	 * @param IMediaWikiClient  $mediaWikiClient
+	 * @param SiteConfiguration $siteConfiguration
+	 */
+	public function __construct(IMediaWikiClient $mediaWikiClient, SiteConfiguration $siteConfiguration)
+	{
+		$this->mediaWikiClient = $mediaWikiClient;
+		$this->siteConfiguration = $siteConfiguration;
+	}
+
+	/**
+	 * @todo handle override antispoof and titleblacklist issues
+	 *
+	 * @param string $username
+	 * @param string $emailAddress
+	 * @param string $reason
+	 *
+	 * @throws Exception
+	 * @throws MediaWikiApiException
+	 */
+	public function createAccount($username, $emailAddress, $reason)
+	{
+		// get token
+		$tokenParams = array(
+			'action' => 'query',
+			'meta'   => 'tokens',
+			'type'   => 'createaccount',
+		);
+
+		$response = $this->mediaWikiClient->doApiCall($tokenParams, 'POST');
+
+		if (isset($response->error)) {
+			throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
+		}
+
+		$token = $response->query->tokens->createaccounttoken;
+
+		$callback = $this->siteConfiguration->getBaseUrl() . '/internal.php/oauth/createCallback';
+
+		$checkboxFields = array();
+		$requiredFields = array();
+		$this->getCreationFieldData($requiredFields, $checkboxFields);
+
+		$apiCallData = array(
+			'action'              => 'createaccount',
+			'createreturnurl'     => $callback,
+			'createtoken'         => $token,
+			'createmessageformat' => 'html',
+		);
+
+		$createParams = array_fill_keys($requiredFields, '') + $apiCallData;
+
+		$createParams['username'] = $username;
+		$createParams['mailpassword'] = true;
+		$createParams['email'] = $emailAddress;
+		$createParams['reason'] = $reason;
+
+		$createResponse = $this->mediaWikiClient->doApiCall($createParams, 'POST');
+
+		if (isset($createResponse->error)) {
+			throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
+		}
+
+		if (!isset($createResponse->createaccount) || !isset($createResponse->createaccount->status)) {
+			throw new MediaWikiApiException('Unknown error creating account');
+		}
+
+		if ($createResponse->createaccount->status === 'FAIL') {
+			throw new MediaWikiApiException($createResponse->createaccount->message);
+		}
+
+		if ($createResponse->createaccount->status === 'PASS') {
+			// success!
+			return;
+		}
+
+		throw new Exception('API result reported status of ' . $createResponse->createaccount->status);
+	}
+
+	/**
+	 * @param string $username
+	 * @param string $title
+	 * @param        $summary
+	 * @param string $message
+	 * @param bool   $createOnly
+	 *
+	 * @throws MediaWikiApiException
+	 */
+	public function addTalkPageMessage($username, $title, $summary, $message, $createOnly = true)
+	{
+		// get token
+		$tokenParams = array(
+			'action' => 'query',
+			'meta'   => 'tokens',
+			'type'   => 'csrf',
+		);
+
+		$response = $this->mediaWikiClient->doApiCall($tokenParams, 'POST');
+
+		if (isset($response->error)) {
+			throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
+		}
+
+		$token = $response->query->tokens->csrftoken;
+
+		if ($token === null) {
+			throw new MediaWikiApiException('Edit token could not be acquired');
+		}
+
+		$editParameters = array(
+			'action'       => 'edit',
+			'title'        => 'User talk:' . $username,
+			'section'      => 'new',
+			'sectiontitle' => $title,
+			'summary'      => $summary,
+			'text'         => $message,
+			'token'        => $token,
+		);
+
+		if ($createOnly) {
+			$editParameters['createonly'] = true;
+		}
+
+		$response = $this->mediaWikiClient->doApiCall($editParameters, 'POST');
+
+		if (!isset($response->edit)) {
+			if (isset($response->error)) {
+				throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
+			}
+
+			throw new MediaWikiApiException('Unknown error encountered during editing.');
+		}
+
+		$editResponse = $response->edit;
+		if ($editResponse->result === "Success") {
+			return;
+		}
+
+		throw new MediaWikiApiException('Edit status unsuccessful: ' . $editResponse->result);
+	}
+
+	public function getCreationFieldData(&$requiredFields, &$checkboxFields)
+	{
+		// get token
+		$params = array(
+			'action'         => 'query',
+			'meta'           => 'authmanagerinfo',
+			'amirequestsfor' => 'create',
+		);
+
+		$response = $this->mediaWikiClient->doApiCall($params, 'GET');
+
+		if (isset($response->error)) {
+			throw new MediaWikiApiException($response->error->code . ': ' . $response->error->info);
+		}
+
+		$requests = $response->query->authmanagerinfo->requests;
+
+		// We don't want to deal with these providers ever.
+		$discardList = array(
+			// Requires a username and password
+			'MediaWiki\\Auth\\PasswordAuthenticationRequest',
+		);
+
+		// We require these providers to function
+		$requireList = array(
+			'MediaWiki\\Auth\\TemporaryPasswordAuthenticationRequest',
+			'MediaWiki\\Auth\\UsernameAuthenticationRequest',
+			'MediaWiki\\Auth\\UserDataAuthenticationRequest',
+			'MediaWiki\\Auth\\CreationReasonAuthenticationRequest',
+		);
+
+		$requiredFields = array();
+		// Keep checkbox fields separate, since "required" actually means optional as absent == false.
+		$checkboxFields = array();
+
+		foreach ($requests as $req) {
+			// Immediately discard anything that is on the discard list.
+			if (in_array($req->id, $discardList)) {
+				continue;
+			}
+
+			$required = false;
+
+			if ($req->required === 'primary-required' && !in_array($req->id, $requireList)) {
+				// Only want one.
+				continue;
+			}
+
+			if (in_array($req->id, $requireList)) {
+				unset($requireList[$req->id]);
+				$required = true;
+			}
+
+			if ($req->required === 'required') {
+				$required = true;
+			}
+
+			if ($required) {
+				foreach ($req->fields as $name => $data) {
+					if ($data->type === 'checkbox') {
+						$checkboxFields[] = $name;
+					}
+					else {
+						$requiredFields[] = $name;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * @param string $username
+	 * @return bool
+	 */
+	public function checkAccountExists($username)
+	{
+		$parameters = array(
+			'action'  => 'query',
+			'list'    => 'users',
+			'format'  => 'php',
+			'ususers' => $username,
+		);
+
+		$apiResult = $this->mediaWikiClient->doApiCall($parameters, 'GET');
+
+		$entry = $apiResult->query->users[0];
+		$exists = !isset($entry->missing);
+
+		return $exists;
+	}
+
+	/**
+	 * Gets the HTML for the provided wiki-markup
+	 *
+	 * @param string $wikiText
+	 *
+	 * @return string
+	 */
+	public function getHtmlForWikiText($wikiText)
+	{
+		$parameters = array(
+			'action'             => 'parse',
+			'pst'                => true,
+			'contentmodel'       => 'wikitext',
+			'disablelimitreport' => true,
+			'disabletoc'         => true,
+			'disableeditsection' => true,
+			'text'               => $wikiText,
+		);
+
+		$apiResult = $this->mediaWikiClient->doApiCall($parameters, 'GET');
+
+		return $apiResult->parse->text->{'*'};
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -228,8 +228,7 @@
                 foreach ($req->fields as $name => $data) {
                     if ($data->type === 'checkbox') {
                         $checkboxFields[] = $name;
-                    }
-                    else {
+                    } else {
                         $requiredFields[] = $name;
                     }
                 }