XaBerr / JATE

examples/05database/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>

examples/05database/pages/Template.php

Spacing +2 added lines, -2 removed lines

@@ -19,14 +19,14 @@
 		public function makeConnection() {
 			global $jConfig;
 			$connection = null;
-			if($jConfig->connection["enable"])
+			if ($jConfig->connection["enable"])
 				$connection = new Connection(
 						$jConfig->connection["server"]
 					, $jConfig->connection["database"]
 					, $jConfig->connection["user"]
 					, $jConfig->connection["password"]
 				);
-			$this->addConnection("base",$connection);
+			$this->addConnection("base", $connection);
 		}
 	}
 ?>

Braces +3 added lines, -2 removed lines

@@ -19,13 +19,14 @@
 		public function makeConnection() {
 			global $jConfig;
 			$connection = null;
-			if($jConfig->connection["enable"])
-				$connection = new Connection(
+			if($jConfig->connection["enable"]) {
+							$connection = new Connection(
 						$jConfig->connection["server"]
 					, $jConfig->connection["database"]
 					, $jConfig->connection["user"]
 					, $jConfig->connection["password"]
 				);
+			}
 			$this->addConnection("base",$connection);
 		}
 	}

examples/01essential/pages/Template.php

Spacing +2 added lines, -2 removed lines

@@ -19,14 +19,14 @@
 		public function makeConnection() {
 			global $jConfig;
 			$connection = null;
-			if($jConfig->connection["enable"])
+			if ($jConfig->connection["enable"])
 				$connection = new Connection(
 						$jConfig->connection["server"]
 					, $jConfig->connection["database"]
 					, $jConfig->connection["user"]
 					, $jConfig->connection["password"]
 				);
-			$this->addConnection("base",$connection);
+			$this->addConnection("base", $connection);
 		}
 	}
 ?>

Braces +3 added lines, -2 removed lines

@@ -19,13 +19,14 @@
 		public function makeConnection() {
 			global $jConfig;
 			$connection = null;
-			if($jConfig->connection["enable"])
-				$connection = new Connection(
+			if($jConfig->connection["enable"]) {
+							$connection = new Connection(
 						$jConfig->connection["server"]
 					, $jConfig->connection["database"]
 					, $jConfig->connection["user"]
 					, $jConfig->connection["password"]
 				);
+			}
 			$this->addConnection("base",$connection);
 		}
 	}

dist/jate/modules/Query/Query.php

Doc Comments +5 added lines

@@ -7,6 +7,11 @@
 			$this->connection = [];
 			$this->currentConnection = null;
 		}
+
+		/**
+		 * @param string $_name
+		 * @param Connection|null $_connection
+		 */
 		public function addConnection( $_name, $_connection ) {
 			$this->connection["$_name"] = $_connection;
 			$this->currentConnection = $_connection;

Spacing +8 added lines, -8 removed lines

@@ -7,38 +7,38 @@
 			$this->connection = [];
 			$this->currentConnection = null;
 		}
-		public function addConnection( $_name, $_connection ) {
+		public function addConnection($_name, $_connection) {
 			$this->connection["$_name"] = $_connection;
 			$this->currentConnection = $_connection;
 		}
-		public function setConnection( $_name ) {
+		public function setConnection($_name) {
 			$this->currentConnection = $this->connection["$_name"];
 		}
-		public function query( $_query ) {
+		public function query($_query) {
 			$this->stdQuery($_query);
 			return true;
 		}
-		public function queryInsert( $_query ) {
+		public function queryInsert($_query) {
 			$temp = $this->stdQuery($_query);
 			return $this->currentConnection->database->lastInsertId();
 		}
 
-		public function queryFetch( $_query ) {
+		public function queryFetch($_query) {
 			$temp = $this->stdQuery($_query);
 			return $temp->fetchAll(PDO::FETCH_ASSOC);
 		}
 
-		public function queryArray( $_query ) {
+		public function queryArray($_query) {
 			$temp = $this->stdQuery($_query);
 			return $temp->fetchAll(PDO::FETCH_COLUMN, 0);
 		}
 
-		protected function stdQuery( $_query ) {
+		protected function stdQuery($_query) {
 			$database = $this->currentConnection->database;
 			$error = "Error query [$_query]";
 			$query = $database->prepare($_query);
 			$_result = $query->execute();
-			if(!$_result) {
+			if (!$_result) {
 				echo "$_query<br>";
 				echo "Something wrong: $error";
 				var_dump($query->errorInfo());

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);
 		}
-		protected function overlay( $_data ) {
-			$this->connection["enable"]		= $_data->connection->enable;
-			$this->connection["user"]			= $_data->connection->user;
+		protected 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/Menu/Menu.php

Spacing +12 added lines, -12 removed lines

@@ -9,13 +9,13 @@ 
 			$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 = $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"], []) );
+						array_push($temp[count($temp) - 1]["submenu"], array("label" => $j["label"], "link" => $j["link"], []));
 				}
 			}
 			$this->data["menu"] = $temp;
@@ -25,8 +25,8 @@ 
 			$temp = "";
 			$actual_link = "http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
 			foreach ($this->data["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)
+				$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 {
 					$temp .= "<li class='dropdown $active'>";
@@ -43,10 +43,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;
 		}
@@ -54,8 +54,8 @@ 
 			$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.*
@@ -70,10 +70,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;
 		}

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->data["menu"] = $temp;
@@ -26,9 +27,9 @@ 
 			$actual_link = "http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
 			foreach ($this->data["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->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;
 		}