XaBerr / JATE

dist/jate/functions/array.php

Doc Comments +4 added lines

@@ -11,6 +11,10 @@
   function arrayHtmlParser($_array) {
     return travelStringArray($_array,"htmlParser");
   }
+
+  /**
+   * @param string $_function
+   */
   function travelStringArray ( $_array, $_function ) {
     if (is_array($_array)) {
       foreach ($_array as $k => $v) {

Indentation +32 added lines, -32 removed lines

@@ -1,51 +1,51 @@
 <?php
   function utf8ize($_array) {
-    return travelStringArray($_array,"utf8_encode");
+	return travelStringArray($_array,"utf8_encode");
   }
   function unutf8ize($_array) {
-    return travelStringArray($_array,"utf8_decode");
+	return travelStringArray($_array,"utf8_decode");
   }
   function arraySlash($_array) {
-    return travelStringArray($_array,"addslashes");
+	return travelStringArray($_array,"addslashes");
   }
   function arrayHtmlParser($_array) {
-    return travelStringArray($_array,"htmlParser");
+	return travelStringArray($_array,"htmlParser");
   }
   function travelStringArray ( $_array, $_function ) {
-    if (is_array($_array)) {
-      foreach ($_array as $k => $v) {
-        $_array[$k] = travelStringArray($v, $_function);
-      }
-    } else if (is_string ($_array)) {
-      return call_user_func($_function,$_array);
-    }
-    return $_array;
+	if (is_array($_array)) {
+	  foreach ($_array as $k => $v) {
+		$_array[$k] = travelStringArray($v, $_function);
+	  }
+	} else if (is_string ($_array)) {
+	  return call_user_func($_function,$_array);
+	}
+	return $_array;
   }
   function arrayDepth( $_array ) {
-    $maxDepth = 1;
-    foreach ($_array as $value) {
-      if (is_array($value)) {
-        $depth = arrayDepth($value) + 1;
-        if ($depth > $maxDepth) {
-          $maxDepth = $depth;
-        }
-      }
-    }
-    return $maxDepth;
+	$maxDepth = 1;
+	foreach ($_array as $value) {
+	  if (is_array($value)) {
+		$depth = arrayDepth($value) + 1;
+		if ($depth > $maxDepth) {
+		  $maxDepth = $depth;
+		}
+	  }
+	}
+	return $maxDepth;
   }
   function arrayDump( $_array, $_name = "Array", $_tab = "&nbsp;&nbsp;" ) {
-    $position = preg_replace('/&nbsp;&nbsp;/', '', $_tab, 1);
-    echo "$position<span style=\"color:rgb(230,0,0)\">$_name:</span><br>";
-    foreach ($_array as $k => $i)
-      if(is_array($i))
-        arrayDump( $i, $k, "&nbsp;&nbsp;$_tab" );
-      else if(is_object($i))
-        echo "$_tab<b>object:</b> [Object]<br>";
-      else
-        echo "$_tab<b>$k:</b> $i<br>";
+	$position = preg_replace('/&nbsp;&nbsp;/', '', $_tab, 1);
+	echo "$position<span style=\"color:rgb(230,0,0)\">$_name:</span><br>";
+	foreach ($_array as $k => $i)
+	  if(is_array($i))
+		arrayDump( $i, $k, "&nbsp;&nbsp;$_tab" );
+	  else if(is_object($i))
+		echo "$_tab<b>object:</b> [Object]<br>";
+	  else
+		echo "$_tab<b>$k:</b> $i<br>";
   }
 
   function htmlParser( $_str) {
-    return htmlentities($_str, ENT_QUOTES | ENT_IGNORE, "UTF-8");
+	return htmlentities($_str, ENT_QUOTES | ENT_IGNORE, "UTF-8");
   }
 ?>

Spacing +13 added lines, -13 removed lines

@@ -1,27 +1,27 @@ 
 <?php
   function utf8ize($_array) {
-    return travelStringArray($_array,"utf8_encode");
+    return travelStringArray($_array, "utf8_encode");
   }
   function unutf8ize($_array) {
-    return travelStringArray($_array,"utf8_decode");
+    return travelStringArray($_array, "utf8_decode");
   }
   function arraySlash($_array) {
-    return travelStringArray($_array,"addslashes");
+    return travelStringArray($_array, "addslashes");
   }
   function arrayHtmlParser($_array) {
-    return travelStringArray($_array,"htmlParser");
+    return travelStringArray($_array, "htmlParser");
   }
-  function travelStringArray ( $_array, $_function ) {
+  function travelStringArray($_array, $_function) {
     if (is_array($_array)) {
       foreach ($_array as $k => $v) {
         $_array[$k] = travelStringArray($v, $_function);
       }
-    } else if (is_string ($_array)) {
-      return call_user_func($_function,$_array);
+    } else if (is_string($_array)) {
+      return call_user_func($_function, $_array);
     }
     return $_array;
   }
-  function arrayDepth( $_array ) {
+  function arrayDepth($_array) {
     $maxDepth = 1;
     foreach ($_array as $value) {
       if (is_array($value)) {
@@ -33,19 +33,19 @@ 
     }
     return $maxDepth;
   }
-  function arrayDump( $_array, $_name = "Array", $_tab = "&nbsp;&nbsp;" ) {
+  function arrayDump($_array, $_name = "Array", $_tab = "&nbsp;&nbsp;") {
     $position = preg_replace('/&nbsp;&nbsp;/', '', $_tab, 1);
     echo "$position<span style=\"color:rgb(230,0,0)\">$_name:</span><br>";
     foreach ($_array as $k => $i)
-      if(is_array($i))
-        arrayDump( $i, $k, "&nbsp;&nbsp;$_tab" );
-      else if(is_object($i))
+      if (is_array($i))
+        arrayDump($i, $k, "&nbsp;&nbsp;$_tab");
+      else if (is_object($i))
         echo "$_tab<b>object:</b> [Object]<br>";
       else
         echo "$_tab<b>$k:</b> $i<br>";
   }
 
-  function htmlParser( $_str) {
+  function htmlParser($_str) {
     return htmlentities($_str, ENT_QUOTES | ENT_IGNORE, "UTF-8");
   }
 ?>

Braces +8 added lines, -6 removed lines

@@ -36,13 +36,15 @@
   function arrayDump( $_array, $_name = "Array", $_tab = "  " ) {
     $position = preg_replace('/  /', '', $_tab, 1);
     echo "$position<span style=\"color:rgb(230,0,0)\">$_name:</span><br>";
-    foreach ($_array as $k => $i)
-      if(is_array($i))
+    foreach ($_array as $k => $i) {
+          if(is_array($i))
         arrayDump( $i, $k, "&nbsp;&nbsp;$_tab" );
-      else if(is_object($i))
-        echo "$_tab<b>object:</b> [Object]<br>";
-      else
-        echo "$_tab<b>$k:</b> $i<br>";
+    }
+      else if(is_object($i)) {
+              echo "$_tab<b>object:</b> [Object]<br>";
+      } else {
+              echo "$_tab<b>$k:</b> $i<br>";
+      }
   }
 
   function htmlParser( $_str) {

dist/jate/functions/folder.php

Doc Comments +4 added lines

@@ -17,6 +17,10 @@
     });
     return $temp;
   }
+
+  /**
+   * @param Closure $_function
+   */
   function fetchInSubFolder( $_dir = "./", $_function) {
     $temp = [];
     if (is_dir($_dir)) {

Indentation +31 added lines, -31 removed lines

@@ -1,45 +1,45 @@
 <?php
   function subFolder( $_dir = "./" ) {
-    $temp = fetchInSubFolder($_dir, function() {
-      return true;
-    });
-    return $temp;
+	$temp = fetchInSubFolder($_dir, function() {
+	  return true;
+	});
+	return $temp;
   }
   function subFolderFile( $_dir = "./" ) {
-    $temp = fetchInSubFolder($_dir, function( $_file ) {
-      return !is_dir($_file);
-    });
-    return $temp;
+	$temp = fetchInSubFolder($_dir, function( $_file ) {
+	  return !is_dir($_file);
+	});
+	return $temp;
   }
   function subFolderDir( $_dir = "./" ) {
-    $temp = fetchInSubFolder($_dir, function( $_file ) {
-      return !is_file($_file);
-    });
-    return $temp;
+	$temp = fetchInSubFolder($_dir, function( $_file ) {
+	  return !is_file($_file);
+	});
+	return $temp;
   }
   function fetchInSubFolder( $_dir = "./", $_function) {
-    $temp = [];
-    if (is_dir($_dir)) {
-        if ($dirOpened = opendir($_dir)) {
-            while (($file = readdir($dirOpened)) !== false)
-                if( ($file !='.')&&($file !='..') )
-                  if($_function($file))
-                    array_push($temp,$file);
-            closedir($dirOpened);
-        }
-    }
-    return $temp;
+	$temp = [];
+	if (is_dir($_dir)) {
+		if ($dirOpened = opendir($_dir)) {
+			while (($file = readdir($dirOpened)) !== false)
+				if( ($file !='.')&&($file !='..') )
+				  if($_function($file))
+					array_push($temp,$file);
+			closedir($dirOpened);
+		}
+	}
+	return $temp;
   }
   function requireSubfolder( $_dir = "./" ) {
-    $temp = subFolderFile($_dir);
-    foreach ($temp as $i)
-      jRequire($_dir."/".$i);
+	$temp = subFolderFile($_dir);
+	foreach ($temp as $i)
+	  jRequire($_dir."/".$i);
   }
   function require_js( $_dir = "./" ) {
-    $tempArray = [];
-    $temp = subFolderFile($_dir);
-    foreach ($temp as $i)
-      array_push($tempArray, $_dir."/".$i);
-    return $tempArray;
+	$tempArray = [];
+	$temp = subFolderFile($_dir);
+	foreach ($temp as $i)
+	  array_push($tempArray, $_dir."/".$i);
+	return $tempArray;
   }
 ?>

Spacing +11 added lines, -11 removed lines

@@ -1,41 +1,41 @@
 <?php
-  function subFolder( $_dir = "./" ) {
+  function subFolder($_dir = "./") {
     $temp = fetchInSubFolder($_dir, function() {
       return true;
     });
     return $temp;
   }
-  function subFolderFile( $_dir = "./" ) {
-    $temp = fetchInSubFolder($_dir, function( $_file ) {
+  function subFolderFile($_dir = "./") {
+    $temp = fetchInSubFolder($_dir, function($_file) {
       return !is_dir($_file);
     });
     return $temp;
   }
-  function subFolderDir( $_dir = "./" ) {
-    $temp = fetchInSubFolder($_dir, function( $_file ) {
+  function subFolderDir($_dir = "./") {
+    $temp = fetchInSubFolder($_dir, function($_file) {
       return !is_file($_file);
     });
     return $temp;
   }
-  function fetchInSubFolder( $_dir = "./", $_function) {
+  function fetchInSubFolder($_dir = "./", $_function) {
     $temp = [];
     if (is_dir($_dir)) {
         if ($dirOpened = opendir($_dir)) {
             while (($file = readdir($dirOpened)) !== false)
-                if( ($file !='.')&&($file !='..') )
-                  if($_function($file))
-                    array_push($temp,$file);
+                if (($file != '.') && ($file != '..'))
+                  if ($_function($file))
+                    array_push($temp, $file);
             closedir($dirOpened);
         }
     }
     return $temp;
   }
-  function requireSubfolder( $_dir = "./" ) {
+  function requireSubfolder($_dir = "./") {
     $temp = subFolderFile($_dir);
     foreach ($temp as $i)
       jRequire($_dir."/".$i);
   }
-  function require_js( $_dir = "./" ) {
+  function require_js($_dir = "./") {
     $tempArray = [];
     $temp = subFolderFile($_dir);
     foreach ($temp as $i)

Braces +9 added lines, -6 removed lines

@@ -21,10 +21,11 @@ 
     $temp = [];
     if (is_dir($_dir)) {
         if ($dirOpened = opendir($_dir)) {
-            while (($file = readdir($dirOpened)) !== false)
-                if( ($file !='.')&&($file !='..') )
+            while (($file = readdir($dirOpened)) !== false) {
+                            if( ($file !='.')&&($file !='..') )
                   if($_function($file))
                     array_push($temp,$file);
+            }
             closedir($dirOpened);
         }
     }
@@ -32,14 +33,16 @@ 
   }
   function requireSubfolder( $_dir = "./" ) {
     $temp = subFolderFile($_dir);
-    foreach ($temp as $i)
-      jRequire($_dir."/".$i);
+    foreach ($temp as $i) {
+          jRequire($_dir."/".$i);
+    }
   }
   function require_js( $_dir = "./" ) {
     $tempArray = [];
     $temp = subFolderFile($_dir);
-    foreach ($temp as $i)
-      array_push($tempArray, $_dir."/".$i);
+    foreach ($temp as $i) {
+          array_push($tempArray, $_dir."/".$i);
+    }
     return $tempArray;
   }
 ?>

dist/jate/modules/Connection/Adapters/ConnectionInterface.php

Doc Comments +8 added lines

@@ -1,6 +1,14 @@
 <?php
   interface ConnectionAdapterInterface {
+
+    /**
+     * @return void
+     */
     public function __construct( $_srv, $_db, $_usr, $_pass);
+
+    /**
+     * @return boolean
+     */
     public function query( $_query );
     public function queryFetch( $_query );
     public function queryArray( $_query );

Indentation +5 added lines, -5 removed lines

@@ -1,9 +1,9 @@
 <?php
   interface ConnectionAdapterInterface {
-    public function __construct( $_srv, $_db, $_usr, $_pass);
-    public function query( $_query );
-    public function queryFetch( $_query );
-    public function queryArray( $_query );
-    public function queryInsert( $_query );
+	public function __construct( $_srv, $_db, $_usr, $_pass);
+	public function query( $_query );
+	public function queryFetch( $_query );
+	public function queryArray( $_query );
+	public function queryInsert( $_query );
   }
 ?>

Spacing +5 added lines, -5 removed lines

@@ -1,9 +1,9 @@
 <?php
   interface ConnectionAdapterInterface {
-    public function __construct( $_srv, $_db, $_usr, $_pass);
-    public function query( $_query );
-    public function queryFetch( $_query );
-    public function queryArray( $_query );
-    public function queryInsert( $_query );
+    public function __construct($_srv, $_db, $_usr, $_pass);
+    public function query($_query);
+    public function queryFetch($_query);
+    public function queryArray($_query);
+    public function queryInsert($_query);
   }
 ?>

dist/jate/functions/block.php

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

Doc Comments +3 added lines

@@ -36,6 +36,9 @@
     return $temp;
   }
 
+  /**
+   * @param string $_type
+   */
   function jBlockFileMan( $_path, $_type, $_parameters = [] ) {
     try {
       $temp = Parser::parseFileMan($_path, $_parameters, $_type);

Indentation +38 added lines, -38 removed lines

@@ -2,64 +2,64 @@
   jRequire("../modules/Parser/Parser.php");
   jRequire("../modules/JException/JException.php");
   function jBlock() {
-    return ob_start();
+	return ob_start();
   }
 
   function jBlockClose( $_type = "html", $_parameters = [] ) {
-    return jBlockEnd($_type, $_parameters);
+	return jBlockEnd($_type, $_parameters);
   }
 
   function jBlockFile( $_path, $_parameters = [] ) {
-    try {
-      $temp = Parser::parseFile($_path, $_parameters);
-    } catch (Exception $e) {
-      throw new JException($e->getMessage(), 1);
-    }
-    return $temp;
+	try {
+	  $temp = Parser::parseFile($_path, $_parameters);
+	} catch (Exception $e) {
+	  throw new JException($e->getMessage(), 1);
+	}
+	return $temp;
   }
 
   function view( $_path, $_parameters = [] ) {
-    try {
-      $temp = jBlockFile("bundles/views/$_path", $_parameters);
-    } catch (Exception $e) {
-      throw new JException($e->getMessage(), 1);
-    }
-    return $temp;
+	try {
+	  $temp = jBlockFile("bundles/views/$_path", $_parameters);
+	} catch (Exception $e) {
+	  throw new JException($e->getMessage(), 1);
+	}
+	return $temp;
   }
 
   function sql( $_path, $_parameters = [] ) {
-    try {
-      $temp = jBlockFileMan("bundles/sql/$_path", "sql", $_parameters);
-    } catch (Exception $e) {
-      throw new JException($e->getMessage(), 1);
-    }
-    return $temp;
+	try {
+	  $temp = jBlockFileMan("bundles/sql/$_path", "sql", $_parameters);
+	} catch (Exception $e) {
+	  throw new JException($e->getMessage(), 1);
+	}
+	return $temp;
   }
 
   function jBlockFileMan( $_path, $_type, $_parameters = [] ) {
-    try {
-      $temp = Parser::parseFileMan($_path, $_parameters, $_type);
-    } catch (Exception $e) {
-      throw new JException($e->getMessage(), 1);
-    }
-    return $temp;
+	try {
+	  $temp = Parser::parseFileMan($_path, $_parameters, $_type);
+	} catch (Exception $e) {
+	  throw new JException($e->getMessage(), 1);
+	}
+	return $temp;
   }
 
   function jBlockEnd( $_type = "html", $_parameters = [] ) {
-    $text = ob_get_clean();
-    try {
-      $temp = Parser::parseText($text, $_parameters, $_type);
-    } catch (Exception $e) {
-      throw new JException($e->getMessage(), 1);
-    }
-    return $temp;
+	$text = ob_get_clean();
+	try {
+	  $temp = Parser::parseText($text, $_parameters, $_type);
+	} catch (Exception $e) {
+	  throw new JException($e->getMessage(), 1);
+	}
+	return $temp;
   }
 
   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));
-    return utf8_encode($_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));
+	return utf8_encode($_buffer);
   }
 ?>

Spacing +9 added lines, -9 removed lines

@@ -5,11 +5,11 @@ 
     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 = []) {
     try {
       $temp = Parser::parseFile($_path, $_parameters);
     } catch (Exception $e) {
@@ -18,7 +18,7 @@ 
     return $temp;
   }
 
-  function view( $_path, $_parameters = [] ) {
+  function view($_path, $_parameters = []) {
     try {
       $temp = jBlockFile("bundles/views/$_path", $_parameters);
     } catch (Exception $e) {
@@ -27,7 +27,7 @@ 
     return $temp;
   }
 
-  function sql( $_path, $_parameters = [] ) {
+  function sql($_path, $_parameters = []) {
     try {
       $temp = jBlockFileMan("bundles/sql/$_path", "sql", $_parameters);
     } catch (Exception $e) {
@@ -36,7 +36,7 @@ 
     return $temp;
   }
 
-  function jBlockFileMan( $_path, $_type, $_parameters = [] ) {
+  function jBlockFileMan($_path, $_type, $_parameters = []) {
     try {
       $temp = Parser::parseFileMan($_path, $_parameters, $_type);
     } catch (Exception $e) {
@@ -45,7 +45,7 @@ 
     return $temp;
   }
 
-  function jBlockEnd( $_type = "html", $_parameters = [] ) {
+  function jBlockEnd($_type = "html", $_parameters = []) {
     $text = ob_get_clean();
     try {
       $temp = Parser::parseText($text, $_parameters, $_type);
@@ -56,9 +56,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);
   }

dist/jate.php

Indentation +13 added lines, -13 removed lines

@@ -1,21 +1,21 @@
 <?php
   if(!isset($GLOBALS["JATEPath"]))
-    $GLOBALS["JATEPath"] = [];
+	$GLOBALS["JATEPath"] = [];
   $commonLocations = [
-      "bower_components/JATE/dist/"
-    , "vendor/xaberr/jate/dist/"
-    , "../../dist/"
-    , "../dist/"
-    , dirname(__FILE__)."/"
+	  "bower_components/JATE/dist/"
+	, "vendor/xaberr/jate/dist/"
+	, "../../dist/"
+	, "../dist/"
+	, dirname(__FILE__)."/"
   ];
   $jSuccess = false;
   foreach ($commonLocations as $path)
-    if(file_exists("${path}jate/coreEngine.php")) {
-      array_push($GLOBALS["JATEPath"], $path);
-      require_once("${path}jate/coreEngine.php");
-      $jSuccess = true;
-      break;
-    }
+	if(file_exists("${path}jate/coreEngine.php")) {
+	  array_push($GLOBALS["JATEPath"], $path);
+	  require_once("${path}jate/coreEngine.php");
+	  $jSuccess = true;
+	  break;
+	}
   if( !$jSuccess )
-    throw new Exception("JATE can't find coreEngine.php.");
+	throw new Exception("JATE can't find coreEngine.php.");
 ?>

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-  if(!isset($GLOBALS["JATEPath"]))
+  if (!isset($GLOBALS["JATEPath"]))
     $GLOBALS["JATEPath"] = [];
   $commonLocations = [
       "bower_components/JATE/dist/"
@@ -10,12 +10,12 @@ 
   ];
   $jSuccess = false;
   foreach ($commonLocations as $path)
-    if(file_exists("${path}jate/coreEngine.php")) {
+    if (file_exists("${path}jate/coreEngine.php")) {
       array_push($GLOBALS["JATEPath"], $path);
       require_once("${path}jate/coreEngine.php");
       $jSuccess = true;
       break;
     }
-  if( !$jSuccess )
+  if (!$jSuccess)
     throw new Exception("JATE can't find coreEngine.php.");
 ?>

Braces +10 added lines, -7 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-  if(!isset($GLOBALS["JATEPath"]))
-    $GLOBALS["JATEPath"] = [];
+  if(!isset($GLOBALS["JATEPath"])) {
+      $GLOBALS["JATEPath"] = [];
+  }
   $commonLocations = [
       "bower_components/JATE/dist/"
     , "vendor/xaberr/jate/dist/"
@@ -9,13 +10,15 @@ 
     , dirname(__FILE__)."/"
   ];
   $jSuccess = false;
-  foreach ($commonLocations as $path)
-    if(file_exists("${path}jate/coreEngine.php")) {
+  foreach ($commonLocations as $path) {
+      if(file_exists("${path}jate/coreEngine.php")) {
       array_push($GLOBALS["JATEPath"], $path);
+  }
       require_once("${path}jate/coreEngine.php");
       $jSuccess = true;
       break;
     }
-  if( !$jSuccess )
-    throw new Exception("JATE can't find coreEngine.php.");
-?>
+  if( !$jSuccess ) {
+      throw new Exception("JATE can't find coreEngine.php.");
+  }
+  ?>

dist/jate/functions/requirer.php

Doc Comments +11 added lines

@@ -1,4 +1,7 @@ 
 <?php
+  /**
+   * @param string $_path
+   */
   function requireComponent( $_path, $_local = true ) {
     $path = getJFolder($_path, $_local, debug_backtrace());
     if(file_exists($path) && isPhp($path))
@@ -26,6 +29,10 @@ 
     $info = pathinfo($_file);
     return ($info["extension"] == "php") || ($info["extension"] == "PHP");
   }
+
+  /**
+   * @param string $_path
+   */
   function requireModules( $_path, $_local = true ) {
     $path = getJFolder($_path, $_local, debug_backtrace());
     $subFolders = subFolderDir($path);
@@ -36,6 +43,10 @@ 
     $path = getJFolder($_path, $_local, debug_backtrace());
     require_once( $path );
   }
+
+  /**
+   * @param boolean $_local
+   */
   function getJFolder( $_path, $_local, $_stack ) {
     if($_local) {
       $stackInfo = $_stack;

Indentation +46 added lines, -46 removed lines

@@ -1,64 +1,64 @@
 <?php
   function requireComponent( $_path, $_local = true ) {
-    $path = getJFolder($_path, $_local, debug_backtrace());
-    if(file_exists($path) && isPhp($path))
-      jRequire($path, false, 0);
-    else
-      requireError($_path);
+	$path = getJFolder($_path, $_local, debug_backtrace());
+	if(file_exists($path) && isPhp($path))
+	  jRequire($path, false, 0);
+	else
+	  requireError($_path);
   }
   function requireComponents( $_path, $_local = true ) {
-    $path = getJFolder($_path, $_local, debug_backtrace());
-    if(file_exists($path)) {
-      $files = subFolderFile($path);
-      foreach ($files as $i)
-        if(isPhp("$path/$i"))
-          requireComponent($path."/".$i, false);
-    } else
-      requireError($_path);
+	$path = getJFolder($_path, $_local, debug_backtrace());
+	if(file_exists($path)) {
+	  $files = subFolderFile($path);
+	  foreach ($files as $i)
+		if(isPhp("$path/$i"))
+		  requireComponent($path."/".$i, false);
+	} else
+	  requireError($_path);
   }
   function requireError( $_path ) {
-    global $DEBUG;
-    if( $DEBUG == 1 )
-      echo "Error load ($_path)<br>";
+	global $DEBUG;
+	if( $DEBUG == 1 )
+	  echo "Error load ($_path)<br>";
   }
   function isPhp ( $_file ) {
-    if(!is_file($_file)) return false;
-    $info = pathinfo($_file);
-    return ($info["extension"] == "php") || ($info["extension"] == "PHP");
+	if(!is_file($_file)) return false;
+	$info = pathinfo($_file);
+	return ($info["extension"] == "php") || ($info["extension"] == "PHP");
   }
   function requireModules( $_path, $_local = true ) {
-    $path = getJFolder($_path, $_local, debug_backtrace());
-    $subFolders = subFolderDir($path);
-    foreach ($subFolders as $i)
-      requireComponents("$path/$i", false);
+	$path = getJFolder($_path, $_local, debug_backtrace());
+	$subFolders = subFolderDir($path);
+	foreach ($subFolders as $i)
+	  requireComponents("$path/$i", false);
   }
   function jRequire( $_path, $_local = true ) {
-    $path = getJFolder($_path, $_local, debug_backtrace());
-    require_once( $path );
+	$path = getJFolder($_path, $_local, debug_backtrace());
+	require_once( $path );
   }
   function getJFolder( $_path, $_local, $_stack ) {
-    if($_local) {
-      $stackInfo = $_stack;
-      $folder = dirname($stackInfo[0]["file"]);
-      $file = "$folder/$_path";
-    } else
-      $file = $_path;
-    return $file;
+	if($_local) {
+	  $stackInfo = $_stack;
+	  $folder = dirname($stackInfo[0]["file"]);
+	  $file = "$folder/$_path";
+	} else
+	  $file = $_path;
+	return $file;
   }
   function requireModulesList( $_path ) {
-    if(!file_exists($_path))
-      return;
-    $data = file_get_contents($_path);
-    $data = json_decode($data);
-    if($data === NULL)
-      throw new Exception("Error in the file format [$_path]", 1);
-    foreach ($data as $item) {
-      if(substr($item, -1) == "*")
-        requireModules(substr($item, 0, -2), false);
-      else {
-        $path = getJFolder($item, false, debug_backtrace());
-        requireComponents("$path", false);
-      }
-    }
+	if(!file_exists($_path))
+	  return;
+	$data = file_get_contents($_path);
+	$data = json_decode($data);
+	if($data === NULL)
+	  throw new Exception("Error in the file format [$_path]", 1);
+	foreach ($data as $item) {
+	  if(substr($item, -1) == "*")
+		requireModules(substr($item, 0, -2), false);
+	  else {
+		$path = getJFolder($item, false, debug_backtrace());
+		requireComponents("$path", false);
+	  }
+	}
   }
 ?>

Spacing +18 added lines, -18 removed lines

@@ -1,43 +1,43 @@ 
 <?php
-  function requireComponent( $_path, $_local = true ) {
+  function requireComponent($_path, $_local = true) {
     $path = getJFolder($_path, $_local, debug_backtrace());
-    if(file_exists($path) && isPhp($path))
+    if (file_exists($path) && isPhp($path))
       jRequire($path, false, 0);
     else
       requireError($_path);
   }
-  function requireComponents( $_path, $_local = true ) {
+  function requireComponents($_path, $_local = true) {
     $path = getJFolder($_path, $_local, debug_backtrace());
-    if(file_exists($path)) {
+    if (file_exists($path)) {
       $files = subFolderFile($path);
       foreach ($files as $i)
-        if(isPhp("$path/$i"))
+        if (isPhp("$path/$i"))
           requireComponent($path."/".$i, false);
     } else
       requireError($_path);
   }
-  function requireError( $_path ) {
+  function requireError($_path) {
     global $DEBUG;
-    if( $DEBUG == 1 )
+    if ($DEBUG == 1)
       echo "Error load ($_path)<br>";
   }
-  function isPhp ( $_file ) {
-    if(!is_file($_file)) return false;
+  function isPhp($_file) {
+    if (!is_file($_file)) return false;
     $info = pathinfo($_file);
     return ($info["extension"] == "php") || ($info["extension"] == "PHP");
   }
-  function requireModules( $_path, $_local = true ) {
+  function requireModules($_path, $_local = true) {
     $path = getJFolder($_path, $_local, debug_backtrace());
     $subFolders = subFolderDir($path);
     foreach ($subFolders as $i)
       requireComponents("$path/$i", false);
   }
-  function jRequire( $_path, $_local = true ) {
+  function jRequire($_path, $_local = true) {
     $path = getJFolder($_path, $_local, debug_backtrace());
-    require_once( $path );
+    require_once($path);
   }
-  function getJFolder( $_path, $_local, $_stack ) {
-    if($_local) {
+  function getJFolder($_path, $_local, $_stack) {
+    if ($_local) {
       $stackInfo = $_stack;
       $folder = dirname($stackInfo[0]["file"]);
       $file = "$folder/$_path";
@@ -45,15 +45,15 @@ 
       $file = $_path;
     return $file;
   }
-  function requireModulesList( $_path ) {
-    if(!file_exists($_path))
+  function requireModulesList($_path) {
+    if (!file_exists($_path))
       return;
     $data = file_get_contents($_path);
     $data = json_decode($data);
-    if($data === NULL)
+    if ($data === NULL)
       throw new Exception("Error in the file format [$_path]", 1);
     foreach ($data as $item) {
-      if(substr($item, -1) == "*")
+      if (substr($item, -1) == "*")
         requireModules(substr($item, 0, -2), false);
       else {
         $path = getJFolder($item, false, debug_backtrace());

Braces +32 added lines, -22 removed lines

@@ -1,36 +1,43 @@ 
 <?php
   function requireComponent( $_path, $_local = true ) {
     $path = getJFolder($_path, $_local, debug_backtrace());
-    if(file_exists($path) && isPhp($path))
-      jRequire($path, false, 0);
-    else
-      requireError($_path);
+    if(file_exists($path) && isPhp($path)) {
+          jRequire($path, false, 0);
+    } else {
+          requireError($_path);
+    }
   }
   function requireComponents( $_path, $_local = true ) {
     $path = getJFolder($_path, $_local, debug_backtrace());
     if(file_exists($path)) {
       $files = subFolderFile($path);
-      foreach ($files as $i)
-        if(isPhp("$path/$i"))
+      foreach ($files as $i) {
+              if(isPhp("$path/$i"))
           requireComponent($path."/".$i, false);
-    } else
-      requireError($_path);
+      }
+    } else {
+          requireError($_path);
+    }
   }
   function requireError( $_path ) {
     global $DEBUG;
-    if( $DEBUG == 1 )
-      echo "Error load ($_path)<br>";
+    if( $DEBUG == 1 ) {
+          echo "Error load ($_path)<br>";
+    }
   }
   function isPhp ( $_file ) {
-    if(!is_file($_file)) return false;
+    if(!is_file($_file)) {
+    	return false;
+    }
     $info = pathinfo($_file);
     return ($info["extension"] == "php") || ($info["extension"] == "PHP");
   }
   function requireModules( $_path, $_local = true ) {
     $path = getJFolder($_path, $_local, debug_backtrace());
     $subFolders = subFolderDir($path);
-    foreach ($subFolders as $i)
-      requireComponents("$path/$i", false);
+    foreach ($subFolders as $i) {
+          requireComponents("$path/$i", false);
+    }
   }
   function jRequire( $_path, $_local = true ) {
     $path = getJFolder($_path, $_local, debug_backtrace());
@@ -41,21 +48,24 @@ 
       $stackInfo = $_stack;
       $folder = dirname($stackInfo[0]["file"]);
       $file = "$folder/$_path";
-    } else
-      $file = $_path;
+    } else {
+          $file = $_path;
+    }
     return $file;
   }
   function requireModulesList( $_path ) {
-    if(!file_exists($_path))
-      return;
+    if(!file_exists($_path)) {
+          return;
+    }
     $data = file_get_contents($_path);
     $data = json_decode($data);
-    if($data === NULL)
-      throw new Exception("Error in the file format [$_path]", 1);
+    if($data === NULL) {
+          throw new Exception("Error in the file format [$_path]", 1);
+    }
     foreach ($data as $item) {
-      if(substr($item, -1) == "*")
-        requireModules(substr($item, 0, -2), false);
-      else {
+      if(substr($item, -1) == "*") {
+              requireModules(substr($item, 0, -2), false);
+      } else {
         $path = getJFolder($item, false, debug_backtrace());
         requireComponents("$path", false);
       }

dist/jate/functions/errorHandler.php

Doc Comments +3 added lines

@@ -1,4 +1,7 @@
 <?php
+  /**
+   * @param integer $number
+   */
   function jateErrorHandler($number, $message, $file, $line) {
     if (!(error_reporting() & $number)) {
       return false;

Indentation +12 added lines, -12 removed lines

@@ -1,11 +1,11 @@ 
 <?php
   function jateErrorHandler($number, $message, $file, $line) {
-    if (!(error_reporting() & $number)) {
-      return false;
-    }
-    ob_end_clean();
-    $message = JException::decode($message);
-    echo "
+	if (!(error_reporting() & $number)) {
+	  return false;
+	}
+	ob_end_clean();
+	$message = JException::decode($message);
+	echo "
     <div id='jate-body'>
       <div id='jate-error'>
         <header>
@@ -54,14 +54,14 @@ 
       }
     </style>
     ";
-    exit(1);
-    return true;
+	exit(1);
+	return true;
   }
   function fatalErrorShutdownHandler() {
-    $last_error = error_get_last();
-    if ($last_error['type'] === E_ERROR) {
-      jateErrorHandler(E_ERROR, $last_error['message'], $last_error['file'], $last_error['line']);
-    }
+	$last_error = error_get_last();
+	if ($last_error['type'] === E_ERROR) {
+	  jateErrorHandler(E_ERROR, $last_error['message'], $last_error['file'], $last_error['line']);
+	}
   }
   set_error_handler('jateErrorHandler');
   register_shutdown_function('fatalErrorShutdownHandler');

dist/jate/modules/File/File.php

Doc Comments +4 added lines

@@ -47,6 +47,10 @@
       if(!(file_exists($_file) || $this->isCorrectUrl($_file)))
         throw new JException("File [$_file] not found.");
     }
+
+    /**
+     * @param string $_url
+     */
     protected function isCorrectUrl( $_url ) {
       return strpos(@get_headers($_url)[0],'200') === false ? false : true;
     }

Indentation +50 added lines, -50 removed lines

@@ -1,54 +1,54 @@
 <?php
   trait File {
-    private $files;
-    public function __construct() {
-      $this->files = [
-        "required" => [],
-        "attached" => []
-      ];
-    }
-    public function addFile( $_file ) {
-      try {
-      $this->isCorrectPath($_file);
-      } catch( Exception $e) {
-        throw new JException($e->getMessage());
-      }
-      $this->files["attached"][] = $_file;
-    }
-    public function addFileRequired( $_file ) {
-      try {
-        $this->isCorrectPath($_file);
-      } catch( Exception $e) {
-        throw new JException($e->getMessage());
-      }
-      $this->files["required"][] = $_file;
-    }
-    public function addFiles( $_files ) {
-      if(!is_array($_files))
-        throw new JException("Parameter must be an array.");
-      foreach ($_files as $value)
-        $this->addFile($value);
-    }
-    public function addFilesRequired( $_files ) {
-      if(!is_array($_files))
-        throw new JException("Parameter must be an array.");
-      foreach ($_files as $value)
-        $this->addFileRequired($value);
-    }
-    public function getFiles() {
-      return $this->files["attached"];
-    }
-    public function getFilesRequired() {
-      return $this->files["required"];
-    }
-    protected function isCorrectPath( $_file ) {
-      if(!is_string($_file))
-        throw new JException("Path must be a string.");
-      if(!(file_exists($_file) || $this->isCorrectUrl($_file)))
-        throw new JException("File [$_file] not found.");
-    }
-    protected function isCorrectUrl( $_url ) {
-      return strpos(@get_headers($_url)[0],'200') === false ? false : true;
-    }
+	private $files;
+	public function __construct() {
+	  $this->files = [
+		"required" => [],
+		"attached" => []
+	  ];
+	}
+	public function addFile( $_file ) {
+	  try {
+	  $this->isCorrectPath($_file);
+	  } catch( Exception $e) {
+		throw new JException($e->getMessage());
+	  }
+	  $this->files["attached"][] = $_file;
+	}
+	public function addFileRequired( $_file ) {
+	  try {
+		$this->isCorrectPath($_file);
+	  } catch( Exception $e) {
+		throw new JException($e->getMessage());
+	  }
+	  $this->files["required"][] = $_file;
+	}
+	public function addFiles( $_files ) {
+	  if(!is_array($_files))
+		throw new JException("Parameter must be an array.");
+	  foreach ($_files as $value)
+		$this->addFile($value);
+	}
+	public function addFilesRequired( $_files ) {
+	  if(!is_array($_files))
+		throw new JException("Parameter must be an array.");
+	  foreach ($_files as $value)
+		$this->addFileRequired($value);
+	}
+	public function getFiles() {
+	  return $this->files["attached"];
+	}
+	public function getFilesRequired() {
+	  return $this->files["required"];
+	}
+	protected function isCorrectPath( $_file ) {
+	  if(!is_string($_file))
+		throw new JException("Path must be a string.");
+	  if(!(file_exists($_file) || $this->isCorrectUrl($_file)))
+		throw new JException("File [$_file] not found.");
+	}
+	protected function isCorrectUrl( $_url ) {
+	  return strpos(@get_headers($_url)[0],'200') === false ? false : true;
+	}
   }
 ?>

Spacing +13 added lines, -13 removed lines

@@ -7,30 +7,30 @@ 
         "attached" => []
       ];
     }
-    public function addFile( $_file ) {
+    public function addFile($_file) {
       try {
       $this->isCorrectPath($_file);
-      } catch( Exception $e) {
+      } catch (Exception $e) {
         throw new JException($e->getMessage());
       }
       $this->files["attached"][] = $_file;
     }
-    public function addFileRequired( $_file ) {
+    public function addFileRequired($_file) {
       try {
         $this->isCorrectPath($_file);
-      } catch( Exception $e) {
+      } catch (Exception $e) {
         throw new JException($e->getMessage());
       }
       $this->files["required"][] = $_file;
     }
-    public function addFiles( $_files ) {
-      if(!is_array($_files))
+    public function addFiles($_files) {
+      if (!is_array($_files))
         throw new JException("Parameter must be an array.");
       foreach ($_files as $value)
         $this->addFile($value);
     }
-    public function addFilesRequired( $_files ) {
-      if(!is_array($_files))
+    public function addFilesRequired($_files) {
+      if (!is_array($_files))
         throw new JException("Parameter must be an array.");
       foreach ($_files as $value)
         $this->addFileRequired($value);
@@ -41,14 +41,14 @@ 
     public function getFilesRequired() {
       return $this->files["required"];
     }
-    protected function isCorrectPath( $_file ) {
-      if(!is_string($_file))
+    protected function isCorrectPath($_file) {
+      if (!is_string($_file))
         throw new JException("Path must be a string.");
-      if(!(file_exists($_file) || $this->isCorrectUrl($_file)))
+      if (!(file_exists($_file) || $this->isCorrectUrl($_file)))
         throw new JException("File [$_file] not found.");
     }
-    protected function isCorrectUrl( $_url ) {
-      return strpos(@get_headers($_url)[0],'200') === false ? false : true;
+    protected function isCorrectUrl($_url) {
+      return strpos(@get_headers($_url)[0], '200') === false ? false : true;
     }
   }
 ?>

Braces +18 added lines, -12 removed lines

@@ -24,16 +24,20 @@ 
       $this->files["required"][] = $_file;
     }
     public function addFiles( $_files ) {
-      if(!is_array($_files))
-        throw new JException("Parameter must be an array.");
-      foreach ($_files as $value)
-        $this->addFile($value);
+      if(!is_array($_files)) {
+              throw new JException("Parameter must be an array.");
+      }
+      foreach ($_files as $value) {
+              $this->addFile($value);
+      }
     }
     public function addFilesRequired( $_files ) {
-      if(!is_array($_files))
-        throw new JException("Parameter must be an array.");
-      foreach ($_files as $value)
-        $this->addFileRequired($value);
+      if(!is_array($_files)) {
+              throw new JException("Parameter must be an array.");
+      }
+      foreach ($_files as $value) {
+              $this->addFileRequired($value);
+      }
     }
     public function getFiles() {
       return $this->files["attached"];
@@ -42,10 +46,12 @@ 
       return $this->files["required"];
     }
     protected function isCorrectPath( $_file ) {
-      if(!is_string($_file))
-        throw new JException("Path must be a string.");
-      if(!(file_exists($_file) || $this->isCorrectUrl($_file)))
-        throw new JException("File [$_file] not found.");
+      if(!is_string($_file)) {
+              throw new JException("Path must be a string.");
+      }
+      if(!(file_exists($_file) || $this->isCorrectUrl($_file))) {
+              throw new JException("File [$_file] not found.");
+      }
     }
     protected function isCorrectUrl( $_url ) {
       return strpos(@get_headers($_url)[0],'200') === false ? false : true;

dist/jate/modules/Html/Html.php

Doc Comments +5 added lines

@@ -83,6 +83,11 @@
       $this->tags["js"]    = $this->getJs();
       $this->tags["jsVar"] = $this->getJsVars();
     }
+
+    /**
+     * @param string $_function
+     * @param string $_extenction
+     */
     protected function getRequire( $_function, $_extenction) {
       $temp = [];
       $filesRequired = $this->getFilesRequired();

Indentation +94 added lines, -94 removed lines

@@ -3,99 +3,99 @@
   requireComponent("../Module/Module.php");
   requireComponent("../JException/JException.php");
   abstract class Html extends Module {
-    public $template;
-    public $app;
-    public $page;
-    public $tags;
-    public $jsVars;
-    public function __construct() {
-      parent::__construct();
-      $this->template = "";
-      $this->app      = [];
-      $this->page     = [];
-      $this->jsVars   = [];
-      $this->tags     = [
-        "css"   => [],
-        "js"    => [],
-        "jsVar" => [],
-        "base"  => ""
-      ];
-    }
-    public function setParameters( $_parameters = [ "app" => null, "page" => null] ) {
-    $this->app  = $_parameters["app"];
-    $this->page = $_parameters["page"];
-    }
-    abstract public function init();
-    public function draw() {
-      if($this->template == "")
-        throw new JException("The variable \$this->template must be set in class $this->name function init().");
-      $server = new ServerVars();
-      $this->addDipendences();
-      $this->tags["css"]  = array_unique($this->tags["css"]);
-      $this->tags["js"]   = array_unique($this->tags["js"]);
-      $this->tags["base"] = $server->server["RELATIVE"]."/";
-      $this->stringifyDipendences();
-      return jBlockFile($this->template, $this->tags);
-    }
-    public function getCss() {
-      return $this->getRequire("getCss",".css");
-    }
-    public function getJs() {
-      return $this->getRequire("getJs",".js");
-    }
-    public function getJsVars() {
-      return $this->jsVars;
-    }
-    public function addJsVar( $_name, $_value ) {
-      if(!is_string($_name))
-        throw new InvalidArgumentException("Parameter name must be a string.");
-      if(!is_string($_value))
-        throw new InvalidArgumentException("Parameter value must be a string.");
-      $this->jsVars[] = [$_name, $_value];
-    }
-    public function addJsVars( $_array ) {
-      if(!is_array($_array))
-        throw new InvalidArgumentException("Parameter must be an array.");
-      foreach ($_array as $value)
-        $this->addJsVar($value[0], $value[1]);
-    }
-    protected function stringifyDipendences() {
-      $tempStr = "";
-      $timeParameter = "?t=".time();
-      $time = ($this->app->cache->css == true) ? "" : $timeParameter;
-      foreach ($this->tags["css"] as $i)
-      $tempStr .= "<link rel='stylesheet' href='$i$time'>";
-      $this->tags["css"] = $tempStr;
-      $tempStr = "";
-      $time = ($this->app->cache->js == true) ? "" : $timeParameter;
-      foreach ($this->tags["js"] as $i)
-      $tempStr .= "<script src='$i$time'></script>";
-      $this->tags["js"] = $tempStr;
-      $tempStr = "";
-      $tempStr .= "<script type='text/javascript'>";
-      foreach ($this->tags["jsVar"] as $i)
-      $tempStr .= " $i[0] = $i[1];\n";
-      $tempStr .= "</script>";
-      $this->tags["jsVar"] = $tempStr;
-    }
-    protected function addDipendences() {
-      $this->tags["css"]   = $this->getCss();
-      $this->tags["js"]    = $this->getJs();
-      $this->tags["jsVar"] = $this->getJsVars();
-    }
-    protected function getRequire( $_function, $_extenction) {
-      $temp = [];
-      $filesRequired = $this->getFilesRequired();
-      $files         = $this->getFiles();
-      foreach ($filesRequired as $i)
-        if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
-          $temp[] = $i;
-      foreach ($this->modules as $i)
-        $temp = array_merge( $temp, $i->$_function() );
-      foreach ($files as $i)
-        if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
-          $temp[] = $i;
-      return $temp;
-    }
+	public $template;
+	public $app;
+	public $page;
+	public $tags;
+	public $jsVars;
+	public function __construct() {
+	  parent::__construct();
+	  $this->template = "";
+	  $this->app      = [];
+	  $this->page     = [];
+	  $this->jsVars   = [];
+	  $this->tags     = [
+		"css"   => [],
+		"js"    => [],
+		"jsVar" => [],
+		"base"  => ""
+	  ];
+	}
+	public function setParameters( $_parameters = [ "app" => null, "page" => null] ) {
+	$this->app  = $_parameters["app"];
+	$this->page = $_parameters["page"];
+	}
+	abstract public function init();
+	public function draw() {
+	  if($this->template == "")
+		throw new JException("The variable \$this->template must be set in class $this->name function init().");
+	  $server = new ServerVars();
+	  $this->addDipendences();
+	  $this->tags["css"]  = array_unique($this->tags["css"]);
+	  $this->tags["js"]   = array_unique($this->tags["js"]);
+	  $this->tags["base"] = $server->server["RELATIVE"]."/";
+	  $this->stringifyDipendences();
+	  return jBlockFile($this->template, $this->tags);
+	}
+	public function getCss() {
+	  return $this->getRequire("getCss",".css");
+	}
+	public function getJs() {
+	  return $this->getRequire("getJs",".js");
+	}
+	public function getJsVars() {
+	  return $this->jsVars;
+	}
+	public function addJsVar( $_name, $_value ) {
+	  if(!is_string($_name))
+		throw new InvalidArgumentException("Parameter name must be a string.");
+	  if(!is_string($_value))
+		throw new InvalidArgumentException("Parameter value must be a string.");
+	  $this->jsVars[] = [$_name, $_value];
+	}
+	public function addJsVars( $_array ) {
+	  if(!is_array($_array))
+		throw new InvalidArgumentException("Parameter must be an array.");
+	  foreach ($_array as $value)
+		$this->addJsVar($value[0], $value[1]);
+	}
+	protected function stringifyDipendences() {
+	  $tempStr = "";
+	  $timeParameter = "?t=".time();
+	  $time = ($this->app->cache->css == true) ? "" : $timeParameter;
+	  foreach ($this->tags["css"] as $i)
+	  $tempStr .= "<link rel='stylesheet' href='$i$time'>";
+	  $this->tags["css"] = $tempStr;
+	  $tempStr = "";
+	  $time = ($this->app->cache->js == true) ? "" : $timeParameter;
+	  foreach ($this->tags["js"] as $i)
+	  $tempStr .= "<script src='$i$time'></script>";
+	  $this->tags["js"] = $tempStr;
+	  $tempStr = "";
+	  $tempStr .= "<script type='text/javascript'>";
+	  foreach ($this->tags["jsVar"] as $i)
+	  $tempStr .= " $i[0] = $i[1];\n";
+	  $tempStr .= "</script>";
+	  $this->tags["jsVar"] = $tempStr;
+	}
+	protected function addDipendences() {
+	  $this->tags["css"]   = $this->getCss();
+	  $this->tags["js"]    = $this->getJs();
+	  $this->tags["jsVar"] = $this->getJsVars();
+	}
+	protected function getRequire( $_function, $_extenction) {
+	  $temp = [];
+	  $filesRequired = $this->getFilesRequired();
+	  $files         = $this->getFiles();
+	  foreach ($filesRequired as $i)
+		if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
+		  $temp[] = $i;
+	  foreach ($this->modules as $i)
+		$temp = array_merge( $temp, $i->$_function() );
+	  foreach ($files as $i)
+		if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
+		  $temp[] = $i;
+	  return $temp;
+	}
   }
 ?>

Spacing +11 added lines, -11 removed lines

@@ -21,13 +21,13 @@ 
         "base"  => ""
       ];
     }
-    public function setParameters( $_parameters = [ "app" => null, "page" => null] ) {
+    public function setParameters($_parameters = ["app" => null, "page" => null]) {
     $this->app  = $_parameters["app"];
     $this->page = $_parameters["page"];
     }
     abstract public function init();
     public function draw() {
-      if($this->template == "")
+      if ($this->template == "")
         throw new JException("The variable \$this->template must be set in class $this->name function init().");
       $server = new ServerVars();
       $this->addDipendences();
@@ -38,23 +38,23 @@ 
       return jBlockFile($this->template, $this->tags);
     }
     public function getCss() {
-      return $this->getRequire("getCss",".css");
+      return $this->getRequire("getCss", ".css");
     }
     public function getJs() {
-      return $this->getRequire("getJs",".js");
+      return $this->getRequire("getJs", ".js");
     }
     public function getJsVars() {
       return $this->jsVars;
     }
-    public function addJsVar( $_name, $_value ) {
-      if(!is_string($_name))
+    public function addJsVar($_name, $_value) {
+      if (!is_string($_name))
         throw new InvalidArgumentException("Parameter name must be a string.");
-      if(!is_string($_value))
+      if (!is_string($_value))
         throw new InvalidArgumentException("Parameter value must be a string.");
       $this->jsVars[] = [$_name, $_value];
     }
-    public function addJsVars( $_array ) {
-      if(!is_array($_array))
+    public function addJsVars($_array) {
+      if (!is_array($_array))
         throw new InvalidArgumentException("Parameter must be an array.");
       foreach ($_array as $value)
         $this->addJsVar($value[0], $value[1]);
@@ -83,7 +83,7 @@ 
       $this->tags["js"]    = $this->getJs();
       $this->tags["jsVar"] = $this->getJsVars();
     }
-    protected function getRequire( $_function, $_extenction) {
+    protected function getRequire($_function, $_extenction) {
       $temp = [];
       $filesRequired = $this->getFilesRequired();
       $files         = $this->getFiles();
@@ -91,7 +91,7 @@ 
         if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
           $temp[] = $i;
       foreach ($this->modules as $i)
-        $temp = array_merge( $temp, $i->$_function() );
+        $temp = array_merge($temp, $i->$_function());
       foreach ($files as $i)
         if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
           $temp[] = $i;

Braces +33 added lines, -22 removed lines

@@ -27,8 +27,9 @@ 
     }
     abstract public function init();
     public function draw() {
-      if($this->template == "")
-        throw new JException("The variable \$this->template must be set in class $this->name function init().");
+      if($this->template == "") {
+              throw new JException("The variable \$this->template must be set in class $this->name function init().");
+      }
       $server = new ServerVars();
       $this->addDipendences();
       $this->tags["css"]  = array_unique($this->tags["css"]);
@@ -47,34 +48,41 @@ 
       return $this->jsVars;
     }
     public function addJsVar( $_name, $_value ) {
-      if(!is_string($_name))
-        throw new InvalidArgumentException("Parameter name must be a string.");
-      if(!is_string($_value))
-        throw new InvalidArgumentException("Parameter value must be a string.");
+      if(!is_string($_name)) {
+              throw new InvalidArgumentException("Parameter name must be a string.");
+      }
+      if(!is_string($_value)) {
+              throw new InvalidArgumentException("Parameter value must be a string.");
+      }
       $this->jsVars[] = [$_name, $_value];
     }
     public function addJsVars( $_array ) {
-      if(!is_array($_array))
-        throw new InvalidArgumentException("Parameter must be an array.");
-      foreach ($_array as $value)
-        $this->addJsVar($value[0], $value[1]);
+      if(!is_array($_array)) {
+              throw new InvalidArgumentException("Parameter must be an array.");
+      }
+      foreach ($_array as $value) {
+              $this->addJsVar($value[0], $value[1]);
+      }
     }
     protected function stringifyDipendences() {
       $tempStr = "";
       $timeParameter = "?t=".time();
       $time = ($this->app->cache->css == true) ? "" : $timeParameter;
-      foreach ($this->tags["css"] as $i)
-      $tempStr .= "<link rel='stylesheet' href='$i$time'>";
+      foreach ($this->tags["css"] as $i) {
+            $tempStr .= "<link rel='stylesheet' href='$i$time'>";
+      }
       $this->tags["css"] = $tempStr;
       $tempStr = "";
       $time = ($this->app->cache->js == true) ? "" : $timeParameter;
-      foreach ($this->tags["js"] as $i)
-      $tempStr .= "<script src='$i$time'></script>";
+      foreach ($this->tags["js"] as $i) {
+            $tempStr .= "<script src='$i$time'></script>";
+      }
       $this->tags["js"] = $tempStr;
       $tempStr = "";
       $tempStr .= "<script type='text/javascript'>";
-      foreach ($this->tags["jsVar"] as $i)
-      $tempStr .= " $i[0] = $i[1];\n";
+      foreach ($this->tags["jsVar"] as $i) {
+            $tempStr .= " $i[0] = $i[1];\n";
+      }
       $tempStr .= "</script>";
       $this->tags["jsVar"] = $tempStr;
     }
@@ -87,14 +95,17 @@ 
       $temp = [];
       $filesRequired = $this->getFilesRequired();
       $files         = $this->getFiles();
-      foreach ($filesRequired as $i)
-        if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
+      foreach ($filesRequired as $i) {
+              if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
           $temp[] = $i;
-      foreach ($this->modules as $i)
-        $temp = array_merge( $temp, $i->$_function() );
-      foreach ($files as $i)
-        if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
+      }
+      foreach ($this->modules as $i) {
+              $temp = array_merge( $temp, $i->$_function() );
+      }
+      foreach ($files as $i) {
+              if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
           $temp[] = $i;
+      }
       return $temp;
     }
   }