mdaniels5757 / waca

includes/SessionAlert.php

Indentation +137 added lines, -137 removed lines

@@ -21,141 +21,141 @@
  */
 class SessionAlert
 {
-    private $message;
-    private $title;
-    private $type;
-    private $closable;
-    private $block;
-
-    /**
-     * @param string $message
-     * @param string $title
-     * @param string $type
-     * @param bool   $closable
-     * @param bool   $block
-     */
-    public function __construct($message, $title, $type = "alert-info", $closable = true, $block = true)
-    {
-        $this->message = $message;
-        $this->title = $title;
-        $this->type = $type;
-        $this->closable = $closable;
-        $this->block = $block;
-    }
-
-    /**
-     * Shows a quick one-liner message
-     *
-     * @param string $message
-     * @param string $type
-     */
-    public static function quick($message, $type = "alert-info")
-    {
-        self::append(new SessionAlert($message, "", $type, true, false));
-    }
-
-    /**
-     * @param SessionAlert $alert
-     */
-    public static function append(SessionAlert $alert)
-    {
-        $data = WebRequest::getSessionAlertData();
-        $data[] = serialize($alert);
-        WebRequest::setSessionAlertData($data);
-    }
-
-    /**
-     * Shows a quick one-liner success message
-     *
-     * @param string $message
-     */
-    public static function success($message)
-    {
-        self::append(new SessionAlert($message, "", "alert-success", true, true));
-    }
-
-    /**
-     * Shows a quick one-liner warning message
-     *
-     * @param string $message
-     * @param string $title
-     */
-    public static function warning($message, $title = "Warning!")
-    {
-        self::append(new SessionAlert($message, $title, "alert-warning", true, true));
-    }
-
-    /**
-     * Shows a quick one-liner error message
-     *
-     * @param string $message
-     * @param string $title
-     */
-    public static function error($message, $title = "Error!")
-    {
-        self::append(new SessionAlert($message, $title, "alert-danger", true, true));
-    }
-
-    /**
-     * Retrieves the alerts which have been saved to the session
-     * @return array
-     */
-    public static function getAlerts()
-    {
-        $alertData = array();
-
-        foreach (WebRequest::getSessionAlertData() as $a) {
-            $alertData[] = unserialize($a);
-        }
-
-        return $alertData;
-    }
-
-    /**
-     * Clears the alerts from the session
-     */
-    public static function clearAlerts()
-    {
-        WebRequest::clearSessionAlertData();
-    }
-
-    /**
-     * @return boolean
-     */
-    public function isBlock()
-    {
-        return $this->block;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function isClosable()
-    {
-        return $this->closable;
-    }
-
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->title;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
+	private $message;
+	private $title;
+	private $type;
+	private $closable;
+	private $block;
+
+	/**
+	 * @param string $message
+	 * @param string $title
+	 * @param string $type
+	 * @param bool   $closable
+	 * @param bool   $block
+	 */
+	public function __construct($message, $title, $type = "alert-info", $closable = true, $block = true)
+	{
+		$this->message = $message;
+		$this->title = $title;
+		$this->type = $type;
+		$this->closable = $closable;
+		$this->block = $block;
+	}
+
+	/**
+	 * Shows a quick one-liner message
+	 *
+	 * @param string $message
+	 * @param string $type
+	 */
+	public static function quick($message, $type = "alert-info")
+	{
+		self::append(new SessionAlert($message, "", $type, true, false));
+	}
+
+	/**
+	 * @param SessionAlert $alert
+	 */
+	public static function append(SessionAlert $alert)
+	{
+		$data = WebRequest::getSessionAlertData();
+		$data[] = serialize($alert);
+		WebRequest::setSessionAlertData($data);
+	}
+
+	/**
+	 * Shows a quick one-liner success message
+	 *
+	 * @param string $message
+	 */
+	public static function success($message)
+	{
+		self::append(new SessionAlert($message, "", "alert-success", true, true));
+	}
+
+	/**
+	 * Shows a quick one-liner warning message
+	 *
+	 * @param string $message
+	 * @param string $title
+	 */
+	public static function warning($message, $title = "Warning!")
+	{
+		self::append(new SessionAlert($message, $title, "alert-warning", true, true));
+	}
+
+	/**
+	 * Shows a quick one-liner error message
+	 *
+	 * @param string $message
+	 * @param string $title
+	 */
+	public static function error($message, $title = "Error!")
+	{
+		self::append(new SessionAlert($message, $title, "alert-danger", true, true));
+	}
+
+	/**
+	 * Retrieves the alerts which have been saved to the session
+	 * @return array
+	 */
+	public static function getAlerts()
+	{
+		$alertData = array();
+
+		foreach (WebRequest::getSessionAlertData() as $a) {
+			$alertData[] = unserialize($a);
+		}
+
+		return $alertData;
+	}
+
+	/**
+	 * Clears the alerts from the session
+	 */
+	public static function clearAlerts()
+	{
+		WebRequest::clearSessionAlertData();
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public function isBlock()
+	{
+		return $this->block;
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public function isClosable()
+	{
+		return $this->closable;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getType()
+	{
+		return $this->type;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return $this->title;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getMessage()
+	{
+		return $this->message;
+	}
 }

includes/StringFunctions.php

Indentation +16 added lines, -16 removed lines

@@ -10,20 +10,20 @@
 
 class StringFunctions
 {
-    /**
-     * Make a string's first character uppercase
-     *
-     * @param string $string
-     *
-     * @return string
-     */
-    public function upperCaseFirst($string)
-    {
-        if (ord($string) < 128) {
-            return ucfirst($string);
-        }
-        else {
-            return mb_strtoupper(mb_substr($string, 0, 1)) . mb_substr($string, 1);
-        }
-    }
+	/**
+	 * Make a string's first character uppercase
+	 *
+	 * @param string $string
+	 *
+	 * @return string
+	 */
+	public function upperCaseFirst($string)
+	{
+		if (ord($string) < 128) {
+			return ucfirst($string);
+		}
+		else {
+			return mb_strtoupper(mb_substr($string, 0, 1)) . mb_substr($string, 1);
+		}
+	}
 }

includes/Router/ApiRequestRouter.php

Indentation +42 added lines, -42 removed lines

@@ -22,49 +22,49 @@
 
 class ApiRequestRouter implements IRequestRouter
 {
-    /**
-     * @return string[]
-     */
-    public static function getActionList()
-    {
-        return array("count", "status", "stats", "help", "monitor");
-    }
+	/**
+	 * @return string[]
+	 */
+	public static function getActionList()
+	{
+		return array("count", "status", "stats", "help", "monitor");
+	}
 
-    /**
-     * @return IRoutedTask
-     * @throws Exception
-     */
-    public function route()
-    {
-        $requestAction = WebRequest::getString('action');
+	/**
+	 * @return IRoutedTask
+	 * @throws Exception
+	 */
+	public function route()
+	{
+		$requestAction = WebRequest::getString('action');
 
-        switch ($requestAction) {
-            case "count":
-                $result = new CountAction();
-                break;
-            case "status":
-                $result = new StatusAction();
-                break;
-            case "stats":
-                $result = new StatsAction();
-                break;
-            case "help":
-                $result = new HelpAction();
-                break;
-            case "monitor":
-                $result = new MonitorAction();
-                break;
-            case "users":
-                $result = new JsUsersAction();
-                break;
-            case "templates":
-                $result = new JsTemplateConfirmsAction();
-                break;
-            default:
-                $result = new UnknownAction();
-                break;
-        }
+		switch ($requestAction) {
+			case "count":
+				$result = new CountAction();
+				break;
+			case "status":
+				$result = new StatusAction();
+				break;
+			case "stats":
+				$result = new StatsAction();
+				break;
+			case "help":
+				$result = new HelpAction();
+				break;
+			case "monitor":
+				$result = new MonitorAction();
+				break;
+			case "users":
+				$result = new JsUsersAction();
+				break;
+			case "templates":
+				$result = new JsTemplateConfirmsAction();
+				break;
+			default:
+				$result = new UnknownAction();
+				break;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 }

includes/Router/OAuthRequestRouter.php

Indentation +5 added lines, -5 removed lines

@@ -17,9 +17,9 @@
  */
 class OAuthRequestRouter extends RequestRouter
 {
-    protected function getRouteFromPath($pathInfo)
-    {
-        // Hardcode the route for this entry point
-        return array(PageOAuthCallback::class, 'authorise');
-    }
+	protected function getRouteFromPath($pathInfo)
+	{
+		// Hardcode the route for this entry point
+		return array(PageOAuthCallback::class, 'authorise');
+	}
 }
\ No newline at end of file

includes/DataObjects/OAuthIdentity.php

Indentation +284 added lines, -284 removed lines

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

includes/DataObjects/SiteNotice.php

Indentation +57 added lines, -57 removed lines

@@ -20,74 +20,74 @@
  */
 class SiteNotice extends DataObject
 {
-    /** @var string */
-    private $content;
+	/** @var string */
+	private $content;
 
-    /**
-     * Get a message.
-     *
-     * @param PdoDatabase $database
-     *
-     * @return string The content for display
-     */
-    public static function get(PdoDatabase $database)
-    {
-        /** @var SiteNotice $message */
-        $message = self::getById(1, $database);
+	/**
+	 * Get a message.
+	 *
+	 * @param PdoDatabase $database
+	 *
+	 * @return string The content for display
+	 */
+	public static function get(PdoDatabase $database)
+	{
+		/** @var SiteNotice $message */
+		$message = self::getById(1, $database);
 
-        return $message->getContent();
-    }
+		return $message->getContent();
+	}
 
-    /**
-     * Saves the object
-     * @throws Exception
-     */
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            throw new Exception('Not allowed to create new site notice object');
-        }
-        else {
-            // update
-            $statement = $this->dbObject->prepare(<<<SQL
+	/**
+	 * Saves the object
+	 * @throws Exception
+	 */
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			throw new Exception('Not allowed to create new site notice object');
+		}
+		else {
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
 UPDATE sitenotice
 SET content = :content, updateversion = updateversion + 1
 WHERE updateversion = :updateversion;
 SQL
-            );
-            $statement->bindValue(':updateversion', $this->updateversion);
+			);
+			$statement->bindValue(':updateversion', $this->updateversion);
 
-            $statement->bindValue(':content', $this->content);
+			$statement->bindValue(':content', $this->content);
 
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
 
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
 
-            $this->updateversion++;
-        }
-    }
+			$this->updateversion++;
+		}
+	}
 
-    /**
-     * Gets the content of the message
-     * @return string
-     */
-    public function getContent()
-    {
-        return $this->content;
-    }
+	/**
+	 * Gets the content of the message
+	 * @return string
+	 */
+	public function getContent()
+	{
+		return $this->content;
+	}
 
-    /**
-     * Sets the content of the message
-     *
-     * @param string $content
-     */
-    public function setContent($content)
-    {
-        $this->content = $content;
-    }
+	/**
+	 * Sets the content of the message
+	 *
+	 * @param string $content
+	 */
+	public function setContent($content)
+	{
+		$this->content = $content;
+	}
 }

includes/DataObjects/Credential.php

Indentation +196 added lines, -196 removed lines

@@ -15,187 +15,187 @@ 
 
 class Credential extends DataObject
 {
-    /** @var int */
-    private $user;
-    /** @var int */
-    private $factor;
-    /** @var string */
-    private $type;
-    /** @var string */
-    private $data;
-    /** @var int */
-    private $version;
-    private $timeout;
-    /** @var int */
-    private $disabled = 0;
-    /** @var int */
-    private $priority;
-
-    /**
-     * @return int
-     */
-    public function getUserId()
-    {
-        return $this->user;
-    }
-
-    /**
-     * @param int $user
-     */
-    public function setUserId($user)
-    {
-        $this->user = $user;
-    }
-
-    /**
-     * @return int
-     */
-    public function getFactor()
-    {
-        return $this->factor;
-    }
-
-    /**
-     * @param int $factor
-     */
-    public function setFactor($factor)
-    {
-        $this->factor = $factor;
-    }
-
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * @param string $type
-     */
-    public function setType($type)
-    {
-        $this->type = $type;
-    }
-
-    /**
-     * @return string
-     */
-    public function getData()
-    {
-        return $this->data;
-    }
-
-    /**
-     * @param string $data
-     */
-    public function setData($data)
-    {
-        $this->data = $data;
-    }
-
-    /**
-     * @return int
-     */
-    public function getVersion()
-    {
-        return $this->version;
-    }
-
-    /**
-     * @param int $version
-     */
-    public function setVersion($version)
-    {
-        $this->version = $version;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getTimeout()
-    {
-        if ($this->timeout === null) {
-            return null;
-        }
-
-        return new DateTimeImmutable($this->timeout);
-    }
-
-    /**
-     * @param mixed $timeout
-     */
-    public function setTimeout(DateTimeImmutable $timeout = null)
-    {
-        if ($timeout === null) {
-            $this->timeout = null;
-        }
-        else {
-            $this->timeout = $timeout->format('Y-m-d H:i:s');
-        }
-    }
-
-    /**
-     * @return int
-     */
-    public function getDisabled()
-    {
-        return $this->disabled;
-    }
-
-    /**
-     * @param int $disabled
-     */
-    public function setDisabled($disabled)
-    {
-        $this->disabled = $disabled;
-    }
-
-    /**
-     * @return int
-     */
-    public function getPriority()
-    {
-        return $this->priority;
-    }
-
-    /**
-     * @param int $priority
-     */
-    public function setPriority($priority)
-    {
-        $this->priority = $priority;
-    }
-
-    public function save()
-    {
-        if ($this->isNew()) {
-            // insert
-            $statement = $this->dbObject->prepare(<<<SQL
+	/** @var int */
+	private $user;
+	/** @var int */
+	private $factor;
+	/** @var string */
+	private $type;
+	/** @var string */
+	private $data;
+	/** @var int */
+	private $version;
+	private $timeout;
+	/** @var int */
+	private $disabled = 0;
+	/** @var int */
+	private $priority;
+
+	/**
+	 * @return int
+	 */
+	public function getUserId()
+	{
+		return $this->user;
+	}
+
+	/**
+	 * @param int $user
+	 */
+	public function setUserId($user)
+	{
+		$this->user = $user;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getFactor()
+	{
+		return $this->factor;
+	}
+
+	/**
+	 * @param int $factor
+	 */
+	public function setFactor($factor)
+	{
+		$this->factor = $factor;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getType()
+	{
+		return $this->type;
+	}
+
+	/**
+	 * @param string $type
+	 */
+	public function setType($type)
+	{
+		$this->type = $type;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getData()
+	{
+		return $this->data;
+	}
+
+	/**
+	 * @param string $data
+	 */
+	public function setData($data)
+	{
+		$this->data = $data;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getVersion()
+	{
+		return $this->version;
+	}
+
+	/**
+	 * @param int $version
+	 */
+	public function setVersion($version)
+	{
+		$this->version = $version;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getTimeout()
+	{
+		if ($this->timeout === null) {
+			return null;
+		}
+
+		return new DateTimeImmutable($this->timeout);
+	}
+
+	/**
+	 * @param mixed $timeout
+	 */
+	public function setTimeout(DateTimeImmutable $timeout = null)
+	{
+		if ($timeout === null) {
+			$this->timeout = null;
+		}
+		else {
+			$this->timeout = $timeout->format('Y-m-d H:i:s');
+		}
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getDisabled()
+	{
+		return $this->disabled;
+	}
+
+	/**
+	 * @param int $disabled
+	 */
+	public function setDisabled($disabled)
+	{
+		$this->disabled = $disabled;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getPriority()
+	{
+		return $this->priority;
+	}
+
+	/**
+	 * @param int $priority
+	 */
+	public function setPriority($priority)
+	{
+		$this->priority = $priority;
+	}
+
+	public function save()
+	{
+		if ($this->isNew()) {
+			// insert
+			$statement = $this->dbObject->prepare(<<<SQL
 INSERT INTO credential ( updateversion, user, factor, type, data, version, timeout, disabled, priority )
 VALUES ( 0, :user, :factor, :type, :data, :version, :timeout, :disabled, :priority );
 SQL
-            );
-            $statement->bindValue(":user", $this->user);
-            $statement->bindValue(":factor", $this->factor);
-            $statement->bindValue(":type", $this->type);
-            $statement->bindValue(":data", $this->data);
-            $statement->bindValue(":version", $this->version);
-            $statement->bindValue(":timeout", $this->timeout);
-            $statement->bindValue(":disabled", $this->disabled);
-            $statement->bindValue(":priority", $this->priority);
-
-            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(":factor", $this->factor);
+			$statement->bindValue(":type", $this->type);
+			$statement->bindValue(":data", $this->data);
+			$statement->bindValue(":version", $this->version);
+			$statement->bindValue(":timeout", $this->timeout);
+			$statement->bindValue(":disabled", $this->disabled);
+			$statement->bindValue(":priority", $this->priority);
+
+			if ($statement->execute()) {
+				$this->id = (int)$this->dbObject->lastInsertId();
+			}
+			else {
+				throw new Exception($statement->errorInfo());
+			}
+		}
+		else {
+			// update
+			$statement = $this->dbObject->prepare(<<<SQL
                 UPDATE credential
                 SET   factor = :factor
                     , data = :data
@@ -206,27 +206,27 @@ 
                     , updateversion = updateversion + 1
                 WHERE id = :id AND updateversion = :updateversion;
 SQL
-            );
+			);
 
-            $statement->bindValue(':id', $this->id);
-            $statement->bindValue(':updateversion', $this->updateversion);
+			$statement->bindValue(':id', $this->id);
+			$statement->bindValue(':updateversion', $this->updateversion);
 
-            $statement->bindValue(":factor", $this->factor);
-            $statement->bindValue(":data", $this->data);
-            $statement->bindValue(":version", $this->version);
-            $statement->bindValue(":timeout", $this->timeout);
-            $statement->bindValue(":disabled", $this->disabled);
-            $statement->bindValue(":priority", $this->priority);
+			$statement->bindValue(":factor", $this->factor);
+			$statement->bindValue(":data", $this->data);
+			$statement->bindValue(":version", $this->version);
+			$statement->bindValue(":timeout", $this->timeout);
+			$statement->bindValue(":disabled", $this->disabled);
+			$statement->bindValue(":priority", $this->priority);
 
-            if (!$statement->execute()) {
-                throw new Exception($statement->errorInfo());
-            }
+			if (!$statement->execute()) {
+				throw new Exception($statement->errorInfo());
+			}
 
-            if ($statement->rowCount() !== 1) {
-                throw new OptimisticLockFailedException();
-            }
+			if ($statement->rowCount() !== 1) {
+				throw new OptimisticLockFailedException();
+			}
 
-            $this->updateversion++;
-        }
-    }
+			$this->updateversion++;
+		}
+	}
 }
\ No newline at end of file

includes/DataObjects/RDnsCache.php

Indentation +99 added lines, -99 removed lines

@@ -19,109 +19,109 @@
  */
 class RDnsCache extends DataObject
 {
-    private $address;
-    private $data;
-    private $creation;
-
-    /**
-     * @param string      $address
-     * @param PdoDatabase $database
-     *
-     * @return RDnsCache|false
-     */
-    public static function getByAddress($address, PdoDatabase $database)
-    {
-        // @todo add cache invalidation (timestamp?)
-        $statement = $database->prepare("SELECT * FROM rdnscache 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 RDnsCache|false
+	 */
+	public static function getByAddress($address, PdoDatabase $database)
+	{
+		// @todo add cache invalidation (timestamp?)
+		$statement = $database->prepare("SELECT * FROM rdnscache 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 `rdnscache` (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 `rdnscache`
 SET address = :address, data = :data, updateversion = updateversion + 1
 WHERE id = :id AND updateversion = :updateversion;
 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 string
-     */
-    public function getData()
-    {
-        return unserialize($this->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 string
+	 */
+	public function getData()
+	{
+		return unserialize($this->data);
+	}
+
+	public function setData($data)
+	{
+		$this->data = serialize($data);
+	}
+
+	/**
+	 * @return DateTimeImmutable
+	 */
+	public function getCreation()
+	{
+		return new DateTimeImmutable($this->creation);
+	}
 }

includes/DataObjects/GeoLocation.php

Indentation +102 added lines, -102 removed lines

@@ -21,110 +21,110 @@
  */
 class GeoLocation extends DataObject
 {
-    private $address;
-    private $data;
-    private $creation;
-
-    /**
-     * @param string      $address
-     * @param PdoDatabase $database
-     * @param bool        $forUpdate
-     * @return GeoLocation
-     */
-    public static function getByAddress($address, PdoDatabase $database, $forUpdate = false)
-    {
-        $lockMode = $forUpdate ? ' FOR UPDATE' : '';
-        $sql = "SELECT * FROM geolocation WHERE address = :id LIMIT 1" . $lockMode;
-
-        $statement = $database->prepare($sql);
-        $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("INSERT INTO `geolocation` (address, data) VALUES (:address, :data) ON DUPLICATE KEY UPDATE address = address;");
-
-            $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
+	private $address;
+	private $data;
+	private $creation;
+
+	/**
+	 * @param string      $address
+	 * @param PdoDatabase $database
+	 * @param bool        $forUpdate
+	 * @return GeoLocation
+	 */
+	public static function getByAddress($address, PdoDatabase $database, $forUpdate = false)
+	{
+		$lockMode = $forUpdate ? ' FOR UPDATE' : '';
+		$sql = "SELECT * FROM geolocation WHERE address = :id LIMIT 1" . $lockMode;
+
+		$statement = $database->prepare($sql);
+		$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("INSERT INTO `geolocation` (address, data) VALUES (:address, :data) ON DUPLICATE KEY UPDATE address = address;");
+
+			$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;
 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);
+	}
 }