XaBerr / JATE

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

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

Spacing +5 added lines, -5 removed lines

@@ -3,17 +3,17 @@
 		public function __construct() {
 			parent::__construct();
 		}
-		public function init( $_page ) {
+		public function init($_page) {
 			$this->tags = $_page->tags;
 		}
-		public function draw( $_template ) {
+		public function draw($_template) {
 			$page = file_get_contents($_template);
 			$render = $this->overlayTag($page);
 			echo minifyOutput($render);
 		}
-		protected function overlayTag( $_page ) {
-			foreach($this->tags as $key => $value)
-				if(!is_array($value))
+		protected function overlayTag($_page) {
+			foreach ($this->tags as $key => $value)
+				if (!is_array($value))
 					$_page = str_replace("<_${key}_>", "$value", $_page);
 			return $_page;
 		}

Braces +3 added lines, -2 removed lines

@@ -12,9 +12,10 @@
 			echo minifyOutput($render);
 		}
 		protected function overlayTag( $_page ) {
-			foreach($this->tags as $key => $value)
-				if(!is_array($value))
+			foreach($this->tags as $key => $value) {
+							if(!is_array($value))
 					$_page = str_replace("<_${key}_>", "$value", $_page);
+			}
 			return $_page;
 		}
 	}

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