XaBerr / JATE

dist/jate/modules/WebApp/WebApp.php

Indentation +14 added lines, -14 removed lines

@@ -2,19 +2,19 @@
   jRequire("../Router/Router.php");
   jRequire("../JConfig/JConfig.php");
   class WebApp {
-    private $router;
-    private $misc;
-    public function __construct() {
-      $configPath   = "config";
-      $this->misc   = new JConfig("$configPath/app.json");
-      $this->router = new Router("$configPath/router.json", $this->misc->urlCaseSensitive);
-    }
-    public function draw() {
-      $pageSelected = $this->router->getPage();
-      $currentPage = new $pageSelected[0]();
-      $currentPage->setParameters(["app" => $this->misc, "page" => $pageSelected[1]]);
-      $currentPage->init();
-      echo minifyOutput($currentPage->draw());
-    }
+	private $router;
+	private $misc;
+	public function __construct() {
+	  $configPath   = "config";
+	  $this->misc   = new JConfig("$configPath/app.json");
+	  $this->router = new Router("$configPath/router.json", $this->misc->urlCaseSensitive);
+	}
+	public function draw() {
+	  $pageSelected = $this->router->getPage();
+	  $currentPage = new $pageSelected[0]();
+	  $currentPage->setParameters(["app" => $this->misc, "page" => $pageSelected[1]]);
+	  $currentPage->init();
+	  echo minifyOutput($currentPage->draw());
+	}
   }
 ?>

dist/jate/modules/Router/Router.php

Indentation +58 added lines, -58 removed lines

@@ -1,63 +1,63 @@
 <?php
   requireComponent("../ServerVars/ServerVars.php");
   class Router {
-    protected $url;
-    protected $pages;
-    protected $defaultPage;
-    protected $urlCaseSensitive;
-    public function __construct( $_path, $_urlCaseSensitive = false ) {
-      if(!is_string($_path))
-        throw new JException("Parameter must be a string.");
-      $jConfig   = new JConfig($_path);
-      $server    = new ServerVars();
-      $request   = $server->server["REQUEST_URI"];
-      $base      = $server->server["RELATIVE"];
-      $url       = str_replace($base, "", $request);
-      $this->url = explode("/", $url);
-      $this->pages       = $jConfig->pages;
-      $this->defaultPage = $jConfig->defaultPage;
-      $this->urlCaseSensitive = $_urlCaseSensitive;
-    }
-    public function getPage() {
-      $parameters = [];
-      $pageSelected = null;
-      foreach ($this->pages as $page) {
-        $urlParameters = $this->pathSeeker(explode("/", $page[0]), $this->url);
-        if(is_array($urlParameters)) {
-          if(isset($page[2]) && is_array($page[2]))
-            $urlParameters = array_merge($urlParameters, $page[2]);
-          $pageSelected = [
-            $page[1],
-            $urlParameters
-          ];
-          break;
-        }
-      }
-      if( $pageSelected !== null )
-        return $pageSelected;
-      else
-        return $this->defaultPage;
-    }
-    protected function pathSeeker( $_path, $_url ) {
-      $urlLength = count($_url);
-      $cont = 0;
-      $variables = [];
-      $pathLength = count($_path);
-      if($urlLength == $pathLength) {
-        while($cont < $urlLength) {
-          if(
-            ($this->urlCaseSensitive && $_path[$cont] == $_url[$cont]) ||
-            (!$this->urlCaseSensitive && strtolower($_path[$cont]) == strtolower($_url[$cont])) )
-            $cont++;
-          else if( strpos($_path[$cont], "\$") !== false ) {
-            $variables[str_replace('$', "", $_path[$cont])] = $_url[$cont];
-            $cont++;
-          } else break;
-        }
-        if($cont == $urlLength)
-          return $variables;
-      }
-      return null;
-    }
+	protected $url;
+	protected $pages;
+	protected $defaultPage;
+	protected $urlCaseSensitive;
+	public function __construct( $_path, $_urlCaseSensitive = false ) {
+	  if(!is_string($_path))
+		throw new JException("Parameter must be a string.");
+	  $jConfig   = new JConfig($_path);
+	  $server    = new ServerVars();
+	  $request   = $server->server["REQUEST_URI"];
+	  $base      = $server->server["RELATIVE"];
+	  $url       = str_replace($base, "", $request);
+	  $this->url = explode("/", $url);
+	  $this->pages       = $jConfig->pages;
+	  $this->defaultPage = $jConfig->defaultPage;
+	  $this->urlCaseSensitive = $_urlCaseSensitive;
+	}
+	public function getPage() {
+	  $parameters = [];
+	  $pageSelected = null;
+	  foreach ($this->pages as $page) {
+		$urlParameters = $this->pathSeeker(explode("/", $page[0]), $this->url);
+		if(is_array($urlParameters)) {
+		  if(isset($page[2]) && is_array($page[2]))
+			$urlParameters = array_merge($urlParameters, $page[2]);
+		  $pageSelected = [
+			$page[1],
+			$urlParameters
+		  ];
+		  break;
+		}
+	  }
+	  if( $pageSelected !== null )
+		return $pageSelected;
+	  else
+		return $this->defaultPage;
+	}
+	protected function pathSeeker( $_path, $_url ) {
+	  $urlLength = count($_url);
+	  $cont = 0;
+	  $variables = [];
+	  $pathLength = count($_path);
+	  if($urlLength == $pathLength) {
+		while($cont < $urlLength) {
+		  if(
+			($this->urlCaseSensitive && $_path[$cont] == $_url[$cont]) ||
+			(!$this->urlCaseSensitive && strtolower($_path[$cont]) == strtolower($_url[$cont])) )
+			$cont++;
+		  else if( strpos($_path[$cont], "\$") !== false ) {
+			$variables[str_replace('$', "", $_path[$cont])] = $_url[$cont];
+			$cont++;
+		  } else break;
+		}
+		if($cont == $urlLength)
+		  return $variables;
+	  }
+	  return null;
+	}
   }
 ?>

Spacing +11 added lines, -11 removed lines

@@ -5,8 +5,8 @@ 
     protected $pages;
     protected $defaultPage;
     protected $urlCaseSensitive;
-    public function __construct( $_path, $_urlCaseSensitive = false ) {
-      if(!is_string($_path))
+    public function __construct($_path, $_urlCaseSensitive = false) {
+      if (!is_string($_path))
         throw new JException("Parameter must be a string.");
       $jConfig   = new JConfig($_path);
       $server    = new ServerVars();
@@ -23,8 +23,8 @@ 
       $pageSelected = null;
       foreach ($this->pages as $page) {
         $urlParameters = $this->pathSeeker(explode("/", $page[0]), $this->url);
-        if(is_array($urlParameters)) {
-          if(isset($page[2]) && is_array($page[2]))
+        if (is_array($urlParameters)) {
+          if (isset($page[2]) && is_array($page[2]))
             $urlParameters = array_merge($urlParameters, $page[2]);
           $pageSelected = [
             $page[1],
@@ -33,28 +33,28 @@ 
           break;
         }
       }
-      if( $pageSelected !== null )
+      if ($pageSelected !== null)
         return $pageSelected;
       else
         return $this->defaultPage;
     }
-    protected function pathSeeker( $_path, $_url ) {
+    protected function pathSeeker($_path, $_url) {
       $urlLength = count($_url);
       $cont = 0;
       $variables = [];
       $pathLength = count($_path);
-      if($urlLength == $pathLength) {
-        while($cont < $urlLength) {
-          if(
+      if ($urlLength == $pathLength) {
+        while ($cont < $urlLength) {
+          if (
             ($this->urlCaseSensitive && $_path[$cont] == $_url[$cont]) ||
             (!$this->urlCaseSensitive && strtolower($_path[$cont]) == strtolower($_url[$cont])) )
             $cont++;
-          else if( strpos($_path[$cont], "\$") !== false ) {
+          else if (strpos($_path[$cont], "\$") !== false) {
             $variables[str_replace('$', "", $_path[$cont])] = $_url[$cont];
             $cont++;
           } else break;
         }
-        if($cont == $urlLength)
+        if ($cont == $urlLength)
           return $variables;
       }
       return null;

Braces +20 added lines, -14 removed lines

@@ -6,8 +6,9 @@ 
     protected $defaultPage;
     protected $urlCaseSensitive;
     public function __construct( $_path, $_urlCaseSensitive = false ) {
-      if(!is_string($_path))
-        throw new JException("Parameter must be a string.");
+      if(!is_string($_path)) {
+              throw new JException("Parameter must be a string.");
+      }
       $jConfig   = new JConfig($_path);
       $server    = new ServerVars();
       $request   = $server->server["REQUEST_URI"];
@@ -24,8 +25,9 @@ 
       foreach ($this->pages as $page) {
         $urlParameters = $this->pathSeeker(explode("/", $page[0]), $this->url);
         if(is_array($urlParameters)) {
-          if(isset($page[2]) && is_array($page[2]))
-            $urlParameters = array_merge($urlParameters, $page[2]);
+          if(isset($page[2]) && is_array($page[2])) {
+                      $urlParameters = array_merge($urlParameters, $page[2]);
+          }
           $pageSelected = [
             $page[1],
             $urlParameters
@@ -33,10 +35,11 @@ 
           break;
         }
       }
-      if( $pageSelected !== null )
-        return $pageSelected;
-      else
-        return $this->defaultPage;
+      if( $pageSelected !== null ) {
+              return $pageSelected;
+      } else {
+              return $this->defaultPage;
+      }
     }
     protected function pathSeeker( $_path, $_url ) {
       $urlLength = count($_url);
@@ -47,15 +50,18 @@ 
         while($cont < $urlLength) {
           if(
             ($this->urlCaseSensitive && $_path[$cont] == $_url[$cont]) ||
-            (!$this->urlCaseSensitive && strtolower($_path[$cont]) == strtolower($_url[$cont])) )
-            $cont++;
-          else if( strpos($_path[$cont], "\$") !== false ) {
+            (!$this->urlCaseSensitive && strtolower($_path[$cont]) == strtolower($_url[$cont])) ) {
+                      $cont++;
+          } else if( strpos($_path[$cont], "\$") !== false ) {
             $variables[str_replace('$', "", $_path[$cont])] = $_url[$cont];
             $cont++;
-          } else break;
+          } else {
+          	break;
+          }
+        }
+        if($cont == $urlLength) {
+                  return $variables;
         }
-        if($cont == $urlLength)
-          return $variables;
       }
       return null;
     }

dist/jate/modules/JConfig/JConfig.php

Indentation +15 added lines, -15 removed lines

@@ -1,19 +1,19 @@
 <?php
   class JConfig {
-    public function __construct( $_path ) {
-      if(!is_string($_path))
-        throw new JException("Path must be a string.");
-      if(!file_exists($_path))
-        throw new JException("File [$_path] not found.");
-      $data = file_get_contents($_path);
-      $data = json_decode($data);
-      if($data === NULL)
-        throw new JException("Invalid file data. [$_path]");
-      if(is_object($data))
-        foreach (get_object_vars($data) as $key => $value)
-          $this->$key = $value;
-      if(is_array($data))
-        $this->data = $data;
-    }
+	public function __construct( $_path ) {
+	  if(!is_string($_path))
+		throw new JException("Path must be a string.");
+	  if(!file_exists($_path))
+		throw new JException("File [$_path] not found.");
+	  $data = file_get_contents($_path);
+	  $data = json_decode($data);
+	  if($data === NULL)
+		throw new JException("Invalid file data. [$_path]");
+	  if(is_object($data))
+		foreach (get_object_vars($data) as $key => $value)
+		  $this->$key = $value;
+	  if(is_array($data))
+		$this->data = $data;
+	}
   }
 ?>

Spacing +6 added lines, -6 removed lines

@@ -1,18 +1,18 @@
 <?php
   class JConfig {
-    public function __construct( $_path ) {
-      if(!is_string($_path))
+    public function __construct($_path) {
+      if (!is_string($_path))
         throw new JException("Path must be a string.");
-      if(!file_exists($_path))
+      if (!file_exists($_path))
         throw new JException("File [$_path] not found.");
       $data = file_get_contents($_path);
       $data = json_decode($data);
-      if($data === NULL)
+      if ($data === NULL)
         throw new JException("Invalid file data. [$_path]");
-      if(is_object($data))
+      if (is_object($data))
         foreach (get_object_vars($data) as $key => $value)
           $this->$key = $value;
-      if(is_array($data))
+      if (is_array($data))
         $this->data = $data;
     }
   }

Braces +15 added lines, -10 removed lines

@@ -1,19 +1,24 @@
 <?php
   class JConfig {
     public function __construct( $_path ) {
-      if(!is_string($_path))
-        throw new JException("Path must be a string.");
-      if(!file_exists($_path))
-        throw new JException("File [$_path] not found.");
+      if(!is_string($_path)) {
+              throw new JException("Path must be a string.");
+      }
+      if(!file_exists($_path)) {
+              throw new JException("File [$_path] not found.");
+      }
       $data = file_get_contents($_path);
       $data = json_decode($data);
-      if($data === NULL)
-        throw new JException("Invalid file data. [$_path]");
-      if(is_object($data))
-        foreach (get_object_vars($data) as $key => $value)
+      if($data === NULL) {
+              throw new JException("Invalid file data. [$_path]");
+      }
+      if(is_object($data)) {
+              foreach (get_object_vars($data) as $key => $value)
           $this->$key = $value;
-      if(is_array($data))
-        $this->data = $data;
+      }
+      if(is_array($data)) {
+              $this->data = $data;
+      }
     }
   }
 ?>

dist/jate/modules/Angular/Angular.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
   requireComponent("../Html/Html.php");
   class Angular extends Html {
-    public function init() {
-      header("Access-Control-Allow-Origin: *");
-      header("Content-Type: application/json; charset=UTF-8");
-    }
-    public function draw() {}
+	public function init() {
+	  header("Access-Control-Allow-Origin: *");
+	  header("Content-Type: application/json; charset=UTF-8");
+	}
+	public function draw() {}
   }
 ?>

dist/jate/modules/Connection/Connection.php

Doc Comments +4 added lines

@@ -3,6 +3,10 @@
   class Connection {
     public $database;
     public $info;
+
+    /**
+     * @param JConfig $_object
+     */
     public function __construct( $_object ) {
       if(!is_object($_object))
         throw new JException("Parameter must be an object.");

Indentation +47 added lines, -47 removed lines

@@ -1,52 +1,52 @@
 <?php
   requireComponents("Adapters");
   class Connection {
-    public $database;
-    public $info;
-    public function __construct( $_object ) {
-      if(!is_object($_object))
-        throw new JException("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 "pdo-sqlite-memory":
-          $this->database = new PdoAdapterSqLiteMemory($_srv, $_db, $_usr, $_pass);
-        break;
-        case "pdo-sqlite-file":
-          $this->database = new PdoAdapterSqLiteFile($_srv, $_db, $_usr, $_pass);
-        break;
-        case "pdo-mysql":
-        default:
-          $this->database = new PdoAdapterMysql($_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 "default";
-    }
+	public $database;
+	public $info;
+	public function __construct( $_object ) {
+	  if(!is_object($_object))
+		throw new JException("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 "pdo-sqlite-memory":
+		  $this->database = new PdoAdapterSqLiteMemory($_srv, $_db, $_usr, $_pass);
+		break;
+		case "pdo-sqlite-file":
+		  $this->database = new PdoAdapterSqLiteFile($_srv, $_db, $_usr, $_pass);
+		break;
+		case "pdo-mysql":
+		default:
+		  $this->database = new PdoAdapterMysql($_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 "default";
+	}
   }
 ?>

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 JException("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);
@@ -41,10 +41,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 "default";
     }

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 JException("Parameter must be an object.");
+      if(!is_object($_object)) {
+              throw new JException("Parameter must be an object.");
+      }
       $this->setConnection(
         $_object->server,
         $_object->database,
@@ -43,9 +44,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 "default";
     }
   }

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

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
   jRequire("PdoAdapterMysql.php");
   class PdoAdapterSqLiteMemory extends PdoAdapterMysql {
-      public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
-        try {
-          $this->connection = new PDO("sqlite::memory:");
-        } catch( Exception $e ) {
-          throw new JException($e->getMessage());
-        }
-      }
-      public function newTable( $_sql ) {
-        try {
-          $temp = $this->connection->exec($_sql);
-        } catch (Exception $e) {
-          throw new JException($e->getMessage());
-        }
-        return $temp;
-      }
+	  public $connection;
+	  public function __construct( $_srv, $_db, $_usr, $_pass ) {
+		try {
+		  $this->connection = new PDO("sqlite::memory:");
+		} catch( Exception $e ) {
+		  throw new JException($e->getMessage());
+		}
+	  }
+	  public function newTable( $_sql ) {
+		try {
+		  $temp = $this->connection->exec($_sql);
+		} catch (Exception $e) {
+		  throw new JException($e->getMessage());
+		}
+		return $temp;
+	  }
   }
 ?>

Spacing +3 added lines, -3 removed lines

@@ -2,14 +2,14 @@
   jRequire("PdoAdapterMysql.php");
   class PdoAdapterSqLiteMemory extends PdoAdapterMysql {
       public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
+      public function __construct($_srv, $_db, $_usr, $_pass) {
         try {
           $this->connection = new PDO("sqlite::memory:");
-        } catch( Exception $e ) {
+        } catch (Exception $e) {
           throw new JException($e->getMessage());
         }
       }
-      public function newTable( $_sql ) {
+      public function newTable($_sql) {
         try {
           $temp = $this->connection->exec($_sql);
         } catch (Exception $e) {

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

Indentation +39 added lines, -39 removed lines

@@ -1,44 +1,44 @@
 <?php
   jRequire("ConnectionInterface.php");
   class PdoAdapterMysql 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;
+	  }
   }
 ?>

Spacing +9 added lines, -9 removed lines

@@ -2,35 +2,35 @@
   jRequire("ConnectionInterface.php");
   class PdoAdapterMysql 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;
       }
   }

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

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
   jRequire("PdoAdapterMysql.php");
   class PdoAdapterSqLiteFile extends PdoAdapterMysql {
-      public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
-        try {
-          $this->connection = new PDO("sqlite:$_srv");
-        } catch( Exception $e ) {
-          throw new JException($e->getMessage());
-        }
-      }
-      public function newTable( $_sql ) {
-        try {
-          $temp = $this->connection->exec($_sql);
-        } catch (Exception $e) {
-          throw new JException($e->getMessage());
-        }
-        return $temp;
-      }
+	  public $connection;
+	  public function __construct( $_srv, $_db, $_usr, $_pass ) {
+		try {
+		  $this->connection = new PDO("sqlite:$_srv");
+		} catch( Exception $e ) {
+		  throw new JException($e->getMessage());
+		}
+	  }
+	  public function newTable( $_sql ) {
+		try {
+		  $temp = $this->connection->exec($_sql);
+		} catch (Exception $e) {
+		  throw new JException($e->getMessage());
+		}
+		return $temp;
+	  }
   }
 ?>

Spacing +3 added lines, -3 removed lines

@@ -2,14 +2,14 @@
   jRequire("PdoAdapterMysql.php");
   class PdoAdapterSqLiteFile extends PdoAdapterMysql {
       public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
+      public function __construct($_srv, $_db, $_usr, $_pass) {
         try {
           $this->connection = new PDO("sqlite:$_srv");
-        } catch( Exception $e ) {
+        } catch (Exception $e) {
           throw new JException($e->getMessage());
         }
       }
-      public function newTable( $_sql ) {
+      public function newTable($_sql) {
         try {
           $temp = $this->connection->exec($_sql);
         } catch (Exception $e) {

dist/jate/modules/Query/Query.php

Indentation +96 added lines, -96 removed lines

@@ -3,101 +3,101 @@
   jRequire("../JConfig/JConfig.php");
   jRequire("../Connection/Connection.php");
   trait Query {
-    public $connection;
-    public $currentConnection;
-    public function __construct() {
-      $this->connection = [];
-      $this->currentConnection = null;
-    }
-    public function addConnection( $_path, $_name = "default" ) {
-      if(!is_string($_path))
-        throw new JException("Parameter must be a string.", 1);
-      try {
-        $jConfig = new JConfig($_path);
-        if($jConfig->enable) {
-          $connection = new Connection($jConfig);
-          $this->addConnectionMan($connection, $_name);
-        }
-      } catch (Exception $e) {
-        throw new JException($e->getMessage(), 1);
-      }
-    }
-    public function addConnectionMan( $_connection, $_name = "default") {
-      if(!is_object($_connection) || !is_a($_connection, "Connection"))
-        throw new JException("Parameter must be a Connection object.", 1);
-      try {
-        $this->connection["$_name"] = $_connection;
-        $this->currentConnection = $_connection;
-      } catch (Exception $e) {
-        throw new JException($e->getMessage(), 1);
-      }
-    }
-    public function setConnection( $_name = "default" ) {
-      if(!is_string($_name))
-        throw new JException("Parameter must be a string.", 1);
-      if(!isset($this->connection["$_name"]))
-        throw new JException("This connection name does not exist.", 1);
-      $this->currentConnection = $this->connection["$_name"];
-    }
-    public function query( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
-        throw new JException("No connection selected.", 1);
-      try {
-        $temp = $this->currentConnection->database->query($_query);
-      } catch (Exception $e) {
-        throw new JException($e->getMessage(), 1);
-      }
-      return $temp;
-    }
-    public function queryInsert( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
-        throw new JException("No connection selected.", 1);
-      try {
-        $temp = $this->currentConnection->database->queryInsert($_query);
-      } catch (Exception $e) {
-        throw new JException($e->getMessage(), 1);
-      }
-      return $temp;
-    }
-    public function queryFetch( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
-        throw new JException("No connection selected.", 1);
-      try {
-        $temp = $this->currentConnection->database->queryFetch($_query);
-      } catch (Exception $e) {
-        throw new JException($e->getMessage(), 1);
-      }
-      return $temp;
-    }
-    public function queryArray( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
-        throw new JException("No connection selected.", 1);
-      try {
-        $temp = $this->currentConnection->database->queryArray($_query);
-      } catch (Exception $e) {
-        throw new JException($e->getMessage(), 1);
-      }
-      return $temp;
-    }
-    public function newTable( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
-        throw new JException("No connection selected.", 1);
-      try {
-        $temp = $this->currentConnection->database->newTable($_query);
-      } catch (Exception $e) {
-        throw new JException($e->getMessage(), 1);
-      }
-      return $temp;
-    }
+	public $connection;
+	public $currentConnection;
+	public function __construct() {
+	  $this->connection = [];
+	  $this->currentConnection = null;
+	}
+	public function addConnection( $_path, $_name = "default" ) {
+	  if(!is_string($_path))
+		throw new JException("Parameter must be a string.", 1);
+	  try {
+		$jConfig = new JConfig($_path);
+		if($jConfig->enable) {
+		  $connection = new Connection($jConfig);
+		  $this->addConnectionMan($connection, $_name);
+		}
+	  } catch (Exception $e) {
+		throw new JException($e->getMessage(), 1);
+	  }
+	}
+	public function addConnectionMan( $_connection, $_name = "default") {
+	  if(!is_object($_connection) || !is_a($_connection, "Connection"))
+		throw new JException("Parameter must be a Connection object.", 1);
+	  try {
+		$this->connection["$_name"] = $_connection;
+		$this->currentConnection = $_connection;
+	  } catch (Exception $e) {
+		throw new JException($e->getMessage(), 1);
+	  }
+	}
+	public function setConnection( $_name = "default" ) {
+	  if(!is_string($_name))
+		throw new JException("Parameter must be a string.", 1);
+	  if(!isset($this->connection["$_name"]))
+		throw new JException("This connection name does not exist.", 1);
+	  $this->currentConnection = $this->connection["$_name"];
+	}
+	public function query( $_query ) {
+	  if(!is_string($_query))
+		throw new JException("Parameter must be a string.", 1);
+	  if($this->currentConnection == null)
+		throw new JException("No connection selected.", 1);
+	  try {
+		$temp = $this->currentConnection->database->query($_query);
+	  } catch (Exception $e) {
+		throw new JException($e->getMessage(), 1);
+	  }
+	  return $temp;
+	}
+	public function queryInsert( $_query ) {
+	  if(!is_string($_query))
+		throw new JException("Parameter must be a string.", 1);
+	  if($this->currentConnection == null)
+		throw new JException("No connection selected.", 1);
+	  try {
+		$temp = $this->currentConnection->database->queryInsert($_query);
+	  } catch (Exception $e) {
+		throw new JException($e->getMessage(), 1);
+	  }
+	  return $temp;
+	}
+	public function queryFetch( $_query ) {
+	  if(!is_string($_query))
+		throw new JException("Parameter must be a string.", 1);
+	  if($this->currentConnection == null)
+		throw new JException("No connection selected.", 1);
+	  try {
+		$temp = $this->currentConnection->database->queryFetch($_query);
+	  } catch (Exception $e) {
+		throw new JException($e->getMessage(), 1);
+	  }
+	  return $temp;
+	}
+	public function queryArray( $_query ) {
+	  if(!is_string($_query))
+		throw new JException("Parameter must be a string.", 1);
+	  if($this->currentConnection == null)
+		throw new JException("No connection selected.", 1);
+	  try {
+		$temp = $this->currentConnection->database->queryArray($_query);
+	  } catch (Exception $e) {
+		throw new JException($e->getMessage(), 1);
+	  }
+	  return $temp;
+	}
+	public function newTable( $_query ) {
+	  if(!is_string($_query))
+		throw new JException("Parameter must be a string.", 1);
+	  if($this->currentConnection == null)
+		throw new JException("No connection selected.", 1);
+	  try {
+		$temp = $this->currentConnection->database->newTable($_query);
+	  } catch (Exception $e) {
+		throw new JException($e->getMessage(), 1);
+	  }
+	  return $temp;
+	}
   }
 ?>

Spacing +23 added lines, -23 removed lines

@@ -9,12 +9,12 @@ 
       $this->connection = [];
       $this->currentConnection = null;
     }
-    public function addConnection( $_path, $_name = "default" ) {
-      if(!is_string($_path))
+    public function addConnection($_path, $_name = "default") {
+      if (!is_string($_path))
         throw new JException("Parameter must be a string.", 1);
       try {
         $jConfig = new JConfig($_path);
-        if($jConfig->enable) {
+        if ($jConfig->enable) {
           $connection = new Connection($jConfig);
           $this->addConnectionMan($connection, $_name);
         }
@@ -22,8 +22,8 @@ 
         throw new JException($e->getMessage(), 1);
       }
     }
-    public function addConnectionMan( $_connection, $_name = "default") {
-      if(!is_object($_connection) || !is_a($_connection, "Connection"))
+    public function addConnectionMan($_connection, $_name = "default") {
+      if (!is_object($_connection) || !is_a($_connection, "Connection"))
         throw new JException("Parameter must be a Connection object.", 1);
       try {
         $this->connection["$_name"] = $_connection;
@@ -32,17 +32,17 @@ 
         throw new JException($e->getMessage(), 1);
       }
     }
-    public function setConnection( $_name = "default" ) {
-      if(!is_string($_name))
+    public function setConnection($_name = "default") {
+      if (!is_string($_name))
         throw new JException("Parameter must be a string.", 1);
-      if(!isset($this->connection["$_name"]))
+      if (!isset($this->connection["$_name"]))
         throw new JException("This connection name does not exist.", 1);
       $this->currentConnection = $this->connection["$_name"];
     }
-    public function query( $_query ) {
-      if(!is_string($_query))
+    public function query($_query) {
+      if (!is_string($_query))
         throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
+      if ($this->currentConnection == null)
         throw new JException("No connection selected.", 1);
       try {
         $temp = $this->currentConnection->database->query($_query);
@@ -51,10 +51,10 @@ 
       }
       return $temp;
     }
-    public function queryInsert( $_query ) {
-      if(!is_string($_query))
+    public function queryInsert($_query) {
+      if (!is_string($_query))
         throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
+      if ($this->currentConnection == null)
         throw new JException("No connection selected.", 1);
       try {
         $temp = $this->currentConnection->database->queryInsert($_query);
@@ -63,10 +63,10 @@ 
       }
       return $temp;
     }
-    public function queryFetch( $_query ) {
-      if(!is_string($_query))
+    public function queryFetch($_query) {
+      if (!is_string($_query))
         throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
+      if ($this->currentConnection == null)
         throw new JException("No connection selected.", 1);
       try {
         $temp = $this->currentConnection->database->queryFetch($_query);
@@ -75,10 +75,10 @@ 
       }
       return $temp;
     }
-    public function queryArray( $_query ) {
-      if(!is_string($_query))
+    public function queryArray($_query) {
+      if (!is_string($_query))
         throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
+      if ($this->currentConnection == null)
         throw new JException("No connection selected.", 1);
       try {
         $temp = $this->currentConnection->database->queryArray($_query);
@@ -87,10 +87,10 @@ 
       }
       return $temp;
     }
-    public function newTable( $_query ) {
-      if(!is_string($_query))
+    public function newTable($_query) {
+      if (!is_string($_query))
         throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
+      if ($this->currentConnection == null)
         throw new JException("No connection selected.", 1);
       try {
         $temp = $this->currentConnection->database->newTable($_query);

Braces +42 added lines, -28 removed lines

@@ -10,8 +10,9 @@ 
       $this->currentConnection = null;
     }
     public function addConnection( $_path, $_name = "default" ) {
-      if(!is_string($_path))
-        throw new JException("Parameter must be a string.", 1);
+      if(!is_string($_path)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
       try {
         $jConfig = new JConfig($_path);
         if($jConfig->enable) {
@@ -23,8 +24,9 @@ 
       }
     }
     public function addConnectionMan( $_connection, $_name = "default") {
-      if(!is_object($_connection) || !is_a($_connection, "Connection"))
-        throw new JException("Parameter must be a Connection object.", 1);
+      if(!is_object($_connection) || !is_a($_connection, "Connection")) {
+              throw new JException("Parameter must be a Connection object.", 1);
+      }
       try {
         $this->connection["$_name"] = $_connection;
         $this->currentConnection = $_connection;
@@ -33,17 +35,21 @@ 
       }
     }
     public function setConnection( $_name = "default" ) {
-      if(!is_string($_name))
-        throw new JException("Parameter must be a string.", 1);
-      if(!isset($this->connection["$_name"]))
-        throw new JException("This connection name does not exist.", 1);
+      if(!is_string($_name)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
+      if(!isset($this->connection["$_name"])) {
+              throw new JException("This connection name does not exist.", 1);
+      }
       $this->currentConnection = $this->connection["$_name"];
     }
     public function query( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
-        throw new JException("No connection selected.", 1);
+      if(!is_string($_query)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
+      if($this->currentConnection == null) {
+              throw new JException("No connection selected.", 1);
+      }
       try {
         $temp = $this->currentConnection->database->query($_query);
       } catch (Exception $e) {
@@ -52,10 +58,12 @@ 
       return $temp;
     }
     public function queryInsert( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
-        throw new JException("No connection selected.", 1);
+      if(!is_string($_query)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
+      if($this->currentConnection == null) {
+              throw new JException("No connection selected.", 1);
+      }
       try {
         $temp = $this->currentConnection->database->queryInsert($_query);
       } catch (Exception $e) {
@@ -64,10 +72,12 @@ 
       return $temp;
     }
     public function queryFetch( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
-        throw new JException("No connection selected.", 1);
+      if(!is_string($_query)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
+      if($this->currentConnection == null) {
+              throw new JException("No connection selected.", 1);
+      }
       try {
         $temp = $this->currentConnection->database->queryFetch($_query);
       } catch (Exception $e) {
@@ -76,10 +86,12 @@ 
       return $temp;
     }
     public function queryArray( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
-        throw new JException("No connection selected.", 1);
+      if(!is_string($_query)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
+      if($this->currentConnection == null) {
+              throw new JException("No connection selected.", 1);
+      }
       try {
         $temp = $this->currentConnection->database->queryArray($_query);
       } catch (Exception $e) {
@@ -88,10 +100,12 @@ 
       return $temp;
     }
     public function newTable( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
-      if($this->currentConnection == null)
-        throw new JException("No connection selected.", 1);
+      if(!is_string($_query)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
+      if($this->currentConnection == null) {
+              throw new JException("No connection selected.", 1);
+      }
       try {
         $temp = $this->currentConnection->database->newTable($_query);
       } catch (Exception $e) {