XaBerr / JATE

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

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

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

Indentation +26 added lines, -26 removed lines

@@ -2,46 +2,46 @@
   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());
-    }
-    return $temp;
+	try {
+	  $temp = Parser::parseFile($_path, $_parameters);
+	} catch (Exception $e) {
+	  throw new JException($e->getMessage());
+	}
+	return $temp;
   }
 
   function jBlockFileMan( $_path, $_type, $_parameters = [] ) {
-    try {
-      $temp = Parser::parseFileMan($_path, $_parameters, $_type);
-    } catch (Exception $e) {
-      throw new JException($e->getMessage());
-    }
-    return $temp;
+	try {
+	  $temp = Parser::parseFileMan($_path, $_parameters, $_type);
+	} catch (Exception $e) {
+	  throw new JException($e->getMessage());
+	}
+	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());
-    }
-    return $temp;
+	$text = ob_get_clean();
+	try {
+	  $temp = Parser::parseText($text, $_parameters, $_type);
+	} catch (Exception $e) {
+	  throw new JException($e->getMessage());
+	}
+	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);
   }
 ?>

dist/jate/functions/folder.php

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

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

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.");
 ?>

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

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

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

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

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/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";
     }
   }

Indentation +44 added lines, -44 removed lines

@@ -1,49 +1,49 @@
 <?php
   requireComponents("Adapters");
   class Connection {
-    public $database;
-    public $info;
-    public function __construct( $_object ) {
-      if(!is_object($_object))
-        throw new InvalidArgumentException("Parameter must be an object.");
-      $this->setConnection(
-        $_object->server,
-        $_object->database,
-        $_object->user,
-        $_object->password,
-        $this->getConnectionType($_object->engine)
-      );
-    }
-    protected function setConnection ( $_srv, $_db, $_usr, $_pass, $_type ) {
-      switch ($_type) {
-        case "mysqli":
-          $this->database = new MysqliAdapter($_srv, $_db, $_usr, $_pass);
-        break;
-        case "postgresql":
-          $this->database = new PostgresqlAdapter($_srv, $_db, $_usr, $_pass);
-        break;
-        case "memory":
-          $this->database = new PdoMemoryAdapter($_srv, $_db, $_usr, $_pass);
-        break;
-        case "pdo":
-        default:
-          $this->database = new PdoAdapter($_srv, $_db, $_usr, $_pass);
-        break;
-      }
-      $this->info = [
-        "srv"  => $_srv,
-        "db"   => $_db,
-        "usr"  => $_usr,
-        "pass" => $_pass,
-        "type" => $_type
-      ];
-    }
-    protected function getConnectionType( $_type ) {
-      $array = (array)$_type;
-      foreach ($array as $key => $value)
-        if($value)
-          return $key;
-      return "pdo";
-    }
+	public $database;
+	public $info;
+	public function __construct( $_object ) {
+	  if(!is_object($_object))
+		throw new InvalidArgumentException("Parameter must be an object.");
+	  $this->setConnection(
+		$_object->server,
+		$_object->database,
+		$_object->user,
+		$_object->password,
+		$this->getConnectionType($_object->engine)
+	  );
+	}
+	protected function setConnection ( $_srv, $_db, $_usr, $_pass, $_type ) {
+	  switch ($_type) {
+		case "mysqli":
+		  $this->database = new MysqliAdapter($_srv, $_db, $_usr, $_pass);
+		break;
+		case "postgresql":
+		  $this->database = new PostgresqlAdapter($_srv, $_db, $_usr, $_pass);
+		break;
+		case "memory":
+		  $this->database = new PdoMemoryAdapter($_srv, $_db, $_usr, $_pass);
+		break;
+		case "pdo":
+		default:
+		  $this->database = new PdoAdapter($_srv, $_db, $_usr, $_pass);
+		break;
+	  }
+	  $this->info = [
+		"srv"  => $_srv,
+		"db"   => $_db,
+		"usr"  => $_usr,
+		"pass" => $_pass,
+		"type" => $_type
+	  ];
+	}
+	protected function getConnectionType( $_type ) {
+	  $array = (array)$_type;
+	  foreach ($array as $key => $value)
+		if($value)
+		  return $key;
+	  return "pdo";
+	}
   }
 ?>

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

Indentation +39 added lines, -39 removed lines

@@ -1,44 +1,44 @@
 <?php
   jRequire("ConnectionInterface.php");
   class PdoAdapter implements ConnectionAdapterInterface {
-      public $connection;
-      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 ) {
-          throw new JException($e->getMessage());
-        }
-      }
-      public function query( $_query ) {
-        $this->stdQuery($_query);
-        return true;
-      }
-      public function queryInsert( $_query ) {
-        $this->stdQuery($_query);
-        return $this->connection->lastInsertId();
-      }
-      public function queryFetch( $_query ) {
-        $temp = $this->stdQuery($_query);
-        return $temp->fetchAll(PDO::FETCH_ASSOC);
-      }
-      public function queryArray( $_query ) {
-        $temp = $this->stdQuery($_query);
-        return $temp->fetchAll(PDO::FETCH_COLUMN, 0);
-      }
-      protected function stdQuery( $_query ) {
-        $database = $this->connection;
-        $query = $database->prepare($_query);
-        $result = $query->execute();
-        if(!$result)
-          throw new JException(json_encode([
-            "query" => $_query,
-            "error" => [
-              $query->errorInfo(),
-              $database->errorInfo()
-            ]
-          ]));
-        return $query;
-      }
+	  public $connection;
+	  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 ) {
+		  throw new JException($e->getMessage());
+		}
+	  }
+	  public function query( $_query ) {
+		$this->stdQuery($_query);
+		return true;
+	  }
+	  public function queryInsert( $_query ) {
+		$this->stdQuery($_query);
+		return $this->connection->lastInsertId();
+	  }
+	  public function queryFetch( $_query ) {
+		$temp = $this->stdQuery($_query);
+		return $temp->fetchAll(PDO::FETCH_ASSOC);
+	  }
+	  public function queryArray( $_query ) {
+		$temp = $this->stdQuery($_query);
+		return $temp->fetchAll(PDO::FETCH_COLUMN, 0);
+	  }
+	  protected function stdQuery( $_query ) {
+		$database = $this->connection;
+		$query = $database->prepare($_query);
+		$result = $query->execute();
+		if(!$result)
+		  throw new JException(json_encode([
+			"query" => $_query,
+			"error" => [
+			  $query->errorInfo(),
+			  $database->errorInfo()
+			]
+		  ]));
+		return $query;
+	  }
   }
 ?>

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

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

Indentation +40 added lines, -40 removed lines

@@ -1,45 +1,45 @@
 <?php
   jRequire("ConnectionInterface.php");
   class MysqliAdapter implements ConnectionAdapterInterface {
-      public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
-        try {
-          $this->connection = new mysqli( $_srv, $_usr, $_pass, $_db );
-        } catch( Exception $e ) {
-          throw new JException($e->getMessage());
-        }
-      }
-      public function query( $_query ) {
-        $this->stdQuery($_query);
-        return true;
-      }
-      public function queryInsert( $_query ) {
-        $this->stdQuery($_query);
-        return $this->connection->insert_id;
-      }
-      public function queryFetch( $_query ) {
-        $result = $this->stdQuery($_query);
-        $rows = [];
-        while($row = $result->fetch_assoc())
-          $rows[] = $row;
-        return $rows;
-      }
-      public function queryArray( $_query ) {
-        $result = $this->stdQuery($_query);
-        $rows = [];
-        while($row = $result->fetch_array())
-          $rows[] = $row;
-        return $rows;
-      }
-      protected function stdQuery( $_query ) {
-        $database = $this->connection;
-        $result = $database->query($_query);
-        if(!$result)
-          throw new JException(json_encode([
-            "query" => $_query,
-            "error" => $database->error
-          ]));
-        return $result;
-      }
+	  public $connection;
+	  public function __construct( $_srv, $_db, $_usr, $_pass ) {
+		try {
+		  $this->connection = new mysqli( $_srv, $_usr, $_pass, $_db );
+		} catch( Exception $e ) {
+		  throw new JException($e->getMessage());
+		}
+	  }
+	  public function query( $_query ) {
+		$this->stdQuery($_query);
+		return true;
+	  }
+	  public function queryInsert( $_query ) {
+		$this->stdQuery($_query);
+		return $this->connection->insert_id;
+	  }
+	  public function queryFetch( $_query ) {
+		$result = $this->stdQuery($_query);
+		$rows = [];
+		while($row = $result->fetch_assoc())
+		  $rows[] = $row;
+		return $rows;
+	  }
+	  public function queryArray( $_query ) {
+		$result = $this->stdQuery($_query);
+		$rows = [];
+		while($row = $result->fetch_array())
+		  $rows[] = $row;
+		return $rows;
+	  }
+	  protected function stdQuery( $_query ) {
+		$database = $this->connection;
+		$result = $database->query($_query);
+		if(!$result)
+		  throw new JException(json_encode([
+			"query" => $_query,
+			"error" => $database->error
+		  ]));
+		return $result;
+	  }
   }
 ?>

Braces +9 added lines, -6 removed lines

@@ -20,25 +20,28 @@
       public function queryFetch( $_query ) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = $result->fetch_assoc())
-          $rows[] = $row;
+        while($row = $result->fetch_assoc()) {
+                  $rows[] = $row;
+        }
         return $rows;
       }
       public function queryArray( $_query ) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = $result->fetch_array())
-          $rows[] = $row;
+        while($row = $result->fetch_array()) {
+                  $rows[] = $row;
+        }
         return $rows;
       }
       protected function stdQuery( $_query ) {
         $database = $this->connection;
         $result = $database->query($_query);
-        if(!$result)
-          throw new JException(json_encode([
+        if(!$result) {
+                  throw new JException(json_encode([
             "query" => $_query,
             "error" => $database->error
           ]));
+        }
         return $result;
       }
   }