JuKu / JuKuCMS

system/core/validator/mail.php

Indentation +16 added lines, -16 removed lines

@@ -27,27 +27,27 @@
 
 class Validator_Mail implements Validator_Base {
 
-	protected static $instance = null;
+    protected static $instance = null;
 
-	public function isValide ($value): bool {
-		return filter_var($value, FILTER_VALIDATE_EMAIL) !== false;
-	}
+    public function isValide ($value): bool {
+        return filter_var($value, FILTER_VALIDATE_EMAIL) !== false;
+    }
 
-	public function validate ($value) : string {
-		if (!$this->isValide($value)) {
-			throw new SecurityException("given mail '" . htmlentities($value) . "' isnt a valide mail.");
-		}
+    public function validate ($value) : string {
+        if (!$this->isValide($value)) {
+            throw new SecurityException("given mail '" . htmlentities($value) . "' isnt a valide mail.");
+        }
 
-		return filter_var($value, FILTER_VALIDATE_EMAIL);
-	}
+        return filter_var($value, FILTER_VALIDATE_EMAIL);
+    }
 
-	public static function get (string $value) : string {
-		if (self::$instance == null) {
-			self::$instance = new Validator_Mail();
-		}
+    public static function get (string $value) : string {
+        if (self::$instance == null) {
+            self::$instance = new Validator_Mail();
+        }
 
-		return self::$instance->validate($value);
-	}
+        return self::$instance->validate($value);
+    }
 
 }
 

system/core/validator/alphanumeric.php

Indentation +14 added lines, -14 removed lines

@@ -27,24 +27,24 @@
 
 class Validator_AlphaNumeric implements Validator_Base {
 
-	protected static $instance = null;
+    protected static $instance = null;
 
-	public function isValide ($value): bool {
-		return ctype_alnum($value);
-	}
+    public function isValide ($value): bool {
+        return ctype_alnum($value);
+    }
 
-	public function validate ($value) : string {
-		//remove all characters except except a-z, A-Z and 0-9
-		return preg_replace("/[^a-zA-Z0-9]+/", "", $value);
-	}
+    public function validate ($value) : string {
+        //remove all characters except except a-z, A-Z and 0-9
+        return preg_replace("/[^a-zA-Z0-9]+/", "", $value);
+    }
 
-	public static function get (string $value) : string {
-		if (self::$instance == null) {
-			self::$instance = new Validator_AlphaNumeric();
-		}
+    public static function get (string $value) : string {
+        if (self::$instance == null) {
+            self::$instance = new Validator_AlphaNumeric();
+        }
 
-		return self::$instance->validate($value);
-	}
+        return self::$instance->validate($value);
+    }
 
 }
 

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

Indentation +77 added lines, -77 removed lines

@@ -27,109 +27,109 @@
 
 class Browser {
 
-	//cached values
-	protected static $isMobile = false;
-	protected static $mobile_checked = false;
-	protected static $isTablet = false;
-	protected static $tablet_checked = false;
+    //cached values
+    protected static $isMobile = false;
+    protected static $mobile_checked = false;
+    protected static $isTablet = false;
+    protected static $tablet_checked = false;
 
-	//https://github.com/serbanghita/Mobile-Detect/blob/master/Mobile_Detect.php
+    //https://github.com/serbanghita/Mobile-Detect/blob/master/Mobile_Detect.php
 
-	/**
-	 * check, if browser is mobile
-	 *
-	 * @return true, if browser is mobile
-	 */
-	public static function isMobile () : bool {
-		//in-memory cache
-		if (self::$mobile_checked) {
-			return self::$isMobile;
-		}
+    /**
+     * check, if browser is mobile
+     *
+     * @return true, if browser is mobile
+     */
+    public static function isMobile () : bool {
+        //in-memory cache
+        if (self::$mobile_checked) {
+            return self::$isMobile;
+        }
 
-		//customized from: https://stackoverflow.com/questions/4117555/simplest-way-to-detect-a-mobile-device
-		//https://stackoverflow.com/questions/4117555/simplest-way-to-detect-a-mobile-device
-		$value = preg_match("/(android|webos|avantgo|iphone|ipad|ipod|blackberry|iemobile|bolt|bo‌​ost|cricket|docomo|fone|hiptop|mini|opera mini|kitkat|mobi|palm|phone|pie|tablet|up\.browser|up\.link|webos|wos)/i", self::getUserAgent());
+        //customized from: https://stackoverflow.com/questions/4117555/simplest-way-to-detect-a-mobile-device
+        //https://stackoverflow.com/questions/4117555/simplest-way-to-detect-a-mobile-device
+        $value = preg_match("/(android|webos|avantgo|iphone|ipad|ipod|blackberry|iemobile|bolt|bo‌​ost|cricket|docomo|fone|hiptop|mini|opera mini|kitkat|mobi|palm|phone|pie|tablet|up\.browser|up\.link|webos|wos)/i", self::getUserAgent());
 
-		//cache values (in local in-memory cache)
-		self::$isMobile = $value;
-		self::$mobile_checked = true;
+        //cache values (in local in-memory cache)
+        self::$isMobile = $value;
+        self::$mobile_checked = true;
 
-		return $value;
-	}
+        return $value;
+    }
 
-	public static function isMobilePhone () : bool {
-		throw new Exception("method Browser::isMobilePhone() isnt implemented yet.");
+    public static function isMobilePhone () : bool {
+        throw new Exception("method Browser::isMobilePhone() isnt implemented yet.");
 
-		//TODO: add code here
-	}
+        //TODO: add code here
+    }
 
-	public static function isTablet () : bool {
-		//in-memory cache
-		if (self::$tablet_checked) {
-			return self::$isTablet;
-		}
+    public static function isTablet () : bool {
+        //in-memory cache
+        if (self::$tablet_checked) {
+            return self::$isTablet;
+        }
 
-		//https://www.phpclasses.org/browse/file/48225.html
-		//https://mobiforge.com/design-development/tablet-and-mobile-device-detection-php
+        //https://www.phpclasses.org/browse/file/48225.html
+        //https://mobiforge.com/design-development/tablet-and-mobile-device-detection-php
 
-		//TODO: ATTENTION! Rewrite this method so it will result into better performance!
+        //TODO: ATTENTION! Rewrite this method so it will result into better performance!
 
-		$user_agent = self::getUserAgent();
+        $user_agent = self::getUserAgent();
 
-		$tablet_browser = 0;
+        $tablet_browser = 0;
 
-		if (preg_match('/(tablet|ipad|playbook)|(android(?!.*(mobi|opera mini)))/i', strtolower($user_agent))) {
-			$tablet_browser++;
-		}
+        if (preg_match('/(tablet|ipad|playbook)|(android(?!.*(mobi|opera mini)))/i', strtolower($user_agent))) {
+            $tablet_browser++;
+        }
 
-		if (strpos(strtolower($user_agent),'opera mini') > 0) {
-			//Check for tablets on opera mini alternative headers
-			$stock_ua = strtolower(isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) ? $_SERVER['HTTP_X_OPERAMINI_PHONE_UA'] : (isset($_SERVER['HTTP_DEVICE_STOCK_UA'])?$_SERVER['HTTP_DEVICE_STOCK_UA']:''));
+        if (strpos(strtolower($user_agent),'opera mini') > 0) {
+            //Check for tablets on opera mini alternative headers
+            $stock_ua = strtolower(isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) ? $_SERVER['HTTP_X_OPERAMINI_PHONE_UA'] : (isset($_SERVER['HTTP_DEVICE_STOCK_UA'])?$_SERVER['HTTP_DEVICE_STOCK_UA']:''));
 
-			if (preg_match('/(tablet|ipad|playbook)|(android(?!.*mobile))/i', $stock_ua)) {
-				$tablet_browser++;
-			}
-		}
+            if (preg_match('/(tablet|ipad|playbook)|(android(?!.*mobile))/i', $stock_ua)) {
+                $tablet_browser++;
+            }
+        }
 
-		$value = $tablet_browser > 0;
+        $value = $tablet_browser > 0;
 
-		//cache values (in local in-memory cache)
-		self::$isTablet = $value;
-		self::$tablet_checked = true;
+        //cache values (in local in-memory cache)
+        self::$isTablet = $value;
+        self::$tablet_checked = true;
 
-		return $value;
-	}
+        return $value;
+    }
 
-	public static function isAppleiOS () : bool {
-		$user_agent = self::getUserAgent();
+    public static function isAppleiOS () : bool {
+        $user_agent = self::getUserAgent();
 
-		$iPod    = stripos($user_agent,"iPod");
-		$iPhone  = stripos($user_agent,"iPhone");
-		$iPad    = stripos($user_agent,"iPad");
-		//$Android = stripos($_SERVER['HTTP_USER_AGENT'],"Android");
-		//$webOS   = stripos($_SERVER['HTTP_USER_AGENT'],"webOS");
+        $iPod    = stripos($user_agent,"iPod");
+        $iPhone  = stripos($user_agent,"iPhone");
+        $iPad    = stripos($user_agent,"iPad");
+        //$Android = stripos($_SERVER['HTTP_USER_AGENT'],"Android");
+        //$webOS   = stripos($_SERVER['HTTP_USER_AGENT'],"webOS");
 
-		return $iPod !== false || $iPhone !== false || $iPad !== false;
-	}
+        return $iPod !== false || $iPhone !== false || $iPad !== false;
+    }
 
-	public static function isAndroid () : bool {
-		return stripos(self::getUserAgent(),'android') !== false;
-	}
+    public static function isAndroid () : bool {
+        return stripos(self::getUserAgent(),'android') !== false;
+    }
 
-	public static function getUserAgent () : string {
-		$user_agent = "";
+    public static function getUserAgent () : string {
+        $user_agent = "";
 
-		if (isset($_SERVER['HTTP_USER_AGENT'])) {
-			$user_agent = strtolower(htmlentities($_SERVER['HTTP_USER_AGENT']));
-		}
+        if (isset($_SERVER['HTTP_USER_AGENT'])) {
+            $user_agent = strtolower(htmlentities($_SERVER['HTTP_USER_AGENT']));
+        }
 
-		//throw event, so plugins can modify user agent
-		Events::throwEvent("get_user_agent", array(
-			'user_agent' => &$user_agent,
-		));
+        //throw event, so plugins can modify user agent
+        Events::throwEvent("get_user_agent", array(
+            'user_agent' => &$user_agent,
+        ));
 
-		return $user_agent;
-	}
+        return $user_agent;
+    }
 
 }
 

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

Indentation +100 added lines, -100 removed lines

@@ -27,128 +27,128 @@
 
 class Groups {
 
-	protected $my_groups = array();
+    protected $my_groups = array();
 
-	public function __construct() {
-		//
-	}
+    public function __construct() {
+        //
+    }
 
-	public function loadMyGroups (int $userID) {
-		if (Cache::contains("groups", "own-groups-" . $userID)) {
-			$this->my_groups = Cache::get("groups", "own-groups-" . $userID);
-		} else {
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}group_members` LEFT JOIN `{praefix}groups` ON `{praefix}group_members`.`groupID` = `{praefix}groups`.`groupID` WHERE `{praefix}group_members`.`userID` = :userID AND `{praefix}group_members`.`activated` = '1'; ", array(
-				'userID' => array(
-					'type' => PDO::PARAM_INT,
-					'value' => $userID
-				)
-			));
+    public function loadMyGroups (int $userID) {
+        if (Cache::contains("groups", "own-groups-" . $userID)) {
+            $this->my_groups = Cache::get("groups", "own-groups-" . $userID);
+        } else {
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}group_members` LEFT JOIN `{praefix}groups` ON `{praefix}group_members`.`groupID` = `{praefix}groups`.`groupID` WHERE `{praefix}group_members`.`userID` = :userID AND `{praefix}group_members`.`activated` = '1'; ", array(
+                'userID' => array(
+                    'type' => PDO::PARAM_INT,
+                    'value' => $userID
+                )
+            ));
 
-			$this->my_groups = $rows;
+            $this->my_groups = $rows;
 
-			//cache rows
-			Cache::put("groups", "own-groups-" . $userID, $this->my_groups);
-		}
-	}
+            //cache rows
+            Cache::put("groups", "own-groups-" . $userID, $this->my_groups);
+        }
+    }
 
-	public function listGroupIDs () : array {
-		$array = array();
+    public function listGroupIDs () : array {
+        $array = array();
 
-		foreach ($this->my_groups as $group_row) {
-			$array[] = $group_row['groupID'];
-		}
+        foreach ($this->my_groups as $group_row) {
+            $array[] = $group_row['groupID'];
+        }
 
-		return $array;
-	}
+        return $array;
+    }
 
-	public function listMyGroups () : array {
-		$array = array();
+    public function listMyGroups () : array {
+        $array = array();
 
-		foreach ($this->my_groups as $row) {
-			$group = new Group();
-			$group->loadByRow($row);
+        foreach ($this->my_groups as $row) {
+            $group = new Group();
+            $group->loadByRow($row);
 
-			$array[] = $group;
-		}
+            $array[] = $group;
+        }
 
-		return $array;
-	}
+        return $array;
+    }
 
-	public static function createGroupIfIdAbsent (int $groupID, string $name, string $description, string $color = "#000000", bool $show = true, bool $system_group = false, bool $auto_assign_regist = false) {
-		//check, if color is valide
-		$validator = new Validator_Color();
+    public static function createGroupIfIdAbsent (int $groupID, string $name, string $description, string $color = "#000000", bool $show = true, bool $system_group = false, bool $auto_assign_regist = false) {
+        //check, if color is valide
+        $validator = new Validator_Color();
 
-		if (!$validator->isValide($color)) {
-			throw new IllegalArgumentException("color '" . $color . "' isnt a valide hex color.");
-		}
+        if (!$validator->isValide($color)) {
+            throw new IllegalArgumentException("color '" . $color . "' isnt a valide hex color.");
+        }
 
-		Database::getInstance()->execute("INSERT INTO `{praefix}groups` (
+        Database::getInstance()->execute("INSERT INTO `{praefix}groups` (
 			`groupID`, `name`, `description`, `color`, `auto_assign_regist`, `system_group`, `show`, `activated`
 		) VALUES (
 			:groupID, :name, :description, :color, :auto_assign_regist, :system_group, :show, '1'
 		) ON DUPLICATE KEY UPDATE `groupID` = :groupID; ", array(
-			'groupID' => $groupID,
-			'name' => Validator_String::get($name),
-			'description' => Validator_String::get($description),
-			'color' => $color,
-			'auto_assign_regist' => ($auto_assign_regist ? 1 : 0),
-			'system_group' => ($system_group ? 1 : 0),
-			'show' => ($show ? 1 : 0)
-		));
-
-		//clear complete cache for all groups, so membership cache is also cleared
-		Cache::clear("groups");
-	}
-
-	public static function deleteGroup (int $groupID) {
-		$group = new Group();
-
-		try {
-			$group->loadById($groupID);
-		} catch (IllegalStateException $e) {
-			//group doesnt exists, we dont have to do anything
-			return;
-		}
-
-		$group->delete();
-	}
-
-	public static function addGroupToUser (int $groupID, int $userID, bool $group_leader = false) {
-		Database::getInstance()->execute("INSERT INTO `{praefix}group_members` (
+            'groupID' => $groupID,
+            'name' => Validator_String::get($name),
+            'description' => Validator_String::get($description),
+            'color' => $color,
+            'auto_assign_regist' => ($auto_assign_regist ? 1 : 0),
+            'system_group' => ($system_group ? 1 : 0),
+            'show' => ($show ? 1 : 0)
+        ));
+
+        //clear complete cache for all groups, so membership cache is also cleared
+        Cache::clear("groups");
+    }
+
+    public static function deleteGroup (int $groupID) {
+        $group = new Group();
+
+        try {
+            $group->loadById($groupID);
+        } catch (IllegalStateException $e) {
+            //group doesnt exists, we dont have to do anything
+            return;
+        }
+
+        $group->delete();
+    }
+
+    public static function addGroupToUser (int $groupID, int $userID, bool $group_leader = false) {
+        Database::getInstance()->execute("INSERT INTO `{praefix}group_members` (
 			`groupID`, `userID`, `group_leader`, `activated`
 		) VALUES (
 			:groupID, :userID, :group_leader, '1'
 		) ON DUPLICATE KEY UPDATE `group_leader` = :group_leader; ", array(
-			'groupID' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $groupID
-			),
-			'userID' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $userID
-			),
-			'group_leader' => ($group_leader ? 1 : 0)
-		));
-
-		//clear cache
-		Cache::clear("groups", "own-groups-" . $userID);
-	}
-
-	public static function removeGroupFromUser (int $groupID, int $userID) {
-		Database::getInstance()->execute("DELETE FROM `{praefix}group_members` WHERE `groupID` = :groupID AND `userID` = :userID; ", array(
-			'groupID' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $groupID
-			),
-			'userID' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $userID
-			)
-		));
-
-		//clear cache
-		Cache::clear("groups", "own-groups-" . $userID);
-	}
+            'groupID' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $groupID
+            ),
+            'userID' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $userID
+            ),
+            'group_leader' => ($group_leader ? 1 : 0)
+        ));
+
+        //clear cache
+        Cache::clear("groups", "own-groups-" . $userID);
+    }
+
+    public static function removeGroupFromUser (int $groupID, int $userID) {
+        Database::getInstance()->execute("DELETE FROM `{praefix}group_members` WHERE `groupID` = :groupID AND `userID` = :userID; ", array(
+            'groupID' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $groupID
+            ),
+            'userID' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $userID
+            )
+        ));
+
+        //clear cache
+        Cache::clear("groups", "own-groups-" . $userID);
+    }
 
 }
 

system/packages/com.jukusoft.cms.groups/classes/group.php

Indentation +206 added lines, -206 removed lines

@@ -27,212 +27,212 @@
 
 class Group {
 
-	protected $groupID = -1;
-	protected $row = null;
-
-	public function __construct() {
-		//
-	}
-
-	public function loadById (int $groupID) {
-		if (Cache::contains("groups", "group-" . $groupID)) {
-			$this->row = Cache::get("groups", "group-" . $groupID);
-		} else {
-			$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}groups` WHERE `groupID` = :groupID AND `acivated` = '1'; ", array(
-				'groupID' => array(
-					'type' => PDO::PARAM_INT,
-					'value' => $groupID
-				)
-			));
-
-			if (!$row) {
-				throw new IllegalStateException("Group with groupID " . $groupID . " doesnt exists.");
-			}
-
-			$this->row = $row;
-			$this->groupID = $row['groupID'];
-
-			//cache database row
-			Cache::put("groups", "group-" . $groupID, $row);
-		}
-	}
-
-	public function loadByRow (array $row) {
-		$this->row = $row;
-		$this->groupID = $row['groupID'];
-	}
-
-	public function update (string $name, string $description, string $color, bool $auto_assign_regist = false) {
-		//throw event
-		Events::throwEvent("before_update_group", array(
-			'groupID' => $this->groupID,
-			'old_row' => $this->row,
-			'name' => &$name,
-			'description' => &$description,
-			'color' => &$color,
-			'auto_assign_regist' => &$auto_assign_regist
-		));
-
-		Database::getInstance()->execute("UPDATE `{praefix}groups` SET `name` = :name, `description` = :description, `color` = :color, `auto_assign_regist` = :auto_assign_regist WHERE `groupID` = :groupID; ", array(
-			'name' => $name,
-			'description' => $description,
-			'color' => $color,
-			'auto_assign_regist' => ($auto_assign_regist ? 1 : 0),
-			'groupID' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $this->groupID
-			)
-		));
-
-		//throw event
-		Events::throwEvent("after_update_group", array(
-			'groupID' => $this->groupID,
-			'old_row' => $this->row,
-		));
-
-		//update row in-memory
-		$this->row['name'] = $name;
-		$this->row['description'] = $description;
-		$this->row['color'] = $color;
-		$this->row['auto_assign_regist'] = ($auto_assign_regist ? 1 : 0);
-
-		//clear cache
-		Cache::clear("groups", "group-" . $this->groupID);
-	}
-
-	public function putCache () {
-		//cache database row
-		Cache::put("groups", "group-" . $this->groupID, $this->row);
-	}
-
-	public function removeCache () {
-		//clear cache data for this group
-		Cache::clear("groups", "group-" . $this->groupID);
-	}
-
-	/**
-	 * get id of group
-	 *
-	 * @return id of group
-	 */
-	public function getGroupID () : int {
-		return $this->groupID;
-	}
-
-	/**
-	 * get name of group
-	 *
-	 * @return name of group
-	 */
-	public function getName () : string {
-		return $this->row['name'];
-	}
-
-	/**
-	 * get group description
-	 *
-	 * @return group description
-	 */
-	public function getDescription () : string {
-		return $this->row['description'];
-	}
-
-	/**
-	 * get color of group (e.q. #FF0000)
-	 *
-	 * @return color of group in hex
-	 */
-	public function getColor () : string {
-		return $this->row['color'];
-	}
-
-	/**
-	 * check, if group is a system group, so group cannot be deleted and is required by system
-	 *
-	 * @return true, if group is a system group
-	 */
-	public function isSystemGroup () : bool {
-		return $this->row['system_group'] === 1;
-	}
-
-	/**
-	 * check for auto assign flag, this is means a group is automatically assigned to users on registration
-	 *
-	 * @return true, if group is a auto assign group on registration
-	 */
-	public function isAutoAssignGroup () : bool {
-		return $this->row['auto_assign_regist'] === 1;
-	}
-
-	public function getRow () : array {
-		return $this->row;
-	}
-
-	public function visible () : bool {
-		return $this->row['show'] === 1;
-	}
-
-	public function hasRank () : bool {
-		return $this->row['rank'] !== "none";
-	}
-
-	public function getRank () : string {
-		return $this->row['rank'];
-	}
-
-	public function hasRankImage () : bool {
-		return $this->row['rank_image'] !== "none";
-	}
-
-	public function getRankImage () : string {
-		return $this->row['rank_image'];
-	}
-
-	public function isActivated () : bool {
-		return $this->row['activated'] === 1;
-	}
-
-	public function delete () {
-		if ($this->groupID <= 0) {
-			throw new IllegalStateException("groupID cannot be <= 0, maybe group wasnt loaded with loadById() or loadByRow()?");
-		}
-
-		$delete_group = true;
-
-		//throw event, so plugins can avoid deleting of groups
-		Events::throwEvent("before_delete_group", array(
-			'groupID' => $this->groupID,
-			'row' => $this->row,
-			'delete_group' => &$delete_group
-		));
-
-		if ($delete_group) {
-			//delete group from database
-			Database::getInstance()->execute("DELETE * FROM `{praefix}groups` WHERE `groupID` = :groupID; ", array(
-				'groupID' => array(
-					'type' => PDO::PARAM_INT,
-					'value' => $this->groupID
-				)
-			));
-
-			//delete all members of group
-			Database::getInstance()->execute("DELETE * FROM `{praefix}group_members` WHERE `groupID` = :groupID; ", array(
-				'groupID' => array(
-					'type' => PDO::PARAM_INT,
-					'value' => $this->groupID
-				)
-			));
-
-			//clear cache
-			Cache::clear("groups", "group-" . $this->groupID);
-
-			//throw event, so plugins can cleanup
-			Events::throwEvent("after_delete_group", array(
-				'groupID' => $this->groupID,
-				'row' => $this->row
-			));
-		}
-	}
+    protected $groupID = -1;
+    protected $row = null;
+
+    public function __construct() {
+        //
+    }
+
+    public function loadById (int $groupID) {
+        if (Cache::contains("groups", "group-" . $groupID)) {
+            $this->row = Cache::get("groups", "group-" . $groupID);
+        } else {
+            $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}groups` WHERE `groupID` = :groupID AND `acivated` = '1'; ", array(
+                'groupID' => array(
+                    'type' => PDO::PARAM_INT,
+                    'value' => $groupID
+                )
+            ));
+
+            if (!$row) {
+                throw new IllegalStateException("Group with groupID " . $groupID . " doesnt exists.");
+            }
+
+            $this->row = $row;
+            $this->groupID = $row['groupID'];
+
+            //cache database row
+            Cache::put("groups", "group-" . $groupID, $row);
+        }
+    }
+
+    public function loadByRow (array $row) {
+        $this->row = $row;
+        $this->groupID = $row['groupID'];
+    }
+
+    public function update (string $name, string $description, string $color, bool $auto_assign_regist = false) {
+        //throw event
+        Events::throwEvent("before_update_group", array(
+            'groupID' => $this->groupID,
+            'old_row' => $this->row,
+            'name' => &$name,
+            'description' => &$description,
+            'color' => &$color,
+            'auto_assign_regist' => &$auto_assign_regist
+        ));
+
+        Database::getInstance()->execute("UPDATE `{praefix}groups` SET `name` = :name, `description` = :description, `color` = :color, `auto_assign_regist` = :auto_assign_regist WHERE `groupID` = :groupID; ", array(
+            'name' => $name,
+            'description' => $description,
+            'color' => $color,
+            'auto_assign_regist' => ($auto_assign_regist ? 1 : 0),
+            'groupID' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $this->groupID
+            )
+        ));
+
+        //throw event
+        Events::throwEvent("after_update_group", array(
+            'groupID' => $this->groupID,
+            'old_row' => $this->row,
+        ));
+
+        //update row in-memory
+        $this->row['name'] = $name;
+        $this->row['description'] = $description;
+        $this->row['color'] = $color;
+        $this->row['auto_assign_regist'] = ($auto_assign_regist ? 1 : 0);
+
+        //clear cache
+        Cache::clear("groups", "group-" . $this->groupID);
+    }
+
+    public function putCache () {
+        //cache database row
+        Cache::put("groups", "group-" . $this->groupID, $this->row);
+    }
+
+    public function removeCache () {
+        //clear cache data for this group
+        Cache::clear("groups", "group-" . $this->groupID);
+    }
+
+    /**
+     * get id of group
+     *
+     * @return id of group
+     */
+    public function getGroupID () : int {
+        return $this->groupID;
+    }
+
+    /**
+     * get name of group
+     *
+     * @return name of group
+     */
+    public function getName () : string {
+        return $this->row['name'];
+    }
+
+    /**
+     * get group description
+     *
+     * @return group description
+     */
+    public function getDescription () : string {
+        return $this->row['description'];
+    }
+
+    /**
+     * get color of group (e.q. #FF0000)
+     *
+     * @return color of group in hex
+     */
+    public function getColor () : string {
+        return $this->row['color'];
+    }
+
+    /**
+     * check, if group is a system group, so group cannot be deleted and is required by system
+     *
+     * @return true, if group is a system group
+     */
+    public function isSystemGroup () : bool {
+        return $this->row['system_group'] === 1;
+    }
+
+    /**
+     * check for auto assign flag, this is means a group is automatically assigned to users on registration
+     *
+     * @return true, if group is a auto assign group on registration
+     */
+    public function isAutoAssignGroup () : bool {
+        return $this->row['auto_assign_regist'] === 1;
+    }
+
+    public function getRow () : array {
+        return $this->row;
+    }
+
+    public function visible () : bool {
+        return $this->row['show'] === 1;
+    }
+
+    public function hasRank () : bool {
+        return $this->row['rank'] !== "none";
+    }
+
+    public function getRank () : string {
+        return $this->row['rank'];
+    }
+
+    public function hasRankImage () : bool {
+        return $this->row['rank_image'] !== "none";
+    }
+
+    public function getRankImage () : string {
+        return $this->row['rank_image'];
+    }
+
+    public function isActivated () : bool {
+        return $this->row['activated'] === 1;
+    }
+
+    public function delete () {
+        if ($this->groupID <= 0) {
+            throw new IllegalStateException("groupID cannot be <= 0, maybe group wasnt loaded with loadById() or loadByRow()?");
+        }
+
+        $delete_group = true;
+
+        //throw event, so plugins can avoid deleting of groups
+        Events::throwEvent("before_delete_group", array(
+            'groupID' => $this->groupID,
+            'row' => $this->row,
+            'delete_group' => &$delete_group
+        ));
+
+        if ($delete_group) {
+            //delete group from database
+            Database::getInstance()->execute("DELETE * FROM `{praefix}groups` WHERE `groupID` = :groupID; ", array(
+                'groupID' => array(
+                    'type' => PDO::PARAM_INT,
+                    'value' => $this->groupID
+                )
+            ));
+
+            //delete all members of group
+            Database::getInstance()->execute("DELETE * FROM `{praefix}group_members` WHERE `groupID` = :groupID; ", array(
+                'groupID' => array(
+                    'type' => PDO::PARAM_INT,
+                    'value' => $this->groupID
+                )
+            ));
+
+            //clear cache
+            Cache::clear("groups", "group-" . $this->groupID);
+
+            //throw event, so plugins can cleanup
+            Events::throwEvent("after_delete_group", array(
+                'groupID' => $this->groupID,
+                'row' => $this->row
+            ));
+        }
+    }
 
 }
 

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

Indentation +3 added lines, -3 removed lines

@@ -27,9 +27,9 @@
 
 class LoginHandler {
 
-	public static function handle () : array {
-		//
-	}
+    public static function handle () : array {
+        //
+    }
 
 }
 

system/packages/com.jukusoft.cms.page/classes/pagerights.php

Indentation +142 added lines, -142 removed lines

@@ -27,160 +27,160 @@
 
 class PageRights {
 
-	protected $pageID = 0;
-	protected $page = null;
-	protected $group_rows = null;
-	protected $user_rows = null;
-
-	public function __construct(Page $page) {
-		$this->pageID = $page->getPageID();
-		$this->page = $page;
-	}
-
-	public function load () {
-		if (Cache::contains("page_rights", "page_" . $this->pageID)) {
-			$this->group_rows = Cache::get("page_rights", "page_" . $this->pageID);
-		} else {
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}page_rights` WHERE `pageID` = :pageID; ", array(
-				'pageID' => array(
-					'type' => PDO::PARAM_INT,
-					'value' => $this->pageID
-				)
-			));
-
-			$array = array();
-
-			foreach ($rows as $row) {
-				if (!isset($array[$row['groupID']])) {
-					$array[$row['groupID']] = array();
-				}
-
-				$array[$row['groupID']][$row['token']] = $row['value'];
-			}
-
-			//cache results
-			Cache::put("page_rights", "page_" . $this->pageID, $array);
-
-			$this->group_rows = $array;
-		}
-
-		if (Cache::contains("page_rights", "page_user_" . $this->pageID)) {
-			$this->user_rows = Cache::get("page_rights", "page_user_" . $this->pageID);
-		} else {
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}page_user_rights` WHERE `pageID` = :pageID; ", array(
-				'pageID' => array(
-					'type' => PDO::PARAM_INT,
-					'value' => $this->pageID
-				)
-			));
-
-			$array = array();
-
-			foreach ($rows as $row) {
-				if (!isset($array[$row['userID']])) {
-					$array[$row['userID']] = array();
-				}
-
-				$array[$row['userID']][$row['token']] = $row['value'];
-			}
-
-			//cache results
-			Cache::put("page_rights", "page_user_" . $this->pageID, $array);
-
-			$this->user_rows = $array;
-		}
-	}
-
-	/**
-	 * check, if user has right for this page
-	 */
-	public function checkRights (int $userID, array $groupIDs, string $token) : bool {
-		$value = 0;
-
-		//per default published pages are visible, if not specified
-		if ($token == "see") {
-			$value = -1;
-		}
-
-		//iterate through user groups
-		foreach ($groupIDs as $groupID) {
-			//check, if permissions exists for groupID
-			if (!isset($this->group_rows[$groupID])) {
-				//no rights specified for this group
-				continue;
-			}
-
-			if (!isset($this->group_rows[$groupID][$token])) {
-				continue;
-			}
-
-			$row_value = $this->group_rows[$groupID][$token];
-
-			if ($row_value > $value) {
-				$value = $row_value;
-			}
-		}
-
-		if (isset($this->user_rows[$userID]) && isset($this->user_rows[$userID][$token])) {
-			$row_value = $this->user_rows[$userID][$token];
-
-			if ($row_value > $value) {
-				$value = $row_value;
-			}
-		}
-
-		return $value == 1 || $value == -1;
-	}
-
-	protected function mergeRow (array $permissions, string $token, int $value) : array {
-		if ($value < 0 || $value > 2) {
-			throw new IllegalArgumentException("token ('" . $token . "') value '" . $value . "' is not allowed, value has to be >= 0 and <= 2.");
-		}
-
-		if (!isset($permissions[$token])) {
-			$permissions[$token] = $value;
-		} else {
-			$current_value = $permissions[$token];
-
-			if ($value > $current_value) {
-				$permissions[$token] = $value;
-			}
-		}
+    protected $pageID = 0;
+    protected $page = null;
+    protected $group_rows = null;
+    protected $user_rows = null;
+
+    public function __construct(Page $page) {
+        $this->pageID = $page->getPageID();
+        $this->page = $page;
+    }
+
+    public function load () {
+        if (Cache::contains("page_rights", "page_" . $this->pageID)) {
+            $this->group_rows = Cache::get("page_rights", "page_" . $this->pageID);
+        } else {
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}page_rights` WHERE `pageID` = :pageID; ", array(
+                'pageID' => array(
+                    'type' => PDO::PARAM_INT,
+                    'value' => $this->pageID
+                )
+            ));
+
+            $array = array();
+
+            foreach ($rows as $row) {
+                if (!isset($array[$row['groupID']])) {
+                    $array[$row['groupID']] = array();
+                }
+
+                $array[$row['groupID']][$row['token']] = $row['value'];
+            }
+
+            //cache results
+            Cache::put("page_rights", "page_" . $this->pageID, $array);
+
+            $this->group_rows = $array;
+        }
+
+        if (Cache::contains("page_rights", "page_user_" . $this->pageID)) {
+            $this->user_rows = Cache::get("page_rights", "page_user_" . $this->pageID);
+        } else {
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}page_user_rights` WHERE `pageID` = :pageID; ", array(
+                'pageID' => array(
+                    'type' => PDO::PARAM_INT,
+                    'value' => $this->pageID
+                )
+            ));
+
+            $array = array();
+
+            foreach ($rows as $row) {
+                if (!isset($array[$row['userID']])) {
+                    $array[$row['userID']] = array();
+                }
+
+                $array[$row['userID']][$row['token']] = $row['value'];
+            }
+
+            //cache results
+            Cache::put("page_rights", "page_user_" . $this->pageID, $array);
+
+            $this->user_rows = $array;
+        }
+    }
+
+    /**
+     * check, if user has right for this page
+     */
+    public function checkRights (int $userID, array $groupIDs, string $token) : bool {
+        $value = 0;
+
+        //per default published pages are visible, if not specified
+        if ($token == "see") {
+            $value = -1;
+        }
+
+        //iterate through user groups
+        foreach ($groupIDs as $groupID) {
+            //check, if permissions exists for groupID
+            if (!isset($this->group_rows[$groupID])) {
+                //no rights specified for this group
+                continue;
+            }
+
+            if (!isset($this->group_rows[$groupID][$token])) {
+                continue;
+            }
+
+            $row_value = $this->group_rows[$groupID][$token];
+
+            if ($row_value > $value) {
+                $value = $row_value;
+            }
+        }
+
+        if (isset($this->user_rows[$userID]) && isset($this->user_rows[$userID][$token])) {
+            $row_value = $this->user_rows[$userID][$token];
+
+            if ($row_value > $value) {
+                $value = $row_value;
+            }
+        }
+
+        return $value == 1 || $value == -1;
+    }
+
+    protected function mergeRow (array $permissions, string $token, int $value) : array {
+        if ($value < 0 || $value > 2) {
+            throw new IllegalArgumentException("token ('" . $token . "') value '" . $value . "' is not allowed, value has to be >= 0 and <= 2.");
+        }
+
+        if (!isset($permissions[$token])) {
+            $permissions[$token] = $value;
+        } else {
+            $current_value = $permissions[$token];
+
+            if ($value > $current_value) {
+                $permissions[$token] = $value;
+            }
+        }
 
-		return $permissions;
-	}
+        return $permissions;
+    }
 
-	public static function setDefaultAllowedGroups (int $pageID, array $groupIDs) {
-		if (sizeof($groupIDs) == 0) {
-			throw new IllegalArgumentException("no groupIDs was set.");
-		}
+    public static function setDefaultAllowedGroups (int $pageID, array $groupIDs) {
+        if (sizeof($groupIDs) == 0) {
+            throw new IllegalArgumentException("no groupIDs was set.");
+        }
 
-		$lines = array();
+        $lines = array();
 
-		foreach ($groupIDs as $groupID) {
-			//validate groupID
-			$groupID = Validator_Int::get($groupID);
+        foreach ($groupIDs as $groupID) {
+            //validate groupID
+            $groupID = Validator_Int::get($groupID);
 
-			$lines[] = "('" . $groupID . "', '" . $pageID . "', 'see', '1')";
-		}
-
-		$line_str = implode(",\n", $lines);
-
-		Database::getInstance()->execute("INSERT INTO `{praefix}page_rights` (
+            $lines[] = "('" . $groupID . "', '" . $pageID . "', 'see', '1')";
+        }
+
+        $line_str = implode(",\n", $lines);
+
+        Database::getInstance()->execute("INSERT INTO `{praefix}page_rights` (
 			`groupID`, `pageID`, `token`, `value`
 		) VALUES 
 			" . $line_str . "
 		ON DUPLICATE KEY UPDATE `value` = '1'; ");
 
-		//clear cache
-		Cache::clear("page_rights", "page_" . $pageID);
-	}
+        //clear cache
+        Cache::clear("page_rights", "page_" . $pageID);
+    }
 
-	public static function setDefaultAllowedGroupsForAlias (string $alias, array $groupIDs) {
-		$pageID = Page::getPageIDByAlias($alias);
+    public static function setDefaultAllowedGroupsForAlias (string $alias, array $groupIDs) {
+        $pageID = Page::getPageIDByAlias($alias);
 
-		self::setDefaultAllowedGroups($pageID, $groupIDs);
-	}
+        self::setDefaultAllowedGroups($pageID, $groupIDs);
+    }
 
 }
 

system/packages/com.jukusoft.cms.page/classes/pageloader.php

Indentation +7 added lines, -7 removed lines

@@ -27,15 +27,15 @@
 
 class PageLoader {
 
-	public static function loadInstance (string $type_name) : PageType {
-		if ($type_name == null || empty($type_name)) {
-			throw new NullPointerException("page_type cannot be null or empty.");
-		}
+    public static function loadInstance (string $type_name) : PageType {
+        if ($type_name == null || empty($type_name)) {
+            throw new NullPointerException("page_type cannot be null or empty.");
+        }
 
-		$class = $type_name;//DataBase::getInstance()->escape($type_name);
+        $class = $type_name;//DataBase::getInstance()->escape($type_name);
 
-		return new $class();
-	}
+        return new $class();
+    }
 
 }
 

system/packages/com.jukusoft.cms.db.upgrader/classes/dbtable.php

Indentation +100 added lines, -100 removed lines

@@ -848,11 +848,11 @@ 
             }
 
             if (isset($column['default']) && $column['default'] != null) {
-            	if ($column['default'] === "CURRENT_TIMESTAMP") {
-					$default_str = " DEFAULT CURRENT_TIMESTAMP";
-				} else {
-					$default_str = " DEFAULT '" . $column['default'] . "'";
-				}
+                if ($column['default'] === "CURRENT_TIMESTAMP") {
+                    $default_str = " DEFAULT CURRENT_TIMESTAMP";
+                } else {
+                    $default_str = " DEFAULT '" . $column['default'] . "'";
+                }
             }
 
             switch ($column['type']) {
@@ -1298,10 +1298,10 @@ 
             //create table structure
             $this->create();
         } else {
-        	var_dump($this->detectTableChanges());
+            var_dump($this->detectTableChanges());
 
             //TODO: add code here
-			//throw new Exception("Upgrading of tables isnt supported yet.");
+            //throw new Exception("Upgrading of tables isnt supported yet.");
         }
     }
 
@@ -1420,109 +1420,109 @@ 
     }
 
     protected function detectTableChanges () : array {
-    	//columns
-    	$changed_columns = array();
-    	$added_columns = array();
-    	$removed_columns = array();
+        //columns
+        $changed_columns = array();
+        $added_columns = array();
+        $removed_columns = array();
 
-    	//indexes
-		$changed_indexes = array();
-		$added_indexes = array();
-		$removed_indexes = array();
+        //indexes
+        $changed_indexes = array();
+        $added_indexes = array();
+        $removed_indexes = array();
 
 
         //compare current state with should state
-		$current_columns = $this->listColumnsFromDatabase();
-		$should_columns = $this->columns;
-
-		//check for added columns
-		foreach ($should_columns as $name=>$column_data) {
-			if (!isset($current_columns[$name])) {
-				//new column found
-				$added_columns[$name] = $should_columns[$name];
-			}
-		}
-
-		//check for removed columns
-		foreach ($current_columns as $name=>$column_data) {
-			if (!isset($should_columns[$name])) {
-				//removed column found
-				$removed_columns[$name] = $current_columns[$name];
-			}
-		}
-
-		//check for changed columns
-		foreach ($should_columns as $name=>$column_data) {
-			//we dont have to check this column, if the column was added
-			if (isset($added_columns[$name])) {
-				continue;
-			}
-
-			//we dont have to check this column, if the column was removed
-			if (isset($removed_columns[$name])) {
-				continue;
-			}
-
-			//check for differences
-			foreach ($should_columns[$name] as $key=>$value) {
-				if (!isset($should_columns[$name][$key]) && !@is_null($should_columns[$name][$key])) {
-					echo "Column '" . $key . "' not found.\n\n";
-
-					echo "should columns:\n";
-					var_dump($should_columns);
-
-					echo "\n\ncurrent columns:\n";
-					var_dump($current_columns);
-
-					echo "\n\n";
-				}
-
-				if (strcmp($name, "charset") && @$current_columns[$name][$key] == "NULL") {
-					continue;
-				}
-
-				if (strcmp($name, "bool(false)")) {
-					continue;
-				}
-
-				if (!isset($current_columns[$name][$key]) && !@is_null($current_columns[$name][$key])) {
-					echo "$" . "current_columns['" . $name . "']['" . $key . "'] not found:\n";
-					var_dump($current_columns);
-
-					echo "\n\nshould columns:\n";
-					var_dump($should_columns);
-				}
-
-				if ($current_columns[$name][$key] != $value) {
-					$changed_columns[$name] = $should_columns[$name];
-				}
-			}
-		}
-
-		//TODO: check for changed indexes / keys
-
-		//TODO: change database engine if neccessary
-
-		//TODO: change charset if neccessary
-
-		return array(
-			'added_columns' => $added_columns,
-			"removed_columns" => $removed_columns,
-			"changed_columns" => $changed_columns,
-			"added_indexes" => $added_indexes,
-			"removed_indexes" => $removed_indexes,
-			"changed_indexes" => $changed_indexes
-		);
+        $current_columns = $this->listColumnsFromDatabase();
+        $should_columns = $this->columns;
+
+        //check for added columns
+        foreach ($should_columns as $name=>$column_data) {
+            if (!isset($current_columns[$name])) {
+                //new column found
+                $added_columns[$name] = $should_columns[$name];
+            }
+        }
+
+        //check for removed columns
+        foreach ($current_columns as $name=>$column_data) {
+            if (!isset($should_columns[$name])) {
+                //removed column found
+                $removed_columns[$name] = $current_columns[$name];
+            }
+        }
+
+        //check for changed columns
+        foreach ($should_columns as $name=>$column_data) {
+            //we dont have to check this column, if the column was added
+            if (isset($added_columns[$name])) {
+                continue;
+            }
+
+            //we dont have to check this column, if the column was removed
+            if (isset($removed_columns[$name])) {
+                continue;
+            }
+
+            //check for differences
+            foreach ($should_columns[$name] as $key=>$value) {
+                if (!isset($should_columns[$name][$key]) && !@is_null($should_columns[$name][$key])) {
+                    echo "Column '" . $key . "' not found.\n\n";
+
+                    echo "should columns:\n";
+                    var_dump($should_columns);
+
+                    echo "\n\ncurrent columns:\n";
+                    var_dump($current_columns);
+
+                    echo "\n\n";
+                }
+
+                if (strcmp($name, "charset") && @$current_columns[$name][$key] == "NULL") {
+                    continue;
+                }
+
+                if (strcmp($name, "bool(false)")) {
+                    continue;
+                }
+
+                if (!isset($current_columns[$name][$key]) && !@is_null($current_columns[$name][$key])) {
+                    echo "$" . "current_columns['" . $name . "']['" . $key . "'] not found:\n";
+                    var_dump($current_columns);
+
+                    echo "\n\nshould columns:\n";
+                    var_dump($should_columns);
+                }
+
+                if ($current_columns[$name][$key] != $value) {
+                    $changed_columns[$name] = $should_columns[$name];
+                }
+            }
+        }
+
+        //TODO: check for changed indexes / keys
+
+        //TODO: change database engine if neccessary
+
+        //TODO: change charset if neccessary
+
+        return array(
+            'added_columns' => $added_columns,
+            "removed_columns" => $removed_columns,
+            "changed_columns" => $changed_columns,
+            "added_indexes" => $added_indexes,
+            "removed_indexes" => $removed_indexes,
+            "changed_indexes" => $changed_indexes
+        );
     }
 
     /**
      * backup table
-	 *
-	 * @param $output_file file where sql query should be written in
+     *
+     * @param $output_file file where sql query should be written in
      */
     public function backup (string $output_file) : void {
-    	//TODO: implement this feature
-	}
+        //TODO: implement this feature
+    }
 
     public function truncate () {
         $this->db_driver->query("TRUNCATE `" . $this->table_name . "`; ");