Completed
Push — master ( a12ace...998a95 )
by Federico
02:48
created
examples/05database/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 	require_once("main.php");
3
-	if(!isset($_GET["page"])) $_GET["page"] = "home";
3
+	if (!isset($_GET["page"])) $_GET["page"] = "home";
4 4
 	$webApp->fetchPage($_GET["page"]);
5 5
 	$webApp->draw();
6 6
 ?>
Please login to merge, or discard this patch.
examples/05database/jate.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-	if(!isset($GLOBALS["JATEPath"]))
2
+	if (!isset($GLOBALS["JATEPath"]))
3 3
 		$GLOBALS["JATEPath"] = [];
4 4
 	$commonLocations = array(
5 5
 		"bower_components/JATE/dist/",
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 		"../../dist/"
8 8
 	);
9 9
 	foreach ($commonLocations as $i)
10
-		if(file_exists($i."jate/coreEngine.php")) {
10
+		if (file_exists($i."jate/coreEngine.php")) {
11 11
 			array_push($GLOBALS["JATEPath"], $i);
12 12
 			require_once($i."jate/coreEngine.php");
13 13
 			break;
Please login to merge, or discard this patch.
dist/jate/coreEngine.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -5,20 +5,20 @@
 block discarded – undo
5 5
 	//JATE SUFF
6 6
 	require_once			(end($GLOBALS["JATEPath"])."jate/functions/requirer.php");
7 7
 	//USER STUFF
8
-	requireComponent	("modules/JConfig/JConfig.php");
9
-	$jConfig	= new JConfig();
8
+	requireComponent("modules/JConfig/JConfig.php");
9
+	$jConfig = new JConfig();
10 10
 	$jConfig->import("config.json");
11 11
 	//JATE STUFF
12
-	requireComponent	("functions/folder.php");
12
+	requireComponent("functions/folder.php");
13 13
 
14 14
 	//JATE SUFF
15
-	requireComponent	("modules/Module/Module.php");
16
-	requireComponents	("functions");
17
-	requireModules		("modules");
15
+	requireComponent("modules/Module/Module.php");
16
+	requireComponents("functions");
17
+	requireModules("modules");
18 18
 
19 19
 	//USER STUFF
20
-	requireComponent	("config.php",false);
21
-	requireModules		("modules",false);
22
-	requireComponent	("pages/Template.php",false);
23
-	requireComponents	("pages",false);
20
+	requireComponent("config.php", false);
21
+	requireModules("modules", false);
22
+	requireComponent("pages/Template.php", false);
23
+	requireComponents("pages", false);
24 24
 ?>
Please login to merge, or discard this patch.
dist/jate/functions/git.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@  discard block
 block discarded – undo
1 1
 <?php
2
-	function getGitLog( $_dir = "./" ) {
3
-		if(!file_exists($_dir)) return [];
2
+	function getGitLog($_dir = "./") {
3
+		if (!file_exists($_dir)) return [];
4 4
 		$currentDir = getcwd();
5 5
 		chdir($_dir);
6 6
 		$git_history = [];
7 7
 		$git_logs	= [];
8
-		$gitPath	= str_replace('\\', '/', exec("git rev-parse --show-toplevel"));
9
-		$rootPath	= str_replace('\\', '/', getcwd ());
10
-		if( $gitPath != $rootPath ) {
8
+		$gitPath = str_replace('\\', '/', exec("git rev-parse --show-toplevel"));
9
+		$rootPath	= str_replace('\\', '/', getcwd());
10
+		if ($gitPath != $rootPath) {
11 11
 			chdir($currentDir);
12 12
 			return [];
13 13
 		}
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 					$git_history[$last_hash]['date'] = date('d/m/Y H:i:s A', strtotime($date));
48 48
 				}
49 49
 				else
50
-					$git_history[$last_hash]['message'] .= $line ." ";
50
+					$git_history[$last_hash]['message'] .= $line." ";
51 51
 			}
52 52
 		}
53 53
 		chdir($currentDir);
Please login to merge, or discard this patch.
dist/jate/functions/requirer.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,45 +1,45 @@
 block discarded – undo
1 1
 <?php
2
-	function requireComponent( $_path, $_local = true, $_stack = null ) {
2
+	function requireComponent($_path, $_local = true, $_stack = null) {
3 3
 		$path = getJFolder($_path, $_local, debug_backtrace());
4
-		if(file_exists($path) && isPhp($path))
4
+		if (file_exists($path) && isPhp($path))
5 5
 			jRequire($path, false, 0);
6 6
 		else
7 7
 			requireError($_path);
8 8
 	}
9
-	function requireComponents( $_path, $_local = true, $_stack = null ) {
9
+	function requireComponents($_path, $_local = true, $_stack = null) {
10 10
 		$path = getJFolder($_path, $_local, debug_backtrace());
11
-		if(file_exists($path)) {
11
+		if (file_exists($path)) {
12 12
 			$files = subFolder_file($path);
13 13
 			foreach ($files as $i) {
14
-				if(isPhp($path."/".$i))
14
+				if (isPhp($path."/".$i))
15 15
 					requireComponent($path."/".$i, false, 0);
16 16
 			}
17 17
 		} else
18 18
 			requireError($_path);
19 19
 	}
20
-	function requireError( $_path ) {
20
+	function requireError($_path) {
21 21
 		global $jConfig;
22
-		if( $jConfig->DEBUG == 1 )
22
+		if ($jConfig->DEBUG == 1)
23 23
 			echo "Error load ($_path)<br>";
24 24
 	}
25
-	function isPhp ( $_file ) {
26
-		if(!is_file($_file)) return false;
25
+	function isPhp($_file) {
26
+		if (!is_file($_file)) return false;
27 27
 		$info = pathinfo($_file);
28 28
 		return ($info["extension"] == "php") || ($info["extension"] == "PHP");
29 29
 	}
30
-	function requireModules( $_path, $_local = true, $_stack = null ) {
30
+	function requireModules($_path, $_local = true, $_stack = null) {
31 31
 		$path = getJFolder($_path, $_local, debug_backtrace());
32 32
 		$subFolders = subFolder_dir($path);
33 33
 		foreach ($subFolders as $i) {
34 34
 			requireComponents($path."/".$i, false, 0);
35 35
 		}
36 36
 	}
37
-	function jRequire( $_path, $_local = true, $_stack = null ) {
37
+	function jRequire($_path, $_local = true, $_stack = null) {
38 38
 		$path = getJFolder($_path, $_local, debug_backtrace());
39
-		require_once( $path );
39
+		require_once($path);
40 40
 	}
41
-	function getJFolder( $_path, $_local, $_stack ) {
42
-		if($_local) {
41
+	function getJFolder($_path, $_local, $_stack) {
42
+		if ($_local) {
43 43
 			$stackInfo = $_stack;
44 44
 			$folder = dirname($stackInfo[0]["file"]);
45 45
 			$file = "$folder/$_path";
Please login to merge, or discard this patch.
dist/jate/functions/block.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -13,9 +13,9 @@
 block discarded – undo
13 13
 	}
14 14
 
15 15
 	function minify_output($_buffer) {
16
-		$search = array ( '/\>[^\S ]+/s', '/[^\S ]+\</s', '/(\s)+/s' );
17
-		$replace = array ( '>', '<', '\\1' );
18
-		if (preg_match("/\<html/i",$_buffer) == 1 && preg_match("/\<\/html\>/i",$_buffer) == 1)
16
+		$search = array('/\>[^\S ]+/s', '/[^\S ]+\</s', '/(\s)+/s');
17
+		$replace = array('>', '<', '\\1');
18
+		if (preg_match("/\<html/i", $_buffer) == 1 && preg_match("/\<\/html\>/i", $_buffer) == 1)
19 19
 			$_buffer = preg_replace($search, $replace, utf8_decode($_buffer));
20 20
 		return utf8_encode($_buffer);
21 21
 	}
Please login to merge, or discard this patch.
dist/jate/functions/string.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-	function htmlParser( $_str) {
2
+	function htmlParser($_str) {
3 3
 		return htmlentities($_str, ENT_QUOTES | ENT_IGNORE, "UTF-8");
4 4
 	}
5 5
 ?>
Please login to merge, or discard this patch.
dist/jate/modules/WebApp/WebApp.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -7,37 +7,37 @@
 block discarded – undo
7 7
 		public function __construct() {
8 8
 			parent::__construct();
9 9
 			$this->pages = [];
10
-			$this->defaultPage	= ["Page404",[]];
10
+			$this->defaultPage	= ["Page404", []];
11 11
 			$this->currentPage	= null;
12 12
 			$this->connection		= null;
13 13
 		}
14
-		public function addPage( $_page ) {
14
+		public function addPage($_page) {
15 15
 			$label = "";
16 16
 			$class = "";
17 17
 			$param = [];
18
-			if(is_array($_page)) {
18
+			if (is_array($_page)) {
19 19
 				$label = $_page[0];
20 20
 				$class = $_page[1];
21
-				if(isset($_page[2]))
21
+				if (isset($_page[2]))
22 22
 					$param = $_page[2];
23 23
 			} else {
24 24
 				$label = $_page;
25 25
 				$class = $_page;
26 26
 			}
27
-			$this->pages[$label] = [$class,$param];
27
+			$this->pages[$label] = [$class, $param];
28 28
 		}
29
-		public function addPages( $_pages ) {
29
+		public function addPages($_pages) {
30 30
 			foreach ($_pages as $i)
31 31
 				$this->addPage($i);
32 32
 		}
33
-		public function fetchPage( $_label ) {
33
+		public function fetchPage($_label) {
34 34
 			$temp = $this->defaultPage;
35
-			if(isset($this->pages[$_label]))
35
+			if (isset($this->pages[$_label]))
36 36
 				$temp = $this->pages[$_label];
37 37
 			$this->currentPage = new $temp[0]($temp[1]);
38 38
 			return $this->currentPage;
39 39
 		}
40
-		public function setDefaultPage( $_page ) {
40
+		public function setDefaultPage($_page) {
41 41
 			$this->defaultPage = $_page;
42 42
 		}
43 43
 		public function draw() {
Please login to merge, or discard this patch.
dist/jate/modules/GUI/GUI.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -3,16 +3,16 @@
 block discarded – undo
3 3
 		public function __construct() {
4 4
 			parent::__construct();
5 5
 		}
6
-		public function init( $_page ) {
6
+		public function init($_page) {
7 7
 			$this->data = $_page->data;
8 8
 		}
9
-		public function draw( $_template ) {
9
+		public function draw($_template) {
10 10
 			$page = file_get_contents($_template);
11 11
 			$render = $this->overlayTag($page);
12 12
 			echo minify_output($render);
13 13
 		}
14
-		protected function overlayTag( $_page ) {
15
-			foreach($this->data as $key => $value) {
14
+		protected function overlayTag($_page) {
15
+			foreach ($this->data as $key => $value) {
16 16
 				$_page = str_replace("<_".$key."_>", "$value", $_page);
17 17
 			}
18 18
 			return $_page;
Please login to merge, or discard this patch.