XaBerr / JATE

dist/jate/modules/Query/Query.php

Doc Comments +5 added lines

@@ -7,6 +7,11 @@
 			$this->connection = [];
 			$this->currentConnection = null;
 		}
+
+		/**
+		 * @param string $_name
+		 * @param Connection|null $_connection
+		 */
 		public function addConnection( $_name, $_connection ) {
 			$this->connection["$_name"] = $_connection;
 			$this->currentConnection = $_connection;

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

Spacing +12 added lines, -12 removed lines

@@ -9,13 +9,13 @@ 
 			$temp = [];
 			foreach ($menu as $i) {
 				$submenu = [];
-				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" => []));
 					$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"], []) );
+						array_push($temp[count($temp) - 1]["submenu"], array("label" => $j["label"], "link" => $j["link"], []));
 				}
 			}
 			$this->data["menu"] = $temp;
@@ -25,8 +25,8 @@ 
 			$temp = "";
 			$actual_link = "http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
 			foreach ($this->data["menu"] as $i) {
-				$active = $this->isSubString($actual_link,array_merge(array_column($i["submenu"], 'link'), array($i["link"])))? "active" : "";
-				if( is_array($i["submenu"]) && count($i["submenu"])<1)
+				$active = $this->isSubString($actual_link, 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='".$i["link"]."'>".$i["label"]."</a></li>";
 				else {
 					$temp .= "<li class='dropdown $active'>";
@@ -43,10 +43,10 @@ 
 			}
 			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;
 		}
@@ -54,8 +54,8 @@ 
 			$this->init();
 			$temp = [];
 			$user = "";
-			if(!isset($_SESSION["username"]))
-				$_SESSION["username"] ="guest";
+			if (!isset($_SESSION["username"]))
+				$_SESSION["username"] = "guest";
 			$user = $_SESSION["username"];
 			$blackList = $this->queryFetch(
 				"SELECT user.*,user_section.*
@@ -70,10 +70,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->data["menu"] = $temp;
 		}

Braces +21 added lines, -15 removed lines

@@ -13,9 +13,10 @@ 
 					$pk_menu = $i["pk_menu"];
 					array_push($temp, array("label" => $i["label"], "link" => $i["link"], "submenu" => []));
 					$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"], []) );
+					}
 				}
 			}
 			$this->tags["menu"] = $temp;
@@ -26,9 +27,9 @@ 
 			$actual_link = "http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
 			foreach ($this->tags["menu"] as $i) {
 				$active = $this->isSubString($actual_link,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='$i[link]'>$i[label]</a></li>";
-				else {
+				if( is_array($i["submenu"]) && count($i["submenu"])<1) {
+										$temp .= "<li class='$active'><a href='$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">'.
@@ -36,8 +37,9 @@ 
 						'<span class="caret"></span>'.
 						'</a>'.
 						'<ul class="dropdown-menu">';
-					foreach ($i["submenu"] as $j)
-						$temp .= "<li><a href='$j[link]'>$j[label]</a></li>";
+					foreach ($i["submenu"] as $j) {
+											$temp .= "<li><a href='$j[link]'>$j[label]</a></li>";
+					}
 					$temp .= "</ul></li>";
 				}
 			}
@@ -45,17 +47,19 @@ 
 		}
 		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 = [];
 			$user = "";
-			if(!isset($_SESSION["username"]))
-				$_SESSION["username"] ="guest";
+			if(!isset($_SESSION["username"])) {
+							$_SESSION["username"] ="guest";
+			}
 			$user = $_SESSION["username"];
 			$blackList = $this->queryFetch(
 				"SELECT user.*,user_section.*
@@ -69,11 +73,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/JConfig/JConfig.php

Spacing +14 added lines, -14 removed lines

@@ -5,41 +5,41 @@
 		public $DEBUG;
 		public $pages;
 		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	= [];
 		}
-		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;
 		}

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

dist/jate/coreEngine.php

Spacing +11 added lines, -11 removed lines

@@ -6,23 +6,23 @@
 	require_once			(end($GLOBALS["JATEPath"])."jate/functions/requirer.php");
 
 	//USER STUFF
-	requireComponent	("modules/JConfig/JConfig.php");
-	$jConfig	= new JConfig();
-	$jConfig->import("config/connection.json","connection");
+	requireComponent("modules/JConfig/JConfig.php");
+	$jConfig = new JConfig();
+	$jConfig->import("config/connection.json", "connection");
 	$jConfig->import("config/misc.json");
 	$jConfig->import("config/router.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 +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

Spacing +7 added lines, -7 removed lines

@@ -8,23 +8,23 @@
 			$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"]				= [];
 		}
 		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'>";

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