XaBerr / JATE

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/functions/block.php

Indentation +38 added lines, -38 removed lines

@@ -2,64 +2,64 @@
   jRequire("../modules/Parser/Parser.php");
   jRequire("../modules/JException/JException.php");
   function jBlock() {
-    return ob_start();
+	return ob_start();
   }
 
   function jBlockClose( $_type = "html", $_parameters = [] ) {
-    return jBlockEnd($_type, $_parameters);
+	return jBlockEnd($_type, $_parameters);
   }
 
   function jBlockFile( $_path, $_parameters = [] ) {
-    try {
-      $temp = Parser::parseFile($_path, $_parameters);
-    } catch (Exception $e) {
-      throw new JException($e->getMessage(), 1);
-    }
-    return $temp;
+	try {
+	  $temp = Parser::parseFile($_path, $_parameters);
+	} catch (Exception $e) {
+	  throw new JException($e->getMessage(), 1);
+	}
+	return $temp;
   }
 
   function view( $_path, $_parameters = [] ) {
-    try {
-      $temp = jBlockFile("bundles/views/$_path", $_parameters);
-    } catch (Exception $e) {
-      throw new JException($e->getMessage(), 1);
-    }
-    return $temp;
+	try {
+	  $temp = jBlockFile("bundles/views/$_path", $_parameters);
+	} catch (Exception $e) {
+	  throw new JException($e->getMessage(), 1);
+	}
+	return $temp;
   }
 
   function sql( $_path, $_parameters = [] ) {
-    try {
-      $temp = jBlockFileMan("bundles/sql/$_path", "sql", $_parameters);
-    } catch (Exception $e) {
-      throw new JException($e->getMessage(), 1);
-    }
-    return $temp;
+	try {
+	  $temp = jBlockFileMan("bundles/sql/$_path", "sql", $_parameters);
+	} catch (Exception $e) {
+	  throw new JException($e->getMessage(), 1);
+	}
+	return $temp;
   }
 
   function jBlockFileMan( $_path, $_type, $_parameters = [] ) {
-    try {
-      $temp = Parser::parseFileMan($_path, $_parameters, $_type);
-    } catch (Exception $e) {
-      throw new JException($e->getMessage(), 1);
-    }
-    return $temp;
+	try {
+	  $temp = Parser::parseFileMan($_path, $_parameters, $_type);
+	} catch (Exception $e) {
+	  throw new JException($e->getMessage(), 1);
+	}
+	return $temp;
   }
 
   function jBlockEnd( $_type = "html", $_parameters = [] ) {
-    $text = ob_get_clean();
-    try {
-      $temp = Parser::parseText($text, $_parameters, $_type);
-    } catch (Exception $e) {
-      throw new JException($e->getMessage(), 1);
-    }
-    return $temp;
+	$text = ob_get_clean();
+	try {
+	  $temp = Parser::parseText($text, $_parameters, $_type);
+	} catch (Exception $e) {
+	  throw new JException($e->getMessage(), 1);
+	}
+	return $temp;
   }
 
   function minifyOutput($_buffer) {
-    $search = array ( '/\>[^\S ]+/s', '/[^\S ]+\</s', '/(\s)+/s' );
-    $replace = array ( '>', '<', '\\1' );
-    if (preg_match("/\<html/i",$_buffer) == 1 && preg_match("/\<\/html\>/i",$_buffer) == 1)
-      $_buffer = preg_replace($search, $replace, utf8_decode($_buffer));
-    return utf8_encode($_buffer);
+	$search = array ( '/\>[^\S ]+/s', '/[^\S ]+\</s', '/(\s)+/s' );
+	$replace = array ( '>', '<', '\\1' );
+	if (preg_match("/\<html/i",$_buffer) == 1 && preg_match("/\<\/html\>/i",$_buffer) == 1)
+	  $_buffer = preg_replace($search, $replace, utf8_decode($_buffer));
+	return utf8_encode($_buffer);
   }
 ?>

dist/jate/modules/Parser/Parser.php

Indentation +62 added lines, -62 removed lines

@@ -2,67 +2,67 @@
   requireComponents("Adapters");
   jRequire("../JException/JException.php");
   class Parser {
-    private static function setParser ( $_type ) {
-      $parser = null;
-      $_type = strtolower($_type);
-      switch ($_type) {
-        case "twig":
-        case "sql":
-          $parser = new TwigAdapter();
-        break;
-        case "jate":
-          $parser = new JTagAdapter();
-        break;
-        case 'jade':
-        case "pug":
-          $parser = new PugAdapter();
-        break;
-        case "md":
-        case "markdown":
-        case "parsedown":
-          $parser = new ParsedownAdapter();
-        break;
-        default:
-          $parser = -1;
-        break;
-      }
-      return $parser;
-    }
-    public static function parseText( $_text, $_parameters = [], $_type = "html" ) {
-      if(!is_string($_text) || !is_string($_type))
-        throw new JException("Parameter must be a string.");
-      if(!is_array($_parameters))
-        throw new JException("Parameter must be an array.");
-      $parser = self::setParser($_type);
-      if($parser === -1)
-        return $_text;
-      return $parser->drawText($_text, $_parameters);
-    }
-    public static function parseFileMan( $_path, $_parameters = [], $_type = "html"  ) {
-      if(!is_string($_path))
-        throw new JException("Parameter must be a string.");
-      if(!file_exists($_path))
-        throw new JException("File [$_path] not found.");
-      $string = file_get_contents($_path);
-      try {
-        $text = self::parseText($string, $_parameters, $_type);
-      } catch (Exception $e) {
-        throw new JException($e->getMessage());
-      }
-      return $text;
-    }
-    public static function parseFile( $_path, $_parameters = [] ) {
-      if(!is_string($_path))
-        throw new JException("Parameter must be a string.");
-      $extension = explode(".", $_path);
-      $extension = $extension[count($extension)-1];
-      $extension = strtolower($extension);
-      try {
-        $text = self::parseFileMan($_path, $_parameters, $extension);
-      } catch (Exception $e) {
-        throw new JException($e->getMessage());
-      }
-      return $text;
-    }
+	private static function setParser ( $_type ) {
+	  $parser = null;
+	  $_type = strtolower($_type);
+	  switch ($_type) {
+		case "twig":
+		case "sql":
+		  $parser = new TwigAdapter();
+		break;
+		case "jate":
+		  $parser = new JTagAdapter();
+		break;
+		case 'jade':
+		case "pug":
+		  $parser = new PugAdapter();
+		break;
+		case "md":
+		case "markdown":
+		case "parsedown":
+		  $parser = new ParsedownAdapter();
+		break;
+		default:
+		  $parser = -1;
+		break;
+	  }
+	  return $parser;
+	}
+	public static function parseText( $_text, $_parameters = [], $_type = "html" ) {
+	  if(!is_string($_text) || !is_string($_type))
+		throw new JException("Parameter must be a string.");
+	  if(!is_array($_parameters))
+		throw new JException("Parameter must be an array.");
+	  $parser = self::setParser($_type);
+	  if($parser === -1)
+		return $_text;
+	  return $parser->drawText($_text, $_parameters);
+	}
+	public static function parseFileMan( $_path, $_parameters = [], $_type = "html"  ) {
+	  if(!is_string($_path))
+		throw new JException("Parameter must be a string.");
+	  if(!file_exists($_path))
+		throw new JException("File [$_path] not found.");
+	  $string = file_get_contents($_path);
+	  try {
+		$text = self::parseText($string, $_parameters, $_type);
+	  } catch (Exception $e) {
+		throw new JException($e->getMessage());
+	  }
+	  return $text;
+	}
+	public static function parseFile( $_path, $_parameters = [] ) {
+	  if(!is_string($_path))
+		throw new JException("Parameter must be a string.");
+	  $extension = explode(".", $_path);
+	  $extension = $extension[count($extension)-1];
+	  $extension = strtolower($extension);
+	  try {
+		$text = self::parseFileMan($_path, $_parameters, $extension);
+	  } catch (Exception $e) {
+		throw new JException($e->getMessage());
+	  }
+	  return $text;
+	}
   }
 ?>

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

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

dist/jate/modules/Connection/Connection.php

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

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

dist/jate/modules/Module/Module.php

Indentation +40 added lines, -40 removed lines

@@ -2,45 +2,45 @@
   jRequire("../Query/Query.php");
   jRequire("../File/File.php");
   class Module {
-    use Query {
-      Query::__construct as private __queryConstruct;
-      Query::addConnectionMan as private __addConnectionMan;
-    }
-    use File {
-      File::__construct as private __fileConstruct;
-    }
-    public $name;
-    public $modules;
-    public function __construct() {
-      $this->name    = get_class($this);
-      $this->modules = [];
-      $this->__queryConstruct();
-      $this->__fileConstruct();
-    }
-    public function addModules( $_modules ) {
-      if(!is_array($_modules))
-        throw new JException("Parameter must be an array.");
-      foreach ($_modules as $value)
-        $this->addModule($value);
-    }
-    public function addModule( $_module ) {
-      if(!is_object($_module))
-        throw new JException("Parameter must be a object.");
-      if(! is_subclass_of ($_module, "Module"))
-        throw new JException("Parameter must be a object inherited from Module object.");
-      $this->modules[$_module->name] = $_module;
-      if($this->currentConnection)
-        $this->modules[$_module->name]->addConnectionMan($this->currentConnection);
-    }
-    public function addConnectionMan( $_connection, $_name = "default") {
-      try {
-        $this->__addConnectionMan($_connection, $_name);
-        foreach ($this->modules as &$module)
-          if(isset($this->currentConnection))
-            $module->addConnectionMan($this->currentConnection, $_name);
-      } catch (Exception $e) {
-        throw new JException($e->getMessage(), 1);
-      }
-    }
+	use Query {
+	  Query::__construct as private __queryConstruct;
+	  Query::addConnectionMan as private __addConnectionMan;
+	}
+	use File {
+	  File::__construct as private __fileConstruct;
+	}
+	public $name;
+	public $modules;
+	public function __construct() {
+	  $this->name    = get_class($this);
+	  $this->modules = [];
+	  $this->__queryConstruct();
+	  $this->__fileConstruct();
+	}
+	public function addModules( $_modules ) {
+	  if(!is_array($_modules))
+		throw new JException("Parameter must be an array.");
+	  foreach ($_modules as $value)
+		$this->addModule($value);
+	}
+	public function addModule( $_module ) {
+	  if(!is_object($_module))
+		throw new JException("Parameter must be a object.");
+	  if(! is_subclass_of ($_module, "Module"))
+		throw new JException("Parameter must be a object inherited from Module object.");
+	  $this->modules[$_module->name] = $_module;
+	  if($this->currentConnection)
+		$this->modules[$_module->name]->addConnectionMan($this->currentConnection);
+	}
+	public function addConnectionMan( $_connection, $_name = "default") {
+	  try {
+		$this->__addConnectionMan($_connection, $_name);
+		foreach ($this->modules as &$module)
+		  if(isset($this->currentConnection))
+			$module->addConnectionMan($this->currentConnection, $_name);
+	  } catch (Exception $e) {
+		throw new JException($e->getMessage(), 1);
+	  }
+	}
   }
 ?>