JuKu / JuKuCMS

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

Spacing +7 added lines, -7 removed lines

@@ -33,7 +33,7 @@ 
 		//
 	}
 
-	public function loadMyGroups (int $userID) {
+	public function loadMyGroups(int $userID) {
 		if (Cache::contains("groups", "own-groups-" . $userID)) {
 			$this->my_groups = Cache::get("groups", "own-groups-" . $userID);
 		} else {
@@ -51,7 +51,7 @@ 
 		}
 	}
 
-	public function listGroupIDs () : array {
+	public function listGroupIDs() : array {
 		$array = array();
 
 		foreach ($this->my_groups as $group_row) {
@@ -61,7 +61,7 @@ 
 		return $array;
 	}
 
-	public function listMyGroups () : array {
+	public function listMyGroups() : array {
 		$array = array();
 
 		foreach ($this->my_groups as $row) {
@@ -74,7 +74,7 @@ 
 		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) {
+	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();
 
@@ -100,7 +100,7 @@ 
 		Cache::clear("groups");
 	}
 
-	public static function deleteGroup (int $groupID) {
+	public static function deleteGroup(int $groupID) {
 		$group = new Group();
 
 		try {
@@ -113,7 +113,7 @@ 
 		$group->delete();
 	}
 
-	public static function addGroupToUser (int $groupID, int $userID, bool $group_leader = false) {
+	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 (
@@ -134,7 +134,7 @@ 
 		Cache::clear("groups", "own-groups-" . $userID);
 	}
 
-	public static function removeGroupFromUser (int $groupID, int $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,

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

Spacing +19 added lines, -19 removed lines

@@ -34,7 +34,7 @@ 
 		//
 	}
 
-	public function loadById (int $groupID) {
+	public function loadById(int $groupID) {
 		if (Cache::contains("groups", "group-" . $groupID)) {
 			$this->row = Cache::get("groups", "group-" . $groupID);
 		} else {
@@ -57,12 +57,12 @@ 
 		}
 	}
 
-	public function loadByRow (array $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) {
+	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,
@@ -100,12 +100,12 @@ 
 		Cache::clear("groups", "group-" . $this->groupID);
 	}
 
-	public function putCache () {
+	public function putCache() {
 		//cache database row
 		Cache::put("groups", "group-" . $this->groupID, $this->row);
 	}
 
-	public function removeCache () {
+	public function removeCache() {
 		//clear cache data for this group
 		Cache::clear("groups", "group-" . $this->groupID);
 	}
@@ -115,7 +115,7 @@ 
 	 *
 	 * @return id of group
 	 */
-	public function getGroupID () : int {
+	public function getGroupID() : int {
 		return $this->groupID;
 	}
 
@@ -124,7 +124,7 @@ 
 	 *
 	 * @return name of group
 	 */
-	public function getName () : string {
+	public function getName() : string {
 		return $this->row['name'];
 	}
 
@@ -133,7 +133,7 @@ 
 	 *
 	 * @return group description
 	 */
-	public function getDescription () : string {
+	public function getDescription() : string {
 		return $this->row['description'];
 	}
 
@@ -142,7 +142,7 @@ 
 	 *
 	 * @return color of group in hex
 	 */
-	public function getColor () : string {
+	public function getColor() : string {
 		return $this->row['color'];
 	}
 
@@ -151,7 +151,7 @@ 
 	 *
 	 * @return true, if group is a system group
 	 */
-	public function isSystemGroup () : bool {
+	public function isSystemGroup() : bool {
 		return $this->row['system_group'] === 1;
 	}
 
@@ -160,39 +160,39 @@ 
 	 *
 	 * @return true, if group is a auto assign group on registration
 	 */
-	public function isAutoAssignGroup () : bool {
+	public function isAutoAssignGroup() : bool {
 		return $this->row['auto_assign_regist'] === 1;
 	}
 
-	public function getRow () : array {
+	public function getRow() : array {
 		return $this->row;
 	}
 
-	public function visible () : bool {
+	public function visible() : bool {
 		return $this->row['show'] === 1;
 	}
 
-	public function hasRank () : bool {
+	public function hasRank() : bool {
 		return $this->row['rank'] !== "none";
 	}
 
-	public function getRank () : string {
+	public function getRank() : string {
 		return $this->row['rank'];
 	}
 
-	public function hasRankImage () : bool {
+	public function hasRankImage() : bool {
 		return $this->row['rank_image'] !== "none";
 	}
 
-	public function getRankImage () : string {
+	public function getRankImage() : string {
 		return $this->row['rank_image'];
 	}
 
-	public function isActivated () : bool {
+	public function isActivated() : bool {
 		return $this->row['activated'] === 1;
 	}
 
-	public function delete () {
+	public function delete() {
 		if ($this->groupID <= 0) {
 			throw new IllegalStateException("groupID cannot be <= 0, maybe group wasnt loaded with loadById() or loadByRow()?");
 		}

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
 		$this->page = $page;
 	}
 
-	public function load () {
+	public function load() {
 		if (Cache::contains("page_rights", "page_" . $this->pageID)) {
 			$this->group_rows = Cache::get("page_rights", "page_" . $this->pageID);
 		} else {
@@ -94,7 +94,7 @@ 
 	/**
 	 * check, if user has right for this page
 	 */
-	public function checkRights (int $userID, array $groupIDs, string $token) : bool {
+	public function checkRights(int $userID, array $groupIDs, string $token) : bool {
 		$value = 0;
 
 		//per default published pages are visible, if not specified
@@ -132,7 +132,7 @@ 
 		return $value == 1 || $value == -1;
 	}
 
-	protected function mergeRow (array $permissions, string $token, int $value) : array {
+	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.");
 		}
@@ -150,7 +150,7 @@ 
 		return $permissions;
 	}
 
-	public static function setDefaultAllowedGroups (int $pageID, array $groupIDs) {
+	public static function setDefaultAllowedGroups(int $pageID, array $groupIDs) {
 		if (sizeof($groupIDs) == 0) {
 			throw new IllegalArgumentException("no groupIDs was set.");
 		}
@@ -176,7 +176,7 @@ 
 		Cache::clear("page_rights", "page_" . $pageID);
 	}
 
-	public static function setDefaultAllowedGroupsForAlias (string $alias, array $groupIDs) {
+	public static function setDefaultAllowedGroupsForAlias(string $alias, array $groupIDs) {
 		$pageID = Page::getPageIDByAlias($alias);
 
 		self::setDefaultAllowedGroups($pageID, $groupIDs);

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

Spacing +2 added lines, -2 removed lines

@@ -27,12 +27,12 @@
 
 class PageLoader {
 
-	public static function loadInstance (string $type_name) : PageType {
+	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();
 	}

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

Spacing +66 added lines, -66 removed lines

@@ -50,12 +50,12 @@ 
 
     protected $db_driver = null;
 
-    public function __construct (string $table_name, DBDriver &$db_driver) {
+    public function __construct(string $table_name, DBDriver &$db_driver) {
         $this->table_name = $this->escape($table_name);
         $this->db_driver = &$db_driver;
     }
 
-    public function setEngine (string $engine_name) {
+    public function setEngine(string $engine_name) {
         $found = false;
         $founded_engine = "";
 
@@ -77,15 +77,15 @@ 
         $this->db_engine = $engine_name;
     }
 
-    public function setCharset (string $charset) {
+    public function setCharset(string $charset) {
         $this->charset = utf8_encode(htmlentities($charset));
     }
 
-    public function setTmpTable (bool $tmp_table) {
+    public function setTmpTable(bool $tmp_table) {
         $this->temp_table = $tmp_table;
     }
 
-    public function setAutoIncrementStartValue (int $value) {
+    public function setAutoIncrementStartValue(int $value) {
         $this->auto_increment = $value;
     }
 
@@ -97,7 +97,7 @@ 
      * @param $unsigned unsigned value false / true
      * @param $zerofill true, if values should be filled with 0, if value length isnt length of column
      */
-    public function addInt (string $name, int $length = null, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
+    public function addInt(string $name, int $length = null, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
         $this->columns[$name] = array(
             'type' => "int",
             'name' => $name,
@@ -113,7 +113,7 @@ 
     /**
      * addInteger() is an alias to addInt()
      */
-    public function addInteger (string $name, int $length = null, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
+    public function addInteger(string $name, int $length = null, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
         $this->addInt($name, $length, $not_null, $auto_increment, $default_value, $unsigned, $zerofill);
     }
 
@@ -124,7 +124,7 @@ 
      * @param $length length of column
      * @param $zerofill true, if values should be filled with 0, if value length isnt length of column
      */
-    public function addUnsignedInteger (string $name, int $length = null, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $zerofill = false) {
+    public function addUnsignedInteger(string $name, int $length = null, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $zerofill = false) {
         $this->columns[$name] = array(
             'type' => "int",
             'name' => $name,
@@ -137,7 +137,7 @@ 
         );
     }
 
-    public function addVarchar (string $name, int $length = 255, bool $not_null = false, string $default_value = null, bool $binary = false, string $charset = null) {
+    public function addVarchar(string $name, int $length = 255, bool $not_null = false, string $default_value = null, bool $binary = false, string $charset = null) {
         $this->columns[$name] = array(
             'type' => "varchar",
             'name' => $name,
@@ -149,7 +149,7 @@ 
         );
     }
 
-    public function addBit (string $name, int $length = null, bool $not_null = false, string $default_value = null) {
+    public function addBit(string $name, int $length = null, bool $not_null = false, string $default_value = null) {
         $this->columns[$name] = array(
             'type' => "bit",
             'name' => $name,
@@ -159,7 +159,7 @@ 
         );
     }
 
-    public function addBinary (string $name, int $length = null, bool $not_null = false, string $default_value = null) {
+    public function addBinary(string $name, int $length = null, bool $not_null = false, string $default_value = null) {
         $this->columns[$name] = array(
             'type' => "binary",
             'name' => $name,
@@ -169,7 +169,7 @@ 
         );
     }
 
-    public function addText (string $name, bool $not_null = false, string $default_value = null, bool $binary = false, string $charset = null) {
+    public function addText(string $name, bool $not_null = false, string $default_value = null, bool $binary = false, string $charset = null) {
         $this->columns[$name] = array(
             'type' => "text",
             'name' => $name,
@@ -180,7 +180,7 @@ 
         );
     }
 
-    public function addChar (string $name, int $length = 255, bool $not_null = false, string $default_value = null, bool $binary = false, string $charset = null) {
+    public function addChar(string $name, int $length = 255, bool $not_null = false, string $default_value = null, bool $binary = false, string $charset = null) {
         $this->columns[$name] = array(
             'type' => "char",
             'name' => $name,
@@ -192,7 +192,7 @@ 
         );
     }
 
-    public function addTinyText (string $name, bool $not_null = false, string $default_value = null, bool $binary = false, string $charset = null) {
+    public function addTinyText(string $name, bool $not_null = false, string $default_value = null, bool $binary = false, string $charset = null) {
         $this->columns[$name] = array(
             'type' => "tinytext",
             'name' => $name,
@@ -203,7 +203,7 @@ 
         );
     }
 
-    public function addMediumText (string $name, bool $not_null = false, string $default_value = null, bool $binary = false, string $charset = null) {
+    public function addMediumText(string $name, bool $not_null = false, string $default_value = null, bool $binary = false, string $charset = null) {
         $this->columns[$name] = array(
             'type' => "mediumtext",
             'name' => $name,
@@ -214,7 +214,7 @@ 
         );
     }
 
-    public function addLongText (string $name, bool $not_null = false, string $default_value = null, bool $binary = false, string $charset = null) {
+    public function addLongText(string $name, bool $not_null = false, string $default_value = null, bool $binary = false, string $charset = null) {
         $this->columns[$name] = array(
             'type' => "longtext",
             'name' => $name,
@@ -225,7 +225,7 @@ 
         );
     }
 
-    public function addTinyInt (string $name, int $length = null, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
+    public function addTinyInt(string $name, int $length = null, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
         $this->columns[$name] = array(
             'type' => "tinyint",
             'name' => $name,
@@ -238,7 +238,7 @@ 
         );
     }
 
-    public function addSmallInt (string $name, int $length = null, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
+    public function addSmallInt(string $name, int $length = null, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
         $this->columns[$name] = array(
             'type' => "smallint",
             'name' => $name,
@@ -251,7 +251,7 @@ 
         );
     }
 
-    public function addMediumInt (string $name, int $length = null, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
+    public function addMediumInt(string $name, int $length = null, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
         $this->columns[$name] = array(
             'type' => "mediumint",
             'name' => $name,
@@ -264,7 +264,7 @@ 
         );
     }
 
-    public function addBigInt (string $name, int $length = null, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
+    public function addBigInt(string $name, int $length = null, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
         $this->columns[$name] = array(
             'type' => "bigint",
             'name' => $name,
@@ -277,7 +277,7 @@ 
         );
     }
 
-    public function addDecimal (string $name, int $length = 5, int $decimals = 2, bool $not_null = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
+    public function addDecimal(string $name, int $length = 5, int $decimals = 2, bool $not_null = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
         //DECIMAL doesnt support AUTO_INCREMENT
 
         $this->columns[$name] = array(
@@ -292,7 +292,7 @@ 
         );
     }
 
-    public function addNumeric (string $name, int $length = 5, int $decimals = 2, bool $not_null = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
+    public function addNumeric(string $name, int $length = 5, int $decimals = 2, bool $not_null = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
         //NUMERIC doesnt support AUTO_INCREMENT
 
         $this->columns[$name] = array(
@@ -307,7 +307,7 @@ 
         );
     }
 
-    public function addDouble (string $name, int $length = 5, int $decimals = 2, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
+    public function addDouble(string $name, int $length = 5, int $decimals = 2, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
         $this->columns[$name] = array(
             'type' => "double",
             'name' => $name,
@@ -321,7 +321,7 @@ 
         );
     }
 
-    public function addFloat (string $name, int $length = 5, int $decimals = 2, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
+    public function addFloat(string $name, int $length = 5, int $decimals = 2, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
         $this->columns[$name] = array(
             'type' => "float",
             'name' => $name,
@@ -335,7 +335,7 @@ 
         );
     }
 
-    public function addReal (string $name, int $length = 5, int $decimals = 2, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
+    public function addReal(string $name, int $length = 5, int $decimals = 2, bool $not_null = false, bool $auto_increment = false, int $default_value = null, bool $unsigned = false, bool $zerofill = false) {
         $this->columns[$name] = array(
             'type' => "real",
             'name' => $name,
@@ -349,7 +349,7 @@ 
         );
     }
 
-    public function addBlob (string $name, bool $not_null = false, string $default_value = null) {
+    public function addBlob(string $name, bool $not_null = false, string $default_value = null) {
         $this->columns[$name] = array(
             'type' => "blob",
             'name' => $name,
@@ -358,7 +358,7 @@ 
         );
     }
 
-    public function addTinyBlob (string $name, bool $not_null = false, string $default_value = null) {
+    public function addTinyBlob(string $name, bool $not_null = false, string $default_value = null) {
         $this->columns[$name] = array(
             'type' => "tinyblob",
             'name' => $name,
@@ -367,7 +367,7 @@ 
         );
     }
 
-    public function addMediumBlob (string $name, bool $not_null = false, string $default_value = null) {
+    public function addMediumBlob(string $name, bool $not_null = false, string $default_value = null) {
         $this->columns[$name] = array(
             'type' => "mediumblob",
             'name' => $name,
@@ -376,7 +376,7 @@ 
         );
     }
 
-    public function addLongBlob (string $name, bool $not_null = false, string $default_value = null) {
+    public function addLongBlob(string $name, bool $not_null = false, string $default_value = null) {
         $this->columns[$name] = array(
             'type' => "longblob",
             'name' => $name,
@@ -385,7 +385,7 @@ 
         );
     }
 
-    public function addEnum (string $name, $values = array(), bool $not_null = false, string $default_value = null, string $charset = null) {
+    public function addEnum(string $name, $values = array(), bool $not_null = false, string $default_value = null, string $charset = null) {
         $this->columns[$name] = array(
             'type' => "enum",
             'name' => $name,
@@ -396,7 +396,7 @@ 
         );
     }
 
-    public function addSet (string $name, array $values = array(), bool $not_null = false, string $default_value = null, string $charset = null) {
+    public function addSet(string $name, array $values = array(), bool $not_null = false, string $default_value = null, string $charset = null) {
         $this->columns[$name] = array(
             'type' => "set",
             'name' => $name,
@@ -407,7 +407,7 @@ 
         );
     }
 
-    public function addDate (string $name, bool $not_null = false, string $default_value = null) {
+    public function addDate(string $name, bool $not_null = false, string $default_value = null) {
         $this->columns[$name] = array(
             'type' => "date",
             'name' => $name,
@@ -416,7 +416,7 @@ 
         );
     }
 
-    public function addTime (string $name, bool $not_null = false, string $default_value = null, int $fsp = null) {
+    public function addTime(string $name, bool $not_null = false, string $default_value = null, int $fsp = null) {
         $this->columns[$name] = array(
             'type' => "time",
             'name' => $name,
@@ -426,7 +426,7 @@ 
         );
     }
 
-    public function addYear (string $name, bool $not_null = false, string $default_value = null) {
+    public function addYear(string $name, bool $not_null = false, string $default_value = null) {
         $this->columns[$name] = array(
             'type' => "year",
             'name' => $name,
@@ -435,7 +435,7 @@ 
         );
     }
 
-    public function addJSON (string $name, bool $not_null = false, string $default_value = null) {
+    public function addJSON(string $name, bool $not_null = false, string $default_value = null) {
         $this->columns[$name] = array(
             'type' => "json",
             'name' => $name,
@@ -444,7 +444,7 @@ 
         );
     }
 
-    public function addTimestamp (string $name, bool $not_null = false, string $default_value = null, bool $on_update_current_timestamp = false, int $fsp = null) {
+    public function addTimestamp(string $name, bool $not_null = false, string $default_value = null, bool $on_update_current_timestamp = false, int $fsp = null) {
         $this->columns[$name] = array(
             'type' => "timestamp",
             'name' => $name,
@@ -455,7 +455,7 @@ 
         );
     }
 
-    public function addDateTime (string $name, bool $not_null = false, string $default_value = null, int $fsp = null) {
+    public function addDateTime(string $name, bool $not_null = false, string $default_value = null, int $fsp = null) {
         $this->columns[$name] = array(
             'type' => "datetime",
             'name' => $name,
@@ -465,14 +465,14 @@ 
         );
     }
 
-    public function addPrimaryKey ($columns) {
+    public function addPrimaryKey($columns) {
         $this->indexes['primary'] = array(
             'type' => "primary",
             'columns' => $columns
         );
     }
 
-    public function addIndex ($columns, string $index_name = null) {
+    public function addIndex($columns, string $index_name = null) {
         if ($index_name == null) {
             if (!is_array($columns)) {
                 $index_name = "ix_" . $columns;
@@ -489,7 +489,7 @@ 
         );
     }
 
-    public function addUnique ($columns, string $index_name = null) {
+    public function addUnique($columns, string $index_name = null) {
         if ($index_name == null) {
             if (!is_array($columns)) {
                 $index_name = "uq_" . $columns;
@@ -506,7 +506,7 @@ 
         );
     }
 
-    public function addSpatial ($columns, string $index_name = null) {
+    public function addSpatial($columns, string $index_name = null) {
         if ($index_name == null) {
             if (!is_array($columns)) {
                 $index_name = "sp_" . $columns;
@@ -523,7 +523,7 @@ 
         );
     }
 
-    public function addFulltext ($columns, string $index_name = null) {
+    public function addFulltext($columns, string $index_name = null) {
         if ($index_name == null) {
             if (!is_array($columns)) {
                 $index_name = "ix_" . $columns;
@@ -540,7 +540,7 @@ 
         );
     }
 
-    public function addForeignKey ($columns, string $reference_table_name, $reference_columns, string $index_name = null, string $on_update = null, string $on_delete = null) {
+    public function addForeignKey($columns, string $reference_table_name, $reference_columns, string $index_name = null, string $on_update = null, string $on_delete = null) {
         if ($index_name == null) {
             if (!is_array($columns)) {
                 $index_name = "ix_" . $columns;
@@ -561,7 +561,7 @@ 
         );
     }
 
-    public function generateCreateQuery () : string {
+    public function generateCreateQuery() : string {
         $tmp_str = "";
 
         if ($this->temp_table) {
@@ -599,7 +599,7 @@ 
         return $sql;
     }
 
-    protected function generateColoumQuery () : string {
+    protected function generateColoumQuery() : string {
         //generate lines of coloum definitions
         $lines = $this->getColoumLines();
 
@@ -607,7 +607,7 @@ 
         return implode(",\r\n", $lines) . "";
     }
 
-    protected function generateIndexQuery () : string {
+    protected function generateIndexQuery() : string {
         //check, if no index is set
         if (count($this->indexes) == 0) {
             return "";
@@ -829,7 +829,7 @@ 
         return ",\r\n" . implode(",\r\n", $lines);
     }
 
-    protected function getColoumLines () : array {
+    protected function getColoumLines() : array {
         $lines = array();
 
         foreach ($this->columns as $column) {
@@ -1285,7 +1285,7 @@ 
     /**
      * create table structure in database, if table not exists
      */
-    public function create () {
+    public function create() {
         //create table
         $this->db_driver->execute($this->generateCreateQuery());
     }
@@ -1293,7 +1293,7 @@ 
     /**
      * upgrades table structure in database, or if table not exists, creates table
      */
-    public function upgrade () {
+    public function upgrade() {
         if (!$this->existsTable()) {
             //create table structure
             $this->create();
@@ -1305,7 +1305,7 @@ 
         }
     }
 
-    public function listColumnsFromDatabase () : array {
+    public function listColumnsFromDatabase() : array {
         $columns = array();
 
         //get columns from database
@@ -1406,7 +1406,7 @@ 
                 'length' => $length,
                 'decimals' => $decimals,
                 'not_null' => $not_null,
-                'values' => $values,//only for enum and set
+                'values' => $values, //only for enum and set
                 'auto_increment' => $auto_increment,
                 'on_update_current_timestamp' => $on_update_current_timestamp,
                 'unsigned' => $unsigned,
@@ -1419,7 +1419,7 @@ 
         return $columns;
     }
 
-    protected function detectTableChanges () : array {
+    protected function detectTableChanges() : array {
     	//columns
     	$changed_columns = array();
     	$added_columns = array();
@@ -1520,64 +1520,64 @@ 
 	 *
 	 * @param $output_file file where sql query should be written in
      */
-    public function backup (string $output_file) : void {
+    public function backup(string $output_file) : void {
     	//TODO: implement this feature
 	}
 
-    public function truncate () {
+    public function truncate() {
         $this->db_driver->query("TRUNCATE `" . $this->table_name . "`; ");
     }
 
     /**
      * alias to truncate()
      */
-    public function cleanUp () {
+    public function cleanUp() {
         $this->truncate();
     }
 
-    public function check () {
+    public function check() {
         //check table
         return $this->db_driver->getRow("CHECK TABLE `{DBPRAEFIX}" . $this->table_name . "`; ");
     }
 
-    public function analyze () {
+    public function analyze() {
         //check table
         return $this->db_driver->getRow("ANALYZE TABLE `{DBPRAEFIX}" . $this->table_name . "`; ");
     }
 
-    public function optimize () {
+    public function optimize() {
         //optimize table
         return $this->db_driver->listRows("OPTIMIZE TABLE `{DBPRAEFIX}" . $this->table_name . "`; ");
     }
 
-    public function flush () {
+    public function flush() {
         //flush table
         $this->db_driver->query("FLUSH TABLE `{DBPRAEFIX}" . $this->table_name . "`; ");
     }
 
-    public function drop () {
+    public function drop() {
         //drop table
         $this->db_driver->query("DROP TABLE `{DBPRAEFIX}" . $this->table_name . "`; ");
     }
 
-    public function existsTable () : bool {
+    public function existsTable() : bool {
         return count($this->db_driver->listRows("SHOW TABLES LIKE '{DBPRAEFIX}" . $this->table_name . "'; ")) > 0;
     }
 
-    public function escape (string $str) {
+    public function escape(string $str) {
         return utf8_encode(htmlentities($str));
     }
 
-    public static function listTables (DBDriver &$dbDriver) {
+    public static function listTables(DBDriver &$dbDriver) {
         return $dbDriver->listRows("SHOW TABLES; ");
     }
 
-    public static function getTableStructure (string $table_name, DBDriver &$dbDriver) {
+    public static function getTableStructure(string $table_name, DBDriver &$dbDriver) {
         //https://dev.mysql.com/doc/refman/5.5/en/creating-tables.html
         return $dbDriver->listRows("DESCRIBE `{DBPRAEFIX}" . $table_name . "`; ");
     }
 
-    public static function getTableStructureByInformationSchema (string $table_name, DBDriver &$dbDriver) {
+    public static function getTableStructureByInformationSchema(string $table_name, DBDriver &$dbDriver) {
         //https://makandracards.com/makandra/2531-show-the-character-set-and-the-collation-of-your-mysql-tables
 
         //http://stackoverflow.com/questions/8662906/getting-mysql-to-display-the-encoding-used-for-a-particular-column
@@ -1588,7 +1588,7 @@ 
         return $dbDriver->listRows("SELECT * FROM `information_schema`.`COLUMNS` WHERE `TABLE_SCHEMA` = '" . $dbDriver->getDatabaseName() . "' AND `TABLE_NAME` = `{DBPRAEFIX}" . $table_name . "`; ", array(), true);
     }
 
-    public static function listIndexes (string $table_name, DBDriver &$dbDriver) {
+    public static function listIndexes(string $table_name, DBDriver &$dbDriver) {
         return $dbDriver->listRows("SHOW INDEX FROM `{DBPRAEFIX}" . $table_name . "`; ");
     }
 

system/packages/com.jukusoft.cms.xtpl/xtpl/caching_xtemplate.class.php

Spacing +17 added lines, -17 removed lines

@@ -36,7 +36,7 @@ 
 	 * @access public
 	 * @var int
 	 */
-	public $cache_expiry	= 0;
+	public $cache_expiry = 0;
 
 	/**
 	 * Cache file unique identifier
@@ -45,7 +45,7 @@ 
 	 * @access public
 	 * @var string
 	 */
-	public $cache_unique	= 'unique';
+	public $cache_unique = 'unique';
 
 	/**
 	 * Filename extension
@@ -54,7 +54,7 @@ 
 	 * @access public
 	 * @var string
 	 */
-	public $cache_ext		= '.xcache';
+	public $cache_ext = '.xcache';
 
 	/**
 	 * Path to cache dir
@@ -64,7 +64,7 @@ 
 	 * @access public
 	 * @var string
 	 */
-	public $cache_dir		= './xcache';
+	public $cache_dir = './xcache';
 
 	/**
 	 * Flag showing whether template is cached
@@ -72,7 +72,7 @@ 
 	 * @access private
 	 * @var boolean
 	 */
-	private $_template_is_cached	= false;
+	private $_template_is_cached = false;
 
 	/**
 	 * Cache expiry time
@@ -80,7 +80,7 @@ 
 	 * @access private
 	 * @var int
 	 */
-	private $_cache_expiry			= 0;
+	private $_cache_expiry = 0;
 
 	/**
 	 * File modified time
@@ -88,7 +88,7 @@ 
 	 * @access private
 	 * @var int
 	 */
-	private $_cache_filemtime		= 0;
+	private $_cache_filemtime = 0;
 
 	/**
 	 * Override of parent constructor
@@ -126,7 +126,7 @@ 
 	 * @param string $cache_dir Cache folder
 	 * @param string $cache_ext Cache file extension
 	 */
-	public function restart ($file, $tpldir = '', $files = null, $mainblock = 'main', $autosetup = true, $tag_start = '{', $tag_end = '}', $cache_expiry = 0, $cache_unique = '', $cache_dir = './xcache', $cache_ext = '.xcache') {
+	public function restart($file, $tpldir = '', $files = null, $mainblock = 'main', $autosetup = true, $tag_start = '{', $tag_end = '}', $cache_expiry = 0, $cache_unique = '', $cache_dir = './xcache', $cache_ext = '.xcache') {
 
 		if ($cache_expiry > 0) {
 			$this->cache_expiry = $cache_expiry;
@@ -170,7 +170,7 @@ 
      * @param string / array $val Value to assign to $name
 	 * @param boolean $magic_quotes
 	 */
-	public function assign ($name, $val = '', $magic_quotes = false) {
+	public function assign($name, $val = '', $magic_quotes = false) {
 
 		if (!$this->_template_is_cached) {
 			parent::assign($name, $val, $magic_quotes);
@@ -184,7 +184,7 @@ 
      * @param string $name Variable to assign $val to
      * @param string / array $val Values to assign to $name
 	 */
-	public function assign_file ($name, $val = '') {
+	public function assign_file($name, $val = '') {
 
 		if (!$this->_template_is_cached) {
 			parent::assign_file($name, $val);
@@ -198,7 +198,7 @@ 
      * @param string $bname Block name to parse
 	 * @param int $cache_expiry Seconds to cache block for
 	 */
-	public function parse ($bname, $cache_expiry = 0) {
+	public function parse($bname, $cache_expiry = 0) {
 
 		if (!$this->_template_is_cached) {
 
@@ -218,7 +218,7 @@ 
      * @param string $bname Block name to return
      * @return string
 	 */
-	public function text ($bname = '') {
+	public function text($bname = '') {
 
 		$text = parent::text($bname);
 
@@ -252,7 +252,7 @@ 
 	 *
 	 * @access protected
 	 */
-	protected function read_template_cache () {
+	protected function read_template_cache() {
 
 		$filename = $this->_get_filename();
 
@@ -282,7 +282,7 @@ 
 	 *
 	 * @access protected
 	 */
-	protected function write_template_cache () {
+	protected function write_template_cache() {
 
 		if ($this->cache_expiry > 0 && is_writable($this->cache_dir)) {
 
@@ -304,7 +304,7 @@ 
 	 * @param ing $cache_expiry Seconds to cache block for
 	 * @return boolean
 	 */
-	protected function read_block_cache ($bname, $cache_expiry = 0) {
+	protected function read_block_cache($bname, $cache_expiry = 0) {
 
 		$retval = false;
 
@@ -344,7 +344,7 @@ 
 	 * @param string $bname Block name to cache
 	 * @param int $cache_expiry Seconds to cache block for
 	 */
-	protected function write_block_cache ($bname, $cache_expiry = 0) {
+	protected function write_block_cache($bname, $cache_expiry = 0) {
 
 		if ($cache_expiry > 0 && is_writable($this->cache_dir)) {
 
@@ -364,7 +364,7 @@ 
 	 * @access private
 	 * @return string
 	 */
-	private function _get_filename () {
+	private function _get_filename() {
 
 		$filename = $this->filename;
 		if (!empty($this->tpldir)) {

system/packages/com.jukusoft.cms.xtpl/xtpl/xtemplate.class.php

Spacing +38 added lines, -38 removed lines

@@ -331,7 +331,7 @@ 
      * @param boolean $autosetup If true, run setup() as part of constuctor
      * @return XTemplate
      */
-	public function XTemplate ($file, $tpldir = '', $files = null, $mainblock = 'main', $autosetup = true) {
+	public function XTemplate($file, $tpldir = '', $files = null, $mainblock = 'main', $autosetup = true) {
 
 		assert('Deprecated - use PHP 5 constructor');
 	}
@@ -359,7 +359,7 @@ 
 	 * @param string $tag_start {
 	 * @param string $tag_end }
 	 */
-	public function restart ($file, $tpldir = '', $files = null, $mainblock = 'main', $autosetup = true, $tag_start = '{', $tag_end = '}') {
+	public function restart($file, $tpldir = '', $files = null, $mainblock = 'main', $autosetup = true, $tag_start = '{', $tag_end = '}') {
 
 		$this->filename = $file;
 
@@ -404,7 +404,7 @@ 
      * @access public
      * @param boolean $add_outer If true is passed when called, it adds an outer main block to the file
      */
-	public function setup ($add_outer = false) {
+	public function setup($add_outer = false) {
 
 		$this->tag_start_delim = preg_quote($this->tag_start_delim);
 		$this->tag_end_delim = preg_quote($this->tag_end_delim);
@@ -461,7 +461,7 @@ 
      * @param string / array $val Value to assign to $name
 	 * @param boolean $reset_array Reset the variable array if $val is an array
      */
-	public function assign ($name, $val = '', $reset_array = true) {
+	public function assign($name, $val = '', $reset_array = true) {
 
 		if (is_array($name)) {
 
@@ -494,7 +494,7 @@ 
      * @param string $name Variable to assign $val to
      * @param string / array $val Values to assign to $name
      */
-	public function assign_file ($name, $val = '') {
+	public function assign_file($name, $val = '') {
 
 		if (is_array($name)) {
 
@@ -514,7 +514,7 @@ 
      * @access public
      * @param string $bname Block name to parse
      */
-	public function parse ($bname) {
+	public function parse($bname) {
 
 		if (isset($this->preparsed_blocks[$bname])) {
 
@@ -550,7 +550,7 @@ 
 		$var_array = array();
 
 		/* find & replace variables+blocks */
-		preg_match_all("|" . $this->tag_start_delim . "([A-Za-z0-9\._]+?" . $this->comment_preg . ")" . $this->tag_end_delim. "|", $copy, $var_array);
+		preg_match_all("|" . $this->tag_start_delim . "([A-Za-z0-9\._]+?" . $this->comment_preg . ")" . $this->tag_end_delim . "|", $copy, $var_array);
 
 		$var_array = $var_array[1];
 
@@ -700,7 +700,7 @@ 
      * @access public
      * @param string $bname Block name to parse
      */
-	public function rparse ($bname) {
+	public function rparse($bname) {
 
 		if (!empty($this->sub_blocks[$bname])) {
 
@@ -725,7 +725,7 @@ 
      * @param string $var Variable to assign values to
      * @param string / array $value Value to assign to $var
     */
-	public function insert_loop ($bname, $var, $value = '') {
+	public function insert_loop($bname, $var, $value = '') {
 
 		$this->assign($var, $value);
 		$this->parse($bname);
@@ -739,11 +739,11 @@ 
      * @param string $var Variable to assign values to
      * @param array $values Values to assign to $var
     */
-	public function array_loop ($bname, $var, &$values) {
+	public function array_loop($bname, $var, &$values) {
 
 		if (is_array($values)) {
 
-			foreach($values as $v) {
+			foreach ($values as $v) {
 
 				$this->insert_loop($bname, $var, $v);
 			}
@@ -757,7 +757,7 @@ 
      * @param string $bname Block name to return
      * @return string
      */
-	public function text ($bname = '') {
+	public function text($bname = '') {
 
 		$text = '';
 
@@ -780,7 +780,7 @@ 
      * @access public
      * @param string $bname Block name to echo out
      */
-	public function out ($bname) {
+	public function out($bname) {
 
 		$out = $this->text($bname);
 		//        $length=strlen($out);
@@ -796,7 +796,7 @@ 
      * @param string $bname Block name to write out
      * @param string $fname File name to write to
      */
-	public function out_file ($bname, $fname) {
+	public function out_file($bname, $fname) {
 
 		if (!empty($bname) && !empty($fname) && is_writeable($fname)) {
 
@@ -812,7 +812,7 @@ 
      * @access public
      * @param string $bname Block to reset
      */
-	public function reset ($bname) {
+	public function reset($bname) {
 
 		$this->parsed_blocks[$bname] = '';
 	}
@@ -824,7 +824,7 @@ 
      * @param string $bname Block name to test
      * @return boolean
      */
-	public function parsed ($bname) {
+	public function parsed($bname) {
 
 		return (!empty($this->parsed_blocks[$bname]));
 	}
@@ -848,7 +848,7 @@ 
 	 * @param string $varname
 	 * @deprecated Change to set_null_string to keep in with rest of naming convention
 	 */
-	public function SetNullString ($str, $varname = '') {
+	public function SetNullString($str, $varname = '') {
 		$this->set_null_string($str, $varname);
 	}
 
@@ -859,7 +859,7 @@ 
      * @param string $str Display string for null block
      * @param string $bname Block name to apply $str to
      */
-	public function set_null_block ($str, $bname = '') {
+	public function set_null_block($str, $bname = '') {
 
 		$this->_null_block[$bname] = $str;
 	}
@@ -871,7 +871,7 @@ 
 	 * @param string $bname
 	 * @deprecated Change to set_null_block to keep in with rest of naming convention
 	 */
-	public function SetNullBlock ($str, $bname = '') {
+	public function SetNullBlock($str, $bname = '') {
 		$this->set_null_block($str, $bname);
 	}
 
@@ -882,7 +882,7 @@ 
      *
      * @access public
      */
-	public function set_autoreset () {
+	public function set_autoreset() {
 
 		$this->_autoreset = true;
 	}
@@ -894,7 +894,7 @@ 
      *
      * @access public
      */
-	public function clear_autoreset () {
+	public function clear_autoreset() {
 
 		$this->_autoreset = false;
 	}
@@ -904,7 +904,7 @@ 
      *
      * @access public
      */
-	public function scan_globals () {
+	public function scan_globals() {
 
 		reset($GLOBALS);
 
@@ -926,7 +926,7 @@ 
      * @access public
      * @return boolean / string
      */
-	public function get_error () {
+	public function get_error() {
 
 		// JRC: 3/1/2003 Added ouptut wrapper and detection of output type for error message output
 		$retval = false;
@@ -961,7 +961,7 @@ 
      * @param string $con content to be processed
      * @param string $parentblock name of the parent block in the block hierarchy
      */
-	public function _maketree ($con, $parentblock='') {
+	public function _maketree($con, $parentblock = '') {
 
 		$blocks = array();
 
@@ -982,7 +982,7 @@ 
 		//$patt = "($this->block_start_word|$this->block_end_word)\s*(\w+)\s*$this->block_end_delim(.*)";
 		$patt = "(" . $this->block_start_word . "|" . $this->block_end_word . ")\s*(\w+)" . $this->comment_preg . "\s*" . $this->block_end_delim . "(.*)";
 
-		foreach($con2 as $k => $v) {
+		foreach ($con2 as $k => $v) {
 
 			$res = array();
 
@@ -1004,7 +1004,7 @@ 
 					$block_names[++$level] = $block_name;
 
 					// make block name (main.table.row)
-					$cur_block_name=implode('.', $block_names);
+					$cur_block_name = implode('.', $block_names);
 
 					// build block parsing order (reverse)
 					$this->block_parse_order[] = $cur_block_name;
@@ -1055,7 +1055,7 @@ 
      * @param string $name
      * @param string $val
      */
-	private function _assign_file_sub ($name, $val) {
+	private function _assign_file_sub($name, $val) {
 
 		if (isset($this->filevar_parent[$name])) {
 
@@ -1063,7 +1063,7 @@ 
 
 				$val = $this->_r_getfile($val);
 
-				foreach($this->filevar_parent[$name] as $parent) {
+				foreach ($this->filevar_parent[$name] as $parent) {
 
 					if (isset($this->preparsed_blocks[$parent]) && !isset($this->filevars[$name])) {
 
@@ -1107,7 +1107,7 @@ 
      * @param array $blocks
      * @return array
      */
-	public function _store_filevar_parents ($blocks){
+	public function _store_filevar_parents($blocks) {
 
 		$parents = array();
 
@@ -1131,7 +1131,7 @@ 
      * @access private
      * @param string $str
      */
-	private function _set_error ($str)    {
+	private function _set_error($str) {
 
 		// JRC: 3/1/2003 Made to append the error messages
 		$this->_error .= '* ' . $str . " *\n";
@@ -1146,7 +1146,7 @@ 
      * @param string $file
      * @return string
      */
-	protected function _getfile ($file) {
+	protected function _getfile($file) {
 
 		if (!isset($file)) {
 			// JC 19/12/02 added $file to error message
@@ -1186,7 +1186,7 @@ 
 				}
 			} else {
 
-				$file = $this->tpldir. DIRECTORY_SEPARATOR . $file;
+				$file = $this->tpldir . DIRECTORY_SEPARATOR . $file;
 			}
 		}
 
@@ -1212,7 +1212,7 @@ 
 						return '';
 					}
 
-					$file_text .= fread($fh,filesize($file));
+					$file_text .= fread($fh, filesize($file));
 					fclose($fh);
 
 				}
@@ -1255,16 +1255,16 @@ 
      * @param string $file
      * @return string
      */
-	public function _r_getfile ($file) {
+	public function _r_getfile($file) {
 
 		$text = $this->_getfile($file);
 
 		$res = array();
 
-		while (preg_match($this->file_delim,$text,$res)) {
+		while (preg_match($this->file_delim, $text, $res)) {
 
 			$text2 = $this->_getfile($res[1]);
-			$text = preg_replace("'".preg_quote($res[0])."'",$text2,$text);
+			$text = preg_replace("'" . preg_quote($res[0]) . "'", $text2, $text);
 		}
 
 		return $text;
@@ -1276,7 +1276,7 @@ 
      *
      * @access private
      */
-	private function _add_outer_block () {
+	private function _add_outer_block() {
 
 		$before = $this->block_start_delim . $this->block_start_word . ' ' . $this->mainblock . ' ' . $this->block_end_delim;
 		$after = $this->block_start_delim . $this->block_end_word . ' ' . $this->mainblock . ' ' . $this->block_end_delim;
@@ -1290,7 +1290,7 @@ 
      * @access private
      * @param multiple var_dumps all the supplied arguments
      */
-	private function _pre_var_dump ($args) {
+	private function _pre_var_dump($args) {
 
 		if ($this->debug) {
 			echo '<pre>';

system/packages/com.jukusoft.cms.xtpl/classes/template.php

Spacing +10 added lines, -10 removed lines

@@ -21,7 +21,7 @@ 
 	protected $template = null;
 	protected static $registeredTemplate = array();
 
-	public function __construct ($file, Registry &$registry = null) {
+	public function __construct($file, Registry &$registry = null) {
 		if ($registry == null) {
 			$registry = Registry::singleton();
 		}
@@ -71,7 +71,7 @@ 
 		$this->template->assign("USERNAME", User::current()->getUsername());
 
 		$style_name = $registry->getSetting("current_style_name");
-		$this->template->assign("STYLE_PATH",DomainUtils::getBaseURL() . "/styles/" . $style_name . "/");
+		$this->template->assign("STYLE_PATH", DomainUtils::getBaseURL() . "/styles/" . $style_name . "/");
 
 		Events::throwEvent("init_template", array(
 			'file' => &$file,
@@ -82,36 +82,36 @@ 
 
 	}
 
-	public function assign ($var, $value) {
+	public function assign($var, $value) {
 		$this->template->assign($var, $value);
 	}
 
-	public function parse ($name = "main") {
+	public function parse($name = "main") {
 		$this->template->parse($name);
 	}
 
-	public function getCode ($name = "main") {
+	public function getCode($name = "main") {
 		return $this->template->text($name);
 	}
 
-	public static function registerTemplate ($template, $file) {
+	public static function registerTemplate($template, $file) {
 		self::$registeredTemplate[$template] = $file;
 	}
 
-	public static function clearTemplates () {
+	public static function clearTemplates() {
 		self::$registeredTemplate = array();
 	}
 
-	public static function createTemplate ($file) {
+	public static function createTemplate($file) {
 		$class = (String) __CLASS__;
 		return new $class($file);
 	}
 
-	public static function getName () {
+	public static function getName() {
 		return __CLASS__;
 	}
 
-	public static function findTemplate (string $tpl_name, Registry &$registry) : string {
+	public static function findTemplate(string $tpl_name, Registry &$registry) : string {
 		if (strpos($tpl_name, ".tpl") !== FALSE) {
 			//remove file extension
 			$tpl_name = str_replace(".tpl", "", $tpl_name);