JuKu / JuKuCMS

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);
+    }
 
 }
 

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

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
+            ));
+        }
+    }
 
 }
 

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

Indentation +3 added lines, -3 removed lines

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

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

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);
+    }
 
 }
 

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

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();
+    }
 
 }
 

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

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 . "`; ");

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

Indentation +293 added lines, -293 removed lines

@@ -30,350 +30,350 @@
  */
 class CachingXTemplate extends XTemplate {
 
-	/**
-	 * Cache expiry time (seconds)
-	 *
-	 * @access public
-	 * @var int
-	 */
-	public $cache_expiry	= 0;
-
-	/**
-	 * Cache file unique identifier
-	 *
-	 * @example session_id()
-	 * @access public
-	 * @var string
-	 */
-	public $cache_unique	= 'unique';
-
-	/**
-	 * Filename extension
-	 *
-	 * @example .xcache
-	 * @access public
-	 * @var string
-	 */
-	public $cache_ext		= '.xcache';
-
-	/**
-	 * Path to cache dir
-	 * Needs to be writable by webserver
-	 *
-	 * @example ./xcache
-	 * @access public
-	 * @var string
-	 */
-	public $cache_dir		= './xcache';
-
-	/**
-	 * Flag showing whether template is cached
-	 *
-	 * @access private
-	 * @var boolean
-	 */
-	private $_template_is_cached	= false;
-
-	/**
-	 * Cache expiry time
-	 *
-	 * @access private
-	 * @var int
-	 */
-	private $_cache_expiry			= 0;
-
-	/**
-	 * File modified time
-	 *
-	 * @access private
-	 * @var int
-	 */
-	private $_cache_filemtime		= 0;
-
-	/**
-	 * Override of parent constructor
-	 *
-	 * @access public
+    /**
+     * Cache expiry time (seconds)
+     *
+     * @access public
+     * @var int
+     */
+    public $cache_expiry	= 0;
+
+    /**
+     * Cache file unique identifier
+     *
+     * @example session_id()
+     * @access public
+     * @var string
+     */
+    public $cache_unique	= 'unique';
+
+    /**
+     * Filename extension
+     *
+     * @example .xcache
+     * @access public
+     * @var string
+     */
+    public $cache_ext		= '.xcache';
+
+    /**
+     * Path to cache dir
+     * Needs to be writable by webserver
+     *
+     * @example ./xcache
+     * @access public
+     * @var string
+     */
+    public $cache_dir		= './xcache';
+
+    /**
+     * Flag showing whether template is cached
+     *
+     * @access private
+     * @var boolean
+     */
+    private $_template_is_cached	= false;
+
+    /**
+     * Cache expiry time
+     *
+     * @access private
+     * @var int
+     */
+    private $_cache_expiry			= 0;
+
+    /**
+     * File modified time
+     *
+     * @access private
+     * @var int
+     */
+    private $_cache_filemtime		= 0;
+
+    /**
+     * Override of parent constructor
+     *
+     * @access public
      * @param string $file Template file to work on
      * @param string $tpldir Location of template files (useful for keeping files outside web server root)
      * @param array $files Filenames lookup
      * @param string $mainblock Name of main block in the template
      * @param boolean $autosetup If true, run setup() as part of constuctor
-	 * @param int $cache_expiry Seconds to cache for
-	 * @param string $cache_unique Unique file id (e.g. session_id())
-	 * @param string $cache_dir Cache folder
-	 * @param string $cache_ext Cache file extension
-	 */
-	public function __construct($file, $tpldir = '', $files = null, $mainblock = 'main', $autosetup = true, $cache_expiry = 0, $cache_unique = '', $cache_dir = './xcache', $cache_ext = '.xcache') {
-
-		$this->restart($file, $tpldir, $files, $mainblock, $autosetup, $this->tag_start_delim, $this->tag_end_delim, $cache_expiry, $cache_unique, $cache_dir, $cache_ext);
-
-	}
-
-	/**
-	 * Override of parent restart method
-	 *
-	 * @access public
-	 * @param string $file Template file to work on
-	 * @param string $tpldir Location of template files
-	 * @param array $files Filenames lookup
-	 * @param string $mainblock Name of main block in the template
-	 * @param boolean $autosetup If true, run setup() as part of restarting
-	 * @param string $tag_start {
-	 * @param string $tag_end }
-	 * @param int $cache_expiry Seconds to cache for
-	 * @param string $cache_unique Unique file id (e.g. session_id())
-	 * @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') {
-
-		if ($cache_expiry > 0) {
-			$this->cache_expiry = $cache_expiry;
-		}
-
-		if (!empty($cache_unique)) {
-			if (!preg_match('/^\./', $cache_unique)) {
-				$cache_unique = '.' . $cache_unique;
-			}
-			$this->cache_unique = $cache_unique;
-		}
-
-		if (!empty($cache_dir)) {
-			$this->cache_dir = $cache_dir;
-		}
-
-		if (!empty($cache_ext)) {
-			if (!preg_match('/^\./', $cache_ext)) {
-				$cache_ext = '.' . $cache_ext;
-			}
-			$this->cache_ext = $cache_ext;
-		}
-
-		// Call parent restart method but don't run setup yet!
-		parent::restart($file, $tpldir, $files, $mainblock, false, $tag_start, $tag_end);
-
-		if ($this->cache_expiry > 0) {
-			$this->read_template_cache();
-		}
-
-		if (!$this->_template_is_cached && $autosetup) {
-			$this->setup();
-		}
-	}
-
-	/**
-	 * Override of parent assign method
-	 *
-	 * @access public
+     * @param int $cache_expiry Seconds to cache for
+     * @param string $cache_unique Unique file id (e.g. session_id())
+     * @param string $cache_dir Cache folder
+     * @param string $cache_ext Cache file extension
+     */
+    public function __construct($file, $tpldir = '', $files = null, $mainblock = 'main', $autosetup = true, $cache_expiry = 0, $cache_unique = '', $cache_dir = './xcache', $cache_ext = '.xcache') {
+
+        $this->restart($file, $tpldir, $files, $mainblock, $autosetup, $this->tag_start_delim, $this->tag_end_delim, $cache_expiry, $cache_unique, $cache_dir, $cache_ext);
+
+    }
+
+    /**
+     * Override of parent restart method
+     *
+     * @access public
+     * @param string $file Template file to work on
+     * @param string $tpldir Location of template files
+     * @param array $files Filenames lookup
+     * @param string $mainblock Name of main block in the template
+     * @param boolean $autosetup If true, run setup() as part of restarting
+     * @param string $tag_start {
+     * @param string $tag_end }
+     * @param int $cache_expiry Seconds to cache for
+     * @param string $cache_unique Unique file id (e.g. session_id())
+     * @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') {
+
+        if ($cache_expiry > 0) {
+            $this->cache_expiry = $cache_expiry;
+        }
+
+        if (!empty($cache_unique)) {
+            if (!preg_match('/^\./', $cache_unique)) {
+                $cache_unique = '.' . $cache_unique;
+            }
+            $this->cache_unique = $cache_unique;
+        }
+
+        if (!empty($cache_dir)) {
+            $this->cache_dir = $cache_dir;
+        }
+
+        if (!empty($cache_ext)) {
+            if (!preg_match('/^\./', $cache_ext)) {
+                $cache_ext = '.' . $cache_ext;
+            }
+            $this->cache_ext = $cache_ext;
+        }
+
+        // Call parent restart method but don't run setup yet!
+        parent::restart($file, $tpldir, $files, $mainblock, false, $tag_start, $tag_end);
+
+        if ($this->cache_expiry > 0) {
+            $this->read_template_cache();
+        }
+
+        if (!$this->_template_is_cached && $autosetup) {
+            $this->setup();
+        }
+    }
+
+    /**
+     * Override of parent assign method
+     *
+     * @access public
      * @param string $name Variable to assign $val to
      * @param string / array $val Value to assign to $name
-	 * @param boolean $magic_quotes
-	 */
-	public function assign ($name, $val = '', $magic_quotes = false) {
-
-		if (!$this->_template_is_cached) {
-			parent::assign($name, $val, $magic_quotes);
-		}
-	}
-
-	/**
-	 * Override of parent assign_file method
-	 *
+     * @param boolean $magic_quotes
+     */
+    public function assign ($name, $val = '', $magic_quotes = false) {
+
+        if (!$this->_template_is_cached) {
+            parent::assign($name, $val, $magic_quotes);
+        }
+    }
+
+    /**
+     * Override of parent assign_file method
+     *
      * @access public
      * @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);
-		}
-	}
+        if (!$this->_template_is_cached) {
+            parent::assign_file($name, $val);
+        }
+    }
 
-	/**
-	 * Override of parent parse method
-	 *
+    /**
+     * Override of parent parse method
+     *
      * @access public
      * @param string $bname Block name to parse
-	 * @param int $cache_expiry Seconds to cache block for
-	 */
-	public function parse ($bname, $cache_expiry = 0) {
+     * @param int $cache_expiry Seconds to cache block for
+     */
+    public function parse ($bname, $cache_expiry = 0) {
 
-		if (!$this->_template_is_cached) {
+        if (!$this->_template_is_cached) {
 
-			if (!$this->read_block_cache($bname, $cache_expiry)) {
+            if (!$this->read_block_cache($bname, $cache_expiry)) {
 
-				parent::parse($bname);
+                parent::parse($bname);
 
-				$this->write_block_cache($bname, $cache_expiry);
-			}
-		}
-	}
+                $this->write_block_cache($bname, $cache_expiry);
+            }
+        }
+    }
 
-	/**
-	 * Override of parent text method
-	 *
+    /**
+     * Override of parent text method
+     *
      * @access public
      * @param string $bname Block name to return
      * @return string
-	 */
-	public function text ($bname = '') {
+     */
+    public function text ($bname = '') {
 
-		$text = parent::text($bname);
+        $text = parent::text($bname);
 
-		if (!$this->_template_is_cached && $this->cache_expiry > 0) {
+        if (!$this->_template_is_cached && $this->cache_expiry > 0) {
 
-			$this->write_template_cache();
+            $this->write_template_cache();
 
-		} elseif ($this->debug && $this->output_type == 'HTML') {
+        } elseif ($this->debug && $this->output_type == 'HTML') {
 
-			$text_header = "<!-- CachingXTemplate debug:\n";
+            $text_header = "<!-- CachingXTemplate debug:\n";
 
-			if ($this->cache_expiry > 0) {
+            if ($this->cache_expiry > 0) {
 
-				$filename = $this->_get_filename();
+                $filename = $this->_get_filename();
 
-				$file = $this->cache_dir . DIRECTORY_SEPARATOR . $filename . $this->cache_unique . $this->cache_ext;
+                $file = $this->cache_dir . DIRECTORY_SEPARATOR . $filename . $this->cache_unique . $this->cache_ext;
 
-				$text_header .= 'File: ' . $file . "\nExpires in: " . ($this->_cache_filemtime - $this->_cache_expiry) . " seconds -->\n";
-			} else {
-				$text_header .= "Template Cache (whole template) disabled -->\n";
-			}
+                $text_header .= 'File: ' . $file . "\nExpires in: " . ($this->_cache_filemtime - $this->_cache_expiry) . " seconds -->\n";
+            } else {
+                $text_header .= "Template Cache (whole template) disabled -->\n";
+            }
 
-			$text = $text_header . $text;
-		}
+            $text = $text_header . $text;
+        }
 
-		return $text;
-	}
+        return $text;
+    }
 
-	/**
-	 * Read whole template cache file
-	 *
-	 * @access protected
-	 */
-	protected function read_template_cache () {
+    /**
+     * Read whole template cache file
+     *
+     * @access protected
+     */
+    protected function read_template_cache () {
 
-		$filename = $this->_get_filename();
+        $filename = $this->_get_filename();
 
-		$file = $this->cache_dir . DIRECTORY_SEPARATOR . $filename . DIRECTORY_SEPARATOR . $this->cache_unique . $this->cache_ext;
+        $file = $this->cache_dir . DIRECTORY_SEPARATOR . $filename . DIRECTORY_SEPARATOR . $this->cache_unique . $this->cache_ext;
 
-		if ($this->cache_expiry > 0 && file_exists($file)) {
+        if ($this->cache_expiry > 0 && file_exists($file)) {
 
-			$this->_cache_filemtime = filemtime($file);
-			$this->_cache_expiry = time() - $this->cache_expiry;
+            $this->_cache_filemtime = filemtime($file);
+            $this->_cache_expiry = time() - $this->cache_expiry;
 
-			if ($this->_cache_filemtime >= $this->_cache_expiry) {
-				if ($parsed_blocks = file_get_contents($file)) {
-					$this->parsed_blocks = unserialize($parsed_blocks);
-					$this->_template_is_cached = true;
-				}
-			} else {
-				// Stale file
-				if (is_writable($this->cache_dir) && is_writable($file)) {
-					unlink($file);
-				}
-			}
-		}
-	}
+            if ($this->_cache_filemtime >= $this->_cache_expiry) {
+                if ($parsed_blocks = file_get_contents($file)) {
+                    $this->parsed_blocks = unserialize($parsed_blocks);
+                    $this->_template_is_cached = true;
+                }
+            } else {
+                // Stale file
+                if (is_writable($this->cache_dir) && is_writable($file)) {
+                    unlink($file);
+                }
+            }
+        }
+    }
 
-	/**
-	 * Write out whole template cache file
-	 *
-	 * @access protected
-	 */
-	protected function write_template_cache () {
+    /**
+     * Write out whole template cache file
+     *
+     * @access protected
+     */
+    protected function write_template_cache () {
 
-		if ($this->cache_expiry > 0 && is_writable($this->cache_dir)) {
+        if ($this->cache_expiry > 0 && is_writable($this->cache_dir)) {
 
-			$filename = $this->_get_filename();
+            $filename = $this->_get_filename();
 
-			if (!file_exists($this->cache_dir . DIRECTORY_SEPARATOR . $filename)) {
-				mkdir($this->cache_dir . DIRECTORY_SEPARATOR . $filename);
-			}
+            if (!file_exists($this->cache_dir . DIRECTORY_SEPARATOR . $filename)) {
+                mkdir($this->cache_dir . DIRECTORY_SEPARATOR . $filename);
+            }
 
-			file_put_contents($this->cache_dir . DIRECTORY_SEPARATOR . $filename . DIRECTORY_SEPARATOR . $this->cache_unique . $this->cache_ext, serialize($this->parsed_blocks));
-		}
-	}
+            file_put_contents($this->cache_dir . DIRECTORY_SEPARATOR . $filename . DIRECTORY_SEPARATOR . $this->cache_unique . $this->cache_ext, serialize($this->parsed_blocks));
+        }
+    }
 
-	/**
-	 * Read block level cache file
-	 *
-	 * @access protected
-	 * @param string $bname Block name to read from cache
-	 * @param ing $cache_expiry Seconds to cache block for
-	 * @return boolean
-	 */
-	protected function read_block_cache ($bname, $cache_expiry = 0) {
+    /**
+     * Read block level cache file
+     *
+     * @access protected
+     * @param string $bname Block name to read from cache
+     * @param ing $cache_expiry Seconds to cache block for
+     * @return boolean
+     */
+    protected function read_block_cache ($bname, $cache_expiry = 0) {
 
-		$retval = false;
+        $retval = false;
 
-		$filename = $this->_get_filename();
+        $filename = $this->_get_filename();
 
-		$file = $this->cache_dir . DIRECTORY_SEPARATOR . $filename . DIRECTORY_SEPARATOR . $bname . $this->cache_unique . $this->cache_ext;
+        $file = $this->cache_dir . DIRECTORY_SEPARATOR . $filename . DIRECTORY_SEPARATOR . $bname . $this->cache_unique . $this->cache_ext;
+
+        if ($cache_expiry > 0 && file_exists($file)) {
+
+            $filemtime = filemtime($file);
+            $cache_expiry = time() - $cache_expiry;
+
+            if ($filemtime >= $cache_expiry) {
+                if ($block = file_get_contents($file)) {
+                    $block = unserialize($block);
+                    if ($this->debug) {
+                        $block = "<!-- CachingXTemplate debug:\nFile: " . $file . "\nBlock: " . $bname . "\nExpires in: " . ($filemtime - $cache_expiry) . ' seconds -->' . "\n" . $block;
+                    }
+                    $this->parsed_blocks[$bname] = $block;
+                    $retval = true;
+                }
+            } else {
+                // Stale file
+                if (is_writable($this->cache_dir) && is_writable($file)) {
+                    unlink($file);
+                }
+            }
+        }
+
+        return $retval;
+    }
+
+    /**
+     * Write out block level cache file
+     *
+     * @access protected
+     * @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) {
+
+        if ($cache_expiry > 0 && is_writable($this->cache_dir)) {
+
+            $filename = $this->_get_filename();
+
+            if (!file_exists($this->cache_dir . DIRECTORY_SEPARATOR . $filename)) {
+                mkdir($this->cache_dir . DIRECTORY_SEPARATOR . $filename);
+            }
+
+            file_put_contents($this->cache_dir . DIRECTORY_SEPARATOR . $filename . DIRECTORY_SEPARATOR . $bname . $this->cache_unique . $this->cache_ext, serialize($this->parsed_blocks[$bname]));
+        }
+    }
+
+    /**
+     * Create the main part of the cache filename
+     *
+     * @access private
+     * @return string
+     */
+    private function _get_filename () {
 
-		if ($cache_expiry > 0 && file_exists($file)) {
+        $filename = $this->filename;
+        if (!empty($this->tpldir)) {
 
-			$filemtime = filemtime($file);
-			$cache_expiry = time() - $cache_expiry;
+            $filename = str_replace(DIRECTORY_SEPARATOR, '_', $this->tpldir . DIRECTORY_SEPARATOR) . $this->filename;
+        }
 
-			if ($filemtime >= $cache_expiry) {
-				if ($block = file_get_contents($file)) {
-					$block = unserialize($block);
-					if ($this->debug) {
-						$block = "<!-- CachingXTemplate debug:\nFile: " . $file . "\nBlock: " . $bname . "\nExpires in: " . ($filemtime - $cache_expiry) . ' seconds -->' . "\n" . $block;
-					}
-					$this->parsed_blocks[$bname] = $block;
-					$retval = true;
-				}
-			} else {
-				// Stale file
-				if (is_writable($this->cache_dir) && is_writable($file)) {
-					unlink($file);
-				}
-			}
-		}
-
-		return $retval;
-	}
-
-	/**
-	 * Write out block level cache file
-	 *
-	 * @access protected
-	 * @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) {
-
-		if ($cache_expiry > 0 && is_writable($this->cache_dir)) {
-
-			$filename = $this->_get_filename();
-
-			if (!file_exists($this->cache_dir . DIRECTORY_SEPARATOR . $filename)) {
-				mkdir($this->cache_dir . DIRECTORY_SEPARATOR . $filename);
-			}
-
-			file_put_contents($this->cache_dir . DIRECTORY_SEPARATOR . $filename . DIRECTORY_SEPARATOR . $bname . $this->cache_unique . $this->cache_ext, serialize($this->parsed_blocks[$bname]));
-		}
-	}
-
-	/**
-	 * Create the main part of the cache filename
-	 *
-	 * @access private
-	 * @return string
-	 */
-	private function _get_filename () {
-
-		$filename = $this->filename;
-		if (!empty($this->tpldir)) {
-
-			$filename = str_replace(DIRECTORY_SEPARATOR, '_', $this->tpldir . DIRECTORY_SEPARATOR) . $this->filename;
-		}
-
-		return $filename;
-	}
+        return $filename;
+    }
 }
 
 ?>
\ No newline at end of file

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

Indentation +889 added lines, -889 removed lines

@@ -24,288 +24,288 @@ 
  */
 class XTemplate {
 
-	/**
-	 * Properties
-	 */
-
-	/**
-	 * Raw contents of the template file
-	 *
-	 * @access public
-	 * @var string
-	 */
-	public $filecontents = '';
-
-	/**
-	 * Unparsed blocks
-	 *
-	 * @access public
-	 * @var array
-	 */
-	public $blocks = array();
-
-	/**
-	 * Parsed blocks
-	 *
-	 * @var unknown_type
-	 */
-	public $parsed_blocks = array();
-
-	/**
-	 * Preparsed blocks (for file includes)
-	 *
-	 * @access public
-	 * @var array
-	 */
-	public $preparsed_blocks = array();
-
-	/**
-	 * Block parsing order for recursive parsing
-	 * (Sometimes reverse :)
-	 *
-	 * @access public
-	 * @var array
-	 */
-	public $block_parse_order = array();
-
-	/**
-	 * Store sub-block names
-	 * (For fast resetting)
-	 *
-	 * @access public
-	 * @var array
-	 */
-	public $sub_blocks = array();
-
-	/**
-	 * Variables array
-	 *
-	 * @access public
-	 * @var array
-	 */
-	public $vars = array();
-
-	/**
-	 * File variables array
-	 *
-	 * @access public
-	 * @var array
-	 */
-	public $filevars = array();
-
-	/**
-	 * Filevars' parent block
-	 *
-	 * @access public
-	 * @var array
-	 */
-	public $filevar_parent = array();
-
-	/**
-	 * File caching during duration of script
-	 * e.g. files only cached to speed {FILE "filename"} repeats
-	 *
-	 * @access public
-	 * @var array
-	 */
-	public $filecache = array();
-
-	/**
-	 * Location of template files
-	 *
-	 * @access public
-	 * @var string
-	 */
-	public $tpldir = '';
-
-	/**
-	 * Filenames lookup table
-	 *
-	 * @access public
-	 * @var null
-	 */
-	public $files = null;
-
-	/**
-	 * Template filename
-	 *
-	 * @access public
-	 * @var string
-	 */
-	public $filename = '';
-
-	// moved to setup method so uses the tag_start & end_delims
-	/**
-	 * RegEx for file includes
-	 *
-	 * "/\{FILE\s*\"([^\"]+)\"\s*\}/m";
-	 *
-	 * @access public
-	 * @var string
-	 */
-	public $file_delim = '';
-
-	/**
-	 * RegEx for file include variable
-	 *
-	 * "/\{FILE\s*\{([A-Za-z0-9\._]+?)\}\s*\}/m";
-	 *
-	 * @access public
-	 * @var string
-	 */
-	public $filevar_delim = '';
-
-	/**
-	 * RegEx for file includes with newlines
-	 *
-	 * "/^\s*\{FILE\s*\{([A-Za-z0-9\._]+?)\}\s*\}\s*\n/m";
-	 *
-	 * @access public
-	 * @var string
-	 */
-	public $filevar_delim_nl = '';
-
-	/**
-	 * Template block start delimiter
-	 *
-	 * @access public
-	 * @var string
-	 */
-	public $block_start_delim = '<!-- ';
-
-	/**
-	 * Template block end delimiter
-	 *
-	 * @access public
-	 * @var string
-	 */
-	public $block_end_delim = '-->';
-
-	/**
-	 * Template block start word
-	 *
-	 * @access public
-	 * @var string
-	 */
-	public $block_start_word = 'BEGIN:';
-
-	/**
-	 * Template block end word
-	 *
-	 * The last 3 properties and this make the delimiters look like:
-	 * @example <!-- BEGIN: block_name -->
-	 * if you use the default syntax.
-	 *
-	 * @access public
-	 * @var string
-	 */
-	public $block_end_word = 'END:';
-
-	/**
-	 * Template tag start delimiter
-	 *
-	 * This makes the delimiters look like:
-	 * @example {tagname}
-	 * if you use the default syntax.
-	 *
-	 * @access public
-	 * @var string
-	 */
-	public $tag_start_delim = '{';
-
-	/**
-	 * Template tag end delimiter
-	 *
-	 * This makes the delimiters look like:
-	 * @example {tagname}
-	 * if you use the default syntax.
-	 *
-	 * @access public
-	 * @var string
-	 */
-	public $tag_end_delim = '}';
-	/* this makes the delimiters look like: {tagname} if you use my syntax. */
-
-	/**
-	 * Regular expression element for comments within tags and blocks
-	 *
-	 * @example {tagname#My Comment}
-	 * @example {tagname #My Comment}
-	 * @example <!-- BEGIN: blockname#My Comment -->
-	 * @example <!-- BEGIN: blockname #My Comment -->
-	 *
-	 * @access public
-	 * @var string
-	 */
-	public $comment_preg = '( ?#.*?)?';
-
-	/**
-	 * Default main template block name
-	 *
-	 * @access public
-	 * @var string
-	 */
-	public $mainblock = 'main';
-
-	/**
-	 * Script output type
-	 *
-	 * @access public
-	 * @var string
-	 */
-	public $output_type = 'HTML';
-
-	/**
-	 * Debug mode
-	 *
-	 * @access public
-	 * @var boolean
-	 */
-	public $debug = false;
-
-	/**
-	 * Null string for unassigned vars
-	 *
-	 * @access protected
-	 * @var array
-	 */
-	protected $_null_string = array('' => '');
-
-	/**
-	 * Null string for unassigned blocks
-	 *
-	 * @access protected
-	 * @var array
-	 */
-	protected $_null_block = array('' => '');
-
-	/**
-	 * Errors
-	 *
-	 * @access protected
-	 * @var string
-	 */
-	protected $_error = '';
-
-	/**
-	 * Auto-reset sub blocks
-	 *
-	 * @access protected
-	 * @var boolean
-	 */
-	protected $_autoreset = true;
-
-	/**
-	 * Set to FALSE to generate errors if a non-existant blocks is referenced
-	 *
-	 * @author NW
-	 * @since 2002/10/17
-	 * @access protected
-	 * @var boolean
-	 */
-	protected $_ignore_missing_blocks = true;
-
-	/**
+    /**
+     * Properties
+     */
+
+    /**
+     * Raw contents of the template file
+     *
+     * @access public
+     * @var string
+     */
+    public $filecontents = '';
+
+    /**
+     * Unparsed blocks
+     *
+     * @access public
+     * @var array
+     */
+    public $blocks = array();
+
+    /**
+     * Parsed blocks
+     *
+     * @var unknown_type
+     */
+    public $parsed_blocks = array();
+
+    /**
+     * Preparsed blocks (for file includes)
+     *
+     * @access public
+     * @var array
+     */
+    public $preparsed_blocks = array();
+
+    /**
+     * Block parsing order for recursive parsing
+     * (Sometimes reverse :)
+     *
+     * @access public
+     * @var array
+     */
+    public $block_parse_order = array();
+
+    /**
+     * Store sub-block names
+     * (For fast resetting)
+     *
+     * @access public
+     * @var array
+     */
+    public $sub_blocks = array();
+
+    /**
+     * Variables array
+     *
+     * @access public
+     * @var array
+     */
+    public $vars = array();
+
+    /**
+     * File variables array
+     *
+     * @access public
+     * @var array
+     */
+    public $filevars = array();
+
+    /**
+     * Filevars' parent block
+     *
+     * @access public
+     * @var array
+     */
+    public $filevar_parent = array();
+
+    /**
+     * File caching during duration of script
+     * e.g. files only cached to speed {FILE "filename"} repeats
+     *
+     * @access public
+     * @var array
+     */
+    public $filecache = array();
+
+    /**
+     * Location of template files
+     *
+     * @access public
+     * @var string
+     */
+    public $tpldir = '';
+
+    /**
+     * Filenames lookup table
+     *
+     * @access public
+     * @var null
+     */
+    public $files = null;
+
+    /**
+     * Template filename
+     *
+     * @access public
+     * @var string
+     */
+    public $filename = '';
+
+    // moved to setup method so uses the tag_start & end_delims
+    /**
+     * RegEx for file includes
+     *
+     * "/\{FILE\s*\"([^\"]+)\"\s*\}/m";
+     *
+     * @access public
+     * @var string
+     */
+    public $file_delim = '';
+
+    /**
+     * RegEx for file include variable
+     *
+     * "/\{FILE\s*\{([A-Za-z0-9\._]+?)\}\s*\}/m";
+     *
+     * @access public
+     * @var string
+     */
+    public $filevar_delim = '';
+
+    /**
+     * RegEx for file includes with newlines
+     *
+     * "/^\s*\{FILE\s*\{([A-Za-z0-9\._]+?)\}\s*\}\s*\n/m";
+     *
+     * @access public
+     * @var string
+     */
+    public $filevar_delim_nl = '';
+
+    /**
+     * Template block start delimiter
+     *
+     * @access public
+     * @var string
+     */
+    public $block_start_delim = '<!-- ';
+
+    /**
+     * Template block end delimiter
+     *
+     * @access public
+     * @var string
+     */
+    public $block_end_delim = '-->';
+
+    /**
+     * Template block start word
+     *
+     * @access public
+     * @var string
+     */
+    public $block_start_word = 'BEGIN:';
+
+    /**
+     * Template block end word
+     *
+     * The last 3 properties and this make the delimiters look like:
+     * @example <!-- BEGIN: block_name -->
+     * if you use the default syntax.
+     *
+     * @access public
+     * @var string
+     */
+    public $block_end_word = 'END:';
+
+    /**
+     * Template tag start delimiter
+     *
+     * This makes the delimiters look like:
+     * @example {tagname}
+     * if you use the default syntax.
+     *
+     * @access public
+     * @var string
+     */
+    public $tag_start_delim = '{';
+
+    /**
+     * Template tag end delimiter
+     *
+     * This makes the delimiters look like:
+     * @example {tagname}
+     * if you use the default syntax.
+     *
+     * @access public
+     * @var string
+     */
+    public $tag_end_delim = '}';
+    /* this makes the delimiters look like: {tagname} if you use my syntax. */
+
+    /**
+     * Regular expression element for comments within tags and blocks
+     *
+     * @example {tagname#My Comment}
+     * @example {tagname #My Comment}
+     * @example <!-- BEGIN: blockname#My Comment -->
+     * @example <!-- BEGIN: blockname #My Comment -->
+     *
+     * @access public
+     * @var string
+     */
+    public $comment_preg = '( ?#.*?)?';
+
+    /**
+     * Default main template block name
+     *
+     * @access public
+     * @var string
+     */
+    public $mainblock = 'main';
+
+    /**
+     * Script output type
+     *
+     * @access public
+     * @var string
+     */
+    public $output_type = 'HTML';
+
+    /**
+     * Debug mode
+     *
+     * @access public
+     * @var boolean
+     */
+    public $debug = false;
+
+    /**
+     * Null string for unassigned vars
+     *
+     * @access protected
+     * @var array
+     */
+    protected $_null_string = array('' => '');
+
+    /**
+     * Null string for unassigned blocks
+     *
+     * @access protected
+     * @var array
+     */
+    protected $_null_block = array('' => '');
+
+    /**
+     * Errors
+     *
+     * @access protected
+     * @var string
+     */
+    protected $_error = '';
+
+    /**
+     * Auto-reset sub blocks
+     *
+     * @access protected
+     * @var boolean
+     */
+    protected $_autoreset = true;
+
+    /**
+     * Set to FALSE to generate errors if a non-existant blocks is referenced
+     *
+     * @author NW
+     * @since 2002/10/17
+     * @access protected
+     * @var boolean
+     */
+    protected $_ignore_missing_blocks = true;
+
+    /**
      * PHP 5 Constructor - Instantiate the object
      *
      * @param string $file Template file to work on
@@ -315,12 +315,12 @@ 
      * @param boolean $autosetup If true, run setup() as part of constuctor
      * @return XTemplate
      */
-	public function __construct($file, $tpldir = '', $files = null, $mainblock = 'main', $autosetup = true) {
+    public function __construct($file, $tpldir = '', $files = null, $mainblock = 'main', $autosetup = true) {
 
-		$this->restart($file, $tpldir, $files, $mainblock, $autosetup, $this->tag_start_delim, $this->tag_end_delim);
-	}
+        $this->restart($file, $tpldir, $files, $mainblock, $autosetup, $this->tag_start_delim, $this->tag_end_delim);
+    }
 
-	/**
+    /**
      * PHP 4 Constructor - Instantiate the object
      *
      * @deprecated Use PHP 5 constructor instead
@@ -331,111 +331,111 @@ 
      * @param boolean $autosetup If true, run setup() as part of constuctor
      * @return XTemplate
      */
-	public function XTemplate ($file, $tpldir = '', $files = null, $mainblock = 'main', $autosetup = true) {
-
-		assert('Deprecated - use PHP 5 constructor');
-	}
-
-
-	/***************************************************************************/
-	/***[ public stuff ]********************************************************/
-	/***************************************************************************/
-
-	/**
-	 * Restart the class - allows one instantiation with several files processed by restarting
-	 * e.g. $xtpl = new XTemplate('file1.xtpl');
-	 * $xtpl->parse('main');
-	 * $xtpl->out('main');
-	 * $xtpl->restart('file2.xtpl');
-	 * $xtpl->parse('main');
-	 * $xtpl->out('main');
-	 * (Added in response to sf:641407 feature request)
-	 *
-	 * @param string $file Template file to work on
-	 * @param string/array $tpldir Location of template files
-	 * @param array $files Filenames lookup
-	 * @param string $mainblock Name of main block in the template
-	 * @param boolean $autosetup If true, run setup() as part of restarting
-	 * @param string $tag_start {
-	 * @param string $tag_end }
-	 */
-	public function restart ($file, $tpldir = '', $files = null, $mainblock = 'main', $autosetup = true, $tag_start = '{', $tag_end = '}') {
-
-		$this->filename = $file;
-
-		// From SF Feature request 1202027
-		// Kenneth Kalmer
-		$this->tpldir = $tpldir;
-		if (defined('XTPL_DIR') && empty($this->tpldir)) {
-			$this->tpldir = XTPL_DIR;
-		}
-
-		if (is_array($files)) {
-			$this->files = $files;
-		}
-
-		$this->mainblock = $mainblock;
-
-		$this->tag_start_delim = $tag_start;
-		$this->tag_end_delim = $tag_end;
-
-		// Start with fresh file contents
-		$this->filecontents = '';
-
-		// Reset the template arrays
-		$this->blocks = array();
-		$this->parsed_blocks = array();
-		$this->preparsed_blocks = array();
-		$this->block_parse_order = array();
-		$this->sub_blocks = array();
-		$this->vars = array();
-		$this->filevars = array();
-		$this->filevar_parent = array();
-		$this->filecache = array();
-
-		if ($autosetup) {
-			$this->setup();
-		}
-	}
-
-	/**
+    public function XTemplate ($file, $tpldir = '', $files = null, $mainblock = 'main', $autosetup = true) {
+
+        assert('Deprecated - use PHP 5 constructor');
+    }
+
+
+    /***************************************************************************/
+    /***[ public stuff ]********************************************************/
+    /***************************************************************************/
+
+    /**
+     * Restart the class - allows one instantiation with several files processed by restarting
+     * e.g. $xtpl = new XTemplate('file1.xtpl');
+     * $xtpl->parse('main');
+     * $xtpl->out('main');
+     * $xtpl->restart('file2.xtpl');
+     * $xtpl->parse('main');
+     * $xtpl->out('main');
+     * (Added in response to sf:641407 feature request)
+     *
+     * @param string $file Template file to work on
+     * @param string/array $tpldir Location of template files
+     * @param array $files Filenames lookup
+     * @param string $mainblock Name of main block in the template
+     * @param boolean $autosetup If true, run setup() as part of restarting
+     * @param string $tag_start {
+     * @param string $tag_end }
+     */
+    public function restart ($file, $tpldir = '', $files = null, $mainblock = 'main', $autosetup = true, $tag_start = '{', $tag_end = '}') {
+
+        $this->filename = $file;
+
+        // From SF Feature request 1202027
+        // Kenneth Kalmer
+        $this->tpldir = $tpldir;
+        if (defined('XTPL_DIR') && empty($this->tpldir)) {
+            $this->tpldir = XTPL_DIR;
+        }
+
+        if (is_array($files)) {
+            $this->files = $files;
+        }
+
+        $this->mainblock = $mainblock;
+
+        $this->tag_start_delim = $tag_start;
+        $this->tag_end_delim = $tag_end;
+
+        // Start with fresh file contents
+        $this->filecontents = '';
+
+        // Reset the template arrays
+        $this->blocks = array();
+        $this->parsed_blocks = array();
+        $this->preparsed_blocks = array();
+        $this->block_parse_order = array();
+        $this->sub_blocks = array();
+        $this->vars = array();
+        $this->filevars = array();
+        $this->filevar_parent = array();
+        $this->filecache = array();
+
+        if ($autosetup) {
+            $this->setup();
+        }
+    }
+
+    /**
      * setup - the elements that were previously in the constructor
      *
      * @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);
+        $this->tag_start_delim = preg_quote($this->tag_start_delim);
+        $this->tag_end_delim = preg_quote($this->tag_end_delim);
 
-		// Setup the file delimiters
+        // Setup the file delimiters
 
-		// regexp for file includes
-		$this->file_delim = "/" . $this->tag_start_delim . "FILE\s*\"([^\"]+)\"" . $this->comment_preg . $this->tag_end_delim . "/m";
+        // regexp for file includes
+        $this->file_delim = "/" . $this->tag_start_delim . "FILE\s*\"([^\"]+)\"" . $this->comment_preg . $this->tag_end_delim . "/m";
 
-		// regexp for file includes
-		$this->filevar_delim = "/" . $this->tag_start_delim . "FILE\s*" . $this->tag_start_delim . "([A-Za-z0-9\._]+?)" . $this->comment_preg . $this->tag_end_delim . $this->comment_preg . $this->tag_end_delim . "/m";
+        // regexp for file includes
+        $this->filevar_delim = "/" . $this->tag_start_delim . "FILE\s*" . $this->tag_start_delim . "([A-Za-z0-9\._]+?)" . $this->comment_preg . $this->tag_end_delim . $this->comment_preg . $this->tag_end_delim . "/m";
 
-		// regexp for file includes w/ newlines
-		$this->filevar_delim_nl = "/^\s*" . $this->tag_start_delim . "FILE\s*" . $this->tag_start_delim . "([A-Za-z0-9\._]+?)" . $this->comment_preg . $this->tag_end_delim . $this->comment_preg . $this->tag_end_delim . "\s*\n/m";
+        // regexp for file includes w/ newlines
+        $this->filevar_delim_nl = "/^\s*" . $this->tag_start_delim . "FILE\s*" . $this->tag_start_delim . "([A-Za-z0-9\._]+?)" . $this->comment_preg . $this->tag_end_delim . $this->comment_preg . $this->tag_end_delim . "\s*\n/m";
 
-		if (empty($this->filecontents)) {
-			// read in template file
-			$this->filecontents = $this->_r_getfile($this->filename);
-		}
+        if (empty($this->filecontents)) {
+            // read in template file
+            $this->filecontents = $this->_r_getfile($this->filename);
+        }
 
-		if ($add_outer) {
-			$this->_add_outer_block();
-		}
+        if ($add_outer) {
+            $this->_add_outer_block();
+        }
 
-		// preprocess some stuff
-		$this->blocks = $this->_maketree($this->filecontents, '');
-		$this->filevar_parent = $this->_store_filevar_parents($this->blocks);
-		$this->scan_globals();
-	}
+        // preprocess some stuff
+        $this->blocks = $this->_maketree($this->filecontents, '');
+        $this->filevar_parent = $this->_store_filevar_parents($this->blocks);
+        $this->scan_globals();
+    }
 
-	/**
+    /**
      * assign a variable
      *
      * @example Simplest case:
@@ -459,500 +459,500 @@ 
      * @access public
      * @param string $name Variable to assign $val to
      * @param string / array $val Value to assign to $name
-	 * @param boolean $reset_array Reset the variable array if $val is an array
+     * @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)) {
+        if (is_array($name)) {
 
-			foreach ($name as $k => $v) {
+            foreach ($name as $k => $v) {
 
-				$this->vars[$k] = $v;
-			}
-		} elseif (is_array($val)) {
+                $this->vars[$k] = $v;
+            }
+        } elseif (is_array($val)) {
 
-			// Clear the existing values
-    		if ($reset_array) {
-    			$this->vars[$name] = array();
-    		}
+            // Clear the existing values
+            if ($reset_array) {
+                $this->vars[$name] = array();
+            }
 
-        	foreach ($val as $k => $v) {
+            foreach ($val as $k => $v) {
 
-        		$this->vars[$name][$k] = $v;
-        	}
+                $this->vars[$name][$k] = $v;
+            }
 
-		} else {
+        } else {
 
-			$this->vars[$name] = $val;
-		}
-	}
+            $this->vars[$name] = $val;
+        }
+    }
 
-	/**
+    /**
      * assign a file variable
      *
      * @access public
      * @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)) {
+        if (is_array($name)) {
 
-			foreach ($name as $k => $v) {
+            foreach ($name as $k => $v) {
 
-				$this->_assign_file_sub($k, $v);
-			}
-		} else {
+                $this->_assign_file_sub($k, $v);
+            }
+        } else {
 
-			$this->_assign_file_sub($name, $val);
-		}
-	}
+            $this->_assign_file_sub($name, $val);
+        }
+    }
 
-	/**
+    /**
      * parse a block
      *
      * @access public
      * @param string $bname Block name to parse
      */
-	public function parse ($bname) {
+    public function parse ($bname) {
 
-		if (isset($this->preparsed_blocks[$bname])) {
+        if (isset($this->preparsed_blocks[$bname])) {
 
-			$copy = $this->preparsed_blocks[$bname];
+            $copy = $this->preparsed_blocks[$bname];
 
-		} elseif (isset($this->blocks[$bname])) {
+        } elseif (isset($this->blocks[$bname])) {
 
-			$copy = $this->blocks[$bname];
+            $copy = $this->blocks[$bname];
 
-		} elseif ($this->_ignore_missing_blocks) {
-			// ------------------------------------------------------
-			// NW : 17 Oct 2002. Added default of ignore_missing_blocks
-			//      to allow for generalised processing where some
-			//      blocks may be removed from the HTML without the
-			//      processing code needing to be altered.
-			// ------------------------------------------------------
-			// JRC: 3/1/2003 added set error to ignore missing functionality
-			$this->_set_error("parse: blockname [$bname] does not exist");
-			return;
+        } elseif ($this->_ignore_missing_blocks) {
+            // ------------------------------------------------------
+            // NW : 17 Oct 2002. Added default of ignore_missing_blocks
+            //      to allow for generalised processing where some
+            //      blocks may be removed from the HTML without the
+            //      processing code needing to be altered.
+            // ------------------------------------------------------
+            // JRC: 3/1/2003 added set error to ignore missing functionality
+            $this->_set_error("parse: blockname [$bname] does not exist");
+            return;
 
-		} else {
+        } else {
 
-			$this->_set_error("parse: blockname [$bname] does not exist");
-		}
+            $this->_set_error("parse: blockname [$bname] does not exist");
+        }
 
-		/* from there we should have no more {FILE } directives */
-		if (!isset($copy)) {
-			die('Block: ' . $bname);
-		}
+        /* from there we should have no more {FILE } directives */
+        if (!isset($copy)) {
+            die('Block: ' . $bname);
+        }
 
-		$copy = preg_replace($this->filevar_delim_nl, '', $copy);
+        $copy = preg_replace($this->filevar_delim_nl, '', $copy);
 
-		$var_array = array();
+        $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);
+        /* 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);
 
-		$var_array = $var_array[1];
+        $var_array = $var_array[1];
 
-		foreach ($var_array as $k => $v) {
+        foreach ($var_array as $k => $v) {
 
-			// Are there any comments in the tags {tag#a comment for documenting the template}
-			$any_comments = explode('#', $v);
-			$v = rtrim($any_comments[0]);
+            // Are there any comments in the tags {tag#a comment for documenting the template}
+            $any_comments = explode('#', $v);
+            $v = rtrim($any_comments[0]);
 
-			if (sizeof($any_comments) > 1) {
+            if (sizeof($any_comments) > 1) {
 
-				$comments = $any_comments[1];
-			} else {
+                $comments = $any_comments[1];
+            } else {
 
-				$comments = '';
-			}
+                $comments = '';
+            }
 
-			$sub = explode('.', $v);
+            $sub = explode('.', $v);
 
-			if ($sub[0] == '_BLOCK_') {
+            if ($sub[0] == '_BLOCK_') {
 
-				unset($sub[0]);
+                unset($sub[0]);
 
-				$bname2 = implode('.', $sub);
+                $bname2 = implode('.', $sub);
 
-				// trinary operator eliminates assign error in E_ALL reporting
-				$var = isset($this->parsed_blocks[$bname2]) ? $this->parsed_blocks[$bname2] : null;
-				$nul = (!isset($this->_null_block[$bname2])) ? $this->_null_block[''] : $this->_null_block[$bname2];
+                // trinary operator eliminates assign error in E_ALL reporting
+                $var = isset($this->parsed_blocks[$bname2]) ? $this->parsed_blocks[$bname2] : null;
+                $nul = (!isset($this->_null_block[$bname2])) ? $this->_null_block[''] : $this->_null_block[$bname2];
 
-				if ($var === '') {
+                if ($var === '') {
 
-					if ($nul == '') {
-						// -----------------------------------------------------------
-						// Removed requirement for blocks to be at the start of string
-						// -----------------------------------------------------------
-						//                      $copy=preg_replace("/^\s*\{".$v."\}\s*\n*/m","",$copy);
-						// Now blocks don't need to be at the beginning of a line,
-						//$copy=preg_replace("/\s*" . $this->tag_start_delim . $v . $this->tag_end_delim . "\s*\n*/m","",$copy);
-						$copy = preg_replace("|" . $this->tag_start_delim . $v . $this->tag_end_delim . "|m", '', $copy);
+                    if ($nul == '') {
+                        // -----------------------------------------------------------
+                        // Removed requirement for blocks to be at the start of string
+                        // -----------------------------------------------------------
+                        //                      $copy=preg_replace("/^\s*\{".$v."\}\s*\n*/m","",$copy);
+                        // Now blocks don't need to be at the beginning of a line,
+                        //$copy=preg_replace("/\s*" . $this->tag_start_delim . $v . $this->tag_end_delim . "\s*\n*/m","",$copy);
+                        $copy = preg_replace("|" . $this->tag_start_delim . $v . $this->tag_end_delim . "|m", '', $copy);
 
-					} else {
+                    } else {
 
-						$copy = preg_replace("|" . $this->tag_start_delim . $v . $this->tag_end_delim . "|m", "$nul", $copy);
-					}
-				} else {
+                        $copy = preg_replace("|" . $this->tag_start_delim . $v . $this->tag_end_delim . "|m", "$nul", $copy);
+                    }
+                } else {
 
-					//$var = trim($var);
-					switch (true) {
-						case preg_match('/^\n/', $var) && preg_match('/\n$/', $var):
-							$var = substr($var, 1, -1);
-							break;
+                    //$var = trim($var);
+                    switch (true) {
+                        case preg_match('/^\n/', $var) && preg_match('/\n$/', $var):
+                            $var = substr($var, 1, -1);
+                            break;
 
-						case preg_match('/^\n/', $var):
-							$var = substr($var, 1);
-							break;
+                        case preg_match('/^\n/', $var):
+                            $var = substr($var, 1);
+                            break;
 
-						case preg_match('/\n$/', $var):
-							$var = substr($var, 0, -1);
-							break;
-					}
+                        case preg_match('/\n$/', $var):
+                            $var = substr($var, 0, -1);
+                            break;
+                    }
 
-					// SF Bug no. 810773 - thanks anonymous
-					$var = str_replace('\\', '\\\\', $var);
-					// Ensure dollars in strings are not evaluated reported by SadGeezer 31/3/04
-					$var = str_replace('$', '\\$', $var);
-					// Replaced str_replaces with preg_quote
-					//$var = preg_quote($var);
-					$var = str_replace('\\|', '|', $var);
-					$copy = preg_replace("|" . $this->tag_start_delim . $v . $this->tag_end_delim . "|m", "$var", $copy);
+                    // SF Bug no. 810773 - thanks anonymous
+                    $var = str_replace('\\', '\\\\', $var);
+                    // Ensure dollars in strings are not evaluated reported by SadGeezer 31/3/04
+                    $var = str_replace('$', '\\$', $var);
+                    // Replaced str_replaces with preg_quote
+                    //$var = preg_quote($var);
+                    $var = str_replace('\\|', '|', $var);
+                    $copy = preg_replace("|" . $this->tag_start_delim . $v . $this->tag_end_delim . "|m", "$var", $copy);
 
-					if (preg_match('/^\n/', $copy) && preg_match('/\n$/', $copy)) {
-						$copy = substr($copy, 1, -1);
-					}
-				}
-			} else {
+                    if (preg_match('/^\n/', $copy) && preg_match('/\n$/', $copy)) {
+                        $copy = substr($copy, 1, -1);
+                    }
+                }
+            } else {
 
-				$var = $this->vars;
+                $var = $this->vars;
 
-				foreach ($sub as $v1) {
+                foreach ($sub as $v1) {
 
-					// NW 4 Oct 2002 - Added isset and is_array check to avoid NOTICE messages
-					// JC 17 Oct 2002 - Changed EMPTY to stlen=0
-					//                if (empty($var[$v1])) { // this line would think that zeros(0) were empty - which is not true
-					if (!isset($var[$v1]) || (!is_array($var[$v1]) && strlen($var[$v1]) == 0)) {
+                    // NW 4 Oct 2002 - Added isset and is_array check to avoid NOTICE messages
+                    // JC 17 Oct 2002 - Changed EMPTY to stlen=0
+                    //                if (empty($var[$v1])) { // this line would think that zeros(0) were empty - which is not true
+                    if (!isset($var[$v1]) || (!is_array($var[$v1]) && strlen($var[$v1]) == 0)) {
 
-						// Check for constant, when variable not assigned
-						if (defined($v1)) {
+                        // Check for constant, when variable not assigned
+                        if (defined($v1)) {
 
-							$var[$v1] = constant($v1);
+                            $var[$v1] = constant($v1);
 
-						} else {
+                        } else {
 
-							$var[$v1] = null;
-						}
-					}
+                            $var[$v1] = null;
+                        }
+                    }
 
-					$var = $var[$v1];
-				}
+                    $var = $var[$v1];
+                }
 
-				$nul = (!isset($this->_null_string[$v])) ? ($this->_null_string[""]) : ($this->_null_string[$v]);
-				$var = (!isset($var)) ? $nul : $var;
+                $nul = (!isset($this->_null_string[$v])) ? ($this->_null_string[""]) : ($this->_null_string[$v]);
+                $var = (!isset($var)) ? $nul : $var;
 
-				if ($var === '') {
-					// -----------------------------------------------------------
-					// Removed requriement for blocks to be at the start of string
-					// -----------------------------------------------------------
-					//                    $copy=preg_replace("|^\s*\{".$v." ?#?".$comments."\}\s*\n|m","",$copy);
-					$copy = preg_replace("|" . $this->tag_start_delim . $v . "( ?#" . $comments . ")?" . $this->tag_end_delim . "|m", '', $copy);
-				}
+                if ($var === '') {
+                    // -----------------------------------------------------------
+                    // Removed requriement for blocks to be at the start of string
+                    // -----------------------------------------------------------
+                    //                    $copy=preg_replace("|^\s*\{".$v." ?#?".$comments."\}\s*\n|m","",$copy);
+                    $copy = preg_replace("|" . $this->tag_start_delim . $v . "( ?#" . $comments . ")?" . $this->tag_end_delim . "|m", '', $copy);
+                }
 
-				$var = trim($var);
-				// SF Bug no. 810773 - thanks anonymous
-				$var = str_replace('\\', '\\\\', $var);
-				// Ensure dollars in strings are not evaluated reported by SadGeezer 31/3/04
-				$var = str_replace('$', '\\$', $var);
-				// Replace str_replaces with preg_quote
-				//$var = preg_quote($var);
-				$var = str_replace('\\|', '|', $var);
-				$copy = preg_replace("|" . $this->tag_start_delim . $v . "( ?#" . $comments . ")?" . $this->tag_end_delim . "|m", "$var", $copy);
-
-				if (preg_match('/^\n/', $copy) && preg_match('/\n$/', $copy)) {
-					$copy = substr($copy, 1);
-				}
-			}
-		}
-
-		if (isset($this->parsed_blocks[$bname])) {
-			$this->parsed_blocks[$bname] .= $copy;
-		} else {
-			$this->parsed_blocks[$bname] = $copy;
-		}
-
-		/* reset sub-blocks */
-		if ($this->_autoreset && (!empty($this->sub_blocks[$bname]))) {
-
-			reset($this->sub_blocks[$bname]);
-
-			foreach ($this->sub_blocks[$bname] as $k => $v) {
-				$this->reset($v);
-			}
-		}
-	}
-
-	/**
+                $var = trim($var);
+                // SF Bug no. 810773 - thanks anonymous
+                $var = str_replace('\\', '\\\\', $var);
+                // Ensure dollars in strings are not evaluated reported by SadGeezer 31/3/04
+                $var = str_replace('$', '\\$', $var);
+                // Replace str_replaces with preg_quote
+                //$var = preg_quote($var);
+                $var = str_replace('\\|', '|', $var);
+                $copy = preg_replace("|" . $this->tag_start_delim . $v . "( ?#" . $comments . ")?" . $this->tag_end_delim . "|m", "$var", $copy);
+
+                if (preg_match('/^\n/', $copy) && preg_match('/\n$/', $copy)) {
+                    $copy = substr($copy, 1);
+                }
+            }
+        }
+
+        if (isset($this->parsed_blocks[$bname])) {
+            $this->parsed_blocks[$bname] .= $copy;
+        } else {
+            $this->parsed_blocks[$bname] = $copy;
+        }
+
+        /* reset sub-blocks */
+        if ($this->_autoreset && (!empty($this->sub_blocks[$bname]))) {
+
+            reset($this->sub_blocks[$bname]);
+
+            foreach ($this->sub_blocks[$bname] as $k => $v) {
+                $this->reset($v);
+            }
+        }
+    }
+
+    /**
      * returns the parsed text for a block, including all sub-blocks.
      *
      * @access public
      * @param string $bname Block name to parse
      */
-	public function rparse ($bname) {
+    public function rparse ($bname) {
 
-		if (!empty($this->sub_blocks[$bname])) {
+        if (!empty($this->sub_blocks[$bname])) {
 
-			reset($this->sub_blocks[$bname]);
+            reset($this->sub_blocks[$bname]);
 
-			foreach ($this->sub_blocks[$bname] as $k => $v) {
+            foreach ($this->sub_blocks[$bname] as $k => $v) {
 
-				if (!empty($v)) {
-					$this->rparse($v);
-				}
-			}
-		}
+                if (!empty($v)) {
+                    $this->rparse($v);
+                }
+            }
+        }
 
-		$this->parse($bname);
-	}
+        $this->parse($bname);
+    }
 
-	/**
+    /**
      * inserts a loop ( call assign & parse )
      *
      * @access public
      * @param string $bname Block name to assign
      * @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);
-	}
+        $this->assign($var, $value);
+        $this->parse($bname);
+    }
 
-	/**
+    /**
      * parses a block for every set of data in the values array
      *
      * @access public
      * @param string $bname Block name to loop
      * @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)) {
+        if (is_array($values)) {
 
-			foreach($values as $v) {
+            foreach($values as $v) {
 
-				$this->insert_loop($bname, $var, $v);
-			}
-		}
-	}
+                $this->insert_loop($bname, $var, $v);
+            }
+        }
+    }
 
-	/**
+    /**
      * returns the parsed text for a block
      *
      * @access public
      * @param string $bname Block name to return
      * @return string
      */
-	public function text ($bname = '') {
+    public function text ($bname = '') {
 
-		$text = '';
+        $text = '';
 
-		if ($this->debug && $this->output_type == 'HTML') {
-			// JC 20/11/02 echo the template filename if in development as
-			// html comment
-			$text .= '<!-- XTemplate: ' . realpath($this->filename) . " -->\n";
-		}
+        if ($this->debug && $this->output_type == 'HTML') {
+            // JC 20/11/02 echo the template filename if in development as
+            // html comment
+            $text .= '<!-- XTemplate: ' . realpath($this->filename) . " -->\n";
+        }
 
-		$bname = !empty($bname) ? $bname : $this->mainblock;
+        $bname = !empty($bname) ? $bname : $this->mainblock;
 
-		$text .= isset($this->parsed_blocks[$bname]) ? $this->parsed_blocks[$bname] : $this->get_error();
+        $text .= isset($this->parsed_blocks[$bname]) ? $this->parsed_blocks[$bname] : $this->get_error();
 
-		return $text;
-	}
+        return $text;
+    }
 
-	/**
+    /**
      * prints the parsed text
      *
      * @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);
-		//header("Content-Length: ".$length); // TODO: Comment this back in later
+        $out = $this->text($bname);
+        //        $length=strlen($out);
+        //header("Content-Length: ".$length); // TODO: Comment this back in later
 
-		echo $out;
-	}
+        echo $out;
+    }
 
-	/**
+    /**
      * prints the parsed text to a specified file
      *
      * @access public
      * @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)) {
+        if (!empty($bname) && !empty($fname) && is_writeable($fname)) {
 
-			$fp = fopen($fname, 'w');
-			fwrite($fp, $this->text($bname));
-			fclose($fp);
-		}
-	}
+            $fp = fopen($fname, 'w');
+            fwrite($fp, $this->text($bname));
+            fclose($fp);
+        }
+    }
 
-	/**
+    /**
      * resets the parsed text
      *
      * @access public
      * @param string $bname Block to reset
      */
-	public function reset ($bname) {
+    public function reset ($bname) {
 
-		$this->parsed_blocks[$bname] = '';
-	}
+        $this->parsed_blocks[$bname] = '';
+    }
 
-	/**
+    /**
      * returns true if block was parsed, false if not
      *
      * @access public
      * @param string $bname Block name to test
      * @return boolean
      */
-	public function parsed ($bname) {
+    public function parsed ($bname) {
 
-		return (!empty($this->parsed_blocks[$bname]));
-	}
+        return (!empty($this->parsed_blocks[$bname]));
+    }
 
-	/**
+    /**
      * sets the string to replace in case the var was not assigned
      *
      * @access public
      * @param string $str Display string for null block
      * @param string $varname Variable name to apply $str to
      */
-	public function set_null_string($str, $varname = '') {
-
-		$this->_null_string[$varname] = $str;
-	}
-
-	/**
-	 * Backwards compatibility only
-	 *
-	 * @param string $str
-	 * @param string $varname
-	 * @deprecated Change to set_null_string to keep in with rest of naming convention
-	 */
-	public function SetNullString ($str, $varname = '') {
-		$this->set_null_string($str, $varname);
-	}
-
-	/**
+    public function set_null_string($str, $varname = '') {
+
+        $this->_null_string[$varname] = $str;
+    }
+
+    /**
+     * Backwards compatibility only
+     *
+     * @param string $str
+     * @param string $varname
+     * @deprecated Change to set_null_string to keep in with rest of naming convention
+     */
+    public function SetNullString ($str, $varname = '') {
+        $this->set_null_string($str, $varname);
+    }
+
+    /**
      * sets the string to replace in case the block was not parsed
      *
      * @access public
      * @param string $str Display string for null block
      * @param string $bname Block name to apply $str to
      */
-	public function set_null_block ($str, $bname = '') {
-
-		$this->_null_block[$bname] = $str;
-	}
-
-	/**
-	 * Backwards compatibility only
-	 *
-	 * @param string $str
-	 * @param string $bname
-	 * @deprecated Change to set_null_block to keep in with rest of naming convention
-	 */
-	public function SetNullBlock ($str, $bname = '') {
-		$this->set_null_block($str, $bname);
-	}
-
-	/**
+    public function set_null_block ($str, $bname = '') {
+
+        $this->_null_block[$bname] = $str;
+    }
+
+    /**
+     * Backwards compatibility only
+     *
+     * @param string $str
+     * @param string $bname
+     * @deprecated Change to set_null_block to keep in with rest of naming convention
+     */
+    public function SetNullBlock ($str, $bname = '') {
+        $this->set_null_block($str, $bname);
+    }
+
+    /**
      * sets AUTORESET to 1. (default is 1)
      * if set to 1, parse() automatically resets the parsed blocks' sub blocks
      * (for multiple level blocks)
      *
      * @access public
      */
-	public function set_autoreset () {
+    public function set_autoreset () {
 
-		$this->_autoreset = true;
-	}
+        $this->_autoreset = true;
+    }
 
-	/**
+    /**
      * sets AUTORESET to 0. (default is 1)
      * if set to 1, parse() automatically resets the parsed blocks' sub blocks
      * (for multiple level blocks)
      *
      * @access public
      */
-	public function clear_autoreset () {
+    public function clear_autoreset () {
 
-		$this->_autoreset = false;
-	}
+        $this->_autoreset = false;
+    }
 
-	/**
+    /**
      * scans global variables and assigns to PHP array
      *
      * @access public
      */
-	public function scan_globals () {
+    public function scan_globals () {
 
-		reset($GLOBALS);
+        reset($GLOBALS);
 
-		foreach ($GLOBALS as $k => $v) {
-			$GLOB[$k] = $v;
-		}
+        foreach ($GLOBALS as $k => $v) {
+            $GLOB[$k] = $v;
+        }
 
-		/**
-		 * Access global variables as:
-		 * @example {PHP._SERVER.HTTP_HOST}
-		 * in your template!
-		 */
-		$this->assign('PHP', $GLOB);
-	}
+        /**
+         * Access global variables as:
+         * @example {PHP._SERVER.HTTP_HOST}
+         * in your template!
+         */
+        $this->assign('PHP', $GLOB);
+    }
 
-	/**
+    /**
      * gets error condition / string
      *
      * @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;
+        // JRC: 3/1/2003 Added ouptut wrapper and detection of output type for error message output
+        $retval = false;
 
-		if ($this->_error != '') {
+        if ($this->_error != '') {
 
-			switch ($this->output_type) {
-				case 'HTML':
-				case 'html':
-					$retval = '<b>[XTemplate]</b><ul>' . nl2br(str_replace('* ', '<li>', str_replace(" *\n", "</li>\n", $this->_error))) . '</ul>';
-					break;
+            switch ($this->output_type) {
+                case 'HTML':
+                case 'html':
+                    $retval = '<b>[XTemplate]</b><ul>' . nl2br(str_replace('* ', '<li>', str_replace(" *\n", "</li>\n", $this->_error))) . '</ul>';
+                    break;
 
-				default:
-					$retval = '[XTemplate] ' . str_replace(' *\n', "\n", $this->_error);
-					break;
-			}
-		}
+                default:
+                    $retval = '[XTemplate] ' . str_replace(' *\n', "\n", $this->_error);
+                    break;
+            }
+        }
 
-		return $retval;
-	}
+        return $retval;
+    }
 
-	/***************************************************************************/
-	/***[ private stuff ]*******************************************************/
-	/***************************************************************************/
+    /***************************************************************************/
+    /***[ private stuff ]*******************************************************/
+    /***************************************************************************/
 
-	/**
+    /**
      * generates the array containing to-be-parsed stuff:
      * $blocks["main"],$blocks["main.table"],$blocks["main.table.row"], etc.
      * also builds the reverse parse order.
@@ -961,343 +961,343 @@ 
      * @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();
+        $blocks = array();
 
-		$con2 = explode($this->block_start_delim, $con);
+        $con2 = explode($this->block_start_delim, $con);
 
-		if (!empty($parentblock)) {
+        if (!empty($parentblock)) {
 
-			$block_names = explode('.', $parentblock);
-			$level = sizeof($block_names);
+            $block_names = explode('.', $parentblock);
+            $level = sizeof($block_names);
 
-		} else {
+        } else {
 
-			$block_names = array();
-			$level = 0;
-		}
+            $block_names = array();
+            $level = 0;
+        }
 
-		// JRC 06/04/2005 Added block comments (on BEGIN or END) <!-- BEGIN: block_name#Comments placed here -->
-		//$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 . "(.*)";
+        // JRC 06/04/2005 Added block comments (on BEGIN or END) <!-- BEGIN: block_name#Comments placed here -->
+        //$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();
+            $res = array();
 
-			if (preg_match_all("/$patt/ims", $v, $res, PREG_SET_ORDER)) {
-				// $res[0][1] = BEGIN or END
-				// $res[0][2] = block name
-				// $res[0][3] = comment
-				// $res[0][4] = kinda content
-				$block_word	= $res[0][1];
-				$block_name	= $res[0][2];
-				$comment	= $res[0][3];
-				$content	= $res[0][4];
+            if (preg_match_all("/$patt/ims", $v, $res, PREG_SET_ORDER)) {
+                // $res[0][1] = BEGIN or END
+                // $res[0][2] = block name
+                // $res[0][3] = comment
+                // $res[0][4] = kinda content
+                $block_word	= $res[0][1];
+                $block_name	= $res[0][2];
+                $comment	= $res[0][3];
+                $content	= $res[0][4];
 
-				if (strtoupper($block_word) == $this->block_start_word) {
+                if (strtoupper($block_word) == $this->block_start_word) {
 
-					$parent_name = implode('.', $block_names);
+                    $parent_name = implode('.', $block_names);
 
-					// add one level - array("main","table","row")
-					$block_names[++$level] = $block_name;
+                    // add one level - array("main","table","row")
+                    $block_names[++$level] = $block_name;
 
-					// make block name (main.table.row)
-					$cur_block_name=implode('.', $block_names);
+                    // make block name (main.table.row)
+                    $cur_block_name=implode('.', $block_names);
 
-					// build block parsing order (reverse)
-					$this->block_parse_order[] = $cur_block_name;
+                    // build block parsing order (reverse)
+                    $this->block_parse_order[] = $cur_block_name;
 
-					//add contents. trinary operator eliminates assign error in E_ALL reporting
-					$blocks[$cur_block_name] = isset($blocks[$cur_block_name]) ? $blocks[$cur_block_name] . $content : $content;
+                    //add contents. trinary operator eliminates assign error in E_ALL reporting
+                    $blocks[$cur_block_name] = isset($blocks[$cur_block_name]) ? $blocks[$cur_block_name] . $content : $content;
 
-					// add {_BLOCK_.blockname} string to parent block
-					$blocks[$parent_name] .= str_replace('\\', '', $this->tag_start_delim) . '_BLOCK_.' . $cur_block_name . str_replace('\\', '', $this->tag_end_delim);
+                    // add {_BLOCK_.blockname} string to parent block
+                    $blocks[$parent_name] .= str_replace('\\', '', $this->tag_start_delim) . '_BLOCK_.' . $cur_block_name . str_replace('\\', '', $this->tag_end_delim);
 
-					// store sub block names for autoresetting and recursive parsing
-					$this->sub_blocks[$parent_name][] = $cur_block_name;
+                    // store sub block names for autoresetting and recursive parsing
+                    $this->sub_blocks[$parent_name][] = $cur_block_name;
 
-					// store sub block names for autoresetting
-					$this->sub_blocks[$cur_block_name][] = '';
+                    // store sub block names for autoresetting
+                    $this->sub_blocks[$cur_block_name][] = '';
 
-				} else if (strtoupper($block_word) == $this->block_end_word) {
+                } else if (strtoupper($block_word) == $this->block_end_word) {
 
-					unset($block_names[$level--]);
+                    unset($block_names[$level--]);
 
-					$parent_name = implode('.', $block_names);
+                    $parent_name = implode('.', $block_names);
 
-					// add rest of block to parent block
-					$blocks[$parent_name] .= $content;
-				}
-			} else {
+                    // add rest of block to parent block
+                    $blocks[$parent_name] .= $content;
+                }
+            } else {
 
-				// no block delimiters found
-				// Saves doing multiple implodes - less overhead
-				$tmp = implode('.', $block_names);
+                // no block delimiters found
+                // Saves doing multiple implodes - less overhead
+                $tmp = implode('.', $block_names);
 
-				if ($k) {
-					$blocks[$tmp] .= $this->block_start_delim;
-				}
+                if ($k) {
+                    $blocks[$tmp] .= $this->block_start_delim;
+                }
 
-				// trinary operator eliminates assign error in E_ALL reporting
-				$blocks[$tmp] = isset($blocks[$tmp]) ? $blocks[$tmp] . $v : $v;
-			}
-		}
+                // trinary operator eliminates assign error in E_ALL reporting
+                $blocks[$tmp] = isset($blocks[$tmp]) ? $blocks[$tmp] . $v : $v;
+            }
+        }
 
-		return $blocks;
-	}
+        return $blocks;
+    }
 
-	/**
+    /**
      * Sub processing for assign_file method
      *
      * @access private
      * @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])) {
+        if (isset($this->filevar_parent[$name])) {
 
-			if ($val != '') {
+            if ($val != '') {
 
-				$val = $this->_r_getfile($val);
+                $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])) {
+                    if (isset($this->preparsed_blocks[$parent]) && !isset($this->filevars[$name])) {
 
-						$copy = $this->preparsed_blocks[$parent];
+                        $copy = $this->preparsed_blocks[$parent];
 
-					} elseif (isset($this->blocks[$parent])) {
+                    } elseif (isset($this->blocks[$parent])) {
 
-						$copy = $this->blocks[$parent];
-					}
+                        $copy = $this->blocks[$parent];
+                    }
 
-					$res = array();
+                    $res = array();
 
-					preg_match_all($this->filevar_delim, $copy, $res, PREG_SET_ORDER);
+                    preg_match_all($this->filevar_delim, $copy, $res, PREG_SET_ORDER);
 
-					if (is_array($res) && isset($res[0])) {
+                    if (is_array($res) && isset($res[0])) {
 
-						// Changed as per solution in SF bug ID #1261828
-						foreach ($res as $v) {
+                        // Changed as per solution in SF bug ID #1261828
+                        foreach ($res as $v) {
 
-							// Changed as per solution in SF bug ID #1261828
-							if ($v[1] == $name) {
+                            // Changed as per solution in SF bug ID #1261828
+                            if ($v[1] == $name) {
 
-								// Changed as per solution in SF bug ID #1261828
-								$copy = preg_replace("/" . preg_quote($v[0]) . "/", "$val", $copy);
-								$this->preparsed_blocks = array_merge($this->preparsed_blocks, $this->_maketree($copy, $parent));
-								$this->filevar_parent = array_merge($this->filevar_parent, $this->_store_filevar_parents($this->preparsed_blocks));
-							}
-						}
-					}
-				}
-			}
-		}
+                                // Changed as per solution in SF bug ID #1261828
+                                $copy = preg_replace("/" . preg_quote($v[0]) . "/", "$val", $copy);
+                                $this->preparsed_blocks = array_merge($this->preparsed_blocks, $this->_maketree($copy, $parent));
+                                $this->filevar_parent = array_merge($this->filevar_parent, $this->_store_filevar_parents($this->preparsed_blocks));
+                            }
+                        }
+                    }
+                }
+            }
+        }
 
-		$this->filevars[$name] = $val;
-	}
+        $this->filevars[$name] = $val;
+    }
 
-	/**
+    /**
      * store container block's name for file variables
      *
      * @access public - aiming for private
      * @param array $blocks
      * @return array
      */
-	public function _store_filevar_parents ($blocks){
+    public function _store_filevar_parents ($blocks){
 
-		$parents = array();
+        $parents = array();
 
-		foreach ($blocks as $bname => $con) {
+        foreach ($blocks as $bname => $con) {
 
-			$res = array();
+            $res = array();
 
-			preg_match_all($this->filevar_delim, $con, $res);
+            preg_match_all($this->filevar_delim, $con, $res);
 
-			foreach ($res[1] as $k => $v) {
+            foreach ($res[1] as $k => $v) {
 
-				$parents[$v][] = $bname;
-			}
-		}
-		return $parents;
-	}
+                $parents[$v][] = $bname;
+            }
+        }
+        return $parents;
+    }
 
-	/**
+    /**
      * Set the error string
      *
      * @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";
-		// JRC: 3/1/2003 Removed trigger error, use this externally if you want it eg. trigger_error($xtpl->get_error())
-		//trigger_error($this->get_error());
-	}
+        // JRC: 3/1/2003 Made to append the error messages
+        $this->_error .= '* ' . $str . " *\n";
+        // JRC: 3/1/2003 Removed trigger error, use this externally if you want it eg. trigger_error($xtpl->get_error())
+        //trigger_error($this->get_error());
+    }
 
-	/**
+    /**
      * returns the contents of a file
      *
      * @access protected
      * @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
-			$this->_set_error('!isset file name!' . $file);
+        if (!isset($file)) {
+            // JC 19/12/02 added $file to error message
+            $this->_set_error('!isset file name!' . $file);
 
-			return '';
-		}
+            return '';
+        }
 
-		// check if filename is mapped to other filename
-		if (isset($this->files)) {
+        // check if filename is mapped to other filename
+        if (isset($this->files)) {
 
-			if (isset($this->files[$file])) {
+            if (isset($this->files[$file])) {
 
-				$file = $this->files[$file];
-			}
-		}
+                $file = $this->files[$file];
+            }
+        }
 
-		// prepend template dir
-		if (!empty($this->tpldir)) {
+        // prepend template dir
+        if (!empty($this->tpldir)) {
 
-			/**
-			 * Support hierarchy of file locations to search
-			 *
-			 * @example Supply array of filepaths when instantiating
-			 * 			First path supplied that has the named file is prioritised
-			 * 			$xtpl = new XTemplate('myfile.xtpl', array('.','/mypath', '/mypath2'));
-			 * @since 29/05/2007
-			 */
-			if (is_array($this->tpldir)) {
+            /**
+             * Support hierarchy of file locations to search
+             *
+             * @example Supply array of filepaths when instantiating
+             * 			First path supplied that has the named file is prioritised
+             * 			$xtpl = new XTemplate('myfile.xtpl', array('.','/mypath', '/mypath2'));
+             * @since 29/05/2007
+             */
+            if (is_array($this->tpldir)) {
 
-				foreach ($this->tpldir as $dir) {
+                foreach ($this->tpldir as $dir) {
 
-					if (is_readable($dir . DIRECTORY_SEPARATOR . $file)) {
-						$file = $dir . DIRECTORY_SEPARATOR . $file;
-						break;
-					}
-				}
-			} else {
+                    if (is_readable($dir . DIRECTORY_SEPARATOR . $file)) {
+                        $file = $dir . DIRECTORY_SEPARATOR . $file;
+                        break;
+                    }
+                }
+            } else {
 
-				$file = $this->tpldir. DIRECTORY_SEPARATOR . $file;
-			}
-		}
+                $file = $this->tpldir. DIRECTORY_SEPARATOR . $file;
+            }
+        }
 
-		$file_text = '';
+        $file_text = '';
 
-		if (isset($this->filecache[$file])) {
+        if (isset($this->filecache[$file])) {
 
-			$file_text .= $this->filecache[$file];
+            $file_text .= $this->filecache[$file];
 
-			if ($this->debug) {
-				$file_text = '<!-- XTemplate debug cached: ' . realpath($file) . ' -->' . "\n" . $file_text;
-			}
+            if ($this->debug) {
+                $file_text = '<!-- XTemplate debug cached: ' . realpath($file) . ' -->' . "\n" . $file_text;
+            }
 
-		} else {
+        } else {
 
-			if (is_file($file) && is_readable($file)) {
+            if (is_file($file) && is_readable($file)) {
 
-				if (filesize($file)) {
+                if (filesize($file)) {
 
-					if (!($fh = fopen($file, 'r'))) {
+                    if (!($fh = fopen($file, 'r'))) {
 
-						$this->_set_error('Cannot open file: ' . realpath($file));
-						return '';
-					}
+                        $this->_set_error('Cannot open file: ' . realpath($file));
+                        return '';
+                    }
 
-					$file_text .= fread($fh,filesize($file));
-					fclose($fh);
+                    $file_text .= fread($fh,filesize($file));
+                    fclose($fh);
 
-				}
+                }
 
-				if ($this->debug) {
-					$file_text = '<!-- XTemplate debug: ' . realpath($file) . ' -->' . "\n" . $file_text;
-				}
+                if ($this->debug) {
+                    $file_text = '<!-- XTemplate debug: ' . realpath($file) . ' -->' . "\n" . $file_text;
+                }
 
-			} elseif (str_replace('.', '', phpversion()) >= '430' && $file_text = @file_get_contents($file, true)) {
-				// Enable use of include path by using file_get_contents
-				// Implemented at suggestion of SF Feature Request ID #1529478 michaelgroh
-				if ($file_text === false) {
-					$this->_set_error("[" . realpath($file) . "] ($file) does not exist");
-					$file_text = "<b>__XTemplate fatal error: file [$file] does not exist in the include path__</b>";
-				} elseif ($this->debug) {
-					$file_text = '<!-- XTemplate debug: ' . realpath($file) . ' (via include path) -->' . "\n" . $file_text;
-				}
-			} elseif (!is_file($file)) {
+            } elseif (str_replace('.', '', phpversion()) >= '430' && $file_text = @file_get_contents($file, true)) {
+                // Enable use of include path by using file_get_contents
+                // Implemented at suggestion of SF Feature Request ID #1529478 michaelgroh
+                if ($file_text === false) {
+                    $this->_set_error("[" . realpath($file) . "] ($file) does not exist");
+                    $file_text = "<b>__XTemplate fatal error: file [$file] does not exist in the include path__</b>";
+                } elseif ($this->debug) {
+                    $file_text = '<!-- XTemplate debug: ' . realpath($file) . ' (via include path) -->' . "\n" . $file_text;
+                }
+            } elseif (!is_file($file)) {
 
-				// NW 17 Oct 2002 : Added realpath around the file name to identify where the code is searching.
-				$this->_set_error("[" . realpath($file) . "] ($file) does not exist");
-				$file_text .= "<b>__XTemplate fatal error: file [$file] does not exist__</b>";
+                // NW 17 Oct 2002 : Added realpath around the file name to identify where the code is searching.
+                $this->_set_error("[" . realpath($file) . "] ($file) does not exist");
+                $file_text .= "<b>__XTemplate fatal error: file [$file] does not exist__</b>";
 
-			} elseif (!is_readable($file)) {
+            } elseif (!is_readable($file)) {
 
-				$this->_set_error("[" . realpath($file) . "] ($file) is not readable");
-				$file_text .= "<b>__XTemplate fatal error: file [$file] is not readable__</b>";
-			}
+                $this->_set_error("[" . realpath($file) . "] ($file) is not readable");
+                $file_text .= "<b>__XTemplate fatal error: file [$file] is not readable__</b>";
+            }
 
-			$this->filecache[$file] = $file_text;
-		}
+            $this->filecache[$file] = $file_text;
+        }
 
-		return $file_text;
-	}
+        return $file_text;
+    }
 
-	/**
+    /**
      * recursively gets the content of a file with {FILE "filename.tpl"} directives
      *
      * @access public - aiming for private
      * @param string $file
      * @return string
      */
-	public function _r_getfile ($file) {
+    public function _r_getfile ($file) {
 
-		$text = $this->_getfile($file);
+        $text = $this->_getfile($file);
 
-		$res = array();
+        $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);
-		}
+            $text2 = $this->_getfile($res[1]);
+            $text = preg_replace("'".preg_quote($res[0])."'",$text2,$text);
+        }
 
-		return $text;
-	}
+        return $text;
+    }
 
 
-	/**
+    /**
      * add an outer block delimiter set useful for rtfs etc - keeps them editable in word
      *
      * @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;
+        $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;
 
-		$this->filecontents = $before . "\n" . $this->filecontents . "\n" . $after;
-	}
+        $this->filecontents = $before . "\n" . $this->filecontents . "\n" . $after;
+    }
 
-	/**
+    /**
      * Debug function - var_dump wrapped in '<pre></pre>' tags
      *
      * @access private
      * @param multiple var_dumps all the supplied arguments
      */
-	private function _pre_var_dump ($args) {
-
-		if ($this->debug) {
-			echo '<pre>';
-			var_dump(func_get_args());
-			echo '</pre>';
-		}
-	}
+    private function _pre_var_dump ($args) {
+
+        if ($this->debug) {
+            echo '<pre>';
+            var_dump(func_get_args());
+            echo '</pre>';
+        }
+    }
 } /* end of XTemplate class. */
 
 ?>
\ No newline at end of file

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);

Indentation +131 added lines, -131 removed lines

@@ -18,137 +18,137 @@
 
 class Template {
 
-	protected $template = null;
-	protected static $registeredTemplate = array();
-
-	public function __construct ($file, Registry &$registry = null) {
-		if ($registry == null) {
-			$registry = Registry::singleton();
-		}
-
-		if (!class_exists("XTemplate", false)) {
-			require_once(ROOT_PATH . "system/packages/com.jukusoft.cms.xtpl/xtpl/xtemplate.class.php");
-		}
-
-		if (isset(self::$registeredTemplate[$file])) {
-			$file = self::$registeredTemplate[$file];
-		}
-
-		//find file
-		$file = self::findTemplate($file, $registry);
-
-		$this->template = new XTemplate($file);
-		$this->template->assign("REGISTRY", $registry->listSettings());
-
-		//set CSRF token
-		$this->template->assign("CSRF_TOKEN", Security::getCSRFToken());
-
-		//set domain, current page and so on
-		$this->template->assign("DOMAIN", DomainUtils::getCurrentDomain());
-		$this->template->assign("BASE_URL", DomainUtils::getBaseURL());
-		$this->template->assign("CURRENT_URL", DomainUtils::getURL());
-		$this->template->assign("FOLDER", $registry->getSetting("folder"));
-
-		//set language settings
-		$this->template->assign("PREF_LANG", $registry->getSetting("pref_lang"));
-		$this->template->assign("LANG_TOKEN", $registry->getSetting("lang_token"));
-
-		$redirect_url = urlencode(DomainUtils::getURL());
-
-		if (isset($_REQUEST['redirect_url']) && !empty($_REQUEST['redirect_url'])) {
-			$redirect_url = $_REQUEST['redirect_url'];
-		}
-
-		$domain = $registry->getObject("domain");
-		$this->template->assign("HOME_PAGE", $domain->getHomePage());
-		$this->template->assign("LOGIN_PAGE", Settings::get("login_page", "login"));
-		$this->template->assign("LOGIN_URL", DomainUtils::getBaseURL() . "/" . Settings::get("login_page", "login") . "?action=login&redirect_url=" . $redirect_url);
-		$this->template->assign("LOGOUT_PAGE", Settings::get("logout_page", "logout"));
-		$this->template->assign("LOGOUT_URL", DomainUtils::getBaseURL() . "/" . Settings::get("logout_page", "logout") . "?csrf_token=" . urlencode(Security::getCSRFToken()));
-
-		//set user variables
-		$this->template->assign("USERID", User::current()->getID());
-		$this->template->assign("USERNAME", User::current()->getUsername());
-
-		$style_name = $registry->getSetting("current_style_name");
-		$this->template->assign("STYLE_PATH",DomainUtils::getBaseURL() . "/styles/" . $style_name . "/");
-
-		Events::throwEvent("init_template", array(
-			'file' => &$file,
-			'template' => &$this,
-			'template_instance' => &$this->template,
-			'registry' => &$registry
-		));
-
-	}
-
-	public function assign ($var, $value) {
-		$this->template->assign($var, $value);
-	}
-
-	public function parse ($name = "main") {
-		$this->template->parse($name);
-	}
-
-	public function getCode ($name = "main") {
-		return $this->template->text($name);
-	}
-
-	public static function registerTemplate ($template, $file) {
-		self::$registeredTemplate[$template] = $file;
-	}
-
-	public static function clearTemplates () {
-		self::$registeredTemplate = array();
-	}
-
-	public static function createTemplate ($file) {
-		$class = (String) __CLASS__;
-		return new $class($file);
-	}
-
-	public static function getName () {
-		return __CLASS__;
-	}
-
-	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);
-		}
-
-		//check, if file path was set
-		if (file_exists($tpl_name . ".tpl")) {
-			return $tpl_name . ".tpl";
-		}
-
-		//find file
-		$current_style = $registry->getSetting("current_style_name");
-		$style_path = STYLE_PATH . $current_style . "/";
-
-		$array = explode("_", $tpl_name);
-
-		if (sizeof($array) == 3) {
-			//plugin or style template
-			if ($array[0] === "plugin") {
-				return PLUGIN_PATH . $array[1] . "/templates/" . $array[2] . ".tpl";
-			} else {
-				throw new Exception("templates with 2 '_' (expect 'plugin') arent supported yet.");
-			}
-		} else if (sizeof($array) == 1) {
-			//search in style path
-			if (file_exists($style_path . $tpl_name . ".tpl")) {
-				return $style_path . $tpl_name . ".tpl";
-			} else if (file_exists(STYLE_PATH . "default/" . $tpl_name . ".tpl")) {
-				//use default template
-				return STYLE_PATH . "default/" . $tpl_name . ".tpl";
-			} else {
-				throw new Exception("Coulnd't found template '" . $tpl_name . "' (search path: '" . $style_path . $tpl_name . ".tpl" . "'!");
-			}
-		} else {
-			throw new IllegalStateException("Coulndt found template file '" . $tpl_name . "', because unknown array size: " . sizeof($array));
-		}
-	}
+    protected $template = null;
+    protected static $registeredTemplate = array();
+
+    public function __construct ($file, Registry &$registry = null) {
+        if ($registry == null) {
+            $registry = Registry::singleton();
+        }
+
+        if (!class_exists("XTemplate", false)) {
+            require_once(ROOT_PATH . "system/packages/com.jukusoft.cms.xtpl/xtpl/xtemplate.class.php");
+        }
+
+        if (isset(self::$registeredTemplate[$file])) {
+            $file = self::$registeredTemplate[$file];
+        }
+
+        //find file
+        $file = self::findTemplate($file, $registry);
+
+        $this->template = new XTemplate($file);
+        $this->template->assign("REGISTRY", $registry->listSettings());
+
+        //set CSRF token
+        $this->template->assign("CSRF_TOKEN", Security::getCSRFToken());
+
+        //set domain, current page and so on
+        $this->template->assign("DOMAIN", DomainUtils::getCurrentDomain());
+        $this->template->assign("BASE_URL", DomainUtils::getBaseURL());
+        $this->template->assign("CURRENT_URL", DomainUtils::getURL());
+        $this->template->assign("FOLDER", $registry->getSetting("folder"));
+
+        //set language settings
+        $this->template->assign("PREF_LANG", $registry->getSetting("pref_lang"));
+        $this->template->assign("LANG_TOKEN", $registry->getSetting("lang_token"));
+
+        $redirect_url = urlencode(DomainUtils::getURL());
+
+        if (isset($_REQUEST['redirect_url']) && !empty($_REQUEST['redirect_url'])) {
+            $redirect_url = $_REQUEST['redirect_url'];
+        }
+
+        $domain = $registry->getObject("domain");
+        $this->template->assign("HOME_PAGE", $domain->getHomePage());
+        $this->template->assign("LOGIN_PAGE", Settings::get("login_page", "login"));
+        $this->template->assign("LOGIN_URL", DomainUtils::getBaseURL() . "/" . Settings::get("login_page", "login") . "?action=login&redirect_url=" . $redirect_url);
+        $this->template->assign("LOGOUT_PAGE", Settings::get("logout_page", "logout"));
+        $this->template->assign("LOGOUT_URL", DomainUtils::getBaseURL() . "/" . Settings::get("logout_page", "logout") . "?csrf_token=" . urlencode(Security::getCSRFToken()));
+
+        //set user variables
+        $this->template->assign("USERID", User::current()->getID());
+        $this->template->assign("USERNAME", User::current()->getUsername());
+
+        $style_name = $registry->getSetting("current_style_name");
+        $this->template->assign("STYLE_PATH",DomainUtils::getBaseURL() . "/styles/" . $style_name . "/");
+
+        Events::throwEvent("init_template", array(
+            'file' => &$file,
+            'template' => &$this,
+            'template_instance' => &$this->template,
+            'registry' => &$registry
+        ));
+
+    }
+
+    public function assign ($var, $value) {
+        $this->template->assign($var, $value);
+    }
+
+    public function parse ($name = "main") {
+        $this->template->parse($name);
+    }
+
+    public function getCode ($name = "main") {
+        return $this->template->text($name);
+    }
+
+    public static function registerTemplate ($template, $file) {
+        self::$registeredTemplate[$template] = $file;
+    }
+
+    public static function clearTemplates () {
+        self::$registeredTemplate = array();
+    }
+
+    public static function createTemplate ($file) {
+        $class = (String) __CLASS__;
+        return new $class($file);
+    }
+
+    public static function getName () {
+        return __CLASS__;
+    }
+
+    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);
+        }
+
+        //check, if file path was set
+        if (file_exists($tpl_name . ".tpl")) {
+            return $tpl_name . ".tpl";
+        }
+
+        //find file
+        $current_style = $registry->getSetting("current_style_name");
+        $style_path = STYLE_PATH . $current_style . "/";
+
+        $array = explode("_", $tpl_name);
+
+        if (sizeof($array) == 3) {
+            //plugin or style template
+            if ($array[0] === "plugin") {
+                return PLUGIN_PATH . $array[1] . "/templates/" . $array[2] . ".tpl";
+            } else {
+                throw new Exception("templates with 2 '_' (expect 'plugin') arent supported yet.");
+            }
+        } else if (sizeof($array) == 1) {
+            //search in style path
+            if (file_exists($style_path . $tpl_name . ".tpl")) {
+                return $style_path . $tpl_name . ".tpl";
+            } else if (file_exists(STYLE_PATH . "default/" . $tpl_name . ".tpl")) {
+                //use default template
+                return STYLE_PATH . "default/" . $tpl_name . ".tpl";
+            } else {
+                throw new Exception("Coulnd't found template '" . $tpl_name . "' (search path: '" . $style_path . $tpl_name . ".tpl" . "'!");
+            }
+        } else {
+            throw new IllegalStateException("Coulndt found template file '" . $tpl_name . "', because unknown array size: " . sizeof($array));
+        }
+    }
 
 }