enwikipedia-acc / waca

includes/Tasks/TaskBase.php

Indentation +225 added lines, -225 removed lines

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

includes/DataObjects/OAuthToken.php

Indentation +137 added lines, -137 removed lines

@@ -14,42 +14,42 @@ 
 
 class OAuthToken extends DataObject
 {
-    /** @var int */
-    private $user;
-    /** @var string */
-    private $token;
-    /** @var string */
-    private $secret;
-    /** @var string */
-    private $type;
-    /** @var string */
-    private $expiry;
-
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+	/** @var int */
+	private $user;
+	/** @var string */
+	private $token;
+	/** @var string */
+	private $secret;
+	/** @var string */
+	private $type;
+	/** @var string */
+	private $expiry;
+
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare(<<<SQL
                 INSERT INTO oauthtoken ( user, token, secret, type, expiry )
                 VALUES ( :user, :token, :secret, :type, :expiry );
 SQL
-            );
-            $statement->bindValue(":user", $this->user);
-            $statement->bindValue(":token", $this->token);
-            $statement->bindValue(":secret", $this->secret);
-            $statement->bindValue(":type", $this->type);
-            $statement->bindValue(":expiry", $this->expiry);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            // update
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+			$statement->bindValue(":user", $this->user);
+			$statement->bindValue(":token", $this->token);
+			$statement->bindValue(":secret", $this->secret);
+			$statement->bindValue(":type", $this->type);
+			$statement->bindValue(":expiry", $this->expiry);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
                 UPDATE oauthtoken
                 SET   token = :token
                     , secret = :secret
@@ -58,109 +58,109 @@ 
                     , updateversion = updateversion + 1
                 WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
-
-            $statement->bindValue(':id', $this->id);
-            $statement->bindValue(':updateversion', $this->updateversion);
-
-            $statement->bindValue(":token", $this->token);
-            $statement->bindValue(":secret", $this->secret);
-            $statement->bindValue(":type", $this->type);
-            $statement->bindValue(":expiry", $this->expiry);
-
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
-
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
-
-            $this->updateversion++;
-        }
-    }
-
-    #region properties
-
-    /**
-     * @return mixed
-     */
-    public function getUserId()
-    {
-        return $this->user;
-    }
-
-    /**
-     * @param mixed $user
-     */
-    public function setUserId($user)
-    {
-        $this->user = $user;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getToken()
-    {
-        return $this->token;
-    }
-
-    /**
-     * @param mixed $token
-     */
-    public function setToken($token)
-    {
-        $this->token = $token;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getSecret()
-    {
-        return $this->secret;
-    }
-
-    /**
-     * @param mixed $secret
-     */
-    public function setSecret($secret)
-    {
-        $this->secret = $secret;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * @param mixed $type
-     */
-    public function setType($type)
-    {
-        $this->type = $type;
-    }
-
-    /**
-     * @return string
-     */
-    public function getExpiry()
-    {
-        return $this->expiry;
-    }
-
-    /**
-     * @param string $expiry
-     */
-    public function setExpiry($expiry)
-    {
-        $this->expiry = $expiry;
-    }
-    #endregion
+			);
+
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
+
+			$statement->bindValue(":token", $this->token);
+			$statement->bindValue(":secret", $this->secret);
+			$statement->bindValue(":type", $this->type);
+			$statement->bindValue(":expiry", $this->expiry);
+
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
+
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
+
+			$this->updateversion++;
+		}
+	}
+
+	#region properties
+
+	/**
+	 * @return mixed
+	 */
+	public function getUserId()
+	{
+		return $this->user;
+	}
+
+	/**
+	 * @param mixed $user
+	 */
+	public function setUserId($user)
+	{
+		$this->user = $user;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getToken()
+	{
+		return $this->token;
+	}
+
+	/**
+	 * @param mixed $token
+	 */
+	public function setToken($token)
+	{
+		$this->token = $token;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getSecret()
+	{
+		return $this->secret;
+	}
+
+	/**
+	 * @param mixed $secret
+	 */
+	public function setSecret($secret)
+	{
+		$this->secret = $secret;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getType()
+	{
+		return $this->type;
+	}
+
+	/**
+	 * @param mixed $type
+	 */
+	public function setType($type)
+	{
+		$this->type = $type;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getExpiry()
+	{
+		return $this->expiry;
+	}
+
+	/**
+	 * @param string $expiry
+	 */
+	public function setExpiry($expiry)
+	{
+		$this->expiry = $expiry;
+	}
+	#endregion
 
 }
\ No newline at end of file

includes/DataObjects/JobQueue.php

Indentation +253 added lines, -253 removed lines

@@ -17,7 +17,7 @@ 
 
 class JobQueue extends DataObject
 {
-    /*
+	/*
      * Status workflow is this:
      *
      * 1) Ready. The job has been added to the queue
@@ -26,78 +26,78 @@ 
      * 3) Complete / Failed. The job has been processed
      *
      */
-    const STATUS_READY = 'ready';
-    const STATUS_WAITING = 'waiting';
-    const STATUS_RUNNING = 'running';
-    const STATUS_COMPLETE = 'complete';
-    const STATUS_CANCELLED = 'cancelled';
-    const STATUS_FAILED = 'failed';
-    const STATUS_HELD = 'held';
-
-    /** @var string */
-    private $task;
-    /** @var int */
-    private $user;
-    /** @var int */
-    private $request;
-    /** @var int */
-    private $emailtemplate;
-    /** @var string */
-    private $status;
-    /** @var string */
-    private $enqueue;
-    /** @var string */
-    private $parameters;
-    /** @var string */
-    private $error;
-    /** @var int */
-    private $acknowledged;
-    /** @var int */
-    private $parent;
-
-    /**
-     * This feels like the least bad place to put this method.
-     */
-    public static function getTaskDescriptions() {
-        return array(
-            BotCreationTask::class  => 'Create account (via bot)',
-            UserCreationTask::class => 'Create account (via OAuth)',
-            WelcomeUserTask::class  => 'Welcome user',
-        );
-    }
-
-    /**
-     * Saves a data object to the database, either updating or inserting a record.
-     * @return void
-     * @throws Exception
-     * @throws OptimisticLockFailedException
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+	const STATUS_READY = 'ready';
+	const STATUS_WAITING = 'waiting';
+	const STATUS_RUNNING = 'running';
+	const STATUS_COMPLETE = 'complete';
+	const STATUS_CANCELLED = 'cancelled';
+	const STATUS_FAILED = 'failed';
+	const STATUS_HELD = 'held';
+
+	/** @var string */
+	private $task;
+	/** @var int */
+	private $user;
+	/** @var int */
+	private $request;
+	/** @var int */
+	private $emailtemplate;
+	/** @var string */
+	private $status;
+	/** @var string */
+	private $enqueue;
+	/** @var string */
+	private $parameters;
+	/** @var string */
+	private $error;
+	/** @var int */
+	private $acknowledged;
+	/** @var int */
+	private $parent;
+
+	/**
+	 * This feels like the least bad place to put this method.
+	 */
+	public static function getTaskDescriptions() {
+		return array(
+			BotCreationTask::class  => 'Create account (via bot)',
+			UserCreationTask::class => 'Create account (via OAuth)',
+			WelcomeUserTask::class  => 'Welcome user',
+		);
+	}
+
+	/**
+	 * Saves a data object to the database, either updating or inserting a record.
+	 * @return void
+	 * @throws Exception
+	 * @throws OptimisticLockFailedException
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare(<<<SQL
                 INSERT INTO jobqueue (task, user, request, emailtemplate, parameters, parent) 
                 VALUES (:task, :user, :request, :emailtemplate, :parameters, :parent)
 SQL
-            );
-            $statement->bindValue(":task", $this->task);
-            $statement->bindValue(":user", $this->user);
-            $statement->bindValue(":request", $this->request);
-            $statement->bindValue(":emailtemplate", $this->emailtemplate);
-            $statement->bindValue(":parameters", $this->parameters);
-            $statement->bindValue(":parent", $this->parent);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            // update
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+			$statement->bindValue(":task", $this->task);
+			$statement->bindValue(":user", $this->user);
+			$statement->bindValue(":request", $this->request);
+			$statement->bindValue(":emailtemplate", $this->emailtemplate);
+			$statement->bindValue(":parameters", $this->parameters);
+			$statement->bindValue(":parent", $this->parent);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
                 UPDATE jobqueue SET 
                       status = :status
                     , error = :error
@@ -105,187 +105,187 @@ 
                     , updateversion = updateversion + 1
                 WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
-
-            $statement->bindValue(":id", $this->id);
-            $statement->bindValue(":updateversion", $this->updateversion);
-
-            $statement->bindValue(":status", $this->status);
-            $statement->bindValue(":error", $this->error);
-            $statement->bindValue(":ack", $this->acknowledged);
-
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
-
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
-
-            $this->updateversion++;
-        }
-    }
-
-    #region Properties
-
-    /**
-     * @return string
-     */
-    public function getTask()
-    {
-        return $this->task;
-    }
-
-    /**
-     * @param string $task
-     */
-    public function setTask($task)
-    {
-        $this->task = $task;
-    }
-
-    /**
-     * @return int
-     */
-    public function getTriggerUserId()
-    {
-        return $this->user;
-    }
-
-    /**
-     * @param int $user
-     */
-    public function setTriggerUserId($user)
-    {
-        $this->user = $user;
-    }
-
-    /**
-     * @return int
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * @param int $request
-     */
-    public function setRequest($request)
-    {
-        $this->request = $request;
-    }
-
-    /**
-     * @return string
-     */
-    public function getStatus()
-    {
-        return $this->status;
-    }
-
-    /**
-     * @param string $status
-     */
-    public function setStatus($status)
-    {
-        $this->status = $status;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEnqueue()
-    {
-        return $this->enqueue;
-    }
-
-    /**
-     * @param string $enqueue
-     */
-    public function setEnqueue($enqueue)
-    {
-        $this->enqueue = $enqueue;
-    }
-
-    /**
-     * @return string
-     */
-    public function getParameters()
-    {
-        return $this->parameters;
-    }
-
-    /**
-     * @param string $parameters
-     */
-    public function setParameters($parameters)
-    {
-        $this->parameters = $parameters;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-
-    /**
-     * @param mixed $error
-     */
-    public function setError($error)
-    {
-        $this->error = $error;
-    }
-
-    /**
-     * @return int
-     */
-    public function getAcknowledged()
-    {
-        return $this->acknowledged;
-    }
-
-    /**
-     * @param int $acknowledged
-     */
-    public function setAcknowledged($acknowledged)
-    {
-        $this->acknowledged = $acknowledged;
-    }
-
-    /**
-     * @return int
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * @param int $parent
-     */
-    public function setParent($parent)
-    {
-        $this->parent = $parent;
-    }
-
-    /**
-     * @return int
-     */
-    public function getEmailTemplate()
-    {
-        return $this->emailtemplate;
-    }
-
-    /**
-     * @param int $emailTemplate
-     */
-    public function setEmailTemplate($emailTemplate)
-    {
-        $this->emailtemplate = $emailTemplate;
-    }
-    #endregion
+			);
+
+			$statement->bindValue(":id", $this->id);
+			$statement->bindValue(":updateversion", $this->updateversion);
+
+			$statement->bindValue(":status", $this->status);
+			$statement->bindValue(":error", $this->error);
+			$statement->bindValue(":ack", $this->acknowledged);
+
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
+
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
+
+			$this->updateversion++;
+		}
+	}
+
+	#region Properties
+
+	/**
+	 * @return string
+	 */
+	public function getTask()
+	{
+		return $this->task;
+	}
+
+	/**
+	 * @param string $task
+	 */
+	public function setTask($task)
+	{
+		$this->task = $task;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getTriggerUserId()
+	{
+		return $this->user;
+	}
+
+	/**
+	 * @param int $user
+	 */
+	public function setTriggerUserId($user)
+	{
+		$this->user = $user;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getRequest()
+	{
+		return $this->request;
+	}
+
+	/**
+	 * @param int $request
+	 */
+	public function setRequest($request)
+	{
+		$this->request = $request;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getStatus()
+	{
+		return $this->status;
+	}
+
+	/**
+	 * @param string $status
+	 */
+	public function setStatus($status)
+	{
+		$this->status = $status;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getEnqueue()
+	{
+		return $this->enqueue;
+	}
+
+	/**
+	 * @param string $enqueue
+	 */
+	public function setEnqueue($enqueue)
+	{
+		$this->enqueue = $enqueue;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getParameters()
+	{
+		return $this->parameters;
+	}
+
+	/**
+	 * @param string $parameters
+	 */
+	public function setParameters($parameters)
+	{
+		$this->parameters = $parameters;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getError()
+	{
+		return $this->error;
+	}
+
+	/**
+	 * @param mixed $error
+	 */
+	public function setError($error)
+	{
+		$this->error = $error;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getAcknowledged()
+	{
+		return $this->acknowledged;
+	}
+
+	/**
+	 * @param int $acknowledged
+	 */
+	public function setAcknowledged($acknowledged)
+	{
+		$this->acknowledged = $acknowledged;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getParent()
+	{
+		return $this->parent;
+	}
+
+	/**
+	 * @param int $parent
+	 */
+	public function setParent($parent)
+	{
+		$this->parent = $parent;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getEmailTemplate()
+	{
+		return $this->emailtemplate;
+	}
+
+	/**
+	 * @param int $emailTemplate
+	 */
+	public function setEmailTemplate($emailTemplate)
+	{
+		$this->emailtemplate = $emailTemplate;
+	}
+	#endregion
 }
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -58,7 +58,8 @@
     /**
      * This feels like the least bad place to put this method.
      */
-    public static function getTaskDescriptions() {
+    public static function getTaskDescriptions()
+    {
         return array(
             BotCreationTask::class  => 'Create account (via bot)',
             UserCreationTask::class => 'Create account (via OAuth)',

includes/ApplicationBase.php

Indentation +151 added lines, -151 removed lines

@@ -25,155 +25,155 @@
 
 abstract class ApplicationBase
 {
-    private $configuration;
-
-    public function __construct(SiteConfiguration $configuration)
-    {
-        $this->configuration = $configuration;
-    }
-
-    /**
-     * Application entry point.
-     *
-     * Sets up the environment and runs the application, performing any global cleanup operations when done.
-     */
-    public function run()
-    {
-        try {
-            if ($this->setupEnvironment()) {
-                $this->main();
-            }
-        }
-        catch (Exception $ex) {
-            print $ex->getMessage();
-        }
-        finally {
-            $this->cleanupEnvironment();
-        }
-    }
-
-    /**
-     * Environment setup
-     *
-     * This method initialises the tool environment. If the tool cannot be initialised correctly, it will return false
-     * and shut down prematurely.
-     *
-     * @return bool
-     * @throws EnvironmentException
-     */
-    protected function setupEnvironment()
-    {
-        $this->setupDatabase();
-
-        return true;
-    }
-
-    /**
-     * @return PdoDatabase
-     * @throws EnvironmentException
-     * @throws Exception
-     */
-    protected function setupDatabase()
-    {
-        // check the schema version
-        $database = PdoDatabase::getDatabaseConnection('acc');
-
-        /** @var int $actualVersion */
-        $actualVersion = (int)$database->query('SELECT version FROM schemaversion')->fetchColumn();
-        if ($actualVersion !== $this->getConfiguration()->getSchemaVersion()) {
-            throw new EnvironmentException('Database schema is wrong version! Please either update configuration or database.');
-        }
-
-        return $database;
-    }
-
-    /**
-     * @return SiteConfiguration
-     */
-    public function getConfiguration()
-    {
-        return $this->configuration;
-    }
-
-    /**
-     * Main application logic
-     * @return void
-     */
-    abstract protected function main();
-
-    /**
-     * Any cleanup tasks should go here
-     *
-     * Note that we need to be very careful here, as exceptions may have been thrown and handled.
-     * This should *only* be for cleaning up, no logic should go here.
-     *
-     * @return void
-     */
-    abstract protected function cleanupEnvironment();
-
-    /**
-     * @param ITask             $page
-     * @param SiteConfiguration $siteConfiguration
-     * @param PdoDatabase       $database
-     * @param PdoDatabase       $notificationsDatabase
-     *
-     * @return void
-     */
-    protected function setupHelpers(
-        ITask $page,
-        SiteConfiguration $siteConfiguration,
-        PdoDatabase $database,
-        PdoDatabase $notificationsDatabase = null
-    ) {
-        $page->setSiteConfiguration($siteConfiguration);
-
-        // setup the global database object
-        $page->setDatabase($database);
-
-        // set up helpers and inject them into the page.
-        $httpHelper = new HttpHelper(
-            $siteConfiguration->getUserAgent(),
-            $siteConfiguration->getCurlDisableVerifyPeer()
-        );
-
-        $page->setEmailHelper(new EmailHelper());
-        $page->setHttpHelper($httpHelper);
-        $page->setWikiTextHelper(new WikiTextHelper($siteConfiguration, $page->getHttpHelper()));
-
-        if ($siteConfiguration->getLocationProviderApiKey() === null) {
-            $page->setLocationProvider(new FakeLocationProvider());
-        }
-        else {
-            $page->setLocationProvider(
-                new IpLocationProvider(
-                    $database,
-                    $siteConfiguration->getLocationProviderApiKey(),
-                    $httpHelper
-                ));
-        }
-
-        $page->setXffTrustProvider(new XffTrustProvider($siteConfiguration->getSquidList(), $database));
-
-        $page->setRdnsProvider(new CachedRDnsLookupProvider($database));
-
-        $page->setAntiSpoofProvider(new CachedApiAntispoofProvider(
-            $database,
-            $this->getConfiguration()->getMediawikiWebServiceEndpoint(),
-            $httpHelper));
-
-        $page->setOAuthProtocolHelper(new OAuthProtocolHelper(
-            $siteConfiguration->getOAuthBaseUrl(),
-            $siteConfiguration->getOAuthConsumerToken(),
-            $siteConfiguration->getOAuthConsumerSecret(),
-            $httpHelper,
-            $siteConfiguration->getMediawikiWebServiceEndpoint()
-        ));
-
-        $page->setNotificationHelper(new IrcNotificationHelper(
-            $siteConfiguration,
-            $database,
-            $notificationsDatabase));
-
-        $page->setTorExitProvider(new TorExitProvider($database));
-    }
+	private $configuration;
+
+	public function __construct(SiteConfiguration $configuration)
+	{
+		$this->configuration = $configuration;
+	}
+
+	/**
+	 * Application entry point.
+	 *
+	 * Sets up the environment and runs the application, performing any global cleanup operations when done.
+	 */
+	public function run()
+	{
+		try {
+			if ($this->setupEnvironment()) {
+				$this->main();
+			}
+		}
+		catch (Exception $ex) {
+			print $ex->getMessage();
+		}
+		finally {
+			$this->cleanupEnvironment();
+		}
+	}
+
+	/**
+	 * Environment setup
+	 *
+	 * This method initialises the tool environment. If the tool cannot be initialised correctly, it will return false
+	 * and shut down prematurely.
+	 *
+	 * @return bool
+	 * @throws EnvironmentException
+	 */
+	protected function setupEnvironment()
+	{
+		$this->setupDatabase();
+
+		return true;
+	}
+
+	/**
+	 * @return PdoDatabase
+	 * @throws EnvironmentException
+	 * @throws Exception
+	 */
+	protected function setupDatabase()
+	{
+		// check the schema version
+		$database = PdoDatabase::getDatabaseConnection('acc');
+
+		/** @var int $actualVersion */
+		$actualVersion = (int)$database->query('SELECT version FROM schemaversion')->fetchColumn();
+		if ($actualVersion !== $this->getConfiguration()->getSchemaVersion()) {
+			throw new EnvironmentException('Database schema is wrong version! Please either update configuration or database.');
+		}
+
+		return $database;
+	}
+
+	/**
+	 * @return SiteConfiguration
+	 */
+	public function getConfiguration()
+	{
+		return $this->configuration;
+	}
+
+	/**
+	 * Main application logic
+	 * @return void
+	 */
+	abstract protected function main();
+
+	/**
+	 * Any cleanup tasks should go here
+	 *
+	 * Note that we need to be very careful here, as exceptions may have been thrown and handled.
+	 * This should *only* be for cleaning up, no logic should go here.
+	 *
+	 * @return void
+	 */
+	abstract protected function cleanupEnvironment();
+
+	/**
+	 * @param ITask             $page
+	 * @param SiteConfiguration $siteConfiguration
+	 * @param PdoDatabase       $database
+	 * @param PdoDatabase       $notificationsDatabase
+	 *
+	 * @return void
+	 */
+	protected function setupHelpers(
+		ITask $page,
+		SiteConfiguration $siteConfiguration,
+		PdoDatabase $database,
+		PdoDatabase $notificationsDatabase = null
+	) {
+		$page->setSiteConfiguration($siteConfiguration);
+
+		// setup the global database object
+		$page->setDatabase($database);
+
+		// set up helpers and inject them into the page.
+		$httpHelper = new HttpHelper(
+			$siteConfiguration->getUserAgent(),
+			$siteConfiguration->getCurlDisableVerifyPeer()
+		);
+
+		$page->setEmailHelper(new EmailHelper());
+		$page->setHttpHelper($httpHelper);
+		$page->setWikiTextHelper(new WikiTextHelper($siteConfiguration, $page->getHttpHelper()));
+
+		if ($siteConfiguration->getLocationProviderApiKey() === null) {
+			$page->setLocationProvider(new FakeLocationProvider());
+		}
+		else {
+			$page->setLocationProvider(
+				new IpLocationProvider(
+					$database,
+					$siteConfiguration->getLocationProviderApiKey(),
+					$httpHelper
+				));
+		}
+
+		$page->setXffTrustProvider(new XffTrustProvider($siteConfiguration->getSquidList(), $database));
+
+		$page->setRdnsProvider(new CachedRDnsLookupProvider($database));
+
+		$page->setAntiSpoofProvider(new CachedApiAntispoofProvider(
+			$database,
+			$this->getConfiguration()->getMediawikiWebServiceEndpoint(),
+			$httpHelper));
+
+		$page->setOAuthProtocolHelper(new OAuthProtocolHelper(
+			$siteConfiguration->getOAuthBaseUrl(),
+			$siteConfiguration->getOAuthConsumerToken(),
+			$siteConfiguration->getOAuthConsumerSecret(),
+			$httpHelper,
+			$siteConfiguration->getMediawikiWebServiceEndpoint()
+		));
+
+		$page->setNotificationHelper(new IrcNotificationHelper(
+			$siteConfiguration,
+			$database,
+			$notificationsDatabase));
+
+		$page->setTorExitProvider(new TorExitProvider($database));
+	}
 }
\ No newline at end of file

includes/ConsoleStart.php

Indentation +59 added lines, -59 removed lines

@@ -15,74 +15,74 @@
 
 class ConsoleStart extends ApplicationBase
 {
-    /**
-     * @var ConsoleTaskBase
-     */
-    private $consoleTask;
+	/**
+	 * @var ConsoleTaskBase
+	 */
+	private $consoleTask;
 
-    /**
-     * ConsoleStart constructor.
-     *
-     * @param SiteConfiguration $configuration
-     * @param ConsoleTaskBase   $consoleTask
-     */
-    public function __construct(SiteConfiguration $configuration, ConsoleTaskBase $consoleTask)
-    {
-        parent::__construct($configuration);
-        $this->consoleTask = $consoleTask;
-    }
+	/**
+	 * ConsoleStart constructor.
+	 *
+	 * @param SiteConfiguration $configuration
+	 * @param ConsoleTaskBase   $consoleTask
+	 */
+	public function __construct(SiteConfiguration $configuration, ConsoleTaskBase $consoleTask)
+	{
+		parent::__construct($configuration);
+		$this->consoleTask = $consoleTask;
+	}
 
-    protected function setupEnvironment()
-    {
-        // initialise super-global providers
-        WebRequest::setGlobalStateProvider(new FakeGlobalStateProvider());
+	protected function setupEnvironment()
+	{
+		// initialise super-global providers
+		WebRequest::setGlobalStateProvider(new FakeGlobalStateProvider());
 
-        if (WebRequest::method() !== null) {
-            throw new EnvironmentException('This is a console task, which cannot be executed via the web.');
-        }
+		if (WebRequest::method() !== null) {
+			throw new EnvironmentException('This is a console task, which cannot be executed via the web.');
+		}
 
-        return parent::setupEnvironment();
-    }
+		return parent::setupEnvironment();
+	}
 
-    protected function cleanupEnvironment()
-    {
-    }
+	protected function cleanupEnvironment()
+	{
+	}
 
-    /**
-     * Main application logic
-     */
-    protected function main()
-    {
-        $database = PdoDatabase::getDatabaseConnection('acc');
+	/**
+	 * Main application logic
+	 */
+	protected function main()
+	{
+		$database = PdoDatabase::getDatabaseConnection('acc');
 
-        if ($this->getConfiguration()->getIrcNotificationsEnabled()) {
-            $notificationsDatabase = PdoDatabase::getDatabaseConnection('notifications');
-        }
-        else {
-            // pass through null
-            $notificationsDatabase = null;
-        }
+		if ($this->getConfiguration()->getIrcNotificationsEnabled()) {
+			$notificationsDatabase = PdoDatabase::getDatabaseConnection('notifications');
+		}
+		else {
+			// pass through null
+			$notificationsDatabase = null;
+		}
 
-        $this->setupHelpers($this->consoleTask, $this->getConfiguration(), $database, $notificationsDatabase);
+		$this->setupHelpers($this->consoleTask, $this->getConfiguration(), $database, $notificationsDatabase);
 
-        // initialise a database transaction
-        if (!$database->beginTransaction()) {
-            throw new Exception('Failed to start transaction on primary database.');
-        }
+		// initialise a database transaction
+		if (!$database->beginTransaction()) {
+			throw new Exception('Failed to start transaction on primary database.');
+		}
 
-        try {
-            // run the task
-            $this->consoleTask->execute();
+		try {
+			// run the task
+			$this->consoleTask->execute();
 
-            if ($database->hasActiveTransaction()) {
-                $database->commit();
-            }
-        }
-        finally {
-            // Catch any hanging on transactions
-            if ($database->hasActiveTransaction()) {
-                $database->rollBack();
-            }
-        }
-    }
+			if ($database->hasActiveTransaction()) {
+				$database->commit();
+			}
+		}
+		finally {
+			// Catch any hanging on transactions
+			if ($database->hasActiveTransaction()) {
+				$database->rollBack();
+			}
+		}
+	}
 }
\ No newline at end of file

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/Pages/RequestAction/RequestActionBase.php

Indentation +44 added lines, -44 removed lines

@@ -19,54 +19,54 @@
 
 abstract class RequestActionBase extends InternalPageBase
 {
-    /**
-     * @param PdoDatabase $database
-     *
-     * @return Request
-     * @throws ApplicationLogicException
-     */
-    protected function getRequest(PdoDatabase $database)
-    {
-        $requestId = WebRequest::postInt('request');
-        if ($requestId === null) {
-            throw new ApplicationLogicException('Request ID not found');
-        }
+	/**
+	 * @param PdoDatabase $database
+	 *
+	 * @return Request
+	 * @throws ApplicationLogicException
+	 */
+	protected function getRequest(PdoDatabase $database)
+	{
+		$requestId = WebRequest::postInt('request');
+		if ($requestId === null) {
+			throw new ApplicationLogicException('Request ID not found');
+		}
 
-        /** @var Request $request */
-        $request = Request::getById($requestId, $database);
+		/** @var Request $request */
+		$request = Request::getById($requestId, $database);
 
-        if ($request === false) {
-            throw new ApplicationLogicException('Request not found');
-        }
+		if ($request === false) {
+			throw new ApplicationLogicException('Request not found');
+		}
 
-        return $request;
-    }
+		return $request;
+	}
 
-    final protected function checkPosted()
-    {
-        // if the request was not posted, send the user away.
-        if (!WebRequest::wasPosted()) {
-            throw new ApplicationLogicException('This page does not support GET methods.');
-        }
+	final protected function checkPosted()
+	{
+		// if the request was not posted, send the user away.
+		if (!WebRequest::wasPosted()) {
+			throw new ApplicationLogicException('This page does not support GET methods.');
+		}
 
-        // validate the CSRF token
-        $this->validateCSRFToken();
-    }
+		// validate the CSRF token
+		$this->validateCSRFToken();
+	}
 
-    /**
-     * @param Request     $request
-     * @param             $parentTaskId
-     * @param User        $user
-     * @param PdoDatabase $database
-     */
-    protected function enqueueWelcomeTask(Request $request, $parentTaskId, User $user, PdoDatabase $database)
-    {
-        $welcomeTask = new JobQueue();
-        $welcomeTask->setTask(WelcomeUserTask::class);
-        $welcomeTask->setRequest($request->getId());
-        $welcomeTask->setParent($parentTaskId);
-        $welcomeTask->setTriggerUserId($user->getId());
-        $welcomeTask->setDatabase($database);
-        $welcomeTask->save();
-    }
+	/**
+	 * @param Request     $request
+	 * @param             $parentTaskId
+	 * @param User        $user
+	 * @param PdoDatabase $database
+	 */
+	protected function enqueueWelcomeTask(Request $request, $parentTaskId, User $user, PdoDatabase $database)
+	{
+		$welcomeTask = new JobQueue();
+		$welcomeTask->setTask(WelcomeUserTask::class);
+		$welcomeTask->setRequest($request->getId());
+		$welcomeTask->setParent($parentTaskId);
+		$welcomeTask->setTriggerUserId($user->getId());
+		$welcomeTask->setDatabase($database);
+		$welcomeTask->save();
+	}
 }
\ No newline at end of file

includes/Pages/RequestAction/PageDropRequest.php

Indentation +15 added lines, -15 removed lines

@@ -15,22 +15,22 @@
 
 class PageDropRequest extends PageCloseRequest
 {
-    protected function getTemplate(PdoDatabase $database)
-    {
-        return EmailTemplate::getDroppedTemplate();
-    }
+	protected function getTemplate(PdoDatabase $database)
+	{
+		return EmailTemplate::getDroppedTemplate();
+	}
 
-    protected function confirmEmailAlreadySent(Request $request, EmailTemplate $template)
-    {
-        return false;
-    }
+	protected function confirmEmailAlreadySent(Request $request, EmailTemplate $template)
+	{
+		return false;
+	}
 
-    protected function confirmAccountCreated(Request $request, EmailTemplate $template)
-    {
-        return false;
-    }
+	protected function confirmAccountCreated(Request $request, EmailTemplate $template)
+	{
+		return false;
+	}
 
-    protected function sendMail(Request $request, $mailText, User $currentUser, $ccMailingList)
-    {
-    }
+	protected function sendMail(Request $request, $mailText, User $currentUser, $ccMailingList)
+	{
+	}
 }
\ No newline at end of file