XaBerr / JATE

examples/05database/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() {

examples/05database/bundles/controllers/Page01.php

Spacing +3 added lines, -3 removed lines

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

examples/03pageParameters/status.php

Spacing +5 added lines, -5 removed lines

@@ -22,17 +22,17 @@ 
 					$percent;
 					foreach (getGitLog() as $i) {
 						$cont++;
-						if($cont % $nPerCol == 1)
+						if ($cont % $nPerCol == 1)
 							echo '<div class="row">';
-						if(isset($i["tag"])) {
-							$percent = explode(".",$i["tag"]);
+						if (isset($i["tag"])) {
+							$percent = explode(".", $i["tag"]);
 							$percent = 100 * intval($percent[0]) + 10 * intval($percent[1]) + intval($percent[2]);
 						}
 					?>
 						<div class="col-lg-<?=$dim?>">
 							<div class="well well-sm miniblock">
 								<div class="autor"><b>Autor:</b> <?=$i["author"]?><br></div>
-								<div class="tag"><b>Tag:</b> <?php if(isset($i["tag"])) echo $i["tag"]?><br></div>
+								<div class="tag"><b>Tag:</b> <?php if (isset($i["tag"])) echo $i["tag"]?><br></div>
 								<div class="date"><b>Date:</b> <?=$i["date"]?><br></div>
 								<div class="message"><b>Message:</b> <?=$i["message"]?><br></div>
 								<div class="progress">
@@ -44,7 +44,7 @@ 
 							</div>
 						</div>
 					<?php
-					if($cont % $nPerCol == 0)
+					if ($cont % $nPerCol == 0)
 						echo '</div>';
 					} ?>
 				</div>

Braces +6 added lines, -3 removed lines

@@ -22,8 +22,9 @@ 
 					$percent;
 					foreach (getGitLog() as $i) {
 						$cont++;
-						if($cont % $nPerCol == 1)
-							echo '<div class="row">';
+						if($cont % $nPerCol == 1) {
+													echo '<div class="row">';
+						}
 						if(isset($i["tag"])) {
 							$percent = explode(".",$i["tag"]);
 							$percent = 100 * intval($percent[0]) + 10 * intval($percent[1]) + intval($percent[2]);
@@ -32,7 +33,8 @@ 
 						<div class="col-lg-<?=$dim?>">
 							<div class="well well-sm miniblock">
 								<div class="autor"><b>Autor:</b> <?=$i["author"]?><br></div>
-								<div class="tag"><b>Tag:</b> <?php if(isset($i["tag"])) echo $i["tag"]?><br></div>
+								<div class="tag"><b>Tag:</b> <?php if(isset($i["tag"])) {
+	echo $i["tag"]?><br></div>
 								<div class="date"><b>Date:</b> <?=$i["date"]?><br></div>
 								<div class="message"><b>Message:</b> <?=$i["message"]?><br></div>
 								<div class="progress">
@@ -46,6 +48,7 @@ 
 					<?php
 					if($cont % $nPerCol == 0)
 						echo '</div>';
+}
 					} ?>
 				</div>
 			</div>

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

Spacing +4 added lines, -4 removed lines

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

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/models/Template.php

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() {

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