enwikipedia-acc / waca

includes/DataObjects/Request.php

Indentation +348 added lines, -348 removed lines

@@ -21,30 +21,30 @@ 
  */
 class Request extends DataObject
 {
-    private $email;
-    private $ip;
-    private $name;
-    /** @var string|null */
-    private $comment;
-    private $status = "Open";
-    private $date;
-    private $emailsent = 0;
-    private $emailconfirm;
-    /** @var int|null */
-    private $reserved = null;
-    private $useragent;
-    private $forwardedip;
-    private $hasComments = false;
-    private $hasCommentsResolved = false;
-
-    /**
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+	private $email;
+	private $ip;
+	private $name;
+	/** @var string|null */
+	private $comment;
+	private $status = "Open";
+	private $date;
+	private $emailsent = 0;
+	private $emailconfirm;
+	/** @var int|null */
+	private $reserved = null;
+	private $useragent;
+	private $forwardedip;
+	private $hasComments = false;
+	private $hasCommentsResolved = false;
+
+	/**
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare(<<<SQL
 INSERT INTO `request` (
 	email, ip, name, comment, status, date, emailsent,
 	emailconfirm, reserved, useragent, forwardedip
@@ -53,28 +53,28 @@ 
 	:emailconfirm, :reserved, :useragent, :forwardedip
 );
 SQL
-            );
-            $statement->bindValue(':email', $this->email);
-            $statement->bindValue(':ip', $this->ip);
-            $statement->bindValue(':name', $this->name);
-            $statement->bindValue(':comment', $this->comment);
-            $statement->bindValue(':status', $this->status);
-            $statement->bindValue(':emailsent', $this->emailsent);
-            $statement->bindValue(':emailconfirm', $this->emailconfirm);
-            $statement->bindValue(':reserved', $this->reserved);
-            $statement->bindValue(':useragent', $this->useragent);
-            $statement->bindValue(':forwardedip', $this->forwardedip);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            // update
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+			$statement->bindValue(':email', $this->email);
+			$statement->bindValue(':ip', $this->ip);
+			$statement->bindValue(':name', $this->name);
+			$statement->bindValue(':comment', $this->comment);
+			$statement->bindValue(':status', $this->status);
+			$statement->bindValue(':emailsent', $this->emailsent);
+			$statement->bindValue(':emailconfirm', $this->emailconfirm);
+			$statement->bindValue(':reserved', $this->reserved);
+			$statement->bindValue(':useragent', $this->useragent);
+			$statement->bindValue(':forwardedip', $this->forwardedip);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
 UPDATE `request` SET
 	status = :status,
 	emailsent = :emailsent,
@@ -84,241 +84,241 @@ 
 WHERE id = :id AND updateversion = :updateversion
 LIMIT 1;
 SQL
-            );
-
-            $statement->bindValue(':id', $this->id);
-            $statement->bindValue(':updateversion', $this->updateversion);
-
-            $statement->bindValue(':status', $this->status);
-            $statement->bindValue(':emailsent', $this->emailsent);
-            $statement->bindValue(':emailconfirm', $this->emailconfirm);
-            $statement->bindValue(':reserved', $this->reserved);
-
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
-
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
-
-            $this->updateversion++;
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getIp()
-    {
-        return $this->ip;
-    }
-
-    /**
-     * @param string $ip
-     */
-    public function setIp($ip)
-    {
-        $this->ip = $ip;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param string $name
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getComment()
-    {
-        return $this->comment;
-    }
-
-    /**
-     * @param string $comment
-     */
-    public function setComment($comment)
-    {
-        $this->comment = $comment;
-    }
-
-    /**
-     * @return string
-     */
-    public function getStatus()
-    {
-        return $this->status;
-    }
-
-    /**
-     * @param string $status
-     */
-    public function setStatus($status)
-    {
-        $this->status = $status;
-    }
-
-    /**
-     * Returns the time the request was first submitted
-     *
-     * @return DateTimeImmutable
-     */
-    public function getDate()
-    {
-        return new DateTimeImmutable($this->date);
-    }
-
-    /**
-     * @return bool
-     */
-    public function getEmailSent()
-    {
-        return $this->emailsent == "1";
-    }
-
-    /**
-     * @param bool $emailSent
-     */
-    public function setEmailSent($emailSent)
-    {
-        $this->emailsent = $emailSent ? 1 : 0;
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getReserved()
-    {
-        return $this->reserved;
-    }
-
-    /**
-     * @param int|null $reserved
-     */
-    public function setReserved($reserved)
-    {
-        $this->reserved = $reserved;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUserAgent()
-    {
-        return $this->useragent;
-    }
-
-    /**
-     * @param string $useragent
-     */
-    public function setUserAgent($useragent)
-    {
-        $this->useragent = $useragent;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getForwardedIp()
-    {
-        return $this->forwardedip;
-    }
-
-    /**
-     * @param string|null $forwardedip
-     */
-    public function setForwardedIp($forwardedip)
-    {
-        $this->forwardedip = $forwardedip;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasComments()
-    {
-        if ($this->hasCommentsResolved) {
-            return $this->hasComments;
-        }
-
-        if ($this->comment != "") {
-            $this->hasComments = true;
-            $this->hasCommentsResolved = true;
-
-            return true;
-        }
-
-        $commentsQuery = $this->dbObject->prepare("SELECT COUNT(*) AS num FROM comment WHERE request = :id;");
-        $commentsQuery->bindValue(":id", $this->id);
-
-        $commentsQuery->execute();
-
-        $this->hasComments = ($commentsQuery->fetchColumn() != 0);
-        $this->hasCommentsResolved = true;
-
-        return $this->hasComments;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEmailConfirm()
-    {
-        return $this->emailconfirm;
-    }
-
-    /**
-     * @param string $emailconfirm
-     */
-    public function setEmailConfirm($emailconfirm)
-    {
-        $this->emailconfirm = $emailconfirm;
-    }
-
-    public function generateEmailConfirmationHash()
-    {
-        $this->emailconfirm = bin2hex(openssl_random_pseudo_bytes(16));
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getEmail()
-    {
-        return $this->email;
-    }
-
-    /**
-     * @param string|null $email
-     */
-    public function setEmail($email)
-    {
-        $this->email = $email;
-    }
-
-    /**
-     * @return string
-     * @throws Exception
-     */
-    public function getClosureReason()
-    {
-        if ($this->status != 'Closed') {
-            throw new Exception("Can't get closure reason for open request.");
-        }
-
-        $statement = $this->dbObject->prepare(<<<SQL
+			);
+
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
+
+			$statement->bindValue(':status', $this->status);
+			$statement->bindValue(':emailsent', $this->emailsent);
+			$statement->bindValue(':emailconfirm', $this->emailconfirm);
+			$statement->bindValue(':reserved', $this->reserved);
+
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
+
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
+
+			$this->updateversion++;
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getIp()
+	{
+		return $this->ip;
+	}
+
+	/**
+	 * @param string $ip
+	 */
+	public function setIp($ip)
+	{
+		$this->ip = $ip;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * @param string $name
+	 */
+	public function setName($name)
+	{
+		$this->name = $name;
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getComment()
+	{
+		return $this->comment;
+	}
+
+	/**
+	 * @param string $comment
+	 */
+	public function setComment($comment)
+	{
+		$this->comment = $comment;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getStatus()
+	{
+		return $this->status;
+	}
+
+	/**
+	 * @param string $status
+	 */
+	public function setStatus($status)
+	{
+		$this->status = $status;
+	}
+
+	/**
+	 * Returns the time the request was first submitted
+	 *
+	 * @return DateTimeImmutable
+	 */
+	public function getDate()
+	{
+		return new DateTimeImmutable($this->date);
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getEmailSent()
+	{
+		return $this->emailsent == "1";
+	}
+
+	/**
+	 * @param bool $emailSent
+	 */
+	public function setEmailSent($emailSent)
+	{
+		$this->emailsent = $emailSent ? 1 : 0;
+	}
+
+	/**
+	 * @return int|null
+	 */
+	public function getReserved()
+	{
+		return $this->reserved;
+	}
+
+	/**
+	 * @param int|null $reserved
+	 */
+	public function setReserved($reserved)
+	{
+		$this->reserved = $reserved;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUserAgent()
+	{
+		return $this->useragent;
+	}
+
+	/**
+	 * @param string $useragent
+	 */
+	public function setUserAgent($useragent)
+	{
+		$this->useragent = $useragent;
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getForwardedIp()
+	{
+		return $this->forwardedip;
+	}
+
+	/**
+	 * @param string|null $forwardedip
+	 */
+	public function setForwardedIp($forwardedip)
+	{
+		$this->forwardedip = $forwardedip;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function hasComments()
+	{
+		if ($this->hasCommentsResolved) {
+			return $this->hasComments;
+		}
+
+		if ($this->comment != "") {
+			$this->hasComments = true;
+			$this->hasCommentsResolved = true;
+
+			return true;
+		}
+
+		$commentsQuery = $this->dbObject->prepare("SELECT COUNT(*) AS num FROM comment WHERE request = :id;");
+		$commentsQuery->bindValue(":id", $this->id);
+
+		$commentsQuery->execute();
+
+		$this->hasComments = ($commentsQuery->fetchColumn() != 0);
+		$this->hasCommentsResolved = true;
+
+		return $this->hasComments;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getEmailConfirm()
+	{
+		return $this->emailconfirm;
+	}
+
+	/**
+	 * @param string $emailconfirm
+	 */
+	public function setEmailConfirm($emailconfirm)
+	{
+		$this->emailconfirm = $emailconfirm;
+	}
+
+	public function generateEmailConfirmationHash()
+	{
+		$this->emailconfirm = bin2hex(openssl_random_pseudo_bytes(16));
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getEmail()
+	{
+		return $this->email;
+	}
+
+	/**
+	 * @param string|null $email
+	 */
+	public function setEmail($email)
+	{
+		$this->email = $email;
+	}
+
+	/**
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getClosureReason()
+	{
+		if ($this->status != 'Closed') {
+			throw new Exception("Can't get closure reason for open request.");
+		}
+
+		$statement = $this->dbObject->prepare(<<<SQL
 SELECT closes.mail_desc
 FROM log
 INNER JOIN closes ON log.action = closes.closes
@@ -328,25 +328,25 @@ 
 ORDER BY log.timestamp DESC
 LIMIT 1;
 SQL
-        );
+		);
 
-        $statement->bindValue(":requestId", $this->id);
-        $statement->execute();
-        $reason = $statement->fetchColumn();
+		$statement->bindValue(":requestId", $this->id);
+		$statement->execute();
+		$reason = $statement->fetchColumn();
 
-        return $reason;
-    }
+		return $reason;
+	}
 
-    /**
-     * Gets a value indicating whether the request was closed as created or not.
-     */
-    public function getWasCreated()
-    {
-        if ($this->status != 'Closed') {
-            throw new Exception("Can't get closure reason for open request.");
-        }
+	/**
+	 * Gets a value indicating whether the request was closed as created or not.
+	 */
+	public function getWasCreated()
+	{
+		if ($this->status != 'Closed') {
+			throw new Exception("Can't get closure reason for open request.");
+		}
 
-        $statement = $this->dbObject->prepare(<<<SQL
+		$statement = $this->dbObject->prepare(<<<SQL
 SELECT emailtemplate.oncreated, log.action
 FROM log
 LEFT JOIN emailtemplate ON CONCAT('Closed ', emailtemplate.id) = log.action
@@ -356,60 +356,60 @@ 
 ORDER BY log.timestamp DESC
 LIMIT 1;
 SQL
-        );
-
-        $statement->bindValue(":requestId", $this->id);
-        $statement->execute();
-        $onCreated = $statement->fetchColumn(0);
-        $logAction = $statement->fetchColumn(1);
-        $statement->closeCursor();
-
-        if ($onCreated === null) {
-            return $logAction === "Closed custom-y";
-        }
-
-        return (bool)$onCreated;
-    }
-
-    /**
-     * @return DateTime
-     */
-    public function getClosureDate()
-    {
-        $logQuery = $this->dbObject->prepare(<<<SQL
+		);
+
+		$statement->bindValue(":requestId", $this->id);
+		$statement->execute();
+		$onCreated = $statement->fetchColumn(0);
+		$logAction = $statement->fetchColumn(1);
+		$statement->closeCursor();
+
+		if ($onCreated === null) {
+			return $logAction === "Closed custom-y";
+		}
+
+		return (bool)$onCreated;
+	}
+
+	/**
+	 * @return DateTime
+	 */
+	public function getClosureDate()
+	{
+		$logQuery = $this->dbObject->prepare(<<<SQL
 SELECT timestamp FROM log
 WHERE objectid = :request AND objecttype = 'Request' AND action LIKE 'Closed%'
 ORDER BY timestamp DESC LIMIT 1;
 SQL
-        );
-        $logQuery->bindValue(":request", $this->getId());
-        $logQuery->execute();
-        $logTime = $logQuery->fetchColumn();
-        $logQuery->closeCursor();
-
-        return new DateTime($logTime);
-    }
-
-    /**
-     * Returns a hash based on data within this request which can be generated easily from the data to be used to reveal
-     * data to unauthorised* users.
-     *
-     * *:Not tool admins, check users, or the reserving user.
-     *
-     * @return string
-     *
-     * @todo future work to make invalidation better. Possibly move to the database and invalidate on relevant events?
-     *       Maybe depend on the last logged action timestamp?
-     */
-    public function getRevealHash()
-    {
-        $data = $this->id         // unique per request
-            . '|' . $this->ip           // }
-            . '|' . $this->forwardedip  // } private data not known to those without access
-            . '|' . $this->useragent    // }
-            . '|' . $this->email        // }
-            . '|' . $this->status;      // to rudimentarily invalidate the token on status change
-
-        return hash('sha256', $data);
-    }
+		);
+		$logQuery->bindValue(":request", $this->getId());
+		$logQuery->execute();
+		$logTime = $logQuery->fetchColumn();
+		$logQuery->closeCursor();
+
+		return new DateTime($logTime);
+	}
+
+	/**
+	 * Returns a hash based on data within this request which can be generated easily from the data to be used to reveal
+	 * data to unauthorised* users.
+	 *
+	 * *:Not tool admins, check users, or the reserving user.
+	 *
+	 * @return string
+	 *
+	 * @todo future work to make invalidation better. Possibly move to the database and invalidate on relevant events?
+	 *       Maybe depend on the last logged action timestamp?
+	 */
+	public function getRevealHash()
+	{
+		$data = $this->id         // unique per request
+			. '|' . $this->ip           // }
+			. '|' . $this->forwardedip  // } private data not known to those without access
+			. '|' . $this->useragent    // }
+			. '|' . $this->email        // }
+			. '|' . $this->status;      // to rudimentarily invalidate the token on status change
+
+		return hash('sha256', $data);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -404,11 +404,11 @@
     public function getRevealHash()
     {
         $data = $this->id         // unique per request
-            . '|' . $this->ip           // }
-            . '|' . $this->forwardedip  // } private data not known to those without access
-            . '|' . $this->useragent    // }
-            . '|' . $this->email        // }
-            . '|' . $this->status;      // to rudimentarily invalidate the token on status change
+            . '|'.$this->ip           // }
+            . '|'.$this->forwardedip  // } private data not known to those without access
+            . '|'.$this->useragent    // }
+            . '|'.$this->email        // }
+            . '|'.$this->status; // to rudimentarily invalidate the token on status change
 
         return hash('sha256', $data);
     }

includes/DataObjects/AntiSpoofCache.php

Indentation +92 added lines, -92 removed lines

@@ -18,101 +18,101 @@
  */
 class AntiSpoofCache extends DataObject
 {
-    /** @var string */
-    protected $username;
-    /** @var string */
-    protected $data;
-    /** @var string */
-    protected $timestamp;
-
-    /**
-     * @param   string    $username
-     * @param PdoDatabase $database
-     *
-     * @return AntiSpoofCache|false
-     */
-    public static function getByUsername($username, PdoDatabase $database)
-    {
-        $statement = $database->prepare(<<<SQL
+	/** @var string */
+	protected $username;
+	/** @var string */
+	protected $data;
+	/** @var string */
+	protected $timestamp;
+
+	/**
+	 * @param   string    $username
+	 * @param PdoDatabase $database
+	 *
+	 * @return AntiSpoofCache|false
+	 */
+	public static function getByUsername($username, PdoDatabase $database)
+	{
+		$statement = $database->prepare(<<<SQL
 SELECT *
 FROM antispoofcache
 WHERE username = :id AND timestamp > date_sub(now(), INTERVAL 3 HOUR)
 LIMIT 1
 SQL
-        );
-        $statement->bindValue(":id", $username);
-
-        $statement->execute();
-
-        $resultObject = $statement->fetchObject(get_called_class());
-
-        if ($resultObject != false) {
-            $resultObject->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUsername()
-    {
-        return $this->username;
-    }
-
-    /**
-     * @param string $username
-     */
-    public function setUsername($username)
-    {
-        $this->username = $username;
-    }
-
-    /**
-     * @return string
-     */
-    public function getData()
-    {
-        return $this->data;
-    }
-
-    /**
-     * @param string $data
-     */
-    public function setData($data)
-    {
-        $this->data = $data;
-    }
-
-    /**
-     * @return DateTimeImmutable
-     */
-    public function getTimestamp()
-    {
-        return new DateTimeImmutable($this->timestamp);
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            // clear old data first
-            $this->dbObject->exec("DELETE FROM antispoofcache WHERE timestamp < date_sub(now(), INTERVAL 3 HOUR);");
-
-            $statement = $this->dbObject->prepare("INSERT INTO antispoofcache (username, data) VALUES (:username, :data);");
-            $statement->bindValue(":username", $this->username);
-            $statement->bindValue(":data", $this->data);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-    }
+		);
+		$statement->bindValue(":id", $username);
+
+		$statement->execute();
+
+		$resultObject = $statement->fetchObject(get_called_class());
+
+		if ($resultObject != false) {
+			$resultObject->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUsername()
+	{
+		return $this->username;
+	}
+
+	/**
+	 * @param string $username
+	 */
+	public function setUsername($username)
+	{
+		$this->username = $username;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getData()
+	{
+		return $this->data;
+	}
+
+	/**
+	 * @param string $data
+	 */
+	public function setData($data)
+	{
+		$this->data = $data;
+	}
+
+	/**
+	 * @return DateTimeImmutable
+	 */
+	public function getTimestamp()
+	{
+		return new DateTimeImmutable($this->timestamp);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			// clear old data first
+			$this->dbObject->exec("DELETE FROM antispoofcache WHERE timestamp < date_sub(now(), INTERVAL 3 HOUR);");
+
+			$statement = $this->dbObject->prepare("INSERT INTO antispoofcache (username, data) VALUES (:username, :data);");
+			$statement->bindValue(":username", $this->username);
+			$statement->bindValue(":data", $this->data);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+	}
 }

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,
@@ -202,130 +202,130 @@ 
 WHERE id = :id AND updateversion = :updateversion
 LIMIT 1;
 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/GeoLocation.php

Indentation +99 added lines, -99 removed lines

@@ -21,110 +21,110 @@
  */
 class GeoLocation extends DataObject
 {
-    private $address;
-    private $data;
-    private $creation;
-
-    /**
-     * @param string      $address
-     * @param PdoDatabase $database
-     *
-     * @return GeoLocation
-     */
-    public static function getByAddress($address, PdoDatabase $database)
-    {
-        $statement = $database->prepare("SELECT * FROM geolocation WHERE address = :id LIMIT 1;");
-        $statement->bindValue(":id", $address);
-
-        $statement->execute();
-
-        $resultObject = $statement->fetchObject(get_called_class());
-
-        if ($resultObject != false) {
-            $resultObject->setDatabase($database);
-        }
-
-        return $resultObject;
-    }
-
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+	private $address;
+	private $data;
+	private $creation;
+
+	/**
+	 * @param string      $address
+	 * @param PdoDatabase $database
+	 *
+	 * @return GeoLocation
+	 */
+	public static function getByAddress($address, PdoDatabase $database)
+	{
+		$statement = $database->prepare("SELECT * FROM geolocation WHERE address = :id LIMIT 1;");
+		$statement->bindValue(":id", $address);
+
+		$statement->execute();
+
+		$resultObject = $statement->fetchObject(get_called_class());
+
+		if ($resultObject != false) {
+			$resultObject->setDatabase($database);
+		}
+
+		return $resultObject;
+	}
+
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare(<<<SQL
 INSERT INTO `geolocation` (address, data) VALUES (:address, :data);
 SQL
-            );
-            $statement->bindValue(":address", $this->address);
-            $statement->bindValue(":data", $this->data);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            // update
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+			$statement->bindValue(":address", $this->address);
+			$statement->bindValue(":data", $this->data);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
 UPDATE `geolocation`
 SET address = :address, data = :data, updateversion = updateversion + 1
 WHERE id = :id AND updateversion = :updateversion
 LIMIT 1;
 SQL
-            );
-
-            $statement->bindValue(":id", $this->id);
-            $statement->bindValue(":updateversion", $this->updateversion);
-
-            $statement->bindValue(":address", $this->address);
-            $statement->bindValue(":data", $this->data);
-
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
-
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
-
-            $this->updateversion++;
-        }
-    }
-
-    public function getAddress()
-    {
-        return $this->address;
-    }
-
-    /**
-     * @param string $address
-     */
-    public function setAddress($address)
-    {
-        $this->address = $address;
-    }
-
-    /**
-     * @return array
-     */
-    public function getData()
-    {
-        return unserialize($this->data);
-    }
-
-    /**
-     * @param array $data
-     */
-    public function setData($data)
-    {
-        $this->data = serialize($data);
-    }
-
-    /** @return DateTimeImmutable */
-    public function getCreation()
-    {
-        return new DateTimeImmutable($this->creation);
-    }
+			);
+
+			$statement->bindValue(":id", $this->id);
+			$statement->bindValue(":updateversion", $this->updateversion);
+
+			$statement->bindValue(":address", $this->address);
+			$statement->bindValue(":data", $this->data);
+
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
+
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
+
+			$this->updateversion++;
+		}
+	}
+
+	public function getAddress()
+	{
+		return $this->address;
+	}
+
+	/**
+	 * @param string $address
+	 */
+	public function setAddress($address)
+	{
+		$this->address = $address;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getData()
+	{
+		return unserialize($this->data);
+	}
+
+	/**
+	 * @param array $data
+	 */
+	public function setData($data)
+	{
+		$this->data = serialize($data);
+	}
+
+	/** @return DateTimeImmutable */
+	public function getCreation()
+	{
+		return new DateTimeImmutable($this->creation);
+	}
 }

includes/DataObjects/Log.php

Indentation +144 added lines, -144 removed lines

@@ -17,151 +17,151 @@
  */
 class Log extends DataObject
 {
-    /** @var int */
-    private $objectid;
-    /** @var string */
-    private $objecttype;
-    /** @var int */
-    private $user;
-    /** @var string */
-    private $action;
-    private $timestamp;
-    /** @var string|null */
-    private $comment;
-
-    /**
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            $statement = $this->dbObject->prepare(<<<SQL
+	/** @var int */
+	private $objectid;
+	/** @var string */
+	private $objecttype;
+	/** @var int */
+	private $user;
+	/** @var string */
+	private $action;
+	private $timestamp;
+	/** @var string|null */
+	private $comment;
+
+	/**
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			$statement = $this->dbObject->prepare(<<<SQL
                 INSERT INTO log (objectid, objecttype, user, action, timestamp, comment) 
                 VALUES (:id, :type, :user, :action, CURRENT_TIMESTAMP(), :comment);
 SQL
-            );
-
-            $statement->bindValue(":id", $this->objectid);
-            $statement->bindValue(":type", $this->objecttype);
-            $statement->bindValue(":user", $this->user);
-            $statement->bindValue(":action", $this->action);
-            $statement->bindValue(":comment", $this->comment);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            throw new Exception("Updating logs is not available");
-        }
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function delete()
-    {
-        throw new Exception("Deleting logs is not available.");
-    }
-
-    /**
-     * @return int
-     */
-    public function getObjectId()
-    {
-        return $this->objectid;
-    }
-
-    /**
-     * Summary of setObjectId
-     *
-     * @param int $objectId
-     */
-    public function setObjectId($objectId)
-    {
-        $this->objectid = $objectId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getObjectType()
-    {
-        return $this->objecttype;
-    }
-
-    /**
-     * Summary of setObjectType
-     *
-     * @param string $objectType
-     */
-    public function setObjectType($objectType)
-    {
-        $this->objecttype = $objectType;
-    }
-
-    /**
-     * @return int
-     */
-    public function getUser()
-    {
-        return $this->user;
-    }
-
-    /**
-     * Summary of setUser
-     *
-     * @param User $user
-     */
-    public function setUser(User $user)
-    {
-        $this->user = $user->getId();
-    }
-
-    /**
-     * @return string
-     */
-    public function getAction()
-    {
-        return $this->action;
-    }
-
-    /**
-     * Summary of setAction
-     *
-     * @param string $action
-     */
-    public function setAction($action)
-    {
-        $this->action = $action;
-    }
-
-    /**
-     * @return DateTimeImmutable
-     */
-    public function getTimestamp()
-    {
-        return new DateTimeImmutable($this->timestamp);
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getComment()
-    {
-        return $this->comment;
-    }
-
-    /**
-     * Summary of setComment
-     *
-     * @param string $comment
-     */
-    public function setComment($comment)
-    {
-        $this->comment = $comment;
-    }
+			);
+
+			$statement->bindValue(":id", $this->objectid);
+			$statement->bindValue(":type", $this->objecttype);
+			$statement->bindValue(":user", $this->user);
+			$statement->bindValue(":action", $this->action);
+			$statement->bindValue(":comment", $this->comment);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			throw new Exception("Updating logs is not available");
+		}
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function delete()
+	{
+		throw new Exception("Deleting logs is not available.");
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getObjectId()
+	{
+		return $this->objectid;
+	}
+
+	/**
+	 * Summary of setObjectId
+	 *
+	 * @param int $objectId
+	 */
+	public function setObjectId($objectId)
+	{
+		$this->objectid = $objectId;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getObjectType()
+	{
+		return $this->objecttype;
+	}
+
+	/**
+	 * Summary of setObjectType
+	 *
+	 * @param string $objectType
+	 */
+	public function setObjectType($objectType)
+	{
+		$this->objecttype = $objectType;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getUser()
+	{
+		return $this->user;
+	}
+
+	/**
+	 * Summary of setUser
+	 *
+	 * @param User $user
+	 */
+	public function setUser(User $user)
+	{
+		$this->user = $user->getId();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getAction()
+	{
+		return $this->action;
+	}
+
+	/**
+	 * Summary of setAction
+	 *
+	 * @param string $action
+	 */
+	public function setAction($action)
+	{
+		$this->action = $action;
+	}
+
+	/**
+	 * @return DateTimeImmutable
+	 */
+	public function getTimestamp()
+	{
+		return new DateTimeImmutable($this->timestamp);
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getComment()
+	{
+		return $this->comment;
+	}
+
+	/**
+	 * Summary of setComment
+	 *
+	 * @param string $comment
+	 */
+	public function setComment($comment)
+	{
+		$this->comment = $comment;
+	}
 }

includes/DataObjects/WelcomeTemplate.php

Indentation +156 added lines, -156 removed lines

@@ -19,167 +19,167 @@
  */
 class WelcomeTemplate extends DataObject
 {
-    /** @var string */
-    private $usercode;
-    /** @var string */
-    private $botcode;
-    private $usageCache;
-    private $deleted = 0;
-
-    /**
-     * Summary of getAll
-     *
-     * @param PdoDatabase $database
-     *
-     * @return WelcomeTemplate[]
-     */
-    public static function getAll(PdoDatabase $database)
-    {
-        $statement = $database->prepare("SELECT * FROM welcometemplate WHERE deleted = 0;");
-
-        $statement->execute();
-
-        $result = array();
-        /** @var WelcomeTemplate $v */
-        foreach ($statement->fetchAll(PDO::FETCH_CLASS, self::class) as $v) {
-            $v->setDatabase($database);
-            $result[] = $v;
-        }
-
-        return $result;
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+	/** @var string */
+	private $usercode;
+	/** @var string */
+	private $botcode;
+	private $usageCache;
+	private $deleted = 0;
+
+	/**
+	 * Summary of getAll
+	 *
+	 * @param PdoDatabase $database
+	 *
+	 * @return WelcomeTemplate[]
+	 */
+	public static function getAll(PdoDatabase $database)
+	{
+		$statement = $database->prepare("SELECT * FROM welcometemplate WHERE deleted = 0;");
+
+		$statement->execute();
+
+		$result = array();
+		/** @var WelcomeTemplate $v */
+		foreach ($statement->fetchAll(PDO::FETCH_CLASS, self::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 welcometemplate (usercode, botcode) VALUES (:usercode, :botcode);
 SQL
-            );
-            $statement->bindValue(":usercode", $this->usercode);
-            $statement->bindValue(":botcode", $this->botcode);
-
-            if ($statement->execute()) {
-                $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
-                throw new Exception($statement->errorInfo());
-            }
-        }
-        else {
-            // update
-            $statement = $this->dbObject->prepare(<<<SQL
+			);
+			$statement->bindValue(":usercode", $this->usercode);
+			$statement->bindValue(":botcode", $this->botcode);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
 UPDATE `welcometemplate`
 SET usercode = :usercode, botcode = :botcode, updateversion = updateversion + 1
 WHERE id = :id AND updateversion = :updateversion
 LIMIT 1;
 SQL
-            );
-
-            $statement->bindValue(':id', $this->id);
-            $statement->bindValue(':updateversion', $this->updateversion);
-
-            $statement->bindValue(':usercode', $this->usercode);
-            $statement->bindValue(':botcode', $this->botcode);
-
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
-
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
-
-            $this->updateversion++;
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getUserCode()
-    {
-        return $this->usercode;
-    }
-
-    /**
-     * @param string $usercode
-     */
-    public function setUserCode($usercode)
-    {
-        $this->usercode = $usercode;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBotCode()
-    {
-        return $this->botcode;
-    }
-
-    /**
-     * @param string $botcode
-     */
-    public function setBotCode($botcode)
-    {
-        $this->botcode = $botcode;
-    }
-
-    /**
-     * @return User[]
-     */
-    public function getUsersUsingTemplate()
-    {
-        if ($this->usageCache === null) {
-            $statement = $this->dbObject->prepare("SELECT * FROM user WHERE welcome_template = :id;");
-
-            $statement->execute(array(":id" => $this->id));
-
-            $result = array();
-            /** @var WelcomeTemplate $v */
-            foreach ($statement->fetchAll(PDO::FETCH_CLASS, User::class) as $v) {
-                $v->setDatabase($this->dbObject);
-                $result[] = $v;
-            }
-
-            $this->usageCache = $result;
-        }
-
-        return $this->usageCache;
-    }
-
-    /**
-     * Deletes the object from the database
-     */
-    public function delete()
-    {
-        if ($this->id === null) {
-            // wtf?
-            return;
-        }
-
-        $deleteQuery = "UPDATE welcometemplate SET deleted = 1 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();
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    public function isDeleted()
-    {
-        return ((int)$this->deleted) === 1;
-    }
+			);
+
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
+
+			$statement->bindValue(':usercode', $this->usercode);
+			$statement->bindValue(':botcode', $this->botcode);
+
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
+
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
+
+			$this->updateversion++;
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUserCode()
+	{
+		return $this->usercode;
+	}
+
+	/**
+	 * @param string $usercode
+	 */
+	public function setUserCode($usercode)
+	{
+		$this->usercode = $usercode;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getBotCode()
+	{
+		return $this->botcode;
+	}
+
+	/**
+	 * @param string $botcode
+	 */
+	public function setBotCode($botcode)
+	{
+		$this->botcode = $botcode;
+	}
+
+	/**
+	 * @return User[]
+	 */
+	public function getUsersUsingTemplate()
+	{
+		if ($this->usageCache === null) {
+			$statement = $this->dbObject->prepare("SELECT * FROM user WHERE welcome_template = :id;");
+
+			$statement->execute(array(":id" => $this->id));
+
+			$result = array();
+			/** @var WelcomeTemplate $v */
+			foreach ($statement->fetchAll(PDO::FETCH_CLASS, User::class) as $v) {
+				$v->setDatabase($this->dbObject);
+				$result[] = $v;
+			}
+
+			$this->usageCache = $result;
+		}
+
+		return $this->usageCache;
+	}
+
+	/**
+	 * Deletes the object from the database
+	 */
+	public function delete()
+	{
+		if ($this->id === null) {
+			// wtf?
+			return;
+		}
+
+		$deleteQuery = "UPDATE welcometemplate SET deleted = 1 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();
+		}
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isDeleted()
+	{
+		return ((int)$this->deleted) === 1;
+	}
 }

includes/Fragments/TemplateOutput.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
     final protected function setUpSmarty()
     {
         $this->smarty = new Smarty();
-        $this->smarty->addPluginsDir($this->getSiteConfiguration()->getFilePath() . '/smarty-plugins');
+        $this->smarty->addPluginsDir($this->getSiteConfiguration()->getFilePath().'/smarty-plugins');
 
         $this->assign('currentUser', User::getCommunity());
         $this->assign('loggedIn', false);

Indentation +61 added lines, -61 removed lines

@@ -15,74 +15,74 @@
 
 trait TemplateOutput
 {
-    /** @var Smarty */
-    private $smarty;
+	/** @var Smarty */
+	private $smarty;
 
-    /**
-     * @return SiteConfiguration
-     */
-    protected abstract function getSiteConfiguration();
+	/**
+	 * @return SiteConfiguration
+	 */
+	protected abstract function getSiteConfiguration();
 
-    /**
-     * Assigns a Smarty variable
-     *
-     * @param  array|string $name  the template variable name(s)
-     * @param  mixed        $value the value to assign
-     */
-    final protected function assign($name, $value)
-    {
-        $this->smarty->assign($name, $value);
-    }
+	/**
+	 * Assigns a Smarty variable
+	 *
+	 * @param  array|string $name  the template variable name(s)
+	 * @param  mixed        $value the value to assign
+	 */
+	final protected function assign($name, $value)
+	{
+		$this->smarty->assign($name, $value);
+	}
 
-    /**
-     * Sets up the variables used by the main Smarty base template.
-     *
-     * This list is getting kinda long.
-     */
-    final protected function setUpSmarty()
-    {
-        $this->smarty = new Smarty();
-        $this->smarty->addPluginsDir($this->getSiteConfiguration()->getFilePath() . '/smarty-plugins');
+	/**
+	 * Sets up the variables used by the main Smarty base template.
+	 *
+	 * This list is getting kinda long.
+	 */
+	final protected function setUpSmarty()
+	{
+		$this->smarty = new Smarty();
+		$this->smarty->addPluginsDir($this->getSiteConfiguration()->getFilePath() . '/smarty-plugins');
 
-        $this->assign('currentUser', User::getCommunity());
-        $this->assign('loggedIn', false);
-        $this->assign('baseurl', $this->getSiteConfiguration()->getBaseUrl());
-        $this->assign('mediawikiScriptPath', $this->getSiteConfiguration()->getMediawikiScriptPath());
+		$this->assign('currentUser', User::getCommunity());
+		$this->assign('loggedIn', false);
+		$this->assign('baseurl', $this->getSiteConfiguration()->getBaseUrl());
+		$this->assign('mediawikiScriptPath', $this->getSiteConfiguration()->getMediawikiScriptPath());
 
-        $this->assign('siteNoticeText', '');
-        $this->assign('toolversion', Environment::getToolVersion());
+		$this->assign('siteNoticeText', '');
+		$this->assign('toolversion', Environment::getToolVersion());
 
-        // default these
-        $this->assign('onlineusers', array());
-        $this->assign('typeAheadBlock', '');
-        $this->assign('extraJs', array());
-        $this->assign('extraCss', array());
+		// default these
+		$this->assign('onlineusers', array());
+		$this->assign('typeAheadBlock', '');
+		$this->assign('extraJs', array());
+		$this->assign('extraCss', array());
 
-        // nav menu access control
-        $this->assign('nav__canRequests', false);
-        $this->assign('nav__canLogs', false);
-        $this->assign('nav__canUsers', false);
-        $this->assign('nav__canSearch', false);
-        $this->assign('nav__canStats', false);
-        $this->assign('nav__canBan', false);
-        $this->assign('nav__canEmailMgmt', false);
-        $this->assign('nav__canWelcomeMgmt', false);
-        $this->assign('nav__canSiteNoticeMgmt', false);
-        $this->assign('nav__canUserMgmt', false);
-        $this->assign('nav__canViewRequest', false);
+		// nav menu access control
+		$this->assign('nav__canRequests', false);
+		$this->assign('nav__canLogs', false);
+		$this->assign('nav__canUsers', false);
+		$this->assign('nav__canSearch', false);
+		$this->assign('nav__canStats', false);
+		$this->assign('nav__canBan', false);
+		$this->assign('nav__canEmailMgmt', false);
+		$this->assign('nav__canWelcomeMgmt', false);
+		$this->assign('nav__canSiteNoticeMgmt', false);
+		$this->assign('nav__canUserMgmt', false);
+		$this->assign('nav__canViewRequest', false);
 
-        $this->assign('page', $this);
-    }
+		$this->assign('page', $this);
+	}
 
-    /**
-     * Fetches a rendered Smarty template
-     *
-     * @param $template string Template file path, relative to /templates/
-     *
-     * @return string Templated HTML
-     */
-    final protected function fetchTemplate($template)
-    {
-        return $this->smarty->fetch($template);
-    }
+	/**
+	 * Fetches a rendered Smarty template
+	 *
+	 * @param $template string Template file path, relative to /templates/
+	 *
+	 * @return string Templated HTML
+	 */
+	final protected function fetchTemplate($template)
+	{
+		return $this->smarty->fetch($template);
+	}
 }

includes/Session.php

Indentation +17 added lines, -17 removed lines

@@ -17,25 +17,25 @@
  */
 class Session
 {
-    public static function start()
-    {
-        ini_set('session.cookie_httponly', 1);
+	public static function start()
+	{
+		ini_set('session.cookie_httponly', 1);
 
-        if (WebRequest::isHttps()) {
-            ini_set('session.cookie_secure', 1);
-        }
+		if (WebRequest::isHttps()) {
+			ini_set('session.cookie_secure', 1);
+		}
 
-        session_start();
-    }
+		session_start();
+	}
 
-    public static function destroy()
-    {
-        session_destroy();
-    }
+	public static function destroy()
+	{
+		session_destroy();
+	}
 
-    public static function restart()
-    {
-        self::destroy();
-        self::start();
-    }
+	public static function restart()
+	{
+		self::destroy();
+		self::start();
+	}
 }

includes/API/Actions/CountAction.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 
         $statement = $this->getDatabase()->prepare($query);
         $statement->bindValue(":username", $this->user->getUsername());
-        $statement->bindValue(":date", date('Y-m-d') . "%");
+        $statement->bindValue(":date", date('Y-m-d')."%");
         $statement->execute();
         $today = $statement->fetchColumn();
         $statement->closeCursor();

Indentation +121 added lines, -121 removed lines

@@ -20,47 +20,47 @@ 
  */
 class CountAction extends XmlApiPageBase implements IXmlApiAction
 {
-    /**
-     * The target user
-     * @var User $user
-     */
-    private $user;
+	/**
+	 * The target user
+	 * @var User $user
+	 */
+	private $user;
 
-    public function executeApiAction(DOMElement $apiDocument)
-    {
-        $username = WebRequest::getString('user');
-        if ($username === null) {
-            throw new ApiException("Please specify a username");
-        }
+	public function executeApiAction(DOMElement $apiDocument)
+	{
+		$username = WebRequest::getString('user');
+		if ($username === null) {
+			throw new ApiException("Please specify a username");
+		}
 
-        $userElement = $this->document->createElement("user");
-        $userElement->setAttribute("name", $username);
-        $apiDocument->appendChild($userElement);
+		$userElement = $this->document->createElement("user");
+		$userElement->setAttribute("name", $username);
+		$apiDocument->appendChild($userElement);
 
-        $user = User::getByUsername($username, $this->getDatabase());
+		$user = User::getByUsername($username, $this->getDatabase());
 
-        if ($user === false) {
-            $userElement->setAttribute("missing", "true");
+		if ($user === false) {
+			$userElement->setAttribute("missing", "true");
 
-            return $apiDocument;
-        }
+			return $apiDocument;
+		}
 
-        $this->user = $user;
+		$this->user = $user;
 
-        $userElement->setAttribute("level", $this->user->getStatus());
-        $userElement->setAttribute("created", $this->getAccountsCreated());
+		$userElement->setAttribute("level", $this->user->getStatus());
+		$userElement->setAttribute("created", $this->getAccountsCreated());
 
-        $userElement->setAttribute("today", $this->getToday());
+		$userElement->setAttribute("today", $this->getToday());
 
-        // Let the IRC bot handle the result of this.
-        $this->fetchAdminData($userElement);
+		// Let the IRC bot handle the result of this.
+		$this->fetchAdminData($userElement);
 
-        return $apiDocument;
-    }
+		return $apiDocument;
+	}
 
-    private function getAccountsCreated()
-    {
-        $query = <<<QUERY
+	private function getAccountsCreated()
+	{
+		$query = <<<QUERY
         SELECT COUNT(*) AS count
         FROM log
             LEFT JOIN emailtemplate ON concat('Closed ', emailtemplate.id) = log.action
@@ -71,17 +71,17 @@ 
             AND user.username = :username;
 QUERY;
 
-        $statement = $this->getDatabase()->prepare($query);
-        $statement->execute(array(":username" => $this->user->getUsername()));
-        $result = $statement->fetchColumn();
-        $statement->closeCursor();
+		$statement = $this->getDatabase()->prepare($query);
+		$statement->execute(array(":username" => $this->user->getUsername()));
+		$result = $statement->fetchColumn();
+		$statement->closeCursor();
 
-        return $result;
-    }
+		return $result;
+	}
 
-    private function getToday()
-    {
-        $query = <<<QUERY
+	private function getToday()
+	{
+		$query = <<<QUERY
         SELECT
             COUNT(*) AS count
         FROM log
@@ -93,99 +93,99 @@ 
             AND user.username = :username;
 QUERY;
 
-        $statement = $this->getDatabase()->prepare($query);
-        $statement->bindValue(":username", $this->user->getUsername());
-        $statement->bindValue(":date", date('Y-m-d') . "%");
-        $statement->execute();
-        $today = $statement->fetchColumn();
-        $statement->closeCursor();
-
-        return $today;
-    }
-
-    private function fetchAdminData(DOMElement $userElement)
-    {
-        $query = "SELECT COUNT(*) AS count FROM log WHERE log.user = :userid AND log.action = :action;";
-
-        $statement = $this->getDatabase()->prepare($query);
-        $statement->bindValue(":userid", $this->user->getId());
-        $statement->bindValue(":action", "Suspended");
-        $statement->execute();
-        $sus = $statement->fetchColumn();
-        $userElement->setAttribute("suspended", $sus);
-        $statement->closeCursor();
-
-        $statement->bindValue(":action", "Promoted");
-        $statement->execute();
-        $pro = $statement->fetchColumn();
-        $userElement->setAttribute("promoted", $pro);
-        $statement->closeCursor();
-
-        $statement->bindValue(":action", "Approved");
-        $statement->execute();
-        $app = $statement->fetchColumn();
-        $userElement->setAttribute("approved", $app);
-        $statement->closeCursor();
-
-        $statement->bindValue(":action", "Demoted");
-        $statement->execute();
-        $dem = $statement->fetchColumn();
-        $userElement->setAttribute("demoted", $dem);
-        $statement->closeCursor();
-
-        $statement->bindValue(":action", "Declined");
-        $statement->execute();
-        $dec = $statement->fetchColumn();
-        $userElement->setAttribute("declined", $dec);
-        $statement->closeCursor();
-
-        $statement->bindValue(":action", "Renamed");
-        $statement->execute();
-        $rnc = $statement->fetchColumn();
-        $userElement->setAttribute("renamed", $rnc);
-        $statement->closeCursor();
-
-        $statement->bindValue(":action", "Edited");
-        $statement->execute();
-        $mec = $statement->fetchColumn();
-        $userElement->setAttribute("edited", $mec);
-        $statement->closeCursor();
-
-        $statement->bindValue(":action", "Prefchange");
-        $statement->execute();
-        $pcc = $statement->fetchColumn();
-        $userElement->setAttribute("prefchange", $pcc);
-        $statement->closeCursor();
-
-        // Combine all three actions affecting Welcome templates into one count.
-        $combinedquery = $this->getDatabase()->prepare(<<<SQL
+		$statement = $this->getDatabase()->prepare($query);
+		$statement->bindValue(":username", $this->user->getUsername());
+		$statement->bindValue(":date", date('Y-m-d') . "%");
+		$statement->execute();
+		$today = $statement->fetchColumn();
+		$statement->closeCursor();
+
+		return $today;
+	}
+
+	private function fetchAdminData(DOMElement $userElement)
+	{
+		$query = "SELECT COUNT(*) AS count FROM log WHERE log.user = :userid AND log.action = :action;";
+
+		$statement = $this->getDatabase()->prepare($query);
+		$statement->bindValue(":userid", $this->user->getId());
+		$statement->bindValue(":action", "Suspended");
+		$statement->execute();
+		$sus = $statement->fetchColumn();
+		$userElement->setAttribute("suspended", $sus);
+		$statement->closeCursor();
+
+		$statement->bindValue(":action", "Promoted");
+		$statement->execute();
+		$pro = $statement->fetchColumn();
+		$userElement->setAttribute("promoted", $pro);
+		$statement->closeCursor();
+
+		$statement->bindValue(":action", "Approved");
+		$statement->execute();
+		$app = $statement->fetchColumn();
+		$userElement->setAttribute("approved", $app);
+		$statement->closeCursor();
+
+		$statement->bindValue(":action", "Demoted");
+		$statement->execute();
+		$dem = $statement->fetchColumn();
+		$userElement->setAttribute("demoted", $dem);
+		$statement->closeCursor();
+
+		$statement->bindValue(":action", "Declined");
+		$statement->execute();
+		$dec = $statement->fetchColumn();
+		$userElement->setAttribute("declined", $dec);
+		$statement->closeCursor();
+
+		$statement->bindValue(":action", "Renamed");
+		$statement->execute();
+		$rnc = $statement->fetchColumn();
+		$userElement->setAttribute("renamed", $rnc);
+		$statement->closeCursor();
+
+		$statement->bindValue(":action", "Edited");
+		$statement->execute();
+		$mec = $statement->fetchColumn();
+		$userElement->setAttribute("edited", $mec);
+		$statement->closeCursor();
+
+		$statement->bindValue(":action", "Prefchange");
+		$statement->execute();
+		$pcc = $statement->fetchColumn();
+		$userElement->setAttribute("prefchange", $pcc);
+		$statement->closeCursor();
+
+		// Combine all three actions affecting Welcome templates into one count.
+		$combinedquery = $this->getDatabase()->prepare(<<<SQL
             SELECT
                 COUNT(*) AS count
             FROM log
             WHERE log.user = :userid
                 AND log.action IN ('CreatedTemplate', 'EditedTemplate', 'DeletedTemplate');
 SQL
-        );
+		);
 
-        $combinedquery->bindValue(":userid", $this->user->getId());
-        $combinedquery->execute();
-        $dtc = $combinedquery->fetchColumn();
-        $userElement->setAttribute("welctempchange", $dtc);
-        $combinedquery->closeCursor();
+		$combinedquery->bindValue(":userid", $this->user->getId());
+		$combinedquery->execute();
+		$dtc = $combinedquery->fetchColumn();
+		$userElement->setAttribute("welctempchange", $dtc);
+		$combinedquery->closeCursor();
 
-        // Combine both actions affecting Email templates into one count.
-        $combinedquery = $this->getDatabase()->prepare(<<<SQL
+		// Combine both actions affecting Email templates into one count.
+		$combinedquery = $this->getDatabase()->prepare(<<<SQL
             SELECT COUNT(*) AS count
             FROM log
             WHERE log.user = :userid
                 AND log.action IN ('CreatedEmail', 'EditedEmail');
 SQL
-        );
-
-        $combinedquery->bindValue(":userid", $this->user->getId());
-        $combinedquery->execute();
-        $cec = $combinedquery->fetchColumn();
-        $userElement->setAttribute("emailtempchange", $cec);
-        $combinedquery->closeCursor();
-    }
+		);
+
+		$combinedquery->bindValue(":userid", $this->user->getId());
+		$combinedquery->execute();
+		$cec = $combinedquery->fetchColumn();
+		$userElement->setAttribute("emailtempchange", $cec);
+		$combinedquery->closeCursor();
+	}
 }