XaBerr / JATE

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

Spacing +4 added lines, -4 removed lines

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

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

Spacing +2 added lines, -2 removed lines

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

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

Spacing +4 added lines, -4 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->tags["brand"]		= "JATE";
 			$this->tags["brandImg"] = "";
 			$this->tags["title"]		= "JATE - 06items";
@@ -20,14 +20,14 @@ 
 		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() {
 			$temp = "";

Braces +3 added lines, -2 removed lines

@@ -20,13 +20,14 @@
 		public function makeConnection() {
 			$jConfig = $this->parameters["app"];
 			$connection = null;
-			if( $jConfig != null && $jConfig->connection["enable"])
-				$connection = new Connection(
+			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);
 		}
 		public function makeMenu() {

examples/03pageParameters/jate.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	if(!isset($GLOBALS["JATEPath"]))
+	if (!isset($GLOBALS["JATEPath"]))
 		$GLOBALS["JATEPath"] = [];
 	$commonLocations = array(
 		"bower_components/JATE/dist/",
@@ -7,7 +7,7 @@ 
 		"../../dist/"
 	);
 	foreach ($commonLocations as $i)
-		if(file_exists($i."jate/coreEngine.php")) {
+		if (file_exists($i."jate/coreEngine.php")) {
 			array_push($GLOBALS["JATEPath"], $i);
 			require_once($i."jate/coreEngine.php");
 			break;

Braces +6 added lines, -4 removed lines

@@ -1,14 +1,16 @@
 <?php
-	if(!isset($GLOBALS["JATEPath"]))
-		$GLOBALS["JATEPath"] = [];
+	if(!isset($GLOBALS["JATEPath"])) {
+			$GLOBALS["JATEPath"] = [];
+	}
 	$commonLocations = array(
 		"bower_components/JATE/dist/",
 		"vendor/xaberr/jate/dist/",
 		"../../dist/"
 	);
-	foreach ($commonLocations as $i)
-		if(file_exists($i."jate/coreEngine.php")) {
+	foreach ($commonLocations as $i) {
+			if(file_exists($i."jate/coreEngine.php")) {
 			array_push($GLOBALS["JATEPath"], $i);
+	}
 			require_once($i."jate/coreEngine.php");
 			break;
 		}

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/functions/requirer.php

Spacing +14 added lines, -14 removed lines

@@ -1,45 +1,45 @@
 <?php
-	function requireComponent( $_path, $_local = true ) {
+	function requireComponent($_path, $_local = true) {
 		$path = getJFolder($_path, $_local, debug_backtrace());
-		if(file_exists($path) && isPhp($path))
+		if (file_exists($path) && isPhp($path))
 			jRequire($path, false, 0);
 		else
 			requireError($_path);
 	}
-	function requireComponents( $_path, $_local = true ) {
+	function requireComponents($_path, $_local = true) {
 		$path = getJFolder($_path, $_local, debug_backtrace());
-		if(file_exists($path)) {
+		if (file_exists($path)) {
 			$files = subFolderFile($path);
 			foreach ($files as $i) {
-				if(isPhp($path."/".$i))
+				if (isPhp($path."/".$i))
 					requireComponent($path."/".$i, false, 0);
 			}
 		} else
 			requireError($_path);
 	}
-	function requireError( $_path ) {
+	function requireError($_path) {
 		global $DEBUG;
-		if( $DEBUG == 1 )
+		if ($DEBUG == 1)
 			echo "Error load ($_path)<br>";
 	}
-	function isPhp ( $_file ) {
-		if(!is_file($_file)) return false;
+	function isPhp($_file) {
+		if (!is_file($_file)) return false;
 		$info = pathinfo($_file);
 		return ($info["extension"] == "php") || ($info["extension"] == "PHP");
 	}
-	function requireModules( $_path, $_local = true ) {
+	function requireModules($_path, $_local = true) {
 		$path = getJFolder($_path, $_local, debug_backtrace());
 		$subFolders = subFolderDir($path);
 		foreach ($subFolders as $i) {
 			requireComponents($path."/".$i, false, 0);
 		}
 	}
-	function jRequire( $_path, $_local = true ) {
+	function jRequire($_path, $_local = true) {
 		$path = getJFolder($_path, $_local, debug_backtrace());
-		require_once( $path );
+		require_once($path);
 	}
-	function getJFolder( $_path, $_local, $_stack ) {
-		if($_local) {
+	function getJFolder($_path, $_local, $_stack) {
+		if ($_local) {
 			$stackInfo = $_stack;
 			$folder = dirname($stackInfo[0]["file"]);
 			$file = "$folder/$_path";

Braces +20 added lines, -13 removed lines

@@ -1,29 +1,35 @@ 
 <?php
 	function requireComponent( $_path, $_local = true ) {
 		$path = getJFolder($_path, $_local, debug_backtrace());
-		if(file_exists($path) && isPhp($path))
-			jRequire($path, false, 0);
-		else
-			requireError($_path);
+		if(file_exists($path) && isPhp($path)) {
+					jRequire($path, false, 0);
+		} else {
+					requireError($_path);
+		}
 	}
 	function requireComponents( $_path, $_local = true ) {
 		$path = getJFolder($_path, $_local, debug_backtrace());
 		if(file_exists($path)) {
 			$files = subFolderFile($path);
 			foreach ($files as $i) {
-				if(isPhp($path."/".$i))
-					requireComponent($path."/".$i, false, 0);
+				if(isPhp($path."/".$i)) {
+									requireComponent($path."/".$i, false, 0);
+				}
 			}
-		} else
-			requireError($_path);
+		} else {
+					requireError($_path);
+		}
 	}
 	function requireError( $_path ) {
 		global $DEBUG;
-		if( $DEBUG == 1 )
-			echo "Error load ($_path)<br>";
+		if( $DEBUG == 1 ) {
+					echo "Error load ($_path)<br>";
+		}
 	}
 	function isPhp ( $_file ) {
-		if(!is_file($_file)) return false;
+		if(!is_file($_file)) {
+			return false;
+		}
 		$info = pathinfo($_file);
 		return ($info["extension"] == "php") || ($info["extension"] == "PHP");
 	}
@@ -43,8 +49,9 @@ 
 			$stackInfo = $_stack;
 			$folder = dirname($stackInfo[0]["file"]);
 			$file = "$folder/$_path";
-		} else
-			$file = $_path;
+		} else {
+					$file = $_path;
+		}
 		return $file;
 	}
 ?>

dist/jate/modules/WebApp/WebApp.php

Spacing +20 added lines, -20 removed lines

@@ -7,49 +7,49 @@ 
 		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) {
 			$path		= "";
 			$class	= "";
 			$param	= [];
-			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];
 			} else {
 				$path		= $_page;
 				$class	= $_page;
 			}
-			$this->pages[$path] = [$class,$param];
+			$this->pages[$path] = [$class, $param];
 		}
-		public function addPages( $_pages ) {
+		public function addPages($_pages) {
 			foreach ($_pages as $i)
 				$this->addPage($i);
 		}
-		public function fetchPage( $_stack ) {
+		public function fetchPage($_stack) {
 			$parameters = [];
-			$temp	= $this->defaultPage;
+			$temp = $this->defaultPage;
 			$variables = null;
 			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() {
@@ -58,28 +58,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");
 		}

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

dist/jate/modules/JConfig/JConfig.php

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/modules/Html/Html.php

Spacing +9 added lines, -9 removed lines

@@ -2,31 +2,31 @@
 	requireComponent("../Query/Query.php");
 	class Html extends Query {
 		public $parameters;
-		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->parameters = $_parameters;
 		}
 		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'>";