XaBerr / JATE

dist/jate/modules/Html/Html.php

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

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

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