enwikipedia-acc / waca

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/DataObjects/CommunityUser.php

Indentation +159 added lines, -159 removed lines

@@ -16,163 +16,163 @@
  */
 class CommunityUser extends User
 {
-    public function getId()
-    {
-        return -1;
-    }
-
-    public function save()
-    {
-        // Do nothing
-    }
-
-    #region properties
-
-    /**
-     * @return string
-     */
-    public function getUsername()
-    {
-        global $communityUsername;
-
-        return $communityUsername;
-    }
-
-    public function setUsername($username)
-    {
-    }
-
-    /**
-     * @return string
-     */
-    public function getEmail()
-    {
-        global $cDataClearEmail;
-
-        return $cDataClearEmail;
-    }
-
-    public function setEmail($email)
-    {
-    }
-
-    public function getStatus()
-    {
-        return "Community";
-    }
-
-    public function getOnWikiName()
-    {
-        return "127.0.0.1";
-    }
-
-    public function setOnWikiName($onWikiName)
-    {
-    }
-
-    public function getWelcomeSig()
-    {
-        return null;
-    }
-
-    public function setWelcomeSig($welcomeSig)
-    {
-    }
-
-    public function getLastActive()
-    {
-        $now = new DateTime();
-
-        return $now->format("Y-m-d H:i:s");
-    }
-
-    public function getForceLogout()
-    {
-        return true;
-    }
-
-    public function setForceLogout($forceLogout)
-    {
-    }
-
-    /**
-     * @param string $status
-     */
-    public function setStatus($status)
-    {
-    }
-
-    public function getWelcomeTemplate()
-    {
-        return 0;
-    }
-
-    public function setWelcomeTemplate($welcomeTemplate)
-    {
-    }
-
-    public function getAbortPref()
-    {
-        return 0;
-    }
-
-    public function setAbortPref($abortPreference)
-    {
-    }
-
-    public function getConfirmationDiff()
-    {
-        return null;
-    }
-
-    public function setConfirmationDiff($confirmationDiff)
-    {
-    }
-
-    public function getEmailSig()
-    {
-        return null;
-    }
-
-    public function setEmailSig($emailSignature)
-    {
-    }
-
-    #endregion
-
-    #region user access checks
-
-    public function isIdentified(IdentificationVerifier $iv)
-    {
-        return false;
-    }
-
-    public function isSuspended()
-    {
-        return false;
-    }
-
-    public function isNewUser()
-    {
-        return false;
-    }
-
-    public function isDeclined()
-    {
-        return false;
-    }
-
-    public function isCommunityUser()
-    {
-        return true;
-    }
-
-    #endregion
-
-    public function getApprovalDate()
-    {
-        $data = DateTime::createFromFormat("Y-m-d H:i:s", "1970-01-01 00:00:00");
-
-        return $data;
-    }
+	public function getId()
+	{
+		return -1;
+	}
+
+	public function save()
+	{
+		// Do nothing
+	}
+
+	#region properties
+
+	/**
+	 * @return string
+	 */
+	public function getUsername()
+	{
+		global $communityUsername;
+
+		return $communityUsername;
+	}
+
+	public function setUsername($username)
+	{
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getEmail()
+	{
+		global $cDataClearEmail;
+
+		return $cDataClearEmail;
+	}
+
+	public function setEmail($email)
+	{
+	}
+
+	public function getStatus()
+	{
+		return "Community";
+	}
+
+	public function getOnWikiName()
+	{
+		return "127.0.0.1";
+	}
+
+	public function setOnWikiName($onWikiName)
+	{
+	}
+
+	public function getWelcomeSig()
+	{
+		return null;
+	}
+
+	public function setWelcomeSig($welcomeSig)
+	{
+	}
+
+	public function getLastActive()
+	{
+		$now = new DateTime();
+
+		return $now->format("Y-m-d H:i:s");
+	}
+
+	public function getForceLogout()
+	{
+		return true;
+	}
+
+	public function setForceLogout($forceLogout)
+	{
+	}
+
+	/**
+	 * @param string $status
+	 */
+	public function setStatus($status)
+	{
+	}
+
+	public function getWelcomeTemplate()
+	{
+		return 0;
+	}
+
+	public function setWelcomeTemplate($welcomeTemplate)
+	{
+	}
+
+	public function getAbortPref()
+	{
+		return 0;
+	}
+
+	public function setAbortPref($abortPreference)
+	{
+	}
+
+	public function getConfirmationDiff()
+	{
+		return null;
+	}
+
+	public function setConfirmationDiff($confirmationDiff)
+	{
+	}
+
+	public function getEmailSig()
+	{
+		return null;
+	}
+
+	public function setEmailSig($emailSignature)
+	{
+	}
+
+	#endregion
+
+	#region user access checks
+
+	public function isIdentified(IdentificationVerifier $iv)
+	{
+		return false;
+	}
+
+	public function isSuspended()
+	{
+		return false;
+	}
+
+	public function isNewUser()
+	{
+		return false;
+	}
+
+	public function isDeclined()
+	{
+		return false;
+	}
+
+	public function isCommunityUser()
+	{
+		return true;
+	}
+
+	#endregion
+
+	public function getApprovalDate()
+	{
+		$data = DateTime::createFromFormat("Y-m-d H:i:s", "1970-01-01 00:00:00");
+
+		return $data;
+	}
 }

includes/DataObjects/OAuthIdentity.php

Indentation +285 added lines, -285 removed lines

@@ -16,51 +16,51 @@ 
 
 class OAuthIdentity extends DataObject
 {
-    #region Fields
-    /** @var int */
-    private $user;
-    /** @var string */
-    private $iss;
-    /** @var int */
-    private $sub;
-    /** @var string */
-    private $aud;
-    /** @var int */
-    private $exp;
-    /** @var int */
-    private $iat;
-    /** @var string */
-    private $username;
-    /** @var int */
-    private $editcount;
-    /** @var int */
-    private $confirmed_email;
-    /** @var int */
-    private $blocked;
-    /** @var string */
-    private $registered;
-    /** @var int */
-    private $checkuser;
-    /** @var int */
-    private $grantbasic;
-    /** @var int */
-    private $grantcreateaccount;
-    /** @var int */
-    private $granthighvolume;
-    /** @var int */
-    private $grantcreateeditmovepage;
-    #endregion
-
-    /**
-     * 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()) {
-            $statement = $this->dbObject->prepare(<<<SQL
+	#region Fields
+	/** @var int */
+	private $user;
+	/** @var string */
+	private $iss;
+	/** @var int */
+	private $sub;
+	/** @var string */
+	private $aud;
+	/** @var int */
+	private $exp;
+	/** @var int */
+	private $iat;
+	/** @var string */
+	private $username;
+	/** @var int */
+	private $editcount;
+	/** @var int */
+	private $confirmed_email;
+	/** @var int */
+	private $blocked;
+	/** @var string */
+	private $registered;
+	/** @var int */
+	private $checkuser;
+	/** @var int */
+	private $grantbasic;
+	/** @var int */
+	private $grantcreateaccount;
+	/** @var int */
+	private $granthighvolume;
+	/** @var int */
+	private $grantcreateeditmovepage;
+	#endregion
+
+	/**
+	 * 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()) {
+			$statement = $this->dbObject->prepare(<<<SQL
                 INSERT INTO oauthidentity (
                     user, iss, sub, aud, exp, iat, username, editcount, confirmed_email, blocked, registered, checkuser, 
                     grantbasic, grantcreateaccount, granthighvolume, grantcreateeditmovepage
@@ -69,34 +69,34 @@ 
                     :checkuser, :grantbasic, :grantcreateaccount, :granthighvolume, :grantcreateeditmovepage
                 )
 SQL
-            );
-
-            $statement->bindValue(':user', $this->user);
-            $statement->bindValue(':iss', $this->iss);
-            $statement->bindValue(':sub', $this->sub);
-            $statement->bindValue(':aud', $this->aud);
-            $statement->bindValue(':exp', $this->exp);
-            $statement->bindValue(':iat', $this->iat);
-            $statement->bindValue(':username', $this->username);
-            $statement->bindValue(':editcount', $this->editcount);
-            $statement->bindValue(':confirmed_email', $this->confirmed_email);
-            $statement->bindValue(':blocked', $this->blocked);
-            $statement->bindValue(':registered', $this->registered);
-            $statement->bindValue(':checkuser', $this->checkuser);
-            $statement->bindValue(':grantbasic', $this->grantbasic);
-            $statement->bindValue(':grantcreateaccount', $this->grantcreateaccount);
-            $statement->bindValue(':granthighvolume', $this->granthighvolume);
-            $statement->bindValue(':grantcreateeditmovepage', $this->grantcreateeditmovepage);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+
+			$statement->bindValue(':user', $this->user);
+			$statement->bindValue(':iss', $this->iss);
+			$statement->bindValue(':sub', $this->sub);
+			$statement->bindValue(':aud', $this->aud);
+			$statement->bindValue(':exp', $this->exp);
+			$statement->bindValue(':iat', $this->iat);
+			$statement->bindValue(':username', $this->username);
+			$statement->bindValue(':editcount', $this->editcount);
+			$statement->bindValue(':confirmed_email', $this->confirmed_email);
+			$statement->bindValue(':blocked', $this->blocked);
+			$statement->bindValue(':registered', $this->registered);
+			$statement->bindValue(':checkuser', $this->checkuser);
+			$statement->bindValue(':grantbasic', $this->grantbasic);
+			$statement->bindValue(':grantcreateaccount', $this->grantcreateaccount);
+			$statement->bindValue(':granthighvolume', $this->granthighvolume);
+			$statement->bindValue(':grantcreateeditmovepage', $this->grantcreateeditmovepage);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			$statement = $this->dbObject->prepare(<<<SQL
                 UPDATE oauthidentity SET
                       iss                     = :iss
                     , sub                     = :sub
@@ -116,211 +116,211 @@ 
                     , updateversion           = updateversion + 1
                 WHERE  id = :id AND updateversion = :updateversion
 SQL
-            );
-
-            $statement->bindValue(':iss', $this->iss);
-            $statement->bindValue(':sub', $this->sub);
-            $statement->bindValue(':aud', $this->aud);
-            $statement->bindValue(':exp', $this->exp);
-            $statement->bindValue(':iat', $this->iat);
-            $statement->bindValue(':username', $this->username);
-            $statement->bindValue(':editcount', $this->editcount);
-            $statement->bindValue(':confirmed_email', $this->confirmed_email);
-            $statement->bindValue(':blocked', $this->blocked);
-            $statement->bindValue(':registered', $this->registered);
-            $statement->bindValue(':checkuser', $this->checkuser);
-            $statement->bindValue(':grantbasic', $this->grantbasic);
-            $statement->bindValue(':grantcreateaccount', $this->grantcreateaccount);
-            $statement->bindValue(':granthighvolume', $this->granthighvolume);
-            $statement->bindValue(':grantcreateeditmovepage', $this->grantcreateeditmovepage);
-
-            $statement->bindValue(':id', $this->id);
-            $statement->bindValue(':updateversion', $this->updateversion);
-
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
-
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
-
-            $this->updateversion++;
-        }
-    }
-
-    #region Properties
-
-    /**
-     * @return int
-     */
-    public function getUserId()
-    {
-        return $this->user;
-    }
-
-    /**
-     * @param int $user
-     */
-    public function setUserId($user)
-    {
-        $this->user = $user;
-    }
-
-    /**
-     * @return string
-     */
-    public function getIssuer()
-    {
-        return $this->iss;
-    }
-
-    /**
-     * @return int
-     */
-    public function getSubject()
-    {
-        return $this->sub;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAudience()
-    {
-        return $this->aud;
-    }
-
-    /**
-     * @return int
-     */
-    public function getExpirationTime()
-    {
-        return $this->exp;
-    }
-
-    /**
-     * @return int
-     */
-    public function getIssuedAtTime()
-    {
-        return $this->iat;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUsername()
-    {
-        return $this->username;
-    }
-
-    /**
-     * @return int
-     */
-    public function getEditCount()
-    {
-        return $this->editcount;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getConfirmedEmail()
-    {
-        return $this->confirmed_email == 1;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getBlocked()
-    {
-        return $this->blocked == 1;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRegistered()
-    {
-        return $this->registered;
-    }
-
-    public function getRegistrationDate()
-    {
-        return DateTimeImmutable::createFromFormat('YmdHis', $this->registered)->format('r');
-    }
-
-    public function getAccountAge()
-    {
-        $regDate = DateTimeImmutable::createFromFormat('YmdHis', $this->registered);
-        $interval = $regDate->diff(new DateTimeImmutable(), true);
-
-        return $interval->days;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getCheckuser()
-    {
-        return $this->checkuser == 1;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getGrantBasic()
-    {
-        return $this->grantbasic == 1;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getGrantCreateAccount()
-    {
-        return $this->grantcreateaccount == 1;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getGrantHighVolume()
-    {
-        return $this->granthighvolume == 1;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getGrantCreateEditMovePage()
-    {
-        return $this->grantcreateeditmovepage == 1;
-    }
-
-    #endregion Properties
-
-    /**
-     * Populates the fields of this instance from a provided JSON Web Token
-     *
-     * @param stdClass $jwt
-     */
-    public function populate($jwt)
-    {
-        $this->iss = $jwt->iss;
-        $this->sub = $jwt->sub;
-        $this->aud = $jwt->aud;
-        $this->exp = $jwt->exp;
-        $this->iat = $jwt->iat;
-        $this->username = $jwt->username;
-        $this->editcount = $jwt->editcount;
-        $this->confirmed_email = $jwt->confirmed_email ? 1 : 0;
-        $this->blocked = $jwt->blocked ? 1 : 0;
-        $this->registered = $jwt->registered;
-
-        /*
+			);
+
+			$statement->bindValue(':iss', $this->iss);
+			$statement->bindValue(':sub', $this->sub);
+			$statement->bindValue(':aud', $this->aud);
+			$statement->bindValue(':exp', $this->exp);
+			$statement->bindValue(':iat', $this->iat);
+			$statement->bindValue(':username', $this->username);
+			$statement->bindValue(':editcount', $this->editcount);
+			$statement->bindValue(':confirmed_email', $this->confirmed_email);
+			$statement->bindValue(':blocked', $this->blocked);
+			$statement->bindValue(':registered', $this->registered);
+			$statement->bindValue(':checkuser', $this->checkuser);
+			$statement->bindValue(':grantbasic', $this->grantbasic);
+			$statement->bindValue(':grantcreateaccount', $this->grantcreateaccount);
+			$statement->bindValue(':granthighvolume', $this->granthighvolume);
+			$statement->bindValue(':grantcreateeditmovepage', $this->grantcreateeditmovepage);
+
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
+
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
+
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
+
+			$this->updateversion++;
+		}
+	}
+
+	#region Properties
+
+	/**
+	 * @return int
+	 */
+	public function getUserId()
+	{
+		return $this->user;
+	}
+
+	/**
+	 * @param int $user
+	 */
+	public function setUserId($user)
+	{
+		$this->user = $user;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getIssuer()
+	{
+		return $this->iss;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getSubject()
+	{
+		return $this->sub;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getAudience()
+	{
+		return $this->aud;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getExpirationTime()
+	{
+		return $this->exp;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getIssuedAtTime()
+	{
+		return $this->iat;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUsername()
+	{
+		return $this->username;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getEditCount()
+	{
+		return $this->editcount;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getConfirmedEmail()
+	{
+		return $this->confirmed_email == 1;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getBlocked()
+	{
+		return $this->blocked == 1;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getRegistered()
+	{
+		return $this->registered;
+	}
+
+	public function getRegistrationDate()
+	{
+		return DateTimeImmutable::createFromFormat('YmdHis', $this->registered)->format('r');
+	}
+
+	public function getAccountAge()
+	{
+		$regDate = DateTimeImmutable::createFromFormat('YmdHis', $this->registered);
+		$interval = $regDate->diff(new DateTimeImmutable(), true);
+
+		return $interval->days;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getCheckuser()
+	{
+		return $this->checkuser == 1;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getGrantBasic()
+	{
+		return $this->grantbasic == 1;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getGrantCreateAccount()
+	{
+		return $this->grantcreateaccount == 1;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getGrantHighVolume()
+	{
+		return $this->granthighvolume == 1;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getGrantCreateEditMovePage()
+	{
+		return $this->grantcreateeditmovepage == 1;
+	}
+
+	#endregion Properties
+
+	/**
+	 * Populates the fields of this instance from a provided JSON Web Token
+	 *
+	 * @param stdClass $jwt
+	 */
+	public function populate($jwt)
+	{
+		$this->iss = $jwt->iss;
+		$this->sub = $jwt->sub;
+		$this->aud = $jwt->aud;
+		$this->exp = $jwt->exp;
+		$this->iat = $jwt->iat;
+		$this->username = $jwt->username;
+		$this->editcount = $jwt->editcount;
+		$this->confirmed_email = $jwt->confirmed_email ? 1 : 0;
+		$this->blocked = $jwt->blocked ? 1 : 0;
+		$this->registered = $jwt->registered;
+
+		/*
          * Rights we need:
          *  Account creation
          *      createaccount      => createaccount
@@ -342,13 +342,13 @@ 
          * Any antispoof conflicts will still have to be resolved manually using the normal creation form.
          */
 
-        $this->grantbasic = in_array('basic', $jwt->grants) ? 1 : 0;
-        $this->grantcreateaccount = in_array('createaccount', $jwt->grants) ? 1 : 0;
-        $this->grantcreateeditmovepage = in_array('createeditmovepage', $jwt->grants) ? 1 : 0;
+		$this->grantbasic = in_array('basic', $jwt->grants) ? 1 : 0;
+		$this->grantcreateaccount = in_array('createaccount', $jwt->grants) ? 1 : 0;
+		$this->grantcreateeditmovepage = in_array('createeditmovepage', $jwt->grants) ? 1 : 0;
 
-        // we don't request these yet.
-        $this->granthighvolume = 0;
+		// we don't request these yet.
+		$this->granthighvolume = 0;
 
-        $this->checkuser = in_array('checkuser', $jwt->rights) ? 1 : 0;
-    }
+		$this->checkuser = in_array('checkuser', $jwt->rights) ? 1 : 0;
+	}
 }
\ No newline at end of file

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/ConsoleTasks/RunJobQueueTask.php

Indentation +107 added lines, -107 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
                 // Create a task.
                 $taskName = $job->getTask();
 
-                if(!class_exists($taskName)) {
+                if (!class_exists($taskName)) {
                     throw new ApplicationLogicException('Job task does not exist');
                 }
 
@@ -127,6 +127,6 @@ 
     }
 
     public static function errorHandler($errno, $errstr, $errfile, $errline) {
-        throw new Exception($errfile . "@" . $errline . ": " . $errstr);
+        throw new Exception($errfile."@".$errline.": ".$errstr);
     }
 }
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -126,7 +126,8 @@
         $task->setNotificationHelper($this->getNotificationHelper());
     }
 
-    public static function errorHandler($errno, $errstr, $errfile, $errline) {
+    public static function errorHandler($errno, $errstr, $errfile, $errline)
+    {
         throw new Exception($errfile . "@" . $errline . ": " . $errstr);
     }
 }
\ No newline at end of file

includes/Pages/PageJobQueue.php

Indentation +179 added lines, -179 removed lines

@@ -26,239 +26,239 @@
 
 class PageJobQueue extends PagedInternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $this->setHtmlTitle('Job Queue Management');
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$this->setHtmlTitle('Job Queue Management');
 
-        $this->prepareMaps();
+		$this->prepareMaps();
 
-        $database = $this->getDatabase();
+		$database = $this->getDatabase();
 
-        /** @var JobQueue[] $jobList */
-        $jobList = JobQueueSearchHelper::get($database)
-            ->statusIn(array('ready', 'waiting', 'running', 'failed'))
-            ->notAcknowledged()
-            ->fetch();
+		/** @var JobQueue[] $jobList */
+		$jobList = JobQueueSearchHelper::get($database)
+			->statusIn(array('ready', 'waiting', 'running', 'failed'))
+			->notAcknowledged()
+			->fetch();
 
-        $userIds = array();
-        $requestIds = array();
+		$userIds = array();
+		$requestIds = array();
 
-        foreach ($jobList as $job) {
-            $userIds[] = $job->getTriggerUserId();
-            $requestIds[] = $job->getRequest();
+		foreach ($jobList as $job) {
+			$userIds[] = $job->getTriggerUserId();
+			$requestIds[] = $job->getRequest();
 
-            $job->setDatabase($database);
-        }
+			$job->setDatabase($database);
+		}
 
-        $this->assign('canSeeAll', $this->barrierTest('all', User::getCurrent($database)));
+		$this->assign('canSeeAll', $this->barrierTest('all', User::getCurrent($database)));
 
-        $this->assign('users', UserSearchHelper::get($database)->inIds($userIds)->fetchMap('username'));
-        $this->assign('requests', RequestSearchHelper::get($database)->inIds($requestIds)->fetchMap('name'));
+		$this->assign('users', UserSearchHelper::get($database)->inIds($userIds)->fetchMap('username'));
+		$this->assign('requests', RequestSearchHelper::get($database)->inIds($requestIds)->fetchMap('name'));
 
-        $this->assign('joblist', $jobList);
-        $this->setTemplate('jobqueue/main.tpl');
-    }
+		$this->assign('joblist', $jobList);
+		$this->setTemplate('jobqueue/main.tpl');
+	}
 
-    protected function all()
-    {
-        $this->setHtmlTitle('All Jobs');
+	protected function all()
+	{
+		$this->setHtmlTitle('All Jobs');
 
-        $this->prepareMaps();
+		$this->prepareMaps();
 
-        $database = $this->getDatabase();
+		$database = $this->getDatabase();
 
-        $searchHelper = JobQueueSearchHelper::get($database);
-        $this->setSearchHelper($searchHelper);
-        $this->setupLimits();
+		$searchHelper = JobQueueSearchHelper::get($database);
+		$this->setSearchHelper($searchHelper);
+		$this->setupLimits();
 
-        $filterUser = WebRequest::getString('filterUser');
-        $filterTask = WebRequest::getString('filterTask');
-        $filterStatus = WebRequest::getString('filterStatus');
-        $filterRequest = WebRequest::getString('filterRequest');
+		$filterUser = WebRequest::getString('filterUser');
+		$filterTask = WebRequest::getString('filterTask');
+		$filterStatus = WebRequest::getString('filterStatus');
+		$filterRequest = WebRequest::getString('filterRequest');
 
-        if ($filterUser !== null) {
-            $searchHelper->byUser(User::getByUsername($filterUser, $database)->getId());
-        }
+		if ($filterUser !== null) {
+			$searchHelper->byUser(User::getByUsername($filterUser, $database)->getId());
+		}
 
-        if ($filterTask !== null) {
-            $searchHelper->byTask($filterTask);
-        }
+		if ($filterTask !== null) {
+			$searchHelper->byTask($filterTask);
+		}
 
-        if ($filterStatus !== null) {
-            $searchHelper->byStatus($filterStatus);
-        }
+		if ($filterStatus !== null) {
+			$searchHelper->byStatus($filterStatus);
+		}
 
-        if ($filterRequest !== null) {
-            $searchHelper->byRequest($filterRequest);
-        }
+		if ($filterRequest !== null) {
+			$searchHelper->byRequest($filterRequest);
+		}
 
-        /** @var JobQueue[] $jobList */
-        $jobList = $searchHelper->getRecordCount($count)->fetch();
+		/** @var JobQueue[] $jobList */
+		$jobList = $searchHelper->getRecordCount($count)->fetch();
 
-        $this->setupPageData($count, array(
-            'filterUser' => $filterUser,
-            'filterTask' => $filterTask,
-            'filterStatus' => $filterStatus,
-            'filterRequest' => $filterRequest,
-        ));
+		$this->setupPageData($count, array(
+			'filterUser' => $filterUser,
+			'filterTask' => $filterTask,
+			'filterStatus' => $filterStatus,
+			'filterRequest' => $filterRequest,
+		));
 
-        $userIds = array();
-        $requestIds = array();
+		$userIds = array();
+		$requestIds = array();
 
-        foreach ($jobList as $job) {
-            $userIds[] = $job->getTriggerUserId();
-            $requestIds[] = $job->getRequest();
+		foreach ($jobList as $job) {
+			$userIds[] = $job->getTriggerUserId();
+			$requestIds[] = $job->getRequest();
 
-            $job->setDatabase($database);
-        }
+			$job->setDatabase($database);
+		}
 
-        $this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database) {
-            return UserSearchHelper::get($database)->fetchColumn('username');
-        });
+		$this->getTypeAheadHelper()->defineTypeAheadSource('username-typeahead', function() use ($database) {
+			return UserSearchHelper::get($database)->fetchColumn('username');
+		});
 
-        $this->assign('users', UserSearchHelper::get($database)->inIds($userIds)->fetchMap('username'));
-        $this->assign('requests', RequestSearchHelper::get($database)->inIds($requestIds)->fetchMap('name'));
+		$this->assign('users', UserSearchHelper::get($database)->inIds($userIds)->fetchMap('username'));
+		$this->assign('requests', RequestSearchHelper::get($database)->inIds($requestIds)->fetchMap('name'));
 
-        $this->assign('joblist', $jobList);
+		$this->assign('joblist', $jobList);
 
-        $this->setTemplate('jobqueue/all.tpl');
-    }
+		$this->setTemplate('jobqueue/all.tpl');
+	}
 
-    protected function view()
-    {
-        $jobId = WebRequest::getInt('id');
-        $database = $this->getDatabase();
+	protected function view()
+	{
+		$jobId = WebRequest::getInt('id');
+		$database = $this->getDatabase();
 
-        if ($jobId === null) {
-            throw new ApplicationLogicException('No job specified');
-        }
+		if ($jobId === null) {
+			throw new ApplicationLogicException('No job specified');
+		}
 
-        /** @var JobQueue $job */
-        $job = JobQueue::getById($jobId, $database);
+		/** @var JobQueue $job */
+		$job = JobQueue::getById($jobId, $database);
 
-        if ($job === false) {
-            throw new ApplicationLogicException('Could not find requested job');
-        }
+		if ($job === false) {
+			throw new ApplicationLogicException('Could not find requested job');
+		}
 
-        $this->setHtmlTitle('Job #' . $job->getId());
+		$this->setHtmlTitle('Job #' . $job->getId());
 
-        $this->prepareMaps();
+		$this->prepareMaps();
 
-        $this->assign('user', User::getById($job->getTriggerUserId(), $database));
-        $this->assign('request', Request::getById($job->getRequest(), $database));
-        $this->assign('emailTemplate', EmailTemplate::getById($job->getEmailTemplate(), $database));
-        $this->assign('parent', JobQueue::getById($job->getParent(), $database));
+		$this->assign('user', User::getById($job->getTriggerUserId(), $database));
+		$this->assign('request', Request::getById($job->getRequest(), $database));
+		$this->assign('emailTemplate', EmailTemplate::getById($job->getEmailTemplate(), $database));
+		$this->assign('parent', JobQueue::getById($job->getParent(), $database));
 
-        /** @var Log[] $logs */
-        $logs = LogSearchHelper::get($database)->byObjectType('JobQueue')
-            ->byObjectId($job->getId())->getRecordCount($logCount)->fetch();
-        if ($logCount === 0) {
-            $this->assign('log', array());
-        }
-        else {
-            list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration());
+		/** @var Log[] $logs */
+		$logs = LogSearchHelper::get($database)->byObjectType('JobQueue')
+			->byObjectId($job->getId())->getRecordCount($logCount)->fetch();
+		if ($logCount === 0) {
+			$this->assign('log', array());
+		}
+		else {
+			list($users, $logData) = LogHelper::prepareLogsForTemplate($logs, $database, $this->getSiteConfiguration());
 
-            $this->assign("log", $logData);
-            $this->assign("users", $users);
-        }
+			$this->assign("log", $logData);
+			$this->assign("users", $users);
+		}
 
-        $this->assignCSRFToken();
+		$this->assignCSRFToken();
 
-        $this->assign('job', $job);
+		$this->assign('job', $job);
 
-        $this->assign('canAcknowledge', $this->barrierTest('acknowledge', User::getCurrent($database)));
-        $this->assign('canRequeue', $this->barrierTest('requeue', User::getCurrent($database)));
-        $this->setTemplate('jobqueue/view.tpl');
-    }
+		$this->assign('canAcknowledge', $this->barrierTest('acknowledge', User::getCurrent($database)));
+		$this->assign('canRequeue', $this->barrierTest('requeue', User::getCurrent($database)));
+		$this->setTemplate('jobqueue/view.tpl');
+	}
 
-    protected function acknowledge()
-    {
-        if (!WebRequest::wasPosted()) {
-            throw new ApplicationLogicException('This page does not support GET methods.');
-        }
+	protected function acknowledge()
+	{
+		if (!WebRequest::wasPosted()) {
+			throw new ApplicationLogicException('This page does not support GET methods.');
+		}
 
-        $this->validateCSRFToken();
+		$this->validateCSRFToken();
 
-        $jobId = WebRequest::postInt('job');
-        $database = $this->getDatabase();
+		$jobId = WebRequest::postInt('job');
+		$database = $this->getDatabase();
 
-        if ($jobId === null) {
-            throw new ApplicationLogicException('No job specified');
-        }
+		if ($jobId === null) {
+			throw new ApplicationLogicException('No job specified');
+		}
 
-        /** @var JobQueue $job */
-        $job = JobQueue::getById($jobId, $database);
+		/** @var JobQueue $job */
+		$job = JobQueue::getById($jobId, $database);
 
-        if ($job === false) {
-            throw new ApplicationLogicException('Could not find requested job');
-        }
+		if ($job === false) {
+			throw new ApplicationLogicException('Could not find requested job');
+		}
 
-        $job->setUpdateVersion(WebRequest::postInt('updateVersion'));
-        $job->setAcknowledged(true);
-        $job->save();
+		$job->setUpdateVersion(WebRequest::postInt('updateVersion'));
+		$job->setAcknowledged(true);
+		$job->save();
 
-        Logger::backgroundJobAcknowledged($database, $job);
+		Logger::backgroundJobAcknowledged($database, $job);
 
-        $this->redirect('jobQueue', 'view', array('id' => $jobId));
-    }
+		$this->redirect('jobQueue', 'view', array('id' => $jobId));
+	}
 
-    protected function requeue()
-    {
-        if (!WebRequest::wasPosted()) {
-            throw new ApplicationLogicException('This page does not support GET methods.');
-        }
+	protected function requeue()
+	{
+		if (!WebRequest::wasPosted()) {
+			throw new ApplicationLogicException('This page does not support GET methods.');
+		}
 
-        $this->validateCSRFToken();
+		$this->validateCSRFToken();
 
-        $jobId = WebRequest::postInt('job');
-        $database = $this->getDatabase();
+		$jobId = WebRequest::postInt('job');
+		$database = $this->getDatabase();
 
-        if ($jobId === null) {
-            throw new ApplicationLogicException('No job specified');
-        }
+		if ($jobId === null) {
+			throw new ApplicationLogicException('No job specified');
+		}
 
-        /** @var JobQueue $job */
-        $job = JobQueue::getById($jobId, $database);
+		/** @var JobQueue $job */
+		$job = JobQueue::getById($jobId, $database);
 
-        if ($job === false) {
-            throw new ApplicationLogicException('Could not find requested job');
-        }
+		if ($job === false) {
+			throw new ApplicationLogicException('Could not find requested job');
+		}
 
-        $job->setStatus(JobQueue::STATUS_READY);
-        $job->setUpdateVersion(WebRequest::postInt('updateVersion'));
-        $job->setAcknowledged(null);
-        $job->setError(null);
-        $job->save();
-
-        /** @var Request $request */
-        $request = Request::getById($job->getRequest(), $database);
-        $request->setStatus(RequestStatus::JOBQUEUE);
-        $request->save();
+		$job->setStatus(JobQueue::STATUS_READY);
+		$job->setUpdateVersion(WebRequest::postInt('updateVersion'));
+		$job->setAcknowledged(null);
+		$job->setError(null);
+		$job->save();
+
+		/** @var Request $request */
+		$request = Request::getById($job->getRequest(), $database);
+		$request->setStatus(RequestStatus::JOBQUEUE);
+		$request->save();
 
-        Logger::enqueuedJobQueue($database, $request);
-        Logger::backgroundJobRequeued($database, $job);
-
-        $this->redirect('jobQueue', 'view', array('id' => $jobId));
-    }
-
-    protected function prepareMaps()
-    {
-        $taskNameMap = JobQueue::getTaskDescriptions();
-
-        $statusDecriptionMap = array(
-            JobQueue::STATUS_CANCELLED => 'The job was cancelled',
-            JobQueue::STATUS_COMPLETE  => 'The job completed successfully',
-            JobQueue::STATUS_FAILED    => 'The job encountered an error',
-            JobQueue::STATUS_READY     => 'The job is ready to be picked up by the next job runner execution',
-            JobQueue::STATUS_RUNNING   => 'The job is being run right now by the job runner',
-            JobQueue::STATUS_WAITING   => 'The job has been picked up by a job runner',
-            JobQueue::STATUS_HELD      => 'The job has manually held from processing',
-        );
-        $this->assign('taskNameMap', $taskNameMap);
-        $this->assign('statusDescriptionMap', $statusDecriptionMap);
-    }
+		Logger::enqueuedJobQueue($database, $request);
+		Logger::backgroundJobRequeued($database, $job);
+
+		$this->redirect('jobQueue', 'view', array('id' => $jobId));
+	}
+
+	protected function prepareMaps()
+	{
+		$taskNameMap = JobQueue::getTaskDescriptions();
+
+		$statusDecriptionMap = array(
+			JobQueue::STATUS_CANCELLED => 'The job was cancelled',
+			JobQueue::STATUS_COMPLETE  => 'The job completed successfully',
+			JobQueue::STATUS_FAILED    => 'The job encountered an error',
+			JobQueue::STATUS_READY     => 'The job is ready to be picked up by the next job runner execution',
+			JobQueue::STATUS_RUNNING   => 'The job is being run right now by the job runner',
+			JobQueue::STATUS_WAITING   => 'The job has been picked up by a job runner',
+			JobQueue::STATUS_HELD      => 'The job has manually held from processing',
+		);
+		$this->assign('taskNameMap', $taskNameMap);
+		$this->assign('statusDescriptionMap', $statusDecriptionMap);
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
             throw new ApplicationLogicException('Could not find requested job');
         }
 
-        $this->setHtmlTitle('Job #' . $job->getId());
+        $this->setHtmlTitle('Job #'.$job->getId());
 
         $this->prepareMaps();