JuKu / JuKuCMS

system/packages/com.jukusoft.cms.user/classes/user.php

Spacing +24 added lines, -24 removed lines

@@ -46,7 +46,7 @@ 
 		//
 	}
 
-	public function load (int $userID = -1) {
+	public function load(int $userID = -1) {
 		//check, if user is logged in
 		if ($userID === -1) {
 			if (isset($_SESSION['logged-in']) && $_SESSION['logged-in'] === true) {
@@ -142,7 +142,7 @@ 
 		}
 	}
 
-	public function loginByUsername (string $username, string $password) : array {
+	public function loginByUsername(string $username, string $password) : array {
 		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `username` = :username AND `activated` = '1'; ", array(
 			'username' => &$username
 		));
@@ -150,7 +150,7 @@ 
 		return $this->loginRow($row, $password);
 	}
 
-	public function loginByMail (string $mail, string $password) : array {
+	public function loginByMail(string $mail, string $password) : array {
 		//check, if mail is valide
 		$validator = new Validator_Mail();
 
@@ -168,7 +168,7 @@ 
 		return $this->loginRow($row, $password);
 	}
 
-	public function loginByID (int $userID) : array {
+	public function loginByID(int $userID) : array {
 		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `userID` = :userID AND `activated` = '1'; ", array(
 			'userID' => &$userID
 		));
@@ -194,7 +194,7 @@ 
 		}
 	}
 
-	protected function loginRow ($row, string $password) : array {
+	protected function loginRow($row, string $password) : array {
 		if (!$row) {
 			//user doesnt exists
 			$res['success'] = false;
@@ -251,7 +251,7 @@ 
 		}
 	}
 
-	protected function setLoggedIn (int $userID, string $username, array $row) {
+	protected function setLoggedIn(int $userID, string $username, array $row) {
 		$_SESSION['logged-in'] = true;
 		$_SESSION['userID'] = (int) $userID;
 		$_SESSION['username'] = $username;
@@ -264,7 +264,7 @@ 
 		$this->row = $row;
 	}
 
-	public function logout () {
+	public function logout() {
 		//check, if session was started
 		PHPUtils::checkSessionStarted();
 
@@ -279,13 +279,13 @@ 
 		$this->setGuest();
 	}
 
-	protected function setGuest () {
+	protected function setGuest() {
 		$this->userID = (int) Settings::get("guest_userid", "-1");
 		$this->username = Settings::get("guest_username", "Guest");
 		$this->isLoggedIn = false;
 	}
 
-	protected static function hashPassword ($password, $salt) {
+	protected static function hashPassword($password, $salt) {
 		//http://php.net/manual/de/function.password-hash.php
 
 		//add salt to password
@@ -309,7 +309,7 @@ 
 	 *
 	 * @return integer userID
 	 */
-	public function getID () : int {
+	public function getID() : int {
 		return $this->userID;
 	}
 
@@ -318,23 +318,23 @@ 
 	 *
 	 * @return string username
 	 */
-	public function getUsername () : string {
+	public function getUsername() : string {
 		return $this->username;
 	}
 
-	public function getMail () : string {
+	public function getMail() : string {
 		return $this->row['mail'];
 	}
 
-	public function isLoggedIn () : bool {
+	public function isLoggedIn() : bool {
 		return $this->isLoggedIn;
 	}
 
-	public function getRow () : array {
+	public function getRow() : array {
 		return $this->row;
 	}
 
-	public function setOnline (bool $updateIP = true) {
+	public function setOnline(bool $updateIP = true) {
 		//get client ip
 		$ip = PHPUtils::getClientIP();
 
@@ -356,7 +356,7 @@ 
 		}
 	}
 
-	public function updateOnlineList () {
+	public function updateOnlineList() {
 		$interval_minutes = (int) Settings::get("online_interval", "5");
 
 		Database::getInstance()->execute("UPDATE `{praefix}user` SET `online` = '0' WHERE DATE_SUB(NOW(), INTERVAL " . $interval_minutes . " MINUTE) > `last_online`; ");
@@ -367,7 +367,7 @@ 
 	 *
 	 * Only use this method for installation & upgrade!
 	 */
-	public static function createIfIdAbsent (int $userID, string $username, string $password, string $mail, int $main_group = 2, string $specific_title = "none", int $activated = 1) {
+	public static function createIfIdAbsent(int $userID, string $username, string $password, string $mail, int $main_group = 2, string $specific_title = "none", int $activated = 1) {
 		if (self::existsUserID($userID)) {
 			//dont create user, if user already exists
 			return;
@@ -395,7 +395,7 @@ 
 		));
 	}
 
-	public static function create (string $username, string $password, string $mail, string $ip, int $main_group = 2, string $specific_title = "none", int $activated = 1) {
+	public static function create(string $username, string $password, string $mail, string $ip, int $main_group = 2, string $specific_title = "none", int $activated = 1) {
 		if (self::existsUsername($username)) {
 			//dont create user, if username already exists
 			return false;
@@ -458,7 +458,7 @@ 
 		);
 	}
 
-	public static function deleteUserID (int $userID) {
+	public static function deleteUserID(int $userID) {
 		Database::getInstance()->execute("DELETE FROM `{praefix}user` WHERE `userID` = :userID; ", array(
 			'userID' => array(
 				'type' => PDO::PARAM_INT,
@@ -470,7 +470,7 @@ 
 		Cache::clear("user", "user-" . $userID);
 	}
 
-	public static function existsUserID (int $userID) : bool {
+	public static function existsUserID(int $userID) : bool {
 		//search for userID in database
 		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `userID` = :userID; ", array(
 			'userID' => array(
@@ -482,21 +482,21 @@ 
 		return $row !== false;
 	}
 
-	public static function existsUsername (string $username) : bool {
+	public static function existsUsername(string $username) : bool {
 		//search for username in database, ignore case
 		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE UPPER(`username`) LIKE UPPER(:username); ", array('username' => $username));
 
 		return $row !== false;
 	}
 
-	public static function existsMail (string $mail) : bool {
+	public static function existsMail(string $mail) : bool {
 		//search for mail in database, ignore case
 		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE UPPER(`mail`) LIKE UPPER(:mail); ", array('mail' => $mail));
 
 		return $row !== false;
 	}
 
-	public static function getIDByUsernameFromDB (string $username) : int {
+	public static function getIDByUsernameFromDB(string $username) : int {
 		//search for username in database, ignore case
 		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE UPPER(`username`) LIKE UPPER(:username); ", array('username' => $username));
 
@@ -511,7 +511,7 @@ 
 	/**
 	 * get instance of current (logged in / guest) user
 	 */
-	public static function &current () : User {
+	public static function &current() : User {
 		if (self::$instance == null) {
 			self::$instance = new User();
 			self::$instance->load();

Indentation +481 added lines, -481 removed lines

@@ -27,495 +27,495 @@
 
 class User {
 
-	//instance of current (logged-in / guest) user
-	protected static $instance = null;
-
-	//current userID
-	protected $userID = -1;
-
-	//current username
-	protected $username = "Guest";
-
-	//flag, if user is logged in
-	protected $isLoggedIn = false;
-
-	//current database row
-	protected $row = null;
-
-	public function __construct() {
-		//
-	}
-
-	public function load (int $userID = -1) {
-		//check, if user is logged in
-		if ($userID === -1) {
-			if (isset($_SESSION['logged-in']) && $_SESSION['logged-in'] === true) {
-				if (!isset($_SESSION['userID']) || empty($_SESSION['userID'])) {
-					throw new IllegalStateException("userID is not set in session.");
-				}
-
-				if (!isset($_SESSION['username']) || empty($_SESSION['username'])) {
-					throw new IllegalStateException("username is not set in session.");
-				}
-
-				$this->userID = (int) $_SESSION['userID'];
-				$this->username = $_SESSION['username'];
-				$this->isLoggedIn = true;
-
-				//TODO: update online state in database
-			} else {
-				$this->setGuest();
-			}
-		} else {
-			$this->userID = (int) $userID;
-		}
-
-		Events::throwEvent("before_load_user", array(
-			'userID' => &$this->userID,
-			'isLoggedIn' => &$this->isLoggedIn,
-			'user' => &$this
-		));
-
-		//try to load from cache
-		if (Cache::contains("user", "user-" . $this->userID)) {
-			$this->row = Cache::get("user", "user-" . $this->userID);
-		} else {
-			$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `userID` = :userID AND `activated` = '1'; ", array(
-				'userID' => array(
-					'type' => PDO::PARAM_INT,
-					'value' => $this->userID
-				)
-			));
-
-			if (!$row) {
-				$logout_user = true;
-
-				//user not found, throw an event, so plugins can handle this (optional)
-				Events::throwEvent("user_not_found", array(
-					'userID' => &$this->userID,
-					'username' => &$this->username,
-					'isLoggedIn' => &$this->isLoggedIn,
-					'row' => &$row,
-					'logout_user' => &$logout_user,
-					'user' => &$this
-				));
-
-				if ($logout_user) {
-					//logout user
-					$this->logout();
-				}
-			} else {
-				//remove password hash from row
-				unset($row['password']);
-
-				Events::throwEvent("before_cache_user", array(
-					'userID' => &$this->userID,
-					'username' => &$this->username,
-					'isLoggedIn' => &$this->isLoggedIn,
-					'row' => &$row,
-					'user' => &$this
-				));
-
-				//cache entry
-				Cache::put("user", "user-" . $this->userID, $row);
-
-				$this->row = $row;
-			}
-		}
-
-		if ($this->row !== null) {
-			$this->userID = (int) $this->row['userID'];
-			$this->username = $this->row['username'];
-		}
-
-		Events::throwEvent("after_load_user", array(
-			'userID' => &$this->userID,
-			'username' => &$this->username,
-			'isLoggedIn' => &$this->isLoggedIn,
-			'row' => &$row,
-			'user' => &$this
-		));
-
-		//TODO: update online state and IP
-		if ($userID === -1 && $this->isLoggedIn()) {
-			$this->setOnline();
-		}
-	}
-
-	public function loginByUsername (string $username, string $password) : array {
-		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `username` = :username AND `activated` = '1'; ", array(
-			'username' => &$username
-		));
-
-		return $this->loginRow($row, $password);
-	}
-
-	public function loginByMail (string $mail, string $password) : array {
-		//check, if mail is valide
-		$validator = new Validator_Mail();
-
-		if (!$validator->isValide($mail)) {
-			return array(
-				'success' => false,
-				'error' => "mail_not_valide"
-			);
-		}
-
-		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `mail` = :mail AND `activated` = '1'; ", array(
-			'mail' => &$mail
-		));
-
-		return $this->loginRow($row, $password);
-	}
-
-	public function loginByID (int $userID) : array {
-		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `userID` = :userID AND `activated` = '1'; ", array(
-			'userID' => &$userID
-		));
-
-		$res = array();
-
-		if ($row !== false) {
-			//set online state
-			$this->setOnline();
-
-			//set logged in
-			$this->setLoggedIn($row['userID'], $row['username'], $row);
-
-			//login successful
-			$res['success'] = true;
-			$res['error'] = "none";
-			return $res;
-		} else {
-			//user doesnt exists
-			$res['success'] = false;
-			$res['error'] = "user_not_exists";
-			return $res;
-		}
-	}
-
-	protected function loginRow ($row, string $password) : array {
-		if (!$row) {
-			//user doesnt exists
-			$res['success'] = false;
-			$res['error'] = "user_not_exists";
-
-			return $res;
-		}
-
-		//user exists
-
-		//get salt
-		$salt = $row['salt'];
-
-		//add salt to password
-		$password .= $salt;
-
-		//verify password
-		if (password_verify($password, $row['password'])) {
-			//correct password
-
-			//check, if a newer password algorithmus is available --> rehash required
-			if (password_needs_rehash($row['password'], PASSWORD_DEFAULT)) {
-				//rehash password
-				$new_hash = self::hashPassword($password, $salt);
-
-				//update password in database
-				Database::getInstance()->execute("UPDATE `{praefix}user` SET `password` = :password WHERE `userID` = :userID; ", array(
-					'password' => $new_hash,
-					'userID' => array(
-						'type' => PDO::PARAM_INT,
-						'value' => $row['userID']
-					)
-				));
-			}
-
-			//set online state
-			$this->setOnline();
-
-			//set logged in
-			$this->setLoggedIn($row['userID'], $row['username'], $row);
-
-			//login successful
-			$res['success'] = true;
-			$res['error'] = "none";
-			return $res;
-		} else {
-			//wrong password
-
-			//user doesnt exists
-			$res['success'] = false;
-			$res['error'] = "wrong_password";
-
-			return $res;
-		}
-	}
-
-	protected function setLoggedIn (int $userID, string $username, array $row) {
-		$_SESSION['logged-in'] = true;
-		$_SESSION['userID'] = (int) $userID;
-		$_SESSION['username'] = $username;
-
-		//remove password hash from row (so password isnt cached)
-		unset($row['password']);
-
-		$this->userID = $userID;
-		$this->username = $username;
-		$this->row = $row;
-	}
-
-	public function logout () {
-		//check, if session was started
-		PHPUtils::checkSessionStarted();
-
-		unset($_SESSION['userID']);
-		unset($_SESSION['username']);
-
-		$_SESSION['logged-in'] = false;
-
-		$this->setGuest();
-	}
-
-	protected function setGuest () {
-		$this->userID = (int) Settings::get("guest_userid", "-1");
-		$this->username = Settings::get("guest_username", "Guest");
-		$this->isLoggedIn = false;
-	}
-
-	protected static function hashPassword ($password, $salt) {
-		//http://php.net/manual/de/function.password-hash.php
-
-		//add salt to password
-		$password .= $salt;
-
-		$options = array(
-			'cost' => (int) Settings::get("password_hash_cost", "10")
-		);
-		$algo = PASSWORD_DEFAULT;
-
-		Events::throwEvent("hashing_password", array(
-			'options' => &$options,
-			'algo' => &$algo
-		));
-
-		return password_hash($password, $algo, $options);
-	}
-
-	/**
-	 * get user ID of user
-	 *
-	 * @return integer userID
-	 */
-	public function getID () : int {
-		return $this->userID;
-	}
-
-	/**
-	 * get username of user
-	 *
-	 * @return string username
-	 */
-	public function getUsername () : string {
-		return $this->username;
-	}
-
-	public function getMail () : string {
-		return $this->row['mail'];
-	}
-
-	public function isLoggedIn () : bool {
-		return $this->isLoggedIn;
-	}
-
-	public function getRow () : array {
-		return $this->row;
-	}
-
-	public function setOnline (bool $updateIP = true) {
-		//get client ip
-		$ip = PHPUtils::getClientIP();
-
-		if ($updateIP) {
-			Database::getInstance()->execute("UPDATE `{praefix}user` SET `online` = '1', `last_online` = CURRENT_TIMESTAMP, `ip` = :ip WHERE `userid` = :userid; ", array(
-				'userid' => array(
-					'type' => PDO::PARAM_INT,
-					'value' => (int) $this->userID
-				),
-				'ip' => $ip
-			));
-		} else {
-			Database::getInstance()->execute("UPDATE `{praefix}user` SET `online` = '1', `last_online` = CURRENT_TIMESTAMP, WHERE `userid` = :userid; ", array(
-				'userid' => array(
-					'type' => PDO::PARAM_INT,
-					'value' => (int) $this->userID
-				)
-			));
-		}
-	}
-
-	public function updateOnlineList () {
-		$interval_minutes = (int) Settings::get("online_interval", "5");
-
-		Database::getInstance()->execute("UPDATE `{praefix}user` SET `online` = '0' WHERE DATE_SUB(NOW(), INTERVAL " . $interval_minutes . " MINUTE) > `last_online`; ");
-	}
-
-	/**
-	 * creates user if userID is absent
-	 *
-	 * Only use this method for installation & upgrade!
-	 */
-	public static function createIfIdAbsent (int $userID, string $username, string $password, string $mail, int $main_group = 2, string $specific_title = "none", int $activated = 1) {
-		if (self::existsUserID($userID)) {
-			//dont create user, if user already exists
-			return;
-		}
-
-		//create salt
-		$salt = md5(PHPUtils::randomString(50));
-
-		//generate password hash
-		$hashed_password = self::hashPassword($password, $salt);
-
-		Database::getInstance()->execute("INSERT INTO `{praefix}user` (
+    //instance of current (logged-in / guest) user
+    protected static $instance = null;
+
+    //current userID
+    protected $userID = -1;
+
+    //current username
+    protected $username = "Guest";
+
+    //flag, if user is logged in
+    protected $isLoggedIn = false;
+
+    //current database row
+    protected $row = null;
+
+    public function __construct() {
+        //
+    }
+
+    public function load (int $userID = -1) {
+        //check, if user is logged in
+        if ($userID === -1) {
+            if (isset($_SESSION['logged-in']) && $_SESSION['logged-in'] === true) {
+                if (!isset($_SESSION['userID']) || empty($_SESSION['userID'])) {
+                    throw new IllegalStateException("userID is not set in session.");
+                }
+
+                if (!isset($_SESSION['username']) || empty($_SESSION['username'])) {
+                    throw new IllegalStateException("username is not set in session.");
+                }
+
+                $this->userID = (int) $_SESSION['userID'];
+                $this->username = $_SESSION['username'];
+                $this->isLoggedIn = true;
+
+                //TODO: update online state in database
+            } else {
+                $this->setGuest();
+            }
+        } else {
+            $this->userID = (int) $userID;
+        }
+
+        Events::throwEvent("before_load_user", array(
+            'userID' => &$this->userID,
+            'isLoggedIn' => &$this->isLoggedIn,
+            'user' => &$this
+        ));
+
+        //try to load from cache
+        if (Cache::contains("user", "user-" . $this->userID)) {
+            $this->row = Cache::get("user", "user-" . $this->userID);
+        } else {
+            $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `userID` = :userID AND `activated` = '1'; ", array(
+                'userID' => array(
+                    'type' => PDO::PARAM_INT,
+                    'value' => $this->userID
+                )
+            ));
+
+            if (!$row) {
+                $logout_user = true;
+
+                //user not found, throw an event, so plugins can handle this (optional)
+                Events::throwEvent("user_not_found", array(
+                    'userID' => &$this->userID,
+                    'username' => &$this->username,
+                    'isLoggedIn' => &$this->isLoggedIn,
+                    'row' => &$row,
+                    'logout_user' => &$logout_user,
+                    'user' => &$this
+                ));
+
+                if ($logout_user) {
+                    //logout user
+                    $this->logout();
+                }
+            } else {
+                //remove password hash from row
+                unset($row['password']);
+
+                Events::throwEvent("before_cache_user", array(
+                    'userID' => &$this->userID,
+                    'username' => &$this->username,
+                    'isLoggedIn' => &$this->isLoggedIn,
+                    'row' => &$row,
+                    'user' => &$this
+                ));
+
+                //cache entry
+                Cache::put("user", "user-" . $this->userID, $row);
+
+                $this->row = $row;
+            }
+        }
+
+        if ($this->row !== null) {
+            $this->userID = (int) $this->row['userID'];
+            $this->username = $this->row['username'];
+        }
+
+        Events::throwEvent("after_load_user", array(
+            'userID' => &$this->userID,
+            'username' => &$this->username,
+            'isLoggedIn' => &$this->isLoggedIn,
+            'row' => &$row,
+            'user' => &$this
+        ));
+
+        //TODO: update online state and IP
+        if ($userID === -1 && $this->isLoggedIn()) {
+            $this->setOnline();
+        }
+    }
+
+    public function loginByUsername (string $username, string $password) : array {
+        $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `username` = :username AND `activated` = '1'; ", array(
+            'username' => &$username
+        ));
+
+        return $this->loginRow($row, $password);
+    }
+
+    public function loginByMail (string $mail, string $password) : array {
+        //check, if mail is valide
+        $validator = new Validator_Mail();
+
+        if (!$validator->isValide($mail)) {
+            return array(
+                'success' => false,
+                'error' => "mail_not_valide"
+            );
+        }
+
+        $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `mail` = :mail AND `activated` = '1'; ", array(
+            'mail' => &$mail
+        ));
+
+        return $this->loginRow($row, $password);
+    }
+
+    public function loginByID (int $userID) : array {
+        $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `userID` = :userID AND `activated` = '1'; ", array(
+            'userID' => &$userID
+        ));
+
+        $res = array();
+
+        if ($row !== false) {
+            //set online state
+            $this->setOnline();
+
+            //set logged in
+            $this->setLoggedIn($row['userID'], $row['username'], $row);
+
+            //login successful
+            $res['success'] = true;
+            $res['error'] = "none";
+            return $res;
+        } else {
+            //user doesnt exists
+            $res['success'] = false;
+            $res['error'] = "user_not_exists";
+            return $res;
+        }
+    }
+
+    protected function loginRow ($row, string $password) : array {
+        if (!$row) {
+            //user doesnt exists
+            $res['success'] = false;
+            $res['error'] = "user_not_exists";
+
+            return $res;
+        }
+
+        //user exists
+
+        //get salt
+        $salt = $row['salt'];
+
+        //add salt to password
+        $password .= $salt;
+
+        //verify password
+        if (password_verify($password, $row['password'])) {
+            //correct password
+
+            //check, if a newer password algorithmus is available --> rehash required
+            if (password_needs_rehash($row['password'], PASSWORD_DEFAULT)) {
+                //rehash password
+                $new_hash = self::hashPassword($password, $salt);
+
+                //update password in database
+                Database::getInstance()->execute("UPDATE `{praefix}user` SET `password` = :password WHERE `userID` = :userID; ", array(
+                    'password' => $new_hash,
+                    'userID' => array(
+                        'type' => PDO::PARAM_INT,
+                        'value' => $row['userID']
+                    )
+                ));
+            }
+
+            //set online state
+            $this->setOnline();
+
+            //set logged in
+            $this->setLoggedIn($row['userID'], $row['username'], $row);
+
+            //login successful
+            $res['success'] = true;
+            $res['error'] = "none";
+            return $res;
+        } else {
+            //wrong password
+
+            //user doesnt exists
+            $res['success'] = false;
+            $res['error'] = "wrong_password";
+
+            return $res;
+        }
+    }
+
+    protected function setLoggedIn (int $userID, string $username, array $row) {
+        $_SESSION['logged-in'] = true;
+        $_SESSION['userID'] = (int) $userID;
+        $_SESSION['username'] = $username;
+
+        //remove password hash from row (so password isnt cached)
+        unset($row['password']);
+
+        $this->userID = $userID;
+        $this->username = $username;
+        $this->row = $row;
+    }
+
+    public function logout () {
+        //check, if session was started
+        PHPUtils::checkSessionStarted();
+
+        unset($_SESSION['userID']);
+        unset($_SESSION['username']);
+
+        $_SESSION['logged-in'] = false;
+
+        $this->setGuest();
+    }
+
+    protected function setGuest () {
+        $this->userID = (int) Settings::get("guest_userid", "-1");
+        $this->username = Settings::get("guest_username", "Guest");
+        $this->isLoggedIn = false;
+    }
+
+    protected static function hashPassword ($password, $salt) {
+        //http://php.net/manual/de/function.password-hash.php
+
+        //add salt to password
+        $password .= $salt;
+
+        $options = array(
+            'cost' => (int) Settings::get("password_hash_cost", "10")
+        );
+        $algo = PASSWORD_DEFAULT;
+
+        Events::throwEvent("hashing_password", array(
+            'options' => &$options,
+            'algo' => &$algo
+        ));
+
+        return password_hash($password, $algo, $options);
+    }
+
+    /**
+     * get user ID of user
+     *
+     * @return integer userID
+     */
+    public function getID () : int {
+        return $this->userID;
+    }
+
+    /**
+     * get username of user
+     *
+     * @return string username
+     */
+    public function getUsername () : string {
+        return $this->username;
+    }
+
+    public function getMail () : string {
+        return $this->row['mail'];
+    }
+
+    public function isLoggedIn () : bool {
+        return $this->isLoggedIn;
+    }
+
+    public function getRow () : array {
+        return $this->row;
+    }
+
+    public function setOnline (bool $updateIP = true) {
+        //get client ip
+        $ip = PHPUtils::getClientIP();
+
+        if ($updateIP) {
+            Database::getInstance()->execute("UPDATE `{praefix}user` SET `online` = '1', `last_online` = CURRENT_TIMESTAMP, `ip` = :ip WHERE `userid` = :userid; ", array(
+                'userid' => array(
+                    'type' => PDO::PARAM_INT,
+                    'value' => (int) $this->userID
+                ),
+                'ip' => $ip
+            ));
+        } else {
+            Database::getInstance()->execute("UPDATE `{praefix}user` SET `online` = '1', `last_online` = CURRENT_TIMESTAMP, WHERE `userid` = :userid; ", array(
+                'userid' => array(
+                    'type' => PDO::PARAM_INT,
+                    'value' => (int) $this->userID
+                )
+            ));
+        }
+    }
+
+    public function updateOnlineList () {
+        $interval_minutes = (int) Settings::get("online_interval", "5");
+
+        Database::getInstance()->execute("UPDATE `{praefix}user` SET `online` = '0' WHERE DATE_SUB(NOW(), INTERVAL " . $interval_minutes . " MINUTE) > `last_online`; ");
+    }
+
+    /**
+     * creates user if userID is absent
+     *
+     * Only use this method for installation & upgrade!
+     */
+    public static function createIfIdAbsent (int $userID, string $username, string $password, string $mail, int $main_group = 2, string $specific_title = "none", int $activated = 1) {
+        if (self::existsUserID($userID)) {
+            //dont create user, if user already exists
+            return;
+        }
+
+        //create salt
+        $salt = md5(PHPUtils::randomString(50));
+
+        //generate password hash
+        $hashed_password = self::hashPassword($password, $salt);
+
+        Database::getInstance()->execute("INSERT INTO `{praefix}user` (
 			`userID`, `username`, `password`, `salt`, `mail`, `ip`, `main_group`, `specific_title`, `online`, `last_online`, `registered`, `activated`
 		) VALUES (
 			:userID, :username, :password, :salt, :mail, '0.0.0.0', :main_group, :title, '0', '0000-00-00 00:00:00', CURRENT_TIMESTAMP , :activated
 		)", array(
-			'userID' => $userID,
-			'username' => $username,
-			'password' => $hashed_password,
-			'salt' => $salt,
-			'mail' => $mail,
-			'main_group' => $main_group,
-			'title' => $specific_title,
-			'activated' => $activated
-		));
-	}
-
-	public static function create (string $username, string $password, string $mail, string $ip, int $main_group = 2, string $specific_title = "none", int $activated = 1) {
-		if (self::existsUsername($username)) {
-			//dont create user, if username already exists
-			return false;
-		}
-
-		if (self::existsMail($mail)) {
-			//dont create user, if mail already exists
-			return false;
-		}
-
-		if (empty($specific_title)) {
-			$specific_title = "none";
-		}
-
-		//create salt
-		$salt = md5(PHPUtils::randomString(50));
-
-		//generate password hash
-		$hashed_password = self::hashPassword($password, $salt);
-
-		//create user in database
-		Database::getInstance()->execute("INSERT INTO `{praefix}user` (
+            'userID' => $userID,
+            'username' => $username,
+            'password' => $hashed_password,
+            'salt' => $salt,
+            'mail' => $mail,
+            'main_group' => $main_group,
+            'title' => $specific_title,
+            'activated' => $activated
+        ));
+    }
+
+    public static function create (string $username, string $password, string $mail, string $ip, int $main_group = 2, string $specific_title = "none", int $activated = 1) {
+        if (self::existsUsername($username)) {
+            //dont create user, if username already exists
+            return false;
+        }
+
+        if (self::existsMail($mail)) {
+            //dont create user, if mail already exists
+            return false;
+        }
+
+        if (empty($specific_title)) {
+            $specific_title = "none";
+        }
+
+        //create salt
+        $salt = md5(PHPUtils::randomString(50));
+
+        //generate password hash
+        $hashed_password = self::hashPassword($password, $salt);
+
+        //create user in database
+        Database::getInstance()->execute("INSERT INTO `{praefix}user` (
 			`userID`, `username`, `password`, `salt`, `mail`, `ip`, `main_group`, `specific_title`, `online`, `last_online`, `registered`, `activated`
 		) VALUES (
 			NULL, :username, :password, :salt, :mail, :ip, :main_group, :title, '0', '0000-00-00 00:00:00', CURRENT_TIMESTAMP , :activated
 		)", array(
-			'username' => $username,
-			'password' => $hashed_password,
-			'salt' => $salt,
-			'mail' => $mail,
-			'ip' => $ip,
-			'main_group' => $main_group,
-			'title' => $specific_title,
-			'activated' => $activated
-		));
-
-		//get userID
-		$userID = self::getIDByUsernameFromDB($username);
-
-		if ($userID == Settings::get("guest_userid", -1)) {
-			//something went wrong
-			return false;
-		}
-
-		//add user to group "registered users"
-		Groups::addGroupToUser(2, $userID, false);
-
-		Events::throwEvent("add_user", array(
-			'userID' => $userID,
-			'username' => &$username,
-			'mail' => $mail,
-			'main_group' => $main_group
-		));
-
-		return array(
-			'success' => true,
-			'userID' => $userID,
-			'username' => $username,
-			'mail' => $mail
-		);
-	}
-
-	public static function deleteUserID (int $userID) {
-		Database::getInstance()->execute("DELETE FROM `{praefix}user` WHERE `userID` = :userID; ", array(
-			'userID' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $userID
-			)
-		));
-
-		//remove user from cache
-		Cache::clear("user", "user-" . $userID);
-	}
-
-	public static function existsUserID (int $userID) : bool {
-		//search for userID in database
-		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `userID` = :userID; ", array(
-			'userID' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $userID
-			)
-		));
-
-		return $row !== false;
-	}
-
-	public static function existsUsername (string $username) : bool {
-		//search for username in database, ignore case
-		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE UPPER(`username`) LIKE UPPER(:username); ", array('username' => $username));
-
-		return $row !== false;
-	}
-
-	public static function existsMail (string $mail) : bool {
-		//search for mail in database, ignore case
-		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE UPPER(`mail`) LIKE UPPER(:mail); ", array('mail' => $mail));
-
-		return $row !== false;
-	}
-
-	public static function getIDByUsernameFromDB (string $username) : int {
-		//search for username in database, ignore case
-		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE UPPER(`username`) LIKE UPPER(:username); ", array('username' => $username));
-
-		if ($row === false) {
-			//return guest userID
-			return Settings::get("guest_userid", -1);
-		}
-
-		return $row['userID'];
-	}
-
-	/**
-	 * get instance of current (logged in / guest) user
-	 */
-	public static function &current () : User {
-		if (self::$instance == null) {
-			self::$instance = new User();
-			self::$instance->load();
-		}
-
-		return self::$instance;
-	}
+            'username' => $username,
+            'password' => $hashed_password,
+            'salt' => $salt,
+            'mail' => $mail,
+            'ip' => $ip,
+            'main_group' => $main_group,
+            'title' => $specific_title,
+            'activated' => $activated
+        ));
+
+        //get userID
+        $userID = self::getIDByUsernameFromDB($username);
+
+        if ($userID == Settings::get("guest_userid", -1)) {
+            //something went wrong
+            return false;
+        }
+
+        //add user to group "registered users"
+        Groups::addGroupToUser(2, $userID, false);
+
+        Events::throwEvent("add_user", array(
+            'userID' => $userID,
+            'username' => &$username,
+            'mail' => $mail,
+            'main_group' => $main_group
+        ));
+
+        return array(
+            'success' => true,
+            'userID' => $userID,
+            'username' => $username,
+            'mail' => $mail
+        );
+    }
+
+    public static function deleteUserID (int $userID) {
+        Database::getInstance()->execute("DELETE FROM `{praefix}user` WHERE `userID` = :userID; ", array(
+            'userID' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $userID
+            )
+        ));
+
+        //remove user from cache
+        Cache::clear("user", "user-" . $userID);
+    }
+
+    public static function existsUserID (int $userID) : bool {
+        //search for userID in database
+        $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `userID` = :userID; ", array(
+            'userID' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $userID
+            )
+        ));
+
+        return $row !== false;
+    }
+
+    public static function existsUsername (string $username) : bool {
+        //search for username in database, ignore case
+        $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE UPPER(`username`) LIKE UPPER(:username); ", array('username' => $username));
+
+        return $row !== false;
+    }
+
+    public static function existsMail (string $mail) : bool {
+        //search for mail in database, ignore case
+        $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE UPPER(`mail`) LIKE UPPER(:mail); ", array('mail' => $mail));
+
+        return $row !== false;
+    }
+
+    public static function getIDByUsernameFromDB (string $username) : int {
+        //search for username in database, ignore case
+        $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE UPPER(`username`) LIKE UPPER(:username); ", array('username' => $username));
+
+        if ($row === false) {
+            //return guest userID
+            return Settings::get("guest_userid", -1);
+        }
+
+        return $row['userID'];
+    }
+
+    /**
+     * get instance of current (logged in / guest) user
+     */
+    public static function &current () : User {
+        if (self::$instance == null) {
+            self::$instance = new User();
+            self::$instance->load();
+        }
+
+        return self::$instance;
+    }
 
 }
 

system/packages/com.jukusoft.cms.user/classes/logoutpage.php

Indentation +27 added lines, -27 removed lines

@@ -27,45 +27,45 @@
 
 class LogoutPage extends HTMLPage {
 
-	protected $error = false;
+    protected $error = false;
 
-	public function setCustomHeader() {
-		//check, if session was started
-		PHPUtils::checkSessionStarted();
+    public function setCustomHeader() {
+        //check, if session was started
+        PHPUtils::checkSessionStarted();
 
-		if (!Security::checkCSRFToken()) {
-			$this->error = true;
+        if (!Security::checkCSRFToken()) {
+            $this->error = true;
 
-			//dont logout user, because csrf token isnt correct
-			return;
-		}
+            //dont logout user, because csrf token isnt correct
+            return;
+        }
 
-		//logout user
-		User::current()->logout();
+        //logout user
+        User::current()->logout();
 
-		Events::throwEvent("after_logout");
+        Events::throwEvent("after_logout");
 
-		//get domain
-		$domain = Registry::singleton()->getObject("domain");
+        //get domain
+        $domain = Registry::singleton()->getObject("domain");
 
-		//generate index url
-		$index_url = DomainUtils::generateURL($domain->getHomePage());
+        //generate index url
+        $index_url = DomainUtils::generateURL($domain->getHomePage());
 
-		header("Location: " . $index_url);
+        header("Location: " . $index_url);
 
-		//flush gzip buffer
-		ob_end_flush();
+        //flush gzip buffer
+        ob_end_flush();
 
-		exit;
-	}
+        exit;
+    }
 
-	public function getContent(): string {
-		if ($this->error) {
-			return "Wrong CSRF token!";
-		}
+    public function getContent(): string {
+        if ($this->error) {
+            return "Wrong CSRF token!";
+        }
 
-		return "";
-	}
+        return "";
+    }
 
 }