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

Indentation +51 added lines, -51 removed lines

@@ -1,55 +1,55 @@
 <?php
   class JConfig {
-    public $connection;
-    public $all;
-    public $DEBUG;
-    public $pages;
-    public $server;
-    public function __construct() {
-      $this->connection["enable"]    = false;
-      $this->connection["user"]      = "";
-      $this->connection["password"] = "";
-      $this->connection["database"] = "";
-      $this->connection["server"]    = "";
-      $this->all    = "";
-      $this->DEBUG  = 0;
-      $this->pages  = [];
-      $this->server  = [];
-      $this->server["HTTP_HOST"]    = $_SERVER["HTTP_HOST"];
-      $this->server["REQUEST_URI"]  = $_SERVER["REQUEST_URI"];
-      $this->server["PHP_SELF"]      = $_SERVER["PHP_SELF"];
-      $this->server["RELATIVE"]      = str_replace("/index.php", "", $_SERVER["PHP_SELF"]);
-    }
-    public function import( $_path, $_type = "misc" ) {
-      $data = file_get_contents($_path);
-      $data = json_decode($data);
-      if($data === NULL)
-        Debug::log("Error processing [$_path]");
-      if( $_type == "connection" )
-        $this->overlayConnection($data);
-      else
-        $this->overlayMisc($data);
-    }
-    protected function overlayConnection( $_data ) {
-      $this->connection = $this->obj2array($_data);
-    }
-    protected function overlayMisc( $_data ) {
-      $this->importObject($_data);
-    }
-    protected function obj2array ( &$_instance ) {
-      $clone  = (array) $_instance;
-      $return  = [];
-      $return['___SOURCE_KEYS_'] = $clone;
-      while ( list ($key, $value) = each ($clone) ) {
-        $temp    = explode ("\0", $key);
-        $newkey  = $temp[count($temp)-1];
-        $return[$newkey] = &$return['___SOURCE_KEYS_'][$key];
-      }
-      return $return;
-    }
-    protected function importObject( $_object ) {
-      foreach (get_object_vars($_object) as $key => $value)
-        $this->$key = $value;
-    }
+	public $connection;
+	public $all;
+	public $DEBUG;
+	public $pages;
+	public $server;
+	public function __construct() {
+	  $this->connection["enable"]    = false;
+	  $this->connection["user"]      = "";
+	  $this->connection["password"] = "";
+	  $this->connection["database"] = "";
+	  $this->connection["server"]    = "";
+	  $this->all    = "";
+	  $this->DEBUG  = 0;
+	  $this->pages  = [];
+	  $this->server  = [];
+	  $this->server["HTTP_HOST"]    = $_SERVER["HTTP_HOST"];
+	  $this->server["REQUEST_URI"]  = $_SERVER["REQUEST_URI"];
+	  $this->server["PHP_SELF"]      = $_SERVER["PHP_SELF"];
+	  $this->server["RELATIVE"]      = str_replace("/index.php", "", $_SERVER["PHP_SELF"]);
+	}
+	public function import( $_path, $_type = "misc" ) {
+	  $data = file_get_contents($_path);
+	  $data = json_decode($data);
+	  if($data === NULL)
+		Debug::log("Error processing [$_path]");
+	  if( $_type == "connection" )
+		$this->overlayConnection($data);
+	  else
+		$this->overlayMisc($data);
+	}
+	protected function overlayConnection( $_data ) {
+	  $this->connection = $this->obj2array($_data);
+	}
+	protected function overlayMisc( $_data ) {
+	  $this->importObject($_data);
+	}
+	protected function obj2array ( &$_instance ) {
+	  $clone  = (array) $_instance;
+	  $return  = [];
+	  $return['___SOURCE_KEYS_'] = $clone;
+	  while ( list ($key, $value) = each ($clone) ) {
+		$temp    = explode ("\0", $key);
+		$newkey  = $temp[count($temp)-1];
+		$return[$newkey] = &$return['___SOURCE_KEYS_'][$key];
+	  }
+	  return $return;
+	}
+	protected function importObject( $_object ) {
+	  foreach (get_object_vars($_object) as $key => $value)
+		$this->$key = $value;
+	}
   }
 ?>

dist/jate/modules/Query/Query.php

Indentation +43 added lines, -43 removed lines

@@ -1,48 +1,48 @@
 <?php
   jRequire("../Module/Module.php");
   class Query extends Module {
-    public $connection;
-    public $currentConnection;
-    public function __construct() {
-      parent::__construct();
-      $this->connection = [];
-      $this->currentConnection = null;
-    }
-    public function addConnection( $_name, $_connection ) {
-      Debug::push();
-      $this->connection["$_name"] = $_connection;
-      $this->currentConnection = $_connection;
-      foreach ($this->modules as &$module)
-        if(isset($module->currentConnection))
-          $module->addConnection($_name, $_connection);
-      Debug::pop();
-    }
-    public function setConnection( $_name ) {
-      $this->currentConnection = $this->connection["$_name"];
-    }
-    public function query( $_query ) {
-      Debug::push();
-      $temp = $this->currentConnection->database->query($_query);
-      Debug::pop();
-      return $temp;
-    }
-    public function queryInsert( $_query ) {
-      Debug::push();
-      $temp = $this->currentConnection->database->queryInsert($_query);
-      Debug::pop();
-      return $temp;
-    }
-    public function queryFetch( $_query ) {
-      Debug::push();
-      $temp = $this->currentConnection->database->queryFetch($_query);
-      Debug::pop();
-      return $temp;
-    }
-    public function queryArray( $_query ) {
-      Debug::push();
-      $temp = $this->currentConnection->database->queryArray($_query);
-      Debug::pop();
-      return $temp;
-    }
+	public $connection;
+	public $currentConnection;
+	public function __construct() {
+	  parent::__construct();
+	  $this->connection = [];
+	  $this->currentConnection = null;
+	}
+	public function addConnection( $_name, $_connection ) {
+	  Debug::push();
+	  $this->connection["$_name"] = $_connection;
+	  $this->currentConnection = $_connection;
+	  foreach ($this->modules as &$module)
+		if(isset($module->currentConnection))
+		  $module->addConnection($_name, $_connection);
+	  Debug::pop();
+	}
+	public function setConnection( $_name ) {
+	  $this->currentConnection = $this->connection["$_name"];
+	}
+	public function query( $_query ) {
+	  Debug::push();
+	  $temp = $this->currentConnection->database->query($_query);
+	  Debug::pop();
+	  return $temp;
+	}
+	public function queryInsert( $_query ) {
+	  Debug::push();
+	  $temp = $this->currentConnection->database->queryInsert($_query);
+	  Debug::pop();
+	  return $temp;
+	}
+	public function queryFetch( $_query ) {
+	  Debug::push();
+	  $temp = $this->currentConnection->database->queryFetch($_query);
+	  Debug::pop();
+	  return $temp;
+	}
+	public function queryArray( $_query ) {
+	  Debug::push();
+	  $temp = $this->currentConnection->database->queryArray($_query);
+	  Debug::pop();
+	  return $temp;
+	}
   }
 ?>

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

Indentation +42 added lines, -42 removed lines

@@ -1,47 +1,47 @@
 <?php
   jRequire("ConnectionInterface.php");
   class ConnectionPdoAdapter 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 $error ) {
-          Debug::log($error->getMessage());
-          exit();
-        }
-      }
-      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) {
-          Debug::logStack([
-            "query" => $_query,
-            "error" => [
-              $query->errorInfo(),
-              $database->errorInfo()
-            ]
-          ]);
-          exit();
-        }
-        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 $error ) {
+		  Debug::log($error->getMessage());
+		  exit();
+		}
+	  }
+	  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) {
+		  Debug::logStack([
+			"query" => $_query,
+			"error" => [
+			  $query->errorInfo(),
+			  $database->errorInfo()
+			]
+		  ]);
+		  exit();
+		}
+		return $query;
+	  }
   }
 ?>

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

Indentation +46 added lines, -46 removed lines

@@ -1,51 +1,51 @@
 <?php
   jRequire("ConnectionInterface.php");
   class ConnectionPostgresqlAdapter implements ConnectionAdapterInterface {
-      public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
-        try {
-          $this->connection = pg_connect("host=$_srv dbname=$_db user=$_usr password=$_pass")
-            or die('Could not connect: '.pg_last_error());
-        } catch( Exception $error ) {
-          Debug::log($error->getMessage());
-          exit();
-        }
-      }
-      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;
-        $result = pg_query($database, $_query);
-        if(!$result) {
-          Debug::logStack([
-            "query" => $_query,
-            "error" => pg_last_error()
-          ]);
-          exit();
-        }
-        return $result;
-      }
+	  public $connection;
+	  public function __construct( $_srv, $_db, $_usr, $_pass ) {
+		try {
+		  $this->connection = pg_connect("host=$_srv dbname=$_db user=$_usr password=$_pass")
+			or die('Could not connect: '.pg_last_error());
+		} catch( Exception $error ) {
+		  Debug::log($error->getMessage());
+		  exit();
+		}
+	  }
+	  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;
+		$result = pg_query($database, $_query);
+		if(!$result) {
+		  Debug::logStack([
+			"query" => $_query,
+			"error" => pg_last_error()
+		  ]);
+		  exit();
+		}
+		return $result;
+	  }
   }
 ?>

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

Indentation +43 added lines, -43 removed lines

@@ -1,48 +1,48 @@
 <?php
   jRequire("ConnectionInterface.php");
   class ConnectionMysqliAdapter implements ConnectionAdapterInterface {
-      public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
-        try {
-          $this->connection = new mysqli( $_srv, $_usr, $_pass, $_db );
-        } catch( Exception $error ) {
-          Debug::log($error->getMessage());
-          exit();
-        }
-      }
-      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) {
-          Debug::logStack([
-            "query" => $_query,
-            "error" => $database->error
-          ]);
-          exit();
-        }
-        return $result;
-      }
+	  public $connection;
+	  public function __construct( $_srv, $_db, $_usr, $_pass ) {
+		try {
+		  $this->connection = new mysqli( $_srv, $_usr, $_pass, $_db );
+		} catch( Exception $error ) {
+		  Debug::log($error->getMessage());
+		  exit();
+		}
+	  }
+	  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) {
+		  Debug::logStack([
+			"query" => $_query,
+			"error" => $database->error
+		  ]);
+		  exit();
+		}
+		return $result;
+	  }
   }
 ?>

dist/jate/modules/Debug/Debug.php

Indentation +49 added lines, -49 removed lines

@@ -1,54 +1,54 @@
 <?php
   // requireComponent("../functions/array.php");
   class Debug {
-    public static $stack;
-    private static $initialized = false;
-    private function __construct() {}
-    private static function initialize() {
-      if (self::$initialized)
-        return;
-      self::$stack = [];
-      self::$initialized = true;
-    }
-    private static function out( $_object ) {
-      if(is_object($_object)) {
-        echo "isObject";
-      } else if(is_array($_object)) {
-        arrayDump($_object, "Debug");
-      } else {
-        echo $_object;
-      }
-    }
-    public static function log( $_object ) {
-      self::out(["error" => $_object]);
-    }
-    public static function logln( $_object ) {
-      self::log($_object);
-      self::out("<br>");
-    }
-    public static function logStack( $_object ) {
-      self::out([
-        "position" => self::$stack,
-        "error" => $_object
-      ]);
-      self::out("<br>");
-    }
-    public static function push() {
-      $debugInfo = debug_backtrace();
-      $debugInfo = [
-        "file" => $debugInfo[1]["file"],
-        "line" => $debugInfo[1]["line"],
-        "function" => $debugInfo[1]["function"],
-        "class" => $debugInfo[1]["class"]
-      ];
-      self::$stack[] = $debugInfo;
-    }
-    public static function pop() {
-      if(count(self::$stack)>0)
-        array_shift(self::$stack);
-    }
-    public static function emptyStack() {
-      self::$stack = [];
-    }
+	public static $stack;
+	private static $initialized = false;
+	private function __construct() {}
+	private static function initialize() {
+	  if (self::$initialized)
+		return;
+	  self::$stack = [];
+	  self::$initialized = true;
+	}
+	private static function out( $_object ) {
+	  if(is_object($_object)) {
+		echo "isObject";
+	  } else if(is_array($_object)) {
+		arrayDump($_object, "Debug");
+	  } else {
+		echo $_object;
+	  }
+	}
+	public static function log( $_object ) {
+	  self::out(["error" => $_object]);
+	}
+	public static function logln( $_object ) {
+	  self::log($_object);
+	  self::out("<br>");
+	}
+	public static function logStack( $_object ) {
+	  self::out([
+		"position" => self::$stack,
+		"error" => $_object
+	  ]);
+	  self::out("<br>");
+	}
+	public static function push() {
+	  $debugInfo = debug_backtrace();
+	  $debugInfo = [
+		"file" => $debugInfo[1]["file"],
+		"line" => $debugInfo[1]["line"],
+		"function" => $debugInfo[1]["function"],
+		"class" => $debugInfo[1]["class"]
+	  ];
+	  self::$stack[] = $debugInfo;
+	}
+	public static function pop() {
+	  if(count(self::$stack)>0)
+		array_shift(self::$stack);
+	}
+	public static function emptyStack() {
+	  self::$stack = [];
+	}
   }
 ?>