XaBerr / JATE

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

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

Spacing +7 added lines, -7 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 jBlockFileMan( $_path, $_type, $_parameters = [] ) {
+  function jBlockFileMan($_path, $_type, $_parameters = []) {
     try {
       $temp = Parser::parseFileMan($_path, $_parameters, $_type);
     } catch (Exception $e) {
@@ -27,7 +27,7 @@ 
     return $temp;
   }
 
-  function jBlockEnd( $_type = "html", $_parameters = [] ) {
+  function jBlockEnd($_type = "html", $_parameters = []) {
     $text = ob_get_clean();
     try {
       $temp = Parser::parseText($text, $_parameters, $_type);
@@ -38,9 +38,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/functions/folder.php

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.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

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

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

Spacing +4 added lines, -4 removed lines

@@ -4,11 +4,11 @@
 
   //JATE SUFF
   require_once     (end($GLOBALS["JATEPath"])."jate/functions/requirer.php");
-  requireComponent ("modules/JException/JException.php");
-  requireComponent ("functions/folder.php");
-  requireComponent ("modules/JConfig/JConfig.php");
+  requireComponent("modules/JException/JException.php");
+  requireComponent("functions/folder.php");
+  requireComponent("modules/JConfig/JConfig.php");
   requireComponents("functions");
-  requireModules   ("modules");
+  requireModules("modules");
 
   //USER STUFF
   requireModulesList("config/loader.json");

dist/jate/modules/Connection/Connection.php

Braces +6 added lines, -4 removed lines

@@ -4,8 +4,9 @@ 
     public $database;
     public $info;
     public function __construct( $_object ) {
-      if(!is_object($_object))
-        throw new InvalidArgumentException("Parameter must be an object.");
+      if(!is_object($_object)) {
+              throw new InvalidArgumentException("Parameter must be an object.");
+      }
       $this->setConnection(
         $_object->server,
         $_object->database,
@@ -33,9 +34,10 @@ 
     }
     protected function getConnectionType( $_type ) {
       $array = (array)$_type;
-      foreach ($array as $key => $value)
-        if($value)
+      foreach ($array as $key => $value) {
+              if($value)
           return $key;
+      }
       return "pdo";
     }
   }

Spacing +6 added lines, -6 removed lines

@@ -3,8 +3,8 @@ 
   class Connection {
     public $database;
     public $info;
-    public function __construct( $_object ) {
-      if(!is_object($_object))
+    public function __construct($_object) {
+      if (!is_object($_object))
         throw new InvalidArgumentException("Parameter must be an object.");
       $this->setConnection(
         $_object->server,
@@ -14,7 +14,7 @@ 
         $this->getConnectionType($_object->engine)
       );
     }
-    protected function setConnection ( $_srv, $_db, $_usr, $_pass, $_type ) {
+    protected function setConnection($_srv, $_db, $_usr, $_pass, $_type) {
       switch ($_type) {
         case "mysqli":
           $this->database = new MysqliAdapter($_srv, $_db, $_usr, $_pass);
@@ -38,10 +38,10 @@ 
         "type" => $_type
       ];
     }
-    protected function getConnectionType( $_type ) {
-      $array = (array)$_type;
+    protected function getConnectionType($_type) {
+      $array = (array) $_type;
       foreach ($array as $key => $value)
-        if($value)
+        if ($value)
           return $key;
       return "pdo";
     }

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

Spacing +9 added lines, -9 removed lines

@@ -2,35 +2,35 @@
   jRequire("ConnectionInterface.php");
   class PdoAdapter implements ConnectionAdapterInterface {
       public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
+      public function __construct($_srv, $_db, $_usr, $_pass) {
         try {
           $connection = "mysql:host=$_srv;dbname=$_db";
-          $this->connection = new PDO( $connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"] );
-        } catch( Exception $e ) {
+          $this->connection = new PDO($connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"]);
+        } catch (Exception $e) {
           throw new JException($e->getMessage());
         }
       }
-      public function query( $_query ) {
+      public function query($_query) {
         $this->stdQuery($_query);
         return true;
       }
-      public function queryInsert( $_query ) {
+      public function queryInsert($_query) {
         $this->stdQuery($_query);
         return $this->connection->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->connection;
         $query = $database->prepare($_query);
         $result = $query->execute();
-        if(!$result)
+        if (!$result)
           throw new JException(json_encode([
             "query" => $_query,
             "error" => [

Braces +3 added lines, -2 removed lines

@@ -30,14 +30,15 @@
         $database = $this->connection;
         $query = $database->prepare($_query);
         $result = $query->execute();
-        if(!$result)
-          throw new JException(json_encode([
+        if(!$result) {
+                  throw new JException(json_encode([
             "query" => $_query,
             "error" => [
               $query->errorInfo(),
               $database->errorInfo()
             ]
           ]));
+        }
         return $query;
       }
   }