JuKu / JuKuCMS

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

Spacing +31 added lines, -31 removed lines

@@ -50,7 +50,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) {
@@ -151,7 +151,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
 		));
@@ -175,7 +175,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();
 
@@ -193,7 +193,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
 		));
@@ -228,7 +228,7 @@ 
 	 *
 	 * @return true, if password is correct
 	 */
-	public function checkPassword (string $password) : bool {
+	public function checkPassword(string $password) : bool {
 		if ($this->row == null || empty($this->row)) {
 			throw new IllegalStateException("user wasnt loaded.");
 		}
@@ -247,7 +247,7 @@ 
 		return password_verify($password, $row['password']);
 	}
 
-	public function setPassword (string $password) {
+	public function setPassword(string $password) {
 		if ($this->row == null || empty($this->row)) {
 			throw new IllegalStateException("user wasnt loaded.");
 		}
@@ -272,7 +272,7 @@ 
 		Cache::clear("user", "user-" . $this->getID());
 	}
 
-	protected function loginRow ($row, string $password) : array {
+	protected function loginRow($row, string $password) : array {
 		$res = array();
 
 		if (!$row) {
@@ -321,7 +321,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;
@@ -334,7 +334,7 @@ 
 		$this->row = $row;
 	}
 
-	public function logout () {
+	public function logout() {
 		//check, if session was started
 		PHPUtils::checkSessionStarted();
 
@@ -346,13 +346,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
@@ -376,7 +376,7 @@ 
 	 *
 	 * @return integer userID
 	 */
-	public function getID () : int {
+	public function getID() : int {
 		return $this->userID;
 	}
 
@@ -385,27 +385,27 @@ 
 	 *
 	 * @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 hasTitle () : bool {
+	public function hasTitle() : bool {
 		return $this->row['specific_title'] !== "none";
 	}
 
-	public function getTitle () : string {
+	public function getTitle() : string {
 		if (!$this->hasTitle()) {
 			return Settings::get("user_default_title", "User");
 		}
@@ -413,7 +413,7 @@ 
 		return $this->row['specific_title'];
 	}
 
-	public function setOnline (bool $updateIP = true) {
+	public function setOnline(bool $updateIP = true) {
 		//get client ip
 		$ip = PHPUtils::getClientIP();
 
@@ -435,7 +435,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`; ");
@@ -446,7 +446,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;
@@ -474,7 +474,7 @@ 
 		));
 	}
 
-	public static function create (string $username, string $password, string $mail, string $ip, int $main_group = 2, string $specific_title = "none", int $activated = 1, string $authentificator = "LocalAuthentificator", string $owner = "system") {
+	public static function create(string $username, string $password, string $mail, string $ip, int $main_group = 2, string $specific_title = "none", int $activated = 1, string $authentificator = "LocalAuthentificator", string $owner = "system") {
 		if (self::existsUsername($username)) {
 			//dont create user, if username already exists
 			return false;
@@ -539,7 +539,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,
@@ -551,7 +551,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(
@@ -563,21 +563,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 {
 		//use in-memory cache to avoid a large amount of sql queries on setup scripts
 		if (isset(self::$getIDByUsernameFromDB_cache[$username])) {
 			return self::$getIDByUsernameFromDB_cache[$username];
@@ -597,7 +597,7 @@ 
 		return $userID;
 	}
 
-	public static function &getAuthentificatorByID (int $userID = -1) {
+	public static function &getAuthentificatorByID(int $userID = -1) {
 		if ($userID == -1) {
 			//get default authentificator
 			return self::getDefaultAuthentificator();
@@ -620,7 +620,7 @@ 
 		}
 	}
 
-	public static function &getAuthentificatorByUsername (string $username = "") {
+	public static function &getAuthentificatorByUsername(string $username = "") {
 		if ($username == null || empty($username)) {
 			//get default authentificator
 			return self::getDefaultAuthentificator();
@@ -643,7 +643,7 @@ 
 		}
 	}
 
-	public static function &getDefaultAuthentificator () : IAuthentificator {
+	public static function &getDefaultAuthentificator() : IAuthentificator {
 		if (self::$default_authentificator == null) {
 			$class_name = Settings::get("default_authentificator", "LocalAuthentificator");
 			$obj = new $class_name();
@@ -657,7 +657,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 +632 added lines, -632 removed lines

@@ -27,646 +27,646 @@
 
 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;
-
-	protected static $default_authentificator = null;
-
-	protected static $getIDByUsernameFromDB_cache = array();
-
-	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 if ($userID == 0) {
-			throw new IllegalArgumentException("userID cannot be 0, userID has to be > 0.");
-		} 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 = false;
-
-			//check, if guest user, because guest user doesnt exists in database
-			if ($this->userID !== -1) {
-				$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 && $this->userID == -1) {
-					//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
-		));
-
-		if (!$row) {
-			//get default authentificator
-			$authentificator = self::getDefaultAuthentificator();
-
-			$userID = $authentificator->checkPasswordAndImport($username, $password);
-
-			if ($userID == -1) {
-				//user not found
-			} else {
-				//user was imported now, get user row
-				$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `userID` = :userID AND `activated` = '1'; ", array(
-					'userID' => &$userID
-				));
-			}
-		}
-
-		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;
-		}
-	}
-
-	/**
-	 * check password of current user
-	 *
-	 * @param $password string password
-	 *
-	 * @throws IllegalStateException if user wasnt loaded before
-	 *
-	 * @return true, if password is correct
-	 */
-	public function checkPassword (string $password) : bool {
-		if ($this->row == null || empty($this->row)) {
-			throw new IllegalStateException("user wasnt loaded.");
-		}
-
-		//because password is not cached, we have to load it directly from database
-		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `userID` = :userID AND `activated` = '1'; ", array(
-			'userID' => $this->getID()
-		));
-
-		//get salt
-		$salt = $row['salt'];
-
-		//add salt to password
-		$password .= $salt;
-
-		return password_verify($password, $row['password']);
-	}
-
-	public function setPassword (string $password) {
-		if ($this->row == null || empty($this->row)) {
-			throw new IllegalStateException("user wasnt loaded.");
-		}
-
-		//validate password
-		$password = Validator_Password::get($password);
-
-		//create new salt
-		$salt = md5(PHPUtils::randomString(50));
-
-		//generate password hash
-		$hashed_password = self::hashPassword($password, $salt);
-
-		//update database
-		Database::getInstance()->execute("UPDATE `{praefix}user` SET `password` = :password, `salt` = :salt WHERE `userID` = :userID; ", array(
-			'password' => $hashed_password,
-			'salt' => $salt,
-			'userID' => $this->getID()
-		));
-
-		//clear cache
-		Cache::clear("user", "user-" . $this->getID());
-	}
-
-	protected function loginRow ($row, string $password) : array {
-		$res = array();
-
-		if (!$row) {
-			//user doesnt exists
-			$res['success'] = false;
-			$res['error'] = "user_not_exists";
-
-			return $res;
-		}
-
-		if ($row['userID'] <= 0) {
-			//user doesnt exists
-			$res['success'] = false;
-			$res['error'] = "not_permitted_user";
-
-			return $res;
-		}
-
-		//get authentificator
-		$authentificator = self::getAuthentificatorByID($row['userID']);
-
-		$auth_res = $authentificator->checkPasswordAndImport($row['username'], $password);
-
-		//check password
-		if ($auth_res !== -1) {
-			//password is correct
-
-			//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 hasTitle () : bool {
-		return $this->row['specific_title'] !== "none";
-	}
-
-	public function getTitle () : string {
-		if (!$this->hasTitle()) {
-			return Settings::get("user_default_title", "User");
-		}
-
-		return $this->row['specific_title'];
-	}
-
-	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;
+
+    protected static $default_authentificator = null;
+
+    protected static $getIDByUsernameFromDB_cache = array();
+
+    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 if ($userID == 0) {
+            throw new IllegalArgumentException("userID cannot be 0, userID has to be > 0.");
+        } 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 = false;
+
+            //check, if guest user, because guest user doesnt exists in database
+            if ($this->userID !== -1) {
+                $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 && $this->userID == -1) {
+                    //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
+        ));
+
+        if (!$row) {
+            //get default authentificator
+            $authentificator = self::getDefaultAuthentificator();
+
+            $userID = $authentificator->checkPasswordAndImport($username, $password);
+
+            if ($userID == -1) {
+                //user not found
+            } else {
+                //user was imported now, get user row
+                $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `userID` = :userID AND `activated` = '1'; ", array(
+                    'userID' => &$userID
+                ));
+            }
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * check password of current user
+     *
+     * @param $password string password
+     *
+     * @throws IllegalStateException if user wasnt loaded before
+     *
+     * @return true, if password is correct
+     */
+    public function checkPassword (string $password) : bool {
+        if ($this->row == null || empty($this->row)) {
+            throw new IllegalStateException("user wasnt loaded.");
+        }
+
+        //because password is not cached, we have to load it directly from database
+        $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `userID` = :userID AND `activated` = '1'; ", array(
+            'userID' => $this->getID()
+        ));
+
+        //get salt
+        $salt = $row['salt'];
+
+        //add salt to password
+        $password .= $salt;
+
+        return password_verify($password, $row['password']);
+    }
+
+    public function setPassword (string $password) {
+        if ($this->row == null || empty($this->row)) {
+            throw new IllegalStateException("user wasnt loaded.");
+        }
+
+        //validate password
+        $password = Validator_Password::get($password);
+
+        //create new salt
+        $salt = md5(PHPUtils::randomString(50));
+
+        //generate password hash
+        $hashed_password = self::hashPassword($password, $salt);
+
+        //update database
+        Database::getInstance()->execute("UPDATE `{praefix}user` SET `password` = :password, `salt` = :salt WHERE `userID` = :userID; ", array(
+            'password' => $hashed_password,
+            'salt' => $salt,
+            'userID' => $this->getID()
+        ));
+
+        //clear cache
+        Cache::clear("user", "user-" . $this->getID());
+    }
+
+    protected function loginRow ($row, string $password) : array {
+        $res = array();
+
+        if (!$row) {
+            //user doesnt exists
+            $res['success'] = false;
+            $res['error'] = "user_not_exists";
+
+            return $res;
+        }
+
+        if ($row['userID'] <= 0) {
+            //user doesnt exists
+            $res['success'] = false;
+            $res['error'] = "not_permitted_user";
+
+            return $res;
+        }
+
+        //get authentificator
+        $authentificator = self::getAuthentificatorByID($row['userID']);
+
+        $auth_res = $authentificator->checkPasswordAndImport($row['username'], $password);
+
+        //check password
+        if ($auth_res !== -1) {
+            //password is correct
+
+            //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 hasTitle () : bool {
+        return $this->row['specific_title'] !== "none";
+    }
+
+    public function getTitle () : string {
+        if (!$this->hasTitle()) {
+            return Settings::get("user_default_title", "User");
+        }
+
+        return $this->row['specific_title'];
+    }
+
+    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, string $authentificator = "LocalAuthentificator", string $owner = "system") {
-		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, string $authentificator = "LocalAuthentificator", string $owner = "system") {
+        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`, `authentificator`, `owner`, `registered`, `activated`
 		) VALUES (
 			NULL, :username, :password, :salt, :mail, :ip, :main_group, :title, '0', '0000-00-00 00:00:00', :authentificator, :owner, CURRENT_TIMESTAMP , :activated
 		)", array(
-			'username' => $username,
-			'password' => $hashed_password,
-			'salt' => $salt,
-			'mail' => $mail,
-			'ip' => $ip,
-			'main_group' => $main_group,
-			'title' => $specific_title,
-			'authentificator' => $authentificator,
-			'owner' => $owner,
-			'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 {
-		//use in-memory cache to avoid a large amount of sql queries on setup scripts
-		if (isset(self::$getIDByUsernameFromDB_cache[$username])) {
-			return self::$getIDByUsernameFromDB_cache[$username];
-		}
-
-		//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);
-		}
-
-		$userID = $row['userID'];
-		self::$getIDByUsernameFromDB_cache[$username] = $userID;
-
-		return $userID;
-	}
-
-	public static function &getAuthentificatorByID (int $userID = -1) {
-		if ($userID == -1) {
-			//get default authentificator
-			return self::getDefaultAuthentificator();
-		} else {
-			//get authentificator class
-
-			//check, if user exists
-			if (!self::existsUserID($userID)) {
-				throw new IllegalStateException("user with userID '" . $userID . "' doesnt exists.");
-			}
-
-			$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `userID` = :userID AND `activated` = '1'; ", array(
-				'userID' => &$userID
-			));
-
-			$class_name = $row['authentificator'];
-			$obj = new $class_name();
-
-			return $obj;
-		}
-	}
-
-	public static function &getAuthentificatorByUsername (string $username = "") {
-		if ($username == null || empty($username)) {
-			//get default authentificator
-			return self::getDefaultAuthentificator();
-		} else {
-			//get authentificator class
-
-			//check, if user exists
-			if (!self::existsUsername($username)) {
-				throw new IllegalStateException("user with username '" . $username . "' doesnt exists.");
-			}
-
-			$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `username` = :username AND `activated` = '1'; ", array(
-				'username' => &$username
-			));
-
-			$class_name = $row['authentificator'];
-			$obj = new $class_name();
-
-			return $obj;
-		}
-	}
-
-	public static function &getDefaultAuthentificator () : IAuthentificator {
-		if (self::$default_authentificator == null) {
-			$class_name = Settings::get("default_authentificator", "LocalAuthentificator");
-			$obj = new $class_name();
-
-			self::$default_authentificator = $obj;
-		}
-
-		return self::$default_authentificator;
-	}
-
-	/**
-	 * 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,
+            'authentificator' => $authentificator,
+            'owner' => $owner,
+            '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 {
+        //use in-memory cache to avoid a large amount of sql queries on setup scripts
+        if (isset(self::$getIDByUsernameFromDB_cache[$username])) {
+            return self::$getIDByUsernameFromDB_cache[$username];
+        }
+
+        //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);
+        }
+
+        $userID = $row['userID'];
+        self::$getIDByUsernameFromDB_cache[$username] = $userID;
+
+        return $userID;
+    }
+
+    public static function &getAuthentificatorByID (int $userID = -1) {
+        if ($userID == -1) {
+            //get default authentificator
+            return self::getDefaultAuthentificator();
+        } else {
+            //get authentificator class
+
+            //check, if user exists
+            if (!self::existsUserID($userID)) {
+                throw new IllegalStateException("user with userID '" . $userID . "' doesnt exists.");
+            }
+
+            $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `userID` = :userID AND `activated` = '1'; ", array(
+                'userID' => &$userID
+            ));
+
+            $class_name = $row['authentificator'];
+            $obj = new $class_name();
+
+            return $obj;
+        }
+    }
+
+    public static function &getAuthentificatorByUsername (string $username = "") {
+        if ($username == null || empty($username)) {
+            //get default authentificator
+            return self::getDefaultAuthentificator();
+        } else {
+            //get authentificator class
+
+            //check, if user exists
+            if (!self::existsUsername($username)) {
+                throw new IllegalStateException("user with username '" . $username . "' doesnt exists.");
+            }
+
+            $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}user` WHERE `username` = :username AND `activated` = '1'; ", array(
+                'username' => &$username
+            ));
+
+            $class_name = $row['authentificator'];
+            $obj = new $class_name();
+
+            return $obj;
+        }
+    }
+
+    public static function &getDefaultAuthentificator () : IAuthentificator {
+        if (self::$default_authentificator == null) {
+            $class_name = Settings::get("default_authentificator", "LocalAuthentificator");
+            $obj = new $class_name();
+
+            self::$default_authentificator = $obj;
+        }
+
+        return self::$default_authentificator;
+    }
+
+    /**
+     * 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;
+    }
 
 }
 

store/package_list.php

Indentation +35 added lines, -35 removed lines

@@ -7,41 +7,41 @@
 
 $package_list = array(
     'com.jukusoft.cms.db.upgrader' => true,
-	'com.jukusoft.cms.domain' => true,
-	'com.jukusoft.cms.settings' => true,
-	'com.jukusoft.cms.apimethods' => true,
-	'com.jukusoft.cms.xtpl' => true,
-	'com.jukusoft.cms.robots' => true,
-	'com.jukusoft.cms.style' => true,
-	'com.jukusoft.cms.browser' => true,
-	'com.jukusoft.cms.lang' => true,
-	'com.jukusoft.cms.folder' => true,
-	'com.jukusoft.cms.style' => true,
-	'com.jukusoft.cms.test' => true,
-	'com.jukusoft.cms.page' => true,
-	'com.jukusoft.cms.menu' => true,
-	'com.jukusoft.cms.htmlpage' => true,
-	'com.jukusoft.cms.user' => true,
-	'com.jukusoft.cms.groups' => true,
-	'com.jukusoft.cms.dashboard' => true,
-	'com.jukusoft.cms.cssbuilder' => true,
-	'com.jukusoft.cms.jsbuilder' => true,
-	'com.jukusoft.cms.version' => true,
-	'com.jukusoft.cms.permissions' => true,
-	'com.jukusoft.cms.dwoo' => true,
-	'com.jukusoft.cms.sitemap' => true,
-	'com.jukusoft.cms.tools' => true,
-	'com.jukusoft.cms.captcha' => true,
-	'com.jukusoft.cms.mail' => true,
-	'com.jukusoft.cms.plugin' => true,
-	'com.jukusoft.cms.tasks' => true,
-	'com.jukusoft.cms.preferences' => true,
-	'com.jukusoft.cms.ldap' => true,
-	'com.jukusoft.cms.api' => true,
-	'com.jukusoft.cms.logging' => true,
-	'com.jukusoft.cms.widgets' => true,
-	'com.jukusoft.cms.sidebar' => true,
-	'com.jukusoft.cms.admin' => true,
+    'com.jukusoft.cms.domain' => true,
+    'com.jukusoft.cms.settings' => true,
+    'com.jukusoft.cms.apimethods' => true,
+    'com.jukusoft.cms.xtpl' => true,
+    'com.jukusoft.cms.robots' => true,
+    'com.jukusoft.cms.style' => true,
+    'com.jukusoft.cms.browser' => true,
+    'com.jukusoft.cms.lang' => true,
+    'com.jukusoft.cms.folder' => true,
+    'com.jukusoft.cms.style' => true,
+    'com.jukusoft.cms.test' => true,
+    'com.jukusoft.cms.page' => true,
+    'com.jukusoft.cms.menu' => true,
+    'com.jukusoft.cms.htmlpage' => true,
+    'com.jukusoft.cms.user' => true,
+    'com.jukusoft.cms.groups' => true,
+    'com.jukusoft.cms.dashboard' => true,
+    'com.jukusoft.cms.cssbuilder' => true,
+    'com.jukusoft.cms.jsbuilder' => true,
+    'com.jukusoft.cms.version' => true,
+    'com.jukusoft.cms.permissions' => true,
+    'com.jukusoft.cms.dwoo' => true,
+    'com.jukusoft.cms.sitemap' => true,
+    'com.jukusoft.cms.tools' => true,
+    'com.jukusoft.cms.captcha' => true,
+    'com.jukusoft.cms.mail' => true,
+    'com.jukusoft.cms.plugin' => true,
+    'com.jukusoft.cms.tasks' => true,
+    'com.jukusoft.cms.preferences' => true,
+    'com.jukusoft.cms.ldap' => true,
+    'com.jukusoft.cms.api' => true,
+    'com.jukusoft.cms.logging' => true,
+    'com.jukusoft.cms.widgets' => true,
+    'com.jukusoft.cms.sidebar' => true,
+    'com.jukusoft.cms.admin' => true,
 );
 
 ?>

system/packages/com.jukusoft.cms.settings/classes/settingscategory.php

Spacing +10 added lines, -10 removed lines

@@ -33,27 +33,27 @@ 
 		//
 	}
 
-	public function load ($row) {
+	public function load($row) {
 		$this->row = $row;
 	}
 
-	public function getCategory () : string {
+	public function getCategory() : string {
 		return $this->row['category'];
 	}
 
-	public function getTitle () : string {
+	public function getTitle() : string {
 		return $this->row['title'];
 	}
 
-	public function getOwner () : string {
+	public function getOwner() : string {
 		return $this->row['owner'];
 	}
 
-	public function getOrder () : int {
+	public function getOrder() : int {
 		return $this->row['order'];
 	}
 
-	public static function createIfAbsent (string $category, string $title, int $order = 10, string $owner = "system") {
+	public static function createIfAbsent(string $category, string $title, int $order = 10, string $owner = "system") {
 		Database::getInstance()->execute("INSERT INTO `{praefix}global_settings_category` (
 			`category`, `title`, `owner`, `order`
 		) VALUES (
@@ -69,7 +69,7 @@ 
 		Cache::clear("setting_categories");
 	}
 
-	public static function remove (string $category) {
+	public static function remove(string $category) {
 		Database::getInstance()->execute("DELETE FROM `{praefix}global_settings_category` WHERE `category` = :category; ", array(
 			'category' => $category
 		));
@@ -78,7 +78,7 @@ 
 		Cache::clear("setting_categories");
 	}
 
-	public static function removeByOwner (string $owner) {
+	public static function removeByOwner(string $owner) {
 		Database::getInstance()->execute("DELETE FROM `{praefix}global_settings_category` WHERE `owner` = :owner; ", array(
 			'owner' => $owner
 		));
@@ -87,7 +87,7 @@ 
 		Cache::clear("setting_categories");
 	}
 
-	public static function listAllCategories () : array {
+	public static function listAllCategories() : array {
 		$rows = array();
 		$list = array();
 
@@ -113,7 +113,7 @@ 
 		return $list;
 	}
 
-	public static function cast (SettingsCategory $category) : SettingsCategory {
+	public static function cast(SettingsCategory $category) : SettingsCategory {
 		return $category;
 	}
 

Indentation +78 added lines, -78 removed lines

@@ -27,95 +27,95 @@
 
 class SettingsCategory {
 
-	protected $row = array();
+    protected $row = array();
 
-	public function __construct() {
-		//
-	}
+    public function __construct() {
+        //
+    }
 
-	public function load ($row) {
-		$this->row = $row;
-	}
+    public function load ($row) {
+        $this->row = $row;
+    }
 
-	public function getCategory () : string {
-		return $this->row['category'];
-	}
+    public function getCategory () : string {
+        return $this->row['category'];
+    }
 
-	public function getTitle () : string {
-		return $this->row['title'];
-	}
+    public function getTitle () : string {
+        return $this->row['title'];
+    }
 
-	public function getOwner () : string {
-		return $this->row['owner'];
-	}
+    public function getOwner () : string {
+        return $this->row['owner'];
+    }
 
-	public function getOrder () : int {
-		return $this->row['order'];
-	}
+    public function getOrder () : int {
+        return $this->row['order'];
+    }
 
-	public static function createIfAbsent (string $category, string $title, int $order = 10, string $owner = "system") {
-		Database::getInstance()->execute("INSERT INTO `{praefix}global_settings_category` (
+    public static function createIfAbsent (string $category, string $title, int $order = 10, string $owner = "system") {
+        Database::getInstance()->execute("INSERT INTO `{praefix}global_settings_category` (
 			`category`, `title`, `owner`, `order`
 		) VALUES (
 			  :category, :title, :owner, :order
 		) ON DUPLICATE KEY UPDATE `title` = :title, `owner` = :owner, `order` = :order; ", array(
-			'category' => $category,
-			'title' => $title,
-			'owner' => $owner,
-			'order' => $order
-		));
-
-		//clear cache
-		Cache::clear("setting_categories");
-	}
-
-	public static function remove (string $category) {
-		Database::getInstance()->execute("DELETE FROM `{praefix}global_settings_category` WHERE `category` = :category; ", array(
-			'category' => $category
-		));
-
-		//clear cache
-		Cache::clear("setting_categories");
-	}
-
-	public static function removeByOwner (string $owner) {
-		Database::getInstance()->execute("DELETE FROM `{praefix}global_settings_category` WHERE `owner` = :owner; ", array(
-			'owner' => $owner
-		));
-
-		//clear cache
-		Cache::clear("setting_categories");
-	}
-
-	public static function listAllCategories () : array {
-		$rows = array();
-		$list = array();
-
-		if (Cache::contains("setting_categories", "list")) {
-			$rows = Cache::get("setting_categories", "list");
-		} else {
-			//get categories from database
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}global_settings_category` ORDER BY `order`; ");
-
-			//store values in cache
-			Cache::put("setting_categories", "list", $rows);
-		}
-
-		foreach ($rows as $row) {
-			//create new instance of category and load row
-			$category = new SettingsCategory();
-			$category->load($row);
-
-			//add category to list
-			$list[] = $category;
-		}
-
-		return $list;
-	}
-
-	public static function cast (SettingsCategory $category) : SettingsCategory {
-		return $category;
-	}
+            'category' => $category,
+            'title' => $title,
+            'owner' => $owner,
+            'order' => $order
+        ));
+
+        //clear cache
+        Cache::clear("setting_categories");
+    }
+
+    public static function remove (string $category) {
+        Database::getInstance()->execute("DELETE FROM `{praefix}global_settings_category` WHERE `category` = :category; ", array(
+            'category' => $category
+        ));
+
+        //clear cache
+        Cache::clear("setting_categories");
+    }
+
+    public static function removeByOwner (string $owner) {
+        Database::getInstance()->execute("DELETE FROM `{praefix}global_settings_category` WHERE `owner` = :owner; ", array(
+            'owner' => $owner
+        ));
+
+        //clear cache
+        Cache::clear("setting_categories");
+    }
+
+    public static function listAllCategories () : array {
+        $rows = array();
+        $list = array();
+
+        if (Cache::contains("setting_categories", "list")) {
+            $rows = Cache::get("setting_categories", "list");
+        } else {
+            //get categories from database
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}global_settings_category` ORDER BY `order`; ");
+
+            //store values in cache
+            Cache::put("setting_categories", "list", $rows);
+        }
+
+        foreach ($rows as $row) {
+            //create new instance of category and load row
+            $category = new SettingsCategory();
+            $category->load($row);
+
+            //add category to list
+            $list[] = $category;
+        }
+
+        return $list;
+    }
+
+    public static function cast (SettingsCategory $category) : SettingsCategory {
+        return $category;
+    }
 
 }
 

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

Indentation +309 added lines, -309 removed lines

@@ -27,348 +27,348 @@
 
 class Menu {
 
-	//menu ID (table menu_names)
-	protected $menuID = -1;
-
-	//name of template
-	protected $template = "";
-
-	//menu structure
-	protected static $menuID_array = array();
-
-	protected $menus = array();
-
-	public function __construct (int $menuID = -1, string $template = "menu") {
-		$this->menuID = (int) $menuID;
-		$this->template = $template;
-	}
-
-	public function loadMenu (int $menuID = -1, Folder $folder) {
-		if ($menuID == -1) {
-			$menuID = $this->menuID;
-		}
-
-		if ($menuID == -1) {
-			//we dont need to load anything, because no menu is selected
-			$this->menus = array();
-		}
-
-		Events::throwEvent("before_load_menu", array(
-			'menuID' => &$menuID,
-			'instance' => &$this
-		));
-
-		//load menuID if absent
-		self::loadMenuID($menuID);
-
-		if (Cache::contains("menus", "menu_" . $menuID . "_" . User::current()->getID())) {
-			$this->menus = Cache::get("menus", "menu_" . $menuID . "_" . User::current()->getID());
-		} else {
-			$menu_cache = self::$menuID_array[$menuID];
-
-			//get menu by parent -y, this means root menu
-			$this->menus = $this->getMenuByParent($menu_cache, -1, $folder);
-
-			Events::throwEvent("after_load_menu", array(
-				'menuID' => &$menuID,
-				'instance' => &$this,
-				'menus' => &$this->menus,
-				'menu_cache' => $menu_cache
-			));
-
-			Cache::put("menus", "menu_" . $menuID . "_" . User::current()->getID(), $this->menus);
-		}
-
-		$this->menuID = $menuID;
-	}
-
-	protected function getMenuByParent (array &$menu_array, int $parentID, Folder $folder) : array {
-		if (!isset($menu_array[$parentID])) {
-			//menu doesnt have submenus
-			return array();
-		}
-
-		$array = array();
-
-		foreach ($menu_array[$parentID] as $row) {
-			//check login_required
-			if ($row['login_required'] == 1 && !User::current()->isLoggedIn()) {
-				//dont show this menu
-				continue;
-			}
-
-			//check permissions
-			$permissions = explode("|", $row['permissions']);
-			$has_permission = false;
-
-			foreach ($permissions as $permission) {
-				if (PermissionChecker::current()->hasRight($permission)) {
-					$has_permission = true;
-					break;
-				}
-			}
-
-			if (!$has_permission) {
-				//dont show this menu, because user doesnt have permission for this menu
-				continue;
-			}
-
-			$entry = array();
-
-			//translate title
-			if ($folder->isTitleTranslationEnabled()) {
-				$row['title'] = Translator::translateTitle($row['title']);
-			}
-
-			$href = "";
-			$entry['append'] = "";
-			$entry['title'] = $row['title'];
-			$entry['text'] = $row['title'];
-			$entry['icon'] = $row['icon'];
-			$entry['icon_class'] = " " . $row['icon'];
-			$entry['permissions'] = explode("|", $row['permissions']);
-			$entry['append'] = "";
-			$entry['extension_code'] = "";
-
-			if (strpos($row['url'], "LOGIN_URL") !== FALSE) {
-				$row['url'] = Registry::singleton()->getSetting("login_url");
-			}
-
-			if (strpos($row['url'], "LOGOUT_URL") !== FALSE) {
-				$row['url'] = Registry::singleton()->getSetting("logout_url");
-			}
-
-			if ($row['type'] == "page") {
-				$href = DomainUtils::generateURL($row['url']);
-			} else if ($row['type'] == "link") {
-				//TODO: add base url
-				$href = $row['url'];
-			} else if ($row['type'] == "external_link") {
-				$href = $row['url'];
-			} else if ($row['type'] == "js_link") {
-				$href = "#";
-				$entry['append'] = " onclick=\"" . $row['url'] . "\"";
-			} else if ($row['type'] == "no_link") {
-				$href = "#";
-			} else if ($row['type'] == "dynamic_link") {
-				$href = "#";
-
-				if (PHPUtils::startsWith($row['url'], "settings:")) {
-					$array1 = explode(":", $row['url']);
-					$href = Settings::get($array1[1], "#");
-				} else if (PHPUtils::startsWith($row['url'], "registry:")) {
-					$array1 = explode(":", $row['url']);
-					$href = Registry::singleton()->getSetting($array1[1], "#");
-				}
-			} else {
-				throw new IllegalStateException("Unknown menu type: " . $row['type']);
-			}
-
-			$entry['href'] = $href;
-
-			if (!empty($row['icon']) && $row['icon'] != "none") {
-				$entry['text'] = "<img src=\"" . $row['icon'] . "\" alt=\"" . $row['title'] . "\" title=\"" . $row['title'] . "\" style=\"max-width:32px; max-height:32px; \" /> " . $row['title'];
-			}
-
-			//get submenus
-			$entry['submenus'] = $this->getMenuByParent($menu_array, $row['id'], $folder);
-			$entry['has_submenus'] = sizeof($entry['submenus']) > 0;
-
-			$array[] = $entry;
-		}
-
-		return $array;
-	}
-
-	/**
-	 * get HTML code of menu
-	 */
-	public function getCode () : string {
-		$template = new DwooTemplate($this->template);
-
-		$template->assign("menu_array", $this->menus);
-
-		/*$template = new Template($this->template);
+    //menu ID (table menu_names)
+    protected $menuID = -1;
+
+    //name of template
+    protected $template = "";
+
+    //menu structure
+    protected static $menuID_array = array();
+
+    protected $menus = array();
+
+    public function __construct (int $menuID = -1, string $template = "menu") {
+        $this->menuID = (int) $menuID;
+        $this->template = $template;
+    }
+
+    public function loadMenu (int $menuID = -1, Folder $folder) {
+        if ($menuID == -1) {
+            $menuID = $this->menuID;
+        }
+
+        if ($menuID == -1) {
+            //we dont need to load anything, because no menu is selected
+            $this->menus = array();
+        }
+
+        Events::throwEvent("before_load_menu", array(
+            'menuID' => &$menuID,
+            'instance' => &$this
+        ));
+
+        //load menuID if absent
+        self::loadMenuID($menuID);
+
+        if (Cache::contains("menus", "menu_" . $menuID . "_" . User::current()->getID())) {
+            $this->menus = Cache::get("menus", "menu_" . $menuID . "_" . User::current()->getID());
+        } else {
+            $menu_cache = self::$menuID_array[$menuID];
+
+            //get menu by parent -y, this means root menu
+            $this->menus = $this->getMenuByParent($menu_cache, -1, $folder);
+
+            Events::throwEvent("after_load_menu", array(
+                'menuID' => &$menuID,
+                'instance' => &$this,
+                'menus' => &$this->menus,
+                'menu_cache' => $menu_cache
+            ));
+
+            Cache::put("menus", "menu_" . $menuID . "_" . User::current()->getID(), $this->menus);
+        }
+
+        $this->menuID = $menuID;
+    }
+
+    protected function getMenuByParent (array &$menu_array, int $parentID, Folder $folder) : array {
+        if (!isset($menu_array[$parentID])) {
+            //menu doesnt have submenus
+            return array();
+        }
+
+        $array = array();
+
+        foreach ($menu_array[$parentID] as $row) {
+            //check login_required
+            if ($row['login_required'] == 1 && !User::current()->isLoggedIn()) {
+                //dont show this menu
+                continue;
+            }
+
+            //check permissions
+            $permissions = explode("|", $row['permissions']);
+            $has_permission = false;
+
+            foreach ($permissions as $permission) {
+                if (PermissionChecker::current()->hasRight($permission)) {
+                    $has_permission = true;
+                    break;
+                }
+            }
+
+            if (!$has_permission) {
+                //dont show this menu, because user doesnt have permission for this menu
+                continue;
+            }
+
+            $entry = array();
+
+            //translate title
+            if ($folder->isTitleTranslationEnabled()) {
+                $row['title'] = Translator::translateTitle($row['title']);
+            }
+
+            $href = "";
+            $entry['append'] = "";
+            $entry['title'] = $row['title'];
+            $entry['text'] = $row['title'];
+            $entry['icon'] = $row['icon'];
+            $entry['icon_class'] = " " . $row['icon'];
+            $entry['permissions'] = explode("|", $row['permissions']);
+            $entry['append'] = "";
+            $entry['extension_code'] = "";
+
+            if (strpos($row['url'], "LOGIN_URL") !== FALSE) {
+                $row['url'] = Registry::singleton()->getSetting("login_url");
+            }
+
+            if (strpos($row['url'], "LOGOUT_URL") !== FALSE) {
+                $row['url'] = Registry::singleton()->getSetting("logout_url");
+            }
+
+            if ($row['type'] == "page") {
+                $href = DomainUtils::generateURL($row['url']);
+            } else if ($row['type'] == "link") {
+                //TODO: add base url
+                $href = $row['url'];
+            } else if ($row['type'] == "external_link") {
+                $href = $row['url'];
+            } else if ($row['type'] == "js_link") {
+                $href = "#";
+                $entry['append'] = " onclick=\"" . $row['url'] . "\"";
+            } else if ($row['type'] == "no_link") {
+                $href = "#";
+            } else if ($row['type'] == "dynamic_link") {
+                $href = "#";
+
+                if (PHPUtils::startsWith($row['url'], "settings:")) {
+                    $array1 = explode(":", $row['url']);
+                    $href = Settings::get($array1[1], "#");
+                } else if (PHPUtils::startsWith($row['url'], "registry:")) {
+                    $array1 = explode(":", $row['url']);
+                    $href = Registry::singleton()->getSetting($array1[1], "#");
+                }
+            } else {
+                throw new IllegalStateException("Unknown menu type: " . $row['type']);
+            }
+
+            $entry['href'] = $href;
+
+            if (!empty($row['icon']) && $row['icon'] != "none") {
+                $entry['text'] = "<img src=\"" . $row['icon'] . "\" alt=\"" . $row['title'] . "\" title=\"" . $row['title'] . "\" style=\"max-width:32px; max-height:32px; \" /> " . $row['title'];
+            }
+
+            //get submenus
+            $entry['submenus'] = $this->getMenuByParent($menu_array, $row['id'], $folder);
+            $entry['has_submenus'] = sizeof($entry['submenus']) > 0;
+
+            $array[] = $entry;
+        }
+
+        return $array;
+    }
+
+    /**
+     * get HTML code of menu
+     */
+    public function getCode () : string {
+        $template = new DwooTemplate($this->template);
+
+        $template->assign("menu_array", $this->menus);
+
+        /*$template = new Template($this->template);
 
 		$this->parseMenu($this->menus, $template);
 
 		//parse main block
 		$template->parse("main");*/
 
-		$html = $template->getCode();
+        $html = $template->getCode();
 
-		Events::throwEvent("get_menu_code", array(
-			'menuID' => $this->menuID,
-			'menus' => &$this->menus,
-			'html' => &$html
-		));
+        Events::throwEvent("get_menu_code", array(
+            'menuID' => $this->menuID,
+            'menus' => &$this->menus,
+            'html' => &$html
+        ));
 
-		return $html;
-	}
+        return $html;
+    }
 
-	protected static function loadMenuID (int $menuID) {
-		if (isset(self::$menuID_array[$menuID])) {
-			return;
-		}
+    protected static function loadMenuID (int $menuID) {
+        if (isset(self::$menuID_array[$menuID])) {
+            return;
+        }
 
-		if (Cache::contains("menus", "menuID_" . $menuID)) {
-			self::$menuID_array[$menuID] = Cache::get("menus", "menuID_" . $menuID);
-		} else {
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}menu` WHERE `menuID` = :menuID AND `activated` = '1' ORDER BY `order`; ", array('menuID' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $menuID
-			)));
+        if (Cache::contains("menus", "menuID_" . $menuID)) {
+            self::$menuID_array[$menuID] = Cache::get("menus", "menuID_" . $menuID);
+        } else {
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}menu` WHERE `menuID` = :menuID AND `activated` = '1' ORDER BY `order`; ", array('menuID' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $menuID
+            )));
 
-			$array = array();
+            $array = array();
 
-			foreach ($rows as $row) {
-				$parentID = $row['parent'];
+            foreach ($rows as $row) {
+                $parentID = $row['parent'];
 
-				if (!isset($array[$parentID])) {
-					$array[$parentID] = array();
-				}
+                if (!isset($array[$parentID])) {
+                    $array[$parentID] = array();
+                }
 
-				$array[$parentID][] = $row;
-			}
+                $array[$parentID][] = $row;
+            }
 
-			self::$menuID_array[$menuID] = $array;
+            self::$menuID_array[$menuID] = $array;
 
-			Cache::put("menus", "menuID_" . $menuID, $array);
-		}
+            Cache::put("menus", "menuID_" . $menuID, $array);
+        }
 
-		//var_dump(self::$menuID_array);
-	}
+        //var_dump(self::$menuID_array);
+    }
 
-	public static function createMenuName (string $title, string $unique_name = null) : int {
-		Events::throwEvent("before_create_menu_name", array(
-			'title' => &$title
-		));
+    public static function createMenuName (string $title, string $unique_name = null) : int {
+        Events::throwEvent("before_create_menu_name", array(
+            'title' => &$title
+        ));
 
-		if ($unique_name == null) {
-			$unique_name = md5(PHPUtils::randomString(100));
-		}
+        if ($unique_name == null) {
+            $unique_name = md5(PHPUtils::randomString(100));
+        }
 
-		$unique_name = Validator_String::get($unique_name);
+        $unique_name = Validator_String::get($unique_name);
 
-		Database::getInstance()->execute("INSERT INTO `{praefix}menu_names` (
+        Database::getInstance()->execute("INSERT INTO `{praefix}menu_names` (
 			`menuID`, `title`, `unique_name`, `activated`
 		) VALUES (
 			NULL, :title, :name, '1'
 		) ON DUPLICATE KEY UPDATE `title` = :title, `activated` = '1'; ", array(
-			'title' => $title,
-			'name' => $unique_name
-		));
-
-		Cache::clear("menus");
-
-		//get menuID of inserted menu name
-		$menuID = Database::getInstance()->lastInsertId();
-
-		Events::throwEvent("after_created_menu_name", array(
-			'menuID' => $menuID,
-			'title' => &$title
-		));
-
-		return $menuID;
-	}
-
-	public static function deleteMenuName (int $menuID) {
-		Database::getInstance()->execute("DELETE FROM `{praefix}menu_names` WHERE `menuID` = :menuID; ", array(
-			'menuID' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $menuID
-			)
-		));
-
-		//clear cache
-		Cache::clear("menus", "menuID_" . $menuID);
-	}
-
-	public static function listMenuNames () : array {
-		if (Cache::contains("menus", "menu_names")) {
-			return Cache::get("menus", "menu_names");
-		} else {
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}menu_names` WHERE `activated` = 1; ");
-
-			Cache::put("menus", "menu_names", $rows);
-
-			return $rows;
-		}
-	}
-
-	public static function createMenu (int $id, int $menuID, string $title, string $url, int $parent = -1, string $unique_name = "", $type = "page", $permissions = array("all"), $login_required = false, string $icon = "none", int $order = 100, string $owner = "user") {
-		if (!is_array($permissions)) {
-			$permissions = array($permissions);
-		}
-
-		//validate values
-		$id = Validator_Int::get($id);
-		$menuID = Validator_Int::get($menuID);
-		$title = Validator_String::get($title);
-		$parent = Validator_Int::get($parent);
-		$type = Validator_String::get($type);
-		$login_required = (bool) $login_required;
-
-		$permissions = implode("|", $permissions);
-
-		if (is_null($unique_name) || empty($unique_name)) {
-			$unique_name = md5(PHPUtils::randomString(100) . time());
-		}
-
-		if ($id != null && $id != -1) {
-			$insertID = Database::getInstance()->execute("INSERT INTO `{praefix}menu` (
+            'title' => $title,
+            'name' => $unique_name
+        ));
+
+        Cache::clear("menus");
+
+        //get menuID of inserted menu name
+        $menuID = Database::getInstance()->lastInsertId();
+
+        Events::throwEvent("after_created_menu_name", array(
+            'menuID' => $menuID,
+            'title' => &$title
+        ));
+
+        return $menuID;
+    }
+
+    public static function deleteMenuName (int $menuID) {
+        Database::getInstance()->execute("DELETE FROM `{praefix}menu_names` WHERE `menuID` = :menuID; ", array(
+            'menuID' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $menuID
+            )
+        ));
+
+        //clear cache
+        Cache::clear("menus", "menuID_" . $menuID);
+    }
+
+    public static function listMenuNames () : array {
+        if (Cache::contains("menus", "menu_names")) {
+            return Cache::get("menus", "menu_names");
+        } else {
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}menu_names` WHERE `activated` = 1; ");
+
+            Cache::put("menus", "menu_names", $rows);
+
+            return $rows;
+        }
+    }
+
+    public static function createMenu (int $id, int $menuID, string $title, string $url, int $parent = -1, string $unique_name = "", $type = "page", $permissions = array("all"), $login_required = false, string $icon = "none", int $order = 100, string $owner = "user") {
+        if (!is_array($permissions)) {
+            $permissions = array($permissions);
+        }
+
+        //validate values
+        $id = Validator_Int::get($id);
+        $menuID = Validator_Int::get($menuID);
+        $title = Validator_String::get($title);
+        $parent = Validator_Int::get($parent);
+        $type = Validator_String::get($type);
+        $login_required = (bool) $login_required;
+
+        $permissions = implode("|", $permissions);
+
+        if (is_null($unique_name) || empty($unique_name)) {
+            $unique_name = md5(PHPUtils::randomString(100) . time());
+        }
+
+        if ($id != null && $id != -1) {
+            $insertID = Database::getInstance()->execute("INSERT INTO `{praefix}menu` (
 				`id`, `menuID`, `title`, `url`, `type`, `icon`, `permissions`, `login_required`, `parent`, `unique_name`, `extensions`, `order`, `owner`, `activated`
 			) VALUES (
 				:id, :menuID, :title, :url, :url_type, :icon, :permissions, :login_required, :parent, :unique_name, :extensions, :menu_order, :owner, '1'
 			) ON DUPLICATE KEY UPDATE `menuID` = :menuID, `title` = :title, `url` = :url, `type` = :url_type, `permissions` = :permissions, `login_required` = :login_required, `parent` = :parent, `unique_name` = :unique_name, `extensions` = :extensions, `order` = :menu_order, `owner` = :owner, `icon` = :icon, `activated` = '1'; ", array(
-				'id' => $id,
-				'menuID' => $menuID,
-				'title' => $title,
-				'url' => $url,
-				'url_type' => $type,
-				'icon' => $icon,
-				'permissions' => $permissions,
-				'login_required' => ($login_required ? 1 : 0),
-				'parent' => $parent,
-				'unique_name' => $unique_name,
-				'extensions' => "none",
-				'menu_order' => $order,
-				'owner' => $owner
-			));
-		} else {
-			$insertID = Database::getInstance()->execute("INSERT INTO `{praefix}menu` (
+                'id' => $id,
+                'menuID' => $menuID,
+                'title' => $title,
+                'url' => $url,
+                'url_type' => $type,
+                'icon' => $icon,
+                'permissions' => $permissions,
+                'login_required' => ($login_required ? 1 : 0),
+                'parent' => $parent,
+                'unique_name' => $unique_name,
+                'extensions' => "none",
+                'menu_order' => $order,
+                'owner' => $owner
+            ));
+        } else {
+            $insertID = Database::getInstance()->execute("INSERT INTO `{praefix}menu` (
 				`id`, `menuID`, `title`, `url`, `type`, `icon`, `permissions`, `login_required`, `parent`, `unique_name`, `extensions`, `order`, `owner`, `activated`
 			) VALUES (
 				NULL, :menuID, :title, :url, :url_type, :icon, :permissions, :login_required, :parent, :unique_name, :extensions, :menu_order, :owner, '1'
 			) ON DUPLICATE KEY UPDATE `menuID` = :menuID, `title` = :title, `url` = :url, `type` = :url_type, `permissions` = :permissions, `login_required` = :login_required, `parent` = :parent, `unique_name` = :unique_name, `extensions` = :extensions, `order` = :menu_order, `owner` = :owner, `icon` = :icon, `activated` = '1'; ", array(
-				'menuID' => $menuID,
-				'title' => $title,
-				'url' => $url,
-				'url_type' => $type,
-				'icon' => $icon,
-				'permissions' => $permissions,
-				'login_required' => ($login_required ? 1 : 0),
-				'parent' => $parent,
-				'unique_name' => $unique_name,
-				'extensions' => "none",
-				'menu_order' => $order,
-				'owner' => $owner
-			));
-		}
-
-		//clear cache
-		Cache::clear("menus", "menuID_" . $menuID);
-
-		return $insertID;
-	}
-
-	public static function deleteMenusByOwner (string $owner) {
-		//delete menus from database
-		Database::getInstance()->execute("DELETE FROM `{praefix}menu` WHERE `owner` = :owner; ", array('owner' => $owner));
-
-		//clear cache
-		Cache::clear("menus");
-	}
+                'menuID' => $menuID,
+                'title' => $title,
+                'url' => $url,
+                'url_type' => $type,
+                'icon' => $icon,
+                'permissions' => $permissions,
+                'login_required' => ($login_required ? 1 : 0),
+                'parent' => $parent,
+                'unique_name' => $unique_name,
+                'extensions' => "none",
+                'menu_order' => $order,
+                'owner' => $owner
+            ));
+        }
+
+        //clear cache
+        Cache::clear("menus", "menuID_" . $menuID);
+
+        return $insertID;
+    }
+
+    public static function deleteMenusByOwner (string $owner) {
+        //delete menus from database
+        Database::getInstance()->execute("DELETE FROM `{praefix}menu` WHERE `owner` = :owner; ", array('owner' => $owner));
+
+        //clear cache
+        Cache::clear("menus");
+    }
 
 }
 

Spacing +10 added lines, -10 removed lines

@@ -38,12 +38,12 @@ 
 
 	protected $menus = array();
 
-	public function __construct (int $menuID = -1, string $template = "menu") {
+	public function __construct(int $menuID = -1, string $template = "menu") {
 		$this->menuID = (int) $menuID;
 		$this->template = $template;
 	}
 
-	public function loadMenu (int $menuID = -1, Folder $folder) {
+	public function loadMenu(int $menuID = -1, Folder $folder) {
 		if ($menuID == -1) {
 			$menuID = $this->menuID;
 		}
@@ -82,7 +82,7 @@ 
 		$this->menuID = $menuID;
 	}
 
-	protected function getMenuByParent (array &$menu_array, int $parentID, Folder $folder) : array {
+	protected function getMenuByParent(array &$menu_array, int $parentID, Folder $folder) : array {
 		if (!isset($menu_array[$parentID])) {
 			//menu doesnt have submenus
 			return array();
@@ -183,7 +183,7 @@ 
 	/**
 	 * get HTML code of menu
 	 */
-	public function getCode () : string {
+	public function getCode() : string {
 		$template = new DwooTemplate($this->template);
 
 		$template->assign("menu_array", $this->menus);
@@ -206,7 +206,7 @@ 
 		return $html;
 	}
 
-	protected static function loadMenuID (int $menuID) {
+	protected static function loadMenuID(int $menuID) {
 		if (isset(self::$menuID_array[$menuID])) {
 			return;
 		}
@@ -239,7 +239,7 @@ 
 		//var_dump(self::$menuID_array);
 	}
 
-	public static function createMenuName (string $title, string $unique_name = null) : int {
+	public static function createMenuName(string $title, string $unique_name = null) : int {
 		Events::throwEvent("before_create_menu_name", array(
 			'title' => &$title
 		));
@@ -272,7 +272,7 @@ 
 		return $menuID;
 	}
 
-	public static function deleteMenuName (int $menuID) {
+	public static function deleteMenuName(int $menuID) {
 		Database::getInstance()->execute("DELETE FROM `{praefix}menu_names` WHERE `menuID` = :menuID; ", array(
 			'menuID' => array(
 				'type' => PDO::PARAM_INT,
@@ -284,7 +284,7 @@ 
 		Cache::clear("menus", "menuID_" . $menuID);
 	}
 
-	public static function listMenuNames () : array {
+	public static function listMenuNames() : array {
 		if (Cache::contains("menus", "menu_names")) {
 			return Cache::get("menus", "menu_names");
 		} else {
@@ -296,7 +296,7 @@ 
 		}
 	}
 
-	public static function createMenu (int $id, int $menuID, string $title, string $url, int $parent = -1, string $unique_name = "", $type = "page", $permissions = array("all"), $login_required = false, string $icon = "none", int $order = 100, string $owner = "user") {
+	public static function createMenu(int $id, int $menuID, string $title, string $url, int $parent = -1, string $unique_name = "", $type = "page", $permissions = array("all"), $login_required = false, string $icon = "none", int $order = 100, string $owner = "user") {
 		if (!is_array($permissions)) {
 			$permissions = array($permissions);
 		}
@@ -362,7 +362,7 @@ 
 		return $insertID;
 	}
 
-	public static function deleteMenusByOwner (string $owner) {
+	public static function deleteMenusByOwner(string $owner) {
 		//delete menus from database
 		Database::getInstance()->execute("DELETE FROM `{praefix}menu` WHERE `owner` = :owner; ", array('owner' => $owner));
 

system/packages/com.jukusoft.cms.style/classes/stylecontroller.php

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
 	 *
 	 * @return current style as string name
 	 */
-	public static function getCurrentStyle (Registry &$registry, Page &$page, PageType &$page_type) : string {
+	public static function getCurrentStyle(Registry &$registry, Page &$page, PageType &$page_type) : string {
 		//get default styles
 		$default_style_name = Settings::get("default_style_name");
 		$default_mobile_style_name = Settings::get("default_mobile_style_name");
@@ -46,7 +46,7 @@ 
 		return $style_name;
 	}
 
-	public static function showPage (Registry &$registry, Page &$page, PageType &$page_type) {
+	public static function showPage(Registry &$registry, Page &$page, PageType &$page_type) {
 		//create new template
 		$template = new DwooTemplate("index");
 
@@ -186,7 +186,7 @@ 
 		echo $template->getCode();
 	}
 
-	public static function listAllStyles () : array {
+	public static function listAllStyles() : array {
 		$styles = array();
 
 		$file_array = glob(STYLE_PATH . "*");

Indentation +173 added lines, -173 removed lines

@@ -18,110 +18,110 @@ 
 
 class StyleController {
 
-	/**
-	 * get name of current style
-	 *
-	 * @param $registry Registry instance
-	 *
-	 * @return current style as string name
-	 */
-	public static function getCurrentStyle (Registry &$registry, Page &$page, PageType &$page_type) : string {
-		//get default styles
-		$default_style_name = Settings::get("default_style_name");
-		$default_mobile_style_name = Settings::get("default_mobile_style_name");
-
-		$style_name = !Browser::isMobile() ? $default_style_name : $default_mobile_style_name;
-
-		//apply style rules
-		$style_name = StyleRules::getStyle($registry, $style_name);
-
-		//throw event, so plugins can change style
-		Events::throwEvent("get_style", array(
-			'default_style_name' => $default_style_name,
-			'default_mobile_style_name' => $default_mobile_style_name,
-			'style_name' => &$style_name,
-			'registry' => $registry
-		));
-
-		//check, if page has own style
-		if ($page->getStyle() !== "none") {
-			return $page->getStyle();
-		}
-
-		return $style_name;
-	}
-
-	public static function showPage (Registry &$registry, Page &$page, PageType &$page_type) {
-		//create new template
-		$template = new DwooTemplate("index");
-
-		$title_preafix = Settings::get("title_praefix", "");
-		$title_suffix = Settings::get("title_suffix", "");
-
-		//translate title
-		$title = Translator::translateTitle($page->getTitle());
-
-		//assign variables
-		$template->assign("TITLE", $title_preafix . $title . $title_suffix);
-		$template->assign("SHORT_TITLE", $title);
-		$template->assign("RAW_TITLE", $page->getTitle());
-		$template->assign("REGISTRY", $registry->listSettings());
-
-		$head_content = "";
-
-		Events::throwEvent("get_head", array(
-			'registry' => &$registry,
-			'page' => &$page,
-			'page_type' => &$page_type,
-			'head_content' => $head_content
-		));
-
-		$template->assign("HEAD", $head_content . $page_type->getAdditionalHeaderCode());
-
-		$template->assign("CONTENT", $page_type->getContent());
-		$template->assign("HEADER", $registry->getSetting("header", ""));
-		$template->assign("FOOTER", $registry->getSetting("footer", ""));
-		$template->assign("COPYRIGHT", Settings::get("copyright", "<strong>Copyright &copy; 2018 <a href=\"http://jukusoft.com\">JuKuSoft.com</a></strong>, All Rights Reserved."));
-
-		$template->assign("FOOTER_SCRIPTS", $page_type->getFooterScripts());
-
-		$template->assign("MY_GROUP_IDS", implode(",", $registry->getObject("groups")->listGroupIDs()));
-		$template->assign("CHARSET", $page_type->getCharset());
-
-		//author name
-		$author = $page->getAuthor();
-
-		//meta tags
-		$meta = array(
-			'description' => $page->getMetaDescription(),
-			'keywords' => $page->getMetaKeywords(),
-			'robots' => $page->getMetaRobotsOptions(),
-			'canoncials' => $page->getMetaCanonicals(),
-			'has_robots' => !empty($page->getMetaRobotsOptions()),
-			'has_canoncials' => !empty($page->getMetaCanonicals()),
-			'author' => array(
-				'userID' => $author->getID(),
-				'username' => $author->getUsername(),
-				'title' => $author->getTitle()
-			)
-		);
-
-		Events::throwEvent("meta_tags", array(
-			'page' => &$page,
-			'translated_title' => &$title,
-			'registry' => &$registry,
-			'template' => &$template,
-			'author' => &$author,
-			'meta' => &$meta
-		));
-
-		$template->assign("meta", $meta);
-
-		//set opengraph tags
-		$template->assign("OG_TAGS", $page_type->getOgTags());
-
-		//create new css builder
-		/*$css_builder = new CSSBuilder();
+    /**
+     * get name of current style
+     *
+     * @param $registry Registry instance
+     *
+     * @return current style as string name
+     */
+    public static function getCurrentStyle (Registry &$registry, Page &$page, PageType &$page_type) : string {
+        //get default styles
+        $default_style_name = Settings::get("default_style_name");
+        $default_mobile_style_name = Settings::get("default_mobile_style_name");
+
+        $style_name = !Browser::isMobile() ? $default_style_name : $default_mobile_style_name;
+
+        //apply style rules
+        $style_name = StyleRules::getStyle($registry, $style_name);
+
+        //throw event, so plugins can change style
+        Events::throwEvent("get_style", array(
+            'default_style_name' => $default_style_name,
+            'default_mobile_style_name' => $default_mobile_style_name,
+            'style_name' => &$style_name,
+            'registry' => $registry
+        ));
+
+        //check, if page has own style
+        if ($page->getStyle() !== "none") {
+            return $page->getStyle();
+        }
+
+        return $style_name;
+    }
+
+    public static function showPage (Registry &$registry, Page &$page, PageType &$page_type) {
+        //create new template
+        $template = new DwooTemplate("index");
+
+        $title_preafix = Settings::get("title_praefix", "");
+        $title_suffix = Settings::get("title_suffix", "");
+
+        //translate title
+        $title = Translator::translateTitle($page->getTitle());
+
+        //assign variables
+        $template->assign("TITLE", $title_preafix . $title . $title_suffix);
+        $template->assign("SHORT_TITLE", $title);
+        $template->assign("RAW_TITLE", $page->getTitle());
+        $template->assign("REGISTRY", $registry->listSettings());
+
+        $head_content = "";
+
+        Events::throwEvent("get_head", array(
+            'registry' => &$registry,
+            'page' => &$page,
+            'page_type' => &$page_type,
+            'head_content' => $head_content
+        ));
+
+        $template->assign("HEAD", $head_content . $page_type->getAdditionalHeaderCode());
+
+        $template->assign("CONTENT", $page_type->getContent());
+        $template->assign("HEADER", $registry->getSetting("header", ""));
+        $template->assign("FOOTER", $registry->getSetting("footer", ""));
+        $template->assign("COPYRIGHT", Settings::get("copyright", "<strong>Copyright &copy; 2018 <a href=\"http://jukusoft.com\">JuKuSoft.com</a></strong>, All Rights Reserved."));
+
+        $template->assign("FOOTER_SCRIPTS", $page_type->getFooterScripts());
+
+        $template->assign("MY_GROUP_IDS", implode(",", $registry->getObject("groups")->listGroupIDs()));
+        $template->assign("CHARSET", $page_type->getCharset());
+
+        //author name
+        $author = $page->getAuthor();
+
+        //meta tags
+        $meta = array(
+            'description' => $page->getMetaDescription(),
+            'keywords' => $page->getMetaKeywords(),
+            'robots' => $page->getMetaRobotsOptions(),
+            'canoncials' => $page->getMetaCanonicals(),
+            'has_robots' => !empty($page->getMetaRobotsOptions()),
+            'has_canoncials' => !empty($page->getMetaCanonicals()),
+            'author' => array(
+                'userID' => $author->getID(),
+                'username' => $author->getUsername(),
+                'title' => $author->getTitle()
+            )
+        );
+
+        Events::throwEvent("meta_tags", array(
+            'page' => &$page,
+            'translated_title' => &$title,
+            'registry' => &$registry,
+            'template' => &$template,
+            'author' => &$author,
+            'meta' => &$meta
+        ));
+
+        $template->assign("meta", $meta);
+
+        //set opengraph tags
+        $template->assign("OG_TAGS", $page_type->getOgTags());
+
+        //create new css builder
+        /*$css_builder = new CSSBuilder();
 
 		//create new js builder
 		$js_builder = new JSBuilder();
@@ -136,76 +136,76 @@ 
 		$template->assign("JS_ALL_HEADER_EMPTY", $js_builder->isEmpty($current_style, "ALL", "header"));
 		$template->assign("JS_ALL_FOOTER_EMPTY", $js_builder->isEmpty($current_style, "ALL", "footer"));*/
 
-		//set sidebar arrays
-		$left_sidebar = Registry::singleton()->getObject("left_sidebar");
-		$right_sidebar = Registry::singleton()->getObject("right_sidebar");
-		$sidebars_var = array(
-			'left_sidebar' => $left_sidebar->listWidgetTplArray(),
-			'right_sidebar' => $right_sidebar->listWidgetTplArray()
-		);
-		$template->assign("sidebars", $sidebars_var);
-
-		//set version and build number
-		if (PermissionChecker::current()->hasRight("can_see_cms_version")) {
-			$template->assign("VERSION", Version::current()->getVersion());
-			$template->assign("BUILD", Version::current()->getBuildNumber());
-		} else {
-			$template->assign("VERSION", "Unknown");
-			$template->assign("BUILD", "Unknown");
-		}
-
-		//userid and username
-		$user = User::current();
-		/*$template->assign("USERID", $user->getID());
+        //set sidebar arrays
+        $left_sidebar = Registry::singleton()->getObject("left_sidebar");
+        $right_sidebar = Registry::singleton()->getObject("right_sidebar");
+        $sidebars_var = array(
+            'left_sidebar' => $left_sidebar->listWidgetTplArray(),
+            'right_sidebar' => $right_sidebar->listWidgetTplArray()
+        );
+        $template->assign("sidebars", $sidebars_var);
+
+        //set version and build number
+        if (PermissionChecker::current()->hasRight("can_see_cms_version")) {
+            $template->assign("VERSION", Version::current()->getVersion());
+            $template->assign("BUILD", Version::current()->getBuildNumber());
+        } else {
+            $template->assign("VERSION", "Unknown");
+            $template->assign("BUILD", "Unknown");
+        }
+
+        //userid and username
+        $user = User::current();
+        /*$template->assign("USERID", $user->getID());
 		$template->assign("USERNAME", $user->getUsername());*/
-		$template->assign("IS_LOGGED_IN", $user->isLoggedIn());
-
-		//assign menu code
-		$globalMenu = $registry->getObject("main_menu");
-		$localMenu = $registry->getObject("local_menu");
-		$template->assign("MENU", $globalMenu->getCode());
-		$template->assign("LOCALMENU", $localMenu->getCode());
-
-		if (User::current()->isLoggedIn()) {
-			$template->assign("is_logged_in", true);
-			//$template->parse("main.logged_in");
-		} else {
-			$template->assign("is_logged_in", false);
-			//$template->parse("main.not_logged_in");
-		}
-
-		//throw event
-		Events::throwEvent("show_page", array(
-			'registry' => &$registry,
-			'page' => &$page,
-			'page_type' => &$page_type,
-			'template' => &$template
-		));
-
-		if ($page_type->showFooter()) {
-			$template->assign("show_footer", true);
-			//$template->parse("main.footer");
-		} else {
-			$template->assign("show_footer", false);
-		}
-
-		//$template->parse();
-
-		echo $template->getCode();
-	}
-
-	public static function listAllStyles () : array {
-		$styles = array();
-
-		$file_array = glob(STYLE_PATH . "*");
-
-		foreach ($file_array as $dir) {
-			$array1 = explode("/", $dir);
-			$styles[] = $array1[count($array1) - 1];
-		}
-
-		return $styles;
-	}
+        $template->assign("IS_LOGGED_IN", $user->isLoggedIn());
+
+        //assign menu code
+        $globalMenu = $registry->getObject("main_menu");
+        $localMenu = $registry->getObject("local_menu");
+        $template->assign("MENU", $globalMenu->getCode());
+        $template->assign("LOCALMENU", $localMenu->getCode());
+
+        if (User::current()->isLoggedIn()) {
+            $template->assign("is_logged_in", true);
+            //$template->parse("main.logged_in");
+        } else {
+            $template->assign("is_logged_in", false);
+            //$template->parse("main.not_logged_in");
+        }
+
+        //throw event
+        Events::throwEvent("show_page", array(
+            'registry' => &$registry,
+            'page' => &$page,
+            'page_type' => &$page_type,
+            'template' => &$template
+        ));
+
+        if ($page_type->showFooter()) {
+            $template->assign("show_footer", true);
+            //$template->parse("main.footer");
+        } else {
+            $template->assign("show_footer", false);
+        }
+
+        //$template->parse();
+
+        echo $template->getCode();
+    }
+
+    public static function listAllStyles () : array {
+        $styles = array();
+
+        $file_array = glob(STYLE_PATH . "*");
+
+        foreach ($file_array as $dir) {
+            $array1 = explode("/", $dir);
+            $styles[] = $array1[count($array1) - 1];
+        }
+
+        return $styles;
+    }
 
 }
 

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

Indentation +194 added lines, -194 removed lines

@@ -27,219 +27,219 @@
 
 class Sidebar {
 
-	protected $sidebar_id = -1;
-	protected $row = array();
-
-	protected $widget_rows = array();
-	protected $widgets = array();
-
-	protected static $is_initialized = false;
-	protected static $all_sidebars = array();
-
-	public function __construct() {
-		//load in-memory cache, if neccessary
-		if (!self::isInitialized()) {
-			self::initialize();
-		}
-	}
-
-	public function load (int $sidebar_id) {
-		if (isset(self::$all_sidebars[$sidebar_id])) {
-			$this->row = self::$all_sidebars[$sidebar_id];
-		} else {
-			throw new IllegalStateException("sidebar with id '" . $sidebar_id . "' doesnt exists.");
-		}
-
-		$this->sidebar_id = $sidebar_id;
-	}
-
-	public function loadByArray (array $row) {
-		$this->row = $row;
-		$this->sidebar_id = (int) $row['sidebar_id'];
-	}
-
-	public function loadWidgets () {
-		$this->widgets = array();
-
-		//load widgets
-		if (Cache::contains("sidebars", "sidebar_widgets_" . $this->sidebar_id)) {
-			$this->widget_rows = Cache::get("sidebars", "sidebar_widgets_" . $this->sidebar_id);
-		} else {
-			//list rows from database
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}sidebar_widgets` WHERE `sidebar_id` = :sidebar_id ORDER BY `order`; ", array(
-				'sidebar_id' => $this->sidebar_id
-			));
-
-			//cache results
-			Cache::put("sidebars", "sidebar_widgets_" . $this->sidebar_id, $rows);
-
-			$this->widget_rows = $rows;
-		}
-
-		foreach ($this->widget_rows as $widget_row) {
-			$class_name = $widget_row['class_name'];
-			$widget_instance = new $class_name();
-
-			if (!($widget_instance instanceof Widget)) {
-				throw new IllegalStateException("instance has to be an instance of class Widget, this means widget types has to extends class Widget.");
-			}
-
-			//cast widget
-			$widget = Widget::castWidget($widget_instance);
-
-			//load widget and set row, so widget doesn't needs to load data seperate from database
-			$widget->load($widget_row);
-
-			//add widget to list
-			$this->widgets[] = $widget;
-		}
-	}
-
-	/**
-	 * list widget instances
-	 */
-	public function listWidgets () : array {
-		return $this->widgets;
-	}
-
-	public function listWidgetTplArray () : array {
-		$array = array();
-
-		foreach ($this->listWidgets() as $widget) {
-			$widget = Widget::castWidget($widget);
-
-			$array[] = array(
-				'id' => $widget->getId(),
-				'title' => $widget->getTitle(),
-				'code' => $widget->getCode(),
-				'css_id' => $widget->getCSSId(),
-				'css_class' => $widget->getCSSClass(),
-				'use_template' => $widget->useTemplate()
-			);
-		}
-
-		return $array;
-	}
-
-	/**
-	 * @return int sidebar id
-	 */
-	public function getSidebarId(): int {
-		return $this->sidebar_id;
-	}
-
-	public function getUniqueName () : string {
-		return $this->row['unique_name'];
-	}
-
-	public function getTitle () : string {
-		return $this->row['title'];
-	}
-
-	public function isDeletable () : bool {
-		return $this->row['deletable'] == 1;
-	}
-
-	public function getRow () : array {
-		return $this->row;
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected static function isInitialized(): bool {
-		return self::$is_initialized;
-	}
-
-	protected static function initialize () {
-		if (Cache::contains("sidebars", "all_sidebars")) {
-			self::$all_sidebars = Cache::get("sidebars", "all_sidebars");
-		} else {
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}sidebars`; ");
-
-			//clear in-memory cache
-			self::$all_sidebars = array();
-
-			foreach ($rows as $row) {
-				self::$all_sidebars[$row['sidebar_id']] = $row;
-			}
-
-			//cache result
-			Cache::put("sidebars", "all_sidebars", self::$all_sidebars);
-		}
-
-		self::$is_initialized = true;
-	}
-
-	public static function create (string $title, string $unique_name, bool $deletable = true) : int {
-		if (empty($unique_name)) {
-			throw new IllegalArgumentException("unique_name cannot be null.");
-		}
-
-		Database::getInstance()->execute("INSERT INTO `{praefix}sidebars` (
+    protected $sidebar_id = -1;
+    protected $row = array();
+
+    protected $widget_rows = array();
+    protected $widgets = array();
+
+    protected static $is_initialized = false;
+    protected static $all_sidebars = array();
+
+    public function __construct() {
+        //load in-memory cache, if neccessary
+        if (!self::isInitialized()) {
+            self::initialize();
+        }
+    }
+
+    public function load (int $sidebar_id) {
+        if (isset(self::$all_sidebars[$sidebar_id])) {
+            $this->row = self::$all_sidebars[$sidebar_id];
+        } else {
+            throw new IllegalStateException("sidebar with id '" . $sidebar_id . "' doesnt exists.");
+        }
+
+        $this->sidebar_id = $sidebar_id;
+    }
+
+    public function loadByArray (array $row) {
+        $this->row = $row;
+        $this->sidebar_id = (int) $row['sidebar_id'];
+    }
+
+    public function loadWidgets () {
+        $this->widgets = array();
+
+        //load widgets
+        if (Cache::contains("sidebars", "sidebar_widgets_" . $this->sidebar_id)) {
+            $this->widget_rows = Cache::get("sidebars", "sidebar_widgets_" . $this->sidebar_id);
+        } else {
+            //list rows from database
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}sidebar_widgets` WHERE `sidebar_id` = :sidebar_id ORDER BY `order`; ", array(
+                'sidebar_id' => $this->sidebar_id
+            ));
+
+            //cache results
+            Cache::put("sidebars", "sidebar_widgets_" . $this->sidebar_id, $rows);
+
+            $this->widget_rows = $rows;
+        }
+
+        foreach ($this->widget_rows as $widget_row) {
+            $class_name = $widget_row['class_name'];
+            $widget_instance = new $class_name();
+
+            if (!($widget_instance instanceof Widget)) {
+                throw new IllegalStateException("instance has to be an instance of class Widget, this means widget types has to extends class Widget.");
+            }
+
+            //cast widget
+            $widget = Widget::castWidget($widget_instance);
+
+            //load widget and set row, so widget doesn't needs to load data seperate from database
+            $widget->load($widget_row);
+
+            //add widget to list
+            $this->widgets[] = $widget;
+        }
+    }
+
+    /**
+     * list widget instances
+     */
+    public function listWidgets () : array {
+        return $this->widgets;
+    }
+
+    public function listWidgetTplArray () : array {
+        $array = array();
+
+        foreach ($this->listWidgets() as $widget) {
+            $widget = Widget::castWidget($widget);
+
+            $array[] = array(
+                'id' => $widget->getId(),
+                'title' => $widget->getTitle(),
+                'code' => $widget->getCode(),
+                'css_id' => $widget->getCSSId(),
+                'css_class' => $widget->getCSSClass(),
+                'use_template' => $widget->useTemplate()
+            );
+        }
+
+        return $array;
+    }
+
+    /**
+     * @return int sidebar id
+     */
+    public function getSidebarId(): int {
+        return $this->sidebar_id;
+    }
+
+    public function getUniqueName () : string {
+        return $this->row['unique_name'];
+    }
+
+    public function getTitle () : string {
+        return $this->row['title'];
+    }
+
+    public function isDeletable () : bool {
+        return $this->row['deletable'] == 1;
+    }
+
+    public function getRow () : array {
+        return $this->row;
+    }
+
+    /**
+     * @return bool
+     */
+    protected static function isInitialized(): bool {
+        return self::$is_initialized;
+    }
+
+    protected static function initialize () {
+        if (Cache::contains("sidebars", "all_sidebars")) {
+            self::$all_sidebars = Cache::get("sidebars", "all_sidebars");
+        } else {
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}sidebars`; ");
+
+            //clear in-memory cache
+            self::$all_sidebars = array();
+
+            foreach ($rows as $row) {
+                self::$all_sidebars[$row['sidebar_id']] = $row;
+            }
+
+            //cache result
+            Cache::put("sidebars", "all_sidebars", self::$all_sidebars);
+        }
+
+        self::$is_initialized = true;
+    }
+
+    public static function create (string $title, string $unique_name, bool $deletable = true) : int {
+        if (empty($unique_name)) {
+            throw new IllegalArgumentException("unique_name cannot be null.");
+        }
+
+        Database::getInstance()->execute("INSERT INTO `{praefix}sidebars` (
 			`sidebar_id`, `unique_name`, `title`, `deletable`
 		) VALUES (
 			NULL, :unique_name, :title, :deletable
 		) ON DUPLICATE KEY UPDATE `unique_name` = :unique_name, `title` = :title, `deletable` = :deletable; ", array(
-			'unique_name' => $unique_name,
-			'title' => $title,
-			'deletable' => ($deletable ? 1 : 0)
-		));
+            'unique_name' => $unique_name,
+            'title' => $title,
+            'deletable' => ($deletable ? 1 : 0)
+        ));
 
-		//clear cache
-		Cache::clear("sidebars");
+        //clear cache
+        Cache::clear("sidebars");
 
-		return Database::getInstance()->lastInsertId();
-	}
+        return Database::getInstance()->lastInsertId();
+    }
 
-	public static function removeById (int $id) {
-		Database::getInstance()->execute("DELETE FROM `{praefix}sidebars` WHERE `sidebar_id` = :sidebar_id; ", array(
-			'sidebar_id' => $id
-		));
+    public static function removeById (int $id) {
+        Database::getInstance()->execute("DELETE FROM `{praefix}sidebars` WHERE `sidebar_id` = :sidebar_id; ", array(
+            'sidebar_id' => $id
+        ));
 
-		//clear cache
-		Cache::clear("sidebars");
-	}
+        //clear cache
+        Cache::clear("sidebars");
+    }
 
-	public static function removeByUniqueName (string $unique_name) {
-		if (empty($unique_name)) {
-			throw new IllegalArgumentException("unique_name cannot be null.");
-		}
+    public static function removeByUniqueName (string $unique_name) {
+        if (empty($unique_name)) {
+            throw new IllegalArgumentException("unique_name cannot be null.");
+        }
 
-		Database::getInstance()->execute("DELETE FROM `{praefix}sidebars` WHERE `unique_name` = :unique_name; ", array(
-			'unique_name' => $unique_name
-		));
+        Database::getInstance()->execute("DELETE FROM `{praefix}sidebars` WHERE `unique_name` = :unique_name; ", array(
+            'unique_name' => $unique_name
+        ));
 
-		//clear cache
-		Cache::clear("sidebars");
-	}
+        //clear cache
+        Cache::clear("sidebars");
+    }
 
-	public static function listSidebars () : array {
-		$rows = array();
+    public static function listSidebars () : array {
+        $rows = array();
 
-		if (Cache::contains("sidebars", "list")) {
-			$rows = Cache::get("sidebars", "list");
-		} else {
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}sidebars`; ");
+        if (Cache::contains("sidebars", "list")) {
+            $rows = Cache::get("sidebars", "list");
+        } else {
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}sidebars`; ");
 
-			Cache::put("sidebars", "list", $rows);
-		}
+            Cache::put("sidebars", "list", $rows);
+        }
 
-		$list = array();
+        $list = array();
 
-		foreach ($rows as $row) {
-			$obj = new Sidebar();
-			$obj->loadByArray($row);
+        foreach ($rows as $row) {
+            $obj = new Sidebar();
+            $obj->loadByArray($row);
 
-			$list[] = $obj;
-		}
+            $list[] = $obj;
+        }
 
-		return $list;
-	}
+        return $list;
+    }
 
-	public static function cast (Sidebar $sidebar) : Sidebar {
-		return $sidebar;
-	}
+    public static function cast (Sidebar $sidebar) : Sidebar {
+        return $sidebar;
+    }
 
 }
 

Spacing +15 added lines, -15 removed lines

@@ -43,7 +43,7 @@ 
 		}
 	}
 
-	public function load (int $sidebar_id) {
+	public function load(int $sidebar_id) {
 		if (isset(self::$all_sidebars[$sidebar_id])) {
 			$this->row = self::$all_sidebars[$sidebar_id];
 		} else {
@@ -53,12 +53,12 @@ 
 		$this->sidebar_id = $sidebar_id;
 	}
 
-	public function loadByArray (array $row) {
+	public function loadByArray(array $row) {
 		$this->row = $row;
 		$this->sidebar_id = (int) $row['sidebar_id'];
 	}
 
-	public function loadWidgets () {
+	public function loadWidgets() {
 		$this->widgets = array();
 
 		//load widgets
@@ -98,11 +98,11 @@ 
 	/**
 	 * list widget instances
 	 */
-	public function listWidgets () : array {
+	public function listWidgets() : array {
 		return $this->widgets;
 	}
 
-	public function listWidgetTplArray () : array {
+	public function listWidgetTplArray() : array {
 		$array = array();
 
 		foreach ($this->listWidgets() as $widget) {
@@ -128,19 +128,19 @@ 
 		return $this->sidebar_id;
 	}
 
-	public function getUniqueName () : string {
+	public function getUniqueName() : string {
 		return $this->row['unique_name'];
 	}
 
-	public function getTitle () : string {
+	public function getTitle() : string {
 		return $this->row['title'];
 	}
 
-	public function isDeletable () : bool {
+	public function isDeletable() : bool {
 		return $this->row['deletable'] == 1;
 	}
 
-	public function getRow () : array {
+	public function getRow() : array {
 		return $this->row;
 	}
 
@@ -151,7 +151,7 @@ 
 		return self::$is_initialized;
 	}
 
-	protected static function initialize () {
+	protected static function initialize() {
 		if (Cache::contains("sidebars", "all_sidebars")) {
 			self::$all_sidebars = Cache::get("sidebars", "all_sidebars");
 		} else {
@@ -171,7 +171,7 @@ 
 		self::$is_initialized = true;
 	}
 
-	public static function create (string $title, string $unique_name, bool $deletable = true) : int {
+	public static function create(string $title, string $unique_name, bool $deletable = true) : int {
 		if (empty($unique_name)) {
 			throw new IllegalArgumentException("unique_name cannot be null.");
 		}
@@ -192,7 +192,7 @@ 
 		return Database::getInstance()->lastInsertId();
 	}
 
-	public static function removeById (int $id) {
+	public static function removeById(int $id) {
 		Database::getInstance()->execute("DELETE FROM `{praefix}sidebars` WHERE `sidebar_id` = :sidebar_id; ", array(
 			'sidebar_id' => $id
 		));
@@ -201,7 +201,7 @@ 
 		Cache::clear("sidebars");
 	}
 
-	public static function removeByUniqueName (string $unique_name) {
+	public static function removeByUniqueName(string $unique_name) {
 		if (empty($unique_name)) {
 			throw new IllegalArgumentException("unique_name cannot be null.");
 		}
@@ -214,7 +214,7 @@ 
 		Cache::clear("sidebars");
 	}
 
-	public static function listSidebars () : array {
+	public static function listSidebars() : array {
 		$rows = array();
 
 		if (Cache::contains("sidebars", "list")) {
@@ -237,7 +237,7 @@ 
 		return $list;
 	}
 
-	public static function cast (Sidebar $sidebar) : Sidebar {
+	public static function cast(Sidebar $sidebar) : Sidebar {
 		return $sidebar;
 	}
 

system/core/datatype/selectbox.php

Indentation +25 added lines, -25 removed lines

@@ -27,31 +27,31 @@
 
 class DataType_SelectBox extends DataType_Base {
 
-	public function getFormCode(): string {
-		$code = "<select name=\"" . $this->getInputName() . "\" class=\"form-control select2\" style=\"width: 100%;\">";
-
-		foreach ($this->getDatatypeParams() as $option) {
-			$code .= "<option" . ($option === $this->getValue() ? " selected=\"selected\"" : "") . ">" . $option . "</option>";
-		}
-
-		$code .= "</select>";
-		return $code;
-	}
-
-	public function validate(string $value): bool {
-		foreach ($this->getDatatypeParams() as $option) {
-			if ($option === $value) {
-				//option exists
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	protected function saveAsync($value) {
-		Settings::setAsync($this->getKey(), (string) $value);
-	}
+    public function getFormCode(): string {
+        $code = "<select name=\"" . $this->getInputName() . "\" class=\"form-control select2\" style=\"width: 100%;\">";
+
+        foreach ($this->getDatatypeParams() as $option) {
+            $code .= "<option" . ($option === $this->getValue() ? " selected=\"selected\"" : "") . ">" . $option . "</option>";
+        }
+
+        $code .= "</select>";
+        return $code;
+    }
+
+    public function validate(string $value): bool {
+        foreach ($this->getDatatypeParams() as $option) {
+            if ($option === $value) {
+                //option exists
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    protected function saveAsync($value) {
+        Settings::setAsync($this->getKey(), (string) $value);
+    }
 }
 
 ?>

system/core/datatype/hidden.php

Indentation +13 added lines, -13 removed lines

@@ -27,19 +27,19 @@
 
 class DataType_Hidden extends DataType_Base {
 
-	public function getFormCode(): string {
-		//dont show hidden value
-		return "";
-	}
-
-	public function validate(string $value): bool {
-		//value cannot be changed
-		return true;
-	}
-
-	protected function saveAsync($value) {
-		//dont do anything, because value cannot be overriden
-	}
+    public function getFormCode(): string {
+        //dont show hidden value
+        return "";
+    }
+
+    public function validate(string $value): bool {
+        //value cannot be changed
+        return true;
+    }
+
+    protected function saveAsync($value) {
+        //dont do anything, because value cannot be overriden
+    }
 }
 
 ?>

system/core/datatype/html.php

Indentation +9 added lines, -9 removed lines

@@ -27,17 +27,17 @@
 
 class DataType_HTML extends DataType_Base {
 
-	public function getFormCode(): string {
-		return "<textarea name=\"" . $this->getInputName() . "\" rows=\"4\" cols=\"50\">" . $this->getValue() . "</textarea>";
-	}
+    public function getFormCode(): string {
+        return "<textarea name=\"" . $this->getInputName() . "\" rows=\"4\" cols=\"50\">" . $this->getValue() . "</textarea>";
+    }
 
-	public function validate(string $value): bool {
-		return true;
-	}
+    public function validate(string $value): bool {
+        return true;
+    }
 
-	protected function saveAsync($value) {
-		Settings::setAsync($this->getKey(), (string) $value);
-	}
+    protected function saveAsync($value) {
+        Settings::setAsync($this->getKey(), (string) $value);
+    }
 }
 
 ?>