XaBerr / JATE

dist/jate/functions/block.php

Doc Comments +3 added lines

@@ -9,6 +9,9 @@
     return jBlockEnd($_type, $_parameters);
   }
 
+  /**
+   * @param string $_path
+   */
   function jBlockFile( $_path, $_parameters = [] ) {
     try {
       $temp = Parser::parseFile($_path, $_parameters);

Indentation +26 added lines, -26 removed lines

@@ -2,46 +2,46 @@
   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());
-    }
-    return $temp;
+	try {
+	  $temp = Parser::parseFile($_path, $_parameters);
+	} catch (Exception $e) {
+	  throw new JException($e->getMessage());
+	}
+	return $temp;
   }
 
   function jBlockFileMan( $_path, $_type, $_parameters = [] ) {
-    try {
-      $temp = Parser::parseFileMan($_path, $_parameters, $_type);
-    } catch (Exception $e) {
-      throw new JException($e->getMessage());
-    }
-    return $temp;
+	try {
+	  $temp = Parser::parseFileMan($_path, $_parameters, $_type);
+	} catch (Exception $e) {
+	  throw new JException($e->getMessage());
+	}
+	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());
-    }
-    return $temp;
+	$text = ob_get_clean();
+	try {
+	  $temp = Parser::parseText($text, $_parameters, $_type);
+	} catch (Exception $e) {
+	  throw new JException($e->getMessage());
+	}
+	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/functions/errorHandler.php

Doc Comments +3 added lines

@@ -1,4 +1,7 @@
 <?php
+  /**
+   * @param integer $number
+   */
   function jateErrorHandler($number, $message, $file, $line) {
     if (!(error_reporting() & $number)) {
       return false;

Indentation +12 added lines, -12 removed lines

@@ -1,11 +1,11 @@ 
 <?php
   function jateErrorHandler($number, $message, $file, $line) {
-    if (!(error_reporting() & $number)) {
-      return false;
-    }
-    ob_end_clean();
-    $message = JException::decode($message);
-    echo "
+	if (!(error_reporting() & $number)) {
+	  return false;
+	}
+	ob_end_clean();
+	$message = JException::decode($message);
+	echo "
       <div id='error'>
         <header>
         JATE ERROR
@@ -51,14 +51,14 @@ 
         }
       </style>
     ";
-    exit(1);
-    return true;
+	exit(1);
+	return true;
   }
   function fatalErrorShutdownHandler() {
-    $last_error = error_get_last();
-    if ($last_error['type'] === E_ERROR) {
-      jateErrorHandler(E_ERROR, $last_error['message'], $last_error['file'], $last_error['line']);
-    }
+	$last_error = error_get_last();
+	if ($last_error['type'] === E_ERROR) {
+	  jateErrorHandler(E_ERROR, $last_error['message'], $last_error['file'], $last_error['line']);
+	}
   }
   set_error_handler('jateErrorHandler');
   register_shutdown_function('fatalErrorShutdownHandler');

dist/jate/modules/Connection/Connection.php

Doc Comments +4 added lines

@@ -3,6 +3,10 @@
   class Connection {
     public $database;
     public $info;
+
+    /**
+     * @param JConfig $_object
+     */
     public function __construct( $_object ) {
       if(!is_object($_object))
         throw new InvalidArgumentException("Parameter must be an object.");

Indentation +37 added lines, -37 removed lines

@@ -1,42 +1,42 @@
 <?php
   requireComponents("Adapters");
   class Connection {
-    public $database;
-    public $info;
-    public function __construct( $_object ) {
-      if(!is_object($_object))
-        throw new InvalidArgumentException("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 "memory":
-          $this->database = new PdoMemoryAdapter($_srv, $_db, $_usr, $_pass);
-        break;
-        case "pdo":
-        default:
-          $this->database = new PdoAdapter($_srv, $_db, $_usr, $_pass);
-        break;
-      }
-    }
-    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 InvalidArgumentException("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 "memory":
+		  $this->database = new PdoMemoryAdapter($_srv, $_db, $_usr, $_pass);
+		break;
+		case "pdo":
+		default:
+		  $this->database = new PdoAdapter($_srv, $_db, $_usr, $_pass);
+		break;
+	  }
+	}
+	protected function getConnectionType( $_type ) {
+	  $array = (array)$_type;
+	  foreach ($array as $key => $value)
+		if($value)
+		  return $key;
+	  return "pdo";
+	}
   }
 ?>

dist/jate/modules/File/File.php

Doc Comments +4 added lines

@@ -47,6 +47,10 @@
       if(!(file_exists($_file) || $this->isCorrectUrl($_file)))
         throw new JException("File [$_file] not found.");
     }
+
+    /**
+     * @param string $_url
+     */
     protected function isCorrectUrl( $_url ) {
       return strpos(@get_headers($_url)[0],'200') === false ? false : true;
     }

Indentation +50 added lines, -50 removed lines

@@ -1,54 +1,54 @@
 <?php
   trait File {
-    private $files;
-    public function __construct() {
-      $this->files = [
-        "required" => [],
-        "attached" => []
-      ];
-    }
-    public function addFile( $_file ) {
-      try {
-      $this->isCorrectPath($_file);
-      } catch( Exception $e) {
-        throw new JException($e->getMessage());
-      }
-      $this->files["attached"][] = $_file;
-    }
-    public function addFileRequired( $_file ) {
-      try {
-        $this->isCorrectPath($_file);
-      } catch( Exception $e) {
-        throw new JException($e->getMessage());
-      }
-      $this->files["required"][] = $_file;
-    }
-    public function addFiles( $_files ) {
-      if(!is_array($_files))
-        throw new JException("Parameter must be an array.");
-      foreach ($_files as $value)
-        $this->addFile($value);
-    }
-    public function addFilesRequired( $_files ) {
-      if(!is_array($_files))
-        throw new JException("Parameter must be an array.");
-      foreach ($_files as $value)
-        $this->addFileRequired($value);
-    }
-    public function getFiles() {
-      return $this->files["attached"];
-    }
-    public function getFilesRequired() {
-      return $this->files["required"];
-    }
-    protected function isCorrectPath( $_file ) {
-      if(!is_string($_file))
-        throw new JException("Path must be a string.");
-      if(!(file_exists($_file) || $this->isCorrectUrl($_file)))
-        throw new JException("File [$_file] not found.");
-    }
-    protected function isCorrectUrl( $_url ) {
-      return strpos(@get_headers($_url)[0],'200') === false ? false : true;
-    }
+	private $files;
+	public function __construct() {
+	  $this->files = [
+		"required" => [],
+		"attached" => []
+	  ];
+	}
+	public function addFile( $_file ) {
+	  try {
+	  $this->isCorrectPath($_file);
+	  } catch( Exception $e) {
+		throw new JException($e->getMessage());
+	  }
+	  $this->files["attached"][] = $_file;
+	}
+	public function addFileRequired( $_file ) {
+	  try {
+		$this->isCorrectPath($_file);
+	  } catch( Exception $e) {
+		throw new JException($e->getMessage());
+	  }
+	  $this->files["required"][] = $_file;
+	}
+	public function addFiles( $_files ) {
+	  if(!is_array($_files))
+		throw new JException("Parameter must be an array.");
+	  foreach ($_files as $value)
+		$this->addFile($value);
+	}
+	public function addFilesRequired( $_files ) {
+	  if(!is_array($_files))
+		throw new JException("Parameter must be an array.");
+	  foreach ($_files as $value)
+		$this->addFileRequired($value);
+	}
+	public function getFiles() {
+	  return $this->files["attached"];
+	}
+	public function getFilesRequired() {
+	  return $this->files["required"];
+	}
+	protected function isCorrectPath( $_file ) {
+	  if(!is_string($_file))
+		throw new JException("Path must be a string.");
+	  if(!(file_exists($_file) || $this->isCorrectUrl($_file)))
+		throw new JException("File [$_file] not found.");
+	}
+	protected function isCorrectUrl( $_url ) {
+	  return strpos(@get_headers($_url)[0],'200') === false ? false : true;
+	}
   }
 ?>

dist/jate/modules/Html/Html.php

Doc Comments +5 added lines

@@ -83,6 +83,11 @@
       $this->tags["js"]    = $this->getJs();
       $this->tags["jsVar"] = $this->getJsVars();
     }
+
+    /**
+     * @param string $_function
+     * @param string $_extenction
+     */
     protected function getRequire( $_function, $_extenction) {
       $temp = [];
       $filesRequired = $this->getFilesRequired();

Indentation +94 added lines, -94 removed lines

@@ -3,99 +3,99 @@
   requireComponent("../Module/Module.php");
   requireComponent("../JException/JException.php");
   abstract class Html extends Module {
-    public $template;
-    public $app;
-    public $page;
-    public $tags;
-    public $jsVars;
-    public function __construct() {
-      parent::__construct();
-      $this->template = "";
-      $this->app      = [];
-      $this->page     = [];
-      $this->jsVars   = [];
-      $this->tags     = [
-        "css"   => [],
-        "js"    => [],
-        "jsVar" => [],
-        "base"  => ""
-      ];
-    }
-    public function setParameters( $_parameters = [ "app" => null, "page" => null] ) {
-    $this->app  = $_parameters["app"];
-    $this->page = $_parameters["page"];
-    }
-    abstract public function init();
-    public function draw() {
-      if($this->template == "")
-        throw new JException("The variable \$this->template must be set in class $this->name function init().");
-      $server = new ServerVars();
-      $this->addDipendences();
-      $this->tags["css"]  = array_unique($this->tags["css"]);
-      $this->tags["js"]   = array_unique($this->tags["js"]);
-      $this->tags["base"] = $server->server["RELATIVE"]."/";
-      $this->stringifyDipendences();
-      return jBlockFile($this->template, $this->tags);
-    }
-    public function getCss() {
-      return $this->getRequire("getCss",".css");
-    }
-    public function getJs() {
-      return $this->getRequire("getJs",".js");
-    }
-    public function getJsVars() {
-      return $this->jsVars;
-    }
-    public function addJsVar( $_name, $_value ) {
-      if(!is_string($_name))
-        throw new InvalidArgumentException("Parameter name must be a string.");
-      if(!is_string($_value))
-        throw new InvalidArgumentException("Parameter value must be a string.");
-      $this->jsVars[] = [$_name, $_value];
-    }
-    public function addJsVars( $_array ) {
-      if(!is_array($_array))
-        throw new InvalidArgumentException("Parameter must be an array.");
-      foreach ($_array as $value)
-        $this->addJsVar($value[0], $value[1]);
-    }
-    protected function stringifyDipendences() {
-      $tempStr = "";
-      $timeParameter = "?t=".time();
-      $time = ($this->app->cache->css == true) ? "" : $timeParameter;
-      foreach ($this->tags["css"] as $i)
-      $tempStr .= "<link rel='stylesheet' href='$i$time'>";
-      $this->tags["css"] = $tempStr;
-      $tempStr = "";
-      $time = ($this->app->cache->js == true) ? "" : $timeParameter;
-      foreach ($this->tags["js"] as $i)
-      $tempStr .= "<script src='$i$time'></script>";
-      $this->tags["js"] = $tempStr;
-      $tempStr = "";
-      $tempStr .= "<script type='text/javascript'>";
-      foreach ($this->tags["jsVar"] as $i)
-      $tempStr .= " $i[0] = $i[1];\n";
-      $tempStr .= "</script>";
-      $this->tags["jsVar"] = $tempStr;
-    }
-    protected function addDipendences() {
-      $this->tags["css"]   = $this->getCss();
-      $this->tags["js"]    = $this->getJs();
-      $this->tags["jsVar"] = $this->getJsVars();
-    }
-    protected function getRequire( $_function, $_extenction) {
-      $temp = [];
-      $filesRequired = $this->getFilesRequired();
-      $files         = $this->getFiles();
-      foreach ($filesRequired as $i)
-        if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
-          $temp[] = $i;
-      foreach ($this->modules as $i)
-        $temp = array_merge( $temp, $i->$_function() );
-      foreach ($files as $i)
-        if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
-          $temp[] = $i;
-      return $temp;
-    }
+	public $template;
+	public $app;
+	public $page;
+	public $tags;
+	public $jsVars;
+	public function __construct() {
+	  parent::__construct();
+	  $this->template = "";
+	  $this->app      = [];
+	  $this->page     = [];
+	  $this->jsVars   = [];
+	  $this->tags     = [
+		"css"   => [],
+		"js"    => [],
+		"jsVar" => [],
+		"base"  => ""
+	  ];
+	}
+	public function setParameters( $_parameters = [ "app" => null, "page" => null] ) {
+	$this->app  = $_parameters["app"];
+	$this->page = $_parameters["page"];
+	}
+	abstract public function init();
+	public function draw() {
+	  if($this->template == "")
+		throw new JException("The variable \$this->template must be set in class $this->name function init().");
+	  $server = new ServerVars();
+	  $this->addDipendences();
+	  $this->tags["css"]  = array_unique($this->tags["css"]);
+	  $this->tags["js"]   = array_unique($this->tags["js"]);
+	  $this->tags["base"] = $server->server["RELATIVE"]."/";
+	  $this->stringifyDipendences();
+	  return jBlockFile($this->template, $this->tags);
+	}
+	public function getCss() {
+	  return $this->getRequire("getCss",".css");
+	}
+	public function getJs() {
+	  return $this->getRequire("getJs",".js");
+	}
+	public function getJsVars() {
+	  return $this->jsVars;
+	}
+	public function addJsVar( $_name, $_value ) {
+	  if(!is_string($_name))
+		throw new InvalidArgumentException("Parameter name must be a string.");
+	  if(!is_string($_value))
+		throw new InvalidArgumentException("Parameter value must be a string.");
+	  $this->jsVars[] = [$_name, $_value];
+	}
+	public function addJsVars( $_array ) {
+	  if(!is_array($_array))
+		throw new InvalidArgumentException("Parameter must be an array.");
+	  foreach ($_array as $value)
+		$this->addJsVar($value[0], $value[1]);
+	}
+	protected function stringifyDipendences() {
+	  $tempStr = "";
+	  $timeParameter = "?t=".time();
+	  $time = ($this->app->cache->css == true) ? "" : $timeParameter;
+	  foreach ($this->tags["css"] as $i)
+	  $tempStr .= "<link rel='stylesheet' href='$i$time'>";
+	  $this->tags["css"] = $tempStr;
+	  $tempStr = "";
+	  $time = ($this->app->cache->js == true) ? "" : $timeParameter;
+	  foreach ($this->tags["js"] as $i)
+	  $tempStr .= "<script src='$i$time'></script>";
+	  $this->tags["js"] = $tempStr;
+	  $tempStr = "";
+	  $tempStr .= "<script type='text/javascript'>";
+	  foreach ($this->tags["jsVar"] as $i)
+	  $tempStr .= " $i[0] = $i[1];\n";
+	  $tempStr .= "</script>";
+	  $this->tags["jsVar"] = $tempStr;
+	}
+	protected function addDipendences() {
+	  $this->tags["css"]   = $this->getCss();
+	  $this->tags["js"]    = $this->getJs();
+	  $this->tags["jsVar"] = $this->getJsVars();
+	}
+	protected function getRequire( $_function, $_extenction) {
+	  $temp = [];
+	  $filesRequired = $this->getFilesRequired();
+	  $files         = $this->getFiles();
+	  foreach ($filesRequired as $i)
+		if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
+		  $temp[] = $i;
+	  foreach ($this->modules as $i)
+		$temp = array_merge( $temp, $i->$_function() );
+	  foreach ($files as $i)
+		if (!is_array($i) && strpos($i, $_extenction) !== FALSE)
+		  $temp[] = $i;
+	  return $temp;
+	}
   }
 ?>

dist/jate/modules/Parser/Adapters/ParserAbstract.php

Doc Comments +8 added lines

@@ -1,8 +1,16 @@
 <?php
   abstract class ParserAbstract {
+
+    /**
+     * @param string $_text
+     */
     public function drawText( $_text, $_parameters = [] ) {
       return $this->draw(trim($_text), $_parameters);
     }
+
+    /**
+     * @param string $_text
+     */
     abstract public function draw( $_text, $_parameters = [] );
   }
 ?>

Indentation +4 added lines, -4 removed lines

@@ -1,8 +1,8 @@
 <?php
   abstract class ParserAbstract {
-    public function drawText( $_text, $_parameters = [] ) {
-      return $this->draw(trim($_text), $_parameters);
-    }
-    abstract public function draw( $_text, $_parameters = [] );
+	public function drawText( $_text, $_parameters = [] ) {
+	  return $this->draw(trim($_text), $_parameters);
+	}
+	abstract public function draw( $_text, $_parameters = [] );
   }
 ?>

dist/jate/modules/Parser/Parser.php

Doc Comments +8 added lines

@@ -2,6 +2,10 @@ 
   requireComponents("Adapters");
   jRequire("../JException/JException.php");
   class Parser {
+
+    /**
+     * @param string $_type
+     */
     private static function setParser ( $_type ) {
       $parser = null;
       $_type = strtolower($_type);
@@ -27,6 +31,10 @@ 
       }
       return $parser;
     }
+
+    /**
+     * @param string $_text
+     */
     public static function parseText( $_text, $_parameters = [], $_type = "html" ) {
       if(!is_string($_text) || !is_string($_type))
         throw new JException("Parameter must be a string.");

Indentation +61 added lines, -61 removed lines

@@ -2,66 +2,66 @@
   requireComponents("Adapters");
   jRequire("../JException/JException.php");
   class Parser {
-    private static function setParser ( $_type ) {
-      $parser = null;
-      $_type = strtolower($_type);
-      switch ($_type) {
-        case "twig":
-          $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":
+		  $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/Query/Query.php

Doc Comments +4 added lines

@@ -22,6 +22,10 @@
         throw new JException($e->getMessage(), 1);
       }
     }
+
+    /**
+     * @param Connection $_connection
+     */
     public function addConnectionMan( $_connection, $_name = "default") {
       if(!is_object($_connection) || !is_a($_connection, "Connection"))
         throw new JException("Parameter must be a Connection object.", 1);

Indentation +79 added lines, -79 removed lines

@@ -3,84 +3,84 @@
   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 $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;
+	}
   }
 ?>

dist/jate/functions/array.php

Indentation +32 added lines, -32 removed lines

@@ -1,51 +1,51 @@
 <?php
   function utf8ize($_array) {
-    return travelStringArray($_array,"utf8_encode");
+	return travelStringArray($_array,"utf8_encode");
   }
   function unutf8ize($_array) {
-    return travelStringArray($_array,"utf8_decode");
+	return travelStringArray($_array,"utf8_decode");
   }
   function arraySlash($_array) {
-    return travelStringArray($_array,"addslashes");
+	return travelStringArray($_array,"addslashes");
   }
   function arrayHtmlParser($_array) {
-    return travelStringArray($_array,"htmlParser");
+	return travelStringArray($_array,"htmlParser");
   }
   function travelStringArray ( $_array, $_function ) {
-    if (is_array($_array)) {
-      foreach ($_array as $k => $v) {
-        $_array[$k] = travelStringArray($v, $_function);
-      }
-    } else if (is_string ($_array)) {
-      return call_user_func($_function,$_array);
-    }
-    return $_array;
+	if (is_array($_array)) {
+	  foreach ($_array as $k => $v) {
+		$_array[$k] = travelStringArray($v, $_function);
+	  }
+	} else if (is_string ($_array)) {
+	  return call_user_func($_function,$_array);
+	}
+	return $_array;
   }
   function arrayDepth( $_array ) {
-    $maxDepth = 1;
-    foreach ($_array as $value) {
-      if (is_array($value)) {
-        $depth = arrayDepth($value) + 1;
-        if ($depth > $maxDepth) {
-          $maxDepth = $depth;
-        }
-      }
-    }
-    return $maxDepth;
+	$maxDepth = 1;
+	foreach ($_array as $value) {
+	  if (is_array($value)) {
+		$depth = arrayDepth($value) + 1;
+		if ($depth > $maxDepth) {
+		  $maxDepth = $depth;
+		}
+	  }
+	}
+	return $maxDepth;
   }
   function arrayDump( $_array, $_name = "Array", $_tab = "&nbsp;&nbsp;" ) {
-    $position = preg_replace('/&nbsp;&nbsp;/', '', $_tab, 1);
-    echo "$position<span style=\"color:rgb(230,0,0)\">$_name:</span><br>";
-    foreach ($_array as $k => $i)
-      if(is_array($i))
-        arrayDump( $i, $k, "&nbsp;&nbsp;$_tab" );
-      else if(is_object($i))
-        echo "$_tab<b>object:</b> [Object]<br>";
-      else
-        echo "$_tab<b>$k:</b> $i<br>";
+	$position = preg_replace('/&nbsp;&nbsp;/', '', $_tab, 1);
+	echo "$position<span style=\"color:rgb(230,0,0)\">$_name:</span><br>";
+	foreach ($_array as $k => $i)
+	  if(is_array($i))
+		arrayDump( $i, $k, "&nbsp;&nbsp;$_tab" );
+	  else if(is_object($i))
+		echo "$_tab<b>object:</b> [Object]<br>";
+	  else
+		echo "$_tab<b>$k:</b> $i<br>";
   }
 
   function htmlParser( $_str) {
-    return htmlentities($_str, ENT_QUOTES | ENT_IGNORE, "UTF-8");
+	return htmlentities($_str, ENT_QUOTES | ENT_IGNORE, "UTF-8");
   }
 ?>