XaBerr / JATE

dist/jate/modules/Query/Query.php

Spacing +9 added lines, -9 removed lines

@@ -7,42 +7,42 @@
 			$this->connection = [];
 			$this->currentConnection = null;
 		}
-		public function addConnection( $_name, $_connection ) {
+		public function addConnection($_name, $_connection) {
 			$this->connection["$_name"] = $_connection;
 			$this->currentConnection = $_connection;
 
 			foreach ($this->modules as &$module)
-				if(isset($module->currentConnection))
+				if (isset($module->currentConnection))
 					$module->addConnection($_name, $_connection);
 		}
-		public function setConnection( $_name ) {
+		public function setConnection($_name) {
 			$this->currentConnection = $this->connection["$_name"];
 		}
-		public function query( $_query ) {
+		public function query($_query) {
 			$this->stdQuery($_query);
 			return true;
 		}
-		public function queryInsert( $_query ) {
+		public function queryInsert($_query) {
 			$temp = $this->stdQuery($_query);
 			return $this->currentConnection->database->lastInsertId();
 		}
 
-		public function queryFetch( $_query ) {
+		public function queryFetch($_query) {
 			$temp = $this->stdQuery($_query);
 			return $temp->fetchAll(PDO::FETCH_ASSOC);
 		}
 
-		public function queryArray( $_query ) {
+		public function queryArray($_query) {
 			$temp = $this->stdQuery($_query);
 			return $temp->fetchAll(PDO::FETCH_COLUMN, 0);
 		}
 
-		protected function stdQuery( $_query ) {
+		protected function stdQuery($_query) {
 			$database = $this->currentConnection->database;
 			$error = "Error query [$_query]";
 			$query = $database->prepare($_query);
 			$_result = $query->execute();
-			if(!$_result) {
+			if (!$_result) {
 				echo "$_query<br>";
 				echo "Something wrong: $error";
 				var_dump($query->errorInfo());

Braces +3 added lines, -2 removed lines

@@ -11,9 +11,10 @@
 			$this->connection["$_name"] = $_connection;
 			$this->currentConnection = $_connection;
 
-			foreach ($this->modules as &$module)
-				if(isset($module->currentConnection))
+			foreach ($this->modules as &$module) {
+							if(isset($module->currentConnection))
 					$module->addConnection($_name, $_connection);
+			}
 		}
 		public function setConnection( $_name ) {
 			$this->currentConnection = $this->connection["$_name"];

dist/jate/modules/JConfig/JConfig.php

Braces +8 added lines, -6 removed lines

@@ -17,10 +17,11 @@ 
 		public function import( $_path, $_type = "misc" ) {
 			$data = file_get_contents($_path);
 			$data = json_decode($data);
-			if( $_type == "connection" )
-				$this->overlayConnection($data);
-			else
-				$this->overlayMisc($data);
+			if( $_type == "connection" ) {
+							$this->overlayConnection($data);
+			} else {
+							$this->overlayMisc($data);
+			}
 		}
 		protected function overlayConnection( $_data ) {
 			$this->connection = $this->obj2array($_data);
@@ -40,8 +41,9 @@ 
 			return $return;
 		}
 		protected function importObject( $_object ) {
-			foreach (get_object_vars($_object) as $key => $value)
-				$this->$key = $value;
+			foreach (get_object_vars($_object) as $key => $value) {
+							$this->$key = $value;
+			}
 		}
 	}
 ?>

Spacing +16 added lines, -16 removed lines

@@ -6,45 +6,45 @@
 		public $pages;
 		public $server;
 		public function __construct() {
-			$this->connection["enable"]		= false;
-			$this->connection["user"]			= "";
+			$this->connection["enable"] = false;
+			$this->connection["user"] = "";
 			$this->connection["password"] = "";
 			$this->connection["database"] = "";
-			$this->connection["server"]		= "";
-			$this->all		= "";
+			$this->connection["server"] = "";
+			$this->all = "";
 			$this->DEBUG	= 0;
 			$this->pages	= [];
-			$this->server	= [];
+			$this->server = [];
 			$this->server["HTTP_HOST"]		= $_SERVER["HTTP_HOST"];
-			$this->server["REQUEST_URI"]	= $_SERVER["REQUEST_URI"];
+			$this->server["REQUEST_URI"] = $_SERVER["REQUEST_URI"];
 			$this->server["PHP_SELF"]			= $_SERVER["PHP_SELF"];
 		}
-		public function import( $_path, $_type = "misc" ) {
+		public function import($_path, $_type = "misc") {
 			$data = file_get_contents($_path);
 			$data = json_decode($data);
-			if( $_type == "connection" )
+			if ($_type == "connection")
 				$this->overlayConnection($data);
 			else
 				$this->overlayMisc($data);
 		}
-		protected function overlayConnection( $_data ) {
+		protected function overlayConnection($_data) {
 			$this->connection = $this->obj2array($_data);
 		}
-		protected function overlayMisc( $_data ) {
+		protected function overlayMisc($_data) {
 			$this->importObject($_data);
 		}
-		protected function obj2array ( &$_instance ) {
-			$clone	= (array) $_instance;
+		protected function obj2array(&$_instance) {
+			$clone = (array) $_instance;
 			$return	= [];
 			$return['___SOURCE_KEYS_'] = $clone;
-			while ( list ($key, $value) = each ($clone) ) {
-				$temp		= explode ("\0", $key);
-				$newkey	= $temp[count($temp)-1];
+			while (list ($key, $value) = each($clone)) {
+				$temp		= explode("\0", $key);
+				$newkey = $temp[count($temp) - 1];
 				$return[$newkey] = &$return['___SOURCE_KEYS_'][$key];
 			}
 			return $return;
 		}
-		protected function importObject( $_object ) {
+		protected function importObject($_object) {
 			foreach (get_object_vars($_object) as $key => $value)
 				$this->$key = $value;
 		}

dist/jate/functions/git.php

Spacing +4 added lines, -4 removed lines

@@ -1,15 +1,15 @@
 <?php
-	function getGitLog( $_dir = "./" ) {
-		if(!file_exists($_dir))
+	function getGitLog($_dir = "./") {
+		if (!file_exists($_dir))
 			return [];
 		$currentDir = getcwd();
 		chdir($_dir);
 		$gitHistory	= [];
 		$gitLogs		= [];
 		$gitPath		= str_replace('\\', '/', exec("git rev-parse --show-toplevel"));
-		$rootPath		= str_replace('\\', '/', getcwd ());
+		$rootPath		= str_replace('\\', '/', getcwd());
 		$lastHash		= null;
-		if( $gitPath != $rootPath ) {
+		if ($gitPath != $rootPath) {
 			chdir($currentDir);
 			return [];
 		}

Braces +7 added lines, -8 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 	function getGitLog( $_dir = "./" ) {
-		if(!file_exists($_dir))
-			return [];
+		if(!file_exists($_dir)) {
+					return [];
+		}
 		$currentDir = getcwd();
 		chdir($_dir);
 		$gitHistory	= [];
@@ -35,19 +36,17 @@ 
 						$tag = trim($tag[0]);
 						$gitHistory[$lastHash]['tag'] = $tag;
 					}
-				}
-				else if (strpos($line, 'Author') === 0) {
+				} else if (strpos($line, 'Author') === 0) {
 					$author = explode(':', $line);
 					$author = trim(end($author));
 					$gitHistory[$lastHash]['author'] = $author;
-				}
-				else if (strpos($line, 'Date') === 0) {
+				} else if (strpos($line, 'Date') === 0) {
 					$date = explode(':', $line, 2);
 					$date = trim(end($date));
 					$gitHistory[$lastHash]['date'] = date('d/m/Y H:i:s A', strtotime($date));
+				} else {
+									$gitHistory[$lastHash]['message'] .= "$line<br>";
 				}
-				else
-					$gitHistory[$lastHash]['message'] .= "$line<br>";
 			}
 		}
 		chdir($currentDir);

dist/jate/modules/Html/Html.php

Braces +9 added lines, -6 removed lines

@@ -26,17 +26,20 @@
 			$this->tags["js"]				= array_unique($this->tags["js"]);
 			$this->tags["pagePath"]	= json_encode($this->tags["pagePath"]);
 			$tempStr = "";
-			foreach ($this->tags["css"] as $i)
-				$tempStr .= "<link rel='stylesheet' href='$i'>";
+			foreach ($this->tags["css"] as $i) {
+							$tempStr .= "<link rel='stylesheet' href='$i'>";
+			}
 			$this->tags["css"] = $tempStr;
 			$tempStr = "";
-			foreach ($this->tags["js"] as $i)
-				$tempStr .= "<script src='$i'></script>";
+			foreach ($this->tags["js"] as $i) {
+							$tempStr .= "<script src='$i'></script>";
+			}
 			$this->tags["js"] = $tempStr;
 			$tempStr = "";
 			$tempStr .= "<script type='text/javascript'>";
-			foreach ($this->tags["jsVariables"] as $i)
-				$tempStr .= " $i[0] = $i[1];\n";
+			foreach ($this->tags["jsVariables"] as $i) {
+							$tempStr .= " $i[0] = $i[1];\n";
+			}
 			$tempStr .= "</script>";
 			$this->tags["jsVariables"] = $tempStr;
 		}

Spacing +10 added lines, -10 removed lines

@@ -1,32 +1,32 @@
 <?php
 	requireComponent("../Query/Query.php");
 	class Html extends Query {
-		public function __construct( $_parameters = [ "app" => null, "page" => null] ) {
+		public function __construct($_parameters = ["app" => null, "page" => null]) {
 			parent::__construct();
 			$this->data["template"]					= "";
 			$this->tags["brand"]						= "";
 			$this->tags["brandImg"]					= "";
 			$this->tags["menu"]							= "";
 			$this->tags["title"]						= "";
-			$this->tags["subtitle"]		 			= "";
+			$this->tags["subtitle"] = "";
 			$this->tags["content"]				 	= "";
-			$this->tags["outContent"]		 		= "";
+			$this->tags["outContent"] = "";
 			$this->tags["footer"]		 				= "";
 			$this->tags["pagePath"]				 	= [];
-			$this->tags["css"]							= [];
-			$this->tags["js"]					 			= [];
+			$this->tags["css"] = [];
+			$this->tags["js"] = [];
 			$this->tags["jsVariables"]			= [];
-			$this->tags["metaDescription"]	= [];
-			$this->tags["metaKeywords"]			= [];
+			$this->tags["metaDescription"] = [];
+			$this->tags["metaKeywords"] = [];
 			$this->tags["metaAuthor"]				= [];
-			$this->parameters								= $_parameters;
-			$this->tags["base"]							= $_parameters["app"]->server["RELATIVE"]."/";
+			$this->parameters = $_parameters;
+			$this->tags["base"] = $_parameters["app"]->server["RELATIVE"]."/";
 		}
 		public function uniforma() {
 			$this->addDipendences();
 			$this->tags["css"]			= array_unique($this->tags["css"]);
 			$this->tags["js"]				= array_unique($this->tags["js"]);
-			$this->tags["pagePath"]	= json_encode($this->tags["pagePath"]);
+			$this->tags["pagePath"] = json_encode($this->tags["pagePath"]);
 			$tempStr = "";
 			foreach ($this->tags["css"] as $i)
 				$tempStr .= "<link rel='stylesheet' href='$i'>";

dist/jate/coreEngine.php

Spacing +9 added lines, -9 removed lines

@@ -4,15 +4,15 @@
 
 	//JATE SUFF
 	require_once			(end($GLOBALS["JATEPath"])."jate/functions/requirer.php");
-	requireComponent	("functions/folder.php");
-	requireComponent	("modules/JConfig/JConfig.php");
-	requireComponent	("modules/Module/Module.php");
-	requireComponents	("functions");
-	requireModules		("modules");
+	requireComponent("functions/folder.php");
+	requireComponent("modules/JConfig/JConfig.php");
+	requireComponent("modules/Module/Module.php");
+	requireComponents("functions");
+	requireModules("modules");
 
 	//USER STUFF
-	requireComponent	("config.php",false);
-	requireModules		("modules",false);
-	requireComponents	("bundles/models",false);
-	requireComponents	("bundles/controllers",false);
+	requireComponent("config.php", false);
+	requireModules("modules", false);
+	requireComponents("bundles/models", false);
+	requireComponents("bundles/controllers", false);
 ?>

dist/jate/modules/WebApp/WebApp.php

Braces +20 added lines, -14 removed lines

@@ -18,8 +18,9 @@ 
 			if(is_array($_page)) {
 				$path		= $_page[0];
 				$class	= $_page[1];
-				if(isset($_page[2]))
-					$param = $_page[2];
+				if(isset($_page[2])) {
+									$param = $_page[2];
+				}
 			} else {
 				$path		= $_page;
 				$class	= $_page;
@@ -27,8 +28,9 @@ 
 			$this->pages[$path] = [$class,$param];
 		}
 		public function addPages( $_pages ) {
-			foreach ($_pages as $i)
-				$this->addPage($i);
+			foreach ($_pages as $i) {
+							$this->addPage($i);
+			}
 		}
 		public function fetchPage( $_stack ) {
 			$parameters = [];
@@ -42,10 +44,11 @@ 
 					break;
 				}
 			}
-			if( isset($temp[1]) && is_array($temp[1]) )
-				$temp[1] = array_merge($temp[1], $parameters);
-			else
-				$temp[1] = $parameters;
+			if( isset($temp[1]) && is_array($temp[1]) ) {
+							$temp[1] = array_merge($temp[1], $parameters);
+			} else {
+							$temp[1] = $parameters;
+			}
 			$this->currentPage = new $temp[0](["app" => $this->jConfig, "page" => $temp[1]]);
 			return $this->currentPage;
 		}
@@ -65,15 +68,18 @@ 
 			$pathLength = count($_path);
 			if($urlLength == $pathLength) {
 				while($cont < $urlLength) {
-					if( $_path[$cont] == $_url[$cont] )
-						$cont++;
-					else if( strpos($_path[$cont], "\$") !== false ) {
+					if( $_path[$cont] == $_url[$cont] ) {
+											$cont++;
+					} else if( strpos($_path[$cont], "\$") !== false ) {
 						$variables[str_replace('$', "", $_path[$cont])] = $_url[$cont];
 						$cont++;
-					} else break;
+					} else {
+						break;
+					}
+				}
+				if($cont == $urlLength) {
+									return $variables;
 				}
-				if($cont == $urlLength)
-					return $variables;
 			}
 			return null;
 		}

Spacing +19 added lines, -19 removed lines

@@ -7,48 +7,48 @@ 
 		public function __construct() {
 			parent::__construct();
 			$this->pages = [];
-			$this->defaultPage	= ["Page404",[]];
+			$this->defaultPage	= ["Page404", []];
 			$this->currentPage	= null;
-			$this->jConfig			= null;
+			$this->jConfig = null;
 		}
-		public function addPage( $_page ) {
+		public function addPage($_page) {
 			$param	= [];
 			$path		= $_page;
 			$class	= $_page;
-			if(is_array($_page)) {
+			if (is_array($_page)) {
 				$path		= $_page[0];
 				$class	= $_page[1];
-				if(isset($_page[2]))
+				if (isset($_page[2]))
 					$param = $_page[2];
 			}
 			$this->pages[$path] = [$class, $param];
 		}
-		public function addPages( $_pages ) {
+		public function addPages($_pages) {
 			foreach ($_pages as $i)
 				$this->addPage($i);
 		}
 		public function fetchPage(  ) {
 			$router = new Router();
-			$router->parameters = [ "app" => &$this->jConfig, "page" => null];
+			$router->parameters = ["app" => &$this->jConfig, "page" => null];
 			$stack = $router->getPage();
 			$parameters = [];
-			$temp				= $this->defaultPage;
+			$temp = $this->defaultPage;
 			foreach ($this->pages as $key => $value) {
 				$variables = $this->pathSeeker(explode("/", $key), $stack);
-				if(is_array($variables)) {
+				if (is_array($variables)) {
 					$temp = $value;
 					$parameters = $variables;
 					break;
 				}
 			}
-			if( isset($temp[1]) && is_array($temp[1]) )
+			if (isset($temp[1]) && is_array($temp[1]))
 				$temp[1] = array_merge($temp[1], $parameters);
 			else
 				$temp[1] = $parameters;
 			$this->currentPage = new $temp[0](["app" => $this->jConfig, "page" => $temp[1]]);
 			return $this->currentPage;
 		}
-		public function setDefaultPage( $_page ) {
+		public function setDefaultPage($_page) {
 			$this->defaultPage = $_page;
 		}
 		public function draw() {
@@ -57,28 +57,28 @@ 
 			$gui->init($this->currentPage);
 			$gui->draw($this->currentPage->data["template"]);
 		}
-		public function pathSeeker( $_path, $_url ) {
+		public function pathSeeker($_path, $_url) {
 			$urlLength = count($_url);
 			$cont = 0;
 			$variables = [];
 			$pathLength = count($_path);
-			if($urlLength == $pathLength) {
-				while($cont < $urlLength) {
-					if( $_path[$cont] == $_url[$cont] )
+			if ($urlLength == $pathLength) {
+				while ($cont < $urlLength) {
+					if ($_path[$cont] == $_url[$cont])
 						$cont++;
-					else if( strpos($_path[$cont], "\$") !== false ) {
+					else if (strpos($_path[$cont], "\$") !== false) {
 						$variables[str_replace('$', "", $_path[$cont])] = $_url[$cont];
 						$cont++;
 					} else break;
 				}
-				if($cont == $urlLength)
+				if ($cont == $urlLength)
 					return $variables;
 			}
 			return null;
 		}
-		public function newConfig( $_path = "config/") {
+		public function newConfig($_path = "config/") {
 			$this->jConfig = new JConfig();
-			$this->jConfig->import("${_path}connection.json","connection");
+			$this->jConfig->import("${_path}connection.json", "connection");
 			$this->jConfig->import("${_path}misc.json");
 			$this->jConfig->import("${_path}router.json");
 		}

dist/jate/modules/Router/Router.php

Spacing +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 			parent::__construct();
 		}
 		public function getPage() {
-			$request	= $this->parameters["app"]->server["REQUEST_URI"];
-			$base			= $this->parameters["app"]->server["RELATIVE"];
+			$request = $this->parameters["app"]->server["REQUEST_URI"];
+			$base = $this->parameters["app"]->server["RELATIVE"];
 			$url			= str_replace($base, "", $request);
 			$url			= explode("/", $url);
 			return $url;

dist/jate/modules/Menu/Menu.php

Spacing +16 added lines, -16 removed lines

@@ -8,13 +8,13 @@ 
 			$menu = $this->queryFetch("SELECT * FROM menu WHERE flag_active = 1 ORDER BY `order`");
 			$temp = [];
 			foreach ($menu as $i) {
-				if($i["fk_menu"] == 0) {
+				if ($i["fk_menu"] == 0) {
 					$pk_menu = $i["pk_menu"];
 					array_push($temp, array("label" => $i["label"], "link" => $i["link"], "submenu" => [], "relative" => false));
 					$submenu = $this->queryFetch("SELECT * FROM menu WHERE fk_menu = $pk_menu ORDER BY `order`");
-					if($submenu)
+					if ($submenu)
 					foreach ($submenu as $j)
-						array_push( $temp[count($temp)-1]["submenu"], array("label" => $j["label"], "link" => $j["link"], "submenu" => [], "relative" => false) );
+						array_push($temp[count($temp) - 1]["submenu"], array("label" => $j["label"], "link" => $j["link"], "submenu" => [], "relative" => false));
 				}
 			}
 			$this->tags["menu"] = $temp;
@@ -23,15 +23,15 @@ 
 		public function draw() {
 			$temp = "";
 			$host = $this->parameters["app"]->server["HTTP_HOST"];
-			$uri	= $this->parameters["app"]->server["REQUEST_URI"];
-			$actualLink	= "http://$host$uri";
-			$relative		= $this->parameters["app"]->server["RELATIVE"];
+			$uri = $this->parameters["app"]->server["REQUEST_URI"];
+			$actualLink = "http://$host$uri";
+			$relative = $this->parameters["app"]->server["RELATIVE"];
 			foreach ($this->tags["menu"] as $i) {
 				$prePath = "";
-				if($i["relative"])
+				if ($i["relative"])
 					$prePath = $relative;
 				$active = $this->isSubString($actualLink, array_merge(array_column($i["submenu"], 'link'), array($i["link"]))) ? "active" : "";
-				if( is_array($i["submenu"]) && count($i["submenu"])<1)
+				if (is_array($i["submenu"]) && count($i["submenu"]) < 1)
 						$temp .= "<li class='$active'><a href='$prePath$i[link]'>$i[label]</a></li>";
 				else {
 					$temp .= "<li class='dropdown $active'>";
@@ -43,7 +43,7 @@ 
 						'<ul class="dropdown-menu">';
 					foreach ($i["submenu"] as $j) {
 						$prePath = "";
-						if($j["relative"])
+						if ($j["relative"])
 							$prePath = $relative;
 						$temp .= "<li><a href='$prePath$j[link]'>$j[label]</a></li>";
 					}
@@ -52,18 +52,18 @@ 
 			}
 			return $temp;
 		}
-		protected function isSubString( $_string, $_list) {
+		protected function isSubString($_string, $_list) {
 			$success = false;
 			foreach ($_list as $i)
-				if(strpos($_string,$i) !== false)
+				if (strpos($_string, $i) !== false)
 					$success = true;
 			return $success;
 		}
 		public function loginWithUser() {
 			$this->init();
 			$temp = [];
-			if(!isset($_SESSION["username"]))
-				$_SESSION["username"] ="guest";
+			if (!isset($_SESSION["username"]))
+				$_SESSION["username"] = "guest";
 			$user = $_SESSION["username"];
 			$blackList = $this->queryFetch(
 				"SELECT user.*,user_section.*
@@ -78,10 +78,10 @@ 
 				$success = true;
 				$k = $i["label"];
 				foreach ($blackList as $j)
-					if( $j["section"] == $k)
+					if ($j["section"] == $k)
 						$success = false;
-				if($success)
-					array_push($temp,$i);
+				if ($success)
+					array_push($temp, $i);
 			}
 			$this->tags["menu"] = $temp;
 		}

Braces +24 added lines, -17 removed lines

@@ -12,9 +12,10 @@ 
 					$pk_menu = $i["pk_menu"];
 					array_push($temp, array("label" => $i["label"], "link" => $i["link"], "submenu" => [], "relative" => false));
 					$submenu = $this->queryFetch("SELECT * FROM menu WHERE fk_menu = $pk_menu ORDER BY `order`");
-					if($submenu)
-					foreach ($submenu as $j)
+					if($submenu) {
+										foreach ($submenu as $j)
 						array_push( $temp[count($temp)-1]["submenu"], array("label" => $j["label"], "link" => $j["link"], "submenu" => [], "relative" => false) );
+					}
 				}
 			}
 			$this->tags["menu"] = $temp;
@@ -28,12 +29,13 @@ 
 			$relative		= $this->parameters["app"]->server["RELATIVE"];
 			foreach ($this->tags["menu"] as $i) {
 				$prePath = "";
-				if($i["relative"])
-					$prePath = $relative;
+				if($i["relative"]) {
+									$prePath = $relative;
+				}
 				$active = $this->isSubString($actualLink, array_merge(array_column($i["submenu"], 'link'), array($i["link"]))) ? "active" : "";
-				if( is_array($i["submenu"]) && count($i["submenu"])<1)
-						$temp .= "<li class='$active'><a href='$prePath$i[link]'>$i[label]</a></li>";
-				else {
+				if( is_array($i["submenu"]) && count($i["submenu"])<1) {
+										$temp .= "<li class='$active'><a href='$prePath$i[link]'>$i[label]</a></li>";
+				} else {
 					$temp .= "<li class='dropdown $active'>";
 					$temp .=
 						'<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'.
@@ -43,8 +45,9 @@ 
 						'<ul class="dropdown-menu">';
 					foreach ($i["submenu"] as $j) {
 						$prePath = "";
-						if($j["relative"])
-							$prePath = $relative;
+						if($j["relative"]) {
+													$prePath = $relative;
+						}
 						$temp .= "<li><a href='$prePath$j[link]'>$j[label]</a></li>";
 					}
 					$temp .= "</ul></li>";
@@ -54,16 +57,18 @@ 
 		}
 		protected function isSubString( $_string, $_list) {
 			$success = false;
-			foreach ($_list as $i)
-				if(strpos($_string,$i) !== false)
+			foreach ($_list as $i) {
+							if(strpos($_string,$i) !== false)
 					$success = true;
+			}
 			return $success;
 		}
 		public function loginWithUser() {
 			$this->init();
 			$temp = [];
-			if(!isset($_SESSION["username"]))
-				$_SESSION["username"] ="guest";
+			if(!isset($_SESSION["username"])) {
+							$_SESSION["username"] ="guest";
+			}
 			$user = $_SESSION["username"];
 			$blackList = $this->queryFetch(
 				"SELECT user.*,user_section.*
@@ -77,11 +82,13 @@ 
 			foreach ($this->tags["menu"] as $i) {
 				$success = true;
 				$k = $i["label"];
-				foreach ($blackList as $j)
-					if( $j["section"] == $k)
+				foreach ($blackList as $j) {
+									if( $j["section"] == $k)
 						$success = false;
-				if($success)
-					array_push($temp,$i);
+				}
+				if($success) {
+									array_push($temp,$i);
+				}
 			}
 			$this->tags["menu"] = $temp;
 		}

dist/jate/modules/GUI/GUI.php

Spacing +8 added lines, -8 removed lines

@@ -4,14 +4,14 @@ 
 		public function __construct() {
 			parent::__construct();
 		}
-		public function init( $_page ) {
+		public function init($_page) {
 			$this->tags = $_page->tags;
 		}
-		public function draw( $_template ) {
+		public function draw($_template) {
 			$page = "";
-			$extension = explode(".",$_template);
-			$extension = $extension[count($extension)-1];
-			if($extension == "pug" || $extension == "jade") {
+			$extension = explode(".", $_template);
+			$extension = $extension[count($extension) - 1];
+			if ($extension == "pug" || $extension == "jade") {
 				$pug = new Pug\Pug();
 				$page = $pug->render($_template);
 			} else
@@ -19,9 +19,9 @@ 
 			$render = $this->overlayTag($page);
 			echo minifyOutput($render);
 		}
-		protected function overlayTag( $_page ) {
-			foreach($this->tags as $key => $value)
-				if(!is_array($value))
+		protected function overlayTag($_page) {
+			foreach ($this->tags as $key => $value)
+				if (!is_array($value))
 					$_page = str_replace("<_${key}_>", "$value", $_page);
 			return $_page;
 		}

Braces +6 added lines, -4 removed lines

@@ -14,15 +14,17 @@
 			if($extension == "pug" || $extension == "jade") {
 				$pug = new Pug\Pug();
 				$page = $pug->render($_template);
-			} else
-				$page = file_get_contents($_template);
+			} else {
+							$page = file_get_contents($_template);
+			}
 			$render = $this->overlayTag($page);
 			echo minifyOutput($render);
 		}
 		protected function overlayTag( $_page ) {
-			foreach($this->tags as $key => $value)
-				if(!is_array($value))
+			foreach($this->tags as $key => $value) {
+							if(!is_array($value))
 					$_page = str_replace("<_${key}_>", "$value", $_page);
+			}
 			return $_page;
 		}
 	}