XaBerr / JATE

dist/jate/modules/Connection/Connection.php

Indentation +46 added lines, -46 removed lines

@@ -2,51 +2,51 @@
   jRequire("../Module/Module.php");
   requireComponents("Adapters");
   class Connection extends Module {
-    public $database;
-    public $info;
-    public function __construct() {
-      parent::__construct();
-      $args = func_get_args();
-      $count = func_num_args();
-      if (method_exists($this,$func='__construct'.$count))
-        call_user_func_array(array($this,$func),$args);
-    }
-    public function __construct0() {
-      $this->database = null;
-    }
-    public function __construct4 ( $_srv, $_db, $_usr, $_pass ) {
-      $this->setConnection($_srv, $_db, $_usr, $_pass, "pdo");
-    }
-    public function __construct5 ( $_srv, $_db, $_usr, $_pass, $_type ) {
-      $type = $this->getConnectionType($_type);
-      $this->setConnection($_srv, $_db, $_usr, $_pass, $type);
-    }
-    protected function setConnection ( $_srv, $_db, $_usr, $_pass, $_type ) {
-      switch ($_type) {
-        case "mysqli":
-          $this->database = new ConnectionMysqliAdapter($_srv, $_db, $_usr, $_pass);
-        break;
-        case "postgresql":
-          $this->database = new ConnectionPostgresqlAdapter($_srv, $_db, $_usr, $_pass);
-        break;
-        default:
-          $this->database = new ConnectionPdoAdapter($_srv, $_db, $_usr, $_pass);
-        break;
-      }
-      $this->setConnectionParameters( $_srv, $_db, $_usr, $_pass);
-    }
-    protected function getConnectionType( $_type ) {
-      foreach ($_type as $key => $value)
-        if($value)
-          return $key;
-      return "pdo";
-    }
-    protected function setConnectionParameters( $_srv, $_db, $_usr, $_pass) {
-      $this->info = [];
-      $this->info["server"]    = $_srv;
-      $this->info["database"]  = $_db;
-      $this->info["user"]      = $_usr;
-      $this->info["password"]  = $_pass;
-    }
+	public $database;
+	public $info;
+	public function __construct() {
+	  parent::__construct();
+	  $args = func_get_args();
+	  $count = func_num_args();
+	  if (method_exists($this,$func='__construct'.$count))
+		call_user_func_array(array($this,$func),$args);
+	}
+	public function __construct0() {
+	  $this->database = null;
+	}
+	public function __construct4 ( $_srv, $_db, $_usr, $_pass ) {
+	  $this->setConnection($_srv, $_db, $_usr, $_pass, "pdo");
+	}
+	public function __construct5 ( $_srv, $_db, $_usr, $_pass, $_type ) {
+	  $type = $this->getConnectionType($_type);
+	  $this->setConnection($_srv, $_db, $_usr, $_pass, $type);
+	}
+	protected function setConnection ( $_srv, $_db, $_usr, $_pass, $_type ) {
+	  switch ($_type) {
+		case "mysqli":
+		  $this->database = new ConnectionMysqliAdapter($_srv, $_db, $_usr, $_pass);
+		break;
+		case "postgresql":
+		  $this->database = new ConnectionPostgresqlAdapter($_srv, $_db, $_usr, $_pass);
+		break;
+		default:
+		  $this->database = new ConnectionPdoAdapter($_srv, $_db, $_usr, $_pass);
+		break;
+	  }
+	  $this->setConnectionParameters( $_srv, $_db, $_usr, $_pass);
+	}
+	protected function getConnectionType( $_type ) {
+	  foreach ($_type as $key => $value)
+		if($value)
+		  return $key;
+	  return "pdo";
+	}
+	protected function setConnectionParameters( $_srv, $_db, $_usr, $_pass) {
+	  $this->info = [];
+	  $this->info["server"]    = $_srv;
+	  $this->info["database"]  = $_db;
+	  $this->info["user"]      = $_usr;
+	  $this->info["password"]  = $_pass;
+	}
   }
 ?>

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

Indentation +41 added lines, -41 removed lines

@@ -1,46 +1,46 @@
 <?php
   jRequire("ConnectionInterface.php");
   class ConnectionPostgresqlAdapter implements ConnectionAdapterInterface {
-      public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
-        $this->connection = pg_connect("host=$_srv dbname=$_db user=$_usr password=$_pass")
-          or die('Could not connect: '.pg_last_error());
-      }
-      public function query( $_query ) {
-        $this->stdQuery($_query);
-        return true;
-      }
-      public function queryInsert( $_query ) {
-        $this->stdQuery($_query);
-        return $this->stdQuery("SELECT lastval()");
-      }
-      public function queryFetch( $_query ) {
-        $result = $this->stdQuery($_query);
-        $rows = [];
-        while($row = pg_fetch_assoc($result))
-          $rows[] = $row;
-        pg_free_result($result);
-        return $rows;
-      }
-      public function queryArray( $_query ) {
-        $result = $this->stdQuery($_query);
-        $rows = [];
-        while($row = pg_fetch_array($result))
-          $rows[] = $row;
-        pg_free_result($result);
-        return $rows;
-      }
-      protected function stdQuery( $_query ) {
-        $database = $this->connection;
-        $error = "Error query [$_query]";
-        $result = pg_query($database, $_query);
-        if(!$result) {
-          echo "$_query<br>";
-          echo "Something wrong: $error";
-          var_dump(pg_last_error());
-          exit();
-        }
-        return $result;
-      }
+	  public $connection;
+	  public function __construct( $_srv, $_db, $_usr, $_pass ) {
+		$this->connection = pg_connect("host=$_srv dbname=$_db user=$_usr password=$_pass")
+		  or die('Could not connect: '.pg_last_error());
+	  }
+	  public function query( $_query ) {
+		$this->stdQuery($_query);
+		return true;
+	  }
+	  public function queryInsert( $_query ) {
+		$this->stdQuery($_query);
+		return $this->stdQuery("SELECT lastval()");
+	  }
+	  public function queryFetch( $_query ) {
+		$result = $this->stdQuery($_query);
+		$rows = [];
+		while($row = pg_fetch_assoc($result))
+		  $rows[] = $row;
+		pg_free_result($result);
+		return $rows;
+	  }
+	  public function queryArray( $_query ) {
+		$result = $this->stdQuery($_query);
+		$rows = [];
+		while($row = pg_fetch_array($result))
+		  $rows[] = $row;
+		pg_free_result($result);
+		return $rows;
+	  }
+	  protected function stdQuery( $_query ) {
+		$database = $this->connection;
+		$error = "Error query [$_query]";
+		$result = pg_query($database, $_query);
+		if(!$result) {
+		  echo "$_query<br>";
+		  echo "Something wrong: $error";
+		  var_dump(pg_last_error());
+		  exit();
+		}
+		return $result;
+	  }
   }
 ?>

Spacing +9 added lines, -9 removed lines

@@ -2,39 +2,39 @@
   jRequire("ConnectionInterface.php");
   class ConnectionPostgresqlAdapter implements ConnectionAdapterInterface {
       public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
+      public function __construct($_srv, $_db, $_usr, $_pass) {
         $this->connection = pg_connect("host=$_srv dbname=$_db user=$_usr password=$_pass")
           or die('Could not connect: '.pg_last_error());
       }
-      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->stdQuery("SELECT lastval()");
       }
-      public function queryFetch( $_query ) {
+      public function queryFetch($_query) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = pg_fetch_assoc($result))
+        while ($row = pg_fetch_assoc($result))
           $rows[] = $row;
         pg_free_result($result);
         return $rows;
       }
-      public function queryArray( $_query ) {
+      public function queryArray($_query) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = pg_fetch_array($result))
+        while ($row = pg_fetch_array($result))
           $rows[] = $row;
         pg_free_result($result);
         return $rows;
       }
-      protected function stdQuery( $_query ) {
+      protected function stdQuery($_query) {
         $database = $this->connection;
         $error = "Error query [$_query]";
         $result = pg_query($database, $_query);
-        if(!$result) {
+        if (!$result) {
           echo "$_query<br>";
           echo "Something wrong: $error";
           var_dump(pg_last_error());

Braces +6 added lines, -4 removed lines

@@ -17,16 +17,18 @@
       public function queryFetch( $_query ) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = pg_fetch_assoc($result))
-          $rows[] = $row;
+        while($row = pg_fetch_assoc($result)) {
+                  $rows[] = $row;
+        }
         pg_free_result($result);
         return $rows;
       }
       public function queryArray( $_query ) {
         $result = $this->stdQuery($_query);
         $rows = [];
-        while($row = pg_fetch_array($result))
-          $rows[] = $row;
+        while($row = pg_fetch_array($result)) {
+                  $rows[] = $row;
+        }
         pg_free_result($result);
         return $rows;
       }