XaBerr / JATE

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/Module/Module.php

Spacing +17 added lines, -17 removed lines

@@ -10,9 +10,9 @@ 
 		public $parameters;
 		public function __construct() {
 			$this->name				= get_class($this);
-			$this->modules		= [];
+			$this->modules = [];
 			$this->files			= [];
-			$this->required		= [];
+			$this->required = [];
 			$this->data				= [];
 			$this->tags				= [];
 			$this->connection	= null;
@@ -22,43 +22,43 @@ 
 		// abstract public function init();
 		// abstract public function draw();
 		public function getCss() {
-			return $this->getRequire("getCss",".css");
+			return $this->getRequire("getCss", ".css");
 		}
 		public function getJs() {
-			return $this->getRequire("getJs",".js");
+			return $this->getRequire("getJs", ".js");
 		}
 		public function getJsVariables() {
 			$temp = [];
 			foreach ($this->required as $i)
 				if (is_array($i))
-					array_push($temp,$i);
+					array_push($temp, $i);
 			foreach ($this->modules as $i)
-				$temp = array_merge( $temp, $i->getJsVariables() );
+				$temp = array_merge($temp, $i->getJsVariables());
 			foreach ($this->files as $i)
 				if (is_array($i))
-					array_push($temp,$i);
+					array_push($temp, $i);
 			return $temp;
 		}
-		public function addModules( $_mods ) {
+		public function addModules($_mods) {
 			foreach ($_mods as $value)
 				$this->addModule($value);
 		}
-		public function addModule( $_mod ) {
+		public function addModule($_mod) {
 			$this->modules[$_mod->name] = $_mod;
 			$this->modules[$_mod->name]->parameters = &$this->parameters;
 		}
-		public function addFiles( $_files ) {
+		public function addFiles($_files) {
 			foreach ($_files as $value)
 				$this->addFile($value);
 		}
-		public function addFile( $_file ) {
+		public function addFile($_file) {
 			array_push($this->files, $_file);
 		}
-		public function addFilesRequired( $_files ) {
+		public function addFilesRequired($_files) {
 			foreach ($_files as $value)
 				$this->addFileRequired($value);
 		}
-		public function addFileRequired( $_file ) {
+		public function addFileRequired($_file) {
 			array_push($this->required, $_file);
 		}
 		protected function addDipendences() {
@@ -66,16 +66,16 @@ 
 			$this->tags["js"] = $this->getJs();
 			$this->tags["jsVariables"] = $this->getJsVariables();
 		}
-		protected function getRequire( $_function, $_extenction) {
+		protected function getRequire($_function, $_extenction) {
 			$temp = [];
 			foreach ($this->required as $i)
 				if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
-					array_push($temp,$i);
+					array_push($temp, $i);
 			foreach ($this->modules as $i)
-				$temp = array_merge( $temp, $i->$_function() );
+				$temp = array_merge($temp, $i->$_function());
 			foreach ($this->files as $i)
 				if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
-					array_push($temp,$i);
+					array_push($temp, $i);
 			return $temp;
 		}
 	}

dist/jate/modules/WebApp/WebApp.php

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/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;
 		}

examples/05database/bundles/models/Template.php

Spacing +8 added lines, -8 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 	class Template extends Html {
-		public function __construct( $_parameters ) {
-			parent::__construct( $_parameters );
+		public function __construct($_parameters) {
+			parent::__construct($_parameters);
 			$this->makeConnection();
 			$this->tags["brand"]		= "JATE";
 			$this->tags["brandImg"] = "";
@@ -12,22 +12,22 @@ 
 				, "https://code.jquery.com/jquery-1.11.3.min.js"
 				, "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
 			]);
-			$this->tags["metaDescription"]	= "Beautiful description .";
-			$this->tags["metaKeywords"]			= "JATE,PHP,JS,CSS";
-			$this->tags["metaAuthor"]				= "XaBerr";
-			$this->tags["menu"]							= $this->makeMenu();
+			$this->tags["metaDescription"] = "Beautiful description .";
+			$this->tags["metaKeywords"] = "JATE,PHP,JS,CSS";
+			$this->tags["metaAuthor"] = "XaBerr";
+			$this->tags["menu"] = $this->makeMenu();
 		}
 		public function makeConnection() {
 			$jConfig = $this->parameters["app"];
 			$connection = null;
-			if( $jConfig != null && $jConfig->connection["enable"])
+			if ($jConfig != null && $jConfig->connection["enable"])
 				$connection = new Connection(
 						$jConfig->connection["server"]
 					, $jConfig->connection["database"]
 					, $jConfig->connection["user"]
 					, $jConfig->connection["password"]
 				);
-			$this->addConnection("base",$connection);
+			$this->addConnection("base", $connection);
 		}
 		public function makeMenu() {
 			jBlock();

examples/01essential/bundles/models/Template.php

Spacing +8 added lines, -8 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 	class Template extends Html {
-		public function __construct( $_parameters ) {
-			parent::__construct( $_parameters );
+		public function __construct($_parameters) {
+			parent::__construct($_parameters);
 			$this->makeConnection();
 			$this->tags["brand"]		= "JATE";
 			$this->tags["brandImg"] = "";
@@ -12,22 +12,22 @@ 
 				, "https://code.jquery.com/jquery-1.11.3.min.js"
 				, "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
 			]);
-			$this->tags["metaDescription"]	= "Beautiful description .";
-			$this->tags["metaKeywords"]			= "JATE,PHP,JS,CSS";
-			$this->tags["metaAuthor"]				= "XaBerr";
-			$this->tags["menu"]							= $this->makeMenu();
+			$this->tags["metaDescription"] = "Beautiful description .";
+			$this->tags["metaKeywords"] = "JATE,PHP,JS,CSS";
+			$this->tags["metaAuthor"] = "XaBerr";
+			$this->tags["menu"] = $this->makeMenu();
 		}
 		public function makeConnection() {
 			$jConfig = $this->parameters["app"];
 			$connection = null;
-			if( $jConfig != null && $jConfig->connection["enable"])
+			if ($jConfig != null && $jConfig->connection["enable"])
 				$connection = new Connection(
 						$jConfig->connection["server"]
 					, $jConfig->connection["database"]
 					, $jConfig->connection["user"]
 					, $jConfig->connection["password"]
 				);
-			$this->addConnection("base",$connection);
+			$this->addConnection("base", $connection);
 		}
 		public function makeMenu() {
 			jBlock();

examples/03pageParameters/bundles/models/Template.php

Spacing +12 added lines, -12 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 	class Template extends Html {
-		public function __construct( $_parameters ) {
-			parent::__construct( $_parameters );
+		public function __construct($_parameters) {
+			parent::__construct($_parameters);
 			$this->addModule(new Menu());
 			$this->makeConnection();
 			$this->tags["brand"]		= "JATE";
@@ -13,29 +13,29 @@ 
 				, "https://code.jquery.com/jquery-1.11.3.min.js"
 				, "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
 			]);
-			$this->tags["metaDescription"]	= "Beautiful description .";
-			$this->tags["metaKeywords"]			= "JATE,PHP,JS,CSS";
-			$this->tags["metaAuthor"]				= "XaBerr";
-			$this->tags["menu"]							= $this->makeMenu();
+			$this->tags["metaDescription"] = "Beautiful description .";
+			$this->tags["metaKeywords"] = "JATE,PHP,JS,CSS";
+			$this->tags["metaAuthor"] = "XaBerr";
+			$this->tags["menu"] = $this->makeMenu();
 		}
 		public function makeConnection() {
 			$jConfig = $this->parameters["app"];
 			$connection = null;
-			if( $jConfig != null && $jConfig->connection["enable"])
+			if ($jConfig != null && $jConfig->connection["enable"])
 				$connection = new Connection(
 						$jConfig->connection["server"]
 					, $jConfig->connection["database"]
 					, $jConfig->connection["user"]
 					, $jConfig->connection["password"]
 				);
-			$this->addConnection("base",$connection);
+			$this->addConnection("base", $connection);
 		}
 		public function makeMenu() {
 			$this->modules["Menu"]->tags["menu"] = [
-					["label"=>"Home", 		"link"=>"/Home",		"submenu"=>[], "relative"=>true]
-				, ["label"=>"Items 1",	"link"=>"/Items/1",	"submenu"=>[], "relative"=>true]
-				, ["label"=>"Items 2",	"link"=>"/Items/2",	"submenu"=>[], "relative"=>true]
-				, ["label"=>"Items 3",	"link"=>"/Items/3",	"submenu"=>[], "relative"=>true]
+					["label"=>"Home", "link"=>"/Home", "submenu"=>[], "relative"=>true]
+				, ["label"=>"Items 1", "link"=>"/Items/1", "submenu"=>[], "relative"=>true]
+				, ["label"=>"Items 2", "link"=>"/Items/2", "submenu"=>[], "relative"=>true]
+				, ["label"=>"Items 3", "link"=>"/Items/3", "submenu"=>[], "relative"=>true]
 			];
 			$temp = $this->modules["Menu"]->draw();
 			return $temp;

examples/03pageParameters/bundles/controllers/Page404.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 	class Page404 extends Template {
-		public function __construct( $_parameters ) {
-			parent::__construct( $_parameters );
-			$this->tags["title"]		= "JATE - 404";
+		public function __construct($_parameters) {
+			parent::__construct($_parameters);
+			$this->tags["title"] = "JATE - 404";
 			$this->tags["content"] = $this->makePage();
 		}
 		public function makePage() {