enwikipedia-acc / waca

includes/DataObjects/EmailTemplate.php

Indentation +290 added lines, -290 removed lines

@@ -21,176 +21,176 @@ 
  */
 class EmailTemplate extends DataObject
 {
-    /** Note, also used in template-table.tpl */
-    const CREATED = "created";
-    /** Note, also used in template-table.tpl */
-    const NOT_CREATED = "not created";
-    /** Note, also used in template-table.tpl */
-    const NONE = null;
-    /** @var string the name of the template */
-    private $name;
-    private $text;
-    /** @var string|null */
-    private $jsquestion;
-    private $active = 1;
-    private $preloadonly = 0;
-    private $defaultaction = self::NOT_CREATED;
-
-    /**
-     * Gets active non-preload templates
-     *
-     * @param string      $defaultAction Default action to take (EmailTemplate::CREATED or EmailTemplate::NOT_CREATED)
-     * @param PdoDatabase $database
-     *
-     * @return array|false
-     */
-    public static function getActiveTemplates($defaultAction, PdoDatabase $database)
-    {
-        global $createdid;
-
-        $statement = $database->prepare(<<<SQL
+	/** Note, also used in template-table.tpl */
+	const CREATED = "created";
+	/** Note, also used in template-table.tpl */
+	const NOT_CREATED = "not created";
+	/** Note, also used in template-table.tpl */
+	const NONE = null;
+	/** @var string the name of the template */
+	private $name;
+	private $text;
+	/** @var string|null */
+	private $jsquestion;
+	private $active = 1;
+	private $preloadonly = 0;
+	private $defaultaction = self::NOT_CREATED;
+
+	/**
+	 * Gets active non-preload templates
+	 *
+	 * @param string      $defaultAction Default action to take (EmailTemplate::CREATED or EmailTemplate::NOT_CREATED)
+	 * @param PdoDatabase $database
+	 *
+	 * @return array|false
+	 */
+	public static function getActiveTemplates($defaultAction, PdoDatabase $database)
+	{
+		global $createdid;
+
+		$statement = $database->prepare(<<<SQL
 SELECT * FROM `emailtemplate`
 WHERE defaultaction = :forcreated AND active = 1 AND preloadonly = 0 AND id != :createdid;
 SQL
-        );
-        $statement->bindValue(":createdid", $createdid);
-        $statement->bindValue(":forcreated", $defaultAction);
-
-        $statement->execute();
-
-        $resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
-
-        /** @var EmailTemplate $t */
-        foreach ($resultObject as $t) {
-            $t->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    /**
-     * Gets active non-preload and preload templates, optionally filtered by the default action.
-     *
-     * @param null|bool|string $defaultAction Default action to take (EmailTemplate::CREATED,
-     *                                        EmailTemplate::NOT_CREATED, or EmailTemplate::NONE), or optionally null to
-     *                                        just get everything.
-     * @param PdoDatabase      $database
-     *
-     * @return array|false
-     */
-    public static function getAllActiveTemplates($defaultAction, PdoDatabase $database)
-    {
-        $statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE defaultaction = :forcreated AND active = 1;");
-
-        if ($defaultAction === false) {
-            $statement = $database->prepare(
-                "SELECT * FROM `emailtemplate` WHERE defaultaction NOT IN ('created', 'not created') AND active = 1;");
-        }
-
-        if ($defaultAction === null) {
-            $statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE  active = 1;");
-        }
-
-        $statement->bindValue(":forcreated", $defaultAction);
-
-        $statement->execute();
-
-        $resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
-
-        /** @var EmailTemplate $t */
-        foreach ($resultObject as $t) {
-            $t->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    /**
-     * Gets all the unactive templates
-     *
-     * @param PdoDatabase $database
-     *
-     * @return array
-     */
-    public static function getAllInactiveTemplates(PdoDatabase $database)
-    {
-        $statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE  active = 0;");
-        $statement->execute();
-
-        $resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
-
-        /** @var EmailTemplate $t */
-        foreach ($resultObject as $t) {
-            $t->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    /**
-     * @param string      $name
-     * @param PdoDatabase $database
-     *
-     * @return EmailTemplate|false
-     */
-    public static function getByName($name, PdoDatabase $database)
-    {
-        $statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE name = :name LIMIT 1;");
-        $statement->bindValue(":name", $name);
-
-        $statement->execute();
-
-        $resultObject = $statement->fetchObject(get_called_class());
-
-        if ($resultObject != false) {
-            $resultObject->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    /**
-     * @return EmailTemplate
-     */
-    public static function getDroppedTemplate()
-    {
-        $t = new EmailTemplate();
-        $t->id = 0;
-        $t->active = 1;
-        $t->name = 'Dropped';
-
-        return $t;
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+		);
+		$statement->bindValue(":createdid", $createdid);
+		$statement->bindValue(":forcreated", $defaultAction);
+
+		$statement->execute();
+
+		$resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
+
+		/** @var EmailTemplate $t */
+		foreach ($resultObject as $t) {
+			$t->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	/**
+	 * Gets active non-preload and preload templates, optionally filtered by the default action.
+	 *
+	 * @param null|bool|string $defaultAction Default action to take (EmailTemplate::CREATED,
+	 *                                        EmailTemplate::NOT_CREATED, or EmailTemplate::NONE), or optionally null to
+	 *                                        just get everything.
+	 * @param PdoDatabase      $database
+	 *
+	 * @return array|false
+	 */
+	public static function getAllActiveTemplates($defaultAction, PdoDatabase $database)
+	{
+		$statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE defaultaction = :forcreated AND active = 1;");
+
+		if ($defaultAction === false) {
+			$statement = $database->prepare(
+				"SELECT * FROM `emailtemplate` WHERE defaultaction NOT IN ('created', 'not created') AND active = 1;");
+		}
+
+		if ($defaultAction === null) {
+			$statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE  active = 1;");
+		}
+
+		$statement->bindValue(":forcreated", $defaultAction);
+
+		$statement->execute();
+
+		$resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
+
+		/** @var EmailTemplate $t */
+		foreach ($resultObject as $t) {
+			$t->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	/**
+	 * Gets all the unactive templates
+	 *
+	 * @param PdoDatabase $database
+	 *
+	 * @return array
+	 */
+	public static function getAllInactiveTemplates(PdoDatabase $database)
+	{
+		$statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE  active = 0;");
+		$statement->execute();
+
+		$resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
+
+		/** @var EmailTemplate $t */
+		foreach ($resultObject as $t) {
+			$t->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	/**
+	 * @param string      $name
+	 * @param PdoDatabase $database
+	 *
+	 * @return EmailTemplate|false
+	 */
+	public static function getByName($name, PdoDatabase $database)
+	{
+		$statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE name = :name LIMIT 1;");
+		$statement->bindValue(":name", $name);
+
+		$statement->execute();
+
+		$resultObject = $statement->fetchObject(get_called_class());
+
+		if ($resultObject != false) {
+			$resultObject->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	/**
+	 * @return EmailTemplate
+	 */
+	public static function getDroppedTemplate()
+	{
+		$t = new EmailTemplate();
+		$t->id = 0;
+		$t->active = 1;
+		$t->name = 'Dropped';
+
+		return $t;
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare(<<<SQL
 INSERT INTO `emailtemplate` (name, text, jsquestion, defaultaction, active, preloadonly)
 VALUES (:name, :text, :jsquestion, :defaultaction, :active, :preloadonly);
 SQL
-            );
-            $statement->bindValue(":name", $this->name);
-            $statement->bindValue(":text", $this->text);
-            $statement->bindValue(":jsquestion", $this->jsquestion);
-            $statement->bindValue(":defaultaction", $this->defaultaction);
-            $statement->bindValue(":active", $this->active);
-            $statement->bindValue(":preloadonly", $this->preloadonly);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            // update
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+			$statement->bindValue(":name", $this->name);
+			$statement->bindValue(":text", $this->text);
+			$statement->bindValue(":jsquestion", $this->jsquestion);
+			$statement->bindValue(":defaultaction", $this->defaultaction);
+			$statement->bindValue(":active", $this->active);
+			$statement->bindValue(":preloadonly", $this->preloadonly);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
 UPDATE `emailtemplate`
 SET name = :name,
 	text = :text,
@@ -201,130 +201,130 @@ 
 	updateversion = updateversion + 1
 WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
-            $statement->bindValue(':id', $this->id);
-            $statement->bindValue(':updateversion', $this->updateversion);
-
-            $statement->bindValue(':name', $this->name);
-            $statement->bindValue(":text", $this->text);
-            $statement->bindValue(":jsquestion", $this->jsquestion);
-            $statement->bindValue(":defaultaction", $this->defaultaction);
-            $statement->bindValue(":active", $this->active);
-            $statement->bindValue(":preloadonly", $this->preloadonly);
-
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
-
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
-
-            $this->updateversion++;
-        }
-    }
-
-    /**
-     * Override delete() from DataObject
-     */
-    public function delete()
-    {
-        throw new Exception("You shouldn't be doing that, you'll break logs.");
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param string $name
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getText()
-    {
-        return $this->text;
-    }
-
-    /**
-     * @param string $text
-     */
-    public function setText($text)
-    {
-        $this->text = $text;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getJsquestion()
-    {
-        return $this->jsquestion;
-    }
-
-    /**
-     * @param string $jsquestion
-     */
-    public function setJsquestion($jsquestion)
-    {
-        $this->jsquestion = $jsquestion;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDefaultAction()
-    {
-        return $this->defaultaction;
-    }
-
-    /**
-     * @param string $defaultAction
-     */
-    public function setDefaultAction($defaultAction)
-    {
-        $this->defaultaction = $defaultAction;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getActive()
-    {
-        return $this->active == 1;
-    }
-
-    /**
-     * @param bool $active
-     */
-    public function setActive($active)
-    {
-        $this->active = $active ? 1 : 0;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getPreloadOnly()
-    {
-        return $this->preloadonly == 1;
-    }
-
-    /**
-     * @param bool $preloadonly
-     */
-    public function setPreloadOnly($preloadonly)
-    {
-        $this->preloadonly = $preloadonly ? 1 : 0;
-    }
+			);
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
+
+			$statement->bindValue(':name', $this->name);
+			$statement->bindValue(":text", $this->text);
+			$statement->bindValue(":jsquestion", $this->jsquestion);
+			$statement->bindValue(":defaultaction", $this->defaultaction);
+			$statement->bindValue(":active", $this->active);
+			$statement->bindValue(":preloadonly", $this->preloadonly);
+
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
+
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
+
+			$this->updateversion++;
+		}
+	}
+
+	/**
+	 * Override delete() from DataObject
+	 */
+	public function delete()
+	{
+		throw new Exception("You shouldn't be doing that, you'll break logs.");
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * @param string $name
+	 */
+	public function setName($name)
+	{
+		$this->name = $name;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getText()
+	{
+		return $this->text;
+	}
+
+	/**
+	 * @param string $text
+	 */
+	public function setText($text)
+	{
+		$this->text = $text;
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getJsquestion()
+	{
+		return $this->jsquestion;
+	}
+
+	/**
+	 * @param string $jsquestion
+	 */
+	public function setJsquestion($jsquestion)
+	{
+		$this->jsquestion = $jsquestion;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDefaultAction()
+	{
+		return $this->defaultaction;
+	}
+
+	/**
+	 * @param string $defaultAction
+	 */
+	public function setDefaultAction($defaultAction)
+	{
+		$this->defaultaction = $defaultAction;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getActive()
+	{
+		return $this->active == 1;
+	}
+
+	/**
+	 * @param bool $active
+	 */
+	public function setActive($active)
+	{
+		$this->active = $active ? 1 : 0;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getPreloadOnly()
+	{
+		return $this->preloadonly == 1;
+	}
+
+	/**
+	 * @param bool $preloadonly
+	 */
+	public function setPreloadOnly($preloadonly)
+	{
+		$this->preloadonly = $preloadonly ? 1 : 0;
+	}
 }

includes/DataObjects/Comment.php

Indentation +157 added lines, -157 removed lines

@@ -20,171 +20,171 @@
  */
 class Comment extends DataObject
 {
-    private $time;
-    private $user;
-    private $comment;
-    private $visibility = "user";
-    private $request;
-
-    /**
-     * Retrieves all comments for a request, optionally filtered
-     *
-     * @param integer     $id      Request ID to search by
-     * @param PdoDatabase $database
-     * @param bool        $showAll True to show all comments, False to show only unprotected comments, and protected
-     *                             comments visible to $userId
-     * @param null|int    $userId  User to filter by
-     *
-     * @return Comment[]
-     */
-    public static function getForRequest($id, PdoDatabase $database, $showAll = false, $userId = null)
-    {
-        if ($showAll) {
-            $statement = $database->prepare('SELECT * FROM comment WHERE request = :target;');
-        }
-        else {
-            $statement = $database->prepare(<<<SQL
+	private $time;
+	private $user;
+	private $comment;
+	private $visibility = "user";
+	private $request;
+
+	/**
+	 * Retrieves all comments for a request, optionally filtered
+	 *
+	 * @param integer     $id      Request ID to search by
+	 * @param PdoDatabase $database
+	 * @param bool        $showAll True to show all comments, False to show only unprotected comments, and protected
+	 *                             comments visible to $userId
+	 * @param null|int    $userId  User to filter by
+	 *
+	 * @return Comment[]
+	 */
+	public static function getForRequest($id, PdoDatabase $database, $showAll = false, $userId = null)
+	{
+		if ($showAll) {
+			$statement = $database->prepare('SELECT * FROM comment WHERE request = :target;');
+		}
+		else {
+			$statement = $database->prepare(<<<SQL
 SELECT * FROM comment
 WHERE request = :target AND (visibility = 'user' OR user = :userid);
 SQL
-            );
-            $statement->bindValue(':userid', $userId);
-        }
-
-        $statement->bindValue(':target', $id);
-
-        $statement->execute();
-
-        $result = array();
-        /** @var Comment $v */
-        foreach ($statement->fetchAll(PDO::FETCH_CLASS, get_called_class()) as $v) {
-            $v->setDatabase($database);
-            $result[] = $v;
-        }
-
-        return $result;
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+			$statement->bindValue(':userid', $userId);
+		}
+
+		$statement->bindValue(':target', $id);
+
+		$statement->execute();
+
+		$result = array();
+		/** @var Comment $v */
+		foreach ($statement->fetchAll(PDO::FETCH_CLASS, get_called_class()) as $v) {
+			$v->setDatabase($database);
+			$result[] = $v;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare(<<<SQL
 INSERT INTO comment ( time, user, comment, visibility, request )
 VALUES ( CURRENT_TIMESTAMP(), :user, :comment, :visibility, :request );
 SQL
-            );
-            $statement->bindValue(":user", $this->user);
-            $statement->bindValue(":comment", $this->comment);
-            $statement->bindValue(":visibility", $this->visibility);
-            $statement->bindValue(":request", $this->request);
-
-            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(":comment", $this->comment);
+			$statement->bindValue(":visibility", $this->visibility);
+			$statement->bindValue(":request", $this->request);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
 UPDATE comment
 SET comment = :comment, visibility = :visibility, updateversion = updateversion + 1
 WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
-
-            $statement->bindValue(':id', $this->id);
-            $statement->bindValue(':updateversion', $this->updateversion);
-
-            $statement->bindValue(':comment', $this->comment);
-            $statement->bindValue(':visibility', $this->visibility);
-
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
-
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
-
-            $this->updateversion++;
-        }
-    }
-
-    /**
-     * @return DateTimeImmutable
-     */
-    public function getTime()
-    {
-        return new DateTimeImmutable($this->time);
-    }
-
-    /**
-     * @return int
-     */
-    public function getUser()
-    {
-        return $this->user;
-    }
-
-    /**
-     * @param int $user
-     */
-    public function setUser($user)
-    {
-        $this->user = $user;
-    }
-
-    /**
-     * @return string
-     */
-    public function getComment()
-    {
-        return $this->comment;
-    }
-
-    /**
-     * @param string $comment
-     */
-    public function setComment($comment)
-    {
-        $this->comment = $comment;
-    }
-
-    /**
-     * @return string
-     */
-    public function getVisibility()
-    {
-        return $this->visibility;
-    }
-
-    /**
-     * @param string $visibility
-     */
-    public function setVisibility($visibility)
-    {
-        $this->visibility = $visibility;
-    }
-
-    /**
-     * @return int
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * @param int $request
-     */
-    public function setRequest($request)
-    {
-        $this->request = $request;
-    }
+			);
+
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
+
+			$statement->bindValue(':comment', $this->comment);
+			$statement->bindValue(':visibility', $this->visibility);
+
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
+
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
+
+			$this->updateversion++;
+		}
+	}
+
+	/**
+	 * @return DateTimeImmutable
+	 */
+	public function getTime()
+	{
+		return new DateTimeImmutable($this->time);
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getUser()
+	{
+		return $this->user;
+	}
+
+	/**
+	 * @param int $user
+	 */
+	public function setUser($user)
+	{
+		$this->user = $user;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getComment()
+	{
+		return $this->comment;
+	}
+
+	/**
+	 * @param string $comment
+	 */
+	public function setComment($comment)
+	{
+		$this->comment = $comment;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getVisibility()
+	{
+		return $this->visibility;
+	}
+
+	/**
+	 * @param string $visibility
+	 */
+	public function setVisibility($visibility)
+	{
+		$this->visibility = $visibility;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getRequest()
+	{
+		return $this->request;
+	}
+
+	/**
+	 * @param int $request
+	 */
+	public function setRequest($request)
+	{
+		$this->request = $request;
+	}
 }

includes/DataObjects/Ban.php

Indentation +239 added lines, -239 removed lines

@@ -19,267 +19,267 @@
  */
 class Ban extends DataObject
 {
-    private $type;
-    private $target;
-    private $user;
-    private $reason;
-    private $date;
-    private $duration;
-    private $active;
-
-    /**
-     * Gets all active bans, filtered by the optional target.
-     *
-     * @param string|null $target
-     * @param PdoDatabase $database
-     *
-     * @return Ban[]
-     */
-    public static function getActiveBans($target, PdoDatabase $database)
-    {
-        if ($target !== null) {
-            $query = <<<SQL
+	private $type;
+	private $target;
+	private $user;
+	private $reason;
+	private $date;
+	private $duration;
+	private $active;
+
+	/**
+	 * Gets all active bans, filtered by the optional target.
+	 *
+	 * @param string|null $target
+	 * @param PdoDatabase $database
+	 *
+	 * @return Ban[]
+	 */
+	public static function getActiveBans($target, PdoDatabase $database)
+	{
+		if ($target !== null) {
+			$query = <<<SQL
 SELECT * FROM ban WHERE target = :target AND (duration > UNIX_TIMESTAMP() OR duration = -1) AND active = 1;
 SQL;
-            $statement = $database->prepare($query);
-            $statement->bindValue(":target", $target);
-        }
-        else {
-            $query = "SELECT * FROM ban WHERE (duration > UNIX_TIMESTAMP() OR duration = -1) AND active = 1;";
-            $statement = $database->prepare($query);
-        }
-
-        $statement->execute();
-
-        $result = array();
-
-        /** @var Ban $v */
-        foreach ($statement->fetchAll(PDO::FETCH_CLASS, get_called_class()) as $v) {
-            $v->setDatabase($database);
-            $result[] = $v;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Gets a ban by it's ID if it's currently active.
-     *
-     * @param     integer $id
-     * @param PdoDatabase $database
-     *
-     * @return Ban
-     */
-    public static function getActiveId($id, PdoDatabase $database)
-    {
-        $statement = $database->prepare(<<<SQL
+			$statement = $database->prepare($query);
+			$statement->bindValue(":target", $target);
+		}
+		else {
+			$query = "SELECT * FROM ban WHERE (duration > UNIX_TIMESTAMP() OR duration = -1) AND active = 1;";
+			$statement = $database->prepare($query);
+		}
+
+		$statement->execute();
+
+		$result = array();
+
+		/** @var Ban $v */
+		foreach ($statement->fetchAll(PDO::FETCH_CLASS, get_called_class()) as $v) {
+			$v->setDatabase($database);
+			$result[] = $v;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Gets a ban by it's ID if it's currently active.
+	 *
+	 * @param     integer $id
+	 * @param PdoDatabase $database
+	 *
+	 * @return Ban
+	 */
+	public static function getActiveId($id, PdoDatabase $database)
+	{
+		$statement = $database->prepare(<<<SQL
 SELECT *
 FROM ban
 WHERE id = :id  AND (duration > UNIX_TIMESTAMP() OR duration = -1) AND active = 1;
 SQL
-        );
-        $statement->bindValue(":id", $id);
-
-        $statement->execute();
-
-        $resultObject = $statement->fetchObject(get_called_class());
-
-        if ($resultObject != false) {
-            $resultObject->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    /**
-     * Get all active bans for a target and type.
-     *
-     * @param string      $target
-     * @param string      $type
-     * @param PdoDatabase $database
-     *
-     * @return Ban
-     */
-    public static function getBanByTarget($target, $type, PdoDatabase $database)
-    {
-        $query = <<<SQL
+		);
+		$statement->bindValue(":id", $id);
+
+		$statement->execute();
+
+		$resultObject = $statement->fetchObject(get_called_class());
+
+		if ($resultObject != false) {
+			$resultObject->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	/**
+	 * Get all active bans for a target and type.
+	 *
+	 * @param string      $target
+	 * @param string      $type
+	 * @param PdoDatabase $database
+	 *
+	 * @return Ban
+	 */
+	public static function getBanByTarget($target, $type, PdoDatabase $database)
+	{
+		$query = <<<SQL
 SELECT * FROM ban
 WHERE type = :type
 	AND target = :target
 	AND (duration > UNIX_TIMESTAMP() OR duration = -1)
 	AND active = 1;
 SQL;
-        $statement = $database->prepare($query);
-        $statement->bindValue(":target", $target);
-        $statement->bindValue(":type", $type);
+		$statement = $database->prepare($query);
+		$statement->bindValue(":target", $target);
+		$statement->bindValue(":type", $type);
 
-        $statement->execute();
+		$statement->execute();
 
-        $resultObject = $statement->fetchObject(get_called_class());
+		$resultObject = $statement->fetchObject(get_called_class());
 
-        if ($resultObject != false) {
-            $resultObject->setDatabase($database);
-        }
+		if ($resultObject != false) {
+			$resultObject->setDatabase($database);
+		}
 
-        return $resultObject;
-    }
+		return $resultObject;
+	}
 
-    /**
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+	/**
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare(<<<SQL
 INSERT INTO `ban` (type, target, user, reason, date, duration, active)
 VALUES (:type, :target, :user, :reason, CURRENT_TIMESTAMP(), :duration, :active);
 SQL
-            );
-            $statement->bindValue(":type", $this->type);
-            $statement->bindValue(":target", $this->target);
-            $statement->bindValue(":user", $this->user);
-            $statement->bindValue(":reason", $this->reason);
-            $statement->bindValue(":duration", $this->duration);
-            $statement->bindValue(":active", $this->active);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            // update
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+			$statement->bindValue(":type", $this->type);
+			$statement->bindValue(":target", $this->target);
+			$statement->bindValue(":user", $this->user);
+			$statement->bindValue(":reason", $this->reason);
+			$statement->bindValue(":duration", $this->duration);
+			$statement->bindValue(":active", $this->active);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
 UPDATE `ban`
 SET duration = :duration, active = :active, user = :user, updateversion = updateversion + 1
 WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
-            $statement->bindValue(':id', $this->id);
-            $statement->bindValue(':updateversion', $this->updateversion);
-
-            $statement->bindValue(':duration', $this->duration);
-            $statement->bindValue(':active', $this->active);
-            $statement->bindValue(':user', $this->user);
-
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
-
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
-
-            $this->updateversion++;
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * @param string $type
-     */
-    public function setType($type)
-    {
-        $this->type = $type;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTarget()
-    {
-        return $this->target;
-    }
-
-    /**
-     * @param string $target
-     */
-    public function setTarget($target)
-    {
-        $this->target = $target;
-    }
-
-    /**
-     * @return string
-     */
-    public function getReason()
-    {
-        return $this->reason;
-    }
-
-    /**
-     * @param string $reason
-     */
-    public function setReason($reason)
-    {
-        $this->reason = $reason;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getDate()
-    {
-        return $this->date;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getDuration()
-    {
-        return $this->duration;
-    }
-
-    /**
-     * @param mixed $duration
-     */
-    public function setDuration($duration)
-    {
-        $this->duration = $duration;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isActive()
-    {
-        return $this->active == 1;
-    }
-
-    /**
-     * @param bool $active
-     */
-    public function setActive($active)
-    {
-        $this->active = $active ? 1 : 0;
-    }
-
-    /**
-     * @return int
-     */
-    public function getUser()
-    {
-        return $this->user;
-    }
-
-    /**
-     * @param int $user UserID of user who is setting the ban
-     *
-     * @throws Exception
-     */
-    public function setUser($user)
-    {
-        $this->user = $user;
-    }
+			);
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
+
+			$statement->bindValue(':duration', $this->duration);
+			$statement->bindValue(':active', $this->active);
+			$statement->bindValue(':user', $this->user);
+
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
+
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
+
+			$this->updateversion++;
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getType()
+	{
+		return $this->type;
+	}
+
+	/**
+	 * @param string $type
+	 */
+	public function setType($type)
+	{
+		$this->type = $type;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getTarget()
+	{
+		return $this->target;
+	}
+
+	/**
+	 * @param string $target
+	 */
+	public function setTarget($target)
+	{
+		$this->target = $target;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getReason()
+	{
+		return $this->reason;
+	}
+
+	/**
+	 * @param string $reason
+	 */
+	public function setReason($reason)
+	{
+		$this->reason = $reason;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getDate()
+	{
+		return $this->date;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getDuration()
+	{
+		return $this->duration;
+	}
+
+	/**
+	 * @param mixed $duration
+	 */
+	public function setDuration($duration)
+	{
+		$this->duration = $duration;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isActive()
+	{
+		return $this->active == 1;
+	}
+
+	/**
+	 * @param bool $active
+	 */
+	public function setActive($active)
+	{
+		$this->active = $active ? 1 : 0;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getUser()
+	{
+		return $this->user;
+	}
+
+	/**
+	 * @param int $user UserID of user who is setting the ban
+	 *
+	 * @throws Exception
+	 */
+	public function setUser($user)
+	{
+		$this->user = $user;
+	}
 }

includes/DataObject.php

Indentation +120 added lines, -120 removed lines

@@ -23,124 +23,124 @@
  */
 abstract class DataObject
 {
-    /** @var int ID of the object */
-    protected $id = null;
-    /** @var int update version for optimistic locking */
-    protected $updateversion = 0;
-    /**
-     * @var PdoDatabase
-     */
-    protected $dbObject;
-
-    /**
-     * Retrieves a data object by it's row ID.
-     *
-     * @param int         $id
-     * @param PdoDatabase $database
-     *
-     * @return DataObject|false
-     */
-    public static function getById($id, PdoDatabase $database)
-    {
-        $array = explode('\\', get_called_class());
-        $realClassName = strtolower(end($array));
-
-        $statement = $database->prepare("SELECT * FROM {$realClassName} WHERE id = :id LIMIT 1;");
-        $statement->bindValue(":id", $id);
-
-        $statement->execute();
-
-        $resultObject = $statement->fetchObject(get_called_class());
-
-        if ($resultObject != false) {
-            $resultObject->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    public function setDatabase(PdoDatabase $db)
-    {
-        $this->dbObject = $db;
-    }
-
-    /**
-     * Gets the database associated with this data object.
-     * @return PdoDatabase
-     */
-    public function getDatabase()
-    {
-        return $this->dbObject;
-    }
-
-    /**
-     * Saves a data object to the database, either updating or inserting a record.
-     *
-     * @return void
-     */
-    abstract public function save();
-
-    /**
-     * Retrieves the ID attribute
-     */
-    public function getId()
-    {
-        return (int)$this->id;
-    }
-
-    /**
-     * Deletes the object from the database
-     */
-    public function delete()
-    {
-        if ($this->id === null) {
-            // wtf?
-            return;
-        }
-
-        $array = explode('\\', get_called_class());
-        $realClassName = strtolower(end($array));
-
-        $deleteQuery = "DELETE FROM {$realClassName} WHERE id = :id AND updateversion = :updateversion;";
-        $statement = $this->dbObject->prepare($deleteQuery);
-
-        $statement->bindValue(":id", $this->id);
-        $statement->bindValue(":updateversion", $this->updateversion);
-        $statement->execute();
-
-        if ($statement->rowCount() !== 1) {
-            throw new OptimisticLockFailedException();
-        }
-
-        $this->id = null;
-    }
-
-    /**
-     * @return int
-     */
-    public function getUpdateVersion()
-    {
-        return $this->updateversion;
-    }
-
-    /**
-     * Sets the update version.
-     *
-     * You should never call this to change the value of the update version. You should only call it when passing user
-     * input through.
-     *
-     * @param int $updateVersion
-     */
-    public function setUpdateVersion($updateVersion)
-    {
-        $this->updateversion = $updateVersion;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isNew()
-    {
-        return $this->id === null;
-    }
+	/** @var int ID of the object */
+	protected $id = null;
+	/** @var int update version for optimistic locking */
+	protected $updateversion = 0;
+	/**
+	 * @var PdoDatabase
+	 */
+	protected $dbObject;
+
+	/**
+	 * Retrieves a data object by it's row ID.
+	 *
+	 * @param int         $id
+	 * @param PdoDatabase $database
+	 *
+	 * @return DataObject|false
+	 */
+	public static function getById($id, PdoDatabase $database)
+	{
+		$array = explode('\\', get_called_class());
+		$realClassName = strtolower(end($array));
+
+		$statement = $database->prepare("SELECT * FROM {$realClassName} WHERE id = :id LIMIT 1;");
+		$statement->bindValue(":id", $id);
+
+		$statement->execute();
+
+		$resultObject = $statement->fetchObject(get_called_class());
+
+		if ($resultObject != false) {
+			$resultObject->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	public function setDatabase(PdoDatabase $db)
+	{
+		$this->dbObject = $db;
+	}
+
+	/**
+	 * Gets the database associated with this data object.
+	 * @return PdoDatabase
+	 */
+	public function getDatabase()
+	{
+		return $this->dbObject;
+	}
+
+	/**
+	 * Saves a data object to the database, either updating or inserting a record.
+	 *
+	 * @return void
+	 */
+	abstract public function save();
+
+	/**
+	 * Retrieves the ID attribute
+	 */
+	public function getId()
+	{
+		return (int)$this->id;
+	}
+
+	/**
+	 * Deletes the object from the database
+	 */
+	public function delete()
+	{
+		if ($this->id === null) {
+			// wtf?
+			return;
+		}
+
+		$array = explode('\\', get_called_class());
+		$realClassName = strtolower(end($array));
+
+		$deleteQuery = "DELETE FROM {$realClassName} WHERE id = :id AND updateversion = :updateversion;";
+		$statement = $this->dbObject->prepare($deleteQuery);
+
+		$statement->bindValue(":id", $this->id);
+		$statement->bindValue(":updateversion", $this->updateversion);
+		$statement->execute();
+
+		if ($statement->rowCount() !== 1) {
+			throw new OptimisticLockFailedException();
+		}
+
+		$this->id = null;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getUpdateVersion()
+	{
+		return $this->updateversion;
+	}
+
+	/**
+	 * Sets the update version.
+	 *
+	 * You should never call this to change the value of the update version. You should only call it when passing user
+	 * input through.
+	 *
+	 * @param int $updateVersion
+	 */
+	public function setUpdateVersion($updateVersion)
+	{
+		$this->updateversion = $updateVersion;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isNew()
+	{
+		return $this->id === null;
+	}
 }

includes/Pages/Statistics/StatsInactiveUsers.php

Indentation +25 added lines, -25 removed lines

@@ -17,31 +17,31 @@
 
 class StatsInactiveUsers extends InternalPageBase
 {
-    public function main()
-    {
-        $this->setHtmlTitle('Inactive Users :: Statistics');
-
-        $date = new DateTime();
-        $date->modify("-90 days");
-
-        $inactiveUsers = UserSearchHelper::get($this->getDatabase())
-            ->byStatus('Active')
-            ->lastActiveBefore($date)
-            ->getRoleMap($roleMap)
-            ->fetch();
-
-        $this->assign('inactiveUsers', $inactiveUsers);
-        $this->assign('roles', $roleMap);
-        $this->assign('canSuspend',
-            $this->barrierTest('suspend', User::getCurrent($this->getDatabase()), PageUserManagement::class));
-
-        $immuneUsers = $this->getDatabase()
-            ->query("SELECT user FROM userrole WHERE role IN ('toolRoot', 'checkuser') GROUP BY user;")
-            ->fetchAll(PDO::FETCH_COLUMN);
+	public function main()
+	{
+		$this->setHtmlTitle('Inactive Users :: Statistics');
+
+		$date = new DateTime();
+		$date->modify("-90 days");
+
+		$inactiveUsers = UserSearchHelper::get($this->getDatabase())
+			->byStatus('Active')
+			->lastActiveBefore($date)
+			->getRoleMap($roleMap)
+			->fetch();
+
+		$this->assign('inactiveUsers', $inactiveUsers);
+		$this->assign('roles', $roleMap);
+		$this->assign('canSuspend',
+			$this->barrierTest('suspend', User::getCurrent($this->getDatabase()), PageUserManagement::class));
+
+		$immuneUsers = $this->getDatabase()
+			->query("SELECT user FROM userrole WHERE role IN ('toolRoot', 'checkuser') GROUP BY user;")
+			->fetchAll(PDO::FETCH_COLUMN);
         
-        $this->assign('immune', array_fill_keys($immuneUsers, true));
+		$this->assign('immune', array_fill_keys($immuneUsers, true));
 
-        $this->setTemplate('statistics/inactive-users.tpl');
-        $this->assign('statsPageTitle', 'Inactive tool users');
-    }
+		$this->setTemplate('statistics/inactive-users.tpl');
+		$this->assign('statsPageTitle', 'Inactive tool users');
+	}
 }

includes/Pages/Registration/PageRegisterOption.php

Indentation +13 added lines, -13 removed lines

@@ -12,18 +12,18 @@
 
 class PageRegisterOption extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @return void
-     */
-    protected function main()
-    {
-        $this->assign('allowRegistration', $this->getSiteConfiguration()->isRegistrationAllowed());
-        $this->setTemplate('registration/option.tpl');
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @return void
+	 */
+	protected function main()
+	{
+		$this->assign('allowRegistration', $this->getSiteConfiguration()->isRegistrationAllowed());
+		$this->setTemplate('registration/option.tpl');
+	}
 
-    protected function isProtectedPage()
-    {
-        return false;
-    }
+	protected function isProtectedPage()
+	{
+		return false;
+	}
 }

includes/Pages/Registration/PageRegisterBase.php

Indentation +200 added lines, -200 removed lines

@@ -21,204 +21,204 @@
 
 abstract class PageRegisterBase extends InternalPageBase
 {
-    /**
-     * Main function for this page, when no specific actions are called.
-     * @throws AccessDeniedException
-     */
-    protected function main()
-    {
-        $useOAuthSignup = $this->getSiteConfiguration()->getUseOAuthSignup();
-        if (! $this->getSiteConfiguration()->isRegistrationAllowed()) {
-           throw new AccessDeniedException();
-        }
-
-        // Dual-mode page
-        if (WebRequest::wasPosted()) {
-            $this->validateCSRFToken();
-
-            try {
-                $this->handlePost($useOAuthSignup);
-            }
-            catch (ApplicationLogicException $ex) {
-                SessionAlert::error($ex->getMessage());
-                $this->redirect('register');
-            }
-        }
-        else {
-            $this->assignCSRFToken();
-            $this->assign("useOAuthSignup", $useOAuthSignup);
-            $this->setTemplate($this->getRegistrationTemplate());
-        }
-    }
-
-    protected abstract function getRegistrationTemplate();
-
-    protected function isProtectedPage()
-    {
-        return false;
-    }
-
-    /**
-     * @param string $emailAddress
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function validateUniqueEmail($emailAddress)
-    {
-        $query = 'SELECT COUNT(id) FROM user WHERE email = :email';
-        $statement = $this->getDatabase()->prepare($query);
-        $statement->execute(array(':email' => $emailAddress));
-
-        if ($statement->fetchColumn() > 0) {
-            throw new ApplicationLogicException('That email address is already in use on this system.');
-        }
-
-        $statement->closeCursor();
-    }
-
-    /**
-     * @param $emailAddress
-     * @param $password
-     * @param $username
-     * @param $useOAuthSignup
-     * @param $confirmationId
-     * @param $onwikiUsername
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function validateRequest(
-        $emailAddress,
-        $password,
-        $username,
-        $useOAuthSignup,
-        $confirmationId,
-        $onwikiUsername
-    ) {
-        if (!WebRequest::postBoolean('guidelines')) {
-            throw new ApplicationLogicException('You must read the interface guidelines before your request may be submitted.');
-        }
-
-        $this->validateGeneralInformation($emailAddress, $password, $username);
-        $this->validateUniqueEmail($emailAddress);
-        $this->validateNonOAuthFields($useOAuthSignup, $confirmationId, $onwikiUsername);
-    }
-
-    /**
-     * @param $useOAuthSignup
-     * @param $confirmationId
-     * @param $onwikiUsername
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function validateNonOAuthFields($useOAuthSignup, $confirmationId, $onwikiUsername)
-    {
-        if (!$useOAuthSignup) {
-            if ($confirmationId === null || $confirmationId <= 0) {
-                throw new ApplicationLogicException('Please enter the revision id of your confirmation edit.');
-            }
-
-            if ($onwikiUsername === null) {
-                throw new ApplicationLogicException('Please specify your on-wiki username.');
-            }
-        }
-    }
-
-    /**
-     * @param $emailAddress
-     * @param $password
-     * @param $username
-     *
-     * @throws ApplicationLogicException
-     */
-    protected function validateGeneralInformation($emailAddress, $password, $username)
-    {
-        if ($emailAddress === null) {
-            throw new ApplicationLogicException('Your email address appears to be invalid!');
-        }
-
-        if ($password !== WebRequest::postString('pass2')) {
-            throw new ApplicationLogicException('Your passwords did not match, please try again.');
-        }
-
-        if (User::getByUsername($username, $this->getDatabase()) !== false) {
-            throw new ApplicationLogicException('That username is already in use on this system.');
-        }
-    }
-
-    /**
-     * @param $useOAuthSignup
-     *
-     * @throws ApplicationLogicException
-     * @throws \Exception
-     */
-    protected function handlePost($useOAuthSignup)
-    {
-        // Get the data
-        $emailAddress = WebRequest::postEmail('email');
-        $password = WebRequest::postString('pass');
-        $username = WebRequest::postString('name');
-
-        // Only set if OAuth is disabled
-        $confirmationId = WebRequest::postInt('conf_revid');
-        $onwikiUsername = WebRequest::postString('wname');
-
-        // Do some validation
-        $this->validateRequest($emailAddress, $password, $username, $useOAuthSignup, $confirmationId,
-            $onwikiUsername);
-
-        $database = $this->getDatabase();
-
-        $user = new User();
-        $user->setDatabase($database);
-
-        $user->setUsername($username);
-        $user->setEmail($emailAddress);
-
-        if (!$useOAuthSignup) {
-            $user->setOnWikiName($onwikiUsername);
-            $user->setConfirmationDiff($confirmationId);
-        }
-
-        $user->save();
-
-        $passwordCredentialProvider = new PasswordCredentialProvider($database, $this->getSiteConfiguration());
-        $passwordCredentialProvider->setCredential($user, 1, $password);
-
-        $defaultRole = $this->getDefaultRole();
-
-        $role = new UserRole();
-        $role->setDatabase($database);
-        $role->setUser($user->getId());
-        $role->setRole($defaultRole);
-        $role->save();
-
-        // Log now to get the signup date.
-        Logger::newUser($database, $user);
-        Logger::userRolesEdited($database, $user, 'Registration', array($defaultRole), array());
-
-        if ($useOAuthSignup) {
-            $oauthProtocolHelper = $this->getOAuthProtocolHelper();
-            $oauth = new OAuthUserHelper($user, $database, $oauthProtocolHelper, $this->getSiteConfiguration());
-
-            $authoriseUrl = $oauth->getRequestToken();
-            WebRequest::setOAuthPartialLogin($user);
-            $this->redirectUrl($authoriseUrl);
-        }
-        else {
-            // only notify if we're not using the oauth signup.
-            $this->getNotificationHelper()->userNew($user);
-            WebRequest::setLoggedInUser($user);
-            $this->redirect('preferences');
-        }
-    }
-
-    protected abstract function getDefaultRole();
-
-    /**
-     * Entry point for registration complete
-     */
-    protected function done()
-    {
-        $this->setTemplate('registration/alert-registrationcomplete.tpl');
-    }
+	/**
+	 * Main function for this page, when no specific actions are called.
+	 * @throws AccessDeniedException
+	 */
+	protected function main()
+	{
+		$useOAuthSignup = $this->getSiteConfiguration()->getUseOAuthSignup();
+		if (! $this->getSiteConfiguration()->isRegistrationAllowed()) {
+		   throw new AccessDeniedException();
+		}
+
+		// Dual-mode page
+		if (WebRequest::wasPosted()) {
+			$this->validateCSRFToken();
+
+			try {
+				$this->handlePost($useOAuthSignup);
+			}
+			catch (ApplicationLogicException $ex) {
+				SessionAlert::error($ex->getMessage());
+				$this->redirect('register');
+			}
+		}
+		else {
+			$this->assignCSRFToken();
+			$this->assign("useOAuthSignup", $useOAuthSignup);
+			$this->setTemplate($this->getRegistrationTemplate());
+		}
+	}
+
+	protected abstract function getRegistrationTemplate();
+
+	protected function isProtectedPage()
+	{
+		return false;
+	}
+
+	/**
+	 * @param string $emailAddress
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function validateUniqueEmail($emailAddress)
+	{
+		$query = 'SELECT COUNT(id) FROM user WHERE email = :email';
+		$statement = $this->getDatabase()->prepare($query);
+		$statement->execute(array(':email' => $emailAddress));
+
+		if ($statement->fetchColumn() > 0) {
+			throw new ApplicationLogicException('That email address is already in use on this system.');
+		}
+
+		$statement->closeCursor();
+	}
+
+	/**
+	 * @param $emailAddress
+	 * @param $password
+	 * @param $username
+	 * @param $useOAuthSignup
+	 * @param $confirmationId
+	 * @param $onwikiUsername
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function validateRequest(
+		$emailAddress,
+		$password,
+		$username,
+		$useOAuthSignup,
+		$confirmationId,
+		$onwikiUsername
+	) {
+		if (!WebRequest::postBoolean('guidelines')) {
+			throw new ApplicationLogicException('You must read the interface guidelines before your request may be submitted.');
+		}
+
+		$this->validateGeneralInformation($emailAddress, $password, $username);
+		$this->validateUniqueEmail($emailAddress);
+		$this->validateNonOAuthFields($useOAuthSignup, $confirmationId, $onwikiUsername);
+	}
+
+	/**
+	 * @param $useOAuthSignup
+	 * @param $confirmationId
+	 * @param $onwikiUsername
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function validateNonOAuthFields($useOAuthSignup, $confirmationId, $onwikiUsername)
+	{
+		if (!$useOAuthSignup) {
+			if ($confirmationId === null || $confirmationId <= 0) {
+				throw new ApplicationLogicException('Please enter the revision id of your confirmation edit.');
+			}
+
+			if ($onwikiUsername === null) {
+				throw new ApplicationLogicException('Please specify your on-wiki username.');
+			}
+		}
+	}
+
+	/**
+	 * @param $emailAddress
+	 * @param $password
+	 * @param $username
+	 *
+	 * @throws ApplicationLogicException
+	 */
+	protected function validateGeneralInformation($emailAddress, $password, $username)
+	{
+		if ($emailAddress === null) {
+			throw new ApplicationLogicException('Your email address appears to be invalid!');
+		}
+
+		if ($password !== WebRequest::postString('pass2')) {
+			throw new ApplicationLogicException('Your passwords did not match, please try again.');
+		}
+
+		if (User::getByUsername($username, $this->getDatabase()) !== false) {
+			throw new ApplicationLogicException('That username is already in use on this system.');
+		}
+	}
+
+	/**
+	 * @param $useOAuthSignup
+	 *
+	 * @throws ApplicationLogicException
+	 * @throws \Exception
+	 */
+	protected function handlePost($useOAuthSignup)
+	{
+		// Get the data
+		$emailAddress = WebRequest::postEmail('email');
+		$password = WebRequest::postString('pass');
+		$username = WebRequest::postString('name');
+
+		// Only set if OAuth is disabled
+		$confirmationId = WebRequest::postInt('conf_revid');
+		$onwikiUsername = WebRequest::postString('wname');
+
+		// Do some validation
+		$this->validateRequest($emailAddress, $password, $username, $useOAuthSignup, $confirmationId,
+			$onwikiUsername);
+
+		$database = $this->getDatabase();
+
+		$user = new User();
+		$user->setDatabase($database);
+
+		$user->setUsername($username);
+		$user->setEmail($emailAddress);
+
+		if (!$useOAuthSignup) {
+			$user->setOnWikiName($onwikiUsername);
+			$user->setConfirmationDiff($confirmationId);
+		}
+
+		$user->save();
+
+		$passwordCredentialProvider = new PasswordCredentialProvider($database, $this->getSiteConfiguration());
+		$passwordCredentialProvider->setCredential($user, 1, $password);
+
+		$defaultRole = $this->getDefaultRole();
+
+		$role = new UserRole();
+		$role->setDatabase($database);
+		$role->setUser($user->getId());
+		$role->setRole($defaultRole);
+		$role->save();
+
+		// Log now to get the signup date.
+		Logger::newUser($database, $user);
+		Logger::userRolesEdited($database, $user, 'Registration', array($defaultRole), array());
+
+		if ($useOAuthSignup) {
+			$oauthProtocolHelper = $this->getOAuthProtocolHelper();
+			$oauth = new OAuthUserHelper($user, $database, $oauthProtocolHelper, $this->getSiteConfiguration());
+
+			$authoriseUrl = $oauth->getRequestToken();
+			WebRequest::setOAuthPartialLogin($user);
+			$this->redirectUrl($authoriseUrl);
+		}
+		else {
+			// only notify if we're not using the oauth signup.
+			$this->getNotificationHelper()->userNew($user);
+			WebRequest::setLoggedInUser($user);
+			$this->redirect('preferences');
+		}
+	}
+
+	protected abstract function getDefaultRole();
+
+	/**
+	 * Entry point for registration complete
+	 */
+	protected function done()
+	{
+		$this->setTemplate('registration/alert-registrationcomplete.tpl');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     protected function main()
     {
         $useOAuthSignup = $this->getSiteConfiguration()->getUseOAuthSignup();
-        if (! $this->getSiteConfiguration()->isRegistrationAllowed()) {
+        if (!$this->getSiteConfiguration()->isRegistrationAllowed()) {
            throw new AccessDeniedException();
         }
 

includes/Helpers/SearchHelpers/UserSearchHelper.php

Indentation +89 added lines, -89 removed lines

@@ -15,73 +15,73 @@ 
 
 class UserSearchHelper extends SearchHelperBase
 {
-    /**
-     * UserSearchHelper constructor.
-     *
-     * @param PdoDatabase $database
-     */
-    public function __construct(PdoDatabase $database)
-    {
-        parent::__construct($database, 'user', User::class);
-    }
-
-    /**
-     * Initiates a search for requests
-     *
-     * @param PdoDatabase $database
-     *
-     * @return UserSearchHelper
-     */
-    public static function get(PdoDatabase $database)
-    {
-        $helper = new UserSearchHelper($database);
-
-        return $helper;
-    }
-
-    /**
-     * @param string $status
-     *
-     * @return $this
-     */
-    public function byStatus($status)
-    {
-        $this->whereClause .= ' AND status = ?';
-        $this->parameterList[] = $status;
-
-        return $this;
-    }
-
-    public function statusIn($statuses)
-    {
-        $this->inClause('status', $statuses);
-
-        return $this;
-    }
-
-    /**
-     * @param string $role
-     *
-     * @return $this
-     */
-    public function byRole($role)
-    {
-        $this->joinClause .= ' INNER JOIN userrole r on origin.id = r.user';
-        $this->whereClause .= ' AND r.role = ?';
-        $this->parameterList[] = $role;
-
-        return $this;
-    }
-
-    /**
-     * @param DateTime $instant
-     *
-     * @return $this
-     */
-    public function lastActiveBefore(DateTime $instant)
-    {
-        $this->whereClause .= ' AND origin.lastactive < ? AND approvaldate.timestamp < ?';
-        $this->joinClause .= <<<'SQLFRAG'
+	/**
+	 * UserSearchHelper constructor.
+	 *
+	 * @param PdoDatabase $database
+	 */
+	public function __construct(PdoDatabase $database)
+	{
+		parent::__construct($database, 'user', User::class);
+	}
+
+	/**
+	 * Initiates a search for requests
+	 *
+	 * @param PdoDatabase $database
+	 *
+	 * @return UserSearchHelper
+	 */
+	public static function get(PdoDatabase $database)
+	{
+		$helper = new UserSearchHelper($database);
+
+		return $helper;
+	}
+
+	/**
+	 * @param string $status
+	 *
+	 * @return $this
+	 */
+	public function byStatus($status)
+	{
+		$this->whereClause .= ' AND status = ?';
+		$this->parameterList[] = $status;
+
+		return $this;
+	}
+
+	public function statusIn($statuses)
+	{
+		$this->inClause('status', $statuses);
+
+		return $this;
+	}
+
+	/**
+	 * @param string $role
+	 *
+	 * @return $this
+	 */
+	public function byRole($role)
+	{
+		$this->joinClause .= ' INNER JOIN userrole r on origin.id = r.user';
+		$this->whereClause .= ' AND r.role = ?';
+		$this->parameterList[] = $role;
+
+		return $this;
+	}
+
+	/**
+	 * @param DateTime $instant
+	 *
+	 * @return $this
+	 */
+	public function lastActiveBefore(DateTime $instant)
+	{
+		$this->whereClause .= ' AND origin.lastactive < ? AND approvaldate.timestamp < ?';
+		$this->joinClause .= <<<'SQLFRAG'
  LEFT JOIN (
     SELECT objectid, MAX(timestamp) timestamp 
     FROM log
@@ -89,16 +89,16 @@ 
     GROUP BY objectid
     ) approvaldate ON approvaldate.objectid = origin.id
 SQLFRAG;
-        $formattedDate = $instant->format("Y-m-d H:i:s");
-        $this->parameterList[] = $formattedDate;
-        $this->parameterList[] = $formattedDate;
+		$formattedDate = $instant->format("Y-m-d H:i:s");
+		$this->parameterList[] = $formattedDate;
+		$this->parameterList[] = $formattedDate;
 
-        return $this;
-    }
+		return $this;
+	}
 
-    public function getRoleMap(&$roleMap)
-    {
-        $query = <<<SQL
+	public function getRoleMap(&$roleMap)
+	{
+		$query = <<<SQL
             SELECT /* UserSearchHelper/roleMap */ 
                   r.user user
                 , group_concat(r.role SEPARATOR ', ') roles 
@@ -107,22 +107,22 @@ 
             GROUP BY r.user
 SQL;
 
-        $statement = $this->database->prepare($query);
-        $statement->execute($this->parameterList);
+		$statement = $this->database->prepare($query);
+		$statement->execute($this->parameterList);
 
-        $roleMap = array();
-        foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
-            $roleMap[$row['user']] = $row['roles'];
-        }
+		$roleMap = array();
+		foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
+			$roleMap[$row['user']] = $row['roles'];
+		}
 
-        return $this;
-    }
+		return $this;
+	}
 
-    public function withReservedRequest()
-    {
-        $this->joinClause = ' INNER JOIN request req ON req.reserved = origin.id';
-        $this->groupByClause = ' GROUP BY origin.id, origin.username';
+	public function withReservedRequest()
+	{
+		$this->joinClause = ' INNER JOIN request req ON req.reserved = origin.id';
+		$this->groupByClause = ' GROUP BY origin.id, origin.username';
 
-        return $this->fetchMap('username');
-    }
+		return $this->fetchMap('username');
+	}
 }

includes/ConsoleTasks/PrecacheGeolocationTask.php

Indentation +53 added lines, -53 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
                 echo ". Committed txn.\n";
             }
             catch (Exception $ex) {
-                echo ". Encountered exception: " . $ex->getMessage() . "\n";
+                echo ". Encountered exception: ".$ex->getMessage()."\n";
                 $database->rollBack();
                 echo ". Rolled back txn\n";
                 throw $ex;