XaBerr / JATE

dist/jate/functions/string.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-	function htmlParser( $_str) {
+	function htmlParser($_str) {
 		return htmlentities($_str, ENT_QUOTES | ENT_IGNORE, "UTF-8");
 	}
 ?>

dist/jate/modules/WebApp/WebApp.php

Spacing +9 added lines, -9 removed lines

@@ -7,37 +7,37 @@
 		public function __construct() {
 			parent::__construct();
 			$this->pages = [];
-			$this->defaultPage	= ["Page404",[]];
+			$this->defaultPage	= ["Page404", []];
 			$this->currentPage	= null;
 			$this->connection		= null;
 		}
-		public function addPage( $_page ) {
+		public function addPage($_page) {
 			$label = "";
 			$class = "";
 			$param = [];
-			if(is_array($_page)) {
+			if (is_array($_page)) {
 				$label = $_page[0];
 				$class = $_page[1];
-				if(isset($_page[2]))
+				if (isset($_page[2]))
 					$param = $_page[2];
 			} else {
 				$label = $_page;
 				$class = $_page;
 			}
-			$this->pages[$label] = [$class,$param];
+			$this->pages[$label] = [$class, $param];
 		}
-		public function addPages( $_pages ) {
+		public function addPages($_pages) {
 			foreach ($_pages as $i)
 				$this->addPage($i);
 		}
-		public function fetchPage( $_label ) {
+		public function fetchPage($_label) {
 			$temp = $this->defaultPage;
-			if(isset($this->pages[$_label]))
+			if (isset($this->pages[$_label]))
 				$temp = $this->pages[$_label];
 			$this->currentPage = new $temp[0]($temp[1]);
 			return $this->currentPage;
 		}
-		public function setDefaultPage( $_page ) {
+		public function setDefaultPage($_page) {
 			$this->defaultPage = $_page;
 		}
 		public function draw() {

Braces +9 added lines, -6 removed lines

@@ -18,8 +18,9 @@ 
 			if(is_array($_page)) {
 				$label = $_page[0];
 				$class = $_page[1];
-				if(isset($_page[2]))
-					$param = $_page[2];
+				if(isset($_page[2])) {
+									$param = $_page[2];
+				}
 			} else {
 				$label = $_page;
 				$class = $_page;
@@ -27,13 +28,15 @@ 
 			$this->pages[$label] = [$class,$param];
 		}
 		public function addPages( $_pages ) {
-			foreach ($_pages as $i)
-				$this->addPage($i);
+			foreach ($_pages as $i) {
+							$this->addPage($i);
+			}
 		}
 		public function fetchPage( $_label ) {
 			$temp = $this->defaultPage;
-			if(isset($this->pages[$_label]))
-				$temp = $this->pages[$_label];
+			if(isset($this->pages[$_label])) {
+							$temp = $this->pages[$_label];
+			}
 			$this->currentPage = new $temp[0]($temp[1]);
 			return $this->currentPage;
 		}

dist/jate/modules/Menu/Menu.php

Braces +23 added lines, -16 removed lines

@@ -11,9 +11,10 @@ 
 				if($i["fk_menu"] == 0) {
 					array_push($temp, array("label" => $i["label"], "link" => $i["link"], "submenu" => []));
 					$submenu = c_query("SELECT * FROM menu WHERE fk_menu = ".$i["pk_menu"],"Menu,getMenu,submenu");
-					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->data["menu"] = $temp;
@@ -26,18 +27,20 @@ 
 				if( is_array($i["submenu"]) && count($i["submenu"])<1) {
 					$temp .= '<li><a href="'.$i["link"].'">'.$i["label"].'</a></li>';
 				} else {
-					if($this->isSubString($actual_link,array_merge(array_column($i["submenu"], 'link'), array($i["link"]))))
-						$temp .= '<li class="dropdown active">';
-					else
-						$temp .= '<li class="dropdown">';
+					if($this->isSubString($actual_link,array_merge(array_column($i["submenu"], 'link'), array($i["link"])))) {
+											$temp .= '<li class="dropdown active">';
+					} else {
+											$temp .= '<li class="dropdown">';
+					}
 					$temp .=
 						'<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'.
 						$i["label"].
 						'<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 +48,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 = c_query(
 				"SELECT user.*,user_section.*
@@ -69,11 +74,13 @@ 
 			foreach ($this->data["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->data["menu"] = $temp;
 		}

Spacing +14 added lines, -14 removed lines

@@ -4,17 +4,17 @@ 
 			parent::__construct();
 		}
 		public function init() {
-			$menu = c_query("SELECT * FROM menu WHERE flag_active = 1 ORDER BY `order`","Menu,getMenu,menu");
+			$menu = c_query("SELECT * FROM menu WHERE flag_active = 1 ORDER BY `order`", "Menu,getMenu,menu");
 			$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 = c_query("SELECT * FROM menu WHERE fk_menu = $pk_menu ORDER BY `order`","Menu,getMenu,submenu");
-					if($submenu)
+					$submenu = c_query("SELECT * FROM menu WHERE fk_menu = $pk_menu ORDER BY `order`", "Menu,getMenu,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;
@@ -24,10 +24,10 @@ 
 			$temp = "";
 			$actual_link = "http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
 			foreach ($this->data["menu"] as $i) {
-				if( is_array($i["submenu"]) && count($i["submenu"])<1) {
+				if (is_array($i["submenu"]) && count($i["submenu"]) < 1) {
 					$temp .= '<li><a href="'.$i["link"].'">'.$i["label"].'</a></li>';
 				} else {
-					if($this->isSubString($actual_link,array_merge(array_column($i["submenu"], 'link'), array($i["link"]))))
+					if ($this->isSubString($actual_link, array_merge(array_column($i["submenu"], 'link'), array($i["link"]))))
 						$temp .= '<li class="dropdown active">';
 					else
 						$temp .= '<li class="dropdown">';
@@ -44,10 +44,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;
 		}
@@ -55,8 +55,8 @@ 
 			$this->init();
 			$temp = [];
 			$user = "";
-			if(!isset($_SESSION["username"]))
-				$_SESSION["username"] ="guest";
+			if (!isset($_SESSION["username"]))
+				$_SESSION["username"] = "guest";
 			$user = $_SESSION["username"];
 			$blackList = c_query(
 				"SELECT user.*,user_section.*
@@ -71,10 +71,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;
 		}

dist/jate/modules/JConfig/JConfig.php

Spacing +10 added lines, -10 removed lines

@@ -5,27 +5,27 @@
 		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 ) {
+		public function import($_path) {
 			$data = file_get_contents($_path);
 			$data = json_decode($data);
 			$this->overlay($data);
 		}
-		private function overlay( $_data ) {
-			$this->connection["enable"]		= $_data->connection->enable;
-			$this->connection["user"]			= $_data->connection->user;
+		private function overlay($_data) {
+			$this->connection["enable"] = $_data->connection->enable;
+			$this->connection["user"] = $_data->connection->user;
 			$this->connection["password"] = $_data->connection->password;
 			$this->connection["database"] = $_data->connection->database;
-			$this->connection["server"]		= $_data->connection->server;
-			$this->all		= $_data->all;
+			$this->connection["server"] = $_data->connection->server;
+			$this->all = $_data->all;
 			$this->DEBUG	= $_data->DEBUG;
 			$this->pages	= $_data->pages;
 		}

dist/jate/modules/Statistic/Statistic.php

Spacing +3 added lines, -3 removed lines

@@ -1,17 +1,17 @@
 <?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/Connection/Connection.php

Spacing +6 added lines, -6 removed lines

@@ -7,20 +7,20 @@
 			parent::__construct();
 			$args = func_get_args();
 			$count = func_num_args();
-			if (method_exists($this,$func='__construct'.$count))
-				call_user_func_array(array($this,$func),$args);
+			if (method_exists($this, $func = '__construct'.$count))
+				call_user_func_array(array($this, $func), $args);
 		}
 		public function __construct0() {
 			$this->connection = null;
 			$this->database = null;
 		}
-		public function __construct4( $_srv, $_db, $_usr, $_pass) {
+		public function __construct4($_srv, $_db, $_usr, $_pass) {
 			$this->connection = "mysql:host=$_srv;dbname=$_db";
-			$this->database = new PDO( $this->connection, $_usr, $_pass,array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));
+			$this->database = new PDO($this->connection, $_usr, $_pass, array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));
 			$this->info = [];
-			$this->info["server"]		= $_srv;
+			$this->info["server"] = $_srv;
 			$this->info["database"]	= $_db;
-			$this->info["user"]			= $_usr;
+			$this->info["user"] = $_usr;
 			$this->info["password"]	= $_pass;
 		}
 	}

Braces +3 added lines, -2 removed lines

@@ -7,8 +7,9 @@
 			parent::__construct();
 			$args = func_get_args();
 			$count = func_num_args();
-			if (method_exists($this,$func='__construct'.$count))
-				call_user_func_array(array($this,$func),$args);
+			if (method_exists($this,$func='__construct'.$count)) {
+							call_user_func_array(array($this,$func),$args);
+			}
 		}
 		public function __construct0() {
 			$this->connection = null;

dist/jate/modules/Html/Html.php

Spacing +7 added lines, -7 removed lines

@@ -7,23 +7,23 @@
 			$this->data["brandImg"]					= "";
 			$this->data["menu"]							= "";
 			$this->data["title"]						= "";
-			$this->data["subtitle"]		 			= "";
+			$this->data["subtitle"] = "";
 			$this->data["content"]				 	= "";
-			$this->data["outContent"]		 		= "";
+			$this->data["outContent"] = "";
 			$this->data["footer"]		 				= "";
 			$this->data["pagePath"]				 	= [];
-			$this->data["css"]							= [];
-			$this->data["js"]					 			= [];
+			$this->data["css"] = [];
+			$this->data["js"] = [];
 			$this->data["jsVariables"]			= [];
-			$this->data["metaDescription"]	= [];
-			$this->data["metaKeywords"]			= [];
+			$this->data["metaDescription"] = [];
+			$this->data["metaKeywords"] = [];
 			$this->data["metaAuthor"]				= [];
 		}
 		public function uniforma() {
 			$this->addDipendences();
 			$this->data["css"]			= array_unique($this->data["css"]);
 			$this->data["js"]				= array_unique($this->data["js"]);
-			$this->data["pagePath"]	= json_encode($this->data["pagePath"]);
+			$this->data["pagePath"] = json_encode($this->data["pagePath"]);
 			$tempStr = "";
 			foreach ($this->data["css"] as $i)
 				$tempStr .= '<link rel="stylesheet" href="'.$i.'">';

Braces +9 added lines, -6 removed lines

@@ -25,17 +25,20 @@
 			$this->data["js"]				= array_unique($this->data["js"]);
 			$this->data["pagePath"]	= json_encode($this->data["pagePath"]);
 			$tempStr = "";
-			foreach ($this->data["css"] as $i)
-				$tempStr .= '<link rel="stylesheet" href="'.$i.'">';
+			foreach ($this->data["css"] as $i) {
+							$tempStr .= '<link rel="stylesheet" href="'.$i.'">';
+			}
 			$this->data["css"] = $tempStr;
 			$tempStr = "";
-			foreach ($this->data["js"] as $i)
-				$tempStr .= '<script src="'.$i.'"></script>';
+			foreach ($this->data["js"] as $i) {
+							$tempStr .= '<script src="'.$i.'"></script>';
+			}
 			$this->data["js"] = $tempStr;
 			$tempStr = "";
 			$tempStr .= '<script type="text/javascript">';
-			foreach ($this->data["jsVariables"] as $i)
-				$tempStr .= " ".$i[0]." = ".$i[1].";\n";
+			foreach ($this->data["jsVariables"] as $i) {
+							$tempStr .= " ".$i[0]." = ".$i[1].";\n";
+			}
 			$tempStr .= '</script>';
 			$this->data["jsVariables"] = $tempStr;
 		}

dist/status.php

Spacing +5 added lines, -5 removed lines

@@ -22,17 +22,17 @@ 
 					$percent;
 					foreach (getGitLog() as $i) {
 						$cont++;
-						if($cont % $nPerCol == 1)
+						if ($cont % $nPerCol == 1)
 							echo '<div class="row">';
-						if(isset($i["tag"])) {
-							$percent = explode(".",$i["tag"]);
+						if (isset($i["tag"])) {
+							$percent = explode(".", $i["tag"]);
 							$percent = 100 * intval($percent[0]) + 10 * intval($percent[1]) + intval($percent[2]);
 						}
 					?>
 						<div class="col-lg-<?=$dim?>">
 							<div class="well well-sm miniblock">
 								<div class="autor"><b>Autor:</b> <?=$i["author"]?><br></div>
-								<div class="tag"><b>Tag:</b> <?php if(isset($i["tag"])) echo $i["tag"]?><br></div>
+								<div class="tag"><b>Tag:</b> <?php if (isset($i["tag"])) echo $i["tag"]?><br></div>
 								<div class="date"><b>Date:</b> <?=$i["date"]?><br></div>
 								<div class="message"><b>Message:</b> <?=$i["message"]?><br></div>
 								<div class="progress">
@@ -44,7 +44,7 @@ 
 							</div>
 						</div>
 					<?php
-					if($cont % $nPerCol == 0)
+					if ($cont % $nPerCol == 0)
 						echo '</div>';
 					} ?>
 				</div>

Braces +6 added lines, -3 removed lines

@@ -22,8 +22,9 @@ 
 					$percent;
 					foreach (getGitLog() as $i) {
 						$cont++;
-						if($cont % $nPerCol == 1)
-							echo '<div class="row">';
+						if($cont % $nPerCol == 1) {
+													echo '<div class="row">';
+						}
 						if(isset($i["tag"])) {
 							$percent = explode(".",$i["tag"]);
 							$percent = 100 * intval($percent[0]) + 10 * intval($percent[1]) + intval($percent[2]);
@@ -32,7 +33,8 @@ 
 						<div class="col-lg-<?=$dim?>">
 							<div class="well well-sm miniblock">
 								<div class="autor"><b>Autor:</b> <?=$i["author"]?><br></div>
-								<div class="tag"><b>Tag:</b> <?php if(isset($i["tag"])) echo $i["tag"]?><br></div>
+								<div class="tag"><b>Tag:</b> <?php if(isset($i["tag"])) {
+	echo $i["tag"]?><br></div>
 								<div class="date"><b>Date:</b> <?=$i["date"]?><br></div>
 								<div class="message"><b>Message:</b> <?=$i["message"]?><br></div>
 								<div class="progress">
@@ -46,6 +48,7 @@ 
 					<?php
 					if($cont % $nPerCol == 0)
 						echo '</div>';
+}
 					} ?>
 				</div>
 			</div>

dist/jate.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	if(isset($GLOBALS["JATEPath"]))
+	if (isset($GLOBALS["JATEPath"]))
 		$GLOBALS["JATEPath"] = [];
 	$commonLocations = array(
 		"bower_components/JATE/dist/",
@@ -7,7 +7,7 @@ 
 		"../../dist/"
 	);
 	foreach ($commonLocations as $i)
-		if(file_exists($i."jate/coreEngine.php")) {
+		if (file_exists($i."jate/coreEngine.php")) {
 			array_push($GLOBALS["JATEPath"], $i);
 			require_once($i."jate/coreEngine.php");
 			break;

Braces +6 added lines, -4 removed lines

@@ -1,14 +1,16 @@
 <?php
-	if(isset($GLOBALS["JATEPath"]))
-		$GLOBALS["JATEPath"] = [];
+	if(isset($GLOBALS["JATEPath"])) {
+			$GLOBALS["JATEPath"] = [];
+	}
 	$commonLocations = array(
 		"bower_components/JATE/dist/",
 		"vendor/xaberr/jate/dist/",
 		"../../dist/"
 	);
-	foreach ($commonLocations as $i)
-		if(file_exists($i."jate/coreEngine.php")) {
+	foreach ($commonLocations as $i) {
+			if(file_exists($i."jate/coreEngine.php")) {
 			array_push($GLOBALS["JATEPath"], $i);
+	}
 			require_once($i."jate/coreEngine.php");
 			break;
 		}