XaBerr / JATE

dist/jate/modules/JConfig/JConfig.php

Spacing +14 added lines, -14 removed lines

@@ -5,41 +5,41 @@
 		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, $_type = "misc" ) {
+		public function import($_path, $_type = "misc") {
 			$data = file_get_contents($_path);
 			$data = json_decode($data);
-			if( $_type == "connection" )
+			if ($_type == "connection")
 				$this->overlayConnection($data);
 			else
 				$this->overlayMisc($data);
 		}
-		protected function overlayConnection( $_data ) {
+		protected function overlayConnection($_data) {
 			$this->connection = $this->obj2array($_data);
 		}
-		protected function overlayMisc( $_data ) {
+		protected function overlayMisc($_data) {
 			$this->importObject($_data);
 		}
-		protected function obj2array ( &$_instance ) {
-			$clone	= (array) $_instance;
+		protected function obj2array(&$_instance) {
+			$clone = (array) $_instance;
 			$return	= [];
 			$return['___SOURCE_KEYS_'] = $clone;
-			while ( list ($key, $value) = each ($clone) ) {
-				$temp		= explode ("\0", $key);
-				$newkey	= $temp[count($temp)-1];
+			while (list ($key, $value) = each($clone)) {
+				$temp		= explode("\0", $key);
+				$newkey = $temp[count($temp) - 1];
 				$return[$newkey] = &$return['___SOURCE_KEYS_'][$key];
 			}
 			return $return;
 		}
-		protected function importObject( $_object ) {
+		protected function importObject($_object) {
 			foreach (get_object_vars($_object) as $key => $value)
 				$this->$key = $value;
 		}

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

Spacing +11 added lines, -11 removed lines

@@ -6,23 +6,23 @@
 	require_once			(end($GLOBALS["JATEPath"])."jate/functions/requirer.php");
 
 	//USER STUFF
-	requireComponent	("modules/JConfig/JConfig.php");
-	$jConfig	= new JConfig();
-	$jConfig->import("config/connection.json","connection");
+	requireComponent("modules/JConfig/JConfig.php");
+	$jConfig = new JConfig();
+	$jConfig->import("config/connection.json", "connection");
 	$jConfig->import("config/misc.json");
 	$jConfig->import("config/router.json");
 
 	//JATE STUFF
-	requireComponent	("functions/folder.php");
+	requireComponent("functions/folder.php");
 
 	//JATE SUFF
-	requireComponent	("modules/Module/Module.php");
-	requireComponents	("functions");
-	requireModules		("modules");
+	requireComponent("modules/Module/Module.php");
+	requireComponents("functions");
+	requireModules("modules");
 
 	//USER STUFF
-	requireComponent	("config.php",false);
-	requireModules		("modules",false);
-	requireComponent	("pages/Template.php",false);
-	requireComponents	("pages",false);
+	requireComponent("config.php", false);
+	requireModules("modules", false);
+	requireComponent("pages/Template.php", false);
+	requireComponents("pages", false);
 ?>