XaBerr / JATE

dist/jate/modules/Query/Query.php

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

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

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

Braces +6 added lines, -4 removed lines

@@ -36,10 +36,12 @@
 	function arrayDump( $_array, $_name = "Array", $_tab = "  " ) {
 			$position = preg_replace('/  /', '', $_tab, 1);
 			echo "$position<span style=\"color:rgb(230,0,0)\">$_name:</span><br>";
-			foreach ($_array as $k => $i)
-				if(is_array($i))
+			foreach ($_array as $k => $i) {
+							if(is_array($i))
 					arrayDump( $i, $k, "&nbsp;&nbsp;$_tab" );
-				else
-					echo "$_tab<b>$k:</b> $i<br>";
+			}
+				else {
+									echo "$_tab<b>$k:</b> $i<br>";
+				}
 		}
 ?>

dist/jate/functions/requirer.php

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

Braces +24 added lines, -17 removed lines

@@ -12,9 +12,10 @@ 
 					$pk_menu = $i["pk_menu"];
 					array_push($temp, array("label" => $i["label"], "link" => $i["link"], "submenu" => [], "relative" => false));
 					$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"], "submenu" => [], "relative" => false) );
+					}
 				}
 			}
 			$this->tags["menu"] = $temp;
@@ -28,12 +29,13 @@ 
 			$relative		= $this->parameters["app"]->server["RELATIVE"];
 			foreach ($this->tags["menu"] as $i) {
 				$prePath = "";
-				if($i["relative"])
-					$prePath = $relative;
+				if($i["relative"]) {
+									$prePath = $relative;
+				}
 				$active = $this->isSubString($actualLink, 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='$prePath$i[link]'>$i[label]</a></li>";
-				else {
+				if( is_array($i["submenu"]) && count($i["submenu"])<1) {
+										$temp .= "<li class='$active'><a href='$prePath$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">'.
@@ -43,8 +45,9 @@ 
 						'<ul class="dropdown-menu">';
 					foreach ($i["submenu"] as $j) {
 						$prePath = "";
-						if($j["relative"])
-							$prePath = $relative;
+						if($j["relative"]) {
+													$prePath = $relative;
+						}
 						$temp .= "<li><a href='$prePath$j[link]'>$j[label]</a></li>";
 					}
 					$temp .= "</ul></li>";
@@ -54,16 +57,18 @@ 
 		}
 		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 = [];
-			if(!isset($_SESSION["username"]))
-				$_SESSION["username"] ="guest";
+			if(!isset($_SESSION["username"])) {
+							$_SESSION["username"] ="guest";
+			}
 			$user = $_SESSION["username"];
 			$blackList = $this->queryFetch(
 				"SELECT user.*,user_section.*
@@ -77,11 +82,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/functions/folder.php

Braces +9 added lines, -6 removed lines

@@ -21,10 +21,11 @@ 
 		$temp = [];
 		if (is_dir($_dir)) {
 				if ($dirOpened = opendir($_dir)) {
-						while (($file = readdir($dirOpened)) !== false)
-								if( ($file !='.')&&($file !='..') )
+						while (($file = readdir($dirOpened)) !== false) {
+														if( ($file !='.')&&($file !='..') )
 									if($_function($file))
 										array_push($temp,$file);
+						}
 						closedir($dirOpened);
 				}
 		}
@@ -32,14 +33,16 @@ 
 	}
 	function requireSubfolder( $_dir = "./" ) {
 		$temp = subFolderFile($_dir);
-		foreach ($temp as $i)
-			jRequire($_dir."/".$i);
+		foreach ($temp as $i) {
+					jRequire($_dir."/".$i);
+		}
 	}
 	function require_js( $_dir = "./" ) {
 		$tempArray = [];
 		$temp = subFolderFile($_dir);
-		foreach ($temp as $i)
-			array_push($tempArray, $_dir."/".$i);
+		foreach ($temp as $i) {
+					array_push($tempArray, $_dir."/".$i);
+		}
 		return $tempArray;
 	}
 ?>

dist/jate/functions/block.php

Braces +3 added lines, -2 removed lines

@@ -51,8 +51,9 @@
 	function minifyOutput($_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/modules/WebApp/WebApp.php

Braces +20 added lines, -14 removed lines

@@ -19,15 +19,17 @@ 
 			if(is_array($_page)) {
 				$path		= $_page[0];
 				$class	= $_page[1];
-				if(isset($_page[2]))
-					$param = $_page[2];
+				if(isset($_page[2])) {
+									$param = $_page[2];
+				}
 			}
 			$this->pages[$path] = [$class, $param];
 			return $this->pages[$path];
 		}
 		public function addPages( $_pages ) {
-			foreach ($_pages as $i)
-				$this->addPage($i);
+			foreach ($_pages as $i) {
+							$this->addPage($i);
+			}
 		}
 		public function fetchPage(  ) {
 			$router = new Router();
@@ -43,10 +45,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;
 		}
@@ -66,15 +69,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;
 		}