XaBerr / JATE

examples/05database/pages/Home.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 			$this->data["content"] = $this->makePage();
 		}
 		public function makePage() {
-			$result = c_query("SELECT name FROM test","Error 01");
+			$result = c_query("SELECT name FROM test", "Error 01");
 			$output = $result[0]["name"];
 			jBlock();
 			?>

examples/05database/main.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 	require_once("jate.php");
 	$connection = null;
-	if($jConfig->connection["enable"])
+	if ($jConfig->connection["enable"])
 		$connection = new Connection(
 				$jConfig->connection["server"]
 			, $jConfig->connection["database"]

Braces +3 added lines, -2 removed lines

@@ -1,13 +1,14 @@
 <?php
 	require_once("jate.php");
 	$connection = null;
-	if($jConfig->connection["enable"])
-		$connection = new Connection(
+	if($jConfig->connection["enable"]) {
+			$connection = new Connection(
 				$jConfig->connection["server"]
 			, $jConfig->connection["database"]
 			, $jConfig->connection["user"]
 			, $jConfig->connection["password"]
 		);
+	}
 	$webApp = new WebApp();
 	$webApp->addPages($jConfig->pages);
 	$webApp->setDefaultPage($jConfig->pages[0]);

examples/05database/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 	require_once("main.php");
-	if(!isset($_GET["page"])) $_GET["page"] = "home";
+	if (!isset($_GET["page"])) $_GET["page"] = "home";
 	$webApp->fetchPage($_GET["page"]);
 	$webApp->draw();
 ?>

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 	require_once("main.php");
-	if(!isset($_GET["page"])) $_GET["page"] = "home";
+	if(!isset($_GET["page"])) {
+		$_GET["page"] = "home";
+	}
 	$webApp->fetchPage($_GET["page"]);
 	$webApp->draw();
 ?>

examples/05database/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/05database/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 +10 added lines, -10 removed lines

@@ -5,20 +5,20 @@
 	//JATE SUFF
 	require_once			(end($GLOBALS["JATEPath"])."jate/functions/requirer.php");
 	//USER STUFF
-	requireComponent	("modules/JConfig/JConfig.php");
-	$jConfig	= new JConfig();
+	requireComponent("modules/JConfig/JConfig.php");
+	$jConfig = new JConfig();
 	$jConfig->import("config.json");
 	//JATE STUFF
-	requireComponent	("functions/folder.php");
+	requireComponent("functions/folder.php");
 
 	//JATE SUFF
-	requireComponent	("modules/Module/Module.php");
-	requireComponents	("functions");
-	requireModules		("modules");
+	requireComponent("modules/Module/Module.php");
+	requireComponents("functions");
+	requireModules("modules");
 
 	//USER STUFF
-	requireComponent	("config.php",false);
-	requireModules		("modules",false);
-	requireComponent	("pages/Template.php",false);
-	requireComponents	("pages",false);
+	requireComponent("config.php", false);
+	requireModules("modules", false);
+	requireComponent("pages/Template.php", false);
+	requireComponents("pages", false);
 ?>

dist/jate/functions/git.php

Spacing +6 added lines, -6 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-	function getGitLog( $_dir = "./" ) {
-		if(!file_exists($_dir)) return [];
+	function getGitLog($_dir = "./") {
+		if (!file_exists($_dir)) return [];
 		$currentDir = getcwd();
 		chdir($_dir);
 		$git_history = [];
 		$git_logs	= [];
-		$gitPath	= str_replace('\\', '/', exec("git rev-parse --show-toplevel"));
-		$rootPath	= str_replace('\\', '/', getcwd ());
-		if( $gitPath != $rootPath ) {
+		$gitPath = str_replace('\\', '/', exec("git rev-parse --show-toplevel"));
+		$rootPath	= str_replace('\\', '/', getcwd());
+		if ($gitPath != $rootPath) {
 			chdir($currentDir);
 			return [];
 		}
@@ -47,7 +47,7 @@ 
 					$git_history[$last_hash]['date'] = date('d/m/Y H:i:s A', strtotime($date));
 				}
 				else
-					$git_history[$last_hash]['message'] .= $line ." ";
+					$git_history[$last_hash]['message'] .= $line." ";
 			}
 		}
 		chdir($currentDir);

Braces +7 added lines, -7 removed lines

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

dist/jate/functions/block.php

Spacing +3 added lines, -3 removed lines

@@ -13,9 +13,9 @@
 	}
 
 	function minify_output($_buffer) {
-		$search = array ( '/\>[^\S ]+/s', '/[^\S ]+\</s', '/(\s)+/s' );
-		$replace = array ( '>', '<', '\\1' );
-		if (preg_match("/\<html/i",$_buffer) == 1 && preg_match("/\<\/html\>/i",$_buffer) == 1)
+		$search = array('/\>[^\S ]+/s', '/[^\S ]+\</s', '/(\s)+/s');
+		$replace = array('>', '<', '\\1');
+		if (preg_match("/\<html/i", $_buffer) == 1 && preg_match("/\<\/html\>/i", $_buffer) == 1)
 			$_buffer = preg_replace($search, $replace, utf8_decode($_buffer));
 		return utf8_encode($_buffer);
 	}

Braces +3 added lines, -2 removed lines

@@ -15,8 +15,9 @@
 	function minify_output($_buffer) {
 		$search = array ( '/\>[^\S ]+/s', '/[^\S ]+\</s', '/(\s)+/s' );
 		$replace = array ( '>', '<', '\\1' );
-		if (preg_match("/\<html/i",$_buffer) == 1 && preg_match("/\<\/html\>/i",$_buffer) == 1)
-			$_buffer = preg_replace($search, $replace, utf8_decode($_buffer));
+		if (preg_match("/\<html/i",$_buffer) == 1 && preg_match("/\<\/html\>/i",$_buffer) == 1) {
+					$_buffer = preg_replace($search, $replace, utf8_decode($_buffer));
+		}
 		return utf8_encode($_buffer);
 	}
 ?>

dist/jate/functions/string.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-	function htmlParser( $_str) {
+	function htmlParser($_str) {
 		return htmlentities($_str, ENT_QUOTES | ENT_IGNORE, "UTF-8");
 	}
 ?>