XaBerr / JATE

dist/jate/modules/Query/Query.php

Indentation +89 added lines, -89 removed lines

@@ -3,94 +3,94 @@
   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;
-        foreach ($this->modules as &$module)
-          if(isset($this->currentConnection))
-            $module->addConnectionMan($this->currentConnection, $_name);
-      } 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);
-      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);
-      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);
-      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);
-      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);
-      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;
+		foreach ($this->modules as &$module)
+		  if(isset($this->currentConnection))
+			$module->addConnectionMan($this->currentConnection, $_name);
+	  } 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);
+	  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);
+	  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);
+	  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);
+	  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);
+	  try {
+		$temp = $this->currentConnection->database->newTable($_query);
+	  } catch (Exception $e) {
+		throw new JException($e->getMessage(), 1);
+	  }
+	  return $temp;
+	}
   }
 ?>

Braces +30 added lines, -20 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,28 +24,33 @@ 
       }
     }
     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;
-        foreach ($this->modules as &$module)
-          if(isset($this->currentConnection))
+        foreach ($this->modules as &$module) {
+                  if(isset($this->currentConnection))
             $module->addConnectionMan($this->currentConnection, $_name);
+        }
       } 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);
+      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(!is_string($_query)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
       try {
         $temp = $this->currentConnection->database->query($_query);
       } catch (Exception $e) {
@@ -53,8 +59,9 @@ 
       return $temp;
     }
     public function queryInsert( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
+      if(!is_string($_query)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
       try {
         $temp = $this->currentConnection->database->queryInsert($_query);
       } catch (Exception $e) {
@@ -63,8 +70,9 @@ 
       return $temp;
     }
     public function queryFetch( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
+      if(!is_string($_query)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
       try {
         $temp = $this->currentConnection->database->queryFetch($_query);
       } catch (Exception $e) {
@@ -73,8 +81,9 @@ 
       return $temp;
     }
     public function queryArray( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
+      if(!is_string($_query)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
       try {
         $temp = $this->currentConnection->database->queryArray($_query);
       } catch (Exception $e) {
@@ -83,8 +92,9 @@ 
       return $temp;
     }
     public function newTable( $_query ) {
-      if(!is_string($_query))
-        throw new JException("Parameter must be a string.", 1);
+      if(!is_string($_query)) {
+              throw new JException("Parameter must be a string.", 1);
+      }
       try {
         $temp = $this->currentConnection->database->newTable($_query);
       } catch (Exception $e) {

dist/jate/modules/Connection/Connection.php

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

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,
@@ -40,9 +41,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";
     }
   }

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

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