XaBerr / JATE

dist/jate/modules/Parsedown/Parsedown.php

Indentation +14 added lines, -14 removed lines

@@ -3,19 +3,19 @@
   jRequire("Parsedown/Parsedown.php");
   use Parsedown as Parsedown;
   class Parsedown extends Module {
-    public function __construct() {
-      parent::__construct();
-    }
-    public function drawFile( $_template ) {
-      return $this->draw($_template);
-    }
-    public function drawText( $_template ) {
-      return $this->draw(trim($_template));
-    }
-    public function draw( $_template ) {
-      $Parsedown = new Parsedown\Parsedown();
-      $page = $Parsedown->text($_template);
-      return $page;
-    }
+	public function __construct() {
+	  parent::__construct();
+	}
+	public function drawFile( $_template ) {
+	  return $this->draw($_template);
+	}
+	public function drawText( $_template ) {
+	  return $this->draw(trim($_template));
+	}
+	public function draw( $_template ) {
+	  $Parsedown = new Parsedown\Parsedown();
+	  $page = $Parsedown->text($_template);
+	  return $page;
+	}
   }
 ?>

dist/jate/modules/Statistic/Statistic.php

Indentation +22 added lines, -22 removed lines

@@ -1,25 +1,25 @@ 
 <?php
   jRequire("../Module/Module.php");
   class Statistic extends Module {
-    public function __construct( $_webApp ) {
-      parent::__construct();
-      $pages = [];
-      $stats = [];
-      $pages = $_webApp->pages;
-      foreach ( $pages as $k => $v ) {
-        $temp = new $v[0]($v[1]);
-        $temp->addDipendences();
-        $stats[$k] = [];
-        $stats[$k]["page"]  = $v[0];
-        $stats[$k]["css"]    = $temp->data["css"];
-        $stats[$k]["js"]    = $temp->data["js"];
-      }
-      $this->data = $stats;
-    }
-    public function draw() {
-      jBlock();
-      foreach ($this->data as $i) {
-      ?>
+	public function __construct( $_webApp ) {
+	  parent::__construct();
+	  $pages = [];
+	  $stats = [];
+	  $pages = $_webApp->pages;
+	  foreach ( $pages as $k => $v ) {
+		$temp = new $v[0]($v[1]);
+		$temp->addDipendences();
+		$stats[$k] = [];
+		$stats[$k]["page"]  = $v[0];
+		$stats[$k]["css"]    = $temp->data["css"];
+		$stats[$k]["js"]    = $temp->data["js"];
+	  }
+	  $this->data = $stats;
+	}
+	public function draw() {
+	  jBlock();
+	  foreach ($this->data as $i) {
+	  ?>
         <div class="row">
           <div class="col-lg-12">
             Page: <?=$i["page"]?><br>
@@ -28,8 +28,8 @@ 
           </div>
         </div>
       <?php
-      }
-      return jBlockEnd();
-    }
+	  }
+	  return jBlockEnd();
+	}
   }
 ?>

dist/jate/modules/WebApp/WebApp.php

Indentation +85 added lines, -85 removed lines

@@ -1,90 +1,90 @@
 <?php
   jRequire("../Module/Module.php");
   class WebApp extends Module {
-    protected $pages;
-    protected $defaultPage;
-    public $currentPage;
-    public $jConfig;
-    public function __construct() {
-      parent::__construct();
-      $this->pages = [];
-      $this->defaultPage = ["Page404",[]];
-      $this->currentPage = null;
-      $this->jConfig     = null;
-    }
-    public function addPage( $_page ) {
-      $param = [];
-      $path  = $_page;
-      $class = $_page;
-      if(is_array($_page)) {
-        $path  = $_page[0];
-        $class = $_page[1];
-        if(isset($_page[2]))
-          $param = $_page[2];
-      }
-      $this->pages[$path] = [$class, $param];
-      return $this->pages[$path];
-    }
-    public function addPages( $_pages ) {
-      foreach ($_pages as $i)
-        $this->addPage($i);
-    }
-    public function fetchPage() {
-      $router = new Router();
-      $router->parameters = [ "app" => &$this->jConfig, "page" => null];
-      $stack = $router->getPage();
-      $parameters = [];
-      $temp = $this->defaultPage;
-      foreach ($this->pages as $key => $value) {
-        $variables = $this->pathSeeker(explode("/", $key), $stack);
-        if(is_array($variables)) {
-          $temp = $value;
-          $parameters = $variables;
-          break;
-        }
-      }
-      if( isset($temp[1]) && is_array($temp[1]) )
-        $temp[1] = array_merge($temp[1], $parameters);
-      else
-        $temp[1] = $parameters;
-      $this->currentPage = new $temp[0](["app" => $this->jConfig, "page" => $temp[1]]);
-      return $this->currentPage;
-    }
-    public function setDefaultPage( $_page ) {
-      $this->defaultPage = $this->addPage($_page);
-    }
-    public function draw() {
-      $this->currentPage->uniforma();
-      $gui = new GUI();
-      $gui->init($this->currentPage);
-      $gui->draw($this->currentPage->data["template"]);
-    }
-    public function pathSeeker( $_path, $_url ) {
-      $urlLength = count($_url);
-      $cont = 0;
-      $variables = [];
-      $pathLength = count($_path);
-      if($urlLength == $pathLength) {
-        while($cont < $urlLength) {
-          if(
-            ($this->jConfig->urlCaseSensitive && $_path[$cont] == $_url[$cont]) ||
-            (!$this->jConfig->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;
-    }
-    public function newConfig( $_path = "config/") {
-      $this->jConfig = new JConfig();
-      $this->jConfig->import("${_path}connection.json","connection");
-      $this->jConfig->import("${_path}misc.json");
-      $this->jConfig->import("${_path}router.json");
-    }
+	protected $pages;
+	protected $defaultPage;
+	public $currentPage;
+	public $jConfig;
+	public function __construct() {
+	  parent::__construct();
+	  $this->pages = [];
+	  $this->defaultPage = ["Page404",[]];
+	  $this->currentPage = null;
+	  $this->jConfig     = null;
+	}
+	public function addPage( $_page ) {
+	  $param = [];
+	  $path  = $_page;
+	  $class = $_page;
+	  if(is_array($_page)) {
+		$path  = $_page[0];
+		$class = $_page[1];
+		if(isset($_page[2]))
+		  $param = $_page[2];
+	  }
+	  $this->pages[$path] = [$class, $param];
+	  return $this->pages[$path];
+	}
+	public function addPages( $_pages ) {
+	  foreach ($_pages as $i)
+		$this->addPage($i);
+	}
+	public function fetchPage() {
+	  $router = new Router();
+	  $router->parameters = [ "app" => &$this->jConfig, "page" => null];
+	  $stack = $router->getPage();
+	  $parameters = [];
+	  $temp = $this->defaultPage;
+	  foreach ($this->pages as $key => $value) {
+		$variables = $this->pathSeeker(explode("/", $key), $stack);
+		if(is_array($variables)) {
+		  $temp = $value;
+		  $parameters = $variables;
+		  break;
+		}
+	  }
+	  if( isset($temp[1]) && is_array($temp[1]) )
+		$temp[1] = array_merge($temp[1], $parameters);
+	  else
+		$temp[1] = $parameters;
+	  $this->currentPage = new $temp[0](["app" => $this->jConfig, "page" => $temp[1]]);
+	  return $this->currentPage;
+	}
+	public function setDefaultPage( $_page ) {
+	  $this->defaultPage = $this->addPage($_page);
+	}
+	public function draw() {
+	  $this->currentPage->uniforma();
+	  $gui = new GUI();
+	  $gui->init($this->currentPage);
+	  $gui->draw($this->currentPage->data["template"]);
+	}
+	public function pathSeeker( $_path, $_url ) {
+	  $urlLength = count($_url);
+	  $cont = 0;
+	  $variables = [];
+	  $pathLength = count($_path);
+	  if($urlLength == $pathLength) {
+		while($cont < $urlLength) {
+		  if(
+			($this->jConfig->urlCaseSensitive && $_path[$cont] == $_url[$cont]) ||
+			(!$this->jConfig->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;
+	}
+	public function newConfig( $_path = "config/") {
+	  $this->jConfig = new JConfig();
+	  $this->jConfig->import("${_path}connection.json","connection");
+	  $this->jConfig->import("${_path}misc.json");
+	  $this->jConfig->import("${_path}router.json");
+	}
   }
 ?>

dist/jate/modules/Module/Module.php

Indentation +92 added lines, -92 removed lines

@@ -1,96 +1,96 @@
 <?php
   class Module {
-    public $name;
-    public $modules;
-    public $files;
-    public $required;
-    public $data;
-    public $tags;
-    public $connection;
-    public $parameters;
-    public function __construct() {
-      $this->name        = get_class($this);
-      $this->modules    = [];
-      $this->files      = [];
-      $this->required    = [];
-      $this->data        = [];
-      $this->tags        = [];
-      $this->connection  = null;
-      $this->parameters = null;
-    }
-    // abstract public function config();
-    // abstract public function init();
-    // abstract public function draw();
-    public function getCss() {
-      return $this->getRequire("getCss",".css");
-    }
-    public function getJs() {
-      return $this->getRequire("getJs",".js");
-    }
-    public function getJsVariables() {
-      $temp = [];
-      foreach ($this->required as $i)
-        if (is_array($i))
-          array_push($temp,$i);
-      foreach ($this->modules as $i)
-        $temp = array_merge( $temp, $i->getJsVariables() );
-      foreach ($this->files as $i)
-        if (is_array($i))
-          array_push($temp,$i);
-      return $temp;
-    }
-    public function addModules( $_mods ) {
-      if(!is_array($_mods))
-        throw new InvalidArgumentException("Parameter must be an array.");
-      foreach ($_mods as $value)
-        $this->addModule($value);
-    }
-    public function addModule( $_mod ) {
-      if(!is_object($_mod))
-        throw new InvalidArgumentException("Parameter must be a class.");
-      if(! is_subclass_of ($_mod, "Module"))
-        throw new InvalidArgumentException("Parameter must be a class.");
-      $this->modules[$_mod->name] = $_mod;
-      $this->modules[$_mod->name]->parameters = &$this->parameters;
-    }
-    public function addFiles( $_files ) {
-      if(!is_array($_files))
-        throw new InvalidArgumentException("Parameter must be an array.");
-      foreach ($_files as $value)
-        $this->addFile($value);
-    }
-    public function addFile( $_file ) {
-      if(!(is_string($_file) || is_array($_file)))
-        throw new InvalidArgumentException("Parameter must be a string or an array.");
-      array_push($this->files, $_file);
-    }
-    public function addFilesRequired( $_files ) {
-      if(!is_array($_files))
-        throw new InvalidArgumentException("Parameter must be an array.");
-      foreach ($_files as $value)
-        $this->addFileRequired($value);
-    }
-    public function addFileRequired( $_file ) {
-      if(!is_string($_file))
-        throw new InvalidArgumentException("Parameter must be a string.");
-      array_push($this->required, $_file);
-    }
-    protected function addDipendences() {
-      $this->tags["css"] = $this->getCss();
-      $this->tags["js"] = $this->getJs();
-      $this->tags["jsVariables"] = $this->getJsVariables();
-    }
-    protected function getRequire( $_function, $_extenction) {
-      $temp = [];
-      foreach ($this->required as $i)
-        if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
-          array_push($temp,$i);
-      foreach ($this->modules as $i)
-        $temp = array_merge( $temp, $i->$_function() );
-      foreach ($this->files as $i)
-        if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
-          array_push($temp,$i);
-      return $temp;
-    }
+	public $name;
+	public $modules;
+	public $files;
+	public $required;
+	public $data;
+	public $tags;
+	public $connection;
+	public $parameters;
+	public function __construct() {
+	  $this->name        = get_class($this);
+	  $this->modules    = [];
+	  $this->files      = [];
+	  $this->required    = [];
+	  $this->data        = [];
+	  $this->tags        = [];
+	  $this->connection  = null;
+	  $this->parameters = null;
+	}
+	// abstract public function config();
+	// abstract public function init();
+	// abstract public function draw();
+	public function getCss() {
+	  return $this->getRequire("getCss",".css");
+	}
+	public function getJs() {
+	  return $this->getRequire("getJs",".js");
+	}
+	public function getJsVariables() {
+	  $temp = [];
+	  foreach ($this->required as $i)
+		if (is_array($i))
+		  array_push($temp,$i);
+	  foreach ($this->modules as $i)
+		$temp = array_merge( $temp, $i->getJsVariables() );
+	  foreach ($this->files as $i)
+		if (is_array($i))
+		  array_push($temp,$i);
+	  return $temp;
+	}
+	public function addModules( $_mods ) {
+	  if(!is_array($_mods))
+		throw new InvalidArgumentException("Parameter must be an array.");
+	  foreach ($_mods as $value)
+		$this->addModule($value);
+	}
+	public function addModule( $_mod ) {
+	  if(!is_object($_mod))
+		throw new InvalidArgumentException("Parameter must be a class.");
+	  if(! is_subclass_of ($_mod, "Module"))
+		throw new InvalidArgumentException("Parameter must be a class.");
+	  $this->modules[$_mod->name] = $_mod;
+	  $this->modules[$_mod->name]->parameters = &$this->parameters;
+	}
+	public function addFiles( $_files ) {
+	  if(!is_array($_files))
+		throw new InvalidArgumentException("Parameter must be an array.");
+	  foreach ($_files as $value)
+		$this->addFile($value);
+	}
+	public function addFile( $_file ) {
+	  if(!(is_string($_file) || is_array($_file)))
+		throw new InvalidArgumentException("Parameter must be a string or an array.");
+	  array_push($this->files, $_file);
+	}
+	public function addFilesRequired( $_files ) {
+	  if(!is_array($_files))
+		throw new InvalidArgumentException("Parameter must be an array.");
+	  foreach ($_files as $value)
+		$this->addFileRequired($value);
+	}
+	public function addFileRequired( $_file ) {
+	  if(!is_string($_file))
+		throw new InvalidArgumentException("Parameter must be a string.");
+	  array_push($this->required, $_file);
+	}
+	protected function addDipendences() {
+	  $this->tags["css"] = $this->getCss();
+	  $this->tags["js"] = $this->getJs();
+	  $this->tags["jsVariables"] = $this->getJsVariables();
+	}
+	protected function getRequire( $_function, $_extenction) {
+	  $temp = [];
+	  foreach ($this->required as $i)
+		if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
+		  array_push($temp,$i);
+	  foreach ($this->modules as $i)
+		$temp = array_merge( $temp, $i->$_function() );
+	  foreach ($this->files as $i)
+		if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
+		  array_push($temp,$i);
+	  return $temp;
+	}
   }
 ?>

dist/jate/modules/GUI/GUI.php

Indentation +43 added lines, -43 removed lines

@@ -3,48 +3,48 @@
   jRequire("../Pug/Pug.php");
   jRequire("../Twig/Twig.php");
   class GUI extends Module {
-    public function __construct() {
-      parent::__construct();
-    }
-    public function init( $_page ) {
-      $this->tags = $_page->tags;
-    }
-    public function draw( $_template ) {
-      $page = "";
-      $extension = explode(".",$_template);
-      $extension = $extension[count($extension)-1];
-      $page = $this->parsingFile($_template, $extension);
-      $render = $this->overlayTag($page);
-      echo minifyOutput($render);
-    }
-    protected function overlayTag( $_page ) {
-      foreach($this->tags as $key => $value)
-        if(!is_array($value))
-          $_page = str_replace("<_${key}_>", "$value", $_page);
-      return $_page;
-    }
-    protected function parsingFile( $_file, $_type = "html" ) {
-      switch ($_type) {
-        case 'pug':
-        case 'jade':
-          $pug = new Pug();
-          $page = $pug->drawFile($_file);
-        break;
-        case "md":
-        case "markdown":
-        case "parsedown":
-          $Parsedown = new Parsedown();
-          $page = $Parsedown->drawFile($_file);
-        break;
-        case 'twig':
-          $twig = new Twig();
-          $page = $twig->drawFile($_file);
-        break;
-        default:
-          $page = file_get_contents($_file);
-        break;
-      }
-      return $page;
-    }
+	public function __construct() {
+	  parent::__construct();
+	}
+	public function init( $_page ) {
+	  $this->tags = $_page->tags;
+	}
+	public function draw( $_template ) {
+	  $page = "";
+	  $extension = explode(".",$_template);
+	  $extension = $extension[count($extension)-1];
+	  $page = $this->parsingFile($_template, $extension);
+	  $render = $this->overlayTag($page);
+	  echo minifyOutput($render);
+	}
+	protected function overlayTag( $_page ) {
+	  foreach($this->tags as $key => $value)
+		if(!is_array($value))
+		  $_page = str_replace("<_${key}_>", "$value", $_page);
+	  return $_page;
+	}
+	protected function parsingFile( $_file, $_type = "html" ) {
+	  switch ($_type) {
+		case 'pug':
+		case 'jade':
+		  $pug = new Pug();
+		  $page = $pug->drawFile($_file);
+		break;
+		case "md":
+		case "markdown":
+		case "parsedown":
+		  $Parsedown = new Parsedown();
+		  $page = $Parsedown->drawFile($_file);
+		break;
+		case 'twig':
+		  $twig = new Twig();
+		  $page = $twig->drawFile($_file);
+		break;
+		default:
+		  $page = file_get_contents($_file);
+		break;
+	  }
+	  return $page;
+	}
   }
 ?>

dist/jate/modules/Twig/Twig.php

Indentation +20 added lines, -20 removed lines

@@ -2,25 +2,25 @@
   // use Twig as Twig;
   jRequire("../Module/Module.php");
   class Twig extends Module {
-    public function __construct() {
-      parent::__construct();
-    }
-    public function drawFile( $_file, $_parameters = [] ) {
-      $loader  = new Twig_Loader_Filesystem('bundles/views');
-      $twig    = new Twig_Environment( $loader, [
-        'cache' => 'bundles/views',
-      ]);
-      $template = $twig->loadTemplate($_text);
-      $page = $template->render($_parameters);
-      return $page;
-    }
-    public function drawText( $_text, $_parameters = [] ) {
-      $loader = new Twig_Loader_Array([
-        'index' => $_text
-      ]);
-      $twig = new Twig_Environment($loader);
-      $page = $twig->render('index', $_parameters);
-      return $page;
-    }
+	public function __construct() {
+	  parent::__construct();
+	}
+	public function drawFile( $_file, $_parameters = [] ) {
+	  $loader  = new Twig_Loader_Filesystem('bundles/views');
+	  $twig    = new Twig_Environment( $loader, [
+		'cache' => 'bundles/views',
+	  ]);
+	  $template = $twig->loadTemplate($_text);
+	  $page = $template->render($_parameters);
+	  return $page;
+	}
+	public function drawText( $_text, $_parameters = [] ) {
+	  $loader = new Twig_Loader_Array([
+		'index' => $_text
+	  ]);
+	  $twig = new Twig_Environment($loader);
+	  $page = $twig->render('index', $_parameters);
+	  return $page;
+	}
   }
 ?>

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

Indentation +5 added lines, -5 removed lines

@@ -1,9 +1,9 @@
 <?php
   interface ConnectionAdapterInterface {
-    public function __construct( $_srv, $_db, $_usr, $_pass);
-    public function query( $_query );
-    public function queryFetch( $_query );
-    public function queryArray( $_query );
-    public function queryInsert( $_query );
+	public function __construct( $_srv, $_db, $_usr, $_pass);
+	public function query( $_query );
+	public function queryFetch( $_query );
+	public function queryArray( $_query );
+	public function queryInsert( $_query );
   }
 ?>

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

Indentation +35 added lines, -35 removed lines

@@ -1,40 +1,40 @@
 <?php
   jRequire("ConnectionInterface.php");
   class ConnectionPdoAdapter implements ConnectionAdapterInterface {
-      public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
-        $connection = "mysql:host=$_srv;dbname=$_db";
-        $this->connection = new PDO( $connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"] );
-      }
-      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;
-        $error = "Error query [$_query]";
-        $query = $database->prepare($_query);
-        $result = $query->execute();
-        if(!$result) {
-          echo "$_query<br>";
-          echo "Something wrong: $error";
-          var_dump($query->errorInfo());
-          var_dump($database->errorInfo());
-          exit();
-        }
-        return $query;
-      }
+	  public $connection;
+	  public function __construct( $_srv, $_db, $_usr, $_pass ) {
+		$connection = "mysql:host=$_srv;dbname=$_db";
+		$this->connection = new PDO( $connection, $_usr, $_pass, [PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"] );
+	  }
+	  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;
+		$error = "Error query [$_query]";
+		$query = $database->prepare($_query);
+		$result = $query->execute();
+		if(!$result) {
+		  echo "$_query<br>";
+		  echo "Something wrong: $error";
+		  var_dump($query->errorInfo());
+		  var_dump($database->errorInfo());
+		  exit();
+		}
+		return $query;
+	  }
   }
 ?>

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

Indentation +38 added lines, -38 removed lines

@@ -1,43 +1,43 @@
 <?php
   jRequire("ConnectionInterface.php");
   class ConnectionMysqliAdapter implements ConnectionAdapterInterface {
-      public $connection;
-      public function __construct( $_srv, $_db, $_usr, $_pass ) {
-        $this->connection = new mysqli( $_srv, $_usr, $_pass, $_db );
-      }
-      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;
-        $error = "Error query [$_query]";
-        $result = $database->query($_query);
-        if(!$result) {
-          echo "$_query<br>";
-          echo "Something wrong: $error";
-          var_dump($database->error);
-          exit();
-        }
-        return $result;
-      }
+	  public $connection;
+	  public function __construct( $_srv, $_db, $_usr, $_pass ) {
+		$this->connection = new mysqli( $_srv, $_usr, $_pass, $_db );
+	  }
+	  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;
+		$error = "Error query [$_query]";
+		$result = $database->query($_query);
+		if(!$result) {
+		  echo "$_query<br>";
+		  echo "Something wrong: $error";
+		  var_dump($database->error);
+		  exit();
+		}
+		return $result;
+	  }
   }
 ?>