XaBerr / JATE

dist/jate/modules/Menu/Menu.php

Spacing +16 added lines, -16 removed lines

@@ -8,13 +8,13 @@ 
 			$menu = $this->queryFetch("SELECT * FROM menu WHERE flag_active = 1 ORDER BY `order`");
 			$temp = [];
 			foreach ($menu as $i) {
-				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" => [], "relative" => false));
 					$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"], "submenu" => [], "relative" => false) );
+						array_push($temp[count($temp) - 1]["submenu"], array("label" => $j["label"], "link" => $j["link"], "submenu" => [], "relative" => false));
 				}
 			}
 			$this->tags["menu"] = $temp;
@@ -23,15 +23,15 @@ 
 		public function draw() {
 			$temp = "";
 			$host = $this->parameters["app"]->server["HTTP_HOST"];
-			$uri	= $this->parameters["app"]->server["REQUEST_URI"];
-			$actualLink	= "http://$host$uri";
-			$relative		= $this->parameters["app"]->server["RELATIVE"];
+			$uri = $this->parameters["app"]->server["REQUEST_URI"];
+			$actualLink = "http://$host$uri";
+			$relative = $this->parameters["app"]->server["RELATIVE"];
 			foreach ($this->tags["menu"] as $i) {
 				$prePath = "";
-				if($i["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)
+				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'>";
@@ -43,7 +43,7 @@ 
 						'<ul class="dropdown-menu">';
 					foreach ($i["submenu"] as $j) {
 						$prePath = "";
-						if($j["relative"])
+						if ($j["relative"])
 							$prePath = $relative;
 						$temp .= "<li><a href='$prePath$j[link]'>$j[label]</a></li>";
 					}
@@ -52,18 +52,18 @@ 
 			}
 			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;
 		}
 		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.*
@@ -78,10 +78,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->tags["menu"] = $temp;
 		}

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/modules/Parsedown/Parsedown.php

Doc Comments +4 added lines

@@ -9,6 +9,10 @@
 		public function drawFile( $_template ) {
 			return $this->draw($_template);
 		}
+
+		/**
+		 * @param string $_template
+		 */
 		public function drawText( $_template ) {
 			return $this->draw(trim($_template));
 		}

Spacing +3 added lines, -3 removed lines

@@ -6,13 +6,13 @@
 		public function __construct() {
 			parent::__construct();
 		}
-		public function drawFile( $_template ) {
+		public function drawFile($_template) {
 			return $this->draw($_template);
 		}
-		public function drawText( $_template ) {
+		public function drawText($_template) {
 			return $this->draw(trim($_template));
 		}
-		public function draw( $_template ) {
+		public function draw($_template) {
 			$Parsedown = new Parsedown\Parsedown();
 			$page = $Parsedown->text($_template);
 			return $page;

dist/jate/coreEngine.php

Spacing +8 added lines, -8 removed lines

@@ -4,14 +4,14 @@
 
 	//JATE SUFF
 	require_once			(end($GLOBALS["JATEPath"])."jate/functions/requirer.php");
-	requireComponent	("functions/folder.php");
-	requireComponent	("modules/JConfig/JConfig.php");
-	requireComponents	("functions");
-	requireModules		("modules");
+	requireComponent("functions/folder.php");
+	requireComponent("modules/JConfig/JConfig.php");
+	requireComponents("functions");
+	requireModules("modules");
 
 	//USER STUFF
-	requireComponent	("config.php",false);
-	requireModules		("modules",false);
-	requireComponents	("bundles/models",false);
-	requireComponents	("bundles/controllers",false);
+	requireComponent("config.php", false);
+	requireModules("modules", false);
+	requireComponents("bundles/models", false);
+	requireComponents("bundles/controllers", false);
 ?>

dist/jate/functions/block.php

Doc Comments +3 added lines

@@ -16,6 +16,9 @@
 		return jBlockFileMan($_path, $extension, $_parameters);
 	}
 
+	/**
+	 * @param string $_type
+	 */
 	function jBlockFileMan( $_path, $_type, $_parameters = [] ) {
 		$temp = file_get_contents($_path);
 		return jBlockParsing($_type, $temp, $_parameters);

Spacing +9 added lines, -9 removed lines

@@ -5,28 +5,28 @@ 
 		return ob_start();
 	}
 
-	function jBlockClose( $_type = "html", $_parameters = [] ) {
+	function jBlockClose($_type = "html", $_parameters = []) {
 		return jBlockEnd($_type, $_parameters);
 	}
 
-	function jBlockFile( $_path, $_parameters = [] ) {
+	function jBlockFile($_path, $_parameters = []) {
 		$extension = explode(".", $_path);
-		$extension = $extension[count($extension)-1];
+		$extension = $extension[count($extension) - 1];
 		$extension = strtolower($extension);
 		return jBlockFileMan($_path, $extension, $_parameters);
 	}
 
-	function jBlockFileMan( $_path, $_type, $_parameters = [] ) {
+	function jBlockFileMan($_path, $_type, $_parameters = []) {
 		$temp = file_get_contents($_path);
 		return jBlockParsing($_type, $temp, $_parameters);
 	}
 
-	function jBlockEnd( $_type = "html", $_parameters = [] ) {
+	function jBlockEnd($_type = "html", $_parameters = []) {
 		$text = ob_get_clean();
 		return jBlockParsing($_type, $text, $_parameters);
 	}
 
-	function jBlockParsing( $_type = "html", $_string = "", $_parameters = [] ) {
+	function jBlockParsing($_type = "html", $_string = "", $_parameters = []) {
 		switch ($_type) {
 			case "pug":
 			case "jade":
@@ -49,9 +49,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)
+		$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

@@ -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/Pug/Pug.php

Doc Comments +4 added lines

@@ -8,6 +8,10 @@
 		public function drawFile( $_file, $_parameters = [] ) {
 			return $this->draw($_file, $_parameters);
 		}
+
+		/**
+		 * @param string $_text
+		 */
 		public function drawText( $_text, $_parameters = [] ) {
 			return $this->draw(trim($_text), $_parameters);
 		}

Spacing +3 added lines, -3 removed lines

@@ -5,13 +5,13 @@
 		public function __construct() {
 			parent::__construct();
 		}
-		public function drawFile( $_file, $_parameters = [] ) {
+		public function drawFile($_file, $_parameters = []) {
 			return $this->draw($_file, $_parameters);
 		}
-		public function drawText( $_text, $_parameters = [] ) {
+		public function drawText($_text, $_parameters = []) {
 			return $this->draw(trim($_text), $_parameters);
 		}
-		public function draw( $_text, $_parameters = [] ) {
+		public function draw($_text, $_parameters = []) {
 			$pug = new Pug\Pug();
 			$page = $pug->render($_text, $_parameters);
 			return $page;

dist/jate/modules/Twig/Twig.php

Doc Comments +4 added lines

@@ -14,6 +14,10 @@
 			$page = $template->render($_parameters);
 			return $page;
 		}
+
+		/**
+		 * @param string $_text
+		 */
 		public function drawText( $_text, $_parameters = [] ) {
 			$loader = new Twig_Loader_Array([
 				'index' => $_text

Spacing +4 added lines, -4 removed lines

@@ -5,16 +5,16 @@
 		public function __construct() {
 			parent::__construct();
 		}
-		public function drawFile( $_file, $_parameters = [] ) {
-			$loader	= new Twig_Loader_Filesystem('bundles/views');
-			$twig		= new Twig_Environment( $loader, [
+		public function drawFile($_file, $_parameters = []) {
+			$loader = new Twig_Loader_Filesystem('bundles/views');
+			$twig = new Twig_Environment($loader, [
 				'cache' => 'bundles/views',
 			]);
 			$template = $twig->loadTemplate($_text);
 			$page = $template->render($_parameters);
 			return $page;
 		}
-		public function drawText( $_text, $_parameters = [] ) {
+		public function drawText($_text, $_parameters = []) {
 			$loader = new Twig_Loader_Array([
 				'index' => $_text
 			]);

dist/jate/modules/GUI/GUI.php

Spacing +8 added lines, -8 removed lines

@@ -6,24 +6,24 @@
 		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 = "";
-			$extension = explode(".",$_template);
-			$extension = $extension[count($extension)-1];
+			$extension = explode(".", $_template);
+			$extension = $extension[count($extension) - 1];
 			$page = $this->parsingFile($_template, $extension);
 			$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;
 		}
-		protected function parsingFile( $_file, $_type = "html" ) {
+		protected function parsingFile($_file, $_type = "html") {
 			switch ($_type) {
 				case 'pug':
 				case 'jade':

Braces +3 added lines, -2 removed lines

@@ -18,9 +18,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;
 		}
 		protected function parsingFile( $_file, $_type = "html" ) {

dist/jate/modules/Statistic/Statistic.php

Spacing +3 added lines, -3 removed lines

@@ -1,18 +1,18 @@
 <?php
 	jRequire("../Module/Module.php");
 	class Statistic extends Module {
-		public function __construct( $_webApp ) {
+		public function __construct($_webApp) {
 			parent::__construct();
 			$pages = [];
 			$stats = [];
 			$pages = $_webApp->pages;
-			foreach ( $pages as $k => $v ) {
+			foreach ($pages as $k => $v) {
 				$temp = new $v[0]($v[1]);
 				$temp->addDipendences();
 				$stats[$k] = [];
 				$stats[$k]["page"]	= $v[0];
 				$stats[$k]["css"]		= $temp->data["css"];
-				$stats[$k]["js"]		= $temp->data["js"];
+				$stats[$k]["js"] = $temp->data["js"];
 			}
 			$this->data = $stats;
 		}

dist/jate/modules/WebApp/WebApp.php

Spacing +19 added lines, -19 removed lines

@@ -8,49 +8,49 @@ 
 		public function __construct() {
 			parent::__construct();
 			$this->pages = [];
-			$this->defaultPage	= ["Page404",[]];
+			$this->defaultPage	= ["Page404", []];
 			$this->currentPage	= null;
-			$this->jConfig			= null;
+			$this->jConfig = null;
 		}
-		public function addPage( $_page ) {
+		public function addPage($_page) {
 			$param	= [];
 			$path		= $_page;
 			$class	= $_page;
-			if(is_array($_page)) {
+			if (is_array($_page)) {
 				$path		= $_page[0];
 				$class	= $_page[1];
-				if(isset($_page[2]))
+				if (isset($_page[2]))
 					$param = $_page[2];
 			}
 			$this->pages[$path] = [$class, $param];
 			return $this->pages[$path];
 		}
-		public function addPages( $_pages ) {
+		public function addPages($_pages) {
 			foreach ($_pages as $i)
 				$this->addPage($i);
 		}
 		public function fetchPage(  ) {
 			$router = new Router();
-			$router->parameters = [ "app" => &$this->jConfig, "page" => null];
+			$router->parameters = ["app" => &$this->jConfig, "page" => null];
 			$stack = $router->getPage();
 			$parameters = [];
-			$temp				= $this->defaultPage;
+			$temp = $this->defaultPage;
 			foreach ($this->pages as $key => $value) {
 				$variables = $this->pathSeeker(explode("/", $key), $stack);
-				if(is_array($variables)) {
+				if (is_array($variables)) {
 					$temp = $value;
 					$parameters = $variables;
 					break;
 				}
 			}
-			if( isset($temp[1]) && is_array($temp[1]) )
+			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;
 		}
-		public function setDefaultPage( $_page ) {
+		public function setDefaultPage($_page) {
 			$this->defaultPage = $this->addPage($_page);
 		}
 		public function draw() {
@@ -59,28 +59,28 @@ 
 			$gui->init($this->currentPage);
 			$gui->draw($this->currentPage->data["template"]);
 		}
-		public function pathSeeker( $_path, $_url ) {
+		public function pathSeeker($_path, $_url) {
 			$urlLength = count($_url);
 			$cont = 0;
 			$variables = [];
 			$pathLength = count($_path);
-			if($urlLength == $pathLength) {
-				while($cont < $urlLength) {
-					if( $_path[$cont] == $_url[$cont] )
+			if ($urlLength == $pathLength) {
+				while ($cont < $urlLength) {
+					if ($_path[$cont] == $_url[$cont])
 						$cont++;
-					else if( strpos($_path[$cont], "\$") !== false ) {
+					else if (strpos($_path[$cont], "\$") !== false) {
 						$variables[str_replace('$', "", $_path[$cont])] = $_url[$cont];
 						$cont++;
 					} else break;
 				}
-				if($cont == $urlLength)
+				if ($cont == $urlLength)
 					return $variables;
 			}
 			return null;
 		}
-		public function newConfig( $_path = "config/") {
+		public function newConfig($_path = "config/") {
 			$this->jConfig = new JConfig();
-			$this->jConfig->import("${_path}connection.json","connection");
+			$this->jConfig->import("${_path}connection.json", "connection");
 			$this->jConfig->import("${_path}misc.json");
 			$this->jConfig->import("${_path}router.json");
 		}

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