From 17eee9529f7f4acadbf21cb8dfbb21e4e49189c1 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 23 Nov 2015 10:46:35 +0200
Subject: [PATCH 001/114] fix upload remove user not logged error with force

---
 system/module/Upload.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/system/module/Upload.php b/system/module/Upload.php
index f80108a..b53da12 100644
--- a/system/module/Upload.php
+++ b/system/module/Upload.php
@@ -466,10 +466,11 @@ public static function remove($ids,$force=false){
 		$ids = implode(",", $ids);
 
 		Module::import("Query");
-		Module::import("User");
-		$user = User::info();
-		if(!$user->status)return $user;
-
+		if(!$force){
+			Module::import("User");
+			$user = User::info();
+			if(!$user->status)return $user;
+		}
 		$where = array("id"=>":in:{$ids}");
 		if(!$force)$where['author'] = $user->data[0]['id'];
 

From caadfea0e93297189fbab1da591a4a428719e60c Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 24 Nov 2015 00:48:54 +0200
Subject: [PATCH 002/114] define vendor assets function

---
 system/core/Assets.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/core/Assets.php b/system/core/Assets.php
index 3863484..13cffba 100644
--- a/system/core/Assets.php
+++ b/system/core/Assets.php
@@ -159,6 +159,6 @@ public static function element($src,$folder="vendor",$listener='element'){
 	public static function vendor($src=''){
 		global $config;
 
-		return Request::base("{$config['app']}/vendor");
+		return Request::base("{$config['app']}/vendor{$src}");
 	}
 }
\ No newline at end of file

From 0ba0e1dd80e31b53768712bd817d9db12f7b1f8a Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 24 Nov 2015 00:49:32 +0200
Subject: [PATCH 003/114] add index for each loop directive by varIndex or
 __index

---
 system/module/Directives.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 6d87a20..5e1d3c7 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -48,8 +48,12 @@ public static function __bootstrap(){
 			'callback' 	=> function($match){
 				$str = "";
 				$ex = explode(' in ',trim($match[1]));
-				foreach(Controller::$scope->$ex[1] as $file){
+				foreach(Controller::$scope->$ex[1] as $k => $file){
 					Controller::$scope->$ex[0] = $file;
+					$index = "{$ex[0]}Index";
+					echo $index;
+					Controller::$scope->$index = $k;
+					Controller::$scope->__index = $k;
 					$str .= Shortcode::trigger($match[2]);
 				}
 				return $str;

From dee9c8c29bf76f4a80f67fcea71b005e18a3a2e5 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 24 Nov 2015 00:50:11 +0200
Subject: [PATCH 004/114] getting started with Object module and adding get and
 fetch functions

---
 system/module/Object.php | 54 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 system/module/Object.php

diff --git a/system/module/Object.php b/system/module/Object.php
new file mode 100644
index 0000000..07828a8
--- /dev/null
+++ b/system/module/Object.php
@@ -0,0 +1,54 @@
+<?php  if (!defined('VERSION'))exit('Direct access to this location is not permitted.');
+/**
+ * Purecis Object Module
+ *
+ * control URL Parameters 
+ *
+ * @package		codeHive
+ * @subpackage	Module
+ * @category	Libraries
+ * @author		Tamer Zorba
+ * @link		http://purecis.com/
+ */
+
+class Object{
+
+	/**
+	 * Object get
+	 *
+	 * Fetching Data from Object table by Taxonomy
+	 *
+	 * @access	public
+	 * @param	taxonomy string 
+	 * @param	array 	sql array 
+	 * @return	void
+	 */
+	public static function get( $taxonomy, $arr=array() ){
+		Module::import("Query");
+
+		if(!is_array($arr["where"]))$arr['where'] = array();
+		$arr['where']['taxonomy'] = $taxonomy;
+
+		return Query::get("objects",$arr);
+	}
+
+	/**
+	 * Object fetch
+	 *
+	 * Fetching Data from Object table by Taxonomy
+	 *
+	 * @access	public
+	 * @param	taxonomy string 
+	 * @param	array 	data array 
+	 * @return	void
+	 */
+	public static function fetch( $taxonomy, $data=array(), $where=array() ){
+
+		return self::get($taxonomy,["data"=>$data, "where"=>$where]);
+	}
+
+
+}
+
+/* End of file Object.php */
+/* Location: ./system/module/Object.php */
\ No newline at end of file

From 44bd536822aa2983b1cb04b80164a8effeb0488d Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 24 Nov 2015 00:54:16 +0200
Subject: [PATCH 005/114] remove echo for debugging

---
 system/module/Directives.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 5e1d3c7..1515180 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -51,7 +51,6 @@ public static function __bootstrap(){
 				foreach(Controller::$scope->$ex[1] as $k => $file){
 					Controller::$scope->$ex[0] = $file;
 					$index = "{$ex[0]}Index";
-					echo $index;
 					Controller::$scope->$index = $k;
 					Controller::$scope->__index = $k;
 					$str .= Shortcode::trigger($match[2]);

From e258dc509eda9ebfdd4087fe2e5742b731c38228 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Fri, 27 Nov 2015 21:46:54 +0200
Subject: [PATCH 006/114] fixed #7

---
 system/module/Upload.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/module/Upload.php b/system/module/Upload.php
index b53da12..4ba9ae8 100644
--- a/system/module/Upload.php
+++ b/system/module/Upload.php
@@ -301,6 +301,7 @@ public static function push($arr=array()){
 		if($q->status){
 			$cls->status = true;
 			$cls->file = $file;
+			$cls->path = json_encode($file);
 		}else{
 			$cls = $q;
 		}

From 980cf8c61e93cab0d3cda0f94ed84f8570fea72a Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Fri, 27 Nov 2015 22:11:35 +0200
Subject: [PATCH 007/114] update on issue #7

---
 system/module/Upload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/module/Upload.php b/system/module/Upload.php
index 4ba9ae8..4780a13 100644
--- a/system/module/Upload.php
+++ b/system/module/Upload.php
@@ -305,7 +305,7 @@ public static function push($arr=array()){
 		}else{
 			$cls = $q;
 		}
-		return $q;
+		return $cls;
 	}
 
 	/*

From 844d1960561903f3b76e8807ba1806225219a7c7 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Wed, 2 Dec 2015 14:52:07 +0200
Subject: [PATCH 008/114] fixes #9

---
 system/module/Query.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/system/module/Query.php b/system/module/Query.php
index d2f0cbe..7ec5730 100644
--- a/system/module/Query.php
+++ b/system/module/Query.php
@@ -524,12 +524,21 @@ private static function parse_eq($key,$value,$table){
 		}else if(strpos($value, ":inset:") !== false){
 			$value = stripslashes($value);
 			$value = str_replace(":inset:", "", $value);
+
+			$separator = "and";
+			if(strpos($value, "and:") !== false){
+				$value = str_replace("and:", "", $value);
+			}
+			if(strpos($value, "or:") !== false){
+				$separator = "or";
+				$value = str_replace("or:", "", $value);
+			}
 			$ex = explode(",",$value);
 			$temp = array();
 			foreach($ex as $v){
 				array_push($temp,"FIND_IN_SET ({$v},`{$key}`)");
 			}
-			return "(".implode(" or ", $temp).")";
+			return "(".implode(" {$separator} ", $temp).")";
 			
 		}else if(strpos($value, ":in:") !== false){
 			$value = stripslashes($value);

From dcde6aa071b71aab87b12d43860abd5986402989 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Wed, 2 Dec 2015 14:59:51 +0200
Subject: [PATCH 009/114] now where can be string

---
 system/module/Query.php | 83 ++++++++++++++++++++++-------------------
 1 file changed, 45 insertions(+), 38 deletions(-)

diff --git a/system/module/Query.php b/system/module/Query.php
index 7ec5730..b1bc9c8 100644
--- a/system/module/Query.php
+++ b/system/module/Query.php
@@ -215,39 +215,41 @@ public static function execute($arr){
 
 		}
 		if(isset($arr['where'])){
-			if(!isset($arr['join']))$arr['join'] = array();
-			foreach($arr['where'] as $k => $v){
-				//fix value
-				// if array then put or between them 
-				if(is_array($v))continue;
-				if(strpos($v, "~") === 0){
-
-					$v = str_replace("~", "", $v);
-					if(!strpos($v, ".")){
-						if(!self::inStructure($v, $table)){
-							$arr['join']["meta as `{$k}`"] = "`{$k}`.`oid` = `{$table}`.`id` and `{$k}`.`key`='{$k}' and `{$k}`.`table` = '{$table}'";
-							$v = "`{$k}`.`{$v}`";
+			if(is_array($arr['where'])){
+				if(!isset($arr['join']))$arr['join'] = array();
+				foreach($arr['where'] as $k => $v){
+					//fix value
+					// if array then put or between them 
+					if(is_array($v))continue;
+					if(strpos($v, "~") === 0){
+
+						$v = str_replace("~", "", $v);
+						if(!strpos($v, ".")){
+							if(!self::inStructure($v, $table)){
+								$arr['join']["meta as `{$k}`"] = "`{$k}`.`oid` = `{$table}`.`id` and `{$k}`.`key`='{$k}' and `{$k}`.`table` = '{$table}'";
+								$v = "`{$k}`.`{$v}`";
+							}else{
+								$v = "`{$table}`.`{$v}`";
+							}
 						}else{
-							$v = "`{$table}`.`{$v}`";
+							$v = str_replace(".", "`.`", $v);
+							$v = "`{$v}`";
 						}
-					}else{
-						$v = str_replace(".", "`.`", $v);
-						$v = "`{$v}`";
 					}
-				}
-				
-				//fix key
-				if(!self::inStructure($k, $table)){
-					$k = trim($k);
-					if(!strpos($k, ".")){
-						$arr['join']["meta as `{$k}`"] = "`{$k}`.`oid` = `{$table}`.`id` and `{$k}`.`key`='{$k}' and `{$k}`.`table` = '{$table}'";
-						unset($arr['where'][$k]);
-						$arr['where']["{$k}.value"] = $v;
-					}
-				}else{
-					if(!strpos($k, ".")){
-						unset($arr['where'][$k]);
-						$arr['where']["{$table}.{$k}"] = $v;
+					
+					//fix key
+					if(!self::inStructure($k, $table)){
+						$k = trim($k);
+						if(!strpos($k, ".")){
+							$arr['join']["meta as `{$k}`"] = "`{$k}`.`oid` = `{$table}`.`id` and `{$k}`.`key`='{$k}' and `{$k}`.`table` = '{$table}'";
+							unset($arr['where'][$k]);
+							$arr['where']["{$k}.value"] = $v;
+						}
+					}else{
+						if(!strpos($k, ".")){
+							unset($arr['where'][$k]);
+							$arr['where']["{$table}.{$k}"] = $v;
+						}
 					}
 				}
 			}
@@ -329,15 +331,20 @@ public static function execute($arr){
 			array_push($sql, implode($j, " "));
 		}
 		if(isset($arr['where'])){
-			if(sizeof($arr['where']) > 0){
-				$wh = array();
-				array_push($sql, 'where');
-				foreach ($arr['where'] as $key => $value) {
-					array_push($wh, self::parse_eq($key, $value, $table));
+			if(is_array($arr['where'])){
+				if(sizeof($arr['where']) > 0){
+					$wh = array();
+					array_push($sql, 'where');
+					foreach ($arr['where'] as $key => $value) {
+						array_push($wh, self::parse_eq($key, $value, $table));
+					}
+					$seperate = isset($arr['whereSeperator'])?$arr['whereSeperator']:'and';
+					$where = implode($wh, " {$seperate} ");
+					array_push($sql, $where);
 				}
-				$seperate = isset($arr['whereSeperator'])?$arr['whereSeperator']:'and';
-				$where = implode($wh, " {$seperate} ");
-				array_push($sql, $where);
+			}else if(is_string($arr['where'])){
+				array_push($sql, 'where');
+				array_push($sql, $arr['where']);
 			}
 		}
 		if(isset($arr['groupby'])){

From 98486a17ced18ff9773cc5640245cc8367eeff88 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Wed, 2 Dec 2015 15:01:41 +0200
Subject: [PATCH 010/114] fixes #9 set or as default

---
 system/module/Query.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/module/Query.php b/system/module/Query.php
index b1bc9c8..3ee016d 100644
--- a/system/module/Query.php
+++ b/system/module/Query.php
@@ -532,14 +532,14 @@ private static function parse_eq($key,$value,$table){
 			$value = stripslashes($value);
 			$value = str_replace(":inset:", "", $value);
 
-			$separator = "and";
-			if(strpos($value, "and:") !== false){
-				$value = str_replace("and:", "", $value);
-			}
+			$separator = "or";
 			if(strpos($value, "or:") !== false){
-				$separator = "or";
 				$value = str_replace("or:", "", $value);
 			}
+			if(strpos($value, "and:") !== false){
+				$separator = "and";
+				$value = str_replace("and:", "", $value);
+			}
 			$ex = explode(",",$value);
 			$temp = array();
 			foreach($ex as $v){

From bdca6f56dbfe148f4f8420e2ac80fd248defbca5 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 28 Dec 2015 12:11:15 +0200
Subject: [PATCH 011/114] return upload file name and last

---
 system/module/Upload.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/module/Upload.php b/system/module/Upload.php
index 4780a13..cbd605c 100644
--- a/system/module/Upload.php
+++ b/system/module/Upload.php
@@ -302,6 +302,8 @@ public static function push($arr=array()){
 			$cls->status = true;
 			$cls->file = $file;
 			$cls->path = json_encode($file);
+			$cls->name = $filename;
+			$cls->last = $q->last;
 		}else{
 			$cls = $q;
 		}

From aac150fee56ff8caa10e59c17677779e048bd7bf Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 16 Jan 2016 01:01:51 +0200
Subject: [PATCH 012/114] parse elements with objects and spaces

---
 system/core/String.php | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/system/core/String.php b/system/core/String.php
index 604e99f..7f27040 100644
--- a/system/core/String.php
+++ b/system/core/String.php
@@ -288,7 +288,43 @@ public static function approxlen($str,$len=200,$append='...') {
 	 * @param	string attribute string ex (name='abc' value='def')
 	 * @return	array
 	 */
-	public static function parse_attr($att){
+	public static function parse_attr($att,$removeQ=false){
+		$pattern = '/(\\w+)\s*=\\s*("[^"]*"|\'[^\']*\'|[^"\'\\s>]*)/';
+		preg_match_all($pattern, $att, $matches, PREG_SET_ORDER);
+		$attrs = array();
+		foreach ($matches as $match) {
+			if (($match[2][0] == '"' || $match[2][0] == "'") && $match[2][0] == $match[2][strlen($match[2])-1] && $removeQ) {
+				$match[2] = substr($match[2], 1, -1);
+			}
+			$name = strtolower($match[1]);
+			$value = html_entity_decode($match[2]);
+			switch ($name) {
+			case 'class':
+				$attrs[$name] = preg_split('/\s+/', trim($value));
+				break;
+			case 'style':
+				// parse CSS property declarations
+				$attrs[$name] = $value;
+				break;
+			default:
+				$attrs[$name] = $value;
+			}
+		}
+		return $attrs;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Parse Attr
+	 *
+	 * Parse XML, Shortcode Attributes
+	 *
+	 * @access	public
+	 * @param	string attribute string ex (name='abc' value='def')
+	 * @return	array
+	 */
+	public static function xml_parse_attr($att){
 		$att = self::decode($att,true);
 		$x = new SimpleXMLElement("<element {$att} />");
 		$attr = array();

From 154841bb8c57eccae81dcf9057f94431742be6dc Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 16 Jan 2016 01:02:04 +0200
Subject: [PATCH 013/114] register element directive

---
 system/module/Directives.php | 39 ++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 1515180..fa10c4a 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -251,6 +251,45 @@ private static function scope($v){
 		}
 		return stripcslashes($val);
 	}
+
+	public static function register($element, $cb){
+		Shortcode::register(array(
+			'code' 		=> "element_{$element}",
+			'pattern' 	=> "%\<{$element} (\b[^<\>]*+)\>((?:(?:(?!\</?{$element}\b).)++| (?R))*+)(\</{$element}\s*+\>)%six",
+			'callback' 	=> function($match) use ($cb, $element){
+				$cls = new stdClass();
+				$cls->content = $match[2];
+				$el = "element_content";
+				Controller::$scope->$el = $match[2];
+				if(!empty($match[1])){
+					$atts = String::parse_attr($match[1]);
+					foreach ($atts as $k => $v) {
+						if((strpos($v, "'") !== false || strpos($v, '"') !== false)){ // string here
+							$v = substr($v, 1, -1); // right left
+						}else{
+							$v = self::scope($v);//Controller::$scope->$v;
+						}
+						$cls->$k = $v;
+						$el = "element_{$k}";
+						Controller::$scope->$el = $v;
+					}
+				}
+				if(is_callable($cb)){
+					$call = call_user_func_array($cb, array($cls, $match[2]));
+				}else{
+					//echo $match[2];
+					$call = Shortcode::trigger($match[2]);
+				}
+				return Shortcode::trigger($call);
+				// trim($match[1]); // the args inside
+				//Controller::$scope->__index = $k; // loop on variables and set them in scope
+				//$str = Shortcode::trigger($match[2]);// run the match 2
+				//return $str;
+			}
+		));
+
+
+	}
 }
 
 /* End of file Query.php */

From 6b8ff8295d7b3f0b495dddc124902aa79ed9e4cc Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 18 Jan 2016 00:10:53 +0200
Subject: [PATCH 014/114] speed up the text search engine with non essential
 mode

---
 system/sql/purecis-v1.0.0.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/sql/purecis-v1.0.0.sql b/system/sql/purecis-v1.0.0.sql
index 162ba23..0211238 100644
--- a/system/sql/purecis-v1.0.0.sql
+++ b/system/sql/purecis-v1.0.0.sql
@@ -54,7 +54,8 @@ CREATE TABLE `meta` (
   `autoload` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`meta_id`),
   UNIQUE KEY `oid` (`oid`,`key`,`table`),
-  KEY `key` (`key`)
+  KEY `key` (`key`),
+  KEY `value` (`value`(255))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 

From 9d202303146b607ae8dbb8131f8295d1c5468ebb Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 18 Jan 2016 15:09:30 +0200
Subject: [PATCH 015/114] fix variable on translation

---
 system/module/Directives.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index fa10c4a..bfb66b0 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -203,8 +203,7 @@ public static function __bootstrap(){
 
 				if(isset($ex[1])){
 					$ex2 = explode("@", $ex[1]);
-					//
-					$a = explode(",", rtrim(ltrim(trim($ex2[0]),"{"),"}"));
+					$a = explode(",",substr(trim($ex2[0]), 1, -1));
 					foreach($a as $v){
 						$vv = explode(":", $v);
 						$ar[$vv[0]] = $vv[1];

From 005401f897f70bd48abe2ec7002033ce975ee512 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sun, 24 Jan 2016 00:13:24 +0200
Subject: [PATCH 016/114] object additionals

---
 system/module/Object.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/module/Object.php b/system/module/Object.php
index 07828a8..0a70f90 100644
--- a/system/module/Object.php
+++ b/system/module/Object.php
@@ -42,9 +42,9 @@ public static function get( $taxonomy, $arr=array() ){
 	 * @param	array 	data array 
 	 * @return	void
 	 */
-	public static function fetch( $taxonomy, $data=array(), $where=array() ){
+	public static function fetch( $taxonomy, $data=array(), $where=array(), $additional=array() ){
 
-		return self::get($taxonomy,["data"=>$data, "where"=>$where]);
+		return self::get($taxonomy, array_merge(["data"=>$data, "where"=>$where],$additional));
 	}
 
 

From a28fff9197c572053574c86b1dc6fa436c733b67 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sun, 24 Jan 2016 00:14:41 +0200
Subject: [PATCH 017/114] fix array in scope, custom element now can scope

---
 system/module/Directives.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index bfb66b0..fe27bfc 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -248,7 +248,7 @@ private static function scope($v){
 				if($val == null)break;
 			}
 		}
-		return stripcslashes($val);
+		return is_string($val)?stripcslashes($val):$val;
 	}
 
 	public static function register($element, $cb){
@@ -274,7 +274,10 @@ public static function register($element, $cb){
 					}
 				}
 				if(is_callable($cb)){
-					$call = call_user_func_array($cb, array($cls, $match[2]));
+					$call = call_user_func_array($cb, array($cls, &Controller::$scope));
+
+				}else if(is_string($cb)){
+					$call = View::load($cb);
 				}else{
 					//echo $match[2];
 					$call = Shortcode::trigger($match[2]);

From e0121ac2fa9ab8efc46003a6adaa38062091c65f Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sun, 24 Jan 2016 00:15:01 +0200
Subject: [PATCH 018/114] fix library get

---
 system/module/Upload.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/system/module/Upload.php b/system/module/Upload.php
index cbd605c..ccce643 100644
--- a/system/module/Upload.php
+++ b/system/module/Upload.php
@@ -412,23 +412,19 @@ public static function get($arr=array()){
 		//
 
 		if(isset($arr['library']) || isset($arr['author'])){
-			$data = array(
+			$sql = array(
 				"where" => array()
 			);
 			if(isset($arr['library'])){
 				if(is_array($arr['library']))$arr['library'] = implode(",",$arr['library']);
-				$data['where']['id'] = ":in:".$arr['library'];
+				$sql['where']['id'] = ":in:".$arr['library'];
 			}
 			if(isset($arr['author'])){
 				if(is_array($arr['author']))$arr['author'] = implode(",",$arr['author']);
-				$data['where']['author'] = ":in:".$arr['author'];
+				$sql['where']['author'] = ":in:".$arr['author'];
 			}
-
-
-			return Query::get("library",$data);
-		}
-
-		if(isset($arr['objects'])){
+			
+		}else if(isset($arr['objects'])){
 			if(is_array($arr['objects']))$arr['objects'] = implode(",",$arr['objects']);
 			$sql = array(
 				"join" => array(
@@ -442,9 +438,9 @@ public static function get($arr=array()){
 				$sql['join']['relations'] .= " AND relations.taxonomy = '{$arr['taxonomy']}'";
 			}
 			//if(isset($arr['taxonomy']))$sql['where']['taxonomy'] = $arr['taxonomy'];
-			return Query::get("library",$sql);
 		}
 
+		return Query::get("library",$sql);
 	}
 
 	// --------------------------------------------------------------------

From 9629dc0cbc4a22eac9d0735209c2aac17ccdd31f Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 6 Feb 2016 04:19:10 +0200
Subject: [PATCH 019/114] whether, neither, repeat, approxlen on Directives

---
 system/module/Directives.php | 88 ++++++++++++++++++++++++++++++++----
 1 file changed, 79 insertions(+), 9 deletions(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index fe27bfc..5539138 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -2,7 +2,7 @@
 /**
  * Purecis Directives Module
  *
- * Append Special Shortcodes to the core 
+ * Append Special Shortcodes to the core
  *
  * @package		codeHive
  * @subpackage	Module
@@ -10,7 +10,7 @@
  * @author		Tamer Zorba
  * @link		http://purecis.com/
  *
- * 
+ *
  * For Nasted directives
  * Spacial Thanx to http://stackoverflow.com/questions/5438133/how-to-remove-improper-nesting-bbcode-tags-using-php
  * and http://www.amazon.com/Mastering-Regular-Expressions-Jeffrey-Friedl/dp/0596528124
@@ -24,7 +24,7 @@
  *   )                         # End $2: Contents of URL tag.
  *   (\[/URL\s*+\])            # $3: Outermost closing [/URL]
  *   %six';
- * 
+ *
  */
 
 class Directives{
@@ -37,6 +37,31 @@ class Directives{
 	 */
 	public static function __bootstrap(){
 
+		/**
+		* directive repeat
+		* Description : repeat data
+		*/
+		self::register("repeat", function($args, &$scope) { // TODO : filter by ( like weither)
+			//print_r($args);
+			$str = "";
+
+			foreach(Controller::$scope->{$args->items} as $k => $v){
+				Controller::$scope->{$args->as} = $v;
+				if(is_null($args->{"index"}))Controller::$scope->{"{$ex[0]}Index"} = $k;
+				else Controller::$scope->{$args->{"index"}} = $k;
+				Controller::$scope->__index = $k;
+				$str .= Shortcode::trigger($args->content);
+			}
+			print_r($args);
+
+			return $str;
+
+			if($args->items){
+
+				//if($args->match == $args->equal)return Shortcode::trigger($args->content);
+			}
+
+		});
 
 		/**
 		* directive Each
@@ -102,8 +127,6 @@ public static function __bootstrap(){
 						$v = rtrim($v,"'");
 						$v = ltrim($v,"'");
 						return $v;
-					}else if(is_numeric(trim($v))){
-						return $v;
 					}else if(trim($v) == "true"){
 						return true;
 					}else if(trim($v) == "false"){
@@ -125,6 +148,18 @@ public static function __bootstrap(){
 					$ex = explode("!=",trim($match[1]));
 					if($parse($ex[0]) != $parse($ex[1]))return Shortcode::trigger($match[2]);
 
+				}else if(strpos($match[1], "isset") !== false){
+					if(strpos(trim($match[1]),"!") === 0)$not = 1;
+					else $not = 0;
+
+					$ex = substr(trim($match[1]), 6+$not, -1);//explode("isset",trim());
+
+					if($not){
+						if(is_null($parse($ex)))return Shortcode::trigger($match[2]);
+					}else{
+						if(!is_null($parse($ex)))return Shortcode::trigger($match[2]);
+					}
+
 				}
 
 				return ;
@@ -211,7 +246,7 @@ public static function __bootstrap(){
 					//
 					if(isset($ex2[1]))$at = $ex2[1];
 				}
-				
+
 				return Internationalization::translate(trim($ex[0]),$ar,$at);
 			}
 		));
@@ -234,9 +269,34 @@ public static function __bootstrap(){
 		));
 */
 
+
+		/**
+		* directive approxlen
+		* Description : shorten the text
+		*/
+		self::register("approxlen", function($args, &$scope) {
+			if(!$args->length)$args->length = 200;
+			if(!$args->append)$args->append = '...';
+			return String::approxlen($args->content,$args->length,$args->append);
+		});
+
+		/**
+		* directive whether
+		* Description : check data
+		*/
+		self::register("whether", function($args, &$scope) { 	//neither // repeat
+			//print_r($args);
+			if($args->match){
+				if($args->match == $args->equal)return Shortcode::trigger($args->content);
+			}
+			// TODO : lt, gt, gte, lte, eq, // extract variable by eval if needed
+		});
+
+
 	}
 
 	private static function scope($v){
+		if(is_numeric(trim($v)))return $v;
 		$val = Controller::$scope;
 		$ex = explode(".", $v);
 		$val = isset($val->$ex[0])?$val->$ex[0]:null;
@@ -258,7 +318,7 @@ public static function register($element, $cb){
 			'callback' 	=> function($match) use ($cb, $element){
 				$cls = new stdClass();
 				$cls->content = $match[2];
-				$el = "element_content";
+				$el = "{$element}-content";
 				Controller::$scope->$el = $match[2];
 				if(!empty($match[1])){
 					$atts = String::parse_attr($match[1]);
@@ -269,10 +329,19 @@ public static function register($element, $cb){
 							$v = self::scope($v);//Controller::$scope->$v;
 						}
 						$cls->$k = $v;
-						$el = "element_{$k}";
+						$el = "{$element}-{$k}";
 						Controller::$scope->$el = $v;
 					}
 				}
+				// whether
+				if(!is_null($cls->whether)){
+					if(!eval("return {$cls->whether};"))return;
+				}
+				// neither
+				if(!is_null($cls->neither)){
+					if(eval("return {$cls->neither};"))return;
+				}
+
 				if(is_callable($cb)){
 					$call = call_user_func_array($cb, array($cls, &Controller::$scope));
 
@@ -292,7 +361,8 @@ public static function register($element, $cb){
 
 
 	}
+
 }
 
 /* End of file Query.php */
-/* Location: ./system/module/Query.php */
\ No newline at end of file
+/* Location: ./system/module/Query.php */

From 612bcffb956f2e2209f6e6d51df7772dbf437747 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 6 Feb 2016 04:21:16 +0200
Subject: [PATCH 020/114] remove logging, forget my mistake

---
 system/module/Directives.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 5539138..28671de 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -52,8 +52,6 @@ public static function __bootstrap(){
 				Controller::$scope->__index = $k;
 				$str .= Shortcode::trigger($args->content);
 			}
-			print_r($args);
-
 			return $str;
 
 			if($args->items){

From 87bcbd6d41caf3db304310a1f30cf86b162f2d05 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sun, 21 Feb 2016 19:49:19 +0200
Subject: [PATCH 021/114] wheather directive actions

---
 system/module/Directives.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 28671de..d1542f2 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -216,7 +216,10 @@ public static function __bootstrap(){
 			'code' 		=> 'event',
 			'pattern' 	=> '#\@event\((.+)\)#Usi',
 			'callback' 	=> function($match){
-				return Event::trigger($match[1]);
+				$ex = explode(",",$match[1]);
+				$event = $ex[0];
+				array_shift($ex);
+				return Event::trigger($event,$ex);
 			}
 		));
 
@@ -283,11 +286,16 @@ public static function __bootstrap(){
 		* Description : check data
 		*/
 		self::register("whether", function($args, &$scope) { 	//neither // repeat
-			//print_r($args);
-			if($args->match){
-				if($args->match == $args->equal)return Shortcode::trigger($args->content);
+
+			if($args->is){
+				if($args->eq)if($args->is == $args->eq)return Shortcode::trigger($args->content);
+				if($args->lt)if($args->is < $args->lt)return Shortcode::trigger($args->content);
+				if($args->gt)if($args->is > $args->gt)return Shortcode::trigger($args->content);
+				if($args->lte)if($args->is <= $args->lte)return Shortcode::trigger($args->content);
+				if($args->gte)if($args->is >= $args->gte)return Shortcode::trigger($args->content);
 			}
-			// TODO : lt, gt, gte, lte, eq, // extract variable by eval if needed
+			if($args->exist)return Shortcode::trigger($args->content);
+
 		});
 
 

From 9fc57fa975d86084b22621f33d70619e674f8232 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sun, 21 Feb 2016 19:49:55 +0200
Subject: [PATCH 022/114] time support on non essential mode

---
 system/module/Query.php | 47 +++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/system/module/Query.php b/system/module/Query.php
index 3ee016d..ead5993 100644
--- a/system/module/Query.php
+++ b/system/module/Query.php
@@ -2,7 +2,7 @@
 /**
  * Purecis Query Module
  *
- * control URL Parameters 
+ * control URL Parameters
  *
  * @package		codeHive
  * @subpackage	Module
@@ -76,6 +76,7 @@ public static function __structure($table=false){
 				"status" 	=> "varchar(20) NOT NULL DEFAULT ''",
 				"permalink" => "varchar(250) NOT NULL DEFAULT ''",
 				"parent" 	=> "bigint(20) NOT NULL DEFAULT 0",
+				"time" 		=> "timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP",
 				"taxonomy" 	=> "varchar(50) NOT NULL DEFAULT ''",
 				"rel" 		=> "varchar(50) NOT NULL DEFAULT ''",
 			],
@@ -98,7 +99,7 @@ public static function __structure($table=false){
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	public static function inStructure($col,$table){
 		global $config;
 		if(isset($config['database']['essential'])){
@@ -113,13 +114,13 @@ public static function inStructure($col,$table){
 	 * Query execute
 	 *
 	 * @access	public
-	 * @param	array 	sql array 
+	 * @param	array 	sql array
 	 * @return	void
 	 */
 	public static function execute($arr){
 		// todo
 		// terms and library with better join like
-		// (:term:termname, :library:libname => "data2get,As,Arr,internalMeta") 
+		// (:term:termname, :library:libname => "data2get,As,Arr,internalMeta")
 
 		global $config;
 
@@ -129,7 +130,7 @@ public static function execute($arr){
 		}
 		//type, table, data, where, whereSeperator, order, limit
 		if(!isset($arr['type']))$arr['type'] = 'select';
-		
+
 		$table = $arr['table'];
 
 		if($arr['type'] == 'select'){
@@ -219,7 +220,7 @@ public static function execute($arr){
 				if(!isset($arr['join']))$arr['join'] = array();
 				foreach($arr['where'] as $k => $v){
 					//fix value
-					// if array then put or between them 
+					// if array then put or between them
 					if(is_array($v))continue;
 					if(strpos($v, "~") === 0){
 
@@ -236,7 +237,7 @@ public static function execute($arr){
 							$v = "`{$v}`";
 						}
 					}
-					
+
 					//fix key
 					if(!self::inStructure($k, $table)){
 						$k = trim($k);
@@ -254,7 +255,7 @@ public static function execute($arr){
 				}
 			}
 		}
-		
+
 
 		switch ( $arr['type'] ) {
 			case 'sql':
@@ -309,18 +310,18 @@ public static function execute($arr){
 				}
 				array_push($sql, implode(", ", $values));
 				break;
-			
+
 			default://select
 
 				# code...
 				array_push($sql, "select");
 				if(isset($arr['data'])){
 					if(is_array($arr['data']))$arr['data'] = implode(", ", $arr['data']);
-					array_push($sql, $arr['data']);	
+					array_push($sql, $arr['data']);
 				}else{
 					array_push($sql, '*');
 				}
-				
+
 				array_push($sql, "from");
 				array_push($sql, $arr['table']);
 				break;
@@ -371,7 +372,7 @@ public static function execute($arr){
 					array_push($a,$key." ".$value);
 				}
 				array_push($sql,implode($a,", "));
-				
+
 			}else{
 				if(strpos($or, "(")){
 					array_push($sql, "{$or}");
@@ -389,7 +390,7 @@ public static function execute($arr){
 				array_push($sql, $limit);
 			}
 		}
-		
+
 		$sql = implode($sql, ' ').";";
 
 		// Extra SQL
@@ -421,7 +422,7 @@ public static function execute($arr){
 				}
 			}
 
-			if($meta_size > 0){// to get id's 
+			if($meta_size > 0){// to get id's
 				$sid_q = self::execute(array(
 					"table" => $arr['table'],
 					"data" => array('id'),
@@ -444,7 +445,7 @@ public static function execute($arr){
 				$extra = "INSERT INTO meta (`oid`,`key`,`value`,`table`) VALUES ";
 				$extra .= implode(", ",$values);
 				$extra .= "ON DUPLICATE KEY UPDATE `value` = VALUES(`value`);";
-				
+
 				if($schema_size > 0)$sql .= $extra;
 				else $sql = $extra;
 			}
@@ -473,9 +474,9 @@ public static function execute($arr){
 			}
 			// delete from meta where `oid` = OLD.id  and `table` = 'terms'; // as trigger
 		}
-		
+
 		//echo $sql;
-		
+
 		//return array();
 		return Database::query($sql);
 	}
@@ -546,7 +547,7 @@ private static function parse_eq($key,$value,$table){
 				array_push($temp,"FIND_IN_SET ({$v},`{$key}`)");
 			}
 			return "(".implode(" {$separator} ", $temp).")";
-			
+
 		}else if(strpos($value, ":in:") !== false){
 			$value = stripslashes($value);
 			$value = str_replace(":in:", "", $value);
@@ -598,7 +599,7 @@ private static function parse_eq($key,$value,$table){
 	 * Fetching Data from table
 	 *
 	 * @access	public
-	 * @param	array 	sql array 
+	 * @param	array 	sql array
 	 * @return	void
 	 */
 	public static function get($table,$arr=array()){
@@ -637,7 +638,7 @@ public static function get($table,$arr=array()){
 	 * Insert or Update Database table based on where is set
 	 *
 	 * @access	public
-	 * @param	array 	sql array 
+	 * @param	array 	sql array
 	 * @return	void
 	 */
 	public static function set($table,$arr=array()){
@@ -655,7 +656,7 @@ public static function set($table,$arr=array()){
 	 * Delete rows from Table
 	 *
 	 * @access	public
-	 * @param	array 	sql array 
+	 * @param	array 	sql array
 	 * @return	void
 	 */
 	public static function remove($table,$arr=array()){
@@ -670,7 +671,7 @@ public static function remove($table,$arr=array()){
 	 * Query on
 	 *
 	 * @access	public
-	 * @param	array 	sql array 
+	 * @param	array 	sql array
 	 * @return	void
 	 */
 	public static function on($table){
@@ -690,4 +691,4 @@ public static function on($table){
 }
 
 /* End of file Query.php */
-/* Location: ./system/module/Query.php */
\ No newline at end of file
+/* Location: ./system/module/Query.php */

From 6cc0a1c5ce547529fed64fb4f1e78f9a6c040c62 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sun, 21 Feb 2016 19:50:24 +0200
Subject: [PATCH 023/114] fix event class

---
 system/core/Event.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/core/Event.php b/system/core/Event.php
index 0956eaf..f7e4cb1 100644
--- a/system/core/Event.php
+++ b/system/core/Event.php
@@ -44,9 +44,9 @@ public static function addListener($event,$callback){
 	 *
 	 * @return	function
 	 */
-	public static function trigger($event){
+	public static function trigger($event, $args=false){
 		$r = "";
-		if(isset(self::$events[$event]))foreach(self::$events[$event] as $c)$r .= call_user_func($c);
+		if(isset(self::$events[$event]))foreach(self::$events[$event] as $c)$r .= call_user_func_array($c, array(&Controller::$scope,$args));
 		return $r;
 	}
-}
\ No newline at end of file
+}

From a8ea12f6f077a31b9a1d478d16d8fdf958707ff6 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sun, 21 Feb 2016 19:58:56 +0200
Subject: [PATCH 024/114] adding .gitignore

---
 .gitignore | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1a8cc82
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,71 @@
+# exclude everything except directory foo/bar
+/*
+!/system
+!/docs
+
+!/assets
+!/assets/library
+/assets/library/*
+!/assets/extensions
+/assets/extensions/*
+/assets/extras
+!/assets/cache
+/assets/cache/*
+
+!/apps
+/apps/*
+!/apps/sample
+
+!LICENSE.md
+!README.md
+!robots.txt
+
+# remove ! if you want to use your own path and project
+!index.php
+!.htaccess
+
+
+# global files to ignore from https://github.com/github/gitignore/tree/master/Global
+
+# OSX Git Agnore
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+#
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
\ No newline at end of file

From e247fb8ba37f29d60c30481679803fbefe9c5d62 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sun, 21 Feb 2016 23:09:50 +0200
Subject: [PATCH 025/114] sql time update

---
 system/sql/purecis-v1.0.0.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/sql/purecis-v1.0.0.sql b/system/sql/purecis-v1.0.0.sql
index 0211238..04b8704 100644
--- a/system/sql/purecis-v1.0.0.sql
+++ b/system/sql/purecis-v1.0.0.sql
@@ -72,6 +72,7 @@ CREATE TABLE `objects` (
   `status` varchar(20) NOT NULL DEFAULT '',
   `parent` bigint(20) NOT NULL,
   `taxonomy` varchar(50) NOT NULL DEFAULT '',
+  `time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `rel` varchar(50) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `author` (`author`),

From 64f28c0516a4b380ac9932a690fc8cb546fc2f76 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 22 Feb 2016 19:30:09 +0200
Subject: [PATCH 026/114] new function src2base

---
 system/core/Image.php | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/system/core/Image.php b/system/core/Image.php
index e7e5a4c..ce00786 100644
--- a/system/core/Image.php
+++ b/system/core/Image.php
@@ -2,7 +2,7 @@
 /**
  * Purecis Module Class
  *
- * This class has image parsing controle 
+ * This class has image parsing controle
  *
  * @package		codeHive
  * @subpackage	Core
@@ -91,7 +91,22 @@ public static function watermark($watermark='logo.png',$srcImage='',$target=fals
 		imagedestroy($im);
 	}
 
+	// --------------------------------------------------------------------
 
+	/**
+	 * src2base
+	 *
+	 * fix images inside text add base to src
+	 *
+	 * @access	public
+	 * @param	string 	contents
+	 * @return	string
+	 */
+	public static function src2base($html) {
+		global $config;
+		$base = Request::base();
+		return str_replace("{$config['assets']}/", "{$base}{$config['assets']}/",$html);
+	}
 }
 
-?>
\ No newline at end of file
+?>

From 10c9ccd8116573de61f7da837d1d0a5b25d01a9f Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 23 Feb 2016 00:05:27 +0200
Subject: [PATCH 027/114] add ontime function to make date human readable

making directive for it
---
 system/core/String.php | 60 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 57 insertions(+), 3 deletions(-)

diff --git a/system/core/String.php b/system/core/String.php
index 7f27040..9f74d13 100644
--- a/system/core/String.php
+++ b/system/core/String.php
@@ -246,7 +246,7 @@ public static function randomId($len = 8,$characters = false){
 			if($characters === false)$characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 			$randomString = '';
 			for($i=0; $i<$len; $i++)$randomString .= $characters[rand(0, strlen($characters) - 1)];
-			return $randomString;			
+			return $randomString;
 		}
 	}
 
@@ -329,10 +329,64 @@ public static function xml_parse_attr($att){
 		$x = new SimpleXMLElement("<element {$att} />");
 		$attr = array();
 		foreach($x->attributes() as $a => $b)$attr[$a] = trim($b);
-		
+
 		return $attr;
 	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * ontime
+	 *
+	 * diffrent between 2 times
+	 *
+	 * @access	public
+	 * @param	mixen datetime or unix time ex: (2016-02-22 22:25:43)
+	 * @return	array
+	 */
+	public static function ontime($bef, $aft=false){
+		if(!is_numeric($bef))$bef = strtotime($bef);
+		if($aft == false)$aft = time();
+		if(!is_numeric($aft))$aft = strtotime($aft);
+
+		$timing = $aft-$bef;
+
+		if(($timing/3600)<24){
+			$h = floor($timing/3600);
+			$i = floor(($timing-($h*3600))/60);
+
+			if($i == 0){
+				return __("Today")." ".__("A little while ago");
+			}else{
+				return __("Today")." ".__(":h Hour and :m Minute ago",['h'=>$h,'m'=>$i]);
+			}
+
+		}else if($timing <= 172800){
+			$h = date("h",$bef);
+			$i = date("i",$bef);
+			$a = date('a',$bef);
+
+			return __("Yesterday on :h::m :a",['h'=>$h,'m'=>$i,"a"=>$a]);
+
+		}else{
+			$days = array(
+				__('Sunday'),
+				__('Monday'),
+				__('Tuesday'),
+				__('Wednesday'),
+				__('Thursday'),
+				__('Friday'),
+				__('Saturday')
+			);
+			$day = $days[date('w',$bef)];
+			$date = date("d/m/Y");
+			$time = date("h:i:s");
+			$a = date('a',$bef);
+			return __(":day :date on :time :a",["day"=>$day,"date"=>$date,"time"=>$time,"a"=>$a]);
+		}
+	}
+
 }
 
 /* End of file String.php */
-/* Location: ./system/core/String.php */
\ No newline at end of file
+/* Location: ./system/core/String.php */

From 294f88fd01af7a495e1e0f3341903cb7d95a6d4f Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 23 Feb 2016 00:12:55 +0200
Subject: [PATCH 028/114] ontime directive

---
 system/module/Directives.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index d1542f2..3cf97ba 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -281,6 +281,14 @@ public static function __bootstrap(){
 			return String::approxlen($args->content,$args->length,$args->append);
 		});
 
+		/**
+		* directive ontime
+		* Description : date to human readable date
+		*/
+		self::register("ontime", function($args, &$scope) {
+			return String::ontime($args->content);
+		});
+
 		/**
 		* directive whether
 		* Description : check data

From 9a944c8ed97a8ffe151e270d8a872ccc974641d5 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 23 Feb 2016 00:32:06 +0200
Subject: [PATCH 029/114] update whether to use in

---
 system/module/Directives.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 3cf97ba..300442a 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -301,6 +301,8 @@ public static function __bootstrap(){
 				if($args->gt)if($args->is > $args->gt)return Shortcode::trigger($args->content);
 				if($args->lte)if($args->is <= $args->lte)return Shortcode::trigger($args->content);
 				if($args->gte)if($args->is >= $args->gte)return Shortcode::trigger($args->content);
+				if($args->in)if(strpos($args->is, $args->in) !== false)return Shortcode::trigger($args->content);
+				// TODO : inset, 
 			}
 			if($args->exist)return Shortcode::trigger($args->content);
 

From 52aef9f887f5624f0d6ede78cca3f4c787b72f52 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Fri, 11 Mar 2016 00:28:03 +0200
Subject: [PATCH 030/114] support timezone

---
 system/core/codeHive.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/system/core/codeHive.php b/system/core/codeHive.php
index 104684e..41c9c52 100644
--- a/system/core/codeHive.php
+++ b/system/core/codeHive.php
@@ -2,7 +2,7 @@
 /**
  * Purecis codeHive Class
  *
- * bootstrap class 
+ * bootstrap class
  *
  * @package		codeHive
  * @subpackage	Core
@@ -57,15 +57,15 @@ public static function start($start = array('app'=>'app')){
 		if (version_compare(PHP_VERSION, '5.3.0', '<')) {
 		  throw new Exception('The codeHive Framework v2 requires PHP version 5.3 or higher, (5.4) is Recomonded.');
 		}
-		
+
 		define(VersionMajor,"2");
 		define(VersionMinor,"0");
 		define(VersionPatch,"00");
 		define(VersionCode,"Alpha");
 		define(VersionBuild,"2096");
-		
+
 		define(VERSION,"v.".VersionMajor.".".VersionMinor.".".VersionPatch." ".VersionCode.", Build ".VersionBuild);
-		
+
 		$config = array();
 		$config['app'] = $start['app']?:"app";
 		$config['assets'] = $start['assets']?:"assets";
@@ -79,6 +79,7 @@ public static function start($start = array('app'=>'app')){
 		define(INDEX_FILE, $config['index']?:'index.php');
 		define(SESSION_PERFIX, $config['session']?:'');
 		if($config['license'])define(SECURITY_HASH, $config['license']['hash']);
+		if($config['timezone'])date_default_timezone_set($config['timezone']);
 
 		// env
 		if ($config['ENVIRONMENT']){
@@ -120,4 +121,4 @@ private static function config($app){
 }
 
 /* End of file codeHive.php */
-/* Location: ./system/core/codeHive.php */
\ No newline at end of file
+/* Location: ./system/core/codeHive.php */

From 9c559255b7e817358227476b3179be6d4270b07f Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Fri, 11 Mar 2016 00:37:10 +0200
Subject: [PATCH 031/114] New Query Builder first init and complete select

---
 system/module/QueryBuilder.php | 292 +++++++++++++++++++++++++++++++++
 1 file changed, 292 insertions(+)
 create mode 100644 system/module/QueryBuilder.php

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
new file mode 100644
index 0000000..72ac1a9
--- /dev/null
+++ b/system/module/QueryBuilder.php
@@ -0,0 +1,292 @@
+<?php if (!defined('VERSION')) {
+    exit('Direct access to this location is not permitted.');
+}
+
+/**
+ * Purecis QueryBuilder Module
+ *
+ * This class Control QueryBuilder Requests
+ *
+ * @package         codeHive
+ * @subpackage      Module
+ * @category        Libraries
+ * @author          Tamer Zorba
+ * @link            http://purecis.com/
+ */
+
+class QueryBuilder
+{
+    /**
+     * Variables
+     *
+     * @var mixen
+     * @access protected
+     */
+    private $table;
+    private $data  = array();
+    public $where  = "";
+    private $join  = "";
+    private $group = "";
+    private $order = "";
+    private $limit = "";
+    private $query;
+
+    // --------------------------------------------------------------------
+
+    /**
+     * ajax table
+     *
+     * @return    void
+     */
+    public function table($table)
+    {
+        $this->table = $table;
+        return $this;
+    }
+
+    /**
+     * set data to query
+     * @param  String $args Mix of data to get
+     * @return Object QueryBuilder
+     */
+    public function data()
+    {
+        $this->data = array_merge($this->data, func_get_args());
+        return $this;
+    }
+
+    public function where()
+    {
+        if (strlen($this->where)) {
+            $this->where .= " AND ";
+        }
+
+        $args = func_get_args();
+        $this->where .= $this->_whereParse($args);
+        return $this;
+    }
+
+    public function orWhere()
+    {
+        if (strlen($this->where)) {
+            $this->where .= " OR ";
+        }
+
+        $args = func_get_args();
+        $this->where .= $this->_whereParse($args);
+        return $this;
+    }
+
+    /**
+     * Builder : join
+     * @return Object QueryBuilder
+     */
+    public function join()
+    {
+        $args = func_get_args();
+        $this->join .= $this->_joinParse($args);
+        return $this;
+    }
+
+    /**
+     * Builder : group
+     * @return Object QueryBuilder
+     */
+    public function group()
+    {
+        $args        = func_get_args();
+        $this->group = " GROUP BY " . $this->_col($args[0]);
+        return $this;
+    }
+
+    /**
+     * Builder : order
+     * @return Object QueryBuilder
+     */
+    public function order()
+    {
+        $args = func_get_args();
+        if (sizeof($args) == 2) {
+            $this->order = " ORDER BY " . $this->_col($args[0]) . " {$args[1]}";
+
+        } else if (sizeof($args) == 1) {
+            $this->order = " ORDER BY " . $this->_col($args[0]) . " DESC";
+
+        } else {
+            $this->order = " ORDER BY " . $this->_col("id") . " DESC";
+
+        }
+        return $this;
+    }
+
+    public function limit()
+    {
+        $args = func_get_args();
+        if (sizeof($args) == 2) {
+            $this->limit = " LIMIT {$args[0]}, {$args[1]}";
+        } else {
+            $this->limit = " LIMIT {$args[0]}";
+        }
+        return $this;
+    }
+
+    /**
+     * generate select statement
+     * @return Object SQL Query
+     */
+    private function _get()
+    {
+        $args = func_get_args();
+
+        $this->query = "SELECT ";
+        $this->query .= $this->_data();
+        $this->query .= " FROM ";
+        $this->query .= $this->_table($this->table);
+        $this->query .= $this->join;
+        $this->query .= $this->_where();
+        $this->query .= $this->group;
+        $this->query .= $this->order;
+        $this->query .= $this->limit;
+        if(!$args[0])$this->query .= ";";
+        return $this->query;
+    }
+
+    public function get()
+    {
+        $this->_get();
+        // TODO : make query run here
+        return $this->query;
+    }
+
+    private function _table()
+    {
+        $args = func_get_args();
+        return "`{$args[0]}`";
+    }
+
+    private function _col()
+    {
+        $args = func_get_args();
+
+        if (is_callable($args[0])) {
+            $q = new QueryBuilder();
+            call_user_func($args[0], $q);
+            return "( {$q->_get(true)} )";
+        }
+
+        if(strpos($args[0],'~') === 0){
+            return $this->_col(substr($args[0],1));
+
+        }else if(substr_count($args[0],'.') == 1 && !$args[1]){
+            $exp = explode(".",$args[0]);
+            return "`{$exp[0]}`.`{$exp[1]}`";
+
+        }else if($args[1]){
+            if(is_array($args[0]))return "('".implode("', '", $args[0])."')";
+            else return "'{$args[0]}'";
+
+        }else{
+            return "`{$this->table}`.`{$args[0]}`";
+
+        }
+    }
+
+    private function _data()
+    {
+        if (!sizeof($this->data)) {
+            return "*";
+        }
+
+        // else
+        $arr = array();
+        foreach ($this->data as $data) {
+            array_push($arr, $this->_col($data));
+        }
+
+        return implode(", ", $arr);
+    }
+
+    public function _where()
+    {
+        if (!strlen($this->where)) {
+            return "";
+        }
+
+        //else
+        return " WHERE {$this->where}";
+    }
+
+    private function _joinParse($args)
+    {
+        if (is_callable($args[0])) {
+            $q = new QueryBuilder();
+            $q->table($this->table);
+            call_user_func($args[0], $q);
+            return "( {$q->where} )";
+        }
+
+        // TODO : check is function and send the table to create inline where
+        $str = "";
+
+        $str .= " JOIN ";
+        $str .= $this->_table($args[0]);
+        $str .= " ON ";
+        array_shift($args);
+        $str .= call_user_func_array(array($this, "_parseOperators"), $args);
+        // $str .= $this->_col($args[1]);
+        // if (!$args[3]) {
+        //     $str .= " = ";
+        //     $str .= $this->_col($args[2]);
+        // } else {
+        //     $str .= " {$args[2]} ";
+        //     $str .= $this->_col($args[3]);
+        // }
+
+        return $str;
+    }
+
+    private function _whereParse($args)
+    {
+        if (is_callable($args[0])) {
+            $q = new QueryBuilder();
+            $q->table($this->table);
+            call_user_func($args[0], $q);
+            // TODO : check if in to return full query in or it seems next args to check;
+            return "( {$q->where} )";
+        }
+
+        return call_user_func_array(array($this, "_parseOperators"), $args);
+    }
+
+    private function _parseOperators()
+    {
+        $args = func_get_args();
+
+        $str = "";
+        $str .= $this->_col($args[0]);
+
+        switch ($args[1]) {
+            case '=':
+                $str .= " = ".$this->_col($args[2],true);
+                break;
+
+            case '!=':
+                $str .= " <> ".$this->_col($args[2],true);
+                break;
+
+            case '<>':
+                $str .= " <> ".$this->_col($args[2],true);
+                break;
+
+            case 'in':
+                $str .= " IN ".$this->_col($args[2],true);
+                break;
+
+            default:
+                $str .= " = ".$this->_col($args[1],true);
+                break;
+        }
+
+        return $str;
+    }
+}

From 54092f1ca97753026c870ec2cb7095f5cdd37ff8 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Fri, 11 Mar 2016 08:44:09 +0200
Subject: [PATCH 032/114] query builder

change data to param
support as in col
support records
---
 system/module/QueryBuilder.php | 42 +++++++++++++++++++---------
 system/module/QueryRecord.php  | 50 ++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 13 deletions(-)
 create mode 100644 system/module/QueryRecord.php

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index 72ac1a9..2ccc53c 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -23,16 +23,20 @@ class QueryBuilder
      * @access protected
      */
     private $table;
-    private $data  = array();
+    private $param  = array();
     public $where  = "";
     private $join  = "";
     private $group = "";
     private $order = "";
     private $limit = "";
     private $query;
+    private $records;
 
     // --------------------------------------------------------------------
-
+    public function __get($property) {
+        echo "Getting '$property'\n";
+        return 123;
+    }
     /**
      * ajax table
      *
@@ -45,13 +49,13 @@ public function table($table)
     }
 
     /**
-     * set data to query
+     * set params to query
      * @param  String $args Mix of data to get
      * @return Object QueryBuilder
      */
-    public function data()
+    public function param()
     {
-        $this->data = array_merge($this->data, func_get_args());
+        $this->param = array_merge($this->param, func_get_args());
         return $this;
     }
 
@@ -139,7 +143,7 @@ private function _get()
         $args = func_get_args();
 
         $this->query = "SELECT ";
-        $this->query .= $this->_data();
+        $this->query .= $this->_param();
         $this->query .= " FROM ";
         $this->query .= $this->_table($this->table);
         $this->query .= $this->join;
@@ -154,8 +158,14 @@ private function _get()
     public function get()
     {
         $this->_get();
-        // TODO : make query run here
-        return $this->query;
+        return $this->records = Database::query($this->query);
+    }
+
+    public function record()
+    {
+        $this->get();
+        Module::import("QueryRecord");
+        return new QueryRecord($this->records);
     }
 
     private function _table()
@@ -174,9 +184,16 @@ private function _col()
             return "( {$q->_get(true)} )";
         }
 
+        $args[0] = trim($args[0]);
+
         if(strpos($args[0],'~') === 0){
             return $this->_col(substr($args[0],1));
 
+        }else if(substr_count($args[0],' as ') == 1 && !$args[1]){
+            $exp = explode(" as ",$args[0]);
+            print_r($exp);
+            return $this->_col($exp[0]). " AS `{$exp[1]}`";
+
         }else if(substr_count($args[0],'.') == 1 && !$args[1]){
             $exp = explode(".",$args[0]);
             return "`{$exp[0]}`.`{$exp[1]}`";
@@ -187,20 +204,19 @@ private function _col()
 
         }else{
             return "`{$this->table}`.`{$args[0]}`";
-
         }
     }
 
-    private function _data()
+    private function _param()
     {
-        if (!sizeof($this->data)) {
+        if (!sizeof($this->param)) {
             return "*";
         }
 
         // else
         $arr = array();
-        foreach ($this->data as $data) {
-            array_push($arr, $this->_col($data));
+        foreach ($this->param as $param) {
+            array_push($arr, $this->_col($param));
         }
 
         return implode(", ", $arr);
diff --git a/system/module/QueryRecord.php b/system/module/QueryRecord.php
new file mode 100644
index 0000000..fa8609b
--- /dev/null
+++ b/system/module/QueryRecord.php
@@ -0,0 +1,50 @@
+<?php if (!defined('VERSION')) {
+    exit('Direct access to this location is not permitted.');
+}
+
+/**
+ * Purecis QueryRecord Module
+ *
+ * This class Control QueryRecord Requests
+ *
+ * @package         codeHive
+ * @subpackage      Module
+ * @category        Libraries
+ * @author          Tamer Zorba
+ * @link            http://purecis.com/
+ */
+class QueryRecord
+{
+
+    private $current = 0;
+    private $records;
+
+    public function __construct($records)
+    {
+        $this->records = $records;
+        return $this;
+    }
+
+    public function all()
+    {
+        return $this->records->data;
+    }
+
+    public function index($i)
+    {
+        return $this->records->data[$i];
+    }
+
+    public function first()
+    {
+        $this->current = 0;
+        return $this->records->data[$this->current];
+    }
+
+    public function next()
+    {
+        $this->current += 1;
+        return $this->records->data[$this->current];
+    }
+
+}

From f738902854187b6561c36428a674afc01744ef9f Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Fri, 11 Mar 2016 08:45:25 +0200
Subject: [PATCH 033/114] database connection support object fetching

---
 system/core/Database.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/system/core/Database.php b/system/core/Database.php
index d1058a2..0a6f505 100644
--- a/system/core/Database.php
+++ b/system/core/Database.php
@@ -2,7 +2,7 @@
 /**
  * Purecis Database Class
  *
- * This class Manage Database Connections & Queries 
+ * This class Manage Database Connections & Queries
  *
  * @package		codeHive
  * @subpackage	Core
@@ -52,7 +52,7 @@ public static function connect($db_name=null,$db_host=null,$db_user=null,$db_pas
 			$user = $config['database']['user'];
 			$pass = $config['database']['pass'];
 			$port = $config['database']['port'];
-			
+
 			try{
 				// Checking Database Type…
 				if($type == 'sqlite')	self::$db = new PDO("sqlite:{$name}");
@@ -63,12 +63,12 @@ public static function connect($db_name=null,$db_host=null,$db_user=null,$db_pas
 				if($type == 'infomix')	self::$db = new PDO("informix:DSN={$name}", $user, $pass);
 				if($type == 'dblib') 	self::$db = new PDO ("dblib:host={$host}:{$port};dbname={$name}",$user,$pass);
 				if($type == 'odbc')		self::$db = new PDO("odbc:Driver={Microsoft Access Driver (*.mdb)};Dbq={$name}");
-				
+
 				self::$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);//set character set utf8
-				
+
 			}catch(PDOException $e){
 				//if($config['ENVIRONMENT'] == 'debug')debug::error("Database Error",$e->getMessage());
-				//else 
+				//else
 				die("Database Error :".$e->getMessage());
 			}
     	}
@@ -90,10 +90,10 @@ public static function query($sql){
 		self::connect();
 		$return = new stdClass();
 		try{
-			$query = self::$db->query($sql);			
+			$query = self::$db->query($sql);
 			//$query = $link->prepare('SELECT * FROM users WHERE username = :name LIMIT 1;');
 			//$query->execute([':name' => $username]); # No need to escape it!
-			
+
 			$temp_sql = strtolower($sql);
 			$s = strpos($temp_sql,'select');
 			$i = strpos($temp_sql,'insert');
@@ -104,25 +104,25 @@ public static function query($sql){
 			if($u < 10 && $u !== false)$type = 'update';
 			if($d < 10 && $d !== false)$type = 'delete';
 
-
+			$fetch = $config['database']['fetch']=="array"?PDO::FETCH_ASSOC:PDO::FETCH_CLASS;
 			if(in_array($type, array('select','update','delete')))$return->count = $query->rowCount();
-			if($type == 'select')$return->data = @$query->fetchAll(PDO::FETCH_ASSOC);
+			if($type == 'select')$return->data = @$query->fetchAll($fetch);
 			if($type == 'insert')$return->last = self::$db->lastInsertId();
 
 			$return->status = true;
 
 			if($config['ENVIRONMENT'] == 'debug')debug::count('Database Queries');
-			
+
 		}catch(PDOException $e){
 			if($config['ENVIRONMENT'] == 'debug')debug::error("Database Error",$e->getMessage());
 			$return->status = false;
 			$return->error = $e->getMessage();
     	}
-    	
+
     	if(in_array($config['ENVIRONMENT'], array('debug','development')))$return->sql = $sql;
     	return $return;
 	}
 }
 
 /* End of file Database.php */
-/* Location: ./system/core/Database.php */
\ No newline at end of file
+/* Location: ./system/core/Database.php */

From da210c29d8b6331f4942044c6b2c597bbbc36626 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 14 Mar 2016 22:02:57 +0200
Subject: [PATCH 034/114] query builder working on

---
 system/module/QueryBuilder.php | 284 ++++++++++++++++++++++++++++-----
 1 file changed, 242 insertions(+), 42 deletions(-)

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index 2ccc53c..09d0bd2 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -12,6 +12,7 @@
  * @category        Libraries
  * @author          Tamer Zorba
  * @link            http://purecis.com/
+ * @todo            shared lock, lock for update
  */
 
 class QueryBuilder
@@ -24,13 +25,16 @@ class QueryBuilder
      */
     private $table;
     private $param  = array();
+    // private $ascol  = array();
     public $where  = "";
     private $join  = "";
-    private $group = "";
-    private $order = "";
+    private $group = array();
+    private $order = array();
     private $limit = "";
     private $query;
     private $records;
+    private $union = "";
+    public $join_on = "";
 
     // --------------------------------------------------------------------
     public function __get($property) {
@@ -92,14 +96,39 @@ public function join()
         return $this;
     }
 
+    public function on()
+    {
+        $args = func_get_args();
+        if (!strlen($this->join_on)) $str = " ON ";
+        else $str = " AND ";
+
+        $str .= call_user_func_array(array($this, "_parseOperators"), $args);
+
+        $this->join_on .= $str;
+
+        return $this;
+    }
+
+    public function orOn()
+    {
+        $args = func_get_args();
+        if (!strlen($this->join_on)) $str = " ON ";
+        else $str = " OR ";
+
+        $str .= call_user_func_array(array($this, "_parseOperators"), $args);
+
+        $this->join_on .= $str;
+
+        return $this;
+    }
+
     /**
      * Builder : group
      * @return Object QueryBuilder
      */
     public function group()
     {
-        $args        = func_get_args();
-        $this->group = " GROUP BY " . $this->_col($args[0]);
+        $this->group = array_merge($this->group, func_get_args());
         return $this;
     }
 
@@ -111,15 +140,16 @@ public function order()
     {
         $args = func_get_args();
         if (sizeof($args) == 2) {
-            $this->order = " ORDER BY " . $this->_col($args[0]) . " {$args[1]}";
+            array_push($this->order, array($args[0], strtoupper($args[1])));
 
         } else if (sizeof($args) == 1) {
-            $this->order = " ORDER BY " . $this->_col($args[0]) . " DESC";
+            array_push($this->order, [$args[0], "DESC"]);
 
         } else {
-            $this->order = " ORDER BY " . $this->_col("id") . " DESC";
+            array_push($this->order, ["id", "DESC"]);
 
         }
+
         return $this;
     }
 
@@ -128,17 +158,36 @@ public function limit()
         $args = func_get_args();
         if (sizeof($args) == 2) {
             $this->limit = " LIMIT {$args[0]}, {$args[1]}";
+
         } else {
             $this->limit = " LIMIT {$args[0]}";
+
         }
+
+        return $this;
+    }
+
+    public function union()
+    {
+        $args = func_get_args();
+        $this->union .= $this->_unionParse($args[0]);
+
+        return $this;
+    }
+
+    public function unionAll()
+    {
+        $args = func_get_args();
+        $this->union .= $this->_unionParse($args[0], "ALL ");
+
         return $this;
     }
 
     /**
-     * generate select statement
+     * generate SELECT statement
      * @return Object SQL Query
      */
-    private function _get()
+    public function _get()
     {
         $args = func_get_args();
 
@@ -148,16 +197,96 @@ private function _get()
         $this->query .= $this->_table($this->table);
         $this->query .= $this->join;
         $this->query .= $this->_where();
-        $this->query .= $this->group;
-        $this->query .= $this->order;
+        $this->query .= $this->_group();
+        $this->query .= $this->_order();
         $this->query .= $this->limit;
+        $this->query .= $this->union;
         if(!$args[0])$this->query .= ";";
         return $this->query;
     }
 
     public function get()
     {
-        $this->_get();
+        return $this->_get();
+        return $this->records = Database::query($this->query);
+    }
+
+    /**
+     * generate INSERT, UPDATE statement
+     * @return Object SQL Query
+     */
+    private function _set()
+    {
+        $args = func_get_args();
+
+        if (!strlen($this->where)) {
+            $this->query = "INSERT INTO ";
+            $this->query .= $this->_table($this->table);
+            $this->query .= " (".$this->_param("insert",1).")";
+            $this->query .= " VALUES";
+            $this->query .= " (".$this->_param("insert",2).")";
+
+        }else{
+            $this->query = "UPDATE ";
+            $this->query .= $this->_table($this->table);
+            $this->query .= " SET ";
+            $this->query .= $this->_param("update");
+            $this->query .= $this->join;
+            $this->query .= $this->_where();
+        }
+
+        $this->query .= ";";
+
+        return $this->query;
+    }
+
+    public function set()
+    {
+        $this->_set();
+        return $this->query;
+        return $this->records = Database::query($this->query);
+    }
+
+    /**
+     * generate DELETE statement
+     * @return Object SQL Query
+     */
+    private function _delete()
+    {
+        $this->query = "DELETE FROM ";
+        $this->query .= $this->_table($this->table);
+        $this->query .= $this->_where();
+        $this->query .= $this->_order();
+        $this->query .= $this->limit;
+        $this->query .= ";";
+
+        return $this->query;
+    }
+
+    public function delete()
+    {
+        $this->_delete();
+        return $this->query;
+        return $this->records = Database::query($this->query);
+    }
+
+    /**
+     * generate TRUNCATE statement
+     * @return Object SQL Query
+     */
+    private function _truncate()
+    {
+        $this->query = "TRUNCATE TABLE ";
+        $this->query .= $this->_table($this->table);
+        $this->query .= ";";
+
+        return $this->query;
+    }
+
+    public function truncate()
+    {
+        $this->_truncate();
+        return $this->query;
         return $this->records = Database::query($this->query);
     }
 
@@ -178,6 +307,16 @@ private function _col()
     {
         $args = func_get_args();
 
+        if(is_array($args[0])){
+            $temp = array();
+            foreach($args as $arg){
+                foreach($arg as $param){
+                    array_push($temp, $this->_col($param));
+                }
+            }
+            return $temp;
+        }
+
         if (is_callable($args[0])) {
             $q = new QueryBuilder();
             call_user_func($args[0], $q);
@@ -191,32 +330,85 @@ private function _col()
 
         }else if(substr_count($args[0],' as ') == 1 && !$args[1]){
             $exp = explode(" as ",$args[0]);
-            print_r($exp);
+        //    array_push($this->ascol, $exp[1]);
             return $this->_col($exp[0]). " AS `{$exp[1]}`";
 
+        // }else if(in_array($args[0],$this->ascol)){
+        //     return $this->_col($args[0],"single");
+
         }else if(substr_count($args[0],'.') == 1 && !$args[1]){
             $exp = explode(".",$args[0]);
             return "`{$exp[0]}`.`{$exp[1]}`";
 
-        }else if($args[1]){
+        }else if($args[1] == "single"){
+            return "`{$args[0]}`";
+
+        }else if($args[1] == "string"){
             if(is_array($args[0]))return "('".implode("', '", $args[0])."')";
-            else return "'{$args[0]}'";
+            else return "'".String::escape($args[0])."'";
 
         }else{
             return "`{$this->table}`.`{$args[0]}`";
         }
     }
 
+    private function _group()
+    {
+        $args = func_get_args();
+        $arr = array();
+
+        if (!sizeof($this->group)) {
+            return "";
+        }
+
+        foreach ($this->group as $col) {
+            array_push($arr, $this->_col($col));
+        }
+
+        return " GROUP BY " . implode(", ", $arr);
+    }
+
+    private function _order()
+    {
+        $args = func_get_args();
+        $arr = array();
+
+        if (!sizeof($this->order)) {
+            return "";
+        }
+
+        foreach ($this->order as $col) {
+            array_push($arr, $this->_col($col[0]) . " {$col[1]}");
+        }
+
+        return " ORDER BY " . implode(", ", $arr);
+    }
+
     private function _param()
     {
+        $args = func_get_args();
+        $arr = array();
+
         if (!sizeof($this->param)) {
             return "*";
         }
 
-        // else
-        $arr = array();
-        foreach ($this->param as $param) {
-            array_push($arr, $this->_col($param));
+        //$this->param = $this->_col($this->param);
+
+        if($args[0] == 'insert'){
+            for ($i = $args[1]-1; $i < sizeof($this->param); $i+=2) {
+                array_push($arr, $this->_col($this->param[$i],$args[1]==1?"single":"string"));
+            }
+
+        }else if($args[0] == 'update'){
+            for ($i = 0; $i < sizeof($this->param); $i+=2) {
+                array_push($arr, $this->_col($this->param[$i],"single")." = ".$this->_col($this->param[$i+1],"string"));
+            }
+
+        }else{
+            foreach ($this->param as $param) {
+                array_push($arr, $this->_col($param));
+            }
         }
 
         return implode(", ", $arr);
@@ -232,31 +424,40 @@ public function _where()
         return " WHERE {$this->where}";
     }
 
-    private function _joinParse($args)
+    private function _unionParse($args)
     {
-        if (is_callable($args[0])) {
+        $args = func_get_args();
+
+        if($args[0] instanceof QueryBuilder){
+            return " UNION {$args[1]}" . $args[0]->_get(true);
+
+        }else if (is_callable($args[0])) {
             $q = new QueryBuilder();
-            $q->table($this->table);
             call_user_func($args[0], $q);
-            return "( {$q->where} )";
+            return " UNION $args[1]" . $q->_get(true);
+
         }
 
-        // TODO : check is function and send the table to create inline where
-        $str = "";
+        return "";
+    }
 
-        $str .= " JOIN ";
+    private function _joinParse($args)
+    {
+        $this->join_on = "";
+        $str = " JOIN ";
         $str .= $this->_table($args[0]);
-        $str .= " ON ";
         array_shift($args);
-        $str .= call_user_func_array(array($this, "_parseOperators"), $args);
-        // $str .= $this->_col($args[1]);
-        // if (!$args[3]) {
-        //     $str .= " = ";
-        //     $str .= $this->_col($args[2]);
-        // } else {
-        //     $str .= " {$args[2]} ";
-        //     $str .= $this->_col($args[3]);
-        // }
+        // $str .= call_user_func_array(array($this, "_parseOperators"), $args);
+
+        if (is_callable($args[0])) {
+            $q = new QueryBuilder();
+            $q->table($this->table);
+            call_user_func($args[0], $q);
+            return $q->join_on;
+        }else{
+            $this->on($args);
+            $str .= $this->join_on;
+        }
 
         return $str;
     }
@@ -267,7 +468,6 @@ private function _whereParse($args)
             $q = new QueryBuilder();
             $q->table($this->table);
             call_user_func($args[0], $q);
-            // TODO : check if in to return full query in or it seems next args to check;
             return "( {$q->where} )";
         }
 
@@ -283,23 +483,23 @@ private function _parseOperators()
 
         switch ($args[1]) {
             case '=':
-                $str .= " = ".$this->_col($args[2],true);
+                $str .= " = ".$this->_col($args[2],"string");
                 break;
 
             case '!=':
-                $str .= " <> ".$this->_col($args[2],true);
+                $str .= " <> ".$this->_col($args[2],"string");
                 break;
 
             case '<>':
-                $str .= " <> ".$this->_col($args[2],true);
+                $str .= " <> ".$this->_col($args[2],"string");
                 break;
 
             case 'in':
-                $str .= " IN ".$this->_col($args[2],true);
+                $str .= " IN ".$this->_col($args[2],"string");
                 break;
 
             default:
-                $str .= " = ".$this->_col($args[1],true);
+                $str .= " = ".$this->_col($args[1],"string");
                 break;
         }
 

From 8175dd0c5f2bcde7cd1091f658feb31e91aa4a89 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 15 Mar 2016 14:46:12 +0200
Subject: [PATCH 035/114] support truncate in database class

---
 system/core/Database.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/core/Database.php b/system/core/Database.php
index 0a6f505..e0624b6 100644
--- a/system/core/Database.php
+++ b/system/core/Database.php
@@ -99,13 +99,15 @@ public static function query($sql){
 			$i = strpos($temp_sql,'insert');
 			$u = strpos($temp_sql,'update');
 			$d = strpos($temp_sql,'delete');
+			$t = strpos($temp_sql,'truncate');
 			if($s < 10 && $s !== false)$type = 'select';
 			if($i < 10 && $i !== false)$type = 'insert';
 			if($u < 10 && $u !== false)$type = 'update';
 			if($d < 10 && $d !== false)$type = 'delete';
+			if($d < 10 && $d !== false)$type = 'truncate';
 
 			$fetch = $config['database']['fetch']=="array"?PDO::FETCH_ASSOC:PDO::FETCH_CLASS;
-			if(in_array($type, array('select','update','delete')))$return->count = $query->rowCount();
+			if(in_array($type, array('select','update','delete','truncate')))$return->count = $query->rowCount();
 			if($type == 'select')$return->data = @$query->fetchAll($fetch);
 			if($type == 'insert')$return->last = self::$db->lastInsertId();
 

From 244d53c6c19dd6ecfe1705da6a7cd4840c32c5b2 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 15 Mar 2016 14:48:58 +0200
Subject: [PATCH 036/114] fix join on query builder

---
 system/module/QueryBuilder.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index 09d0bd2..9f459f8 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -207,7 +207,7 @@ public function _get()
 
     public function get()
     {
-        return $this->_get();
+        $this->_get();
         return $this->records = Database::query($this->query);
     }
 
@@ -447,7 +447,6 @@ private function _joinParse($args)
         $str = " JOIN ";
         $str .= $this->_table($args[0]);
         array_shift($args);
-        // $str .= call_user_func_array(array($this, "_parseOperators"), $args);
 
         if (is_callable($args[0])) {
             $q = new QueryBuilder();
@@ -455,7 +454,7 @@ private function _joinParse($args)
             call_user_func($args[0], $q);
             return $q->join_on;
         }else{
-            $this->on($args);
+            call_user_func_array(array($this, "on"), $args);
             $str .= $this->join_on;
         }
 

From 5f0ccdda82cfbdef388448a9a449dcea45a4a270 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 15 Mar 2016 15:57:41 +0200
Subject: [PATCH 037/114] add some operators and fix array string col

---
 system/module/QueryBuilder.php | 75 +++++++++++++++++++++++++++++++---
 1 file changed, 70 insertions(+), 5 deletions(-)

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index 9f459f8..4d6e8e6 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -307,7 +307,7 @@ private function _col()
     {
         $args = func_get_args();
 
-        if(is_array($args[0])){
+        if(is_array($args[0]) && $args[1] != "string"){
             $temp = array();
             foreach($args as $arg){
                 foreach($arg as $param){
@@ -323,7 +323,7 @@ private function _col()
             return "( {$q->_get(true)} )";
         }
 
-        $args[0] = trim($args[0]);
+        if(!is_array($args[0]))$args[0] = trim($args[0]);
 
         if(strpos($args[0],'~') === 0){
             return $this->_col(substr($args[0],1));
@@ -478,25 +478,90 @@ private function _parseOperators()
         $args = func_get_args();
 
         $str = "";
-        $str .= $this->_col($args[0]);
+
+        if(!in_array($args[1], array("set", "inset")))
+            $str .= $this->_col($args[0]);
 
         switch ($args[1]) {
             case '=':
                 $str .= " = ".$this->_col($args[2],"string");
                 break;
 
-            case '!=':
-                $str .= " <> ".$this->_col($args[2],"string");
+            case 'like':
+                $str .= " LIKE ".$this->_col($args[2],"string");
                 break;
 
+            case '!=':
+            $str .= " != ".$this->_col($args[2],"string");
+            break;
+
             case '<>':
                 $str .= " <> ".$this->_col($args[2],"string");
                 break;
 
+            case 'lt':
+            case '<':
+            case '!>':
+                $str .= " < ".$this->_col($args[2],"string");
+                break;
+
+            case 'lte':
+            case '<=':
+                $str .= " <= ".$this->_col($args[2],"string");
+                break;
+
+            case 'lg':
+            case '>':
+            case '!<':
+                $str .= " > ".$this->_col($args[2],"string");
+                break;
+
+            case 'lge':
+            case '>=':
+                $str .= " > ".$this->_col($args[2],"string");
+                break;
+
+            case 'is':
+                $str .= " IS ".strtoupper($args[2]);
+                break;
+
             case 'in':
                 $str .= " IN ".$this->_col($args[2],"string");
                 break;
 
+            case 'notin':
+                $str .= " NOT IN ".$this->_col($args[2],"string");
+                break;
+
+            case 'bet':
+            case 'between':
+            case '><':
+            case 'notbet':
+            case 'notbetween':
+            case '!><':
+
+                $b = in_array($args[1], array("between", "bet", "><")) ? "BETWEEN" : "NOT BETWEEN";
+
+                if(is_array($args[2])){
+                    $str .= " {$b} " . $this->_col($args[2][0],"string") . " AND " . $this->_col($args[2][1],"string");
+                }else{
+                    $str .= " {$b} " . $this->_col($args[2],"string") . " AND " . $this->_col($args[3],"string");
+                }
+                break;
+
+            case 'set':
+            case 'inset':
+                if(is_array($args[2])){
+                    $temp = array();
+                    foreach($args[2] as $v){
+                        array_push($temp, "FIND_IN_SET (".$this->_col($v,"string").",".$this->_col($args[0]).")");
+                    }
+                    $str .= "( " . implode(" AND ", $temp) . ")";
+                }else{
+                    $str .= "FIND_IN_SET (".$this->_col($args[2],"string").",".$this->_col($args[0]).")";
+                }
+                break;
+
             default:
                 $str .= " = ".$this->_col($args[1],"string");
                 break;

From 335739679bc169d247d53be85def12d704c7deaa Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sun, 20 Mar 2016 21:54:00 +0200
Subject: [PATCH 038/114] allow query builder to accept capital and small
 letters

---
 system/module/QueryBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index 4d6e8e6..635a587 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -482,7 +482,7 @@ private function _parseOperators()
         if(!in_array($args[1], array("set", "inset")))
             $str .= $this->_col($args[0]);
 
-        switch ($args[1]) {
+        switch (strtolower($args[1])) {
             case '=':
                 $str .= " = ".$this->_col($args[2],"string");
                 break;

From f1deebbdb8733d9e62d204bed0ad8bf1f0c636b5 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Wed, 30 Mar 2016 16:31:04 +0300
Subject: [PATCH 039/114] fix database error view in debugger

---
 system/core/Database.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/core/Database.php b/system/core/Database.php
index e0624b6..1be7828 100644
--- a/system/core/Database.php
+++ b/system/core/Database.php
@@ -116,7 +116,7 @@ public static function query($sql){
 			if($config['ENVIRONMENT'] == 'debug')debug::count('Database Queries');
 
 		}catch(PDOException $e){
-			if($config['ENVIRONMENT'] == 'debug')debug::error("Database Error",$e->getMessage());
+			if($config['ENVIRONMENT'] == 'debug')debug::error("Database Error",String::escape($e->getMessage()));
 			$return->status = false;
 			$return->error = $e->getMessage();
     	}

From b87bf907615e86639a5e264e0517aa77c77331fa Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Wed, 30 Mar 2016 18:48:29 +0300
Subject: [PATCH 040/114] Assets update

Assets : add private string parser
Assets : better calling for Events as string
Assets : change Events to Hooks
Assets : use PSR-2
---
 system/core/Assets.php | 344 ++++++++++++++++++++++-------------------
 1 file changed, 183 insertions(+), 161 deletions(-)

diff --git a/system/core/Assets.php b/system/core/Assets.php
index 13cffba..98a939d 100644
--- a/system/core/Assets.php
+++ b/system/core/Assets.php
@@ -1,164 +1,186 @@
-<?php  if (!defined('VERSION'))exit('Direct access to this location is not permitted.');
+<?php
+
+defined('VERSION') or exit('Direct access to this location is not permitted');
+
 /**
- * Purecis Assets Module
+ * codeHive Assets.
+ *
+ * Assets class prepare resources, meta and elements to initiate in app
+ *
+ * @category    core
  *
- * @package		codeHive
- * @subpackage	Module
- * @category	Libraries
- * @author		Tamer Zorba
- * @link		http://purecis.com/
+ * @author      Tamer Zorba <abo.al.tot@gmail.com>
+ * @copyright   Copyright (c) 2013 - 2016, PureCore International Solutions (http://purecis.com/)
+ * @license     http://opensource.org/licenses/MIT	MIT License
+ *
+ * @link       http://codehive.purecis.com/package/Assets
+ * @since      File available since Release 2.0.0
+ *
+ * @version    V: 2.1.0
  */
-
-class Assets{
-
-	protected static $code = array("var codeHive = codeHive || {};");
-	protected static $codev = array();
-
-	public static function __bootstrap(){
-		// define globals (create function to globals .. call on listener & v get)
-		global $config;
-		self::define("path","{}");
-		self::define("path.base",Request::base());
-		self::define("path.app",Request::base($config['app']));
-		self::define("path.view",Request::base("{$config['app']}/view"));
-		self::define("path.vendor",Request::base("{$config['app']}/vendor"));
-		self::define("path.library",Request::base("{$config['assets']}/library"));
-		self::define("path.domain",Request::domain());
-		
-		Event::addListener('defaults',function(){
-
-			// parse code
-			$code = implode("\n\t\t", self::$code);
-			return "\n\t<script type='text/javascript'>\n\t\t{$code}\n\t</script>";
-		});
-	}
-
-	/**
-	 * define javascript code
-	 *
-	 * @return	void
-	 */
-	public static function define($a,$b,$c=false){
-		self::$codev[$a] = $b;
-		
-		if($b != "{}" && $b != "[]"){
-			$b = "'{$b}'";
-		}else{
-			$b = "codeHive.{$a} || {$b}";
-		}
-
-		if(!$c){
-			$b = " = {$b}";
-		}else{
-			$b = ".{$c}({$b})";
-		}
-
-		array_push(self::$code,"codeHive.{$a}{$b};");
-	}
-
-	/**
-	 * get defined all variables
-	 *
-	 * @return	void
-	 */
-	public static function variables(){
-		return self::$codev;
-	}
-
-	// TODO : load folder ( scripts )
-	
-	/**
-	 * load script
-	 *
-	 * @return	void
-	 */
-	public static function script($src,$folder="vendor",$listener='script'){
-		global $config;
-
-
-		$external = explode("://", $src);// chk external
-		if(sizeof($external) <= 1){
-
-			$ex = explode("@",$src);
-			$path = (sizeof($ex) > 1)?Module::path($ex[1]):false;
-			if(!$path)$path = "{$config['app']}";
-			else $src = $ex[0];
-
-			$path = Request::base($path);
-			$src = "{$path}/{$folder}/{$src}";
-		}
-
-		Event::addListener($listener,function() use ($src){
-			return "\n\t<script type='text/javascript' src='{$src}'></script>";
-		});
-	}
-
-	/**
-	 * style load
-	 *
-	 * @return	void
-	 */
-	public static function style($src,$folder="vendor",$listener='style'){
-		global $config;
-
-		$external = explode("://", $src);// chk external
-		if(sizeof($external) <= 1){
-
-			$ex = explode("@",$src);
-			$path = (sizeof($ex) > 1)?Module::path($ex[1]):false;
-			if(!$path)$path = "{$config['app']}";
-			else $src = $ex[0];
-
-			$path = Request::base($path);
-
-			$src = "{$path}/{$folder}/{$src}";
-		}
-
-		$extra = File::extension($src)=='less'?'/less':"";
-
-		Event::addListener($listener,function() use ($src, $extra){
-			return "\n\t<link rel='stylesheet{$extra}' type='text/css' href='{$src}' />";
-		});
-	}
-
-	/**
-	 * element load
-	 *
-	 * @return	void
-	 */
-	public static function element($src,$folder="vendor",$listener='element'){
-		global $config;
-
-		$external = explode("://", $src);// chk external
-		if(sizeof($external) <= 1){
-
-			$ex = explode("@",$src);
-			$path = (sizeof($ex) > 1)?Module::path($ex[1]):false;
-			if(!$path)$path = "{$config['app']}";
-			else $src = $ex[0];
-
-			$path = Request::base($path);
-
-			if(!strpos($src, "."))$src="{$src}/{$src}.html";
-
-			$src = "{$path}/{$folder}/{$src}";
-		}
-
-		$extra = File::extension($src)=='less'?'/less':"";
-
-		Event::addListener($listener,function() use ($src, $extra){
-			return "\n\t<link rel='import' href='{$src}' />";
-		});
-	}
-
-	/**
-	 * style load
-	 *
-	 * @return	void
-	 */
-	public static function vendor($src=''){
-		global $config;
-
-		return Request::base("{$config['app']}/vendor{$src}");
-	}
-}
\ No newline at end of file
+class Assets
+{
+    /**
+     * initialize js code.
+     */
+    protected static $code = array('var codeHive = codeHive || {};');
+
+    /**
+     * code variables.
+     */
+    protected static $codev = array();
+
+    /**
+     * codeHive Assets class constructor.
+     *
+     * define javascript default path values from codeHive
+     */
+    public static function __bootstrap()
+    {
+        // define globals (create function to globals .. call on listener & v get)
+        global $config;
+        self::define('path', '{}');
+        self::define('path.base', Request::base());
+        self::define('path.app', Request::base($config['app']));
+        self::define('path.view', Request::base("{$config['app']}/view"));
+        self::define('path.vendor', Request::base("{$config['app']}/vendor"));
+        self::define('path.library', Request::base("{$config['assets']}/library"));
+        self::define('path.domain', Request::domain());
+
+        Hook::on('script', function () {
+            $code = implode("\n\t\t", self::$code);
+
+            return "\n\t<script type='text/javascript'>\n\t\t{$code}\n\t</script>";
+        });
+        Hook::on('defaults', "\n\t<meta charset='utf-8'>");
+        Hook::on('defaults', "\n\t<meta name='viewport' content='width=device-width, initial-scale=1.0'>");
+        Hook::on('defaults', "\n\t<meta http-equiv='X-UA-Compatible' content='IE=edge' />");
+    }
+
+    /**
+     * define javascript code.
+     *
+     * @param string $a path
+     * @param Mixen  $b equality
+     * @param string $c method
+     */
+    public static function define($a, $b, $c = false)
+    {
+        self::$codev[$a] = $b;
+
+        if ($b != '{}' && $b != '[]') {
+            $b = "'{$b}'";
+        } else {
+            $b = "codeHive.{$a} || {$b}";
+        }
+
+        if (!$c) {
+            $b = " = {$b}";
+        } else {
+            $b = ".{$c}({$b})";
+        }
+
+        array_push(self::$code, "codeHive.{$a}{$b};");
+    }
+
+    /**
+     * get defined all variables.
+     *
+     * @return array List of all defintions
+     */
+    public static function variables()
+    {
+        return self::$codev;
+    }
+
+    /**
+     * Parse Source string Load assets.
+     *
+     * @param string $src    Path of js file
+     * @param string $folder default load folder
+     * @param string $ext    extension to load inside folder
+     *
+     * @return string
+     */
+    private static function src_parser($src, $folder, $ext = false)
+    {
+        global $config;
+        if (strpos($src, '://') === false) { // check is external
+            $ex = explode('@', $src);
+            $path = (sizeof($ex) > 1) ? Module::path($ex[1]) : false;
+            if (!$path) {
+                $path = "{$config['app']}";
+            } else {
+                $src = $ex[0];
+            }
+            $path = Request::base($path);
+            if (!strpos($src, '.') && $ext) {
+                $src = "{$src}/{$src}.{$ext}";
+            }
+            $src = "{$path}/{$folder}/{$src}";
+        }
+
+        return $src;
+    }
+
+    /**
+     * Register Hook to Load script.
+     *
+     * @param string $src      Path of js file
+     * @param string $folder   default load folder
+     * @param string $listener default listener name
+     */
+    public static function script($src, $folder = 'vendor', $listener = 'script')
+    {
+        $src = self::src_parser($src, $folder);
+        Hook::on($listener, "\n\t<script type='text/javascript' src='{$src}'></script>");
+    }
+
+    /**
+     * Register Hook to Load style.
+     *
+     * @param string $src      Path of js file
+     * @param string $folder   default load folder
+     * @param string $listener default listener name
+     */
+    public static function style($src, $folder = 'vendor', $listener = 'style')
+    {
+        $src = self::src_parser($src, $folder);
+        $extra = File::extension($src) == 'less' ? '/less' : '';
+        // TODO : make less and scss as plugins or hooks to fetch
+
+        Hook::on($listener, "\n\t<link rel='stylesheet{$extra}' type='text/css' href='{$src}' />");
+    }
+
+    /**
+     * Register Hook to Load element.
+     *
+     * @param string $src      Path of js file
+     * @param string $folder   default load folder
+     * @param string $listener default listener name
+     */
+    public static function element($src, $folder = 'vendor', $listener = 'element')
+    {
+        $src = self::src_parser($src, $folder, 'html');
+        $extra = File::extension($src) == 'less' ? '/less' : '';
+
+        Hook::addListener($listener, "\n\t<link rel='import' href='{$src}' />");
+    }
+
+    /**
+     * get file source in vendor.
+     *
+     * @param string $src Path of js file
+     *
+     * @return string path
+     */
+    public static function vendor($src = '')
+    {
+        global $config;
+
+        return Request::base("{$config['app']}/vendor{$src}");
+    }
+}
+
+/* End of file Assets.php */
+/* Location: ./system/core/Assets.php */

From f8f27c2482b325676615b03390c4c1e68051364e Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Wed, 30 Mar 2016 18:49:08 +0300
Subject: [PATCH 041/114] Benchmark update

Benchmark : use stdClass as default instead of array
Benchmark : use PSR-2
---
 system/core/Benchmark.php | 115 ++++++++++++++++++++------------------
 1 file changed, 61 insertions(+), 54 deletions(-)

diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php
index 401b0fb..572491b 100644
--- a/system/core/Benchmark.php
+++ b/system/core/Benchmark.php
@@ -1,69 +1,76 @@
-<?php  if (!defined('VERSION'))exit('Direct access to this location is not permitted.');
+<?php
+
+defined('VERSION') or exit('Direct access to this location is not permitted');
+
 /**
- * Purecis Benchmark Class
+ * codeHive Benchmark.
+ *
+ * Benchmark class create time and resource listener to monitor code
  *
- * This class Manage Benchmarks 
+ * @category    core
  *
- * @package		codeHive
- * @subpackage	Core
- * @category	Libraries
- * @author		Tamer Zorba
- * @link		http://purecis.com/
+ * @author      Tamer Zorba <abo.al.tot@gmail.com>
+ * @copyright   Copyright (c) 2013 - 2016, PureCore International Solutions (http://purecis.com/)
+ * @license     http://opensource.org/licenses/MIT	MIT License
+ *
+ * @link       http://codehive.purecis.com/package/Benchmark
+ * @since      File available since Release 2.0.0
+ *
+ * @version    V: 2.1.0
  */
+class Benchmark
+{
+    /**
+     * List of benchmarks.
+     */
+    protected static $benchmarks = array();
+
+    // --------------------------------------------------------------------
 
-class Benchmark{
+    /**
+     * Benchmark Start.
+     *
+     * @param	string 	Benchmark name
+     *
+     * @return array
+     */
+    public static function start($name)
+    {
+        self::$benchmarks[$name] = new stdClass();
+        self::$benchmarks[$name]->time = microtime(true);
+        self::$benchmarks[$name]->memory = memory_get_usage();
 
-	/**
-	 * List of benchmarks
-	 *
-	 * @var array
-	 * @access protected
-	 */
-	protected static $Benchmarks = array();
+        return self::$benchmarks[$name];
+    }
 
-	// --------------------------------------------------------------------
+    // --------------------------------------------------------------------
 
-	/**
-	 * Benchmark Start
-	 *
-	 * @access	public
-	 * @param	string 	Benchmark name
-	 * @return	array
-	 */
-	public static function start($name){
-		self::$Benchmarks[$name] = array();
-		self::$Benchmarks[$name]['time'] = microtime(true);
-		self::$Benchmarks[$name]['memory'] = memory_get_usage();
-		return self::$Benchmarks[$name];
-	}
+    /**
+     * Benchmark Complete.
+     *
+     * @param	string 	Benchmark name
+     *
+     * @return array
+     */
+    public static function complete($name)
+    {
+        global $config;
 
-	// --------------------------------------------------------------------
+        $end = new stdClass();
+        $end->time = microtime(true);
+        $end->memory = memory_get_usage();
 
-	/**
-	 * Benchmark Complete
-	 *
-	 * @access	public
-	 * @param	string 	Benchmark name
-	 * @return	array
-	 */
-	public static function complete($name){
-		global $config;
-		
-		$arr = array(
-			"time" 		=> microtime(true),
-			"memory" 	=> memory_get_usage()
-		);
-		if($config['ENVIRONMENT'] == 'debug'){
-			$time = round($arr['time']-self::$Benchmarks[$name]['time'],4);
-			$memory = $arr['memory'] - self::$Benchmarks[$name]['memory'];
-			$memory = $memory." - ".File::format($memory);
+        if ($config['ENVIRONMENT'] == 'debug') {
+            $time = round($end->time - self::$benchmarks[$name]->time, 4);
+            $memory = $end->memory - self::$benchmarks[$name]->memory;
+            $memory = $memory.' - '.File::format($memory);
 
-			debug::error("Benchmark {$name}","Time : {$time} | Memory : {$memory}");
-		}
-		return $arr;
-	}
+            Debug::error("Benchmark {$name}", "Time : {$time} | Memory : {$memory}");
+        }
 
+        return $arr;
+    }
 }
 
 /* End of file Benchmark.php */
-/* Location: ./system/core/Benchmark.php */
\ No newline at end of file
+/* Location: ./system/core/Benchmark.php */

From f3126d1b5ffb7fb3ddf6c66e1170bf149598bf6f Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Wed, 30 Mar 2016 18:49:23 +0300
Subject: [PATCH 042/114] Event : accept string to callback

---
 system/core/Event.php | 87 +++++++++++++++++++++++++------------------
 1 file changed, 51 insertions(+), 36 deletions(-)

diff --git a/system/core/Event.php b/system/core/Event.php
index f7e4cb1..a8f0336 100644
--- a/system/core/Event.php
+++ b/system/core/Event.php
@@ -1,52 +1,67 @@
-<?php  if (!defined('VERSION'))exit('Direct access to this location is not permitted.');
+<?php
+ if (!defined('VERSION')) {
+     exit('Direct access to this location is not permitted.');
+ }
 /**
- * Purecis Event Module
+ * Purecis Event Module.
  *
  * This class Control Event Requests
  *
- * @package		codeHive
- * @subpackage	Module
  * @category	Libraries
+ *
  * @author		Tamer Zorba
+ *
  * @link		http://purecis.com/
  */
+class Event
+{
+    /**
+     * Variables.
+     *
+     * @var mixen
+     */
+    private static $events;
 
-class Event{
+    // --------------------------------------------------------------------
 
-	/**
-	 * Variables
-	 *
-	 * @var mixen
-	 * @access protected
-	 */
-	private static $events;
+    /**
+     * event addListener.
+     *
+     * @param	string
+     * @param	mixen
+     */
+    public static function addListener($event, $callback)
+    {
+        if (!is_callable($callback)) {
+            $callback = function () use ($callback) {
+                return $callback;
+            };
+        }
 
-	// --------------------------------------------------------------------
+        if (!isset(self::$events[$event])) {
+            self::$events[$event] = [];
+        }
+        array_push(self::$events[$event], $callback);
 
-	/**
-	 * event addListener
-	 *
-	 * @param	string
-	 * @param	mixen
-	 * @return	void
-	 */
-	public static function addListener($event,$callback){
-		if(!isset(self::$events[$event]))self::$events[$event] = [];
-		array_push(self::$events[$event], $callback);
-		return $callback;
-	}
+        return $callback;
+    }
 
+    // --------------------------------------------------------------------
 
-	// --------------------------------------------------------------------
+    /**
+     * event trigger.
+     *
+     * @return function
+     */
+    public static function trigger($event, $args = false)
+    {
+        $r = '';
+        if (isset(self::$events[$event])) {
+            foreach (self::$events[$event] as $c) {
+                $r .= call_user_func_array($c, array(&Controller::$scope, $args));
+            }
+        }
 
-	/**
-	 * event trigger
-	 *
-	 * @return	function
-	 */
-	public static function trigger($event, $args=false){
-		$r = "";
-		if(isset(self::$events[$event]))foreach(self::$events[$event] as $c)$r .= call_user_func_array($c, array(&Controller::$scope,$args));
-		return $r;
-	}
+        return $r;
+    }
 }

From 609fdee835b113dcf7e5649f601f187314488096 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Wed, 30 Mar 2016 18:49:37 +0300
Subject: [PATCH 043/114] Internationalization : the __ alias require
 initialize this module

---
 system/core/Internationalization.php | 380 ++++++++++++++-------------
 1 file changed, 204 insertions(+), 176 deletions(-)

diff --git a/system/core/Internationalization.php b/system/core/Internationalization.php
index e6f11df..9448897 100644
--- a/system/core/Internationalization.php
+++ b/system/core/Internationalization.php
@@ -1,187 +1,215 @@
-<?php  if (!defined('VERSION'))exit('Direct access to this location is not permitted.');
+<?php
+ if (!defined('VERSION')) {
+     exit('Direct access to this location is not permitted.');
+ }
 /**
- * Purecis Internationalization Class
+ * Purecis Internationalization Class.
  *
- * control Sessions With Advance Tecnique 
+ * control Sessions With Advance Tecnique
  *
- * @package		codeHive
- * @subpackage	Core
  * @category	Libraries
+ *
  * @author		Tamer Zorba
+ *
  * @link		http://purecis.com/
  */
+class Internationalization
+{
+    /**
+     * @var array
+     */
+    protected static $phrases = array();
+    protected static $phrases_space = array();
+    public static $locale = 'en-us';
+
+    // --------------------------------------------------------------------
+
+    /**
+     * Locale translate.
+     *
+     * @param	mixen 	str or array keys only
+     *
+     * @return mixen
+     */
+    public static function translate($msg, $args = array(), $space = false)
+    {
+        self::prepare($space);
+
+        if (!$space) {
+            $localeArr = isset(self::$phrases[$msg]) ? self::$phrases[$msg] : $msg;
+        } else {
+            $localeArr = isset(self::$phrases_space[$space][$msg]) ? self::$phrases_space[$space][$msg] : $msg;
+        }
+
+        if (is_array($localeArr)) {
+            $parsing = self::parse($localeArr, $args);
+            if ($parsing) {
+                $msg = $parsing;
+            }
+        } elseif (is_string($localeArr)) {
+            $msg = $localeArr;
+        }
+
+        // we use this bcz preg_replace Modifier /e deprecated
+        $arr = array();
+        foreach ($args as $k => $v) {
+            $arr[":{$k}"] = $v;
+        }
+        $msg = strtr($msg, $arr);
+
+        //$msg = preg_replace('/:(\w+)/e', 'isset($args["$1"])?$args["$1"]:0', $msg);
+
+        return $msg;
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * Locale Parse.
+     *
+     * @param	mixen 	str or array keys only
+     *
+     * @return mixen
+     */
+    private static function parse($msg_arr, $args)
+    {
+        foreach ($msg_arr as $exp => $msg) {
+            if (self::plural($exp, $args)) {
+                if (is_array($msg)) {
+                    return self::parse($msg, $args);
+                } else {
+                    return $msg;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * Locale plural.
+     *
+     * @param	mixen 	str or array keys only
+     *
+     * @return mixen
+     */
+    private static function plural($exp, $args)
+    {
+        $exp = explode(':', $exp);
+
+        if (!isset($args[$exp[0]])) {
+            return false;
+        }
+
+        if ($exp[1] == 'eq') {
+            return $args[$exp[0]] == $exp[2];
+        } elseif ($exp[1] == 'gt') {
+            return $args[$exp[0]] > $exp[2];
+        } elseif ($exp[1] == 'gte') {
+            return $args[$exp[0]] >= $exp[2];
+        } elseif ($exp[1] == 'lt') {
+            return $args[$exp[0]] < $exp[2];
+        } elseif ($exp[1] == 'lte') {
+            return $args[$exp[0]] <= $exp[2];
+        } elseif ($exp[1] == 'zero') {
+            return $args[$exp[0]] == 0;
+        } elseif ($exp[1] == 'one') {
+            return $args[$exp[0]] == 1;
+        } elseif ($exp[1] == 'few') {
+            return $args[$exp[0]] >= 2 && $args[$exp[0]] <= 4;
+        } elseif ($exp[1] == 'other') {
+            return true;
+        }
+
+        return false;
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * Locale prepare.
+     *
+     * @param	mixen 	str or array keys only
+     *
+     * @return mixen
+     */
+    public static function prepare($space = false, $force = false)
+    {
+        global $config;
+
+        $locale = Session::exist('locale') ? Session::get('locale') : (isset($config['locale']) ? $config['locale'] : self::$locale);
+
+        if ($space) {
+            if ($force) {
+                Module::import($space);
+            }
+            $path = Module::path($space)."/language/{$locale}";
+        } else {
+            $path = "{$config['app']}/language/{$locale}";
+            if (!file_exists($path)) {
+                $path = "{$config['app']}/locale/{$locale}";
+            }
+            if (!file_exists($path)) {
+                $path = "{$config['system']}/language/{$locale}";
+            }
+        }
+        if (!is_dir($path)) {
+            if ($config['ENVIRONMENT'] == 'debug') {
+                debug::error('Missing Locales', $space);
+            }
+            //else die("Locales at <b>{$space}</b> not Found.");
+
+            return;
+        }
+
+        foreach (glob("{$path}/*.php") as $filename) {
+            $lng = self::localeFile($filename);
+            if (!is_array($lng)) {
+                return false;
+            }
+            if (!$space) {
+                self::$phrases = array_merge(self::$phrases, $lng);
+            } else {
+                if (!is_array(self::$phrases_space[$space])) {
+                    self::$phrases_space[$space] = array();
+                }
+                self::$phrases_space[$space] = array_merge(self::$phrases_space[$space], $lng);
+            }
+        }
+
+        if (!$space) {
+            return self::$phrases;
+        } else {
+            return self::$phrases_space[$space];
+        }
+    }
+
+    private static function localeFile($filename)
+    {
+        return require_once $filename;
+    }
+
+    public static function requestLocale($locale = 'locale')
+    {
+        if (Request::get($locale)) {
+            Session::set(array('locale' => Request::get($locale)));
+        }
+    }
+}
 
-class Internationalization{
-
-	/**
-	 * @var array
-	 * @access protected
-	 */
-	protected static $phrases = array();
-	protected static $phrases_space = array();
-	public static $locale = 'en-us';
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Locale translate
-	 *
-	 * @access	public
-	 * @param	mixen 	str or array keys only
-	 * @return	mixen
-	 */
-	public static function translate($msg, $args=array(),$space=false){
-		self::prepare($space);
-
-		if(!$space){
-			$localeArr = isset(self::$phrases[$msg])?self::$phrases[$msg]:$msg;
-		}else{
-			$localeArr = isset(self::$phrases_space[$space][$msg])?self::$phrases_space[$space][$msg]:$msg;
-		}
-
-		if(is_array($localeArr)){
-			$parsing = self::parse($localeArr,$args);
-			if($parsing)$msg = $parsing;
-
-		}else if(is_string($localeArr)){
-			$msg = $localeArr;
-
-		}
-
-		// we use this bcz preg_replace Modifier /e deprecated 
-		$arr = array();
-		foreach($args as $k => $v)$arr[":{$k}"] = $v;
-		$msg = strtr($msg,$arr);
-		
-	 	//$msg = preg_replace('/:(\w+)/e', 'isset($args["$1"])?$args["$1"]:0', $msg);
-
-		
-		return $msg;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Locale Parse
-	 *
-	 * @access	private
-	 * @param	mixen 	str or array keys only
-	 * @return	mixen
-	 */
-	private static function parse($msg_arr, $args){
-		foreach($msg_arr as $exp => $msg){
-			if(self::plural($exp,$args)){
-				if(is_array($msg)){
-
-					return self::parse($msg,$args);
-				}else{
-
-					return $msg;
-				}
-			}
-		}
-		return false;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Locale plural
-	 *
-	 * @access	private
-	 * @param	mixen 	str or array keys only
-	 * @return	mixen
-	 */
-	private static function plural($exp, $args){
-
-		$exp = explode(":",$exp);
-
-		if(!isset($args[$exp[0]]))return false;
-
-		if($exp[1] == 'eq'){
-			return $args[$exp[0]] == $exp[2];
-		
-		}else if($exp[1] == 'gt'){
-			return $args[$exp[0]] > $exp[2];
-		
-		}else if($exp[1] == 'gte'){
-			return $args[$exp[0]] >= $exp[2];
-			
-		}else if($exp[1] == 'lt'){
-			return $args[$exp[0]] < $exp[2];
-			
-		}else if($exp[1] == 'lte'){
-			return $args[$exp[0]] <= $exp[2];
-		
-		}else if($exp[1] == 'zero'){
-			return $args[$exp[0]] == 0;
-
-		}else if($exp[1] == 'one'){
-			return $args[$exp[0]] == 1;
-		
-		}else if($exp[1] == 'few'){
-			return ($args[$exp[0]] >= 2 && $args[$exp[0]] <= 4);
-		
-		}else if($exp[1] == 'other'){
-			return true;
-		}
-
-		return false;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Locale prepare
-	 *
-	 * @access	public
-	 * @param	mixen 	str or array keys only
-	 * @return	mixen
-	 */
-	public static function prepare($space=false,$force=false){
-		global $config;
-
-		$locale = Session::exist('locale')?Session::get('locale'):(isset($config['locale'])?$config['locale']:self::$locale);
-		
-		if($space){
-			if($force)Module::import($space);
-			$path = Module::path($space)."/language/{$locale}";
-		}else{
-			$path = "{$config['app']}/language/{$locale}";
-			if(!file_exists($path))$path = "{$config['app']}/locale/{$locale}";
-			if(!file_exists($path))$path = "{$config['system']}/language/{$locale}";
-		}
-		if(!is_dir($path)){
-			if($config['ENVIRONMENT'] == 'debug')debug::error("Missing Locales",$space);
-			//else die("Locales at <b>{$space}</b> not Found.");
-
-			return null;
-		}
-
-		foreach (glob("{$path}/*.php") as $filename){
-		    $lng = self::localeFile($filename);
-		    if(!is_array($lng))return false;
-		    if(!$space){
-		    	self::$phrases = array_merge(self::$phrases,$lng);
-		    }else{
-		    	if(!is_array(self::$phrases_space[$space]))self::$phrases_space[$space] = array();
-		     	self::$phrases_space[$space] = array_merge(self::$phrases_space[$space],$lng);
-		    }
-		}
-
-		if(!$space)return self::$phrases;
-		else return self::$phrases_space[$space];
-	}
-	
-	private static function localeFile($filename){
-		return require_once $filename;
-	}
-
-
-	public static function requestLocale($locale='locale'){
-		if(Request::get($locale))Session::set(array('locale'=>Request::get($locale)));
-	}
+/**
+ * Locale Alias __.
+ *
+ * @param	mixen 	str or array keys only
+ *
+ * @return mixen
+ */
+function __($e, $a = array(), $space = false)
+{
+    return Internationalization::translate($e, $a, $space);
 }
 
 /* End of file Locale.php */
-/* Location: ./system/core/Locale.php */
\ No newline at end of file
+/* Location: ./system/core/Locale.php */

From b7eae5fe80beb9c94b5d1175cfab4bf91e1a9ec5 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Wed, 30 Mar 2016 18:50:14 +0300
Subject: [PATCH 044/114] Hook : init new class

create new alias for Events class
---
 system/core/Hook.php | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 system/core/Hook.php

diff --git a/system/core/Hook.php b/system/core/Hook.php
new file mode 100644
index 0000000..35feb9d
--- /dev/null
+++ b/system/core/Hook.php
@@ -0,0 +1,42 @@
+<?php
+ if (!defined('VERSION')) {
+     exit('Direct access to this location is not permitted.');
+ }
+/**
+ * codeHive Hooks class is an alias for Events.
+ *
+ * This class Control Event Requests
+ *
+ * @category	Libraries
+ *
+ * @author		Tamer Zorba
+ *
+ * @link		http://purecis.com/
+ */
+class Hook
+{
+    // --------------------------------------------------------------------
+
+    /**
+     * event addListener.
+     *
+     * @param	string (event name)
+     * @param	mixen
+     */
+    public static function on($event, $callback)
+    {
+        return Event::addListener($event, $callback);
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * event trigger.
+     *
+     * @return function
+     */
+    public static function trigger($event, $args = false)
+    {
+        return Event::trigger($event, $args);
+    }
+}

From 342fecd1fdfb221a57fa109ee5b0764ca3c790c8 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Wed, 30 Mar 2016 18:50:28 +0300
Subject: [PATCH 045/114] Debug : fix view on js

---
 system/core/Debug.php | 260 +++++++++++++++++++++++-------------------
 1 file changed, 144 insertions(+), 116 deletions(-)

diff --git a/system/core/Debug.php b/system/core/Debug.php
index f1e0d12..954f072 100644
--- a/system/core/Debug.php
+++ b/system/core/Debug.php
@@ -1,125 +1,153 @@
-<?php  if (!defined('VERSION'))exit('Direct access to this location is not permitted.');
+<?php
+ if (!defined('VERSION')) {
+     exit('Direct access to this location is not permitted.');
+ }
 /**
- * Purecis Debug Class
+ * Purecis Debug Class.
  *
  * This class Control Files on the server.
  *
- * @package		codeHive
- * @subpackage	Core
  * @category	Libraries
+ *
  * @author		Tamer Zorba
+ *
  * @link		http://purecis.com/
  */
-
-class Debug{
-
-	private static $message = array();
-	private static $error = array();
-	private static $count = array();
-	private static $microtime;
-	private static $memory;
-
-	private static $disabled = false;
-
-	private static $custom = array(
-		"time" => array(),
-		"memory" => array()
-	);
-
-	public static function __bootstrap(){
-		if(self::$disabled)return;
-		self::$microtime = microtime(true);
-		self::$memory = memory_get_usage();
-	}
-
-	public static function __shutdown(){
-		if(self::$disabled)return;
-
-		$time = round(microtime(true)-self::$microtime,4);
-		$memory = memory_get_usage();
-		$rmemory = $memory-self::$memory;
-		$memory .= " - %c".File::format($memory);
-		$rmemory .= " - %c".File::format($rmemory);
-		$memoryp = memory_get_peak_usage(true);
-		$memoryp .= " - %c".File::format($memoryp);
-		$version = VERSION;
-		$ext = File::extension(request::alias());
-
-		$comment = (in_array($ext, array('js','css')))?true:false;
-
-		if($comment)echo "/** Debug **";
-
-		echo "\n\n\n\n\n\n<script>";
-		echo "console.log('%cTime to Excute \t: %c{$time}', 'color:#999', 'color:#099');";
-		echo "console.log('%cMemory Usage \t\t: %c{$rmemory}', 'color:#999', 'color:#ddd', 'color:#099');";
-		echo "console.log('%cTotal Memory Usage : %c{$memory}', 'color:#999', 'color:#ddd', 'color:#099');";
-		echo "console.log('%cTotal Memory Peaks : %c{$memoryp}', 'color:#999', 'color:#ddd', 'color:#099');";
-
-		foreach(self::$count as $type => $arr){
-			$msg = sizeof($arr);
-			$space = 5-floor(strlen($type)/4);
-			$space = str_repeat("\t", $space);
-			echo "console.log('%c{$type}{$space}: %c{$msg}', 'color:#999', 'color:#099');";
-		}
-
-		foreach(self::$message as $type => $arr){
-			$msg = implode($arr, ", ");
-			$space = 5-floor(strlen($type)/4);
-			$space = str_repeat("\t", $space);
-			echo "console.log('%c{$type}{$space}: %c{$msg}', 'color:#999', 'color:#099');";
-		}
-
-
-		foreach(self::$error as $type => $arr){
-			foreach($arr as $k => $v)if(is_array($arr[$k]))$arr[$k] = "(".implode($v, "|").")";
-			$msg = implode($arr, ", ");
-			$space = 5-floor(strlen($type)/4);
-			$space = str_repeat("\t", $space);
-			echo "console.log('%c{$type}{$space}: %c{$msg}', 'color:#900', 'color:#111');";
-		}
-		$REQUEST_URI = $_SERVER['REQUEST_URI'];
-		echo "console.log('%cRequest \t\t\t: %c{$REQUEST_URI}', 'color: #999', 'color:#099');";
-		echo "console.log('%cCore Version \t\t: %c{$version}', 'color: #999', 'color:#ddd');";
-		echo "console.log('%cCopyright \t\t\t: %cPowered By Pure Core International Solutions (Purecis)', 'color: #999', 'color:#ddd');";
-		echo "console.log('%c-- -- -- -- -- -- -- -- -- -- -- -- -- -- --', 'color: #999');";
-
-		echo "</script>";
-
-		if($comment)echo "*/";
-		
-	}
-
-	public static function message($parent,$msg){
-		if(!isset(self::$message[$parent]))self::$message[$parent] = array();
-		if(array_search($msg,self::$message[$parent]) === false)array_push(self::$message[$parent],$msg);
-	}
-
-	public static function error($parent,$msg){
-		if(!isset(self::$error[$parent]))self::$error[$parent] = array();
-		if(array_search($msg,self::$error[$parent]) === false)array_push(self::$error[$parent],$msg);
-	}
-
-	public static function count($parent){
-		if(!isset(self::$count[$parent]))self::$count[$parent] = array();
-		array_push(self::$count[$parent],"");
-	}
-
-	public static function disable(){
-		self::$disabled = true;
-	}
-
-
-	public static function start($name="default"){
-		self::$custom["time"][$name] = microtime(true);
-		self::$custom["memory"][$name] = memory_get_usage();
-	}
-
-	public static function finish($name="default"){
-		$cls = new stdClass();
-		$cls->time = round(microtime(true)-self::$custom["time"][$name],4);
-		$cls->memory = File::format(memory_get_usage()-self::$memory);
-		return $cls;
-	}
-
+class Debug
+{
+    private static $message = array();
+    private static $error = array();
+    private static $count = array();
+    private static $microtime;
+    private static $memory;
+
+    private static $disabled = false;
+
+    private static $custom = array(
+        'time' => array(),
+        'memory' => array(),
+    );
+
+    public static function __bootstrap()
+    {
+        if (self::$disabled) {
+            return;
+        }
+        self::$microtime = microtime(true);
+        self::$memory = memory_get_usage();
+    }
+
+    public static function __shutdown()
+    {
+        if (self::$disabled) {
+            return;
+        }
+
+        $time = round(microtime(true) - self::$microtime, 4);
+        $memory = memory_get_usage();
+        $rmemory = $memory - self::$memory;
+        $memory .= ' - %c'.File::format($memory);
+        $rmemory .= ' - %c'.File::format($rmemory);
+        $memoryp = memory_get_peak_usage(true);
+        $memoryp .= ' - %c'.File::format($memoryp);
+        $version = VERSION;
+        $ext = File::extension(request::alias());
+
+        $comment = (in_array($ext, array('js', 'css'))) ? true : false;
+
+        if ($comment) {
+            echo '/** Debug **';
+        }
+
+        echo "\n\n\n\n\n\n<script>";
+        echo "\n\tconsole.log('%cTime to Excute \t: %c{$time}', 'color:#999', 'color:#099');";
+        echo "\n\tconsole.log('%cMemory Usage \t\t: %c{$rmemory}', 'color:#999', 'color:#ddd', 'color:#099');";
+        echo "\n\tconsole.log('%cTotal Memory Usage : %c{$memory}', 'color:#999', 'color:#ddd', 'color:#099');";
+        echo "\n\tconsole.log('%cTotal Memory Peaks : %c{$memoryp}', 'color:#999', 'color:#ddd', 'color:#099');";
+
+        foreach (self::$count as $type => $arr) {
+            $msg = sizeof($arr);
+            $space = 5 - floor(strlen($type) / 4);
+            $space = str_repeat("\t", $space);
+            echo "\n\tconsole.log('%c{$type}{$space}: %c{$msg}', 'color:#999', 'color:#099');";
+        }
+
+        foreach (self::$message as $type => $arr) {
+            $msg = implode($arr, ', ');
+            $space = 5 - floor(strlen($type) / 4);
+            $space = str_repeat("\t", $space);
+            echo "\n\tconsole.log('%c{$type}{$space}: %c{$msg}', 'color:#999', 'color:#099');";
+        }
+
+        foreach (self::$error as $type => $arr) {
+            foreach ($arr as $k => $v) {
+                if (is_array($arr[$k])) {
+                    $arr[$k] = '('.implode($v, '|').')';
+                }
+            }
+            $msg = implode($arr, ', ');
+            $space = 5 - floor(strlen($type) / 4);
+            $space = str_repeat("\t", $space);
+            echo "\n\tconsole.log('%c{$type}{$space}: %c{$msg}', 'color:#900', 'color:#111');";
+        }
+        $REQUEST_URI = $_SERVER['REQUEST_URI'];
+        echo "\n\tconsole.log('%cRequest \t\t\t: %c{$REQUEST_URI}', 'color: #999', 'color:#099');";
+        echo "\n\tconsole.log('%cCore Version \t\t: %c{$version}', 'color: #999', 'color:#ddd');";
+        echo "\n\tconsole.log('%cCopyright \t\t\t: %cPowered By Pure Core International Solutions (Purecis)', 'color: #999', 'color:#ddd');";
+        echo "\n\tconsole.log('%c-- -- -- -- -- -- -- -- -- -- -- -- -- -- --', 'color: #999');";
+
+        echo '</script>';
+
+        if ($comment) {
+            echo '*/';
+        }
+    }
+
+    public static function message($parent, $msg)
+    {
+        if (!isset(self::$message[$parent])) {
+            self::$message[$parent] = array();
+        }
+        if (array_search($msg, self::$message[$parent]) === false) {
+            array_push(self::$message[$parent], $msg);
+        }
+    }
+
+    public static function error($parent, $msg)
+    {
+        if (!isset(self::$error[$parent])) {
+            self::$error[$parent] = array();
+        }
+        if (array_search($msg, self::$error[$parent]) === false) {
+            array_push(self::$error[$parent], $msg);
+        }
+    }
+
+    public static function count($parent)
+    {
+        if (!isset(self::$count[$parent])) {
+            self::$count[$parent] = array();
+        }
+        array_push(self::$count[$parent], '');
+    }
+
+    public static function disable()
+    {
+        self::$disabled = true;
+    }
+
+    public static function start($name = 'default')
+    {
+        self::$custom['time'][$name] = microtime(true);
+        self::$custom['memory'][$name] = memory_get_usage();
+    }
+
+    public static function finish($name = 'default')
+    {
+        $cls = new stdClass();
+        $cls->time = round(microtime(true) - self::$custom['time'][$name], 4);
+        $cls->memory = File::format(memory_get_usage() - self::$memory);
+
+        return $cls;
+    }
 }
-?>
\ No newline at end of file

From 27298b763c23d35d863be688b0b5db005f9cc6c6 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Wed, 30 Mar 2016 18:50:50 +0300
Subject: [PATCH 046/114] Core update

codeHive Core : fix some notice and better code
codeHive Core : use PSR-2
---
 system/core/codeHive.php | 225 +++++++++++++++++++--------------------
 1 file changed, 112 insertions(+), 113 deletions(-)

diff --git a/system/core/codeHive.php b/system/core/codeHive.php
index 41c9c52..04a40a6 100644
--- a/system/core/codeHive.php
+++ b/system/core/codeHive.php
@@ -1,124 +1,123 @@
 <?php
 /**
- * Purecis codeHive Class
+ * codeHive Core.
  *
- * bootstrap class
+ * Core class init codeHive Framework
  *
- * @package		codeHive
- * @subpackage	Core
- * @category	Libraries
- * @author		Purecis Dev Team
- * @copyright	Copyright (c) 2004 - 2015, Purecis, Inc.
- * @license		http://purecis.com/license
- * @link		http://purecis.com
- * @since		Version 2.0
- * @filesource
- */
-
-/**
- * auto load class when it called (Library classes only)
- */
-spl_autoload_register(function($class) {
-	global $config;
-	//if(strpos($class,"codeHive\Module\\") !== false){
-	//	$class = substr($class,strlen("codeHive\Module\\"));
-	//	Module::import($class);
-	//}else{
-		$class = str_replace("\\", "/", $class);
-		if(is_file("{$config['system']}/core/{$class}.php")){
-			require_once "{$class}.php";
-			if(is_callable(array($class,'__bootstrap')))call_user_func(array($class,'__bootstrap'));
-			if($config['ENVIRONMENT'] == 'debug')debug::message("Used System Cores",$class);
-		}else{
-			if($config['ENVIRONMENT'] == 'debug')debug::error("System Cores Faild",$class);
-		}
-	//}
-});
-
-/**
- * Locale Alias __
+ * @category    core
+ *
+ * @author      Tamer Zorba <abo.al.tot@gmail.com>
+ * @copyright   Copyright (c) 2013 - 2016, PureCore International Solutions (http://purecis.com/)
+ * @license     http://opensource.org/licenses/MIT	MIT License
  *
- * @access	public
- * @param	mixen 	str or array keys only
- * @return	mixen
+ * @link       http://codehive.purecis.com/package/Benchmark
+ * @since      File available since Release 2.0.0
+ *
+ * @version    V: 2.1.0
  */
-function __($e,$a=array(),$space=false){
-	return Internationalization::translate($e,$a,$space);
+class codeHive
+{
+    public static function start($start = array('app' => 'app'))
+    {
+        global $config;
+
+        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+            throw new Exception('The codeHive Framework v2.1 requires PHP version 5.3 or higher, (5.4) is Recomonded.');
+        }
+
+        define('VersionMajor', '2');
+        define('VersionMinor', '1');
+        define('VersionPatch', '00');
+        define('VersionCode', 'Beta');
+        define('VersionBuild', '3000');
+
+        define('VERSION', 'v.'.VersionMajor.'.'.VersionMinor.'.'.VersionPatch.' '.VersionCode.', Build '.VersionBuild);
+
+        $config = array();
+        $config['app'] = $start['app'] ?: 'app';
+        $config['assets'] = $start['assets'] ?: 'assets';
+        $config['system'] = $start['system'] ?: 'system';
+
+        $config = array_merge($config, self::config($config['app']));
+
+        if (!$config['settings']) {
+            $config['settings'] = array();
+        }
+
+        // defines
+        define('INDEX_FILE', isset($config['index']) ? $config['index'] : 'index.php');
+        define('SESSION_PERFIX', isset($config['session']) ? $config['session'] : '');
+
+        if (isset($config['license'])) {
+            if (isset($config['license']['hash'])) {
+                define('SECURITY_HASH', $config['license']['hash']);
+            }
+        }
+        if (isset($config['timezone'])) {
+            date_default_timezone_set($config['timezone']);
+        }
+
+        if (isset($config['ENVIRONMENT'])) {
+            switch ($config['ENVIRONMENT']) {
+                case 'development' :
+                    error_reporting(E_ALL);
+                break;
+
+                case 'debug' :
+                    error_reporting(E_ALL);
+                    Debug::__bootstrap();
+                break;
+
+                case 'production' :
+                    error_reporting(0);
+                break;
+
+                default:
+                    exit('The application environment is not set correctly.');
+            }
+        }
+
+        echo Module::__bootstrap();
+
+        require_once "{$start['app']}/app.php";
+
+        echo Module::__shutdown();
+
+        if (isset($config['ENVIRONMENT']) && $config['ENVIRONMENT'] == 'debug') {
+            Debug::__shutdown();
+        }
+    }
+
+    private static function config($app)
+    {
+        if (!file_exists("{$app}/config.php")) {
+            Install::initialize();
+            exit;
+        };
+
+        return require_once "{$app}/config.php";
+    }
 }
 
-/**
- * Class Start
+/*
+ * auto load class when it called (Core Classes Only).
  */
-class codeHive{//composer, artisan, Hive , Arti, Zorba, codeHive, iBuilder
-
-	public static function start($start = array('app'=>'app')){
-		global $config;
-
-		if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-		  throw new Exception('The codeHive Framework v2 requires PHP version 5.3 or higher, (5.4) is Recomonded.');
-		}
-
-		define(VersionMajor,"2");
-		define(VersionMinor,"0");
-		define(VersionPatch,"00");
-		define(VersionCode,"Alpha");
-		define(VersionBuild,"2096");
-
-		define(VERSION,"v.".VersionMajor.".".VersionMinor.".".VersionPatch." ".VersionCode.", Build ".VersionBuild);
-
-		$config = array();
-		$config['app'] = $start['app']?:"app";
-		$config['assets'] = $start['assets']?:"assets";
-		$config['system'] = $start['system']?:"system";
-
-		$config = array_merge($config,self::config($config['app']));
-
-		if(!$config['settings'])$config['settings'] = array();
-
-		// defines
-		define(INDEX_FILE, $config['index']?:'index.php');
-		define(SESSION_PERFIX, $config['session']?:'');
-		if($config['license'])define(SECURITY_HASH, $config['license']['hash']);
-		if($config['timezone'])date_default_timezone_set($config['timezone']);
-
-		// env
-		if ($config['ENVIRONMENT']){
-			switch ($config['ENVIRONMENT']){
-				case 'development':
-					error_reporting(E_ALL);
-				break;
-
-				case 'debug':
-					error_reporting(E_ALL);
-					Debug::__bootstrap();
-				break;
-
-				case 'production':
-					error_reporting(0);
-				break;
-
-				default:
-					exit('The application environment is not set correctly.');
-			}
-		}
-
-		echo Module::__bootstrap();
-
-		require_once "{$start['app']}/app.php";
-
-		echo Module::__shutdown();
-
-		if($config['ENVIRONMENT'] == 'debug')Debug::__shutdown();
-	}
-
-	private static function config($app){
-		if(!file_exists("{$app}/config.php")){
-			Install::initialize();
-			exit;
-		};
-		return require_once "{$app}/config.php";
-	}
-}
-
+spl_autoload_register(function ($class) {
+    global $config;
+    $class = str_replace('\\', '/', $class);
+    if (is_file("{$config['system']}/core/{$class}.php")) {
+        require_once "{$class}.php";
+        if (is_callable(array($class, '__bootstrap'))) {
+            call_user_func(array($class, '__bootstrap'));
+        }
+        if (isset($config['ENVIRONMENT']) && $config['ENVIRONMENT'] == 'debug') {
+            debug::message('Used System Cores', $class);
+        }
+    } else {
+        if ($config['ENVIRONMENT'] == 'debug') {
+            debug::error('System Cores Faild', $class);
+        }
+    }
+});
 /* End of file codeHive.php */
 /* Location: ./system/core/codeHive.php */

From 2c1cb93b81bd82441f8f75624b972c808db8d07a Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 5 Apr 2016 14:35:00 +0300
Subject: [PATCH 047/114] fix some issues

new database connection
new trace and globalize it
api can handle module inside api's
and alot more
---
 system/core/{Assets.php => Asset.php} |   16 +-
 system/core/Benchmark.php             |   17 +-
 system/core/Controller.php            |  216 ++--
 system/core/Database.php              |  302 +++---
 system/core/Internationalization.php  |    4 +-
 system/core/Module.php                |  396 ++++---
 system/core/Session.php               |  195 ++--
 system/core/{Debug.php => Trace.php}  |   10 +-
 system/core/View.php                  |  118 ++-
 system/core/codeHive.php              |   29 +-
 system/helper/Cache.php               |    9 +
 system/module/API.php                 |  426 ++++----
 system/module/Query.php               | 1412 +++++++++++++------------
 system/module/QueryBuilder.php        |  323 +++---
 system/module/Router.php              |  251 +++--
 15 files changed, 2032 insertions(+), 1692 deletions(-)
 rename system/core/{Assets.php => Asset.php} (93%)
 rename system/core/{Debug.php => Trace.php} (94%)
 create mode 100644 system/helper/Cache.php

diff --git a/system/core/Assets.php b/system/core/Asset.php
similarity index 93%
rename from system/core/Assets.php
rename to system/core/Asset.php
index 98a939d..1da981d 100644
--- a/system/core/Assets.php
+++ b/system/core/Asset.php
@@ -3,9 +3,9 @@
 defined('VERSION') or exit('Direct access to this location is not permitted');
 
 /**
- * codeHive Assets.
+ * codeHive Asset.
  *
- * Assets class prepare resources, meta and elements to initiate in app
+ * Asset class prepare resources, meta and elements to initiate in app
  *
  * @category    core
  *
@@ -13,12 +13,12 @@
  * @copyright   Copyright (c) 2013 - 2016, PureCore International Solutions (http://purecis.com/)
  * @license     http://opensource.org/licenses/MIT	MIT License
  *
- * @link       http://codehive.purecis.com/package/Assets
+ * @link       http://codehive.purecis.com/package/Asset
  * @since      File available since Release 2.0.0
  *
  * @version    V: 2.1.0
  */
-class Assets
+class Asset
 {
     /**
      * initialize js code.
@@ -31,7 +31,7 @@ class Assets
     protected static $codev = array();
 
     /**
-     * codeHive Assets class constructor.
+     * codeHive Asset class constructor.
      *
      * define javascript default path values from codeHive
      */
@@ -147,7 +147,7 @@ public static function style($src, $folder = 'vendor', $listener = 'style')
     {
         $src = self::src_parser($src, $folder);
         $extra = File::extension($src) == 'less' ? '/less' : '';
-        // TODO : make less and scss as plugins or hooks to fetch
+        // TODO:20 : make less and scss as plugins or hooks to fetch
 
         Hook::on($listener, "\n\t<link rel='stylesheet{$extra}' type='text/css' href='{$src}' />");
     }
@@ -182,5 +182,5 @@ public static function vendor($src = '')
     }
 }
 
-/* End of file Assets.php */
-/* Location: ./system/core/Assets.php */
+/* End of file Asset.php */
+/* Location: ./system/core/Asset.php */
diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php
index 572491b..d957521 100644
--- a/system/core/Benchmark.php
+++ b/system/core/Benchmark.php
@@ -34,7 +34,7 @@ class Benchmark
      *
      * @return array
      */
-    public static function start($name)
+    public static function start($name = 'default')
     {
         self::$benchmarks[$name] = new stdClass();
         self::$benchmarks[$name]->time = microtime(true);
@@ -52,7 +52,7 @@ public static function start($name)
      *
      * @return array
      */
-    public static function complete($name)
+    public static function complete($name = 'default')
     {
         global $config;
 
@@ -60,15 +60,16 @@ public static function complete($name)
         $end->time = microtime(true);
         $end->memory = memory_get_usage();
 
-        if ($config['ENVIRONMENT'] == 'debug') {
-            $time = round($end->time - self::$benchmarks[$name]->time, 4);
-            $memory = $end->memory - self::$benchmarks[$name]->memory;
-            $memory = $memory.' - '.File::format($memory);
+        $result = new stdClass();
+        $result->time = round($end->time - self::$benchmarks[$name]->time, 4);
+        $result->memory = $end->memory - self::$benchmarks[$name]->memory;
+        $result->memory .= ' - '.File::format($result->memory);
 
-            Debug::error("Benchmark {$name}", "Time : {$time} | Memory : {$memory}");
+        if (strtoupper($config['ENVIRONMENT']) == 'TRACE') {
+            Trace::error("Benchmark {$name}", "Time : {$result->time} | Memory : {$result->memory}");
         }
 
-        return $arr;
+        return $result;
     }
 }
 
diff --git a/system/core/Controller.php b/system/core/Controller.php
index 7c55125..7ec8d5a 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -1,119 +1,133 @@
-<?php  if (!defined('VERSION'))exit('Direct access to this location is not permitted.');
+<?php
+
+defined('VERSION') or exit('Direct access to this location is not permitted');
+
 /**
- * Purecis Controller Class
+ * codeHive Controller.
+ *
+ * Controller class provide the framework module based infrastructure
+ *
+ * @category    core
  *
- * This class Manage Controllers 
+ * @author      Tamer Zorba <abo.al.tot@gmail.com>
+ * @copyright   Copyright (c) 2013 - 2016, PureCore International Solutions (http://purecis.com/)
+ * @license     http://opensource.org/licenses/MIT	MIT License
  *
- * @package		codeHive
- * @subpackage	Core
- * @category	Libraries
- * @author		Tamer Zorba
- * @link		http://purecis.com/
+ * @link       http://codehive.purecis.com/package/Controller
+ * @since      File available since Release 2.0.0
+ *
+ * @version    V: 2.1.0
  */
+class Controller
+{
+    /**
+     * List on predefined controllers.
+     */
+    protected static $controllers = array();
 
-class Controller{
-
-	/**
-	 * List of paths to load views from
-	 *
-	 * @var array
-	 * @access protected
-	 */
-	protected static $controllers = array();
-	public static $scope;
-
-	// --------------------------------------------------------------------
+    /**
+     * application object (the owner of application variables and functions).
+     */
+    public static $scope; // TODO:30 : multiple scopes per view with its childs
 
-	/**
-	 * Controller bootstrap
-	 *
-	 * Update : For better performance change this start to per file load
-	 *
-	 * @access	public
-	 * @return	string
-	 */
-	public static function __bootstrap(){
-		global $config;
-		foreach (glob("{$config['app']}/controller/*.bootstrap.php") as $filename){
-			require_once $filename;
-		}
-	}
+    /**
+     * codeHive Controller class constructor.
+     *
+     * initialize default controllers
+     */
+    public static function __bootstrap()
+    {
+        global $config;
+        foreach (glob("{$config['app']}/controller/*.bootstrap.php") as $filename) {
+            require_once $filename;
+        }
+        foreach (glob("{$config['app']}/controller/*.init.php") as $filename) {
+            require_once $filename;
+        }
+    }
 
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Controller Define Scope
-	 *
-	 * @access	public
-	 * @param	array 	key:value
-	 * @return	array 	scope
-	 */
-	public static function scope($arr=array()){
-		if(empty(self::$scope))self::$scope = new stdClass();
-		foreach ($arr as $key => $value){
-			self::$scope->$key = $value;
-		}
-		return self::$scope;
-	}
+    /**
+     * append array to the Scope.
+     *
+     * @param array $arr key:cvalue
+     *
+     * @return object Scope
+     */
+    public static function scope($arr = array())
+    {
+        if (empty(self::$scope)) {
+            self::$scope = new stdClass();
+        }
+        foreach ($arr as $key => $value) {
+            self::$scope->$key = $value;
+        }
 
-	// --------------------------------------------------------------------
+        return self::$scope;
+    }
 
-	/**
-	 * Controller Register
-	 *
-	 * @access	public
-	 * @param	string 	controller name
-	 * @param	mixen 	callback
-	 * @return	string
-	 */
-	public static function register($name,$fn){
-		$name = urlencode($name);
+    /**
+     * register new controller.
+     *
+     * @param string $name controller name
+     * @param mixen  $fn   callback
+     *
+     * @return array Controllers
+     */
+    public static function register($name, $fn)
+    {
+        $name = urlencode($name);
 
-		self::$controllers[$name] = $fn;
-		
-		return self::$controllers;
-	}
+        self::$controllers[$name] = $fn;
 
-	// --------------------------------------------------------------------
+        return self::$controllers;
+    }
 
-	/**
-	 * Controller Trigger
-	 *
-	 * @access	public
-	 * @param	mixen 	controller
-	 * @param	mixen 	args to pass
-	 * @return	mixen
-	 */
-	public static function trigger($name,$arg=null){
-		global $config;
+    /**
+     * trigger controller by name and send args to callback.
+     *
+     * @param string $name controller name
+     * @param array  $arg  callback arguments
+     */
+    public static function trigger($name, $arg = null)
+    {
+        global $config;
 
-		if(empty(self::$scope))self::$scope = new stdClass();
+        if (empty(self::$scope)) {
+            self::$scope = new stdClass();
+        }
 
-		if(is_string($name)){
-			if(array_key_exists($name,self::$controllers)){
-				$name = self::$controllers[$name];
-			}else{
-				$path = "{$config['app']}/controller/{$name}.php";
-				if(is_file($path))require_once $path;
-			}
-			if(array_key_exists($name,self::$controllers)){
-				$name = self::$controllers[$name];
-			}
-		}
-		if(is_array($name)){
-			$path = "{$config['app']}/controller/{$name[0]}.php";
-			if(is_file($path))require_once $path;
-			$name[0] = str_replace(".", "\\", $name[0]);
-		}
+        if (is_string($name)) {
+            if (array_key_exists($name, self::$controllers)) {
+                $name = self::$controllers[$name];
+            } else {
+                $path = "{$config['app']}/controller/{$name}.php";
+                if (is_file($path)) {
+                    require_once $path;
+                }
+            }
+            if (array_key_exists($name, self::$controllers)) {
+                $name = self::$controllers[$name];
+            }
+        }
+        if (is_array($name)) {
+            $path = "{$config['app']}/controller/{$name[0]}.php";
+            if (is_file($path)) {
+                require_once $path;
+            }
+            $name[0] = str_replace('.', '\\', $name[0]);
+        }
 
-		if(is_callable($name)){
-			return call_user_func_array($name, array(&self::$scope,$arg));
-		}else{
-			if($config['ENVIRONMENT'] == 'debug')debug::error("Missing Controller",$name);
-			else die("Controller <b>{$name}</b> not Found.");
-		}
-	}
+        if (is_callable($name)) {
+            return call_user_func_array($name, array(&self::$scope, $arg));
+        } else {
+            if (strtoupper($config['ENVIRONMENT']) == 'TRACE') {
+                Trace::error('Missing Controller', $name);
+            } else {
+                die("Controller <b>{$name}</b> not Found.");
+            }
+        }
+    }
 }
 
 /* End of file Controller.php */
-/* Location: ./system/core/Controller.php */
\ No newline at end of file
+/* Location: ./system/core/Controller.php */
diff --git a/system/core/Database.php b/system/core/Database.php
index 1be7828..284bb76 100644
--- a/system/core/Database.php
+++ b/system/core/Database.php
@@ -1,129 +1,185 @@
-<?php  if (!defined('VERSION'))exit('Direct access to this location is not permitted.');
-/**
- * Purecis Database Class
+<?php
+
+defined('VERSION') or exit('Direct access to this location is not permitted');
+
+/*
+ * codeHive Database.
+ *
+ * Database class provide the framework module based infrastructure
  *
- * This class Manage Database Connections & Queries
+ * @category    core
  *
- * @package		codeHive
- * @subpackage	Core
- * @category	Libraries
- * @author		Tamer Zorba
- * @link		http://purecis.com/
+ * @author      Tamer Zorba <abo.al.tot@gmail.com>
+ * @copyright   Copyright (c) 2013 - 2016, PureCore International Solutions (http://purecis.com/)
+ * @license     http://opensource.org/licenses/MIT	MIT License
+ *
+ * @link       http://codehive.purecis.com/package/Database
+ * @since      File available since Release 2.0.0
+ *
+ * @version    V: 2.1.0
  */
-
-class Database{
-
-	/**
-	 * Database Live Connection
-	 *
-	 * @var mixen
-	 * @access protected
-	 */
-	protected static $db = null;
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Database Connect
-	 *
-	 * @access	public
-	 * @param	string 	Database name
-	 * @param	string 	Database host
-	 * @param	string 	Database user
-	 * @param	string 	Database pass
-	 * @param	string 	Database port
-	 * @return	mixen
-	 */
-	public static function connect($db_name=null,$db_host=null,$db_user=null,$db_pass=null,$db_port=null){
-		global $config;
-
-		if(!$config['database'])$config['database'] = array();
-
-		if (!self::$db or ($db_name && $db_name != $config['database']['name'])){
-			if($db_name)$config['database']['name'] = $db_name;
-			if($db_host)$config['database']['host'] = $db_host;
-			if($db_user)$config['database']['user'] = $db_user;
-			if($db_pass)$config['database']['pass'] = $db_pass;
-			if($db_port)$config['database']['port'] = $db_port;
-
-			$type = $config['database']['type'];
-			$host = $config['database']['host'];
-			$name = $config['database']['name'];
-			$user = $config['database']['user'];
-			$pass = $config['database']['pass'];
-			$port = $config['database']['port'];
-
-			try{
-				// Checking Database Type…
-				if($type == 'sqlite')	self::$db = new PDO("sqlite:{$name}");
-				if($type == 'mysql')	self::$db = new PDO("mysql:host={$host};dbname={$name};charset=utf8;Allow User Variables=True", $user, $pass);
-				if($type == 'pgsql')	self::$db = new PDO("pgsql:dbname={$name};host={$host}", $user, $pass );
-				if($type == 'oracle')	self::$db = new PDO("OCI:dbname={$name};charset=UTF-8", $user, $pass);
-				if($type == 'firebird')	self::$db = new PDO("firebird:dbname={$host}:{$name}", "SYSDBA", $pass);
-				if($type == 'infomix')	self::$db = new PDO("informix:DSN={$name}", $user, $pass);
-				if($type == 'dblib') 	self::$db = new PDO ("dblib:host={$host}:{$port};dbname={$name}",$user,$pass);
-				if($type == 'odbc')		self::$db = new PDO("odbc:Driver={Microsoft Access Driver (*.mdb)};Dbq={$name}");
-
-				self::$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);//set character set utf8
-
-			}catch(PDOException $e){
-				//if($config['ENVIRONMENT'] == 'debug')debug::error("Database Error",$e->getMessage());
-				//else
-				die("Database Error :".$e->getMessage());
-			}
-    	}
-		return self::$db;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Database Query
-	 *
-	 * @access	public
-	 * @param	string 	sql
-	 * @return	array
-	 */
-	public static function query($sql){
-		global $config;
-
-		self::connect();
-		$return = new stdClass();
-		try{
-			$query = self::$db->query($sql);
-			//$query = $link->prepare('SELECT * FROM users WHERE username = :name LIMIT 1;');
-			//$query->execute([':name' => $username]); # No need to escape it!
-
-			$temp_sql = strtolower($sql);
-			$s = strpos($temp_sql,'select');
-			$i = strpos($temp_sql,'insert');
-			$u = strpos($temp_sql,'update');
-			$d = strpos($temp_sql,'delete');
-			$t = strpos($temp_sql,'truncate');
-			if($s < 10 && $s !== false)$type = 'select';
-			if($i < 10 && $i !== false)$type = 'insert';
-			if($u < 10 && $u !== false)$type = 'update';
-			if($d < 10 && $d !== false)$type = 'delete';
-			if($d < 10 && $d !== false)$type = 'truncate';
-
-			$fetch = $config['database']['fetch']=="array"?PDO::FETCH_ASSOC:PDO::FETCH_CLASS;
-			if(in_array($type, array('select','update','delete','truncate')))$return->count = $query->rowCount();
-			if($type == 'select')$return->data = @$query->fetchAll($fetch);
-			if($type == 'insert')$return->last = self::$db->lastInsertId();
-
-			$return->status = true;
-
-			if($config['ENVIRONMENT'] == 'debug')debug::count('Database Queries');
-
-		}catch(PDOException $e){
-			if($config['ENVIRONMENT'] == 'debug')debug::error("Database Error",String::escape($e->getMessage()));
-			$return->status = false;
-			$return->error = $e->getMessage();
-    	}
-
-    	if(in_array($config['ENVIRONMENT'], array('debug','development')))$return->sql = $sql;
-    	return $return;
-	}
+class Database
+{
+    /**
+     * Database Connection.
+     */
+    private static $current = null;
+    protected static $connection = null;
+
+    // --------------------------------------------------------------------
+
+    /**
+     * Database Connect.
+     *
+     * @param	string 	Database name
+     * @param	string 	Database host
+     * @param	string 	Database user
+     * @param	string 	Database pass
+     * @param	string 	Database port
+     *
+     * @return mixen
+     */
+    public static function connect($con = array())
+    {
+        global $config;
+
+        if (!$config['database']) {
+            $config['database'] = array();
+        }
+
+        if (self::$connection && (!isset($con['name']) or $con['name'] == self::$current)) {
+            return self::$connection;
+        }
+        if (self::$connection && $con['name'] == $config['database']['name']) {
+            return self::$connection;
+        }
+
+        $crd = new stdClass();
+        $crd->type = isset($con['type']) ? $con['type'] : $config['database']['type'];
+        $crd->host = isset($con['host']) ? $con['host'] : $config['database']['host'];
+        $crd->name = isset($con['name']) ? $con['name'] : $config['database']['name'];
+        $crd->user = isset($con['user']) ? $con['user'] : $config['database']['user'];
+        $crd->pass = isset($con['pass']) ? $con['pass'] : $config['database']['pass'];
+        $crd->port = isset($con['port']) ? $con['port'] : $config['database']['port'];
+
+        try {
+            switch ($crd->type) {
+                case 'sqlite':
+                    $dsn = "sqlite:{$crd->name}";
+                    break;
+
+                case 'pgsql':
+                    $dsn = "pgsql:dbname={$crd->name};host={$crd->host}";
+                    break;
+
+                case 'oracle':
+                    $dsn = "OCI:dbname={$crd->name};charset=UTF-8";
+                    break;
+
+                case 'firebird':
+                    $dsn = "firebird:dbname={$crd->host}:{$crd->name}";
+                    $crd->user = 'SYSDBA';
+                    break;
+
+                case 'infomix':
+                    $dsn = "informix:DSN={$crd->name}";
+                    break;
+
+                case 'dblib':
+                    $dsn = "dblib:host={$crd->host}:{$crd->port};dbname={$crd->name}";
+                    break;
+
+                case 'odbc':
+                    $dsn = "odbc:Driver={Microsoft Access Driver (*.mdb)};Dbq={$crd->name}";
+                    break;
+
+                case 'mysql':
+                default:
+                    $crd->port = $crd->port ?: 3306;
+                    $dsn = "mysql:host={$crd->host};dbname={$crd->name};port={$crd->port};charset=utf8";
+                    break;
+            }
+
+            self::$connection = self::$current = new PDO($dsn, $crd->user, $crd->pass);
+            self::$connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        } catch (PDOException $e) {
+            if (strtoupper($config['ENVIRONMENT']) == 'TRACE') {
+                Trace::error('Database Error', String::escape($e->getMessage()));
+            } else {
+                die('Database Error :'.$e->getMessage());
+            }
+        }
+
+        return self::$connection;
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * Database Query.
+     *
+     * @param	string 	sql
+     *
+     * @return array
+     */
+    public static function query($sql, $args = array())
+    {
+        global $config;
+
+        self::connect();
+        $return = new stdClass();
+        try {
+            if (!sizeof($args)) {
+                $query = self::$connection->query($sql);
+            } else {
+                $query = self::$connection->prepare($sql);
+                $query->execute($args);
+            }
+
+            $type = strtoupper(substr($sql, 0, 10));
+            if (strpos($type, 'INSERT') !== false) {
+                $type = 'insert';
+            } elseif (strpos($type, 'UPDATE') !== false) {
+                $type = 'update';
+            } elseif (strpos($type, 'DELETE') !== false) {
+                $type = 'delete';
+            } elseif (strpos($type, 'TRUNCATE') !== false) {
+                $type = 'truncate';
+            } else {
+                $type = 'select'; // show
+            }
+
+            $fetch = isset($config['database']['fetch']) && $config['database']['fetch'] == 'array' ? PDO::FETCH_ASSOC : PDO::FETCH_CLASS;
+            if (in_array($type, array('select', 'update', 'delete', 'truncate'))) {
+                $return->count = $query->rowCount();
+            }
+            if ($type == 'select') {
+                $return->record = $query->fetchAll($fetch);
+            }
+            if ($type == 'insert') {
+                $return->last = self::$connection->lastInsertId();
+            }
+
+            $return->status = true;
+
+            if (strtoupper($config['ENVIRONMENT']) == 'TRACE') {
+                Trace::count('Database Queries');
+            }
+        } catch (PDOException $e) {
+            if (strtoupper($config['ENVIRONMENT']) == 'TRACE') {
+                Trace::error('Database Error', String::escape($e->getMessage()));
+            }
+            $return->status = false;
+            $return->error = $e->getMessage();
+        }
+
+        if (in_array(strtoupper($config['ENVIRONMENT']), array('TRACE', 'DEVELOPMENT'))) {
+            $return->sql = $sql;
+            // TODO : append sql to tracer ..
+        }
+
+        return $return;
+    }
 }
 
 /* End of file Database.php */
diff --git a/system/core/Internationalization.php b/system/core/Internationalization.php
index 9448897..2af0234 100644
--- a/system/core/Internationalization.php
+++ b/system/core/Internationalization.php
@@ -156,8 +156,8 @@ public static function prepare($space = false, $force = false)
             }
         }
         if (!is_dir($path)) {
-            if ($config['ENVIRONMENT'] == 'debug') {
-                debug::error('Missing Locales', $space);
+            if (strtoupper($config['ENVIRONMENT']) == 'TRACE') {
+                Trace::error('Missing Locales', $space);
             }
             //else die("Locales at <b>{$space}</b> not Found.");
 
diff --git a/system/core/Module.php b/system/core/Module.php
index d4ef613..fd2b678 100644
--- a/system/core/Module.php
+++ b/system/core/Module.php
@@ -1,167 +1,251 @@
-<?php  if (!defined('VERSION'))exit('Direct access to this location is not permitted.');
+<?php
+ if (!defined('VERSION')) {
+     exit('Direct access to this location is not permitted.');
+ }
 /**
- * Purecis Module Class
+ * Purecis Module Class.
  *
- * This class control all the request attrbutes and protect 
+ * This class control all the request attrbutes and protect
  * them from known attac and injection
  *
- * @package		codeHive
- * @subpackage	Core
  * @category	Libraries
+ *
  * @author		Tamer Zorba
+ *
  * @link		http://purecis.com/
  */
-
-class Module{
-
-	/**
-	 * List of paths to load views from
-	 *
-	 * @var array
-	 * @access protected
-	 */
-	protected static $modules = array();
-
-	/**
-	 * BootStrap
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	public static function __bootstrap(){
-		global $config;
-		self::import($config['modules']);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Use and Import Module
-	 *
-	 * Defines Module and prepare to call bootstrap for each
-	 *
-	 * @access	public
-	 * @param	mixen 	module or array of modules
-	 * @return	void
-	 */
-	public static function import($mod){
-		if(is_array($mod)){
-			foreach($mod as $m){
-				if(!isset(self::$modules[$m]))self::register($m);
-			}
-		}else{
-			if(!isset(self::$modules[$mod]))self::register($mod);
-		}
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Register Module and initialize it by calling bootstrap
-	 *
-	 * @access	public
-	 * @param	string 	module name
-	 * @return	void
-	 */
-	private static function register($k){
-		global $config;
-
-		$path = self::path($k,true);
-
-		if(!$path){
-			if($config['ENVIRONMENT'] == 'debug')debug::error("Missing Module","{$k}");
-			else die("Module <b>{$k}</b> not Found in {$path}.");
-		}else{
-			self::$modules[$k] = array("dir"=>dirname($path),"version"=>"1");
-			require_once $path;
-			$k = str_replace(".", "\\", $k);
-			if(is_callable(array($k,"__bootstrap")))call_user_func(array($k,"__bootstrap"));
-		}
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Check if Module Used
-	 *
-	 * @access	public
-	 * @param	mixen 	module or array of modules
-	 * @return	boolean
-	 */
-	public static function used($mod){
-		if(is_array($mod)){
-			foreach($mod as $m){
-				if(!isset(self::$modules[$m]))return false;
-			}
-			return true;
-		}else{
-			if(isset(self::$modules[$mod]))return true;
-		}
-		return false;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Get Module Path
-	 *
-	 * @access	public
-	 * @param	mixen 	module or array of modules
-	 * @return	boolean
-	 */
-	public static function path($mod,$full=false){
-		if(isset(self::$modules[$mod])){
-			return self::$modules[$mod]['dir'];
-		}
-
-		global $config;
-		if(strpos($mod, ".")){
-			$ex = explode(".", $mod);
-			$file = end($ex);
-		}else{
-			$file = $mod;
-		}
-
-		// TODO : the module, plugins, etc folders called SPACE, PACKAGE in doc's
-		
-		$path = "{$config['app']}/module/{$mod}/{$file}.php";
-		if(!is_file($path))$path = "{$config['app']}/hook/{$mod}/{$file}.php";
-		if(!is_file($path))$path = "{$config['app']}/plugin/{$mod}/{$file}.php";
-		if(!is_file($path))$path = "{$config['app']}/extension/{$mod}/{$file}.php";
-		if(!is_file($path))$path = "{$config['app']}/component/{$mod}/{$file}.php";
-		if(!is_file($path))$path = "{$config['app']}/element/{$mod}/{$file}.php";
-		if(!is_file($path))$path = "{$config['app']}/service/{$mod}/{$file}.php";
-		if(!is_file($path))$path = "{$config['app']}/helper/{$mod}/{$file}.php";
-		if(!is_file($path))$path = "{$config['assets']}/extensions/{$mod}/{$file}.php";
-		if(!is_file($path))$path = "{$config['system']}/module/{$mod}.php";
-
-		if(is_file($path)){
-			if($full) return $path;
-			else return dirname($path);
-		}
-		return false;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Shutdown
-	 *
-	 * @access	public
-	 * @return	void
-	 */
-	public static function __shutdown(){
-		global $config;
-		foreach(self::$modules as $k => $v){
-			if(is_callable(array($k,"__shutdown")))call_user_func(array($k,"__shutdown"));
-		}
-		if($config['ENVIRONMENT'] == 'debug'){
-			foreach(self::$modules as $k => $v){
-				debug::message("Used Modules","{$k}");
-			}
-		}
-	}
+class Module
+{
+    /**
+     * List of paths to load views from.
+     *
+     * @var array
+     */
+    protected static $modules = array();
+
+    /**
+     * BootStrap.
+     */
+    public static function __bootstrap()
+    {
+        global $config;
+        self::import($config['modules']);
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * Use and Import Module.
+     *
+     * Defines Module and prepare to call bootstrap for each
+     *
+     * @param	mixen 	module or array of modules
+     */
+    public static function import($mod)
+    {
+        if (is_array($mod)) {
+            foreach ($mod as $m) {
+                if (!isset(self::$modules[$m])) {
+                    self::register($m);
+                }
+            }
+        } else {
+            if (!isset(self::$modules[$mod])) {
+                self::register($mod);
+            }
+        }
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * Register Module and initialize it by calling bootstrap.
+     *
+     * @param	string 	module name
+     */
+    private static function register($k)
+    {
+        global $config;
+
+        $path = self::path($k, true);
+
+        if (!$path) {
+            if (strtoupper($config['ENVIRONMENT']) == 'TRACE') {
+                Trace::error('Missing Module', "{$k}");
+            } else {
+                die("Module <b>{$k}</b> not Found in {$path}.");
+            }
+        } else {
+            self::$modules[$k] = array('dir' => dirname($path), 'version' => '1');
+            require_once $path;
+            $k = str_replace('.', '\\', $k);
+            if (is_callable(array($k, '__bootstrap'))) {
+                call_user_func(array($k, '__bootstrap'));
+            }
+        }
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * Check if Module Used.
+     *
+     * @param	mixen 	module or array of modules
+     *
+     * @return bool
+     */
+    public static function used($mod)
+    {
+        if (is_array($mod)) {
+            foreach ($mod as $m) {
+                if (!isset(self::$modules[$m])) {
+                    return false;
+                }
+            }
+
+            return true;
+        } else {
+            if (isset(self::$modules[$mod])) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * Get Module Path.
+     *
+     * @param	mixen 	module or array of modules
+     *
+     * @return bool
+     */
+    public static function path($mod, $full = false)
+    {
+        if (isset(self::$modules[$mod])) {
+            return self::$modules[$mod]['dir'];
+        }
+
+        global $config;
+        if (strpos($mod, '.')) {
+            $ex = explode('.', $mod);
+            $file = end($ex);
+        } else {
+            $file = $mod;
+        }
+
+        $alias = array('module', 'hook', 'plugin', 'extension', 'component', 'element', 'service', 'helper', 'lib', 'kernel', 'space', 'package');
+        foreach ($alias as $als) {
+            $path = "{$config['app']}/{$als}/{$mod}/{$file}.php";
+            if (is_file($path)) {
+                break;
+            }
+            $path = "{$config['assets']}/{$als}/{$mod}/{$file}.php";
+            if (is_file($path)) {
+                break;
+            }
+            $path = "{$config['system']}/{$als}/{$mod}/{$file}.php";
+            if (is_file($path)) {
+                break;
+            }
+            $path = "{$config['system']}/{$als}/{$mod}.php";
+            if (is_file($path)) {
+                break;
+            }
+        }
+
+        /*
+        $path = "{$config['app']}/module/{$mod}/{$file}.php";
+        if (!is_file($path)) {
+            $path = "{$config['app']}/hook/{$mod}/{$file}.php";
+        }
+        if (!is_file($path)) {
+            $path = "{$config['app']}/plugin/{$mod}/{$file}.php";
+        }
+        if (!is_file($path)) {
+            $path = "{$config['app']}/extension/{$mod}/{$file}.php";
+        }
+        if (!is_file($path)) {
+            $path = "{$config['app']}/component/{$mod}/{$file}.php";
+        }
+        if (!is_file($path)) {
+            $path = "{$config['app']}/element/{$mod}/{$file}.php";
+        }
+        if (!is_file($path)) {
+            $path = "{$config['app']}/service/{$mod}/{$file}.php";
+        }
+        if (!is_file($path)) {
+            $path = "{$config['app']}/helper/{$mod}/{$file}.php";
+        }
+
+        if (!is_file($path)) {
+            $path = "{$config['assets']}/extensions/{$mod}/{$file}.php";
+        }
+        if (!is_file($path)) {
+            $path = "{$config['system']}/module/{$mod}.php";
+        }
+        if (!is_file($path)) {
+            $path = "{$config['system']}/hook/{$mod}.php";
+        }
+        if (!is_file($path)) {
+            $path = "{$config['system']}/plugin/{$mod}.php";
+        }
+        if (!is_file($path)) {
+            $path = "{$config['system']}/extension/{$mod}.php";
+        }
+        if (!is_file($path)) {
+            $path = "{$config['system']}/component/{$mod}.php";
+        }
+        if (!is_file($path)) {
+            $path = "{$config['system']}/element/{$mod}.php";
+        }
+        if (!is_file($path)) {
+            $path = "{$config['system']}/service/{$mod}.php";
+        }
+        if (!is_file($path)) {
+            $path = "{$config['system']}/helper/{$mod}.php";
+        }
+        */
+
+        if (is_file($path)) {
+            if ($full) {
+                return $path;
+            } else {
+                return dirname($path);
+            }
+        }
+
+        return false;
+    }
+
+    // --------------------------------------------------------------------
+
+    public static function exist($mod, $full = false)
+    {
+        return (bool) self::path($mod, $full);
+    }
+    // --------------------------------------------------------------------
+
+    /**
+     * Shutdown.
+     */
+    public static function __shutdown()
+    {
+        global $config;
+        foreach (self::$modules as $k => $v) {
+            if (is_callable(array($k, '__shutdown'))) {
+                call_user_func(array($k, '__shutdown'));
+            }
+        }
+        if (strtoupper($config['ENVIRONMENT']) == 'TRACE') {
+            foreach (self::$modules as $k => $v) {
+                Trace::message('Used Modules', "{$k}");
+            }
+        }
+    }
 }
 
 /* End of file Module.php */
-/* Location: ./system/core/Module.php */
\ No newline at end of file
+/* Location: ./system/core/Module.php */
diff --git a/system/core/Session.php b/system/core/Session.php
index 1a46f54..e15ae8b 100644
--- a/system/core/Session.php
+++ b/system/core/Session.php
@@ -1,117 +1,126 @@
-<?php  if (!defined('VERSION'))exit('Direct access to this location is not permitted.');
+<?php
+ if (!defined('VERSION')) {
+     exit('Direct access to this location is not permitted.');
+ }
 /**
- * Purecis Session Class
+ * Purecis Session Class.
  *
- * control Sessions With Advance Tecnique 
+ * control Sessions With Advance Tecnique
  *
- * @package		codeHive
- * @subpackage	Core
  * @category	Libraries
+ *
  * @author		Tamer Zorba
+ *
  * @link		http://purecis.com/
  */
 
 //if (!defined('SESSION_PERFIX'))define(SESSION_PERFIX,"");
 
-class Session{
-
-	public static $SESSION_PERFIX = SESSION_PERFIX;
+class Session
+{
+    public static $SESSION_PERFIX;
 
-	/**
-	 * Session get
-	 *
-	 * @access	public
-	 * @param	mixen 	str or array keys only
-	 * @return	mixen
-	 */
-	public static function get($sess){
+    public function __construct()
+    {
+        self::$SESSION_PERFIX = defined(SESSION_PERFIX) ? SESSION_PERFIX : '';
+    }
+    /**
+     * Session get.
+     *
+     * @param	mixen 	str or array keys only
+     *
+     * @return mixen
+     */
+    public static function get($sess)
+    {
+        if (!is_array($sess)) {
+            $arr = explode(',', $sess);
+        } else {
+            $arr = $sess;
+        }
 
-		if(!is_array($sess))$arr = explode(",", $sess);
-		else $arr = $sess;
+        $cls = new stdClass();
+        if (sizeof($arr) > 1) {
+            foreach ($arr as $key => $val) {
+                if (!isset($_SESSION[static::$SESSION_PERFIX.$val])) {
+                    $cls->$val = false;
+                } else {
+                    $cls->$val = $_SESSION[static::$SESSION_PERFIX.$val];
+                }
+            }
 
-		$cls = new stdClass();
-		if(sizeof($arr) > 1){
-			foreach($arr as $key => $val){
-				if(!isset($_SESSION[static::$SESSION_PERFIX.$val])){
-					$cls->$val = false;
-				}else{
-					$cls->$val = $_SESSION[static::$SESSION_PERFIX.$val];
-				}
-			}
-			return $cls;
-		}else{
-			return isset($_SESSION[static::$SESSION_PERFIX.$arr[0]])?$_SESSION[static::$SESSION_PERFIX.$arr[0]]:false;
-		}
-	}
+            return $cls;
+        } else {
+            return isset($_SESSION[static::$SESSION_PERFIX.$arr[0]]) ? $_SESSION[static::$SESSION_PERFIX.$arr[0]] : false;
+        }
+    }
 
-	// --------------------------------------------------------------------
+    // --------------------------------------------------------------------
 
-	/**
-	 * Session exist
-	 *
-	 * will check all is exist or none
-	 *
-	 * @access	public
-	 * @param	mixen 	str or array keys only
-	 * @return	boolean
-	 */
-	public static function exist($arr){
+    /**
+     * Session exist.
+     *
+     * will check all is exist or none
+     *
+     * @param	mixen 	str or array keys only
+     *
+     * @return bool
+     */
+    public static function exist($arr)
+    {
+        if (!is_array($arr)) {
+            $arr = explode(',', $arr);
+        }
 
-		if(!is_array($arr))$arr = explode(",", $arr);
+        foreach ($arr as $key) {
+            if (
+                !isset($_SESSION[static::$SESSION_PERFIX.$key]) or
+                $_SESSION[static::$SESSION_PERFIX.$key] == false
+            ) {
+                return false;
+            }
+        }
 
-		foreach($arr as $key){
-			if(
-				!isset($_SESSION[static::$SESSION_PERFIX.$key]) or 
-				$_SESSION[static::$SESSION_PERFIX.$key] == false
-			){
-				return false;
-			}
-		}
-		return true;
-	}
+        return true;
+    }
 
-	// --------------------------------------------------------------------
+    // --------------------------------------------------------------------
 
-	/**
-	 * Session set
-	 *
-	 * register array of sessions with values
-	 *
-	 * @access	public
-	 * @param	array 	str or array key value
-	 * @return	void
-	 */
-	public static function set($arr){
-		
-		foreach($arr as $key => $val){
-			$_SESSION[static::$SESSION_PERFIX.$key] = $val;
-		}
-		
-	}
+    /**
+     * Session set.
+     *
+     * register array of sessions with values
+     *
+     * @param	array 	str or array key value
+     */
+    public static function set($arr)
+    {
+        foreach ($arr as $key => $val) {
+            $_SESSION[static::$SESSION_PERFIX.$key] = $val;
+        }
+    }
 
-	// --------------------------------------------------------------------
+    // --------------------------------------------------------------------
 
-	/**
-	 * Session remove
-	 *
-	 * remove all sessions 
-	 *
-	 * @access	public
-	 * @param	array 	str or array key value
-	 * @return	void
-	 */
-	public static function remove($arr=array(),$all=false){
-		if(sizeof($arr) < 1 || $all){
-			@session_unset(); 
-			@session_destroy(); 
-		}else{
-			foreach($arr as $val){
-				unset($_SESSION[static::$SESSION_PERFIX.$val]);
-			}
-		}
-		
-	}
+    /**
+     * Session remove.
+     *
+     * remove all sessions
+     *
+     * @param	array 	str or array key value
+     */
+    public static function remove($arr = array(), $all = false)
+    {
+        if (sizeof($arr) < 1 || $all) {
+            @session_unset();
+            @session_destroy();
+        } else {
+            foreach ($arr as $val) {
+                unset($_SESSION[static::$SESSION_PERFIX.$val]);
+            }
+        }
+    }
 }
 
 /* End of file Session.php */
-/* Location: ./system/core/Session.php */
\ No newline at end of file
+/* Location: ./system/core/Session.php */
diff --git a/system/core/Debug.php b/system/core/Trace.php
similarity index 94%
rename from system/core/Debug.php
rename to system/core/Trace.php
index 954f072..e3da933 100644
--- a/system/core/Debug.php
+++ b/system/core/Trace.php
@@ -3,7 +3,7 @@
      exit('Direct access to this location is not permitted.');
  }
 /**
- * Purecis Debug Class.
+ * Trace Class.
  *
  * This class Control Files on the server.
  *
@@ -13,7 +13,7 @@
  *
  * @link		http://purecis.com/
  */
-class Debug
+class Trace
 {
     private static $message = array();
     private static $error = array();
@@ -56,7 +56,7 @@ public static function __shutdown()
         $comment = (in_array($ext, array('js', 'css'))) ? true : false;
 
         if ($comment) {
-            echo '/** Debug **';
+            echo '/** Trace **';
         }
 
         echo "\n\n\n\n\n\n<script>";
@@ -136,13 +136,14 @@ public static function disable()
         self::$disabled = true;
     }
 
+    // TODO : merge benchmark with trace start .. complete
     public static function start($name = 'default')
     {
         self::$custom['time'][$name] = microtime(true);
         self::$custom['memory'][$name] = memory_get_usage();
     }
 
-    public static function finish($name = 'default')
+    public static function complete($name = 'default')
     {
         $cls = new stdClass();
         $cls->time = round(microtime(true) - self::$custom['time'][$name], 4);
@@ -150,4 +151,5 @@ public static function finish($name = 'default')
 
         return $cls;
     }
+    // TODO : create tracer for queries and query display object if debugger not display well ..
 }
diff --git a/system/core/View.php b/system/core/View.php
index 63403e9..a924093 100644
--- a/system/core/View.php
+++ b/system/core/View.php
@@ -1,69 +1,81 @@
-<?php  if (!defined('VERSION'))exit('Direct access to this location is not permitted.');
+<?php
+ if (!defined('VERSION')) {
+     exit('Direct access to this location is not permitted.');
+ }
 /**
- * Purecis View Class
+ * Purecis View Class.
  *
- * This class control all the request attrbutes and protect 
+ * This class control all the request attrbutes and protect
  *
- * @package		codeHive
- * @subpackage	Core
  * @category	Libraries
+ *
  * @author		Tamer Zorba
+ *
  * @link		http://purecis.com/
  */
+class View
+{
+    /**
+     * List of paths to load views from.
+     *
+     * @var array
+     */
+    protected static $views = array();
 
-class View{
-
-	/**
-	 * List of paths to load views from
-	 *
-	 * @var array
-	 * @access protected
-	 */
-	protected static $views = array();
+    // --------------------------------------------------------------------
 
-	// --------------------------------------------------------------------
+    /**
+     * Controller Register.
+     *
+     * @param	string 	view name and you can add by module (view@module)
+     * @param	mixen 	callback
+     *
+     * @return string
+     */
+    public static function load($tpl, $force = false)
+    {
+        global $config;
 
-	/**
-	 * Controller Register
-	 *
-	 * @access	public
-	 * @param	string 	view name and you can add by module (view@module)
-	 * @param	mixen 	callback
-	 * @return	string
-	 */
-	public static function load($tpl,$force=false){
-		global $config;
+        if (strpos($tpl, '@')) {
+            $ex = explode('@', $tpl);
+            if ($force) {
+                Module::import($ex[1]);
+            }
+            $path = (sizeof($ex) > 1) ? Module::path($ex[1]) : false;
+            $path = "{$path}/view/{$ex[0]}.html";
+        } else {
+            $path = "{$config['app']}/view/{$tpl}.html";
+            if (!file_exists($path)) {
+                $path = "{$config['system']}/view/{$tpl}.html";
+            }
+        }
+        if (!file_exists($path)) {
+            if (strtoupper($config['ENVIRONMENT']) == 'TRACE') {
+                Trace::error('Missing View', $tpl);
+            } else {
+                die("View <b>{$tpl}</b> not Found.");
+            }
 
-		if(strpos($tpl, '@')){
-			$ex = explode("@", $tpl);
-			if($force)Module::import($ex[1]);
-			$path = (sizeof($ex) > 1)?Module::path($ex[1]):false;
-			$path = "{$path}/view/{$ex[0]}.html";
-		}else{
-			$path = "{$config['app']}/view/{$tpl}.html";
-			if(!file_exists($path))$path = "{$config['system']}/view/{$tpl}.html";
-		}
-		if(!file_exists($path)){
-			if($config['ENVIRONMENT'] == 'debug')debug::error("Missing View",$tpl);
-			else die("View <b>{$tpl}</b> not Found.");
+            return;
+        }
 
-			return null;
-		}
-		return Shortcode::trigger(file_get_contents($path));
-	}
+        return Shortcode::trigger(file_get_contents($path));
+    }
 
-	// --------------------------------------------------------------------
+    // --------------------------------------------------------------------
 
-	/**
-	 * Define Scope
-	 *
-	 * @access	public
-	 * @param	array 	key:value
-	 * @return	array 	scope
-	 */
-	public static function scope($arr=array()){
-		return Controller::scope($arr);
-	}}
+    /**
+     * Define Scope.
+     *
+     * @param	array 	key:value
+     *
+     * @return array scope
+     */
+    public static function scope($arr = array())
+    {
+        return Controller::scope($arr);
+    }
+}
 
 /* End of file View.php */
-/* Location: ./system/core/View.php */
\ No newline at end of file
+/* Location: ./system/core/View.php */
diff --git a/system/core/codeHive.php b/system/core/codeHive.php
index 04a40a6..938d82e 100644
--- a/system/core/codeHive.php
+++ b/system/core/codeHive.php
@@ -40,7 +40,7 @@ public static function start($start = array('app' => 'app'))
 
         $config = array_merge($config, self::config($config['app']));
 
-        if (!$config['settings']) {
+        if (!isset($config['settings'])) {
             $config['settings'] = array();
         }
 
@@ -58,22 +58,20 @@ public static function start($start = array('app' => 'app'))
         }
 
         if (isset($config['ENVIRONMENT'])) {
-            switch ($config['ENVIRONMENT']) {
-                case 'development' :
+            switch (strtoupper($config['ENVIRONMENT'])) {
+                case 'DEVELOPMENT' :
                     error_reporting(E_ALL);
                 break;
 
-                case 'debug' :
+                case 'TRACE' :
                     error_reporting(E_ALL);
-                    Debug::__bootstrap();
+                    Trace::__bootstrap();
                 break;
 
-                case 'production' :
+                case 'PRODUCTION' :
+                default:
                     error_reporting(0);
                 break;
-
-                default:
-                    exit('The application environment is not set correctly.');
             }
         }
 
@@ -83,8 +81,8 @@ public static function start($start = array('app' => 'app'))
 
         echo Module::__shutdown();
 
-        if (isset($config['ENVIRONMENT']) && $config['ENVIRONMENT'] == 'debug') {
-            Debug::__shutdown();
+        if (isset($config['ENVIRONMENT']) && strtoupper($config['ENVIRONMENT']) == 'TRACE') {
+            Trace::__shutdown();
         }
     }
 
@@ -110,14 +108,15 @@ private static function config($app)
         if (is_callable(array($class, '__bootstrap'))) {
             call_user_func(array($class, '__bootstrap'));
         }
-        if (isset($config['ENVIRONMENT']) && $config['ENVIRONMENT'] == 'debug') {
-            debug::message('Used System Cores', $class);
+        if (isset($config['ENVIRONMENT']) && strtoupper($config['ENVIRONMENT']) == 'TRACE') {
+            Trace::message('Used System Cores', $class);
         }
     } else {
-        if ($config['ENVIRONMENT'] == 'debug') {
-            debug::error('System Cores Faild', $class);
+        if (strtoupper($config['ENVIRONMENT']) == 'TRACE') {
+            Trace::error('System Cores Faild', $class);
         }
     }
 });
+
 /* End of file codeHive.php */
 /* Location: ./system/core/codeHive.php */
diff --git a/system/helper/Cache.php b/system/helper/Cache.php
new file mode 100644
index 0000000..ed1f817
--- /dev/null
+++ b/system/helper/Cache.php
@@ -0,0 +1,9 @@
+<?php
+
+class Cache
+{
+    public static function __bootstrap()
+    {
+        echo 'Cache Loaded<br />';
+    }
+}
diff --git a/system/module/API.php b/system/module/API.php
index 56c138d..6fe036f 100644
--- a/system/module/API.php
+++ b/system/module/API.php
@@ -1,195 +1,247 @@
-<?php  if (!defined('VERSION'))exit('Direct access to this location is not permitted.');
+<?php
+ if (!defined('VERSION')) {
+     exit('Direct access to this location is not permitted.');
+ }
 /**
- * Purecis API Module
+ * Purecis API Module.
  *
  * This class Control API Requests
  *
- * @package		codeHive
- * @subpackage	Module
  * @category	Libraries
+ *
  * @author		Tamer Zorba
+ *
  * @link		http://purecis.com/
  */
-
-class API{
-
-	/**
-	 * Variables
-	 *
-	 * @var mixen
-	 * @access protected
-	 */
-	private static $apis;
-	public static $route = "api";
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * api bootstrap
-	 *
-	 * @return	void
-	 */
-	public static function __bootstrap(){
-		Module::import('Router');
-		// todo .. create function to change the api main url
-		Router::on(static::$route,array('fire','do','token'),function(&$scope,$router){
-			global $config;
-			if($config['ENVIRONMENT'] == "debug")$config['ENVIRONMENT'] = "development";
-
-			$name = $router->fire;
-			$path = "{$config['app']}/controller/api.{$name}.php";
-			if(!is_file($path))$path = "{$config['app']}/controller/{$name}.php";
-			if(!is_file($path))$path = "{$config['app']}/controller/api.php";
-			if(is_file($path))require_once $path;
-
-			// search in module controller
-			if(!isset(self::$apis[$router->fire])){
-				$mod = Module::path($router->fire);
-				$name = $router->do; 
-				$path = "{$mod}/controller/api.{$name}.php";
-				if(!is_file($path))$path = "{$mod}/controller/{$name}.php";
-				if(!is_file($path))$path = "{$mod}/controller/api.php";
-				if(is_file($path)){
-					self::$current++;
-					require_once $path;
-				}
-			}
-
-			if(isset(self::$apis[$name])){
-				//check is callable
-				return call_user_func_array(self::$apis[$name], array(&$scope,$router));
-			}
-		});
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * api register
-	 *
-	 * @return	function
-	 */
-	public static function register($api,$callback){
-		self::$apis[$api] = $callback;
-		return $callback;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * api router
-	 *
-	 * @return	array
-	 */
-	public static function router($args,$minus=false){
-		if(!is_array($args))$args = array($args);
-		if(!$minus)self::$current--;
-		
-		$arr = array();
-		for ($i=1; $i <= self::$current; $i++) { 
-			array_push($arr, "api-{$i}");
-		}
-		foreach ($args as $key)array_push($arr, $key);
-
-		return Router::parse($arr);
-	}
-
-	/**
-	 * api then
-	 *
-	 * @return	array
-	 * @todo  creating scope, router, multi call in same scope
-	 */
-	private static $current = 1;
-	public static function then($a,$b = false,$c = false, $method = true){
-		if(is_object($c)){
-			$callback = $c;
-			$args = $b;
-			$text = $a;
-		}
-		if(is_object($b)){
-			$callback = $b;
-			if(is_array($a)){
-				$args = $a;
-				$text = false;
-			}else{
-				// todo : split string and check for :id arguments
-				$args = array();
-				$text = $a;
-			}
-		}
-		if(is_object($a)){
-			$callback = $a;
-			$args = array();
-			$text = false;
-		}
-		if($text == false)self::$current--;
-
-		$router = self::router($args,true);
-		$me = "api-".(self::$current);
-
-		if(
-			(($router->$me == $text) || ($text === false)) && $method
-		){
-			self::$current++;
-			$cb = call_user_func_array($callback, array(&Controller::$scope,$router));
-			if(is_array($cb) || is_object($cb))$cb = json_encode($cb);
-			echo $cb;
-			exit;
-		}else{
-			if($text == false)self::$current++;
-		}
-	}
-
-	public static function group($text,$args = false,$callback = false){
-		return self::then($text,$args,$callback);
-	}
-
-	public static function get($text,$args = false,$callback = false){
-		return self::then($text,$args,$callback,Request::method() == "GET");
-	}
-
-	public static function post($text,$args = false,$callback = false){
-		return self::then($text,$args,$callback,Request::method() == "POST");
-	}
-
-	public static function delete($text,$args = false,$callback = false){
-		return self::then($text,$args,$callback,Request::method() == "DELETE");
-	}
-
-	public static function put($text,$args = false,$callback = false){
-		return self::then($text,$args,$callback,Request::method() == "PUT");
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * api access : check token if send to make query
-	 *
-	 * @return	boolean
-	 */
-	public static function access($name="token"){
-		global $config;
-		$token = Request::get($name);
-		return ($token == md5($config['license']['key'].$config['license']['secret']));
-	}
-
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * accessDenied
-	 *
-	 * @access	public
-	 * @param 	string
-	 * @return	string
-	 */
-	public static function accessDenied($err="Access Denied",$code=false){
-		$cls = new stdClass;
-		$cls->status = false;
-		$cls->error = $err;
-		if($code)$cls->code = $code;
-		return $cls;
-	}
-
-}
\ No newline at end of file
+class API
+{
+    /**
+     * Variables.
+     *
+     * @var mixen
+     */
+    private static $apis;
+    public static $route = 'api';
+
+    // --------------------------------------------------------------------
+
+    /**
+     * api bootstrap.
+     */
+    public static function __bootstrap()
+    {
+        Module::import('Router');
+        // todo .. create function to change the api main url
+        Router::on(static::$route, array('fire', 'do', 'token'), function (&$scope, $router) {
+            global $config;
+            if (strtoupper($config['ENVIRONMENT']) == 'TRACE') {
+                $config['ENVIRONMENT'] = 'development';
+            }
+
+            $name = $router->fire;
+            $path = "{$config['app']}/controller/api.{$name}.php";
+            if (!is_file($path)) {
+                $path = "{$config['app']}/controller/{$name}.php";
+            }
+            if (!is_file($path)) {
+                $path = "{$config['app']}/controller/api.php";
+            }
+
+            // search in module controller
+            if (!isset(self::$apis[$router->fire])) {
+                $mod = Module::path($router->fire);
+                $a = explode('.', $router->fire);
+                $name = end($a);
+                $path = "{$mod}/controller/api.{$name}.php";
+                if (!is_file($path)) {
+                    $path = "{$mod}/controller/{$name}.php";
+                }
+                if (!is_file($path)) {
+                    $path = "{$mod}/controller/api.php";
+                }
+            }
+
+            // search in module controller
+            if (!isset(self::$apis[$router->fire]) && !is_file($path)) {
+                $mod = Module::path($router->fire);
+                $name = $router->do;
+                $path = "{$mod}/controller/api.{$name}.php";
+                if (!is_file($path)) {
+                    $path = "{$mod}/controller/{$name}.php";
+                }
+                if (!is_file($path)) {
+                    $path = "{$mod}/controller/api.php";
+                }
+                if (is_file($path)) {
+                    ++self::$current;
+                }
+            }
+
+            if (is_file($path)) {
+                require_once $path;
+            }
+            var_dump(self::$apis);
+            if (isset(self::$apis[$name])) {
+                //check is callable
+                return call_user_func_array(self::$apis[$name], array(&$scope, $router));
+            }
+        });
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * api register.
+     *
+     * @return function
+     */
+    public static function register($api, $callback)
+    {
+        self::$apis[$api] = $callback;
+
+        return $callback;
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * api router.
+     *
+     * @return array
+     */
+    public static function router($args, $minus = false)
+    {
+        if (!is_array($args)) {
+            $args = array($args);
+        }
+        if (!$minus) {
+            --self::$current;
+        }
+
+        $arr = array();
+        for ($i = 1; $i <= self::$current; ++$i) {
+            array_push($arr, "api-{$i}");
+        }
+        foreach ($args as $key) {
+            array_push($arr, $key);
+        }
+
+        return Router::parse($arr);
+    }
+
+    /**
+     * api then.
+     *
+     * @return array
+     *
+     * @todo  creating scope, router, multi call in same scope
+     */
+    private static $current = 1;
+    public static function then($a, $b = false, $c = false, $method = true)
+    {
+        if (is_object($c)) {
+            $callback = $c;
+            $args = $b;
+            $text = $a;
+        }
+        if (is_object($b)) {
+            $callback = $b;
+            if (is_array($a)) {
+                $args = $a;
+                $text = false;
+            } else {
+                // todo : split string and check for :id arguments
+                $args = array();
+                $text = $a;
+            }
+        }
+        if (is_object($a)) {
+            $callback = $a;
+            $args = array();
+            $text = false;
+        }
+        if ($text == false) {
+            --self::$current;
+        }
+
+        $router = self::router($args, true);
+        $me = 'api-'.(self::$current);
+
+        if (
+            (($router->$me == $text) || ($text === false)) && $method
+        ) {
+            ++self::$current;
+            $cb = call_user_func_array($callback, array(&Controller::$scope, $router));
+            if (is_array($cb) || is_object($cb)) {
+                $cb = json_encode($cb);
+            }
+            echo $cb;
+            exit;
+        } else {
+            if ($text == false) {
+                ++self::$current;
+            }
+        }
+    }
+
+    public static function group($text, $args = false, $callback = false)
+    {
+        return self::then($text, $args, $callback);
+    }
+
+    public static function get($text, $args = false, $callback = false)
+    {
+        return self::then($text, $args, $callback, Request::method() == 'GET');
+    }
+
+    public static function post($text, $args = false, $callback = false)
+    {
+        return self::then($text, $args, $callback, Request::method() == 'POST');
+    }
+
+    public static function delete($text, $args = false, $callback = false)
+    {
+        return self::then($text, $args, $callback, Request::method() == 'DELETE');
+    }
+
+    public static function put($text, $args = false, $callback = false)
+    {
+        return self::then($text, $args, $callback, Request::method() == 'PUT');
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * api access : check token if send to make query.
+     *
+     * @return bool
+     */
+    public static function access($name = 'token')
+    {
+        global $config;
+        $token = Request::get($name);
+
+        return $token == md5($config['license']['key'].$config['license']['secret']);
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * accessDenied.
+     *
+     * @param 	string
+     *
+     * @return string
+     */
+    public static function accessDenied($err = 'Access Denied', $code = false)
+    {
+        $cls = new stdClass();
+        $cls->status = false;
+        $cls->error = $err;
+        if ($code) {
+            $cls->code = $code;
+        }
+
+        return $cls;
+    }
+}
diff --git a/system/module/Query.php b/system/module/Query.php
index ead5993..8b58161 100644
--- a/system/module/Query.php
+++ b/system/module/Query.php
@@ -1,693 +1,741 @@
-<?php  if (!defined('VERSION'))exit('Direct access to this location is not permitted.');
+<?php
+ if (!defined('VERSION')) {
+     exit('Direct access to this location is not permitted.');
+ }
 /**
- * Purecis Query Module
+ * Purecis Query Module.
  *
  * control URL Parameters
  *
- * @package		codeHive
- * @subpackage	Module
  * @category	Libraries
+ *
  * @author		Tamer Zorba
+ *
  * @link		http://purecis.com/
  */
-
-class Query{
-
-	/**
-	 * List of arrays
-	 *
-	 * @access protected
-	 */
-	protected static $callback = array();
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Query install
-	 *
-	 * @access	public
-	 * @return	string
-	 */
-	public static function __install(){
-		// check sql install
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Query structure
-	 *
-	 * @access	public
-	 * @return	string
-	 */
-	public static function __structure($table=false){
-		//ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-		$st = array(
-			"users" => [
-				"id" 		=> "bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY",
-				"oauth" 	=> "varchar(50) NOT NULL DEFAULT '0'",
-				"name" 		=> "varchar(200) NOT NULL",
-				"login" 	=> "varchar(200) NOT NULL",
-				"email" 	=> "varchar(100) NOT NULL",
-				"pass" 		=> "varchar(200) NOT NULL",
-				"group" 	=> "int(2) NOT NULL DEFAULT '0'",
-				"status" 	=> "varchar(20) NOT NULL DEFAULT 'new'",
-				"rules" 	=> "text",
-				"rel" 		=> "varchar(50) DEFAULT NULL"
-			],
-			"terms" => [
-				"id" 		=> "bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY",
-				"name" 		=> "varchar(200) NOT NULL",
-				"taxonomy" 	=> "varchar(200) NOT NULL",
-				"parent" 	=> "int(11) NOT NULL DEFAULT '0'",
-				"count" 	=> "int(11) NOT NULL DEFAULT '0'"
-			],
-			"relations" => [
-				"id" 		=> "bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY",
-				"oid" 		=> "bigint(20) NOT NULL",
-				"rid" 	=> "bigint(20) NOT NULL",
-				"table" 	=> "varchar(50) NOT NULL",
-				"taxonomy" 	=> "varchar(50)"
-			],
-			"objects" => [
-				"id" 		=> "bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY",
-				"author" 	=> "bigint(20) NOT NULL",
-				"status" 	=> "varchar(20) NOT NULL DEFAULT ''",
-				"permalink" => "varchar(250) NOT NULL DEFAULT ''",
-				"parent" 	=> "bigint(20) NOT NULL DEFAULT 0",
-				"time" 		=> "timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP",
-				"taxonomy" 	=> "varchar(50) NOT NULL DEFAULT ''",
-				"rel" 		=> "varchar(50) NOT NULL DEFAULT ''",
-			],
-			"library" => [
-				"id" 		=> "bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY",
-				"author" 	=> "bigint(20) NOT NULL",
-				"name" 		=> "varchar(200) NOT NULL DEFAULT ''",
-				"path" 		=> "text NOT NULL DEFAULT ''",
-				"updated" => "int(11)",
-				"extension" => "varchar(20) NOT NULL DEFAULT 0",
-				"size" 		=> "varchar(50) NOT NULL DEFAULT 0",
-				"tags" 		=> "tinytext"
-			]
-		);
-		if($table){
-			if(isset($st[$table]))return $st[$table];
-			else return array();
-		}
-		return $st;
-	}
-
-	// --------------------------------------------------------------------
-
-	public static function inStructure($col,$table){
-		global $config;
-		if(isset($config['database']['essential'])){
-			if($config['database']['essential'] == true)return true;
-		}
-		$st = self::__structure($table);
-		return array_key_exists($col, $st);
-	}
-	// --------------------------------------------------------------------
-
-	/**
-	 * Query execute
-	 *
-	 * @access	public
-	 * @param	array 	sql array
-	 * @return	void
-	 */
-	public static function execute($arr){
-		// todo
-		// terms and library with better join like
-		// (:term:termname, :library:libname => "data2get,As,Arr,internalMeta")
-
-		global $config;
-
-		$sql = array();
-		if(!empty($config['database']['prefix']) && $arr['table'] != 'meta'){
-			$arr['table'] = $config['database']['prefix'].$arr['table'];
-		}
-		//type, table, data, where, whereSeperator, order, limit
-		if(!isset($arr['type']))$arr['type'] = 'select';
-
-		$table = $arr['table'];
-
-		if($arr['type'] == 'select'){
-			// start parsing meta table
-			if(isset($arr['data'])){
-				if(!is_array($arr['data']))$arr['data'] = explode(",", $arr['data']);
-				if(!isset($arr['join']))$arr['join'] = array();
-				foreach($arr['data'] as $k => $v){
-					//key
-					/*
-					if(!self::inStructure($k, $table)){
-						if(!strpos($k, ".")){
-							$arr['join']["meta as {$k}"] = "{$k}.oid = {$table}.id and {$k}.key='{$k}' and {$k}.table = '{$table}'";
-							unset($arr['data'][$k]);
-							$k = "{$k}.value";
-							$arr['data'][$k] = $v;
-						}else{
-
-						}
-					}*/
-					//value on select only
-					if($arr['type'] == 'select'){
-						if(!self::inStructure($v, $table)){
-							$v = trim($v);
-							//echo "{$v} not exist<hr>";
-							$arr['join']["meta as `{$v}`"] = "`{$v}`.`oid` = `{$table}`.`id` and `{$v}`.`key`='{$v}' and `{$v}`.`table` = '{$table}'";
-							$arr['data'][$k] = "`{$v}`.`value` as `{$v}`";
-							//unset($arr['data'][$k]);
-							// fix where here ::value::
-						}else{
-							if(!strpos($v, ".")){
-								if(strpos($arr['data'][$k], "~") === false)$arr['data'][$k] = "`{$table}`.`{$arr['data'][$k]}`";
-							}
-							$arr['data'][$k] = str_replace("~", "", $arr['data'][$k]);
-						}
-					}
-				}
-			}
-			// checking library here
-			if(isset($arr['library1'])){
-				array_push($arr['data'], 'librarytable.id as libId');
-				array_push($arr['data'], 'librarytable.name as libName');
-				array_push($arr['data'], 'librarytable.path as libPath');
-				if(!isset($arr['join']))$arr['join'] = array();
-				$arr['join']["relations as libraryrelations"] = "{$table}.id = libraryrelations.oid";
-				$arr['join']["library as librarytable"] = "libraryrelations.rid = librarytable.id";
-				$arr['groupby'] = "`{$table}`.`id`";
-			}
-			// checking library here
-			if(isset($arr['library'])){
-				if(!isset($arr['join']))$arr['join'] = array();
-				$arr['join']["relations as libraryrelations"] = "{$table}.id = libraryrelations.oid";
-				$arr['join']["library as librarytable"] = "libraryrelations.rid = librarytable.id";
-				$arr['groupby'] = "`{$table}`.`id`";
-
-			//	array_push($arr['data'], 'librarytable.id as libId');
-			//	array_push($arr['data'], 'librarytable.name as libName');
-			//	array_push($arr['data'], 'librarytable.path as libPath');
-
-				foreach($arr['library'] as $library){
-					if(!self::inStructure($library, "library")){
-					//	array_push($arr['data'], "thisusermeta.value as author_{$author}");
-					//	$arr['join']["meta as `thisusermeta`"] = "`thisusermeta`.`oid` = `{$table}`.`author` and `thisusermeta`.`key`='{$author}' and `thisusermeta`.`table` = 'users'";
-					}else{
-						array_push($arr['data'], "librarytable.{$library} as library_{$library}");
-					}
-				}
-			}
-			// checking user here
-			if(isset($arr['author'])){
-				if(!isset($arr['join']))$arr['join'] = array();
-				$arr['join']["users as thisuser"] = "{$table}.author = thisuser.id";
-
-				foreach($arr['author'] as $author){
-					if(!self::inStructure($author, "users")){
-						array_push($arr['data'], "thisusermeta.value as author_{$author}");
-						$arr['join']["meta as `thisusermeta`"] = "`thisusermeta`.`oid` = `{$table}`.`author` and `thisusermeta`.`key`='{$author}' and `thisusermeta`.`table` = 'users'";
-					}else{
-						array_push($arr['data'], "thisuser.{$author} as author_{$author}");
-					}
-				}
-			}
-
-		}
-		if(isset($arr['where'])){
-			if(is_array($arr['where'])){
-				if(!isset($arr['join']))$arr['join'] = array();
-				foreach($arr['where'] as $k => $v){
-					//fix value
-					// if array then put or between them
-					if(is_array($v))continue;
-					if(strpos($v, "~") === 0){
-
-						$v = str_replace("~", "", $v);
-						if(!strpos($v, ".")){
-							if(!self::inStructure($v, $table)){
-								$arr['join']["meta as `{$k}`"] = "`{$k}`.`oid` = `{$table}`.`id` and `{$k}`.`key`='{$k}' and `{$k}`.`table` = '{$table}'";
-								$v = "`{$k}`.`{$v}`";
-							}else{
-								$v = "`{$table}`.`{$v}`";
-							}
-						}else{
-							$v = str_replace(".", "`.`", $v);
-							$v = "`{$v}`";
-						}
-					}
-
-					//fix key
-					if(!self::inStructure($k, $table)){
-						$k = trim($k);
-						if(!strpos($k, ".")){
-							$arr['join']["meta as `{$k}`"] = "`{$k}`.`oid` = `{$table}`.`id` and `{$k}`.`key`='{$k}' and `{$k}`.`table` = '{$table}'";
-							unset($arr['where'][$k]);
-							$arr['where']["{$k}.value"] = $v;
-						}
-					}else{
-						if(!strpos($k, ".")){
-							unset($arr['where'][$k]);
-							$arr['where']["{$table}.{$k}"] = $v;
-						}
-					}
-				}
-			}
-		}
-
-
-		switch ( $arr['type'] ) {
-			case 'sql':
-
-				# code...
-				break;
-			case 'insert':
-				array_push($sql, "insert");
-				if(isset($arr['ignore']) && $arr['ignore'] == true)array_push($sql, "IGNORE");
-				array_push($sql, "into");
-				array_push($sql, $arr['table']);
-				$keys = array();
-				$values = array();
-				foreach($arr['data'] as $k => $v){
-					if(self::inStructure($k, $table)){
-						array_push($keys,"`$k`");
-						$v = string::escape($v);
-						array_push($values,"'{$v}'");
-					}
-				}
-				array_push($sql, "(");
-				array_push($sql, implode(", ", $keys));
-				array_push($sql, ") values (");
-				array_push($sql, implode(", ", $values));// fix for multible
-				array_push($sql, ")");
-				break;
-
-			case 'delete':
-				array_push($sql, "delete from");
-				array_push($sql, $arr['table']);
-				# code...
-				break;
-
-			case 'update':
-				array_push($sql, "update");
-				array_push($sql, $arr['table']);
-
-				if(isset($arr['join'])){
-					$j = array();
-					foreach($arr['join'] as $tbl => $join)array_push($j, "LEFT JOIN {$tbl} ON {$join}");
-					array_push($sql, implode($j, " "));
-				}
-
-				array_push($sql, "set");
-				$values = array();
-				foreach($arr['data'] as $k => $v){
-					if(self::inStructure($k, $table)){
-						$v = string::escape($v);
-						array_push($values, self::parse_eq("{$table}.{$k}",$v,$table));
-						//array_push($values,"`{$table}`.`{$k}` = '{$v}'");
-					}
-				}
-				array_push($sql, implode(", ", $values));
-				break;
-
-			default://select
-
-				# code...
-				array_push($sql, "select");
-				if(isset($arr['data'])){
-					if(is_array($arr['data']))$arr['data'] = implode(", ", $arr['data']);
-					array_push($sql, $arr['data']);
-				}else{
-					array_push($sql, '*');
-				}
-
-				array_push($sql, "from");
-				array_push($sql, $arr['table']);
-				break;
-		}
-		if(isset($arr['join']) && $arr['type'] != 'update'){
-			$j = array();
-			foreach($arr['join'] as $tbl => $join)array_push($j, "LEFT JOIN {$tbl} ON {$join}");
-			array_push($sql, implode($j, " "));
-		}
-		if(isset($arr['where'])){
-			if(is_array($arr['where'])){
-				if(sizeof($arr['where']) > 0){
-					$wh = array();
-					array_push($sql, 'where');
-					foreach ($arr['where'] as $key => $value) {
-						array_push($wh, self::parse_eq($key, $value, $table));
-					}
-					$seperate = isset($arr['whereSeperator'])?$arr['whereSeperator']:'and';
-					$where = implode($wh, " {$seperate} ");
-					array_push($sql, $where);
-				}
-			}else if(is_string($arr['where'])){
-				array_push($sql, 'where');
-				array_push($sql, $arr['where']);
-			}
-		}
-		if(isset($arr['groupby'])){
-			array_push($sql, "GROUP BY {$arr['groupby']}");
-		}
-		if(isset($arr['order'])){
-			array_push($sql, "order by");
-			$or = $arr['order'];
-			if(is_object($or)){
-				$a = (array)$or;
-				if(!isset($config['database']['essential'])){
-					$col = "CAST(".key($or)." AS SIGNED)";
-				}else{
-					$col = $or;
-				}
-				array_push($sql,$col." ".$a[key($or)]);
-
-			}else if(is_array($or)){
-				$a = array();
-				foreach ($or as $key => $value) {
-					if(!isset($config['database']['essential'])){
-						$key = "CAST(".$key." AS SIGNED)";
-					}
-					array_push($a,$key." ".$value);
-				}
-				array_push($sql,implode($a,", "));
-
-			}else{
-				if(strpos($or, "(")){
-					array_push($sql, "{$or}");
-				}else{
-					array_push($sql, "id {$or}");
-				}
-			}
-		}
-		if(isset($arr['limit'])){
-			$limit = 'limit '.$arr['limit'];
-			array_push($sql, $limit);
-		}else{
-			if($arr['type'] == 'select'){
-				$limit = 'limit 1000';
-				array_push($sql, $limit);
-			}
-		}
-
-		$sql = implode($sql, ' ').";";
-
-		// Extra SQL
-		if($arr['type'] == "insert"){
-			$values = array();
-			foreach($arr['data'] as $k => $v){
-				if(!self::inStructure($k, $table) && !empty($v)){
-					$v = string::escape($v);
-					array_push($values,"(LAST_INSERT_ID(), '{$k}', '{$v}','{$arr['table']}')");
-				}
-			}
-			if(sizeof($values) > 0){
-				$extra = "INSERT INTO meta (`oid`,`key`,`value`,`table`) VALUES ";
-				$extra .= implode(", ",$values);
-				$extra .= "ON DUPLICATE KEY UPDATE `value` = VALUES(`value`);";
-				$sql .= $extra;
-			}
-		}else if($arr['type'] == 'update'){
-			//set select where if where in some meta then update by id's (more than 1)
-			// in upload not important if the value empty it will update any way
-			$data_keys = array_keys($arr['data']);
-			$meta_size = 0;
-			$schema_size = 0;
-			foreach($data_keys as $ks){
-				if(!self::inStructure($ks, $table)){
-					$meta_size ++;
-				}else{
-					$schema_size ++;
-				}
-			}
-
-			if($meta_size > 0){// to get id's
-				$sid_q = self::execute(array(
-					"table" => $arr['table'],
-					"data" => array('id'),
-					"where" => isset($arr['where'])?$arr['where']:null,
-					"join" => isset($arr['join'])?$arr['join']:null
-				));
-				//all
-				$sid = array();
-				foreach($sid_q->data as $d)array_push($sid, $d['id']);
-			}
-
-			if(isset($sid)){
-				$values = array();
-				foreach($arr['data'] as $k => $v){
-					if(!self::inStructure($k, $table)){
-						$v = string::escape($v);
-						foreach($sid as $sid_k)array_push($values,"({$sid_k}, '{$k}', '{$v}','{$arr['table']}')");
-					}
-				}
-				$extra = "INSERT INTO meta (`oid`,`key`,`value`,`table`) VALUES ";
-				$extra .= implode(", ",$values);
-				$extra .= "ON DUPLICATE KEY UPDATE `value` = VALUES(`value`);";
-
-				if($schema_size > 0)$sql .= $extra;
-				else $sql = $extra;
-			}
-		}else if($arr['type'] == 'delete'){
-			if(!isset($where))$where="";
-			if(!isset($limit))$limit="";
-			//print_r($limit);
-			$idsQ = Database::query("select id from {$table} where {$where} {$limit};");// this to get ids for meta
-			if($idsQ->status){
-				$ids = array();
-				foreach($idsQ->data as $row)array_push($ids, $row['id']);// todo : need optimization
-			}else{
-				$ids = array();
-			}
-			//print_r($ids);
-			$ids = implode(",", $ids);
-			// delete more than 1
-			if(in_array($table, ['users','terms','objects','library'])){ // todo : create group definer function
-				$sql .= "DELETE FROM meta WHERE `oid` in ({$ids})  AND `table` = '{$table}';";
-			}
-			if(in_array($table, ['terms','library'])){ // todo : create group definer function
-				$sql .= "DELETE FROM relations WHERE `rid` in ({$ids})  AND `table` = '{$table}';";
-			}
-			if(in_array($table, ['object'])){
-				$sql .= "DELETE FROM relations WHERE `oid` in ({$ids});";
-			}
-			// delete from meta where `oid` = OLD.id  and `table` = 'terms'; // as trigger
-		}
-
-		//echo $sql;
-
-		//return array();
-		return Database::query($sql);
-	}
-
-	private static function parse_eq($key,$value,$table){
-		$key = str_replace(".", "`.`", $key);
-
-		if(strpos($key, "(") !== false){
-			$key = str_replace($table, "", $key);
-			$key = str_replace("`.`", "", $key);
-			$key = str_replace("~", "", $key);
-			//echo $key;
-		}
-
-		if(!is_array($value) && strpos($value, "~") === 0){
-			$value = str_replace("~", "", $value);
-			if(!strpos($value, ".")){
-				if(!self::inStructure($value, $table)){
-					$arr['join']["meta as `{$key}`"] = "`{$key}`.`oid` = `{$table}`.`id` and `{$key}`.`key`='{$key}' and `{$key}`.`table` = '{$table}'";
-					$value = "`{$key}`.`{$value}`";
-				}else{
-					$value = "`{$table}`.`{$value}`";
-				}
-			}else{
-				$value = str_replace(".", "`.`", $value);
-				$value = "`{$value}`";
-			}
-			$normal_v = false;
-		}else{
-			$normal_v = true;
-			if(is_array($value)){
-				if(!self::inStructure($key, $table))$key = $key."`.`value";
-				else $key = "{$table}`.`{$key}";
-				$value = ":in:".implode(", ", $value);
-			}
-		}
-
-		if(strpos($value, ":like:") !== false){
-			$value = str_replace(":like:", "", $value);
-			if($normal_v)$value = "'{$value}'";
-			return "`{$key}` like {$value}";
-
-		}else if(strpos($value, ":is:") !== false){
-			$value = str_replace(":is:", "", $value);
-			if($normal_v)$value = "'{$value}'";
-			return "`{$key}` is {$value}";
-
-		}else if(strpos($value, ":not:") !== false){
-			$value = str_replace(":not:", "", $value);
-			if($normal_v)$value = "'{$value}'";
-			return "`{$key}` != {$value}";
-
-		}else if(strpos($value, ":inset:") !== false){
-			$value = stripslashes($value);
-			$value = str_replace(":inset:", "", $value);
-
-			$separator = "or";
-			if(strpos($value, "or:") !== false){
-				$value = str_replace("or:", "", $value);
-			}
-			if(strpos($value, "and:") !== false){
-				$separator = "and";
-				$value = str_replace("and:", "", $value);
-			}
-			$ex = explode(",",$value);
-			$temp = array();
-			foreach($ex as $v){
-				array_push($temp,"FIND_IN_SET ({$v},`{$key}`)");
-			}
-			return "(".implode(" {$separator} ", $temp).")";
-
-		}else if(strpos($value, ":in:") !== false){
-			$value = stripslashes($value);
-			$value = str_replace(":in:", "", $value);
-			return "`{$key}` in ({$value})";
-
-		}else if(strpos($value, ":notin:") !== false){
-			$value = str_replace(":notin:", "", $value);
-			return "`{$key}` not in ({$value})";
-
-		}else if(strpos($value, ":gt:") !== false){
-			$value = str_replace(":gt:", "", $value);
-			return "`{$key}` > {$value}";
-
-		}else if(strpos($value, ":gte:") !== false){
-			$value = str_replace(":gte:", "", $value);
-			return "`{$key}` >= {$value}";
-
-		}else if(strpos($value, ":lt:") !== false){
-			$value = str_replace(":lt:", "", $value);
-			return "`{$key}` < {$value}";
-
-		}else if(strpos($value, ":lte:") !== false){
-			$value = str_replace(":lte:", "", $value);
-			return "`{$key}` <= {$value}";
-
-		}else if(strpos($value, ":bet:") !== false){
-			$value = str_replace(":bet:", "", $value);
-			$value = str_replace(",", " and ", $value);
-			return "(`{$key}` BETWEEN {$value})";
-
-		}else if(strpos($value, ":append:") !== false){
-			$value = str_replace(":append:", "", $value);
-			return "`{$key}` = `{$key}` + {$value}";
-
-		}else{
-			if($normal_v)$value = "'{$value}'";
-			if(strpos($key, "(") !== false)return "{$key} = {$value}";
-			else return "`{$key}` = {$value}";
-
-		}
-		// in set and things
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Query get
-	 *
-	 * Fetching Data from table
-	 *
-	 * @access	public
-	 * @param	array 	sql array
-	 * @return	void
-	 */
-	public static function get($table,$arr=array()){
-/*
-			select users.*
-			,birthday.value as birthday
-			from users
-			left join meta as birthday on birthday.oid = users.id and birthday.key='birthday' and birthday.table = 'users'
-			;
-			*/
-		$arr['table'] = $table;
-		$arr['type'] = 'select';
-		// fix structure
-		if(isset($arr['library'])){
-			//"LEFT JOIN {$tbl} ON {$join}"
-			//"LEFT JOIN library ON {$join}"
-			/*
-			array_push($arr['data'], "library.id as libid");
-			array_push($arr['data'], "library.name as libname");
-			$arr['join'] = array(
-				"relations"=>"objects.id = relations.oid",
-				"library"=>"relations.rid = library.id"
-			);
-			*/
-			//unset($arr['library']);
-		}
-
-		return self::execute($arr);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Query set
-	 *
-	 * Insert or Update Database table based on where is set
-	 *
-	 * @access	public
-	 * @param	array 	sql array
-	 * @return	void
-	 */
-	public static function set($table,$arr=array()){
-		$arr['table'] = $table;
-		$arr['type'] = 'insert';
-		if(isset($arr['where']))$arr['type'] = "update";
-		return self::execute($arr);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Query remove
-	 *
-	 * Delete rows from Table
-	 *
-	 * @access	public
-	 * @param	array 	sql array
-	 * @return	void
-	 */
-	public static function remove($table,$arr=array()){
-		$arr['table'] = $table;
-		$arr['type'] = 'delete';
-		return self::execute($arr);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Query on
-	 *
-	 * @access	public
-	 * @param	array 	sql array
-	 * @return	void
-	 */
-	public static function on($table){
-		// working on
-
-		$cls = new stdClass();
-		$cls->sql_arr = array();
-		$cls->where = function(){
-			echo "1";
-		};
-
-		return $cls;
-	}
-
-
-
+class Query
+{
+    /**
+     * List of arrays.
+     */
+    protected static $callback = array();
+
+    // --------------------------------------------------------------------
+
+    /**
+     * Query install.
+     *
+     * @return string
+     */
+    public static function __install()
+    {
+        // check sql install
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * Query structure.
+     *
+     * @return string
+     */
+    public static function __structure($table = false)
+    {
+        //ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+        $st = array(
+            'users' => [
+                'id' => 'bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY',
+                'oauth' => "varchar(50) NOT NULL DEFAULT '0'",
+                'name' => 'varchar(200) NOT NULL',
+                'login' => 'varchar(200) NOT NULL',
+                'email' => 'varchar(100) NOT NULL',
+                'pass' => 'varchar(200) NOT NULL',
+                'group' => "int(2) NOT NULL DEFAULT '0'",
+                'status' => "varchar(20) NOT NULL DEFAULT 'new'",
+                'rules' => 'text',
+                'rel' => 'varchar(50) DEFAULT NULL',
+            ],
+            'terms' => [
+                'id' => 'bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY',
+                'name' => 'varchar(200) NOT NULL',
+                'taxonomy' => 'varchar(200) NOT NULL',
+                'parent' => "int(11) NOT NULL DEFAULT '0'",
+                'count' => "int(11) NOT NULL DEFAULT '0'",
+            ],
+            'relations' => [
+                'id' => 'bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY',
+                'oid' => 'bigint(20) NOT NULL',
+                'rid' => 'bigint(20) NOT NULL',
+                'table' => 'varchar(50) NOT NULL',
+                'taxonomy' => 'varchar(50)',
+            ],
+            'objects' => [
+                'id' => 'bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY',
+                'author' => 'bigint(20) NOT NULL',
+                'status' => "varchar(20) NOT NULL DEFAULT ''",
+                'permalink' => "varchar(250) NOT NULL DEFAULT ''",
+                'parent' => 'bigint(20) NOT NULL DEFAULT 0',
+                'time' => 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP',
+                'taxonomy' => "varchar(50) NOT NULL DEFAULT ''",
+                'rel' => "varchar(50) NOT NULL DEFAULT ''",
+            ],
+            'library' => [
+                'id' => 'bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY',
+                'author' => 'bigint(20) NOT NULL',
+                'name' => "varchar(200) NOT NULL DEFAULT ''",
+                'path' => "text NOT NULL DEFAULT ''",
+                'updated' => 'int(11)',
+                'extension' => 'varchar(20) NOT NULL DEFAULT 0',
+                'size' => 'varchar(50) NOT NULL DEFAULT 0',
+                'tags' => 'tinytext',
+            ],
+        );
+        if ($table) {
+            if (isset($st[$table])) {
+                return $st[$table];
+            } else {
+                return array();
+            }
+        }
+
+        return $st;
+    }
+
+    // --------------------------------------------------------------------
+
+    public static function inStructure($col, $table)
+    {
+        global $config;
+        if (isset($config['database']['essential'])) {
+            if ($config['database']['essential'] == true) {
+                return true;
+            }
+        }
+        $st = self::__structure($table);
+
+        return array_key_exists($col, $st);
+    }
+    // --------------------------------------------------------------------
+
+    /**
+     * Query execute.
+     *
+     * @param	array 	sql array
+     */
+    public static function execute($arr)
+    {
+        // todo
+        // terms and library with better join like
+        // (:term:termname, :library:libname => "data2get,As,Arr,internalMeta")
+
+        global $config;
+
+        $sql = array();
+        if (!empty($config['database']['prefix']) && $arr['table'] != 'meta') {
+            $arr['table'] = $config['database']['prefix'].$arr['table'];
+        }
+        //type, table, data, where, whereSeperator, order, limit
+        if (!isset($arr['type'])) {
+            $arr['type'] = 'select';
+        }
+
+        $table = $arr['table'];
+
+        if ($arr['type'] == 'select') {
+            // start parsing meta table
+            if (isset($arr['data'])) {
+                if (!is_array($arr['data'])) {
+                    $arr['data'] = explode(',', $arr['data']);
+                }
+                if (!isset($arr['join'])) {
+                    $arr['join'] = array();
+                }
+                foreach ($arr['data'] as $k => $v) {
+                    //key
+                    /*
+                    if(!self::inStructure($k, $table)){
+                        if(!strpos($k, ".")){
+                            $arr['join']["meta as {$k}"] = "{$k}.oid = {$table}.id and {$k}.key='{$k}' and {$k}.table = '{$table}'";
+                            unset($arr['data'][$k]);
+                            $k = "{$k}.value";
+                            $arr['data'][$k] = $v;
+                        }else{
+
+                        }
+                    }*/
+                    //value on select only
+                    if ($arr['type'] == 'select') {
+                        if (!self::inStructure($v, $table)) {
+                            $v = trim($v);
+                            //echo "{$v} not exist<hr>";
+                            $arr['join']["meta as `{$v}`"] = "`{$v}`.`oid` = `{$table}`.`id` and `{$v}`.`key`='{$v}' and `{$v}`.`table` = '{$table}'";
+                            $arr['data'][$k] = "`{$v}`.`value` as `{$v}`";
+                            //unset($arr['data'][$k]);
+                            // fix where here ::value::
+                        } else {
+                            if (!strpos($v, '.')) {
+                                if (strpos($arr['data'][$k], '~') === false) {
+                                    $arr['data'][$k] = "`{$table}`.`{$arr['data'][$k]}`";
+                                }
+                            }
+                            $arr['data'][$k] = str_replace('~', '', $arr['data'][$k]);
+                        }
+                    }
+                }
+            }
+            // checking library here
+            if (isset($arr['library1'])) {
+                array_push($arr['data'], 'librarytable.id as libId');
+                array_push($arr['data'], 'librarytable.name as libName');
+                array_push($arr['data'], 'librarytable.path as libPath');
+                if (!isset($arr['join'])) {
+                    $arr['join'] = array();
+                }
+                $arr['join']['relations as libraryrelations'] = "{$table}.id = libraryrelations.oid";
+                $arr['join']['library as librarytable'] = 'libraryrelations.rid = librarytable.id';
+                $arr['groupby'] = "`{$table}`.`id`";
+            }
+            // checking library here
+            if (isset($arr['library'])) {
+                if (!isset($arr['join'])) {
+                    $arr['join'] = array();
+                }
+                $arr['join']['relations as libraryrelations'] = "{$table}.id = libraryrelations.oid";
+                $arr['join']['library as librarytable'] = 'libraryrelations.rid = librarytable.id';
+                $arr['groupby'] = "`{$table}`.`id`";
+
+            //	array_push($arr['data'], 'librarytable.id as libId');
+            //	array_push($arr['data'], 'librarytable.name as libName');
+            //	array_push($arr['data'], 'librarytable.path as libPath');
+
+                foreach ($arr['library'] as $library) {
+                    if (!self::inStructure($library, 'library')) {
+                        //	array_push($arr['data'], "thisusermeta.value as author_{$author}");
+                    //	$arr['join']["meta as `thisusermeta`"] = "`thisusermeta`.`oid` = `{$table}`.`author` and `thisusermeta`.`key`='{$author}' and `thisusermeta`.`table` = 'users'";
+                    } else {
+                        array_push($arr['data'], "librarytable.{$library} as library_{$library}");
+                    }
+                }
+            }
+            // checking user here
+            if (isset($arr['author'])) {
+                if (!isset($arr['join'])) {
+                    $arr['join'] = array();
+                }
+                $arr['join']['users as thisuser'] = "{$table}.author = thisuser.id";
+
+                foreach ($arr['author'] as $author) {
+                    if (!self::inStructure($author, 'users')) {
+                        array_push($arr['data'], "thisusermeta.value as author_{$author}");
+                        $arr['join']['meta as `thisusermeta`'] = "`thisusermeta`.`oid` = `{$table}`.`author` and `thisusermeta`.`key`='{$author}' and `thisusermeta`.`table` = 'users'";
+                    } else {
+                        array_push($arr['data'], "thisuser.{$author} as author_{$author}");
+                    }
+                }
+            }
+        }
+        if (isset($arr['where'])) {
+            if (is_array($arr['where'])) {
+                if (!isset($arr['join'])) {
+                    $arr['join'] = array();
+                }
+                foreach ($arr['where'] as $k => $v) {
+                    //fix value
+                    // if array then put or between them
+                    if (is_array($v)) {
+                        continue;
+                    }
+                    if (strpos($v, '~') === 0) {
+                        $v = str_replace('~', '', $v);
+                        if (!strpos($v, '.')) {
+                            if (!self::inStructure($v, $table)) {
+                                $arr['join']["meta as `{$k}`"] = "`{$k}`.`oid` = `{$table}`.`id` and `{$k}`.`key`='{$k}' and `{$k}`.`table` = '{$table}'";
+                                $v = "`{$k}`.`{$v}`";
+                            } else {
+                                $v = "`{$table}`.`{$v}`";
+                            }
+                        } else {
+                            $v = str_replace('.', '`.`', $v);
+                            $v = "`{$v}`";
+                        }
+                    }
+
+                    //fix key
+                    if (!self::inStructure($k, $table)) {
+                        $k = trim($k);
+                        if (!strpos($k, '.')) {
+                            $arr['join']["meta as `{$k}`"] = "`{$k}`.`oid` = `{$table}`.`id` and `{$k}`.`key`='{$k}' and `{$k}`.`table` = '{$table}'";
+                            unset($arr['where'][$k]);
+                            $arr['where']["{$k}.value"] = $v;
+                        }
+                    } else {
+                        if (!strpos($k, '.')) {
+                            unset($arr['where'][$k]);
+                            $arr['where']["{$table}.{$k}"] = $v;
+                        }
+                    }
+                }
+            }
+        }
+
+        switch ($arr['type']) {
+            case 'sql':
+
+                # code...
+                break;
+            case 'insert':
+                array_push($sql, 'insert');
+                if (isset($arr['ignore']) && $arr['ignore'] == true) {
+                    array_push($sql, 'IGNORE');
+                }
+                array_push($sql, 'into');
+                array_push($sql, $arr['table']);
+                $keys = array();
+                $values = array();
+                foreach ($arr['data'] as $k => $v) {
+                    if (self::inStructure($k, $table)) {
+                        array_push($keys, "`$k`");
+                        $v = string::escape($v);
+                        array_push($values, "'{$v}'");
+                    }
+                }
+                array_push($sql, '(');
+                array_push($sql, implode(', ', $keys));
+                array_push($sql, ') values (');
+                array_push($sql, implode(', ', $values));// fix for multible
+                array_push($sql, ')');
+                break;
+
+            case 'delete':
+                array_push($sql, 'delete from');
+                array_push($sql, $arr['table']);
+                # code...
+                break;
+
+            case 'update':
+                array_push($sql, 'update');
+                array_push($sql, $arr['table']);
+
+                if (isset($arr['join'])) {
+                    $j = array();
+                    foreach ($arr['join'] as $tbl => $join) {
+                        array_push($j, "LEFT JOIN {$tbl} ON {$join}");
+                    }
+                    array_push($sql, implode($j, ' '));
+                }
+
+                array_push($sql, 'set');
+                $values = array();
+                foreach ($arr['data'] as $k => $v) {
+                    if (self::inStructure($k, $table)) {
+                        $v = string::escape($v);
+                        array_push($values, self::parse_eq("{$table}.{$k}", $v, $table));
+                        //array_push($values,"`{$table}`.`{$k}` = '{$v}'");
+                    }
+                }
+                array_push($sql, implode(', ', $values));
+                break;
+
+            default://select
+
+                # code...
+                array_push($sql, 'select');
+                if (isset($arr['data'])) {
+                    if (is_array($arr['data'])) {
+                        $arr['data'] = implode(', ', $arr['data']);
+                    }
+                    array_push($sql, $arr['data']);
+                } else {
+                    array_push($sql, '*');
+                }
+
+                array_push($sql, 'from');
+                array_push($sql, $arr['table']);
+                break;
+        }
+        if (isset($arr['join']) && $arr['type'] != 'update') {
+            $j = array();
+            foreach ($arr['join'] as $tbl => $join) {
+                array_push($j, "LEFT JOIN {$tbl} ON {$join}");
+            }
+            array_push($sql, implode($j, ' '));
+        }
+        if (isset($arr['where'])) {
+            if (is_array($arr['where'])) {
+                if (sizeof($arr['where']) > 0) {
+                    $wh = array();
+                    array_push($sql, 'where');
+                    foreach ($arr['where'] as $key => $value) {
+                        array_push($wh, self::parse_eq($key, $value, $table));
+                    }
+                    $seperate = isset($arr['whereSeperator']) ? $arr['whereSeperator'] : 'and';
+                    $where = implode($wh, " {$seperate} ");
+                    array_push($sql, $where);
+                }
+            } elseif (is_string($arr['where'])) {
+                array_push($sql, 'where');
+                array_push($sql, $arr['where']);
+            }
+        }
+        if (isset($arr['groupby'])) {
+            array_push($sql, "GROUP BY {$arr['groupby']}");
+        }
+        if (isset($arr['order'])) {
+            array_push($sql, 'order by');
+            $or = $arr['order'];
+            if (is_object($or)) {
+                $a = (array) $or;
+                if (!isset($config['database']['essential'])) {
+                    $col = 'CAST('.key($or).' AS SIGNED)';
+                } else {
+                    $col = $or;
+                }
+                array_push($sql, $col.' '.$a[key($or)]);
+            } elseif (is_array($or)) {
+                $a = array();
+                foreach ($or as $key => $value) {
+                    if (!isset($config['database']['essential'])) {
+                        $key = 'CAST('.$key.' AS SIGNED)';
+                    }
+                    array_push($a, $key.' '.$value);
+                }
+                array_push($sql, implode($a, ', '));
+            } else {
+                if (strpos($or, '(')) {
+                    array_push($sql, "{$or}");
+                } else {
+                    array_push($sql, "id {$or}");
+                }
+            }
+        }
+        if (isset($arr['limit'])) {
+            $limit = 'limit '.$arr['limit'];
+            array_push($sql, $limit);
+        } else {
+            if ($arr['type'] == 'select') {
+                $limit = 'limit 1000';
+                array_push($sql, $limit);
+            }
+        }
+
+        $sql = implode($sql, ' ').';';
+
+        // Extra SQL
+        if ($arr['type'] == 'insert') {
+            $values = array();
+            foreach ($arr['data'] as $k => $v) {
+                if (!self::inStructure($k, $table) && !empty($v)) {
+                    $v = string::escape($v);
+                    array_push($values, "(LAST_INSERT_ID(), '{$k}', '{$v}','{$arr['table']}')");
+                }
+            }
+            if (sizeof($values) > 0) {
+                $extra = 'INSERT INTO meta (`oid`,`key`,`value`,`table`) VALUES ';
+                $extra .= implode(', ', $values);
+                $extra .= 'ON DUPLICATE KEY UPDATE `value` = VALUES(`value`);';
+                $sql .= $extra;
+            }
+        } elseif ($arr['type'] == 'update') {
+            //set select where if where in some meta then update by id's (more than 1)
+            // in upload not important if the value empty it will update any way
+            $data_keys = array_keys($arr['data']);
+            $meta_size = 0;
+            $schema_size = 0;
+            foreach ($data_keys as $ks) {
+                if (!self::inStructure($ks, $table)) {
+                    ++$meta_size;
+                } else {
+                    ++$schema_size;
+                }
+            }
+
+            if ($meta_size > 0) {
+                // to get id's
+                $sid_q = self::execute(array(
+                    'table' => $arr['table'],
+                    'data' => array('id'),
+                    'where' => isset($arr['where']) ? $arr['where'] : null,
+                    'join' => isset($arr['join']) ? $arr['join'] : null,
+                ));
+                //all
+                $sid = array();
+                foreach ($sid_q->data as $d) {
+                    array_push($sid, $d['id']);
+                }
+            }
+
+            if (isset($sid)) {
+                $values = array();
+                foreach ($arr['data'] as $k => $v) {
+                    if (!self::inStructure($k, $table)) {
+                        $v = string::escape($v);
+                        foreach ($sid as $sid_k) {
+                            array_push($values, "({$sid_k}, '{$k}', '{$v}','{$arr['table']}')");
+                        }
+                    }
+                }
+                $extra = 'INSERT INTO meta (`oid`,`key`,`value`,`table`) VALUES ';
+                $extra .= implode(', ', $values);
+                $extra .= 'ON DUPLICATE KEY UPDATE `value` = VALUES(`value`);';
+
+                if ($schema_size > 0) {
+                    $sql .= $extra;
+                } else {
+                    $sql = $extra;
+                }
+            }
+        } elseif ($arr['type'] == 'delete') {
+            if (!isset($where)) {
+                $where = '';
+            }
+            if (!isset($limit)) {
+                $limit = '';
+            }
+            //print_r($limit);
+            $idsQ = Database::query("select id from {$table} where {$where} {$limit};");// this to get ids for meta
+            if ($idsQ->status) {
+                $ids = array();
+                foreach ($idsQ->data as $row) {
+                    array_push($ids, $row['id']);
+                }// todo : need optimization
+            } else {
+                $ids = array();
+            }
+            //print_r($ids);
+            $ids = implode(',', $ids);
+            // delete more than 1
+            if (in_array($table, ['users', 'terms', 'objects', 'library'])) { // todo : create group definer function
+                $sql .= "DELETE FROM meta WHERE `oid` in ({$ids})  AND `table` = '{$table}';";
+            }
+            if (in_array($table, ['terms', 'library'])) { // todo : create group definer function
+                $sql .= "DELETE FROM relations WHERE `rid` in ({$ids})  AND `table` = '{$table}';";
+            }
+            if (in_array($table, ['object'])) {
+                $sql .= "DELETE FROM relations WHERE `oid` in ({$ids});";
+            }
+            // delete from meta where `oid` = OLD.id  and `table` = 'terms'; // as trigger
+        }
+
+        //echo $sql;
+
+        //return array();
+        return Database::query($sql);
+    }
+
+    private static function parse_eq($key, $value, $table)
+    {
+        $key = str_replace('.', '`.`', $key);
+
+        if (strpos($key, '(') !== false) {
+            $key = str_replace($table, '', $key);
+            $key = str_replace('`.`', '', $key);
+            $key = str_replace('~', '', $key);
+            //echo $key;
+        }
+
+        if (!is_array($value) && strpos($value, '~') === 0) {
+            $value = str_replace('~', '', $value);
+            if (!strpos($value, '.')) {
+                if (!self::inStructure($value, $table)) {
+                    $arr['join']["meta as `{$key}`"] = "`{$key}`.`oid` = `{$table}`.`id` and `{$key}`.`key`='{$key}' and `{$key}`.`table` = '{$table}'";
+                    $value = "`{$key}`.`{$value}`";
+                } else {
+                    $value = "`{$table}`.`{$value}`";
+                }
+            } else {
+                $value = str_replace('.', '`.`', $value);
+                $value = "`{$value}`";
+            }
+            $normal_v = false;
+        } else {
+            $normal_v = true;
+            if (is_array($value)) {
+                if (!self::inStructure($key, $table)) {
+                    $key = $key.'`.`value';
+                } else {
+                    $key = "{$table}`.`{$key}";
+                }
+                $value = ':in:'.implode(', ', $value);
+            }
+        }
+
+        if (strpos($value, ':like:') !== false) {
+            $value = str_replace(':like:', '', $value);
+            if ($normal_v) {
+                $value = "'{$value}'";
+            }
+
+            return "`{$key}` like {$value}";
+        } elseif (strpos($value, ':is:') !== false) {
+            $value = str_replace(':is:', '', $value);
+            if ($normal_v) {
+                $value = "'{$value}'";
+            }
+
+            return "`{$key}` is {$value}";
+        } elseif (strpos($value, ':not:') !== false) {
+            $value = str_replace(':not:', '', $value);
+            if ($normal_v) {
+                $value = "'{$value}'";
+            }
+
+            return "`{$key}` != {$value}";
+        } elseif (strpos($value, ':inset:') !== false) {
+            $value = stripslashes($value);
+            $value = str_replace(':inset:', '', $value);
+
+            $separator = 'or';
+            if (strpos($value, 'or:') !== false) {
+                $value = str_replace('or:', '', $value);
+            }
+            if (strpos($value, 'and:') !== false) {
+                $separator = 'and';
+                $value = str_replace('and:', '', $value);
+            }
+            $ex = explode(',', $value);
+            $temp = array();
+            foreach ($ex as $v) {
+                array_push($temp, "FIND_IN_SET ({$v},`{$key}`)");
+            }
+
+            return '('.implode(" {$separator} ", $temp).')';
+        } elseif (strpos($value, ':in:') !== false) {
+            $value = stripslashes($value);
+            $value = str_replace(':in:', '', $value);
+
+            return "`{$key}` in ({$value})";
+        } elseif (strpos($value, ':notin:') !== false) {
+            $value = str_replace(':notin:', '', $value);
+
+            return "`{$key}` not in ({$value})";
+        } elseif (strpos($value, ':gt:') !== false) {
+            $value = str_replace(':gt:', '', $value);
+
+            return "`{$key}` > {$value}";
+        } elseif (strpos($value, ':gte:') !== false) {
+            $value = str_replace(':gte:', '', $value);
+
+            return "`{$key}` >= {$value}";
+        } elseif (strpos($value, ':lt:') !== false) {
+            $value = str_replace(':lt:', '', $value);
+
+            return "`{$key}` < {$value}";
+        } elseif (strpos($value, ':lte:') !== false) {
+            $value = str_replace(':lte:', '', $value);
+
+            return "`{$key}` <= {$value}";
+        } elseif (strpos($value, ':bet:') !== false) {
+            $value = str_replace(':bet:', '', $value);
+            $value = str_replace(',', ' and ', $value);
+
+            return "(`{$key}` BETWEEN {$value})";
+        } elseif (strpos($value, ':append:') !== false) {
+            $value = str_replace(':append:', '', $value);
+
+            return "`{$key}` = `{$key}` + {$value}";
+        } else {
+            if ($normal_v) {
+                $value = "'{$value}'";
+            }
+            if (strpos($key, '(') !== false) {
+                return "{$key} = {$value}";
+            } else {
+                return "`{$key}` = {$value}";
+            }
+        }
+        // in set and things
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * Query get.
+     *
+     * Fetching Data from table
+     *
+     * @param	array 	sql array
+     */
+    public static function get($table, $arr = array())
+    {
+        /*
+            select users.*
+            ,birthday.value as birthday
+            from users
+            left join meta as birthday on birthday.oid = users.id and birthday.key='birthday' and birthday.table = 'users'
+            ;
+            */
+        $arr['table'] = $table;
+        $arr['type'] = 'select';
+        // fix structure
+        if (isset($arr['library'])) {
+            //"LEFT JOIN {$tbl} ON {$join}"
+            //"LEFT JOIN library ON {$join}"
+            /*
+            array_push($arr['data'], "library.id as libid");
+            array_push($arr['data'], "library.name as libname");
+            $arr['join'] = array(
+                "relations"=>"objects.id = relations.oid",
+                "library"=>"relations.rid = library.id"
+            );
+            */
+            //unset($arr['library']);
+        }
+
+        return self::execute($arr);
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * Query set.
+     *
+     * Insert or Update Database table based on where is set
+     *
+     * @param	array 	sql array
+     */
+    public static function set($table, $arr = array())
+    {
+        $arr['table'] = $table;
+        $arr['type'] = 'insert';
+        if (isset($arr['where'])) {
+            $arr['type'] = 'update';
+        }
+
+        return self::execute($arr);
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * Query remove.
+     *
+     * Delete rows from Table
+     *
+     * @param	array 	sql array
+     */
+    public static function remove($table, $arr = array())
+    {
+        $arr['table'] = $table;
+        $arr['type'] = 'delete';
+
+        return self::execute($arr);
+    }
+
+    // --------------------------------------------------------------------
+
+    /**
+     * Query on.
+     *
+     * @param	array 	sql array
+     */
+    public static function on($table)
+    {
+        Module::import('QueryBuilder');
+        $bldr = new QueryBuilder();
+
+        return $bldr->table($table);
+    }
 }
 
 /* End of file Query.php */
diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index 635a587..2c921d4 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -1,108 +1,120 @@
-<?php if (!defined('VERSION')) {
+<?php
+
+if (!defined('VERSION')) {
     exit('Direct access to this location is not permitted.');
 }
 
 /**
- * Purecis QueryBuilder Module
+ * Purecis QueryBuilder Module.
  *
  * This class Control QueryBuilder Requests
  *
- * @package         codeHive
- * @subpackage      Module
  * @category        Libraries
+ *
  * @author          Tamer Zorba
+ *
  * @link            http://purecis.com/
+ *
  * @todo            shared lock, lock for update
  */
-
 class QueryBuilder
 {
     /**
-     * Variables
+     * Variables.
      *
      * @var mixen
-     * @access protected
      */
     private $table;
-    private $param  = array();
+    private $param = array();
     // private $ascol  = array();
-    public $where  = "";
-    private $join  = "";
+    public $where = '';
+    private $join = '';
     private $group = array();
     private $order = array();
-    private $limit = "";
+    private $limit = '';
     private $query;
     private $records;
-    private $union = "";
-    public $join_on = "";
+    private $union = '';
+    public $join_on = '';
 
     // --------------------------------------------------------------------
-    public function __get($property) {
+    public function __get($property)
+    {
         echo "Getting '$property'\n";
+
         return 123;
     }
     /**
-     * ajax table
-     *
-     * @return    void
+     * ajax table.
      */
     public function table($table)
     {
         $this->table = $table;
+
         return $this;
     }
 
     /**
-     * set params to query
-     * @param  String $args Mix of data to get
-     * @return Object QueryBuilder
+     * set params to query.
+     *
+     * @param string $args Mix of data to get
+     *
+     * @return object QueryBuilder
      */
     public function param()
     {
         $this->param = array_merge($this->param, func_get_args());
+
         return $this;
     }
 
     public function where()
     {
         if (strlen($this->where)) {
-            $this->where .= " AND ";
+            $this->where .= ' AND ';
         }
 
         $args = func_get_args();
         $this->where .= $this->_whereParse($args);
+
         return $this;
     }
 
     public function orWhere()
     {
         if (strlen($this->where)) {
-            $this->where .= " OR ";
+            $this->where .= ' OR ';
         }
 
         $args = func_get_args();
         $this->where .= $this->_whereParse($args);
+
         return $this;
     }
 
     /**
-     * Builder : join
-     * @return Object QueryBuilder
+     * Builder : join.
+     *
+     * @return object QueryBuilder
      */
     public function join()
     {
         $args = func_get_args();
         $this->join .= $this->_joinParse($args);
+
         return $this;
     }
 
     public function on()
     {
         $args = func_get_args();
-        if (!strlen($this->join_on)) $str = " ON ";
-        else $str = " AND ";
+        if (!strlen($this->join_on)) {
+            $str = ' ON ';
+        } else {
+            $str = ' AND ';
+        }
 
-        $str .= call_user_func_array(array($this, "_parseOperators"), $args);
+        $str .= call_user_func_array(array($this, '_parseOperators'), $args);
 
         $this->join_on .= $str;
 
@@ -112,10 +124,13 @@ public function on()
     public function orOn()
     {
         $args = func_get_args();
-        if (!strlen($this->join_on)) $str = " ON ";
-        else $str = " OR ";
+        if (!strlen($this->join_on)) {
+            $str = ' ON ';
+        } else {
+            $str = ' OR ';
+        }
 
-        $str .= call_user_func_array(array($this, "_parseOperators"), $args);
+        $str .= call_user_func_array(array($this, '_parseOperators'), $args);
 
         $this->join_on .= $str;
 
@@ -123,31 +138,31 @@ public function orOn()
     }
 
     /**
-     * Builder : group
-     * @return Object QueryBuilder
+     * Builder : group.
+     *
+     * @return object QueryBuilder
      */
     public function group()
     {
         $this->group = array_merge($this->group, func_get_args());
+
         return $this;
     }
 
     /**
-     * Builder : order
-     * @return Object QueryBuilder
+     * Builder : order.
+     *
+     * @return object QueryBuilder
      */
     public function order()
     {
         $args = func_get_args();
         if (sizeof($args) == 2) {
             array_push($this->order, array($args[0], strtoupper($args[1])));
-
-        } else if (sizeof($args) == 1) {
-            array_push($this->order, [$args[0], "DESC"]);
-
+        } elseif (sizeof($args) == 1) {
+            array_push($this->order, [$args[0], 'DESC']);
         } else {
-            array_push($this->order, ["id", "DESC"]);
-
+            array_push($this->order, ['id', 'DESC']);
         }
 
         return $this;
@@ -158,10 +173,8 @@ public function limit()
         $args = func_get_args();
         if (sizeof($args) == 2) {
             $this->limit = " LIMIT {$args[0]}, {$args[1]}";
-
         } else {
             $this->limit = " LIMIT {$args[0]}";
-
         }
 
         return $this;
@@ -178,22 +191,23 @@ public function union()
     public function unionAll()
     {
         $args = func_get_args();
-        $this->union .= $this->_unionParse($args[0], "ALL ");
+        $this->union .= $this->_unionParse($args[0], 'ALL ');
 
         return $this;
     }
 
     /**
-     * generate SELECT statement
-     * @return Object SQL Query
+     * generate SELECT statement.
+     *
+     * @return object SQL Query
      */
     public function _get()
     {
         $args = func_get_args();
 
-        $this->query = "SELECT ";
+        $this->query = 'SELECT ';
         $this->query .= $this->_param();
-        $this->query .= " FROM ";
+        $this->query .= ' FROM ';
         $this->query .= $this->_table($this->table);
         $this->query .= $this->join;
         $this->query .= $this->_where();
@@ -201,41 +215,45 @@ public function _get()
         $this->query .= $this->_order();
         $this->query .= $this->limit;
         $this->query .= $this->union;
-        if(!$args[0])$this->query .= ";";
+        if (!$args[0]) {
+            $this->query .= ';';
+        }
+
         return $this->query;
     }
 
     public function get()
     {
         $this->_get();
+
         return $this->records = Database::query($this->query);
     }
 
     /**
-     * generate INSERT, UPDATE statement
-     * @return Object SQL Query
+     * generate INSERT, UPDATE statement.
+     *
+     * @return object SQL Query
      */
     private function _set()
     {
         $args = func_get_args();
 
         if (!strlen($this->where)) {
-            $this->query = "INSERT INTO ";
+            $this->query = 'INSERT INTO ';
             $this->query .= $this->_table($this->table);
-            $this->query .= " (".$this->_param("insert",1).")";
-            $this->query .= " VALUES";
-            $this->query .= " (".$this->_param("insert",2).")";
-
-        }else{
-            $this->query = "UPDATE ";
+            $this->query .= ' ('.$this->_param('insert', 1).')';
+            $this->query .= ' VALUES';
+            $this->query .= ' ('.$this->_param('insert', 2).')';
+        } else {
+            $this->query = 'UPDATE ';
             $this->query .= $this->_table($this->table);
-            $this->query .= " SET ";
-            $this->query .= $this->_param("update");
+            $this->query .= ' SET ';
+            $this->query .= $this->_param('update');
             $this->query .= $this->join;
             $this->query .= $this->_where();
         }
 
-        $this->query .= ";";
+        $this->query .= ';';
 
         return $this->query;
     }
@@ -243,22 +261,23 @@ private function _set()
     public function set()
     {
         $this->_set();
-        return $this->query;
+        // return $this->query;
         return $this->records = Database::query($this->query);
     }
 
     /**
-     * generate DELETE statement
-     * @return Object SQL Query
+     * generate DELETE statement.
+     *
+     * @return object SQL Query
      */
     private function _delete()
     {
-        $this->query = "DELETE FROM ";
+        $this->query = 'DELETE FROM ';
         $this->query .= $this->_table($this->table);
         $this->query .= $this->_where();
         $this->query .= $this->_order();
         $this->query .= $this->limit;
-        $this->query .= ";";
+        $this->query .= ';';
 
         return $this->query;
     }
@@ -266,19 +285,22 @@ private function _delete()
     public function delete()
     {
         $this->_delete();
+
         return $this->query;
+
         return $this->records = Database::query($this->query);
     }
 
     /**
-     * generate TRUNCATE statement
-     * @return Object SQL Query
+     * generate TRUNCATE statement.
+     *
+     * @return object SQL Query
      */
     private function _truncate()
     {
-        $this->query = "TRUNCATE TABLE ";
+        $this->query = 'TRUNCATE TABLE ';
         $this->query .= $this->_table($this->table);
-        $this->query .= ";";
+        $this->query .= ';';
 
         return $this->query;
     }
@@ -286,20 +308,24 @@ private function _truncate()
     public function truncate()
     {
         $this->_truncate();
+
         return $this->query;
+
         return $this->records = Database::query($this->query);
     }
 
     public function record()
     {
         $this->get();
-        Module::import("QueryRecord");
+        Module::import('QueryRecord');
+
         return new QueryRecord($this->records);
     }
 
     private function _table()
     {
         $args = func_get_args();
+
         return "`{$args[0]}`";
     }
 
@@ -307,47 +333,50 @@ private function _col()
     {
         $args = func_get_args();
 
-        if(is_array($args[0]) && $args[1] != "string"){
+        if (is_array($args[0]) && $args[1] != 'string') {
             $temp = array();
-            foreach($args as $arg){
-                foreach($arg as $param){
+            foreach ($args as $arg) {
+                foreach ($arg as $param) {
                     array_push($temp, $this->_col($param));
                 }
             }
+
             return $temp;
         }
 
         if (is_callable($args[0])) {
-            $q = new QueryBuilder();
+            $q = new self();
             call_user_func($args[0], $q);
+
             return "( {$q->_get(true)} )";
         }
 
-        if(!is_array($args[0]))$args[0] = trim($args[0]);
-
-        if(strpos($args[0],'~') === 0){
-            return $this->_col(substr($args[0],1));
+        if (!is_array($args[0])) {
+            $args[0] = trim($args[0]);
+        }
 
-        }else if(substr_count($args[0],' as ') == 1 && !$args[1]){
-            $exp = explode(" as ",$args[0]);
+        if (strpos($args[0], '~') === 0) {
+            return $this->_col(substr($args[0], 1));
+        } elseif (substr_count($args[0], ' as ') == 1 && !$args[1]) {
+            $exp = explode(' as ', $args[0]);
         //    array_push($this->ascol, $exp[1]);
-            return $this->_col($exp[0]). " AS `{$exp[1]}`";
+            return $this->_col($exp[0])." AS `{$exp[1]}`";
 
         // }else if(in_array($args[0],$this->ascol)){
         //     return $this->_col($args[0],"single");
+        } elseif (substr_count($args[0], '.') == 1 && !$args[1]) {
+            $exp = explode('.', $args[0]);
 
-        }else if(substr_count($args[0],'.') == 1 && !$args[1]){
-            $exp = explode(".",$args[0]);
             return "`{$exp[0]}`.`{$exp[1]}`";
-
-        }else if($args[1] == "single"){
+        } elseif ($args[1] == 'single') {
             return "`{$args[0]}`";
-
-        }else if($args[1] == "string"){
-            if(is_array($args[0]))return "('".implode("', '", $args[0])."')";
-            else return "'".String::escape($args[0])."'";
-
-        }else{
+        } elseif ($args[1] == 'string') {
+            if (is_array($args[0])) {
+                return "('".implode("', '", $args[0])."')";
+            } else {
+                return "'".String::escape($args[0])."'";
+            }
+        } else {
             return "`{$this->table}`.`{$args[0]}`";
         }
     }
@@ -358,14 +387,14 @@ private function _group()
         $arr = array();
 
         if (!sizeof($this->group)) {
-            return "";
+            return '';
         }
 
         foreach ($this->group as $col) {
             array_push($arr, $this->_col($col));
         }
 
-        return " GROUP BY " . implode(", ", $arr);
+        return ' GROUP BY '.implode(', ', $arr);
     }
 
     private function _order()
@@ -374,14 +403,14 @@ private function _order()
         $arr = array();
 
         if (!sizeof($this->order)) {
-            return "";
+            return '';
         }
 
         foreach ($this->order as $col) {
-            array_push($arr, $this->_col($col[0]) . " {$col[1]}");
+            array_push($arr, $this->_col($col[0])." {$col[1]}");
         }
 
-        return " ORDER BY " . implode(", ", $arr);
+        return ' ORDER BY '.implode(', ', $arr);
     }
 
     private function _param()
@@ -390,34 +419,32 @@ private function _param()
         $arr = array();
 
         if (!sizeof($this->param)) {
-            return "*";
+            return '*';
         }
 
         //$this->param = $this->_col($this->param);
 
-        if($args[0] == 'insert'){
-            for ($i = $args[1]-1; $i < sizeof($this->param); $i+=2) {
-                array_push($arr, $this->_col($this->param[$i],$args[1]==1?"single":"string"));
+        if ($args[0] == 'insert') {
+            for ($i = $args[1] - 1; $i < sizeof($this->param); $i += 2) {
+                array_push($arr, $this->_col($this->param[$i], $args[1] == 1 ? 'single' : 'string'));
             }
-
-        }else if($args[0] == 'update'){
-            for ($i = 0; $i < sizeof($this->param); $i+=2) {
-                array_push($arr, $this->_col($this->param[$i],"single")." = ".$this->_col($this->param[$i+1],"string"));
+        } elseif ($args[0] == 'update') {
+            for ($i = 0; $i < sizeof($this->param); $i += 2) {
+                array_push($arr, $this->_col($this->param[$i], 'single').' = '.$this->_col($this->param[$i + 1], 'string'));
             }
-
-        }else{
+        } else {
             foreach ($this->param as $param) {
                 array_push($arr, $this->_col($param));
             }
         }
 
-        return implode(", ", $arr);
+        return implode(', ', $arr);
     }
 
     public function _where()
     {
         if (!strlen($this->where)) {
-            return "";
+            return '';
         }
 
         //else
@@ -428,33 +455,33 @@ private function _unionParse($args)
     {
         $args = func_get_args();
 
-        if($args[0] instanceof QueryBuilder){
-            return " UNION {$args[1]}" . $args[0]->_get(true);
-
-        }else if (is_callable($args[0])) {
-            $q = new QueryBuilder();
+        if ($args[0] instanceof self) {
+            return " UNION {$args[1]}".$args[0]->_get(true);
+        } elseif (is_callable($args[0])) {
+            $q = new self();
             call_user_func($args[0], $q);
-            return " UNION $args[1]" . $q->_get(true);
 
+            return " UNION $args[1]".$q->_get(true);
         }
 
-        return "";
+        return '';
     }
 
     private function _joinParse($args)
     {
-        $this->join_on = "";
-        $str = " JOIN ";
+        $this->join_on = '';
+        $str = ' JOIN ';
         $str .= $this->_table($args[0]);
         array_shift($args);
 
         if (is_callable($args[0])) {
-            $q = new QueryBuilder();
+            $q = new self();
             $q->table($this->table);
             call_user_func($args[0], $q);
+
             return $q->join_on;
-        }else{
-            call_user_func_array(array($this, "on"), $args);
+        } else {
+            call_user_func_array(array($this, 'on'), $args);
             $str .= $this->join_on;
         }
 
@@ -464,73 +491,75 @@ private function _joinParse($args)
     private function _whereParse($args)
     {
         if (is_callable($args[0])) {
-            $q = new QueryBuilder();
+            $q = new self();
             $q->table($this->table);
             call_user_func($args[0], $q);
+
             return "( {$q->where} )";
         }
 
-        return call_user_func_array(array($this, "_parseOperators"), $args);
+        return call_user_func_array(array($this, '_parseOperators'), $args);
     }
 
     private function _parseOperators()
     {
         $args = func_get_args();
 
-        $str = "";
+        $str = '';
 
-        if(!in_array($args[1], array("set", "inset")))
+        if (!in_array($args[1], array('set', 'inset'))) {
             $str .= $this->_col($args[0]);
+        }
 
         switch (strtolower($args[1])) {
             case '=':
-                $str .= " = ".$this->_col($args[2],"string");
+                $str .= ' = '.$this->_col($args[2], 'string');
                 break;
 
             case 'like':
-                $str .= " LIKE ".$this->_col($args[2],"string");
+                $str .= ' LIKE '.$this->_col($args[2], 'string');
                 break;
 
             case '!=':
-            $str .= " != ".$this->_col($args[2],"string");
+            $str .= ' != '.$this->_col($args[2], 'string');
             break;
 
             case '<>':
-                $str .= " <> ".$this->_col($args[2],"string");
+                $str .= ' <> '.$this->_col($args[2], 'string');
                 break;
 
             case 'lt':
             case '<':
             case '!>':
-                $str .= " < ".$this->_col($args[2],"string");
+                $str .= ' < '.$this->_col($args[2], 'string');
                 break;
 
             case 'lte':
             case '<=':
-                $str .= " <= ".$this->_col($args[2],"string");
+                $str .= ' <= '.$this->_col($args[2], 'string');
                 break;
 
             case 'lg':
             case '>':
             case '!<':
-                $str .= " > ".$this->_col($args[2],"string");
+                $str .= ' > '.$this->_col($args[2], 'string');
                 break;
 
             case 'lge':
             case '>=':
-                $str .= " > ".$this->_col($args[2],"string");
+                $str .= ' > '.$this->_col($args[2], 'string');
                 break;
 
             case 'is':
-                $str .= " IS ".strtoupper($args[2]);
+                $str .= ' IS '.strtoupper($args[2]);
                 break;
 
             case 'in':
-                $str .= " IN ".$this->_col($args[2],"string");
+                $str .= ' IN '.$this->_col($args[2], 'string');
                 break;
 
             case 'notin':
-                $str .= " NOT IN ".$this->_col($args[2],"string");
+                $str .= ' NOT IN '.$this->_col($args[2], 'string');
                 break;
 
             case 'bet':
@@ -540,30 +569,30 @@ private function _parseOperators()
             case 'notbetween':
             case '!><':
 
-                $b = in_array($args[1], array("between", "bet", "><")) ? "BETWEEN" : "NOT BETWEEN";
+                $b = in_array($args[1], array('between', 'bet', '><')) ? 'BETWEEN' : 'NOT BETWEEN';
 
-                if(is_array($args[2])){
-                    $str .= " {$b} " . $this->_col($args[2][0],"string") . " AND " . $this->_col($args[2][1],"string");
-                }else{
-                    $str .= " {$b} " . $this->_col($args[2],"string") . " AND " . $this->_col($args[3],"string");
+                if (is_array($args[2])) {
+                    $str .= " {$b} ".$this->_col($args[2][0], 'string').' AND '.$this->_col($args[2][1], 'string');
+                } else {
+                    $str .= " {$b} ".$this->_col($args[2], 'string').' AND '.$this->_col($args[3], 'string');
                 }
                 break;
 
             case 'set':
             case 'inset':
-                if(is_array($args[2])){
+                if (is_array($args[2])) {
                     $temp = array();
-                    foreach($args[2] as $v){
-                        array_push($temp, "FIND_IN_SET (".$this->_col($v,"string").",".$this->_col($args[0]).")");
+                    foreach ($args[2] as $v) {
+                        array_push($temp, 'FIND_IN_SET ('.$this->_col($v, 'string').','.$this->_col($args[0]).')');
                     }
-                    $str .= "( " . implode(" AND ", $temp) . ")";
-                }else{
-                    $str .= "FIND_IN_SET (".$this->_col($args[2],"string").",".$this->_col($args[0]).")";
+                    $str .= '( '.implode(' AND ', $temp).')';
+                } else {
+                    $str .= 'FIND_IN_SET ('.$this->_col($args[2], 'string').','.$this->_col($args[0]).')';
                 }
                 break;
 
             default:
-                $str .= " = ".$this->_col($args[1],"string");
+                $str .= ' = '.$this->_col($args[1], 'string');
                 break;
         }
 
diff --git a/system/module/Router.php b/system/module/Router.php
index db064e2..fb648e3 100644
--- a/system/module/Router.php
+++ b/system/module/Router.php
@@ -1,124 +1,149 @@
-<?php  if (!defined('VERSION'))exit('Direct access to this location is not permitted.');
+<?php
+ if (!defined('VERSION')) {
+     exit('Direct access to this location is not permitted.');
+ }
 /**
- * Purecis Router Module
+ * Purecis Router Module.
  *
- * control URL Parameters 
+ * control URL Parameters
  *
- * @package		codeHive
- * @subpackage	Module
  * @category	Libraries
+ *
  * @author		Tamer Zorba
+ *
  * @link		http://purecis.com/
  */
+class Router
+{
+    /**
+     * List of arrays.
+     */
+    protected static $callback;
+    protected static $router;
+
+    public static function refresh($to = false, $time = 0)
+    {
+        //$to = Request::domain(true,$to);
+        die("<meta http-equiv='refresh' content='{$time}; url={$to}' />");
+
+        return $to;
+    }
+
+    public static function get($name = 0)
+    {
+        $ret = false;
+        $url = Request::parser();
+
+        if (isset(self::$router[$url[0]])) {
+            $rarr = self::$router[$url[0]];
+        } else {
+            $rarr = (isset(self::$router['_otherwise'])) ? self::$router['_otherwise'] : array();
+        }
+        if ($name == 'pagename') {
+            $ret = $url[0];
+        } else {
+            if ($name !== 0 && sizeof($rarr) > 0) {
+                $arrSearch = array_search($name, $rarr);
+                if ($arrSearch !== false) {
+                    if (isset($url[$arrSearch + 1])) {
+                        $ret = $url[$arrSearch + 1];
+                    }
+                }
+            }
+        }
+
+        return String::escape($ret);
+    }
+
+    public static function on($name, $val, $cb = false)
+    {
+        $name = urlencode($name);
+
+        if ($cb != false) {
+            self::$router[$name] = $val;
+        } else {
+            //self::$router[$name] = array();
+            $cb = $val;
+        }
+
+        self::$callback[$name] = $cb;
+
+        return self::$router;
+    }
+
+    public static function parse($arr)
+    {
+        if (!is_array($arr)) {
+            $arr = array($arr);
+        }
+        $mod = self::get('pagename');
+        self::$router[$mod] = $arr;
+        $cls = new stdClass();
+        if (isset(self::$router[$mod])) {
+            foreach (self::$router[$mod] as $k) {
+                $cls->$k = self::get($k);
+            }
+        }
+
+        return $cls;
+    }
+
+    public static function otherwise($val, $cb = false)
+    {
+        if ($cb != false) {
+            self::$router['_otherwise'] = array_merge($val, array('pagename'));
+        } else {
+            $cb = $val;
+        }
+
+        self::$callback['_otherwise'] = $cb;
+
+        return self::$router;
+    }
+
+    public static function callback()
+    {
+        //$mod = Request::get('pagename');
+        $mod = Request::parser(0);
+
+        $_exist = isset(self::$callback[$mod]) ? true : false;
+        if (!$_exist) {
+            global $config;
+            $path = "{$config['app']}/controller/{$mod}.php";
+            if (is_file($path)) {
+                require_once $path;
+                $_exist = isset(self::$callback[$mod]) ? true : false;
+            }
+        }
+
+        if (!$_exist) {
+            $mod = '_otherwise';
+            $_exist = isset(self::$callback[$mod]) ? true : false;
+        }
+
+        if ($_exist) {
+            $cls = new stdClass();
+            if (isset(self::$router[$mod])) {
+                foreach (self::$router[$mod] as $k) {
+                    $cls->$k = self::get($k);
+                }
+            }
+            echo Controller::trigger(self::$callback[$mod], $cls);
+        } else {
+            // 404, 403...
+            //post parser
+            //get page with that name if not then search for post
+            if (Module::used('post')) {
+                post::parser();
+            }
+        }
+    }
 
-class Router{
-
-	/**
-	 * List of arrays
-	 *
-	 * @access protected
-	 */
-	protected static $callback;
-	protected static $router;
-
-	public static function refresh($to=false,$time=0){
-		//$to = Request::domain(true,$to);
-		die("<meta http-equiv='refresh' content='{$time}; url={$to}' />");
-		return $to;
-	}
-
-	public static function get($name=0){
-		$ret = false;
-		$url = Request::parser();
-
-		if(isset(self::$router[$url[0]])){
-			$rarr = self::$router[$url[0]];
-		}else{
-			$rarr = (isset(self::$router['_otherwise']))?self::$router['_otherwise']:array();
-		}
-		if($name == 'pagename'){
-			$ret = $url[0];
-		}else{
-			if($name !== 0 && sizeof($rarr) > 0){
-				$arrSearch = array_search($name, $rarr);
-				if($arrSearch !== false){
-					if(isset($url[$arrSearch+1]))$ret = $url[$arrSearch+1];
-				}
-			}
-		}
-		return String::escape($ret);
-	}
-	
-	public static function on($name,$val,$cb=false){
-		$name = urlencode($name);
-
-		if($cb != false){
-			self::$router[$name] = $val;
-		}else{
-			//self::$router[$name] = array();
-			$cb = $val;
-		}
-		
-		self::$callback[$name] = $cb;
-		
-		return self::$router;
-	}
-
-	public static function parse($arr){
-		if(!is_array($arr))$arr = array($arr);
-		$mod = self::get("pagename");
-		self::$router[$mod] = $arr;
-		$cls = new stdClass();
-		if(isset(self::$router[$mod]))foreach(self::$router[$mod] as $k)$cls->$k = self::get($k);
-		return $cls;
-	}
-	
-	public static function otherwise($val,$cb=false){
-		
-		if($cb != false)self::$router['_otherwise'] = array_merge($val,array("pagename"));
-		else $cb = $val;
-
-		self::$callback['_otherwise'] = $cb;
-		
-		return self::$router;
-	}
-
-	public static function callback(){
-		//$mod = Request::get('pagename');
-		$mod = Request::parser(0);
-		
-		$_exist = isset(self::$callback[$mod])?true:false;
-		if(!$_exist){
-			global $config;
-			$path = "{$config['app']}/controller/{$mod}.php";
-			if(is_file($path)){
-				require_once $path;
-				$_exist = isset(self::$callback[$mod])?true:false;
-			}
-		}
-		
-		if(!$_exist){
-			$mod = '_otherwise';
-			$_exist = isset(self::$callback[$mod])?true:false;
-		}
-
-		if($_exist){
-			$cls = new stdClass();
-			if(isset(self::$router[$mod]))foreach(self::$router[$mod] as $k)$cls->$k = self::get($k);
-			echo Controller::trigger(self::$callback[$mod],$cls);
-		}else{
-			// 404, 403... 
-			//post parser
-			//get page with that name if not then search for post
-			if(Module::used("post"))post::parser();
-		}
-	}
-
-
-	public static function __shutdown(){
-		self::callback();
-	}
+    public static function __shutdown()
+    {
+        self::callback();
+    }
 }
 
 /* End of file Router.php */
-/* Location: ./system/module/Router.php */
\ No newline at end of file
+/* Location: ./system/module/Router.php */

From bcc650a0412f4e86b2c7ee42ae862f484b9d377a Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 5 Apr 2016 14:37:35 +0300
Subject: [PATCH 048/114] fix api bug : old methods stopped

---
 system/module/API.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/module/API.php b/system/module/API.php
index 6fe036f..f3efbd0 100644
--- a/system/module/API.php
+++ b/system/module/API.php
@@ -48,7 +48,7 @@ public static function __bootstrap()
             }
 
             // search in module controller
-            if (!isset(self::$apis[$router->fire])) {
+            if (!isset(self::$apis[$router->fire]) && !is_file($path)) {
                 $mod = Module::path($router->fire);
                 $a = explode('.', $router->fire);
                 $name = end($a);

From cb7dc415be0f8d4a05c21f92cf984745355b7742 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 12 Apr 2016 10:18:23 +0300
Subject: [PATCH 049/114] request, internationalization, QueryBuilder and Query
 update

Request now support multiple parameters
Internationalization is module
QueryBuilder support offset and with functions
Query access table emediatly
---
 system/core/Request.php                       | 18 +++---
 .../{core => module}/Internationalization.php |  0
 system/module/Query.php                       |  3 +
 system/module/QueryBuilder.php                | 59 ++++++++++++++++---
 4 files changed, 62 insertions(+), 18 deletions(-)
 rename system/{core => module}/Internationalization.php (100%)

diff --git a/system/core/Request.php b/system/core/Request.php
index 5f062ba..37d9f71 100644
--- a/system/core/Request.php
+++ b/system/core/Request.php
@@ -2,7 +2,7 @@
 /**
  * Purecis Request Class
  *
- * This class control all the request attrbutes and protect 
+ * This class control all the request attrbutes and protect
  * them from known attac and injection
  *
  * @package		codeHive
@@ -71,7 +71,7 @@ public static function parser($ret=false){
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	public static function method(){
 		$method = $_SERVER['REQUEST_METHOD'];
         if ($method == 'POST' && array_key_exists('HTTP_X_HTTP_METHOD', $_SERVER)) {
@@ -251,9 +251,9 @@ private static function updateQuerystring($querystring, $param, $value){
 	 * @param	boolean if the request is array or not
 	 * @return	mixen
 	 */
-	public static function get($name=0){
-		//check array type
-		//if($getArray)return $_REQUEST[$name];// return array without parsing
+	public static function get($name=null){
+        $name = func_get_args();
+		if(sizeof($name) == 1)$name = $name[0];
 
 		if(is_array($name)){
 			$cls = new stdClass();
@@ -273,7 +273,7 @@ public static function get($name=0){
 		}
 
 		$url = self::parser();
-		$ret = false;
+		$ret = null;
 		if($name == 'pagename')return $url[0];
 
 		// check Router
@@ -305,13 +305,13 @@ public static function get($name=0){
 		//	if(is_array($ret))echo "$name is array";
 		//		$ret = implode(",",$ret);
 		//	}else{
-				$ret = String::escape($ret);				
+				$ret = String::escape($ret);
 		//	}
 		}
 
 		return $ret;
 	}
-	
+
 	// $_SERVER['REQUEST_METHOD'] for restfull api GET, POST, PUT or DELETE)
 }
 
@@ -324,4 +324,4 @@ public static function get($name=0){
 
 
 /* End of file Request.php */
-/* Location: ./system/core/Request.php */
\ No newline at end of file
+/* Location: ./system/core/Request.php */
diff --git a/system/core/Internationalization.php b/system/module/Internationalization.php
similarity index 100%
rename from system/core/Internationalization.php
rename to system/module/Internationalization.php
diff --git a/system/module/Query.php b/system/module/Query.php
index 8b58161..400f0eb 100644
--- a/system/module/Query.php
+++ b/system/module/Query.php
@@ -736,6 +736,9 @@ public static function on($table)
 
         return $bldr->table($table);
     }
+    public static function table($table){
+        return self::on($table);
+    }
 }
 
 /* End of file Query.php */
diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index 2c921d4..ee3a39c 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -32,10 +32,12 @@ class QueryBuilder
     private $group = array();
     private $order = array();
     private $limit = '';
+    private $offset = '';
     private $query;
     private $records;
     private $union = '';
     public $join_on = '';
+    private $with = array();
 
     // --------------------------------------------------------------------
     public function __get($property)
@@ -171,6 +173,8 @@ public function order()
     public function limit()
     {
         $args = func_get_args();
+        if(!is_numeric($args[0]) || (isset($args[1]) && !is_numeric($args[1])))return $this;
+
         if (sizeof($args) == 2) {
             $this->limit = " LIMIT {$args[0]}, {$args[1]}";
         } else {
@@ -180,6 +184,17 @@ public function limit()
         return $this;
     }
 
+    public function offset()
+    {
+        $args = func_get_args();
+        if(!is_numeric($args[0]))return $this;
+
+        if(empty($this->limit))$this->limit =  " LIMIT 10";
+        $this->offset = " OFFSET {$args[0]}";
+
+        return $this;
+    }
+
     public function union()
     {
         $args = func_get_args();
@@ -196,6 +211,31 @@ public function unionAll()
         return $this;
     }
 
+    public function with()
+    {
+        $args = func_get_args();
+        $this->join_on = '';
+        $str = ' JOIN ';
+        $str .= $this->_table($args[0]);
+        array_shift($args);
+
+        if (is_callable($args[0])) {
+            $q = new self();
+            $q->table($this->table);
+            call_user_func($args[0], $q);
+
+            return $q->join_on;
+        } else {
+            call_user_func_array(array($this, 'on'), $args);
+            $str .= $this->join_on;
+        }
+
+        return $str;
+    }
+    private function withParse(){
+
+    }
+
     /**
      * generate SELECT statement.
      *
@@ -214,8 +254,9 @@ public function _get()
         $this->query .= $this->_group();
         $this->query .= $this->_order();
         $this->query .= $this->limit;
+        $this->query .= $this->offset;
         $this->query .= $this->union;
-        if (!$args[0]) {
+        if (!isset($args[0])) {
             $this->query .= ';';
         }
 
@@ -225,7 +266,7 @@ public function _get()
     public function get()
     {
         $this->_get();
-
+        // TODO : append with steatment
         return $this->records = Database::query($this->query);
     }
 
@@ -357,20 +398,20 @@ private function _col()
 
         if (strpos($args[0], '~') === 0) {
             return $this->_col(substr($args[0], 1));
-        } elseif (substr_count($args[0], ' as ') == 1 && !$args[1]) {
+        } elseif (substr_count($args[0], ' as ') == 1 && !isset($args[1])) {
             $exp = explode(' as ', $args[0]);
         //    array_push($this->ascol, $exp[1]);
             return $this->_col($exp[0])." AS `{$exp[1]}`";
 
         // }else if(in_array($args[0],$this->ascol)){
         //     return $this->_col($args[0],"single");
-        } elseif (substr_count($args[0], '.') == 1 && !$args[1]) {
+    } elseif (substr_count($args[0], '.') == 1 && !isset($args[1])) {
             $exp = explode('.', $args[0]);
 
             return "`{$exp[0]}`.`{$exp[1]}`";
-        } elseif ($args[1] == 'single') {
+        } elseif (isset($args[1]) && $args[1] == 'single') {
             return "`{$args[0]}`";
-        } elseif ($args[1] == 'string') {
+        } elseif (isset($args[1]) && $args[1] == 'string') {
             if (is_array($args[0])) {
                 return "('".implode("', '", $args[0])."')";
             } else {
@@ -424,11 +465,11 @@ private function _param()
 
         //$this->param = $this->_col($this->param);
 
-        if ($args[0] == 'insert') {
+        if (isset($args[0]) && $args[0] == 'insert') {
             for ($i = $args[1] - 1; $i < sizeof($this->param); $i += 2) {
                 array_push($arr, $this->_col($this->param[$i], $args[1] == 1 ? 'single' : 'string'));
             }
-        } elseif ($args[0] == 'update') {
+        } elseif (isset($args[0]) && $args[0] == 'update') {
             for ($i = 0; $i < sizeof($this->param); $i += 2) {
                 array_push($arr, $this->_col($this->param[$i], 'single').' = '.$this->_col($this->param[$i + 1], 'string'));
             }
@@ -470,7 +511,7 @@ private function _unionParse($args)
     private function _joinParse($args)
     {
         $this->join_on = '';
-        $str = ' JOIN ';
+        $str = ' LEFT JOIN ';
         $str .= $this->_table($args[0]);
         array_shift($args);
 

From ec8564b7900b19f36df22e03a62270d29e4c102b Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 12 Apr 2016 16:17:40 +0300
Subject: [PATCH 050/114] fix where in array, support remove, PSR-2

---
 system/module/QueryBuilder.php | 45 ++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index ee3a39c..8c9d88d 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -173,7 +173,9 @@ public function order()
     public function limit()
     {
         $args = func_get_args();
-        if(!is_numeric($args[0]) || (isset($args[1]) && !is_numeric($args[1])))return $this;
+        if (!is_numeric($args[0]) || (isset($args[1]) && !is_numeric($args[1]))) {
+            return $this;
+        }
 
         if (sizeof($args) == 2) {
             $this->limit = " LIMIT {$args[0]}, {$args[1]}";
@@ -187,9 +189,13 @@ public function limit()
     public function offset()
     {
         $args = func_get_args();
-        if(!is_numeric($args[0]))return $this;
+        if (!is_numeric($args[0])) {
+            return $this;
+        }
 
-        if(empty($this->limit))$this->limit =  " LIMIT 10";
+        if (empty($this->limit)) {
+            $this->limit = ' LIMIT 10';
+        }
         $this->offset = " OFFSET {$args[0]}";
 
         return $this;
@@ -232,8 +238,8 @@ public function with()
 
         return $str;
     }
-    private function withParse(){
-
+    private function withParse()
+    {
     }
 
     /**
@@ -311,7 +317,7 @@ public function set()
      *
      * @return object SQL Query
      */
-    private function _delete()
+    private function _remove()
     {
         $this->query = 'DELETE FROM ';
         $this->query .= $this->_table($this->table);
@@ -323,11 +329,9 @@ private function _delete()
         return $this->query;
     }
 
-    public function delete()
+    public function remove()
     {
-        $this->_delete();
-
-        return $this->query;
+        $this->_remove();
 
         return $this->records = Database::query($this->query);
     }
@@ -389,13 +393,12 @@ private function _col()
             $q = new self();
             call_user_func($args[0], $q);
 
-            return "( {$q->_get(true)} )";
+            return $q->_get(true);
         }
 
         if (!is_array($args[0])) {
             $args[0] = trim($args[0]);
         }
-
         if (strpos($args[0], '~') === 0) {
             return $this->_col(substr($args[0], 1));
         } elseif (substr_count($args[0], ' as ') == 1 && !isset($args[1])) {
@@ -405,7 +408,7 @@ private function _col()
 
         // }else if(in_array($args[0],$this->ascol)){
         //     return $this->_col($args[0],"single");
-    } elseif (substr_count($args[0], '.') == 1 && !isset($args[1])) {
+        } elseif (substr_count($args[0], '.') == 1 && !isset($args[1])) {
             $exp = explode('.', $args[0]);
 
             return "`{$exp[0]}`.`{$exp[1]}`";
@@ -596,11 +599,17 @@ private function _parseOperators()
                 break;
 
             case 'in':
-                $str .= ' IN '.$this->_col($args[2], 'string');
-                break;
-
             case 'notin':
-                $str .= ' NOT IN '.$this->_col($args[2], 'string');
+                $b = in_array($args[1], array('in')) ? 'IN' : 'NOT IN';
+                if (is_array($args[2])) {
+                    $temp = array();
+                    foreach ($args[2] as $v) {
+                        array_push($temp, $this->_col($v, 'string'));
+                    }
+                    $str .= " {$b} ( ".implode(', ', $temp).' )';
+                } else {
+                    $str .= " {$b} ( ".$this->_col($args[2], 'string').' )';
+                }
                 break;
 
             case 'bet':
@@ -610,8 +619,6 @@ private function _parseOperators()
             case 'notbetween':
             case '!><':
 
-                $b = in_array($args[1], array('between', 'bet', '><')) ? 'BETWEEN' : 'NOT BETWEEN';
-
                 if (is_array($args[2])) {
                     $str .= " {$b} ".$this->_col($args[2][0], 'string').' AND '.$this->_col($args[2][1], 'string');
                 } else {

From 45507a66215ecfda638cb15e4a5e80a522d4fe94 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 16 Apr 2016 20:12:11 +0300
Subject: [PATCH 051/114] QueryBuilder now support with statement

---
 system/module/QueryBuilder.php | 92 ++++++++++++++++++++++++++--------
 1 file changed, 70 insertions(+), 22 deletions(-)

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index 8c9d88d..0da2139 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -25,8 +25,7 @@ class QueryBuilder
      * @var mixen
      */
     private $table;
-    private $param = array();
-    // private $ascol  = array();
+    public $param = array();
     public $where = '';
     private $join = '';
     private $group = array();
@@ -42,9 +41,9 @@ class QueryBuilder
     // --------------------------------------------------------------------
     public function __get($property)
     {
-        echo "Getting '$property'\n";
+        // echo "Getting '$property'\n";
 
-        return 123;
+        // return 123;
     }
     /**
      * ajax table.
@@ -220,26 +219,70 @@ public function unionAll()
     public function with()
     {
         $args = func_get_args();
-        $this->join_on = '';
-        $str = ' JOIN ';
-        $str .= $this->_table($args[0]);
-        array_shift($args);
 
-        if (is_callable($args[0])) {
-            $q = new self();
-            $q->table($this->table);
-            call_user_func($args[0], $q);
+        array_push($this->with, $args);
 
-            return $q->join_on;
-        } else {
-            call_user_func_array(array($this, 'on'), $args);
-            $str .= $this->join_on;
+        return $this;
+    }
+    public function relation()
+    {
+        $args = func_get_args();
+        $col = isset($args[2]) ? $args[2] : 'id';
+        $this->withFirstColumn = isset($this->withFirstColumn) ? $this->withFirstColumn : $col;
+        $this->withSecColumn = $args[0];
+
+        // TODO: Save Seperator `=`, `in`, `not in`, `!=`
+        if (!isset($args[1]) || (isset($args[1]) && $args[1] == '=')) {
+            $this->masterQuery->param = [];
+            array_push($this->masterQuery->param, $col);
+            $this->where($args[0], 'in', $this->masterQuery);
         }
 
-        return $str;
+        return $this;
     }
     private function withParse()
     {
+        foreach ($this->with as $args) {
+            $table = $args[0]; // if is string only
+            $as = $args[0];
+
+            $q = new self();
+            $q->table($table);
+
+            $q->masterQuery = clone $this;
+
+            if (is_callable($args[1])) {
+                call_user_func($args[1], $q);
+                if (array_search($q->withSecColumn, $q->param) === false) {
+                    array_push($q->param, $q->withSecColumn);
+                }
+            } else {
+                array_shift($args);
+                call_user_func_array(array($q, 'relation'), $args);
+            }
+
+            $newQuery = $q->get();
+
+            foreach ($this->records->record as $record) {
+                $record->{$as} = array_filter(
+                $newQuery->record,
+                function ($e) use ($q, $record) {
+                    // TODO : support `in` method
+                    // TODO : shift name if send with dot
+                    return $e->{$q->withSecColumn} == $record->{$q->withFirstColumn};
+                });
+                // TODO: remove the sec column from the child if not sended
+            }
+        }
+
+        if (is_string($this->records->sql)) {
+            $temp = $this->records->sql;
+            $this->records->sql = [];
+            array_push($this->records->sql, $temp);
+        }
+        array_push($this->records->sql, $newQuery->sql);
+
+        return $this;
     }
 
     /**
@@ -272,8 +315,10 @@ public function _get()
     public function get()
     {
         $this->_get();
-        // TODO : append with steatment
-        return $this->records = Database::query($this->query);
+        $this->records = Database::query($this->query);
+        $this->withParse();
+
+        return $this->records;
     }
 
     /**
@@ -583,13 +628,13 @@ private function _parseOperators()
                 $str .= ' <= '.$this->_col($args[2], 'string');
                 break;
 
-            case 'lg':
+            case 'gt':
             case '>':
             case '!<':
                 $str .= ' > '.$this->_col($args[2], 'string');
                 break;
 
-            case 'lge':
+            case 'gte':
             case '>=':
                 $str .= ' > '.$this->_col($args[2], 'string');
                 break;
@@ -601,7 +646,10 @@ private function _parseOperators()
             case 'in':
             case 'notin':
                 $b = in_array($args[1], array('in')) ? 'IN' : 'NOT IN';
-                if (is_array($args[2])) {
+
+                if ($args[2] instanceof self) {
+                    $str .= " {$b} ( ".$args[2]->_get(true).' )';
+                } elseif (is_array($args[2])) {
                     $temp = array();
                     foreach ($args[2] as $v) {
                         array_push($temp, $this->_col($v, 'string'));

From c7c299313db99650a3539827cb2cbb295a0fc729 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 16 Apr 2016 20:18:26 +0300
Subject: [PATCH 052/114] fix router object callback

---
 system/module/Router.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/system/module/Router.php b/system/module/Router.php
index fb648e3..abbabe0 100644
--- a/system/module/Router.php
+++ b/system/module/Router.php
@@ -128,7 +128,12 @@ public static function callback()
                     $cls->$k = self::get($k);
                 }
             }
-            echo Controller::trigger(self::$callback[$mod], $cls);
+
+            $cb = Controller::trigger(self::$callback[$mod], $cls);
+            if (is_array($cb) || is_object($cb)) {
+                $cb = json_encode($cb);
+            }
+            echo $cb;
         } else {
             // 404, 403...
             //post parser

From b9040bf4d0af74350a3a2b875148e93a20e8b521 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 16 Apr 2016 20:24:22 +0300
Subject: [PATCH 053/114] fix with insider call if not sended

---
 system/module/QueryBuilder.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index 0da2139..b71c230 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -273,14 +273,14 @@ function ($e) use ($q, $record) {
                 });
                 // TODO: remove the sec column from the child if not sended
             }
-        }
 
-        if (is_string($this->records->sql)) {
-            $temp = $this->records->sql;
-            $this->records->sql = [];
-            array_push($this->records->sql, $temp);
+            if (is_string($this->records->sql)) {
+                $temp = $this->records->sql;
+                $this->records->sql = [];
+                array_push($this->records->sql, $temp);
+            }
+            array_push($this->records->sql, $newQuery->sql);
         }
-        array_push($this->records->sql, $newQuery->sql);
 
         return $this;
     }

From f016c7fe95748b48bdf8ac01ab0b967879c71e28 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 16 Apr 2016 20:27:07 +0300
Subject: [PATCH 054/114] check size of sended params before the limit with sec
 column

---
 system/module/QueryBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index b71c230..c0ae9af 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -253,7 +253,7 @@ private function withParse()
 
             if (is_callable($args[1])) {
                 call_user_func($args[1], $q);
-                if (array_search($q->withSecColumn, $q->param) === false) {
+                if (array_search($q->withSecColumn, $q->param) === false && sizeof($q->param)) {
                     array_push($q->param, $q->withSecColumn);
                 }
             } else {

From 885d71b32a25d7085b0c05128091f605fbc696df Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 18 Apr 2016 14:15:20 +0300
Subject: [PATCH 055/114] fix essential mode delete

---
 system/module/Query.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/module/Query.php b/system/module/Query.php
index 400f0eb..039270e 100644
--- a/system/module/Query.php
+++ b/system/module/Query.php
@@ -422,6 +422,7 @@ public static function execute($arr)
         $sql = implode($sql, ' ').';';
 
         // Extra SQL
+        if(!isset($config['database']['essential']) || !$config['database']['essential']){
         if ($arr['type'] == 'insert') {
             $values = array();
             foreach ($arr['data'] as $k => $v) {
@@ -516,7 +517,7 @@ public static function execute($arr)
             }
             // delete from meta where `oid` = OLD.id  and `table` = 'terms'; // as trigger
         }
-
+        } // end of extra sql
         //echo $sql;
 
         //return array();

From e3bfab8d61e7646b41d8caa292ca3d60ff3906ba Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 18 Apr 2016 19:27:22 +0300
Subject: [PATCH 056/114] update to record

---
 system/module/Query.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/module/Query.php b/system/module/Query.php
index 039270e..5be6565 100644
--- a/system/module/Query.php
+++ b/system/module/Query.php
@@ -461,8 +461,8 @@ public static function execute($arr)
                 ));
                 //all
                 $sid = array();
-                foreach ($sid_q->data as $d) {
-                    array_push($sid, $d['id']);
+                foreach ($sid_q->record as $d) {
+                    array_push($sid, $d->id);
                 }
             }
 

From a76e678a9c62d03025fb6d878eb6086e4e77ff63 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 18 Apr 2016 19:27:33 +0300
Subject: [PATCH 057/114] remove forgetten dumb

---
 system/module/API.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/module/API.php b/system/module/API.php
index f3efbd0..0cf2f0e 100644
--- a/system/module/API.php
+++ b/system/module/API.php
@@ -80,7 +80,6 @@ public static function __bootstrap()
             if (is_file($path)) {
                 require_once $path;
             }
-            var_dump(self::$apis);
             if (isset(self::$apis[$name])) {
                 //check is callable
                 return call_user_func_array(self::$apis[$name], array(&$scope, $router));

From 13a44677b0d8ba50da0b4988dc064969f6c5de63 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 18 Apr 2016 19:27:51 +0300
Subject: [PATCH 058/114] adding support to appear as function

---
 system/module/QueryBuilder.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index c0ae9af..b01aa88 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -224,6 +224,11 @@ public function with()
 
         return $this;
     }
+    public function appearAs(){
+        $args = func_get_args();
+        $this->appear = $args[0];
+        return $this;
+    }
     public function relation()
     {
         $args = func_get_args();
@@ -244,10 +249,10 @@ private function withParse()
     {
         foreach ($this->with as $args) {
             $table = $args[0]; // if is string only
-            $as = $args[0];
 
             $q = new self();
             $q->table($table);
+            $q->appear = $args[0];
 
             $q->masterQuery = clone $this;
 
@@ -264,13 +269,13 @@ private function withParse()
             $newQuery = $q->get();
 
             foreach ($this->records->record as $record) {
-                $record->{$as} = array_filter(
+                $record->{$q->appear} = array_values(array_filter(
                 $newQuery->record,
                 function ($e) use ($q, $record) {
                     // TODO : support `in` method
                     // TODO : shift name if send with dot
                     return $e->{$q->withSecColumn} == $record->{$q->withFirstColumn};
-                });
+                }));
                 // TODO: remove the sec column from the child if not sended
             }
 

From fa38f2ba9f45b61735be65f257e2fd1c8a98e16b Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 18 Apr 2016 19:28:11 +0300
Subject: [PATCH 059/114] fix query fetch to object

---
 system/module/Upload.php | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/system/module/Upload.php b/system/module/Upload.php
index ccce643..17b93be 100644
--- a/system/module/Upload.php
+++ b/system/module/Upload.php
@@ -2,7 +2,7 @@
 /**
  * Purecis Upload Class
  *
- * This class Manage Upload Connections & Queries 
+ * This class Manage Upload Connections & Queries
  *
  * @package		codeHive
  * @subpackage	Core
@@ -35,7 +35,7 @@ public static function push($arr=array()){
 		//ini_set( 'memory_limit', '200M' );
 		//ini_set('upload_max_filesize', UPLOAD_MAX_SIZE.'M');
 		//ini_set('post_max_size', UPLOAD_MAX_SIZE.'M');
-		//ini_set('max_input_time', 600);  
+		//ini_set('max_input_time', 600);
 		//ini_set('max_execution_time', 600);
 		/*
 		$arr = array(
@@ -43,13 +43,13 @@ public static function push($arr=array()){
 		//	'allowed' => 'JPG',
 		//	'folder' => 'images',
 		//	'tags' => 'image',
-			
+
 		//	'resize' => array(400),
 		//	'thumbs' => true,
 		//	'target' => 'filename',
 		//	'library' => 'library_path',
 		);*/
-	
+
 		global $config;
 
 		if(!isset($arr['name']))$arr['name'] = 'file';
@@ -90,7 +90,7 @@ public static function push($arr=array()){
 		}
 
 		$cls = new stdClass();
-		
+
 		Module::import("User");
 		if(User::hasRule('upload-private-ext')){
 			$allowed = explode(',',strtoupper($config['upload']['private']));
@@ -99,7 +99,7 @@ public static function push($arr=array()){
 			$allowed = explode(',',strtoupper($config['upload']['public']));
 			$type = 'UPLOAD_PUBLIC_EXT';
 		};
-		
+
 		if(isset($arr['allowed'])){
 			$al = true;
 			$al1 = explode(',', strtoupper($arr['allowed']));
@@ -125,7 +125,7 @@ public static function push($arr=array()){
 			$cls->status = false;
 			return $cls;
 		}
-		
+
 		$filename = $_FILES[$arr['name']]['name'];
 		$ext = strtoupper(pathinfo($filename, PATHINFO_EXTENSION));
 		if(!in_array($ext,$allowed) ) {
@@ -232,7 +232,7 @@ public static function push($arr=array()){
 		if(in_array($ext,explode(',',"MP4,MOV,AVI,FLV,ASF")) && VIDEO_FIT != false){
 			$dir = dirname(dirname(dirname(__FILE__)));
 			$file[test] = "{$dir}/{$target}.{$ext}";
-			
+
 			//thumb
 			if(in_array('THUMBS', explode(',', VIDEO_FIT))){
 				self::shell_execute("ffmpeg"," -y -i {$dir}/{$target}.{$ext} -ss 5 -vframes 1 -r 1 -vf scale=854x480 -f image2 {$target}_thumb1.jpg");
@@ -282,9 +282,9 @@ public static function push($arr=array()){
 
 		if(!isset($arr['author'])){
 			$user = User::info();
-			$arr['author'] = $user->status?$user->data[0]['id']:0;
+			$arr['author'] = $user->status?$user->record[0]->id:0;
 		}
-		
+
 		Module::import("Query");
 		$q = Query::set('library',array(
 			'data' 		=> array(
@@ -363,7 +363,7 @@ public static function link($arr=array()){
 	 * @return void
 	 */
 	public static function unlink($arr=array()){
-		/*		
+		/*
 		$arr = array(
 			"library" => [1,2,3],
 			"taxonomy" => "",// tax to remove
@@ -406,11 +406,11 @@ public static function get($arr=array()){
 			//"objects" => [4,5,6],
 			//"author" => ids
 		//);
-		
+
 		// todo
 		// meta , taxonomy alone .. or with library and author
 		//
-
+		$sql = array();
 		if(isset($arr['library']) || isset($arr['author'])){
 			$sql = array(
 				"where" => array()
@@ -423,7 +423,7 @@ public static function get($arr=array()){
 				if(is_array($arr['author']))$arr['author'] = implode(",",$arr['author']);
 				$sql['where']['author'] = ":in:".$arr['author'];
 			}
-			
+
 		}else if(isset($arr['objects'])){
 			if(is_array($arr['objects']))$arr['objects'] = implode(",",$arr['objects']);
 			$sql = array(
@@ -459,7 +459,7 @@ public static function remove($ids,$force=false){
 			$cls->status = false;
 			$cls->error = "id not set";
 			$cls->code = 1;
-			return $cls;			
+			return $cls;
 		}
 		if(!is_array($ids))$ids = array($ids);
 		$ids = implode(",", $ids);
@@ -471,11 +471,11 @@ public static function remove($ids,$force=false){
 			if(!$user->status)return $user;
 		}
 		$where = array("id"=>":in:{$ids}");
-		if(!$force)$where['author'] = $user->data[0]['id'];
+		if(!$force)$where['author'] = $user->record[0]->id;
 
 		$q = Query::get("library",array("where"=>$where));
-		foreach($q->data as $row){
-			$data = json_decode($row['path']);
+		foreach($q->record as $row){
+			$data = json_decode($row->path);
 			foreach($data as $img)if(is_file($img))unlink($img);
 		}
 
@@ -484,4 +484,4 @@ public static function remove($ids,$force=false){
 }
 
 /* End of file Upload.php */
-/* Location: ./system/module/Upload.php */
\ No newline at end of file
+/* Location: ./system/module/Upload.php */

From efa6595c3afd522cb50add131d52c396434a31e7 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 18 Apr 2016 19:28:34 +0300
Subject: [PATCH 060/114] fix query fetch to object and rewrite hasRule

---
 system/module/User.php | 59 ++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 31 deletions(-)

diff --git a/system/module/User.php b/system/module/User.php
index 3b104e0..ebe2e9a 100644
--- a/system/module/User.php
+++ b/system/module/User.php
@@ -54,10 +54,10 @@ public static function register($arr,$login=false){
 			return $cls;
 		}
 		$arr['pass'] = self::encpass($arr['pass']);
-		
+
 		$arr['registered'] = isset($arr['registered'])?$arr['registered']:time();
 		$arr['ip'] = isset($arr['ip'])?$arr['ip']:Request::ip();
-		
+
 		$nex = self::notexist($arr['email'],'email');
 		if(!$nex->status)return $nex;
 
@@ -99,10 +99,10 @@ public static function update($arr,$where=false){
 
 		if(!empty($arr['pass']))$arr['pass'] = self::encpass($arr['pass']);
 		if(empty($arr['pass']))unset($arr['pass']);
-		
+
 		$arr['lastupdate'] = isset($arr['lastupdate'])?$arr['lastupdate']:time();
 		$arr['lastip'] = isset($arr['lastip'])?$arr['lastip']:Request::ip();
-		
+
 		/* update if this email not related to another user
 		$nex = self::notexist($arr['email'],'email');
 		if(!$nex->status)return $nex;
@@ -153,8 +153,8 @@ public static function get($data=false,$where=false){
 	 * check if user data in database
 	 *
 	 * @access	public
-	 * @param 	string field value , ex: name@mail.com 
-	 * @param 	string field key, ex: email 
+	 * @param 	string field value , ex: name@mail.com
+	 * @param 	string field key, ex: email
 	 * @return	object
 	 */
 	public static function notexist($field,$key='email'){
@@ -165,7 +165,7 @@ public static function notexist($field,$key='email'){
 			$cls->error = "{$key} already exist";
 			$cls->code = 2;
 			$cls->status = false;
-			$cls->id = $sql->data[0]['id'];
+			$cls->id = $sql->record[0]->id;
 		}else{
 			$cls->status = true;
 			$cls->id = 0;
@@ -183,7 +183,7 @@ public static function notexist($field,$key='email'){
 	 * @return	string
 	 */
 	public static function defaultRules(){
-		return Query::get("users",['data'=>'rules','where'=>['id'=>0]])->data[0]['rules'];	
+		return Query::get("users",['data'=>'rules','where'=>['id'=>0]])->record[0]['rules'];
 	}
 
 	// --------------------------------------------------------------------
@@ -212,7 +212,7 @@ public static function rules($arr,$where=false){
 				}
 			}
 		}
-		$rules = Query::get("users",['data'=>'rules','where'=>$where])->data[0]['rules'];
+		$rules = Query::get("users",['data'=>'rules','where'=>$where])->record[0]->rules;
 		if(!empty($rules))$rules = explode(",", $rules);
 		else $rules = array();
 
@@ -250,14 +250,14 @@ public static function rules($arr,$where=false){
 	public static function login($arr){
 		$arr = (Array)$arr;
 		if(!isset($arr['token']))$arr['pass'] = self::encpass($arr['pass']);
-		
+
 		$q = Query::get("users",array(
 			"data" => array("id","rules"),
 			"where" => $arr
 		));
 		if($q->count > 0){
 			Session::set(array(
-				static::$sessId => $q->data[0]['id']
+				static::$sessId => $q->record[0]->id
 			));
 		}else{
 			$q = new stdClass();
@@ -299,7 +299,7 @@ public static function oauth($arr){
 		// login
 		if($q->count > 0){
 			Session::set(array(
-				static::$sessId => $q->data[0]['id']
+				static::$sessId => $q->record[0]->id
 			));
 			$ret = $q;
 			//$ret->status = true;
@@ -320,11 +320,11 @@ public static function oauth($arr){
 						"oauth_{$provider}" => $oauth
 					),
 					"where" => array(
-						"id" => $q->data[0]['id']
+						"id" => $q->record[0]->id
 					)
 				));
 				Session::set(array(
-					static::$sessId => $q->data[0]['id']
+					static::$sessId => $q->record[0]->id
 				));
 				$ret = $q;
 				$ret->status = true;
@@ -450,33 +450,30 @@ public static function info($more = array(),$more2 = array()){
 	 * @access	public
 	 * @return	boolean
 	 */
-	public static function hasRule($rules = array(),$defRules=false){
-		// TODO: no has rule .. 
-		self::$lastRule = $rules;
+	public static function hasRule($check = array(),$rules=false){
+		// TODO: no has rule ..
+		self::$lastRule = $check;
 
-		if(!is_array($rules))$arr = explode(",", $rules);
-		else $arr = $rules;
+		if(!is_array($check))$check = explode(",", $check);
 
-		if($defRules != false){
-			if(!is_array($defRules))$rules = explode(",",$defRules);
-			else $rules = $defRules;
-		}else{
+		if($rules != false && !is_array($rules))$rules = explode(",",$rules);
+
+		if(!$rules){
 			$user = self::info();
 			if(!$user->status)return false;
-			$rules = explode(",",$user->data[0]['rules']);
+			$rules = explode(",",$user->record[0]->rules);
 		}
-		$ret = true;
-		
-		foreach($arr as $rule){
 
+		$final = true;
+		foreach($check as $rule){
 			if(strpos($rule, "!") === 0){
-				if(in_array(ltrim($rule, '!'), $rules))$ret = false;
+				if(in_array(ltrim($rule, '!'), $rules))$final = false;
 			}else{
-				if(!in_array($rule, $rules))$ret = false;
+				if(!in_array($rule, $rules))$final = false;
 			}
 		}
 
-		return $ret;
+		return $final;
 	}
 
 
@@ -492,7 +489,7 @@ public static function hasRule($rules = array(),$defRules=false){
 	 * @return	string
 	 */
 	public static function encpass($pass){
-		return md5(String::encrypt($pass)).sha1(String::encrypt($pass)); 
+		return md5(String::encrypt($pass)).sha1(String::encrypt($pass));
 	}
 
 

From 51941ff5ae4c5d669229ad26ab6339d3db0eba81 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 18 Apr 2016 19:28:50 +0300
Subject: [PATCH 061/114] new validation class

---
 system/module/Validate.php | 332 +++++++++++++++++++++++++++++++++++++
 1 file changed, 332 insertions(+)
 create mode 100644 system/module/Validate.php

diff --git a/system/module/Validate.php b/system/module/Validate.php
new file mode 100644
index 0000000..0fea028
--- /dev/null
+++ b/system/module/Validate.php
@@ -0,0 +1,332 @@
+<?php
+ if (!defined('VERSION')) {
+     exit('Direct access to this location is not permitted.');
+ }
+/**
+ * Validate.
+ *
+ * validator class
+ *
+ * @category	Libraries
+ *
+ * @author		Tamer Zorba
+ *
+ * @link		http://purecis.com/
+ */
+class Validate
+{
+
+    public static $error = [];
+
+    public static function check()
+    {
+        $args = func_get_args();
+        $obj = new stdClass();
+        $obj->status = true;
+        $obj->messages = [];
+        $obj->error = [];
+        $obj->first = null;
+        // $obj->last = null;
+
+        foreach ($args[1] as $key => $value) {
+            $value = explode('|', $value);
+            foreach ($value as $check) {
+                $check = explode(':', $check);
+                //  d($check);
+                //  echo "<br />";
+                $args[0]->{$key} = isset($args[0]->{$key})?$args[0]->{$key}:null;
+                $v = self::is($args[0]->{$key}, $check[0], isset($check[1]) ? $check[1] : null);
+                if(!$v->status){
+                    $obj->status = false;
+                    if(!isset($obj->messages[$key]))$obj->messages[$key] = [];
+                    array_push($obj->messages[$key], $v->error);
+                    if(!isset($obj->error[$key]))$obj->error[$key] = $v->error;
+
+                    $name = ucwords(preg_replace('/[A-Z]/', ' $0', $key));
+                    if(!isset($obj->first))$obj->first = $name.' '.$v->error;
+                    // break;
+
+                    // array_push($obj->messages, $v->error);
+                }
+
+            }
+        }
+        s($obj);
+        return $obj;
+    }
+
+    public static function is()
+    {
+        $args = func_get_args();
+
+        $obj = new stdClass();
+        $obj->status = false;
+
+        switch ($args[1]) {
+            case 'required':
+                $obj->status = self::required($args[0]);
+                $obj->error = 'Required';
+                break;
+
+            case 'isset':
+                $obj->status = self::set($args[0]);
+                $obj->error = 'Not Set';
+                break;
+
+            case 'min':
+                $obj->status = self::min($args[0], $args[2]);
+                $obj->error = "Length Should be Larger than {$args[2]}";
+                break;
+
+            case 'max':
+                $obj->status = self::max($args[0], $args[2]);
+                $obj->error = "Length Should be Less then {$args[2]}";
+                break;
+
+            case 'between':
+                $obj->status = self::between($args[0], $args[2]);
+                $obj->error = "Length Should be Between {$args[2]}";
+                break;
+
+            case 'exact-length':
+                $obj->status = self::exact_length($args[0], $args[2]);
+                $obj->error = "Length Sould be {$args[2]} Char";
+                break;
+
+            case 'equals':
+                $obj->status = self::equals($args[0], $args[2]);
+                $obj->error = "Not Equals to {$args[2]}";
+                break;
+
+            case 'equal-both':
+                $obj->status = self::equal_both($args[0], $args[2]);
+                $obj->error = "Should Equal one of {$args[2]}";
+                break;
+
+            case 'length-both':
+                $obj->status = self::length_both($args[0], $args[2]);
+                $obj->error = "Length Should be one of $args[2]";
+                break;
+
+            case 'gt':
+                $obj->status = self::gt($args[0], $args[2]);
+                $obj->error = "Should be between $args[2]";
+                break;
+
+            case 'gte':
+                $obj->status = self::gte($args[0], $args[2]);
+                $obj->error = "Should be between $args[2]";
+                break;
+
+            case 'lt':
+                $obj->status = self::lt($args[0], $args[2]);
+                $obj->error = "Should be between $args[2]";
+                break;
+
+            case 'lte':
+                $obj->status = self::lte($args[0], $args[2]);
+                $obj->error = "Should be between $args[2]";
+                break;
+
+            case 'range':
+                $obj->status = self::range($args[0], $args[2]);
+                $obj->error = "Should be between $args[2]";
+                break;
+
+            case 'numeric':
+                $obj->status = self::numeric($args[0]);
+                $obj->error = 'Should be a Number';
+                break;
+
+            case 'integer':
+                $obj->status = self::integer($args[0]);
+                $obj->error = 'Not Valid Integer';
+                break;
+
+            case 'string':
+                $obj->status = self::string($args[0]);
+                $obj->error = 'Not Valid String';
+                break;
+
+            case 'float':
+                $obj->status = self::float($args[0]);
+                $obj->error = 'Not Valid Float';
+                break;
+
+            case 'alpha':
+                $obj->status = self::alpha($args[0]);
+                $obj->error = 'We Accept Alphabet Only';
+                break;
+
+            case 'alpha-numeric':
+                $obj->status = self::alpha_numeric($args[0]);
+                $obj->error = 'Alphabet and Numbers Allowed Only';
+                break;
+
+            case 'email':
+                $obj->status = self::email($args[0]);
+                $obj->error = 'Not Valid Email Address';
+                break;
+
+            case 'ip':
+                $obj->status = self::ip($args[0]);
+                $obj->error = 'Not Valid IP Address';
+                break;
+
+            case 'url':
+                $obj->status = self::url($args[0]);
+                $obj->error = 'Not Valid URL';
+                break;
+
+            case 'exist':
+                $obj->status = self::exist($args[0], $args[2], $k);
+                $obj->error = 'Allready Exist in Database';
+                break;
+
+            case 'notexist':
+                $obj->status = self::notexist($args[0], $args[2], $k);
+                $obj->error = 'Not Exist in Database';
+                break;
+
+            default:
+                # code...
+                break;
+        }
+
+        return $obj;
+    }
+
+    protected static function set($input = null)
+    {
+        return isset($input);
+    }
+
+    protected static function required($input = null)
+    {
+        return !is_null($input) && (trim($input) != '');
+    }
+
+    protected static function numeric($input)
+    {
+        return is_numeric($input);
+    }
+
+    protected static function email($input)
+    {
+        return filter_var($input, FILTER_VALIDATE_EMAIL);
+    }
+
+    protected static function integer($input)
+    {
+        return is_int($input) || ($input == (string) (int) $input);
+    }
+
+    protected static function string($input)
+    {
+        return is_string($input) || ($input == (string) $input);
+    }
+
+    protected static function float($input)
+    {
+        return is_float($input) || ($input == (string) (float) $input);
+    }
+
+    protected static function alpha($input)
+    {
+        return preg_match('#^[a-zA-Z]+$#', $input) == 1;
+    }
+
+    protected static function alpha_numeric($input)
+    {
+        return preg_match('#^[a-zA-Z0-9]+$#', $input) == 1;
+    }
+
+    protected static function ip($input)
+    {
+        return filter_var($input, FILTER_VALIDATE_IP);
+    }
+
+    protected static function url($input)
+    {
+        return filter_var($input, FILTER_VALIDATE_URL);
+    }
+
+    protected static function max($input, $length)
+    {
+        return strlen($input) <= $length;
+    }
+
+    protected static function min($input, $length)
+    {
+        return strlen($input) >= $length;
+    }
+
+    protected static function range($input, $length)
+    {
+        $arr = explode(',', $param);
+
+        return $input >= $arr[0] && $input <= $arr[1];
+    }
+    protected static function lt($input, $length)
+    {
+        return $input < $length;
+    }
+    protected static function lte($input, $length)
+    {
+        return $input <= $length;
+    }
+    protected static function gt($input, $length)
+    {
+        return $input > $length;
+    }    protected static function gte($input, $length)
+    {
+        return $input >= $length;
+    }
+
+    protected static function between($input, $param)
+    {
+        $arr = explode(',', $param);
+
+        return strlen($input) >= $arr[0] && strlen($input) <= $arr[1];
+    }
+
+    protected static function exact_length($input, $length)
+    {
+        return strlen($input) == $length;
+    }
+
+    protected static function equals($input, $param)
+    {
+        return $input == $param;
+    }
+
+    protected static function equal_both($input, $param)
+    {
+        $arr = explode(',', $param);
+
+        return $input == $arr[0] || $input == $arr[1];
+    }
+
+    protected static function length_both($input, $param)
+    {
+        $arr = explode(',', $param);
+
+        return strlen($input) == $arr[0] || strlen($input) == $arr[1];
+    }
+
+    protected static function exist($input, $table, $col)
+    {
+        database::query("SELECT count(*) as count from {$table} where {$col} = '{$input}';");
+
+        return database::fetchColumn() > 0 ? true : false;
+    }
+
+    protected static function notexist($input, $table, $col)
+    {
+        return !self::exist($input, $table, $col);
+    }
+    // TODO : date check, dateISO, digits, creditcard, regix, phone, 
+}
+
+/* End of file Validate.php */
+/* Location: ./system/module/Validate.php */

From bbea40f67e0e312d65cd5960308dcc8a731cd390 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 18 Apr 2016 19:29:11 +0300
Subject: [PATCH 062/114] add devel path to search for module in

---
 system/core/Module.php | 74 ++++++++++++------------------------------
 1 file changed, 20 insertions(+), 54 deletions(-)

diff --git a/system/core/Module.php b/system/core/Module.php
index fd2b678..6d4eccf 100644
--- a/system/core/Module.php
+++ b/system/core/Module.php
@@ -136,12 +136,31 @@ public static function path($mod, $full = false)
             $file = $mod;
         }
 
-        $alias = array('module', 'hook', 'plugin', 'extension', 'component', 'element', 'service', 'helper', 'lib', 'kernel', 'space', 'package');
+        $alias = array(
+            'module',
+            'hook',
+            'plugin',
+            'extension',
+            'component',
+            'element',
+            'service',
+            'helper',
+            'lib',
+            'kernel',
+            'space',
+            'package',
+            'resource',
+        );
+        
         foreach ($alias as $als) {
             $path = "{$config['app']}/{$als}/{$mod}/{$file}.php";
             if (is_file($path)) {
                 break;
             }
+            $path = "{$config['app']}/devel/{$als}/{$mod}/{$file}.php";
+            if (is_file($path)) {
+                break;
+            }
             $path = "{$config['assets']}/{$als}/{$mod}/{$file}.php";
             if (is_file($path)) {
                 break;
@@ -156,59 +175,6 @@ public static function path($mod, $full = false)
             }
         }
 
-        /*
-        $path = "{$config['app']}/module/{$mod}/{$file}.php";
-        if (!is_file($path)) {
-            $path = "{$config['app']}/hook/{$mod}/{$file}.php";
-        }
-        if (!is_file($path)) {
-            $path = "{$config['app']}/plugin/{$mod}/{$file}.php";
-        }
-        if (!is_file($path)) {
-            $path = "{$config['app']}/extension/{$mod}/{$file}.php";
-        }
-        if (!is_file($path)) {
-            $path = "{$config['app']}/component/{$mod}/{$file}.php";
-        }
-        if (!is_file($path)) {
-            $path = "{$config['app']}/element/{$mod}/{$file}.php";
-        }
-        if (!is_file($path)) {
-            $path = "{$config['app']}/service/{$mod}/{$file}.php";
-        }
-        if (!is_file($path)) {
-            $path = "{$config['app']}/helper/{$mod}/{$file}.php";
-        }
-
-        if (!is_file($path)) {
-            $path = "{$config['assets']}/extensions/{$mod}/{$file}.php";
-        }
-        if (!is_file($path)) {
-            $path = "{$config['system']}/module/{$mod}.php";
-        }
-        if (!is_file($path)) {
-            $path = "{$config['system']}/hook/{$mod}.php";
-        }
-        if (!is_file($path)) {
-            $path = "{$config['system']}/plugin/{$mod}.php";
-        }
-        if (!is_file($path)) {
-            $path = "{$config['system']}/extension/{$mod}.php";
-        }
-        if (!is_file($path)) {
-            $path = "{$config['system']}/component/{$mod}.php";
-        }
-        if (!is_file($path)) {
-            $path = "{$config['system']}/element/{$mod}.php";
-        }
-        if (!is_file($path)) {
-            $path = "{$config['system']}/service/{$mod}.php";
-        }
-        if (!is_file($path)) {
-            $path = "{$config['system']}/helper/{$mod}.php";
-        }
-        */
-
         if (is_file($path)) {
             if ($full) {
                 return $path;

From c354485282beb9b41dbcc64c09f78eed1c20be1a Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 2 May 2016 17:46:31 +0300
Subject: [PATCH 063/114] add trigger on router

---
 system/module/Router.php | 46 +++++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/system/module/Router.php b/system/module/Router.php
index abbabe0..48c99ce 100644
--- a/system/module/Router.php
+++ b/system/module/Router.php
@@ -101,6 +101,25 @@ public static function otherwise($val, $cb = false)
         return self::$router;
     }
 
+    public static function trigger($mod){
+
+        $_exist = isset(self::$callback[$mod]) ? true : false;
+        if($_exist){
+            $cls = new stdClass();
+            if (isset(self::$router[$mod])) {
+                foreach (self::$router[$mod] as $k) {
+                    $cls->$k = self::get($k);
+                }
+            }
+
+            $cb = Controller::trigger(self::$callback[$mod], $cls);
+            if (is_array($cb) || is_object($cb)) {
+                $cb = json_encode($cb);
+            }
+            return $cb;
+        }
+    }
+
     public static function callback()
     {
         //$mod = Request::get('pagename');
@@ -121,19 +140,10 @@ public static function callback()
             $_exist = isset(self::$callback[$mod]) ? true : false;
         }
 
+        echo self::trigger($mod);
+        /*
         if ($_exist) {
-            $cls = new stdClass();
-            if (isset(self::$router[$mod])) {
-                foreach (self::$router[$mod] as $k) {
-                    $cls->$k = self::get($k);
-                }
-            }
-
-            $cb = Controller::trigger(self::$callback[$mod], $cls);
-            if (is_array($cb) || is_object($cb)) {
-                $cb = json_encode($cb);
-            }
-            echo $cb;
+            echo self::trigger();
         } else {
             // 404, 403...
             //post parser
@@ -142,6 +152,18 @@ public static function callback()
                 post::parser();
             }
         }
+        */
+    }
+
+    // call router emediatly if it the same, its good for directive check
+    // to work emediatly without check otherwise again
+    public static function is(){
+        $args = func_get_args();
+        $mod = Request::parser(0);
+        if($mod == $args[0]){
+            call_user_func_array(array('self','on'), $args);
+            return self::trigger($args[0]);
+        }
     }
 
     public static function __shutdown()

From 4b32c64c96b44c7961bb64f147696627c2a8432e Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 2 May 2016 17:47:06 +0300
Subject: [PATCH 064/114] new directives and scopes

---
 system/module/Directives.php | 885 +++++++++++++++++++++--------------
 1 file changed, 534 insertions(+), 351 deletions(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 300442a..0387efa 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -1,13 +1,16 @@
-<?php  if (!defined('VERSION'))exit('Direct access to this location is not permitted.');
+<?php
+ if (!defined('VERSION')) {
+     exit('Direct access to this location is not permitted.');
+ }
 /**
- * Purecis Directives Module
+ * Purecis Directives Module.
  *
  * Append Special Shortcodes to the core
  *
- * @package		codeHive
- * @subpackage	Module
  * @category	Libraries
+ *
  * @author		Tamer Zorba
+ *
  * @link		http://purecis.com/
  *
  *
@@ -24,360 +27,540 @@
  *   )                         # End $2: Contents of URL tag.
  *   (\[/URL\s*+\])            # $3: Outermost closing [/URL]
  *   %six';
- *
  */
-
-class Directives{
-
-	/**
-	 * Directives bootstrap
-	 *
-	 * @access	public
-	 * @return	string
-	 */
-	public static function __bootstrap(){
-
-		/**
-		* directive repeat
-		* Description : repeat data
-		*/
-		self::register("repeat", function($args, &$scope) { // TODO : filter by ( like weither)
-			//print_r($args);
-			$str = "";
-
-			foreach(Controller::$scope->{$args->items} as $k => $v){
-				Controller::$scope->{$args->as} = $v;
-				if(is_null($args->{"index"}))Controller::$scope->{"{$ex[0]}Index"} = $k;
-				else Controller::$scope->{$args->{"index"}} = $k;
-				Controller::$scope->__index = $k;
-				$str .= Shortcode::trigger($args->content);
-			}
-			return $str;
-
-			if($args->items){
-
-				//if($args->match == $args->equal)return Shortcode::trigger($args->content);
-			}
-
-		});
-
-		/**
-		* directive Each
-		* Description : Looping array
-		*/
-		Shortcode::register(array(
-			'code' 		=> 'each',
-			'pattern' 	=> '%\<EACH (\b[^<\>]*+)\>((?:(?:(?!\</?EACH\b).)++| (?R))*+)(\</EACH\s*+\>)%six',
-			'callback' 	=> function($match){
-				$str = "";
-				$ex = explode(' in ',trim($match[1]));
-				foreach(Controller::$scope->$ex[1] as $k => $file){
-					Controller::$scope->$ex[0] = $file;
-					$index = "{$ex[0]}Index";
-					Controller::$scope->$index = $k;
-					Controller::$scope->__index = $k;
-					$str .= Shortcode::trigger($match[2]);
-				}
-				return $str;
-			}
-		));
-
-		/**
-		* directive Scope
-		* Description : Scoping variables
-		*/
-		Shortcode::register(array(
-			'code' 		=> 'scope',
-			'pattern' 	=> '#\{-(.+)\-}#Usi',
-			'callback' 	=> function($match){
-				$filter = explode("|", $match[1]);//check ex for plugins like lower
-				$match[1] = $filter[0];
-
-				$val = Directives::scope($match[1]);
-
-				if(isset($filter[1])){
-					$f = trim($filter[1]);
-					if($f == 'upper'){
-						$val = strtoupper($val);
-					}else if($f == 'escape'){
-						$val = htmlspecialchars($val,ENT_QUOTES,'UTF-8');
-					}
+class Directives
+{
+    /**
+     * Directives bootstrap.
+     *
+     * @return string
+     */
+    public static function __bootstrap()
+    {
+        // request .. to get
+        // router to route
+
+        /*
+        * get request from header
+        */
+        self::register('request', function ($args, &$scope) {
+            $param = explode(',', $args->get);
+            $param = Request::get($param);
+            $name = isset($args->scope) ? $args->scope : 'request';
+            $scope->{$name} = isset($scope->{$name}) ? (object) array_merge((array) $scope->{$name}, (array) $param) : $param;
+        });
+
+        /*
+        * define scope variable directive
+        */
+        self::register('var', function ($args, &$scope) {
+            $name = isset($args->scope) ? $args->scope : 'var';
+			$scope->{$name} = isset($scope->{$name}) ? (object) array_merge((array) $scope->{$name}, (array) $args) : $args;
+        });
+
+        /*
+        * directive query
+        * Description : shorten the text
+        */
+        self::register('router', function ($args, &$scope) {
+			if(!isset($args->param))$args->param = [];
+			else $args->param = explode(",", $args->param);
+
+			if ( preg_match_all("(:\w+)", $args->route, $matches) ) {
+				$temp = [];
+				foreach($matches[0] as $match){
+					array_push($args->param, ltrim($match, ':'));
 				}
-				return $val;
 			}
-		));
-
-		/**
-		* directive Each
-		* Description : Looping array
-		*/
-		Shortcode::register(array(
-			'code' 		=> 'if',
-			'pattern' 	=> '%\<IF (\b[^<\>]*+)\>((?:(?:(?!\</?IF\b).)++| (?R))*+)(\</IF\s*+\>)%six',
-			'callback' 	=> function($match){
-
-				$parse = function($v){
-					if(strpos(trim($v),'"') === 0){
-						$v = rtrim($v,'"');
-						$v = ltrim($v,'"');
-						return $v;
-					}else if(strpos(trim($v),"'") === 0){
-						$v = rtrim($v,"'");
-						$v = ltrim($v,"'");
-						return $v;
-					}else if(trim($v) == "true"){
-						return true;
-					}else if(trim($v) == "false"){
-						return false;
-					}else if(trim($v) == "null"){
-						return '';
-					}else{
-						return Directives::scope($v);
-					}
-				};
-				$ok = true;
-
-				if(strpos($match[1], "=") !== false){
-					$ex = explode("=",trim($match[1]));
-
-					if($parse($ex[0]) == $parse($ex[1]))return Shortcode::trigger($match[2]);
-
-				}else if(strpos($match[1], "!=") !== false){
-					$ex = explode("!=",trim($match[1]));
-					if($parse($ex[0]) != $parse($ex[1]))return Shortcode::trigger($match[2]);
-
-				}else if(strpos($match[1], "isset") !== false){
-					if(strpos(trim($match[1]),"!") === 0)$not = 1;
-					else $not = 0;
-
-					$ex = substr(trim($match[1]), 6+$not, -1);//explode("isset",trim());
-
-					if($not){
-						if(is_null($parse($ex)))return Shortcode::trigger($match[2]);
-					}else{
-						if(!is_null($parse($ex)))return Shortcode::trigger($match[2]);
-					}
-
-				}
-
-				return ;
-				/*
-				$str = "";
-				$ex = explode(' in ',trim($match[1]));
-				foreach(Controller::$scope->$ex[1] as $file){
-					Controller::$scope->$ex[0] = $file;
-					$str .= Shortcode::trigger($match[2]);
-				}
-				return $str;
-				*/
-			}
-		));
-
-		/*
-		* directive Scope
-		* Description : Scoping variables
-		*
-		Shortcode::register(array(
-			'code' 		=> 'scope',
-			'pattern' 	=> '#\<!(.+)\>#Usi',
-			'callback' 	=> function($match){
-				$val = Controller::$scope;
-				$ex = explode(".", $match[1]);
-				$val = isset($val->$ex[0])?$val->$ex[0]:null;
-				if(sizeof($ex) > 1){
-					foreach($ex as $k => $v){
-						if($k == 0)continue;
-						$val = isset($val[$v])?$val[$v]:null;
-						if($val == null)break;
-					}
-				}
-				return $val;
-			}
-		));
-		*/
-
-		/**
-		* directive Import
-		* Description : include view
-		*/
-		Shortcode::register(array(
-			'code' 		=> 'import',
-			'pattern' 	=> '#\@import\((.+)\)#Usi',
-			'callback' 	=> function($match){
-				return View::load($match[1]);// set additional import if
-			}
-		));
-
-		/**
-		* directive Event
-		* Description : trigger event
-		*/
-		Shortcode::register(array(
-			'code' 		=> 'event',
-			'pattern' 	=> '#\@event\((.+)\)#Usi',
-			'callback' 	=> function($match){
-				$ex = explode(",",$match[1]);
-				$event = $ex[0];
-				array_shift($ex);
-				return Event::trigger($event,$ex);
-			}
-		));
-
-		/**
-		* directive Internationalization
-		* Description : trigger event
-		* Usage : __(You have :count messages and :days days :> {count:1,days:2} @ module.name)
-		*/
-		Shortcode::register(array(
-			'code' 		=> 'internationalization',
-			'pattern' 	=> '#\__\((.+)\)#Usi',
-			'callback' 	=> function($match){
-				$ar = array();
-				$at = false;
-
-				$ex = explode(":>", $match[1]);
-
-				if(isset($ex[1])){
-					$ex2 = explode("@", $ex[1]);
-					$a = explode(",",substr(trim($ex2[0]), 1, -1));
-					foreach($a as $v){
-						$vv = explode(":", $v);
-						$ar[$vv[0]] = $vv[1];
-					}
-					//
-					if(isset($ex2[1]))$at = $ex2[1];
-				}
-
-				return Internationalization::translate(trim($ex[0]),$ar,$at);
-			}
-		));
+			$route = explode("/", $args->route);
+			$route = $route[0];
+
+			return Router::is($route, $args->param, function(&$scope, $router) use ($args){
+				$name = isset($args->scope) ? $args->scope : 'router';
+	            $scope->{$name} = $router;
+				return Shortcode::trigger($args->content);
+			});
+
+            // return 'Query Still Under Development.';
+        });
+
+        /*
+        * directive query
+        * Description : shorten the text
+        */
+        self::register('query', function ($args, &$scope) {
+            return 'Query Still Under Development.';
+        });
+
+        /*
+        * directive object
+        * Description : shorten the text
+        */
+        self::register('query-object', function ($args, &$scope) {
+            $where = isset($args->where) ? (array) String::json(Shortcode::trigger($args->where)) : null;
+            $limit = isset($args->limit) ? isset($args->offset) ? "{$args->offset},{$args->limit}" : $args->limit : null;
+            $query = Object::fetch($args->taxonomy, $args->param, $where, ['limit' => $limit]);
+            $scope->{$args->as} = $query->status?$query->record:[];
+        });
+
+        /*
+        * directive repeat
+        * Description : repeat data
+        */
+        self::register('repeat', function ($args, &$scope) { // TODO : filter by ( like whether)
+            $str = '';
+
+            foreach (Directives::scope($args->items) as $k => $v) {
+                Controller::$scope->{$args->as} = $v;
+                if (is_null($args->{'index'})) {
+                    Controller::$scope->{"{$ex[0]}Index"} = $k;
+                } else {
+                    Controller::$scope->{$args->{'index'}} = $k;
+                }
+                Controller::$scope->__index = $k;
+                $str .= Shortcode::trigger($args->content);
+            }
+			// run whether here
+            return $str;
+        });
+
+        /*
+        * directive Each
+        * Description : Looping array
+        */
+        Shortcode::register(array(
+            'code' => 'each',
+            'pattern' => '%\<EACH (\b[^<\>]*+)\>((?:(?:(?!\</?EACH\b).)++| (?R))*+)(\</EACH\s*+\>)%six',
+            'callback' => function ($match) {
+                $str = '';
+                $ex = explode(' in ', trim($match[1]));
+                foreach (Controller::$scope->$ex[1] as $k => $file) {
+                    Controller::$scope->$ex[0] = $file;
+                    $index = "{$ex[0]}Index";
+                    Controller::$scope->$index = $k;
+                    Controller::$scope->__index = $k;
+                    $str .= Shortcode::trigger($match[2]);
+                }
+
+                return $str;
+            },
+        ));
+
+        /*
+        * directive Scope
+        * Description : Scoping variables
+        */
+
+        // support new method until remove support for old one
+        Shortcode::register(array(
+            'code' => 'newScope$',
+            'pattern' => '#\${(.+)}#Usi',
+            'callback' => function ($match) {
+                $filter = explode('|', $match[1]);//check ex for plugins like lower
+                $match[1] = $filter[0];
+
+                $val = Directives::scope($match[1]);
+
+                if (isset($filter[1])) {
+                    $f = trim($filter[1]);
+                    if ($f == 'upper') {
+                        $val = strtoupper($val);
+                    } elseif ($f == 'escape') {
+                        $val = htmlspecialchars($val, ENT_QUOTES, 'UTF-8');
+                    }
+                }
+
+                return $val;
+            },
+        ));
+        Shortcode::register(array(
+            'code' => 'newScope@',
+            'pattern' => '#\@{(.+)}#Usi',
+            'callback' => function ($match) {
+                $filter = explode('|', $match[1]);//check ex for plugins like lower
+                $match[1] = $filter[0];
+
+                $val = Directives::scope($match[1]);
+
+                if (isset($filter[1])) {
+                    $f = trim($filter[1]);
+                    if ($f == 'upper') {
+                        $val = strtoupper($val);
+                    } elseif ($f == 'escape') {
+                        $val = htmlspecialchars($val, ENT_QUOTES, 'UTF-8');
+                    }
+                }
+
+                return $val;
+            },
+        ));
+
+        Shortcode::register(array(
+            'code' => 'scope',
+            'pattern' => '#\{-(.+)\-}#Usi',
+            'callback' => function ($match) {
+                $filter = explode('|', $match[1]);//check ex for plugins like lower
+                $match[1] = $filter[0];
+
+                $val = Directives::scope($match[1]);
+
+                if (isset($filter[1])) {
+                    $f = trim($filter[1]);
+                    if ($f == 'upper') {
+                        $val = strtoupper($val);
+                    } elseif ($f == 'escape') {
+                        $val = htmlspecialchars($val, ENT_QUOTES, 'UTF-8');
+                    }
+                }
+
+                return $val;
+            },
+        ));
+
+        Shortcode::register(array(
+            'code' => 'base',
+            'pattern' => '#(~\/)#Usi',
+            'callback' => function ($match) {
+                return Request::base();
+            }
+        ));
+
+        /*
+        * directive Each
+        * Description : Looping array
+        */
+        Shortcode::register(array(
+            'code' => 'if',
+            'pattern' => '%\<IF (\b[^<\>]*+)\>((?:(?:(?!\</?IF\b).)++| (?R))*+)(\</IF\s*+\>)%six',
+            'callback' => function ($match) {
+
+                $parse = function ($v) {
+                    if (strpos(trim($v), '"') === 0) {
+                        $v = rtrim($v, '"');
+                        $v = ltrim($v, '"');
+
+                        return $v;
+                    } elseif (strpos(trim($v), "'") === 0) {
+                        $v = rtrim($v, "'");
+                        $v = ltrim($v, "'");
+
+                        return $v;
+                    } elseif (trim($v) == 'true') {
+                        return true;
+                    } elseif (trim($v) == 'false') {
+                        return false;
+                    } elseif (trim($v) == 'null') {
+                        return '';
+                    } else {
+                        return Directives::scope($v);
+                    }
+                };
+                $ok = true;
+
+                if (strpos($match[1], '=') !== false) {
+                    $ex = explode('=', trim($match[1]));
+
+                    if ($parse($ex[0]) == $parse($ex[1])) {
+                        return Shortcode::trigger($match[2]);
+                    }
+                } elseif (strpos($match[1], '!=') !== false) {
+                    $ex = explode('!=', trim($match[1]));
+                    if ($parse($ex[0]) != $parse($ex[1])) {
+                        return Shortcode::trigger($match[2]);
+                    }
+                } elseif (strpos($match[1], 'isset') !== false) {
+                    if (strpos(trim($match[1]), '!') === 0) {
+                        $not = 1;
+                    } else {
+                        $not = 0;
+                    }
+
+                    $ex = substr(trim($match[1]), 6 + $not, -1);//explode("isset",trim());
+
+                    if ($not) {
+                        if (is_null($parse($ex))) {
+                            return Shortcode::trigger($match[2]);
+                        }
+                    } else {
+                        if (!is_null($parse($ex))) {
+                            return Shortcode::trigger($match[2]);
+                        }
+                    }
+                }
+
+                return;
+                /*
+                $str = "";
+                $ex = explode(' in ',trim($match[1]));
+                foreach(Controller::$scope->$ex[1] as $file){
+                    Controller::$scope->$ex[0] = $file;
+                    $str .= Shortcode::trigger($match[2]);
+                }
+                return $str;
+                */
+            },
+        ));
+
+        /*
+        * directive Scope
+        * Description : Scoping variables
+        *
+        Shortcode::register(array(
+            'code' 		=> 'scope',
+            'pattern' 	=> '#\<!(.+)\>#Usi',
+            'callback' 	=> function($match){
+                $val = Controller::$scope;
+                $ex = explode(".", $match[1]);
+                $val = isset($val->$ex[0])?$val->$ex[0]:null;
+                if(sizeof($ex) > 1){
+                    foreach($ex as $k => $v){
+                        if($k == 0)continue;
+                        $val = isset($val[$v])?$val[$v]:null;
+                        if($val == null)break;
+                    }
+                }
+                return $val;
+            }
+        ));
+        */
+
+        /*
+        * directive Import
+        * Description : include view
+        */
+        Shortcode::register(array(
+            'code' => 'import',
+            'pattern' => '#\@import\((.+)\)#Usi',
+            'callback' => function ($match) {
+                return View::load($match[1]);// set additional import if
+            },
+        ));
+
+        self::register('view', function ($args, &$scope) {
+            $name = isset($args->scope) ? $args->scope : 'view';
+            $scope->{$name} = $args;
+
+            return View::load($args->src);
+        });
+
+        /*
+        * directive Event
+        * Description : trigger event
+        */
+        Shortcode::register(array(
+            'code' => 'event',
+            'pattern' => '#\@event\((.+)\)#Usi',
+            'callback' => function ($match) {
+                $ex = explode(',', $match[1]);
+                $event = $ex[0];
+                array_shift($ex);
+
+                return Event::trigger($event, $ex);
+            },
+        ));
+
+        /*
+        * directive Internationalization
+        * Description : trigger event
+        * Usage : __(You have :count messages and :days days :> {count:1,days:2} @ module.name)
+        */
+        Shortcode::register(array(
+            'code' => 'internationalization',
+            'pattern' => '#\__\((.+)\)#Usi',
+            'callback' => function ($match) {
+                $ar = array();
+                $at = false;
+
+                $ex = explode(':>', $match[1]);
+
+                if (isset($ex[1])) {
+                    $ex2 = explode('@', $ex[1]);
+                    $a = explode(',', substr(trim($ex2[0]), 1, -1));
+                    foreach ($a as $v) {
+                        $vv = explode(':', $v);
+                        $ar[$vv[0]] = $vv[1];
+                    }
+                    //
+                    if (isset($ex2[1])) {
+                        $at = $ex2[1];
+                    }
+                }
+
+                return Internationalization::translate(trim($ex[0]), $ar, $at);
+            },
+        ));
 
 /*
-		Shortcode::register(array(
-			'code' 		=> 'input',
-			'pattern' 	=> '#\[input(.+)]#Usi',
-			'callback' 	=> function($match){
-				return "input is here";
-			}
-		));
-
-		Shortcode::register(array(
-			'code' 		=> 'extends',
-			'pattern' 	=> '#\@extends\((.+)\)#Usi',
-			'callback' 	=> function($match){
-				return "you are extending {$match[1]}";
-			}
-		));
+        Shortcode::register(array(
+            'code' 		=> 'input',
+            'pattern' 	=> '#\[input(.+)]#Usi',
+            'callback' 	=> function($match){
+                return "input is here";
+            }
+        ));
+
+        Shortcode::register(array(
+            'code' 		=> 'extends',
+            'pattern' 	=> '#\@extends\((.+)\)#Usi',
+            'callback' 	=> function($match){
+                return "you are extending {$match[1]}";
+            }
+        ));
 */
 
-
-		/**
-		* directive approxlen
-		* Description : shorten the text
-		*/
-		self::register("approxlen", function($args, &$scope) {
-			if(!$args->length)$args->length = 200;
-			if(!$args->append)$args->append = '...';
-			return String::approxlen($args->content,$args->length,$args->append);
-		});
-
-		/**
-		* directive ontime
-		* Description : date to human readable date
-		*/
-		self::register("ontime", function($args, &$scope) {
-			return String::ontime($args->content);
-		});
-
-		/**
-		* directive whether
-		* Description : check data
-		*/
-		self::register("whether", function($args, &$scope) { 	//neither // repeat
-
-			if($args->is){
-				if($args->eq)if($args->is == $args->eq)return Shortcode::trigger($args->content);
-				if($args->lt)if($args->is < $args->lt)return Shortcode::trigger($args->content);
-				if($args->gt)if($args->is > $args->gt)return Shortcode::trigger($args->content);
-				if($args->lte)if($args->is <= $args->lte)return Shortcode::trigger($args->content);
-				if($args->gte)if($args->is >= $args->gte)return Shortcode::trigger($args->content);
-				if($args->in)if(strpos($args->is, $args->in) !== false)return Shortcode::trigger($args->content);
-				// TODO : inset, 
-			}
-			if($args->exist)return Shortcode::trigger($args->content);
-
-		});
-
-
-	}
-
-	private static function scope($v){
-		if(is_numeric(trim($v)))return $v;
-		$val = Controller::$scope;
-		$ex = explode(".", $v);
-		$val = isset($val->$ex[0])?$val->$ex[0]:null;
-		if(sizeof($ex) > 1){
-			foreach($ex as $k => $v){
-				if($k == 0)continue;
-				$val = (array)$val;
-				$val = isset($val[$v])?$val[$v]:null;
-				if($val == null)break;
-			}
-		}
-		return is_string($val)?stripcslashes($val):$val;
-	}
-
-	public static function register($element, $cb){
-		Shortcode::register(array(
-			'code' 		=> "element_{$element}",
-			'pattern' 	=> "%\<{$element} (\b[^<\>]*+)\>((?:(?:(?!\</?{$element}\b).)++| (?R))*+)(\</{$element}\s*+\>)%six",
-			'callback' 	=> function($match) use ($cb, $element){
-				$cls = new stdClass();
-				$cls->content = $match[2];
-				$el = "{$element}-content";
-				Controller::$scope->$el = $match[2];
-				if(!empty($match[1])){
-					$atts = String::parse_attr($match[1]);
-					foreach ($atts as $k => $v) {
-						if((strpos($v, "'") !== false || strpos($v, '"') !== false)){ // string here
-							$v = substr($v, 1, -1); // right left
-						}else{
-							$v = self::scope($v);//Controller::$scope->$v;
-						}
-						$cls->$k = $v;
-						$el = "{$element}-{$k}";
-						Controller::$scope->$el = $v;
-					}
-				}
-				// whether
-				if(!is_null($cls->whether)){
-					if(!eval("return {$cls->whether};"))return;
-				}
-				// neither
-				if(!is_null($cls->neither)){
-					if(eval("return {$cls->neither};"))return;
-				}
-
-				if(is_callable($cb)){
-					$call = call_user_func_array($cb, array($cls, &Controller::$scope));
-
-				}else if(is_string($cb)){
-					$call = View::load($cb);
-				}else{
-					//echo $match[2];
-					$call = Shortcode::trigger($match[2]);
-				}
-				return Shortcode::trigger($call);
-				// trim($match[1]); // the args inside
-				//Controller::$scope->__index = $k; // loop on variables and set them in scope
-				//$str = Shortcode::trigger($match[2]);// run the match 2
-				//return $str;
-			}
-		));
-
-
-	}
-
+        /*
+        * directive approxlen
+        * Description : shorten the text
+        */
+        self::register('approxlen', function ($args, &$scope) {
+            if (!$args->length) {
+                $args->length = 200;
+            }
+            if (!$args->append) {
+                $args->append = '...';
+            }
+
+            return String::approxlen($args->content, $args->length, $args->append);
+        });
+
+        /*
+        * decode url
+        */
+        self::register('url', function ($args, &$scope) {
+            return urldecode($args->content);
+        });
+
+        /*
+        * directive ontime
+        * Description : date to human readable date
+        */
+        self::register('ontime', function ($args, &$scope) {
+            return String::ontime($args->content);
+        });
+
+        /*
+        * directive whether
+        * Description : check data
+        */
+        self::register('whether', function ($args, &$scope) {    //neither // repeat
+
+            if (isset($args->is)) {
+                if (isset($args->eq)) {
+                    if ($args->is == $args->eq) {
+                        return Shortcode::trigger($args->content);
+                    }
+                }
+                if (isset($args->lt)) {
+                    if ($args->is < $args->lt) {
+                        return Shortcode::trigger($args->content);
+                    }
+                }
+                if (isset($args->gt)) {
+                    if ($args->is > $args->gt) {
+                        return Shortcode::trigger($args->content);
+                    }
+                }
+                if (isset($args->lte)) {
+                    if ($args->is <= $args->lte) {
+                        return Shortcode::trigger($args->content);
+                    }
+                }
+                if (isset($args->gte)) {
+                    if ($args->is >= $args->gte) {
+                        return Shortcode::trigger($args->content);
+                    }
+                }
+                if (isset($args->in)) {
+                    if (strpos($args->is, $args->in) !== false) {
+                        return Shortcode::trigger($args->content);
+                    }
+                }
+                // TODO : inset,
+            }
+            if (isset($args->exist)) {
+                return Shortcode::trigger($args->content);
+            }
+
+        });
+    }
+
+    private static function scope($v)
+    {
+        if (is_numeric(trim($v))) {
+            return $v;
+        }
+        $val = Controller::$scope;
+        $ex = explode('.', $v);
+        $val = isset($val->$ex[0]) ? $val->$ex[0] : null;
+        if (sizeof($ex) > 1) {
+            foreach ($ex as $k => $v) {
+                if ($k == 0) {
+                    continue;
+                }
+                $val = (array) $val;
+                $val = isset($val[$v]) ? $val[$v] : null;
+                if ($val == null) {
+                    break;
+                }
+            }
+        }
+
+        return is_string($val) ? stripcslashes($val) : $val;
+    }
+
+    public static function register($element, $cb)
+    {
+        Shortcode::register(array(
+            'code' => "element_{$element}",
+            'pattern' => "%\<{$element} (\b[^<\>]*+)\>((?:(?:(?!\</?{$element}\b).)++| (?R))*+)(\</{$element}\s*+\>)%six",
+            'callback' => function ($match) use ($cb, $element) {
+                $cls = new stdClass();
+                $cls->content = $match[2];
+                $el = "{$element}-content";
+                Controller::$scope->$el = $match[2];
+                if (!empty($match[1])) {
+                    $atts = String::parse_attr($match[1]);
+                    foreach ($atts as $k => $v) {
+                        if ((strpos($v, "'") !== false || strpos($v, '"') !== false)) { // string here
+                            $v = substr($v, 1, -1); // right left
+                        } else {
+                            $v = self::scope($v);//Controller::$scope->$v;
+                        }
+                        $cls->$k = $v;
+                        $el = "{$element}-{$k}";
+                        Controller::$scope->$el = $v;
+                    }
+                }
+                // whether
+                if (isset($cls->whether) && !is_null($cls->whether)) {
+                    if (!eval("return {$cls->whether};")) {
+                        return;
+                    }
+                }
+                // neither
+                if (isset($cls->neither) && !is_null($cls->neither)) {
+                    if (eval("return {$cls->neither};")) {
+                        return;
+                    }
+                }
+
+                if (is_callable($cb)) {
+                    $call = call_user_func_array($cb, array($cls, &Controller::$scope));
+                } elseif (is_string($cb)) {
+                    $call = View::load($cb);
+                } else {
+                    //echo $match[2];
+                    $call = Shortcode::trigger($match[2]);
+                }
+
+                return Shortcode::trigger($call);
+                // trim($match[1]); // the args inside
+                //Controller::$scope->__index = $k; // loop on variables and set them in scope
+                //$str = Shortcode::trigger($match[2]);// run the match 2
+                //return $str;
+            },
+        ));
+    }
 }
 
 /* End of file Query.php */

From cab0d94da9a3de9d1b8d9e380f1793747cb60248 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Thu, 5 May 2016 13:45:54 +0300
Subject: [PATCH 065/114] module and asset directives

---
 system/module/Directives.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 0387efa..a9d6330 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -40,6 +40,26 @@ public static function __bootstrap()
         // request .. to get
         // router to route
 
+        /*
+        * import module
+        */
+        self::register('module', function ($args, &$scope) {
+            Module::import($args->import);
+        });
+
+        /*
+        * set asset
+        */
+        self::register('asset', function ($args, &$scope) {
+            if(!isset($args->scope))$args->scope = "vendor";
+
+            if(isset($args->type) && $args->type == "script"){
+                Asset::script($args->src, $args->scope);
+            }else{
+                Asset::style($args->src, $args->scope);
+            }
+        });
+
         /*
         * get request from header
         */

From 0dc211074cde9ceed7d42f665fc00a30882e4efa Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Wed, 11 May 2016 23:41:02 +0300
Subject: [PATCH 066/114] Directive update

router now has route arg in it
query-object now support order
repeat directive now can explode items
new short if directive
new short if pointer directive
new inCallArr scope as array call .. need some new idea to loop all in one directive not 2
scope now trim every var come inside
---
 system/module/Directives.php | 199 +++++++++++++++++++++++++++++++++--
 1 file changed, 192 insertions(+), 7 deletions(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index a9d6330..e0533c5 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -95,9 +95,10 @@ public static function __bootstrap()
 			$route = explode("/", $args->route);
 			$route = $route[0];
 
-			return Router::is($route, $args->param, function(&$scope, $router) use ($args){
+			return Router::is($route, $args->param, function(&$scope, $router) use ($args, $route){
 				$name = isset($args->scope) ? $args->scope : 'router';
-	            $scope->{$name} = $router;
+                $router->route = $route;
+                $scope->{$name} = $router;
 				return Shortcode::trigger($args->content);
 			});
 
@@ -119,7 +120,9 @@ public static function __bootstrap()
         self::register('query-object', function ($args, &$scope) {
             $where = isset($args->where) ? (array) String::json(Shortcode::trigger($args->where)) : null;
             $limit = isset($args->limit) ? isset($args->offset) ? "{$args->offset},{$args->limit}" : $args->limit : null;
-            $query = Object::fetch($args->taxonomy, $args->param, $where, ['limit' => $limit]);
+            $order = isset($args->order) ? $args->order : null;
+            $query = Object::fetch($args->taxonomy, $args->param, $where, ['limit' => $limit,"order"=>$order]);
+            // d($query);
             $scope->{$args->as} = $query->status?$query->record:[];
         });
 
@@ -129,8 +132,11 @@ public static function __bootstrap()
         */
         self::register('repeat', function ($args, &$scope) { // TODO : filter by ( like whether)
             $str = '';
-
-            foreach (Directives::scope($args->items) as $k => $v) {
+            $arr = Directives::scope($args->items);
+            if(isset($args->explode)){
+                $arr = explode($args->explode, $arr);
+            }
+            foreach ($arr as $k => $v) {
                 Controller::$scope->{$args->as} = $v;
                 if (is_null($args->{'index'})) {
                     Controller::$scope->{"{$ex[0]}Index"} = $k;
@@ -165,17 +171,195 @@ public static function __bootstrap()
                 return $str;
             },
         ));
+        /*
+        * directive Short If
+        * Description : Looping array
+        * Usage : ${var = 'string'?'yes':'not'}
+        */
+        Shortcode::register(array(
+            'code' => 'shortif',
+            'pattern' => '#\${(.+)\?(.*)\:(.*)}#Usi',
+            'callback' => function ($match) {
+                $parse = function ($v) {
+                    $v = trim($v);
+                    if (strpos($v, '"') === 0) {
+                        $v = rtrim($v, '"');
+                        $v = ltrim($v, '"');
+                        return $v;
+                    } elseif (strpos($v, "'") === 0) {
+                        $v = rtrim($v, "'");
+                        $v = ltrim($v, "'");
 
+                        return $v;
+                    } elseif ($v == 'true') {
+                        return true;
+                    } elseif ($v == 'false') {
+                        return false;
+                    } elseif ($v == 'null') {
+                        return '';
+                    } else {
+                        return Directives::scope($v);
+                    }
+                };
+                $ok = true;
+
+                $match[2] = $parse($match[2]);
+                $match[3] = $parse($match[3]);
+
+                if (strpos($match[1], '=') !== false) {
+                    $ex = explode('=', trim($match[1]));
+
+                    if ($parse($ex[0]) == $parse($ex[1])) {
+                        return Shortcode::trigger($match[2]);
+                    }else{
+                        return Shortcode::trigger($match[3]);
+                    }
+                } elseif (strpos($match[1], '!=') !== false) {
+                    $ex = explode('!=', trim($match[1]));
+                    if ($parse($ex[0]) != $parse($ex[1])) {
+                        return Shortcode::trigger($match[2]);
+                    }else{
+                        return Shortcode::trigger($match[3]);
+                    }
+                } elseif (strpos($match[1], 'isset') !== false) {
+                    if (strpos(trim($match[1]), '!') === 0) {
+                        $not = 1;
+                    } else {
+                        $not = 0;
+                    }
+
+                    $ex = substr(trim($match[1]), 6 + $not, -1);//explode("isset",trim());
+
+                    if ($not) {
+                        if (is_null($parse($ex))) {
+                            return Shortcode::trigger($match[2]);
+                        }else{
+                            return Shortcode::trigger($match[3]);
+                        }
+                    } else {
+                        if (!is_null($parse($ex))) {
+                            return Shortcode::trigger($match[2]);
+                        }else{
+                            return Shortcode::trigger($match[3]);
+                        }
+                    }
+                }
+
+                return;
+            },
+        ));
+        /*
+        * directive Short If
+        * Description : Looping array
+        * Usage : ${router.taxo='safari'=>'active'}
+        */
+        Shortcode::register(array(
+            'code' => 'shortif_pointer',
+            'pattern' => '#\${(.+)\=\>(.*)}#Usi',
+            'callback' => function ($match) {
+                $parse = function ($v) {
+                    $v = trim($v);
+                    if (strpos($v, '"') === 0) {
+                        $v = rtrim($v, '"');
+                        $v = ltrim($v, '"');
+                        return $v;
+                    } elseif (strpos($v, "'") === 0) {
+                        $v = rtrim($v, "'");
+                        $v = ltrim($v, "'");
+
+                        return $v;
+                    } elseif ($v == 'true') {
+                        return true;
+                    } elseif ($v == 'false') {
+                        return false;
+                    } elseif ($v == 'null') {
+                        return '';
+                    } else {
+                        return Directives::scope($v);
+                    }
+                };
+                $ok = true;
+
+                $match[2] = $parse($match[2]);
+                $match[3] = isset($match[3])?$parse($match[3]):"";
+
+                if (strpos($match[1], '=') !== false) {
+                    $ex = explode('=', trim($match[1]));
+
+                    if ($parse($ex[0]) == $parse($ex[1])) {
+                        return Shortcode::trigger($match[2]);
+                    }else{
+                        return Shortcode::trigger($match[3]);
+                    }
+                } elseif (strpos($match[1], '!=') !== false) {
+                    $ex = explode('!=', trim($match[1]));
+                    if ($parse($ex[0]) != $parse($ex[1])) {
+                        return Shortcode::trigger($match[2]);
+                    }else{
+                        return Shortcode::trigger($match[3]);
+                    }
+                } elseif (strpos($match[1], 'isset') !== false) {
+                    if (strpos(trim($match[1]), '!') === 0) {
+                        $not = 1;
+                    } else {
+                        $not = 0;
+                    }
+
+                    $ex = substr(trim($match[1]), 6 + $not, -1);//explode("isset",trim());
+
+                    if ($not) {
+                        if (is_null($parse($ex))) {
+                            return Shortcode::trigger($match[2]);
+                        }else{
+                            return Shortcode::trigger($match[3]);
+                        }
+                    } else {
+                        if (!is_null($parse($ex))) {
+                            return Shortcode::trigger($match[2]);
+                        }else{
+                            return Shortcode::trigger($match[3]);
+                        }
+                    }
+                }
+
+                return;
+            },
+        ));
         /*
         * directive Scope
         * Description : Scoping variables
         */
 
         // support new method until remove support for old one
+        Shortcode::register(array(
+            'code' => 'newScope$B',
+            'pattern' => '#\$\[(.+)\]#Usi',
+            // 'pattern' => '#\${(.+\${(.+)}.+|(.+))}#Usi',
+            'callback' => function ($match) {
+
+                $filter = explode('|', $match[1]);//check ex for plugins like lower
+                $match[1] = $filter[0];
+
+                $val = Directives::scope($match[1]);
+
+                if (isset($filter[1])) {
+                    $f = trim($filter[1]);
+                    if ($f == 'upper') {
+                        $val = strtoupper($val);
+                    } elseif ($f == 'escape') {
+                        $val = htmlspecialchars($val, ENT_QUOTES, 'UTF-8');
+                    }
+                }
+
+                return $val;
+            },
+        ));
         Shortcode::register(array(
             'code' => 'newScope$',
             'pattern' => '#\${(.+)}#Usi',
+            // 'pattern' => '#\${(.+\${(.+)}.+|(.+))}#Usi',
             'callback' => function ($match) {
+
                 $filter = explode('|', $match[1]);//check ex for plugins like lower
                 $match[1] = $filter[0];
 
@@ -246,7 +430,7 @@ public static function __bootstrap()
         ));
 
         /*
-        * directive Each
+        * directive If
         * Description : Looping array
         */
         Shortcode::register(array(
@@ -506,7 +690,8 @@ public static function __bootstrap()
 
     private static function scope($v)
     {
-        if (is_numeric(trim($v))) {
+        $v = trim($v);
+        if (is_numeric($v)) {
             return $v;
         }
         $val = Controller::$scope;

From 636134124a8f4b4b0b82a2d986f36b190c9c9aac Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Wed, 11 May 2016 23:41:56 +0300
Subject: [PATCH 067/114] string now accept json to call where in query object
 directive

---
 system/core/String.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/system/core/String.php b/system/core/String.php
index 9f74d13..6058483 100644
--- a/system/core/String.php
+++ b/system/core/String.php
@@ -335,6 +335,27 @@ public static function xml_parse_attr($att){
 
 	// --------------------------------------------------------------------
 
+	/**
+	 * json
+	 *
+	 * Parse XML, Shortcode Attributes
+	 *
+	 * @access	public
+	 * @param	string attribute string ex (name='abc' value='def')
+	 * @return	array
+	 */
+	public static function json($s){
+        $s = str_replace(
+            array('"',  "'"),
+            array('\"', '"'),
+            $s
+        );
+        $s = preg_replace('/(\w+):/i', '"\1":', $s);
+		return json_decode($s);
+	}
+
+	// --------------------------------------------------------------------
+
 	/**
 	 * ontime
 	 *

From ab869986771e847c306530b60877673111be6830 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Wed, 11 May 2016 23:42:27 +0300
Subject: [PATCH 068/114] object now accept multiple taxonomies

---
 system/module/Object.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/system/module/Object.php b/system/module/Object.php
index 0a70f90..0331d87 100644
--- a/system/module/Object.php
+++ b/system/module/Object.php
@@ -2,7 +2,7 @@
 /**
  * Purecis Object Module
  *
- * control URL Parameters 
+ * control URL Parameters
  *
  * @package		codeHive
  * @subpackage	Module
@@ -19,16 +19,16 @@ class Object{
 	 * Fetching Data from Object table by Taxonomy
 	 *
 	 * @access	public
-	 * @param	taxonomy string 
-	 * @param	array 	sql array 
+	 * @param	taxonomy string
+	 * @param	array 	sql array
 	 * @return	void
 	 */
 	public static function get( $taxonomy, $arr=array() ){
 		Module::import("Query");
 
 		if(!is_array($arr["where"]))$arr['where'] = array();
-		$arr['where']['taxonomy'] = $taxonomy;
-
+		$taxonomy = explode(",", $taxonomy);
+		$arr['where']['taxonomy'] = ":in:'".implode("','",$taxonomy)."'";
 		return Query::get("objects",$arr);
 	}
 
@@ -38,8 +38,8 @@ public static function get( $taxonomy, $arr=array() ){
 	 * Fetching Data from Object table by Taxonomy
 	 *
 	 * @access	public
-	 * @param	taxonomy string 
-	 * @param	array 	data array 
+	 * @param	taxonomy string
+	 * @param	array 	data array
 	 * @return	void
 	 */
 	public static function fetch( $taxonomy, $data=array(), $where=array(), $additional=array() ){
@@ -51,4 +51,4 @@ public static function fetch( $taxonomy, $data=array(), $where=array(), $additio
 }
 
 /* End of file Object.php */
-/* Location: ./system/module/Object.php */
\ No newline at end of file
+/* Location: ./system/module/Object.php */

From 697c3891f45316fce160cb5543f35647454ea820 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Thu, 12 May 2016 10:05:05 +0300
Subject: [PATCH 069/114] star parse in query builder

---
 system/module/QueryBuilder.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index b01aa88..8c6caad 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -460,10 +460,18 @@ private function _col()
         //     return $this->_col($args[0],"single");
         } elseif (substr_count($args[0], '.') == 1 && !isset($args[1])) {
             $exp = explode('.', $args[0]);
-
-            return "`{$exp[0]}`.`{$exp[1]}`";
+            if($exp[1] == "*"){
+                return "`{$exp[0]}`.{$exp[1]}";
+            }else{
+                return "`{$exp[0]}`.`{$exp[1]}`";
+            }
         } elseif (isset($args[1]) && $args[1] == 'single') {
-            return "`{$args[0]}`";
+            if($args[0] == "*"){
+                return $args[0];
+            }else{
+                return "`{$args[0]}`";
+            }
+
         } elseif (isset($args[1]) && $args[1] == 'string') {
             if (is_array($args[0])) {
                 return "('".implode("', '", $args[0])."')";

From 8d9310f84de70ce1a094d0bee3ddd29b9d7ebc15 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Thu, 12 May 2016 10:08:13 +0300
Subject: [PATCH 070/114] fix star in query builder

---
 system/module/QueryBuilder.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index 8c6caad..264255b 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -466,11 +466,7 @@ private function _col()
                 return "`{$exp[0]}`.`{$exp[1]}`";
             }
         } elseif (isset($args[1]) && $args[1] == 'single') {
-            if($args[0] == "*"){
-                return $args[0];
-            }else{
-                return "`{$args[0]}`";
-            }
+            return "`{$args[0]}`";
 
         } elseif (isset($args[1]) && $args[1] == 'string') {
             if (is_array($args[0])) {
@@ -479,7 +475,12 @@ private function _col()
                 return "'".String::escape($args[0])."'";
             }
         } else {
-            return "`{$this->table}`.`{$args[0]}`";
+            if($args[0] == "*"){
+                return "`{$this->table}`.{$args[0]}";
+            }else{
+                return "`{$this->table}`.`{$args[0]}`";
+            }
+
         }
     }
 

From 3761be2fef4b0ba80c8413b22b7f01124c6f3e55 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sun, 15 May 2016 10:34:20 +0300
Subject: [PATCH 071/114] fix join on, fix multiple error handling

---
 system/module/QueryBuilder.php | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index 264255b..fd032ad 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -268,15 +268,26 @@ private function withParse()
 
             $newQuery = $q->get();
 
-            foreach ($this->records->record as $record) {
-                $record->{$q->appear} = array_values(array_filter(
-                $newQuery->record,
-                function ($e) use ($q, $record) {
-                    // TODO : support `in` method
-                    // TODO : shift name if send with dot
-                    return $e->{$q->withSecColumn} == $record->{$q->withFirstColumn};
-                }));
-                // TODO: remove the sec column from the child if not sended
+            if($newQuery->status){
+                foreach ($this->records->record as $record) {
+                    $record->{$q->appear} = array_values(array_filter(
+                    $newQuery->record,
+                    function ($e) use ($q, $record) {
+                        // TODO : support `in` method
+                        // TODO : shift name if send with dot
+                        return $e->{$q->withSecColumn} == $record->{$q->withFirstColumn};
+                    }));
+                    // TODO: remove the sec column from the child if not sended
+                }
+            }else{
+                if (isset($this->records->error) && is_string($this->records->error)) {
+                    $temp = $this->records->error;
+                    $this->records->error = [];
+                    array_push($this->records->error, $temp);
+                }else{
+                    $this->records->error = [];
+                }
+                array_push($this->records->error, $newQuery->error);
             }
 
             if (is_string($this->records->sql)) {
@@ -582,7 +593,7 @@ private function _joinParse($args)
             $q->table($this->table);
             call_user_func($args[0], $q);
 
-            return $q->join_on;
+            return $str.$q->join_on;
         } else {
             call_user_func_array(array($this, 'on'), $args);
             $str .= $this->join_on;

From bae36cba936af565b119b8a10db4001a43e67960 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sun, 15 May 2016 10:42:44 +0300
Subject: [PATCH 072/114] support for multiple join types (left, right, outer,
 inner)

---
 system/module/QueryBuilder.php | 37 ++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index fd032ad..141cc61 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -105,6 +105,35 @@ public function join()
 
         return $this;
     }
+    public function leftJoin()
+    {
+        $args = func_get_args();
+        $this->join .= $this->_joinParse($args, "LEFT");
+
+        return $this;
+    }
+    public function rightJoin()
+    {
+        $args = func_get_args();
+        $this->join .= $this->_joinParse($args, "RIGHT");
+
+        return $this;
+    }
+    public function outerJoin()
+    {
+        // TODO : support right outer and left outer
+        $args = func_get_args();
+        $this->join .= $this->_joinParse($args, "FULL OUTER");
+
+        return $this;
+    }
+    public function innerJoin()
+    {
+        $args = func_get_args();
+        $this->join .= $this->_joinParse($args, "INNER");
+
+        return $this;
+    }
 
     public function on()
     {
@@ -581,10 +610,14 @@ private function _unionParse($args)
         return '';
     }
 
-    private function _joinParse($args)
+    private function _joinParse($args, $place = false)
     {
         $this->join_on = '';
-        $str = ' LEFT JOIN ';
+        $str = "";
+        if($place){
+            $str .= " {$place}";
+        }
+        $str .= ' JOIN ';
         $str .= $this->_table($args[0]);
         array_shift($args);
 

From 5ae02593974cd2a7e154077e376647e859cad3ef Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 16 May 2016 12:51:03 +0300
Subject: [PATCH 073/114] check if any callback is instant of Closure

---
 system/module/QueryBuilder.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index 141cc61..8fa43e0 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -285,7 +285,7 @@ private function withParse()
 
             $q->masterQuery = clone $this;
 
-            if (is_callable($args[1])) {
+            if (is_callable($args[1]) && $args[1] instanceof Closure) {
                 call_user_func($args[1], $q);
                 if (array_search($q->withSecColumn, $q->param) === false && sizeof($q->param)) {
                     array_push($q->param, $q->withSecColumn);
@@ -479,7 +479,7 @@ private function _col()
             return $temp;
         }
 
-        if (is_callable($args[0])) {
+        if (is_callable($args[0]) && $args[0] instanceof Closure) {
             $q = new self();
             call_user_func($args[0], $q);
 
@@ -600,7 +600,7 @@ private function _unionParse($args)
 
         if ($args[0] instanceof self) {
             return " UNION {$args[1]}".$args[0]->_get(true);
-        } elseif (is_callable($args[0])) {
+        } elseif (is_callable($args[0]) && $args[0] instanceof Closure) {
             $q = new self();
             call_user_func($args[0], $q);
 
@@ -621,7 +621,7 @@ private function _joinParse($args, $place = false)
         $str .= $this->_table($args[0]);
         array_shift($args);
 
-        if (is_callable($args[0])) {
+        if (is_callable($args[0]) && $args[0] instanceof Closure) {
             $q = new self();
             $q->table($this->table);
             call_user_func($args[0], $q);
@@ -637,7 +637,7 @@ private function _joinParse($args, $place = false)
 
     private function _whereParse($args)
     {
-        if (is_callable($args[0])) {
+        if (is_callable($args[0]) && $args[0] instanceof Closure) {
             $q = new self();
             $q->table($this->table);
             call_user_func($args[0], $q);

From 48b9737057bb29e5b36bbd67471b2511aedf2fad Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 17 May 2016 12:13:31 +0300
Subject: [PATCH 074/114] support url request

---
 system/core/File.php | 53 +++++++++++++++++++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/system/core/File.php b/system/core/File.php
index 64bafb1..8803931 100644
--- a/system/core/File.php
+++ b/system/core/File.php
@@ -57,18 +57,18 @@ public static function extension($filename){
 	public static function Download($local_file,$download_file='fileName',$download_rate=null){//4096
 		if(file_exists($local_file) && is_file($local_file)){
 			header('Cache-control: private');
-			header('Content-Type: application/octet-stream'); 
+			header('Content-Type: application/octet-stream');
 			header('Content-Length: '.filesize($local_file));
 			header('Content-Disposition: filename='.$download_file);
 
-			flush();    
-			$file = fopen($local_file, "r");    
+			flush();
+			$file = fopen($local_file, "r");
 			while(!feof($file)){
-				if($download_rate)print fread($file, round($download_rate * 1024));    
-				else print fread($file);    
+				if($download_rate)print fread($file, round($download_rate * 1024));
+				else print fread($file);
 				flush();
-			  if($download_rate)sleep(1);    
-			};    
+			  if($download_rate)sleep(1);
+			};
 			fclose($file);
 		}else{
 			die('Error: The file '.$local_file.' does not exist!');
@@ -96,7 +96,44 @@ public static function fetchUrl($url,$file,$type=false) {
 			return file_put_contents($filename, $s);
 		}
 	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Fetch URL
+	 *
+	 * Fetching link from another host and save it locally
+	 *
+	 * @access	public
+	 * @param	string 	File or URL to fetch
+	 * @param	string 	Where to save
+	 * @param	boolean Type wither use copy or content getter (cg use more memory)
+	 * @return	mixen
+	 */
+	public static function request($url) {
+		if (extension_loaded('curl')) {
+			$ch = curl_init() or die ( curl_error() );
+			$timeout = 10;
+			curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false);
+			curl_setopt( $ch, CURLOPT_URL, $url );
+			curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
+			curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+			$data = curl_exec( $ch );
+			curl_close( $ch );
+
+			if($data) {
+				return (new SimpleXMLElement($data));
+			}else{
+				return false;
+			}
+		}else{
+			if(($data = file_get_contents($url)) === false){
+				return false;
+			}
+			return $data;
+		}
+	}
 }
 
 /* End of file File.php */
-/* Location: ./system/core/File.php */
\ No newline at end of file
+/* Location: ./system/core/File.php */

From 07d7b4d5df51862ad54fef1ef8b1f0ec86e7b554 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 21 May 2016 21:03:05 +0300
Subject: [PATCH 075/114] working on new update v2.1

fix when no modules in config
update all files to global APP_PATH
update alot of things
---
 README.md                              |  68 ++++-----
 apps/sample/config.php                 | 108 +++++++-------
 index.php                              |  29 ++--
 system/core/Asset.php                  |  11 +-
 system/core/CLI.php                    | 192 +++++++++++++++++++++++++
 system/core/Controller.php             |   8 +-
 system/core/File.php                   |   8 +-
 system/core/Module.php                 |   8 +-
 system/core/View.php                   |   2 +-
 system/core/codeHive.php               |  27 +++-
 system/module/API.php                  |   6 +-
 system/module/Internationalization.php |   4 +-
 system/module/Router.php               |   2 +-
 13 files changed, 334 insertions(+), 139 deletions(-)
 create mode 100644 system/core/CLI.php

diff --git a/README.md b/README.md
index 0139b64..4727a6e 100644
--- a/README.md
+++ b/README.md
@@ -1,59 +1,41 @@
-## CodeHive PHP Framework v2.0 
-***
-codeHive is a lightweight web Application Development Framework with expressive elegant syntax. codeHive gives you an MVC structure allowing you to concentrate on the fun stuff while building web applications.
-
-codeHive is tiny in code and huge in thought. Being lightweight and simple is fundamental to codeHive.
-
-
-
+# CodeHive PHP Framework v2.1
 
-### Core values
-
-* MVC - The MVC pattern, or Model View Controller, is at the heart of codeHive applications. It ensures your application is modular, name-spaced and doesn't descend into a mess of view and model logic by having a consistent architecture. It's great for teams, and brings a well needed structure to PHP development.
-
-* Simplicity - codeHive is a minimum possible viable product. It doesn't dictate you it way of programming, you can chose how to play with code in many ways, even your way, It is a huge framework consisting of different kinds of widgets and modules. The goal is to get things out of your way, letting you go ahead and do what you do best, build awesome web applications.
-
-* Extensions : every thing you need is one step away from your hands, just put the extension in the extension folder then import it in your code, and you can create your own extensions and module in a minitues 
-
-* Query - codeHive has new way to query, you can use normal sql way or our own Special NoSql method, its even work with mysql, its smart way to use sql as noSql.
+--------------------------------------------------------------------------------
 
+codeHive is a lightweight web Application Development Framework with expressive elegant syntax. codeHive gives you an MVC structure allowing you to concentrate on the fun stuff while building web applications.
 
+codeHive is tiny in code and huge in thought. Being lightweight and simple is fundamental to codeHive.
 
-### Why should you use codeHive
+## Core values
+- `MVC` - The MVC pattern, or Model View Controller, is at the heart of codeHive applications. It ensures your application is modular, name-spaced and doesn't descend into a mess of view and model logic by having a consistent architecture. It's great for teams, and brings a well needed structure to PHP development.
+- `Modular` ... 
+- `Simplicity` - codeHive is a minimum possible viable product. It doesn't dictate you it way of programming, you can chose how to play with code in many ways, even your way, It is a huge framework consisting of different kinds of widgets and modules. The goal is to get things out of your way, letting you go ahead and do what you do best, build awesome web applications.
+- `Extensions` : every thing you need is one step away from your hands, just put the extension in the extension folder then import it in your code, and you can create your own extensions and module in a minutes
+- `Query` - codeHive has new way to query, you can use normal sql way or our own Special NoSql method, its even work with mysql, its smart way to use sql as noSql.
 
+## Why should you use codeHive
 `PHP frameworks are a dime a dozen, and more are appearing everyday. So what makes codeHive so special?`
-
-
-* Built in a real-world environment
-* Tiny foorprint in CPU and Memory
-* Great performance
-* Smart debugger
-* Simple and lightweight
-* Minimal dependencies
-* Very Approachable Source Code
-* Great documentation
-* and the most imporatnt thing, its OpenSource
-
-
-
-## Official Documentation
-
+- Built in a real-world environment
+- Tiny foorprint in CPU and Memory
+- Great performance
+- Smart debugger
+- Simple and lightweight
+- Minimal dependencies
+- Very Approachable Source Code
+- Great documentation
+- and the most imporatnt thing, its OpenSource
+
+# Official Documentation
 Documentation for the framework can be found on the [Purecis website](http://codehive.purecis.com/docs).
 
 or you can build it by your self using spinix after you checkout the code and for API documentation use APIGen to Generate new api documentation by using :
 
 apigen generate -s system -d api --template-theme "bootstrap"
 
-
-## Contributing
-
+# Contributing
 Thank you for considering contributing to the codeHive framework! The contribution guide can be found in the [codeHive documentation](http://codehive.purecis.com/docs/contributions).
 
-### License
-
-Copyright (c) 2004 - 2015, Purecis, Inc.
-All rights reserved.
+## License
+Copyright (c) 2013 - 2015, Purecis, Inc. All rights reserved.
 
 The codeHive framework is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
-
-
diff --git a/apps/sample/config.php b/apps/sample/config.php
index eab5f0c..0efba68 100644
--- a/apps/sample/config.php
+++ b/apps/sample/config.php
@@ -1,5 +1,8 @@
-<?php  if (!defined('VERSION'))exit('Direct access to this location is not permitted.');
-/**
+<?php
+ if (!defined('VERSION')) {
+     exit('Direct access to this location is not permitted.');
+ }
+/*
 * CONFIG File
 *
 * @package		codeHive
@@ -10,54 +13,55 @@
 */
 
 return array(
-	"index" => "index.php",
-	// title for the app
-	"title" 	=> "Sample App",
-
-	// app, website, api, cli
-	"type" 		=> "app",
-
-	// plugins that the app will load
-	"modules" 	=> array(),
-
-	/**
-	 * Define DataBase and Connection
-	 *
-	 * Acceptable Database Types (sqlite,mysql,pgsql,oracle,firebird,infomix,dblib,odbc)
-	 *
-	 */
-	"database" 	=> array(
-		"type" => "mysql",
-		"host" => "localhost",
-		"port" => "3306",
-		"name" => "purecis-v2",
-		"user" => "root",
-		"pass" => "root",
-		"prefix"=> ""
-	),
-
-	/**
-	 * Define Upload
-	*/
-	"upload" => array(
-		"maxsize" => 32,
-		"public"  => "JPG,JPEG,PNG,GIF,MP3,WAV,PDF,MP4",
-		"private" => "JPG,JPEG,PNG,GIF,MP3,M4A,OGG,WAV,MP4,M4V,MOV,WMV,AVI,MPG,OGV,3GP,3G2,PDF,ODT,DOC,DOCX,XLS,XLSX,PPT,PPTX,PPS,PPSX,RAR,ZIP,GZ,TAR",
-		"thumbnails" => array(
-			'xs' 	=> 150,
-			'sm' 	=> 300,
-			'md' 	=> 600,
-			'lg' 	=> 1200
-		)
-	),
-
-	"license" => array(
-		"key" 		=> "56500ef9db9a04820cd29cd444cab675",
-		"secret" 	=> "56500ef9db9a04820cd29cd444cab675",
-		"hash" 		=> md5('0598251486'),//for passwords on this site
-	),
-
-	// development, production, debug
-	"ENVIRONMENT" => "debug"
+    'index' => 'index.php',
+    // title for the app
+    'title' => 'Sample App',
+
+    // app, website, api, cli
+    'type' => 'app',
+
+    // plugins that the app will load
+    'modules' => array(),
+
+    /*
+     * Define DataBase and Connection
+     *
+     * Acceptable Database Types (sqlite,mysql,pgsql,oracle,firebird,infomix,dblib,odbc)
+     *
+     */
+    'database' => array(
+        'type' => 'mysql',
+        'host' => 'localhost',
+        'port' => '3306',
+        'name' => 'purecis-v2',
+        'user' => 'root',
+        'pass' => 'root',
+        'prefix' => '',
+    ),
+
+    /*
+     * Define Upload
+    */
+    'upload' => array(
+        'maxsize' => 32,
+        'public' => 'JPG,JPEG,PNG,GIF,MP3,WAV,PDF,MP4',
+        'private' => 'JPG,JPEG,PNG,GIF,MP3,M4A,OGG,WAV,MP4,M4V,MOV,WMV,AVI,MPG,OGV,3GP,3G2,PDF,ODT,DOC,DOCX,XLS,XLSX,PPT,PPTX,PPS,PPSX,RAR,ZIP,GZ,TAR',
+        'thumbnails' => array(
+            'xs' => 150,
+            'sm' => 300,
+            'md' => 600,
+            'lg' => 1200,
+        ),
+    ),
+
+    'license' => array(
+        'key' => '56500ef9db9a04820cd29cd444cab675',
+        'secret' => '56500ef9db9a04820cd29cd444cab675',
+        'hash' => md5('0598251486'), //for passwords on this site
+    ),
+
+    'timezone' => 'Asia/Jerusalem',
+
+    // development, production, trace
+    'ENVIRONMENT' => 'trace',
 );
-?>
\ No newline at end of file
diff --git a/index.php b/index.php
index b8489ce..588fce7 100644
--- a/index.php
+++ b/index.php
@@ -1,31 +1,28 @@
 <?php
 /**
- * Purecis codeHive Class
+ * codeHive Excute File.
  *
- * bootstrap class 
- *
- * @package		codeHive
- * @subpackage	Core
- * @category	Libraries
  * @author		Purecis Dev Team
- * @copyright	Copyright (c) 2004 - 2015, Purecis, Inc.
+ * @copyright	Copyright (c) 2013 - 2016, Purecis, Inc.
  * @license		http://purecis.com/license
+ *
  * @link		http://purecis.com
  * @since		Version 2.0
  * @filesource
  */
-
 session_start();
 
-include "system/core/codeHive.php";
+include 'system/core/codeHive.php';
+
+codeHive::start(array(
+    'app' => 'online-exam',
 
-$start = array(
-	"app" 		=> "apps/sample",
-	"assets" 	=> "assets",
-	"system" 	=> "system"
-); 
+    // define folders
+    'container' => "apps",
+    'assets' => 'assets',
+    'system' => 'system',
+));
 
-codeHive::start($start);
 
 /* End of file index.php */
-/* Location: ./index.php */
\ No newline at end of file
+/* Location: ./index.php */
diff --git a/system/core/Asset.php b/system/core/Asset.php
index 1da981d..06f9601 100644
--- a/system/core/Asset.php
+++ b/system/core/Asset.php
@@ -41,9 +41,9 @@ public static function __bootstrap()
         global $config;
         self::define('path', '{}');
         self::define('path.base', Request::base());
-        self::define('path.app', Request::base($config['app']));
-        self::define('path.view', Request::base("{$config['app']}/view"));
-        self::define('path.vendor', Request::base("{$config['app']}/vendor"));
+        self::define('path.app', Request::base(APP_PATH));
+        self::define('path.view', Request::base(APP_PATH."/view"));
+        self::define('path.vendor', Request::base(APP_PATH."/vendor"));
         self::define('path.library', Request::base("{$config['assets']}/library"));
         self::define('path.domain', Request::domain());
 
@@ -104,12 +104,11 @@ public static function variables()
      */
     private static function src_parser($src, $folder, $ext = false)
     {
-        global $config;
         if (strpos($src, '://') === false) { // check is external
             $ex = explode('@', $src);
             $path = (sizeof($ex) > 1) ? Module::path($ex[1]) : false;
             if (!$path) {
-                $path = "{$config['app']}";
+                $path = APP_PATH;
             } else {
                 $src = $ex[0];
             }
@@ -178,7 +177,7 @@ public static function vendor($src = '')
     {
         global $config;
 
-        return Request::base("{$config['app']}/vendor{$src}");
+        return Request::base(APP_PATH."/vendor{$src}");
     }
 }
 
diff --git a/system/core/CLI.php b/system/core/CLI.php
new file mode 100644
index 0000000..7a7e14c
--- /dev/null
+++ b/system/core/CLI.php
@@ -0,0 +1,192 @@
+<?php
+
+defined('VERSION') or exit('Direct access to this location is not permitted');
+
+/**
+ * codeHive CLI.
+ *
+ * Command Line Interface.
+ *
+ * @category    core
+ *
+ * @author      Tamer Zorba <abo.al.tot@gmail.com>
+ * @copyright   Copyright (c) 2013 - 2016, PureCore International Solutions (http://purecis.com/)
+ * @license     http://opensource.org/licenses/MIT	MIT License
+ *
+ * @link       http://codehive.purecis.com/package/CLI
+ * @since      File available since Release 2.1.0
+ *
+ * @version    V: 2.1.0
+ */
+class CLI
+{
+    /**
+     * progressbar text.
+     * ██▓▒░-
+     *
+     */
+     public static $progressbar = [
+         "╢",      // start
+         "█",      // fill
+         "░",      // empty
+         "",      // splitter
+         "╟",      // end
+         "        "// "in %d sec..." // time message
+     ];
+
+     /**
+      * cli colors.
+      */
+     public static $color = [
+         "lightgray"    => "\033[97m",
+         "green"        => "\033[32m",
+         "default"      => "\033[0m",
+         "blink"        => "\e[5m"
+     ];
+
+     public static $brand = "\033[97m
+       ██████╗ ██████╗ ██████╗ ███████╗██╗  ██╗██╗██╗   ██╗███████╗
+      ██╔════╝██╔═══██╗██╔══██╗██╔════╝██║  ██║██║██║   ██║██╔════╝
+      ██║     ██║   ██║██║  ██║█████╗  ███████║██║██║   ██║█████╗
+      ██║     ██║   ██║██║  ██║██╔══╝  ██╔══██║██║╚██╗ ██╔╝██╔══╝
+      ╚██████╗╚██████╔╝██████╔╝███████╗██║  ██║██║ ╚████╔╝ ███████╗
+       ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝╚═╝  ╚═╝╚═╝  ╚═══╝  ╚══════╝
+     \033[0m\n";
+
+    /**
+     * get the .
+     *
+     * @param	string 	$link
+     * @param	string 	$target
+     * @param	string 	$progress
+     *
+     * @return content
+     */
+    public static function fetch($link, $target=false, $progress=false){
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $link);
+        curl_setopt($ch, CURLOPT_BUFFERSIZE,1280);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        if($progress){
+            curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($resource, $total, $done){
+                self::percantageProgress($done, $total, 100);
+            });
+            curl_setopt($ch, CURLOPT_NOPROGRESS, false); // needed to make progress function work
+        }
+        curl_setopt($ch, CURLOPT_HEADER, 0);
+        curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
+        $content = curl_exec($ch);
+        curl_close($ch);
+
+        echo "\n";
+
+        if($target)return file_put_contents($target, $content);
+        else return $content;
+    }
+
+    /**
+     * CLI Percentage Progress Bar.
+     *
+     * @param	string 	$done     percentage complete
+     * @param	string 	$total    total file size
+     * @param	string 	$size     progress bar size
+     *
+     * @return content
+     */
+    private static function percantageProgress($done, $total, $size=30) {
+
+
+        static $start_time;
+
+        // if we go over our bound, just ignore it
+        if($done > $total || $total == 0) return;
+
+
+        if(empty($start_time)) $start_time=time();
+        $now = time();
+
+        $perc=(double)($done/$total);
+
+        $bar=floor($perc*$size);
+
+        $status_bar="\r" . self::$color['green'] . self::$progressbar[0];
+        $status_bar.=str_repeat(self::$progressbar[1], $bar);
+        if($bar<$size){
+            $status_bar.=self::$progressbar[3];
+            $status_bar.=str_repeat(self::$progressbar[2], $size-$bar);
+        } else {
+            $status_bar.= self::$progressbar[1];
+        }
+
+        $disp=number_format($perc*100, 0);
+
+        $donev = File::format($done);
+        $totalv = File::format($total);
+
+        $status_bar.= self::$progressbar[4] . self::$color['default'] . " $disp%  $donev/$totalv ";
+
+        $rate = $done == 0 ? 0 : ($now-$start_time)/$done;
+        $left = $total - $done;
+        $eta = round($rate * $left, 2);
+
+        $elapsed = $now - $start_time;
+
+
+        $status_bar.= sprintf(self::$progressbar[5], number_format($eta), number_format($elapsed));
+
+        echo $status_bar;
+
+        // flush();
+    }
+
+    /**
+     * install CLI tools to device.
+     *
+     * @param	string 	$done     percentage complete
+     * @param	string 	$total    total file size
+     * @param	string 	$size     progress bar size
+     *
+     * @return content
+     */
+    public static function install(){
+
+        echo self::$brand;
+        echo self::$color['green'];
+        echo "CLI tools Installer\n";
+        echo self::$color['default'];
+
+        // TODO : check platform if windows or unix
+        $php = exec("whereis php");
+        $php = self::ask($php, "defining PHP PATH", "OK PHP PATH defined as");
+        // TODO : check if file exist
+
+        $index = $_SERVER['PWD'] . "/" . $_SERVER['SCRIPT_NAME'];
+        $index = self::ask($index, "defining codeHive index PATH", "OK codeHive index PATH is");
+        // TODO : check if file exist
+
+        $write = "/usr/local/bin/codehive";
+        $write = self::ask($write, "writing codeHive CLI to", "Will Write codeHive to");
+
+        // install codeHive cli to disk
+        @unlink($write);
+        file_put_contents($write, "#!/bin/sh\n{$php} {$index} _cli $@");
+        chmod($write, 0755);
+
+        // install app _cli from internet to apps
+        exit;
+    }
+
+    public static function ask($default, $question, $OK="", $options="enter|path"){
+
+        echo "{$question} ({$default}) ? ({$options}) \n ";
+        $line = trim(fgets(STDIN));
+        if($line != "y" and $line != ""){
+            $default = $line;
+        }
+        echo self::$color['green'] . "\r{$OK} ({$default})\n\n\n\n" . self::$color['default'];
+        return $default;
+    }
+}
+
+/* End of file CLI.php */
+/* Location: ./system/core/CLI.php */
diff --git a/system/core/Controller.php b/system/core/Controller.php
index 7ec8d5a..cd019b1 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -38,10 +38,10 @@ class Controller
     public static function __bootstrap()
     {
         global $config;
-        foreach (glob("{$config['app']}/controller/*.bootstrap.php") as $filename) {
+        foreach (glob(APP_PATH."/controller/*.bootstrap.php") as $filename) {
             require_once $filename;
         }
-        foreach (glob("{$config['app']}/controller/*.init.php") as $filename) {
+        foreach (glob(APP_PATH."/controller/*.init.php") as $filename) {
             require_once $filename;
         }
     }
@@ -100,7 +100,7 @@ public static function trigger($name, $arg = null)
             if (array_key_exists($name, self::$controllers)) {
                 $name = self::$controllers[$name];
             } else {
-                $path = "{$config['app']}/controller/{$name}.php";
+                $path = APP_PATH."/controller/{$name}.php";
                 if (is_file($path)) {
                     require_once $path;
                 }
@@ -110,7 +110,7 @@ public static function trigger($name, $arg = null)
             }
         }
         if (is_array($name)) {
-            $path = "{$config['app']}/controller/{$name[0]}.php";
+            $path = APP_PATH."/controller/{$name[0]}.php";
             if (is_file($path)) {
                 require_once $path;
             }
diff --git a/system/core/File.php b/system/core/File.php
index 8803931..338777f 100644
--- a/system/core/File.php
+++ b/system/core/File.php
@@ -21,9 +21,13 @@ class File{
 	 * @param	integer File size in Bytes
 	 * @return	string
 	 */
-	public static function format($size){
+	public static function format($size, $float=2){
 	    $unit=array('Byte','KB','MB','GB','TB','PB');
-	    return @round($size/pow(1024,($i=floor(log($size,1024)))),2).' '.$unit[$i];
+		$n = round($size/pow(1024,($i=floor(log($size,1024)))),$float);
+		if($float){
+			$n = sprintf("%.{$float}f", $n);
+		}
+	    return $n.' '.$unit[$i];
 	}
 
 	// --------------------------------------------------------------------
diff --git a/system/core/Module.php b/system/core/Module.php
index 6d4eccf..5ff7b49 100644
--- a/system/core/Module.php
+++ b/system/core/Module.php
@@ -29,7 +29,7 @@ class Module
     public static function __bootstrap()
     {
         global $config;
-        self::import($config['modules']);
+        if(sizeof($config['modules']))self::import($config['modules']);
     }
 
     // --------------------------------------------------------------------
@@ -151,13 +151,13 @@ public static function path($mod, $full = false)
             'package',
             'resource',
         );
-        
+
         foreach ($alias as $als) {
-            $path = "{$config['app']}/{$als}/{$mod}/{$file}.php";
+            $path = APP_PATH."/{$als}/{$mod}/{$file}.php";
             if (is_file($path)) {
                 break;
             }
-            $path = "{$config['app']}/devel/{$als}/{$mod}/{$file}.php";
+            $path = APP_PATH."/devel/{$als}/{$mod}/{$file}.php";
             if (is_file($path)) {
                 break;
             }
diff --git a/system/core/View.php b/system/core/View.php
index a924093..4426f74 100644
--- a/system/core/View.php
+++ b/system/core/View.php
@@ -44,7 +44,7 @@ public static function load($tpl, $force = false)
             $path = (sizeof($ex) > 1) ? Module::path($ex[1]) : false;
             $path = "{$path}/view/{$ex[0]}.html";
         } else {
-            $path = "{$config['app']}/view/{$tpl}.html";
+            $path = APP_PATH."/view/{$tpl}.html";
             if (!file_exists($path)) {
                 $path = "{$config['system']}/view/{$tpl}.html";
             }
diff --git a/system/core/codeHive.php b/system/core/codeHive.php
index 938d82e..8748dc9 100644
--- a/system/core/codeHive.php
+++ b/system/core/codeHive.php
@@ -29,16 +29,29 @@ public static function start($start = array('app' => 'app'))
         define('VersionMinor', '1');
         define('VersionPatch', '00');
         define('VersionCode', 'Beta');
-        define('VersionBuild', '3000');
 
-        define('VERSION', 'v.'.VersionMajor.'.'.VersionMinor.'.'.VersionPatch.' '.VersionCode.', Build '.VersionBuild);
+        define('VERSION', 'v.'.VersionMajor.'.'.VersionMinor.'.'.VersionPatch.' '.VersionCode);
 
         $config = array();
         $config['app'] = $start['app'] ?: 'app';
+        $config['container'] = $start['container'] ?: 'apps';
         $config['assets'] = $start['assets'] ?: 'assets';
         $config['system'] = $start['system'] ?: 'system';
 
-        $config = array_merge($config, self::config($config['app']));
+        // check if cli
+        if (substr(php_sapi_name(), 0, 3) == 'cli') {
+            if($_SERVER['argv'][1] == "_cli"){
+                $config['app'] = "_cli";
+            }else if($_SERVER['argv'][1] == "install"){
+                CLI::install();
+            }
+            array_shift($_SERVER['argv']);
+            array_shift($_SERVER['argv']);
+        }
+
+        define('APP_PATH', "{$config['container']}/{$config['app']}");
+
+        $config = array_merge($config, self::config(APP_PATH));
 
         if (!isset($config['settings'])) {
             $config['settings'] = array();
@@ -77,7 +90,7 @@ public static function start($start = array('app' => 'app'))
 
         echo Module::__bootstrap();
 
-        require_once "{$start['app']}/app.php";
+        require_once APP_PATH."/app.php";
 
         echo Module::__shutdown();
 
@@ -88,10 +101,14 @@ public static function start($start = array('app' => 'app'))
 
     private static function config($app)
     {
+        global $config;
+        if($config['app'] == "_cli"){
+            return [];
+        }
         if (!file_exists("{$app}/config.php")) {
             Install::initialize();
             exit;
-        };
+        }
 
         return require_once "{$app}/config.php";
     }
diff --git a/system/module/API.php b/system/module/API.php
index 0cf2f0e..700787c 100644
--- a/system/module/API.php
+++ b/system/module/API.php
@@ -39,12 +39,12 @@ public static function __bootstrap()
             }
 
             $name = $router->fire;
-            $path = "{$config['app']}/controller/api.{$name}.php";
+            $path = APP_PATH."/controller/api.{$name}.php";
             if (!is_file($path)) {
-                $path = "{$config['app']}/controller/{$name}.php";
+                $path = APP_PATH."/controller/{$name}.php";
             }
             if (!is_file($path)) {
-                $path = "{$config['app']}/controller/api.php";
+                $path = APP_PATH."/controller/api.php";
             }
 
             // search in module controller
diff --git a/system/module/Internationalization.php b/system/module/Internationalization.php
index 2af0234..a1d34a9 100644
--- a/system/module/Internationalization.php
+++ b/system/module/Internationalization.php
@@ -147,9 +147,9 @@ public static function prepare($space = false, $force = false)
             }
             $path = Module::path($space)."/language/{$locale}";
         } else {
-            $path = "{$config['app']}/language/{$locale}";
+            $path = APP_PATH."/language/{$locale}";
             if (!file_exists($path)) {
-                $path = "{$config['app']}/locale/{$locale}";
+                $path = APP_PATH."/locale/{$locale}";
             }
             if (!file_exists($path)) {
                 $path = "{$config['system']}/language/{$locale}";
diff --git a/system/module/Router.php b/system/module/Router.php
index 48c99ce..dc95975 100644
--- a/system/module/Router.php
+++ b/system/module/Router.php
@@ -128,7 +128,7 @@ public static function callback()
         $_exist = isset(self::$callback[$mod]) ? true : false;
         if (!$_exist) {
             global $config;
-            $path = "{$config['app']}/controller/{$mod}.php";
+            $path = APP_PATH."/controller/{$mod}.php";
             if (is_file($path)) {
                 require_once $path;
                 $_exist = isset(self::$callback[$mod]) ? true : false;

From 241b9246d5938f96657edc04a53a298427b65cf8 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 21 May 2016 21:03:39 +0300
Subject: [PATCH 076/114] Upload class get content reversed

---
 system/module/Upload.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/module/Upload.php b/system/module/Upload.php
index 17b93be..ae86238 100644
--- a/system/module/Upload.php
+++ b/system/module/Upload.php
@@ -440,6 +440,8 @@ public static function get($arr=array()){
 			//if(isset($arr['taxonomy']))$sql['where']['taxonomy'] = $arr['taxonomy'];
 		}
 
+		$sql["order"] = "desc";
+
 		return Query::get("library",$sql);
 	}
 

From 9063054217e771c0a3df5df1389460ca99661752 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 21 May 2016 21:04:20 +0300
Subject: [PATCH 077/114] update gitignore

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 1a8cc82..7aa83c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,8 @@
 !/apps
 /apps/*
 !/apps/sample
+!/apps/_cli
+!/apps/_global
 
 !LICENSE.md
 !README.md
@@ -68,4 +70,4 @@ $RECYCLE.BIN/
 *.msp
 
 # Windows shortcuts
-*.lnk
\ No newline at end of file
+*.lnk

From 4b5c5bee6a61fc2ab1be4e1ab2e44cf7569815c1 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 28 May 2016 04:26:21 +0300
Subject: [PATCH 078/114] controller directive, fix directives issue, fix json
 str

---
 system/core/Controller.php   |  9 +++++++++
 system/core/String.php       |  2 +-
 system/module/Directives.php | 20 ++++++++++++++------
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/system/core/Controller.php b/system/core/Controller.php
index cd019b1..2ce0292 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -88,6 +88,8 @@ public static function register($name, $fn)
      * @param string $name controller name
      * @param array  $arg  callback arguments
      */
+    // TODO : need to support controller call inside modules
+    // TODO : make all file paths search inside one module and call from all
     public static function trigger($name, $arg = null)
     {
         global $config;
@@ -96,6 +98,13 @@ public static function trigger($name, $arg = null)
             self::$scope = new stdClass();
         }
 
+        if (is_string($name)) {
+            $temp = String::json($name);
+            if($temp){
+                $name = $temp;
+            }
+        }
+
         if (is_string($name)) {
             if (array_key_exists($name, self::$controllers)) {
                 $name = self::$controllers[$name];
diff --git a/system/core/String.php b/system/core/String.php
index 6058483..d3565ff 100644
--- a/system/core/String.php
+++ b/system/core/String.php
@@ -351,7 +351,7 @@ public static function json($s){
             $s
         );
         $s = preg_replace('/(\w+):/i', '"\1":', $s);
-		return json_decode($s);
+		return is_array($s) ? $s : json_decode($s);
 	}
 
 	// --------------------------------------------------------------------
diff --git a/system/module/Directives.php b/system/module/Directives.php
index e0533c5..8165402 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -60,6 +60,14 @@ public static function __bootstrap()
             }
         });
 
+        /*
+        * call controller
+        */
+       // TODO : need to support class call and module insider call
+        self::register('controller', function ($args, &$scope) {            
+            return Controller::trigger($args->name, $args);
+        });
+
         /*
         * get request from header
         */
@@ -178,7 +186,7 @@ public static function __bootstrap()
         */
         Shortcode::register(array(
             'code' => 'shortif',
-            'pattern' => '#\${(.+)\?(.*)\:(.*)}#Usi',
+            'pattern' => '#\${([^}]+)\?([^}]*)\:([^}]*)}#Usi',
             'callback' => function ($match) {
                 $parse = function ($v) {
                     $v = trim($v);
@@ -255,7 +263,7 @@ public static function __bootstrap()
         */
         Shortcode::register(array(
             'code' => 'shortif_pointer',
-            'pattern' => '#\${(.+)\=\>(.*)}#Usi',
+            'pattern' => '#\${([^}]+)\=\>([^}]*)}#Usi',
             'callback' => function ($match) {
                 $parse = function ($v) {
                     $v = trim($v);
@@ -333,7 +341,7 @@ public static function __bootstrap()
         // support new method until remove support for old one
         Shortcode::register(array(
             'code' => 'newScope$B',
-            'pattern' => '#\$\[(.+)\]#Usi',
+            'pattern' => '#\$\[([^}]+)\]#Usi',
             // 'pattern' => '#\${(.+\${(.+)}.+|(.+))}#Usi',
             'callback' => function ($match) {
 
@@ -356,7 +364,7 @@ public static function __bootstrap()
         ));
         Shortcode::register(array(
             'code' => 'newScope$',
-            'pattern' => '#\${(.+)}#Usi',
+            'pattern' => '#\${([^}]+)}#Usi',
             // 'pattern' => '#\${(.+\${(.+)}.+|(.+))}#Usi',
             'callback' => function ($match) {
 
@@ -379,7 +387,7 @@ public static function __bootstrap()
         ));
         Shortcode::register(array(
             'code' => 'newScope@',
-            'pattern' => '#\@{(.+)}#Usi',
+            'pattern' => '#\@{([^}]+)}#Usi',
             'callback' => function ($match) {
                 $filter = explode('|', $match[1]);//check ex for plugins like lower
                 $match[1] = $filter[0];
@@ -401,7 +409,7 @@ public static function __bootstrap()
 
         Shortcode::register(array(
             'code' => 'scope',
-            'pattern' => '#\{-(.+)\-}#Usi',
+            'pattern' => '#\{-([^}]+)\-}#Usi',
             'callback' => function ($match) {
                 $filter = explode('|', $match[1]);//check ex for plugins like lower
                 $match[1] = $filter[0];

From 041421c7ad97c4f77ceb9d2f96d1ef37b400ec86 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 28 May 2016 04:26:51 +0300
Subject: [PATCH 079/114] api support multifile inside module call

---
 system/module/API.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/system/module/API.php b/system/module/API.php
index 700787c..9e3f638 100644
--- a/system/module/API.php
+++ b/system/module/API.php
@@ -50,17 +50,26 @@ public static function __bootstrap()
             // search in module controller
             if (!isset(self::$apis[$router->fire]) && !is_file($path)) {
                 $mod = Module::path($router->fire);
-                $a = explode('.', $router->fire);
-                $name = end($a);
+
+                $name = $router->do;
                 $path = "{$mod}/controller/api.{$name}.php";
                 if (!is_file($path)) {
                     $path = "{$mod}/controller/{$name}.php";
                 }
+                if (!is_file($path)) {
+                    $a = explode('.', $router->fire);
+                    $name = end($a);
+                    $path = "{$mod}/controller/api.{$name}.php";
+                }
+                if (!is_file($path)) {
+                    $path = "{$mod}/controller/{$name}.php";
+                }
                 if (!is_file($path)) {
                     $path = "{$mod}/controller/api.php";
                 }
             }
 
+
             // search in module controller
             if (!isset(self::$apis[$router->fire]) && !is_file($path)) {
                 $mod = Module::path($router->fire);

From 4b7f0b338e535d080d7f23bce76f7e07911ed590 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 30 May 2016 08:00:28 +0300
Subject: [PATCH 080/114] fix locale, new global loader

---
 apps/sample/config.php                        |  2 ++
 .../Localization.php}                         | 36 +++++++++----------
 system/core/_globals.php                      | 33 +++++++++++++++++
 system/core/codeHive.php                      | 23 ++----------
 system/module/Directives.php                  |  8 ++---
 system/module/Router.php                      |  1 +
 6 files changed, 59 insertions(+), 44 deletions(-)
 rename system/{module/Internationalization.php => core/Localization.php} (91%)
 create mode 100644 system/core/_globals.php

diff --git a/apps/sample/config.php b/apps/sample/config.php
index 0efba68..7fdd82f 100644
--- a/apps/sample/config.php
+++ b/apps/sample/config.php
@@ -64,4 +64,6 @@
 
     // development, production, trace
     'ENVIRONMENT' => 'trace',
+
+    "locale" => "en-us"
 );
diff --git a/system/module/Internationalization.php b/system/core/Localization.php
similarity index 91%
rename from system/module/Internationalization.php
rename to system/core/Localization.php
index a1d34a9..464f470 100644
--- a/system/module/Internationalization.php
+++ b/system/core/Localization.php
@@ -3,7 +3,7 @@
      exit('Direct access to this location is not permitted.');
  }
 /**
- * Purecis Internationalization Class.
+ * Purecis localization Class.
  *
  * control Sessions With Advance Tecnique
  *
@@ -13,7 +13,7 @@
  *
  * @link		http://purecis.com/
  */
-class Internationalization
+class Localization
 {
     /**
      * @var array
@@ -157,10 +157,8 @@ public static function prepare($space = false, $force = false)
         }
         if (!is_dir($path)) {
             if (strtoupper($config['ENVIRONMENT']) == 'TRACE') {
-                Trace::error('Missing Locales', $space);
+                Trace::error('Missing Locales', $path);
             }
-            //else die("Locales at <b>{$space}</b> not Found.");
-
             return;
         }
 
@@ -193,22 +191,22 @@ private static function localeFile($filename)
 
     public static function requestLocale($locale = 'locale')
     {
-        if (Request::get($locale)) {
-            Session::set(array('locale' => Request::get($locale)));
+        global $config;
+        $locale = Request::get($locale);
+        if ($locale) {
+            Session::set(array('locale' => $locale));
+        }else{
+            $locale = $config['locale'];
+            if(!$locale){
+                $locale = "en-us";
+            }
         }
+        return $locale;
+    }
+    
+    public static function request($locale = 'locale'){
+        self::requestLocale($locale);
     }
-}
-
-/**
- * Locale Alias __.
- *
- * @param	mixen 	str or array keys only
- *
- * @return mixen
- */
-function __($e, $a = array(), $space = false)
-{
-    return Internationalization::translate($e, $a, $space);
 }
 
 /* End of file Locale.php */
diff --git a/system/core/_globals.php b/system/core/_globals.php
new file mode 100644
index 0000000..656ce4b
--- /dev/null
+++ b/system/core/_globals.php
@@ -0,0 +1,33 @@
+<?php
+/*
+ * auto load class when it called (Core Classes Only).
+ */
+spl_autoload_register(function ($class) {
+    global $config;
+    $class = str_replace('\\', '/', $class);
+    if (is_file("{$config['system']}/core/{$class}.php")) {
+        require_once "{$class}.php";
+        if (is_callable(array($class, '__bootstrap'))) {
+            call_user_func(array($class, '__bootstrap'));
+        }
+        if (isset($config['ENVIRONMENT']) && strtoupper($config['ENVIRONMENT']) == 'TRACE') {
+            Trace::message('Used System Cores', $class);
+        }
+    } else {
+        if (strtoupper($config['ENVIRONMENT']) == 'TRACE') {
+            Trace::error('System Cores Faild', $class);
+        }
+    }
+});
+
+/**
+ * Locale Alias __.
+ *
+ * @param	mixen 	str or array keys only
+ *
+ * @return mixen
+ */
+function __($e, $a = array(), $space = false)
+{
+    return Localization::translate($e, $a, $space);
+}
diff --git a/system/core/codeHive.php b/system/core/codeHive.php
index 8748dc9..25c4f16 100644
--- a/system/core/codeHive.php
+++ b/system/core/codeHive.php
@@ -25,6 +25,8 @@ public static function start($start = array('app' => 'app'))
             throw new Exception('The codeHive Framework v2.1 requires PHP version 5.3 or higher, (5.4) is Recomonded.');
         }
 
+        require_once "_globals.php";
+
         define('VersionMajor', '2');
         define('VersionMinor', '1');
         define('VersionPatch', '00');
@@ -114,26 +116,5 @@ private static function config($app)
     }
 }
 
-/*
- * auto load class when it called (Core Classes Only).
- */
-spl_autoload_register(function ($class) {
-    global $config;
-    $class = str_replace('\\', '/', $class);
-    if (is_file("{$config['system']}/core/{$class}.php")) {
-        require_once "{$class}.php";
-        if (is_callable(array($class, '__bootstrap'))) {
-            call_user_func(array($class, '__bootstrap'));
-        }
-        if (isset($config['ENVIRONMENT']) && strtoupper($config['ENVIRONMENT']) == 'TRACE') {
-            Trace::message('Used System Cores', $class);
-        }
-    } else {
-        if (strtoupper($config['ENVIRONMENT']) == 'TRACE') {
-            Trace::error('System Cores Faild', $class);
-        }
-    }
-});
-
 /* End of file codeHive.php */
 /* Location: ./system/core/codeHive.php */
diff --git a/system/module/Directives.php b/system/module/Directives.php
index 8165402..015bdb1 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -64,7 +64,7 @@ public static function __bootstrap()
         * call controller
         */
        // TODO : need to support class call and module insider call
-        self::register('controller', function ($args, &$scope) {            
+        self::register('controller', function ($args, &$scope) {
             return Controller::trigger($args->name, $args);
         });
 
@@ -572,12 +572,12 @@ public static function __bootstrap()
         ));
 
         /*
-        * directive Internationalization
+        * directive Localization
         * Description : trigger event
         * Usage : __(You have :count messages and :days days :> {count:1,days:2} @ module.name)
         */
         Shortcode::register(array(
-            'code' => 'internationalization',
+            'code' => 'Localization',
             'pattern' => '#\__\((.+)\)#Usi',
             'callback' => function ($match) {
                 $ar = array();
@@ -598,7 +598,7 @@ public static function __bootstrap()
                     }
                 }
 
-                return Internationalization::translate(trim($ex[0]), $ar, $at);
+                return Localization::translate(trim($ex[0]), $ar, $at);
             },
         ));
 
diff --git a/system/module/Router.php b/system/module/Router.php
index dc95975..06f1507 100644
--- a/system/module/Router.php
+++ b/system/module/Router.php
@@ -65,6 +65,7 @@ public static function on($name, $val, $cb = false)
             //self::$router[$name] = array();
             $cb = $val;
         }
+        // TODO : parse pattern /url/:id (here and inside api)
 
         self::$callback[$name] = $cb;
 

From b1cda56095f2ba701fdd112985492dbae843a5f3 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 30 May 2016 08:01:43 +0300
Subject: [PATCH 081/114] fix index

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 588fce7..0c7d51d 100644
--- a/index.php
+++ b/index.php
@@ -15,7 +15,7 @@
 include 'system/core/codeHive.php';
 
 codeHive::start(array(
-    'app' => 'online-exam',
+    'app' => 'sample',
 
     // define folders
     'container' => "apps",

From 1dde74051babd3da803856b8ce7aff0befe1d2bc Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 30 May 2016 17:46:13 +0300
Subject: [PATCH 082/114] support function call in query

---
 system/module/QueryBuilder.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index 8fa43e0..a582ccf 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -359,10 +359,15 @@ public function _get()
 
     public function get()
     {
+        $args = func_get_args();
+
         $this->_get();
         $this->records = Database::query($this->query);
         $this->withParse();
 
+        if(isset($args[0])){
+            return (Object) $this->records->record[$args[0]];
+        }
         return $this->records;
     }
 
@@ -489,7 +494,17 @@ private function _col()
         if (!is_array($args[0])) {
             $args[0] = trim($args[0]);
         }
-        if (strpos($args[0], '~') === 0) {
+
+
+
+        if (strpos($args[0], '(') !== FALSE) {
+            // TODO : fix 2 arguments sql functions
+            return preg_replace_callback("#\((.*)\)#six", function($match){
+                $match[1] = self::_col($match[1]);
+                return "(".$match[1].")";
+            }, $args[0]);
+
+        }else if (strpos($args[0], '~') === 0) {
             return $this->_col(substr($args[0], 1));
         } elseif (substr_count($args[0], ' as ') == 1 && !isset($args[1])) {
             $exp = explode(' as ', $args[0]);

From 893bee0b43a181ed2de9db7ccaf08e532e7d9e3c Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Fri, 3 Jun 2016 20:49:38 +0300
Subject: [PATCH 083/114] add in support into whether directive

---
 system/module/Directives.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 015bdb1..3323a01 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -683,7 +683,8 @@ public static function __bootstrap()
                     }
                 }
                 if (isset($args->in)) {
-                    if (strpos($args->is, $args->in) !== false) {
+                    $in = explode(",", $args->in);
+                    if (in_array($args->is, $in)) {
                         return Shortcode::trigger($args->content);
                     }
                 }

From 57214be3a6ab39a931e5d63a9b360b09ec00d7cb Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Fri, 3 Jun 2016 20:50:05 +0300
Subject: [PATCH 084/114] reset locale and return request

---
 system/core/Localization.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/core/Localization.php b/system/core/Localization.php
index 464f470..1ca3b16 100644
--- a/system/core/Localization.php
+++ b/system/core/Localization.php
@@ -198,14 +198,14 @@ public static function requestLocale($locale = 'locale')
         }else{
             $locale = $config['locale'];
             if(!$locale){
-                $locale = "en-us";
+                $locale = self::$locale;
             }
         }
         return $locale;
     }
-    
+
     public static function request($locale = 'locale'){
-        self::requestLocale($locale);
+        return self::requestLocale($locale);
     }
 }
 

From 26f03b39bd41a72f7cddd2273a291a4487b4ea88 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 11 Jun 2016 13:55:07 +0300
Subject: [PATCH 085/114] localization when no lang return empty array

---
 system/core/Localization.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/core/Localization.php b/system/core/Localization.php
index 1ca3b16..bbcce99 100644
--- a/system/core/Localization.php
+++ b/system/core/Localization.php
@@ -159,7 +159,7 @@ public static function prepare($space = false, $force = false)
             if (strtoupper($config['ENVIRONMENT']) == 'TRACE') {
                 Trace::error('Missing Locales', $path);
             }
-            return;
+            return [];
         }
 
         foreach (glob("{$path}/*.php") as $filename) {

From 502ce5360035620c751e0009230f5164bfc8a903 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Thu, 16 Jun 2016 03:29:47 +0300
Subject: [PATCH 086/114] fix order rand, new relation by, handle array fetch,
 table as, fix join

---
 system/module/QueryBuilder.php | 54 +++++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 7 deletions(-)

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index a582ccf..867d2a4 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -190,7 +190,11 @@ public function order()
         if (sizeof($args) == 2) {
             array_push($this->order, array($args[0], strtoupper($args[1])));
         } elseif (sizeof($args) == 1) {
-            array_push($this->order, [$args[0], 'DESC']);
+            if (strpos($args[0], '(') !== FALSE) {
+                array_push($this->order, [$args[0]]);
+            }else{
+                array_push($this->order, [$args[0], 'DESC']);
+            }
         } else {
             array_push($this->order, ['id', 'DESC']);
         }
@@ -271,11 +275,16 @@ public function relation()
             array_push($this->masterQuery->param, $col);
             $this->where($args[0], 'in', $this->masterQuery);
         }
+        if($args[1] == 'by'){
+            $this->masterQuery->param = [];
+            array_push($this->masterQuery->param, $col);
+        }
 
         return $this;
     }
     private function withParse()
     {
+        global $config;
         foreach ($this->with as $args) {
             $table = $args[0]; // if is string only
 
@@ -287,7 +296,13 @@ private function withParse()
 
             if (is_callable($args[1]) && $args[1] instanceof Closure) {
                 call_user_func($args[1], $q);
-                if (array_search($q->withSecColumn, $q->param) === false && sizeof($q->param)) {
+                if (
+                    !(
+                        array_search($q->withSecColumn, $q->param) !== false ||
+                        sizeof(preg_grep("#(.{$q->withSecColumn})#", $q->param)) != 0 
+                    ) && 
+                    sizeof($q->param)
+                ) {
                     array_push($q->param, $q->withSecColumn);
                 }
             } else {
@@ -298,15 +313,24 @@ private function withParse()
             $newQuery = $q->get();
 
             if($newQuery->status){
-                foreach ($this->records->record as $record) {
-                    $record->{$q->appear} = array_values(array_filter(
+                $q = (Object) $q;
+                foreach ($this->records->record as $key => $record) {
+                    //$record = (Object) $record;
+                    $filter = array_values(array_filter(
                     $newQuery->record,
                     function ($e) use ($q, $record) {
+                        $e = (Object) $e;
+                        $record = (Object) $record;
                         // TODO : support `in` method
                         // TODO : shift name if send with dot
                         return $e->{$q->withSecColumn} == $record->{$q->withFirstColumn};
                     }));
                     // TODO: remove the sec column from the child if not sended
+                    if(isset($config['database']['fetch']) && $config['database']['fetch'] == 'array'){
+                        $this->records->record[$key][$q->appear] = $filter;
+                    }else {
+                        $record->{$q->appear} = $filter;
+                    }
                 }
             }else{
                 if (isset($this->records->error) && is_string($this->records->error)) {
@@ -465,7 +489,9 @@ public function record()
     private function _table()
     {
         $args = func_get_args();
-
+        if(isset($args[1])){
+            return "`{$args[0]}` as `{$args[1]}`";    
+        }
         return "`{$args[0]}`";
     }
 
@@ -500,6 +526,7 @@ private function _col()
         if (strpos($args[0], '(') !== FALSE) {
             // TODO : fix 2 arguments sql functions
             return preg_replace_callback("#\((.*)\)#six", function($match){
+                if(empty($match[1]))return "()";
                 $match[1] = self::_col($match[1]);
                 return "(".$match[1].")";
             }, $args[0]);
@@ -565,7 +592,7 @@ private function _order()
         }
 
         foreach ($this->order as $col) {
-            array_push($arr, $this->_col($col[0])." {$col[1]}");
+            array_push($arr, $this->_col($col[0]).(isset($col[1])?" ".$col[1]:""));
         }
 
         return ' ORDER BY '.implode(', ', $arr);
@@ -633,8 +660,21 @@ private function _joinParse($args, $place = false)
             $str .= " {$place}";
         }
         $str .= ' JOIN ';
-        $str .= $this->_table($args[0]);
+
+        $join_table = $args[0];
+        if (substr_count($join_table, ' as ') == 1) {
+            $exp = explode(' as ', $join_table);
+            $join_table = $exp[1];
+            $str .= $this->_table($exp[0], $exp[1]);
+        }else{
+            $str .= $this->_table($join_table);
+        }
+        
         array_shift($args);
+        
+        // TODO : support new way in config to setup type as (snakecase, camelcase)
+        if(!isset($args[0]))$args[0] = "{$join_table}.{$this->table}Id";
+        if(!isset($args[1]))$args[1] = "~id";
 
         if (is_callable($args[0]) && $args[0] instanceof Closure) {
             $q = new self();

From cb08e09b9c41c24690ac47b550e6605be8581757 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 27 Jun 2016 15:46:10 +0300
Subject: [PATCH 087/114] fix aproxlen fix if not set notice

---
 system/module/Directives.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 3323a01..d6078bc 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -625,10 +625,10 @@ public static function __bootstrap()
         * Description : shorten the text
         */
         self::register('approxlen', function ($args, &$scope) {
-            if (!$args->length) {
+            if (!isset($args->length)) {
                 $args->length = 200;
             }
-            if (!$args->append) {
+            if (!isset($args->append)) {
                 $args->append = '...';
             }
 

From 64e3529826e247b01e930a21cccbc552b0babc28 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Thu, 7 Jul 2016 03:08:53 +0300
Subject: [PATCH 088/114] fix query record error

---
 system/module/Query.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/module/Query.php b/system/module/Query.php
index 5be6565..5410b57 100644
--- a/system/module/Query.php
+++ b/system/module/Query.php
@@ -497,7 +497,8 @@ public static function execute($arr)
             $idsQ = Database::query("select id from {$table} where {$where} {$limit};");// this to get ids for meta
             if ($idsQ->status) {
                 $ids = array();
-                foreach ($idsQ->data as $row) {
+                foreach ($idsQ->record as $row) {
+                    $row = (array) $row;
                     array_push($ids, $row['id']);
                 }// todo : need optimization
             } else {

From d143b4faa32a300a9f8a8d902d5ab2c6bb36dbed Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 12 Jul 2016 21:57:42 +0300
Subject: [PATCH 089/114] support single element directive, adding event
 directive

---
 system/module/Directives.php | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index d6078bc..7b49eed 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -571,6 +571,10 @@ public static function __bootstrap()
             },
         ));
 
+        self::register('/event', function ($args, &$scope) {
+            return Event::trigger($args->trigger, $args);
+        });
+
         /*
         * directive Localization
         * Description : trigger event
@@ -724,14 +728,21 @@ private static function scope($v)
 
     public static function register($element, $cb)
     {
+        if(strpos($element, "/") !== false){
+            $element = substr($element, 1);
+            $pattern = "%\<{$element} (\b[^<\>]*+)\>%six";
+            $element = $element."_single";
+        }else{
+            $pattern = "%\<{$element} (\b[^<\>]*+)\>((?:(?:(?!\</?{$element}\b).)++| (?R))*+)(\</{$element}\s*+\>)%six";
+        }
         Shortcode::register(array(
             'code' => "element_{$element}",
-            'pattern' => "%\<{$element} (\b[^<\>]*+)\>((?:(?:(?!\</?{$element}\b).)++| (?R))*+)(\</{$element}\s*+\>)%six",
+            'pattern' => $pattern,
             'callback' => function ($match) use ($cb, $element) {
                 $cls = new stdClass();
-                $cls->content = $match[2];
+                $cls->content = isset($match[2])?$match[2]:'';
                 $el = "{$element}-content";
-                Controller::$scope->$el = $match[2];
+                Controller::$scope->$el = $cls->content;
                 if (!empty($match[1])) {
                     $atts = String::parse_attr($match[1]);
                     foreach ($atts as $k => $v) {

From 12814959d27bc0707b43fd135e0890cf39e6d432 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 12 Jul 2016 22:04:31 +0300
Subject: [PATCH 090/114] allow multiple directive register

---
 system/module/Directives.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 7b49eed..d62fed4 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -548,7 +548,7 @@ public static function __bootstrap()
             },
         ));
 
-        self::register('view', function ($args, &$scope) {
+        self::register(['view', '/view'], function ($args, &$scope) {
             $name = isset($args->scope) ? $args->scope : 'view';
             $scope->{$name} = $args;
 
@@ -728,6 +728,15 @@ private static function scope($v)
 
     public static function register($element, $cb)
     {
+        // for multiple register
+        if(is_array($element)){
+            foreach ($element as $elm) {
+                self::register($elm, $cb);
+            }
+            return ;
+        }
+
+        // for single check
         if(strpos($element, "/") !== false){
             $element = substr($element, 1);
             $pattern = "%\<{$element} (\b[^<\>]*+)\>%six";
@@ -735,6 +744,8 @@ public static function register($element, $cb)
         }else{
             $pattern = "%\<{$element} (\b[^<\>]*+)\>((?:(?:(?!\</?{$element}\b).)++| (?R))*+)(\</{$element}\s*+\>)%six";
         }
+
+        // register shortcode
         Shortcode::register(array(
             'code' => "element_{$element}",
             'pattern' => $pattern,

From 56aec2a4b02d81633d7e5f644b2806411bc6390f Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 12 Jul 2016 23:00:56 +0300
Subject: [PATCH 091/114] update whether neither add empty, not equel

---
 system/module/Directives.php | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index d62fed4..e06a50c 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -658,14 +658,18 @@ public static function __bootstrap()
         * directive whether
         * Description : check data
         */
-        self::register('whether', function ($args, &$scope) {    //neither // repeat
-
+        function whetherCheck($args){
             if (isset($args->is)) {
                 if (isset($args->eq)) {
                     if ($args->is == $args->eq) {
                         return Shortcode::trigger($args->content);
                     }
                 }
+                if (isset($args->neq)) {
+                    if ($args->is != $args->neq) {
+                        return Shortcode::trigger($args->content);
+                    }
+                }
                 if (isset($args->lt)) {
                     if ($args->is < $args->lt) {
                         return Shortcode::trigger($args->content);
@@ -697,9 +701,28 @@ public static function __bootstrap()
             if (isset($args->exist)) {
                 return Shortcode::trigger($args->content);
             }
+            if (isset($args->empty)) {
+                if(empty($args->empty)){
+                    return Shortcode::trigger($args->content);
+                }
+            }
 
+            return false;
+        }
+        
+        self::register('whether', function ($args, &$scope) {    //neither // repeat
+            if(whetherCheck($args)){
+                return Shortcode::trigger($args->content);
+            }
         });
-    }
+        
+        self::register('neither', function ($args, &$scope) {
+            if(!whetherCheck($args)){
+                return Shortcode::trigger($args->content);
+            }
+        });
+        
+    } // end of __bootstrap
 
     private static function scope($v)
     {

From accc0d064dc930fa92a17f923ae26fa86129d6a0 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 12 Jul 2016 23:04:23 +0300
Subject: [PATCH 092/114] query-object now accept single tag

---
 system/module/Directives.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index e06a50c..2827b72 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -125,7 +125,7 @@ public static function __bootstrap()
         * directive object
         * Description : shorten the text
         */
-        self::register('query-object', function ($args, &$scope) {
+        self::register(['query-object','/query-object'], function ($args, &$scope) {
             $where = isset($args->where) ? (array) String::json(Shortcode::trigger($args->where)) : null;
             $limit = isset($args->limit) ? isset($args->offset) ? "{$args->offset},{$args->limit}" : $args->limit : null;
             $order = isset($args->order) ? $args->order : null;

From 41eec6e48a8ef4a075003f2f9c24157753108875 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 16 Jul 2016 02:06:02 +0300
Subject: [PATCH 093/114] fix wrap problem in some css

---
 system/core/String.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/core/String.php b/system/core/String.php
index d3565ff..2ebf35a 100644
--- a/system/core/String.php
+++ b/system/core/String.php
@@ -274,6 +274,7 @@ public static function approxlen($str,$len=200,$append='...') {
 			else $newlen = $newlen.$this_x;
 		}
 		if(trim($newlen) != trim($str))$newlen .= $append;
+		$newlen = str_replace("&nbsp;", " ", $newlen); // fix wrap problem in some css
 		return $newlen;
 	}
 

From e3647ceb6a5722f0850a052a18d86d4d69869e24 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 16 Jul 2016 02:06:29 +0300
Subject: [PATCH 094/114] support trigger arrays and objects in shortcodes

---
 system/core/Shortcode.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/system/core/Shortcode.php b/system/core/Shortcode.php
index 252fbd8..d44a0cd 100644
--- a/system/core/Shortcode.php
+++ b/system/core/Shortcode.php
@@ -45,6 +45,15 @@ public static function register($sc){
 	 * @return	void
 	 */
 	public static function trigger($output,$custom = false){
+		if(is_array($output) or is_object($output)){
+			$out = Array();
+			foreach($output as $k => $v){
+				$out[$k] = self::trigger($v, $custom);
+			}
+			if(is_array($output))return $out;
+			if(is_object($output))return (object) $out;
+		}
+
 		if($custom){
 			if(!self::$patterns[$custom])return $output;
 			return preg_replace_callback(self::$patterns[$custom], self::$callback[$custom] , $output);

From bf512a711f98b7e74e0ee3d99e69d67ac9144965 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 16 Jul 2016 02:06:50 +0300
Subject: [PATCH 095/114] query object now accept vars in where

---
 system/module/Directives.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 2827b72..8c0e04d 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -126,11 +126,20 @@ public static function __bootstrap()
         * Description : shorten the text
         */
         self::register(['query-object','/query-object'], function ($args, &$scope) {
-            $where = isset($args->where) ? (array) String::json(Shortcode::trigger($args->where)) : null;
+            if(is_object($args->where)){
+                $args->where = (array) $args->where;
+                if(isset($args->where['scope']))unset($args->where['scope']);
+                if(empty($args->where['content']))unset($args->where['content']);
+                $where = Shortcode::trigger($args->where);
+            }else{
+                $where = isset($args->where) ? (array) String::json(Shortcode::trigger($args->where)) : null;
+            }
+            
             $limit = isset($args->limit) ? isset($args->offset) ? "{$args->offset},{$args->limit}" : $args->limit : null;
             $order = isset($args->order) ? $args->order : null;
             $query = Object::fetch($args->taxonomy, $args->param, $where, ['limit' => $limit,"order"=>$order]);
             // d($query);
+            
             $scope->{$args->as} = $query->status?$query->record:[];
         });
 

From b4fdaba2c14e44ca43bd0c3bee2e62e25a44659a Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 16 Jul 2016 02:09:27 +0300
Subject: [PATCH 096/114] add single tag to some directives

---
 system/module/Directives.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 8c0e04d..47cf921 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -43,14 +43,14 @@ public static function __bootstrap()
         /*
         * import module
         */
-        self::register('module', function ($args, &$scope) {
+        self::register(['module', '/module'], function ($args, &$scope) {
             Module::import($args->import);
         });
 
         /*
         * set asset
         */
-        self::register('asset', function ($args, &$scope) {
+        self::register(['asset', '/asset'], function ($args, &$scope) {
             if(!isset($args->scope))$args->scope = "vendor";
 
             if(isset($args->type) && $args->type == "script"){
@@ -64,14 +64,14 @@ public static function __bootstrap()
         * call controller
         */
        // TODO : need to support class call and module insider call
-        self::register('controller', function ($args, &$scope) {
+        self::register(['controller', '/controller'], function ($args, &$scope) {
             return Controller::trigger($args->name, $args);
         });
 
         /*
         * get request from header
         */
-        self::register('request', function ($args, &$scope) {
+        self::register(['request', '/request'], function ($args, &$scope) {
             $param = explode(',', $args->get);
             $param = Request::get($param);
             $name = isset($args->scope) ? $args->scope : 'request';
@@ -81,7 +81,7 @@ public static function __bootstrap()
         /*
         * define scope variable directive
         */
-        self::register('var', function ($args, &$scope) {
+        self::register(['var', '/var'], function ($args, &$scope) {
             $name = isset($args->scope) ? $args->scope : 'var';
 			$scope->{$name} = isset($scope->{$name}) ? (object) array_merge((array) $scope->{$name}, (array) $args) : $args;
         });

From 8ab7f5a01fe98e7f5eba4e746d3ff75762791087 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 16 Jul 2016 02:10:53 +0300
Subject: [PATCH 097/114] fix where notice in query directive

---
 system/module/Directives.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 47cf921..3ae1f5c 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -126,7 +126,7 @@ public static function __bootstrap()
         * Description : shorten the text
         */
         self::register(['query-object','/query-object'], function ($args, &$scope) {
-            if(is_object($args->where)){
+            if(isset($args->where) && is_object($args->where)){
                 $args->where = (array) $args->where;
                 if(isset($args->where['scope']))unset($args->where['scope']);
                 if(empty($args->where['content']))unset($args->where['content']);

From b1e14de337987dfc560407c6c053ea80c83ab5fa Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 16 Jul 2016 10:48:57 +0300
Subject: [PATCH 098/114] fix whether return to boolean

---
 system/module/Directives.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 3ae1f5c..244145a 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -671,48 +671,48 @@ function whetherCheck($args){
             if (isset($args->is)) {
                 if (isset($args->eq)) {
                     if ($args->is == $args->eq) {
-                        return Shortcode::trigger($args->content);
+                        return true;
                     }
                 }
                 if (isset($args->neq)) {
                     if ($args->is != $args->neq) {
-                        return Shortcode::trigger($args->content);
+                        return true;
                     }
                 }
                 if (isset($args->lt)) {
                     if ($args->is < $args->lt) {
-                        return Shortcode::trigger($args->content);
+                        return true;
                     }
                 }
                 if (isset($args->gt)) {
                     if ($args->is > $args->gt) {
-                        return Shortcode::trigger($args->content);
+                        return true;
                     }
                 }
                 if (isset($args->lte)) {
                     if ($args->is <= $args->lte) {
-                        return Shortcode::trigger($args->content);
+                        return true;
                     }
                 }
                 if (isset($args->gte)) {
                     if ($args->is >= $args->gte) {
-                        return Shortcode::trigger($args->content);
+                        return true;
                     }
                 }
                 if (isset($args->in)) {
                     $in = explode(",", $args->in);
                     if (in_array($args->is, $in)) {
-                        return Shortcode::trigger($args->content);
+                        return true;
                     }
                 }
                 // TODO : inset,
             }
             if (isset($args->exist)) {
-                return Shortcode::trigger($args->content);
+                return true;
             }
             if (isset($args->empty)) {
                 if(empty($args->empty)){
-                    return Shortcode::trigger($args->content);
+                    return true;
                 }
             }
 

From 927d990abf168c919963d36db4ecec22ade506ec Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 16 Jul 2016 11:00:30 +0300
Subject: [PATCH 099/114] fix locale, now it check the session first

---
 system/core/Localization.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/core/Localization.php b/system/core/Localization.php
index bbcce99..4eb5661 100644
--- a/system/core/Localization.php
+++ b/system/core/Localization.php
@@ -196,9 +196,12 @@ public static function requestLocale($locale = 'locale')
         if ($locale) {
             Session::set(array('locale' => $locale));
         }else{
-            $locale = $config['locale'];
+            $locale = Session::get('locale');
             if(!$locale){
-                $locale = self::$locale;
+                $locale = $config['locale'];
+                if(!$locale){
+                    $locale = self::$locale;
+                }
             }
         }
         return $locale;

From 50b8b3d424cebd4f120d701e82892964f0c06afe Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 23 Jul 2016 12:11:20 +0300
Subject: [PATCH 100/114] whether sizeof, hook directive and event multiple

---
 system/module/Directives.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 244145a..99914bf 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -580,7 +580,11 @@ public static function __bootstrap()
             },
         ));
 
-        self::register('/event', function ($args, &$scope) {
+        self::register(['event', '/event'], function ($args, &$scope) {
+            return Event::trigger($args->trigger, $args);
+        });
+
+        self::register(['hook', '/hook'], function ($args, &$scope) {
             return Event::trigger($args->trigger, $args);
         });
 
@@ -668,6 +672,10 @@ public static function __bootstrap()
         * Description : check data
         */
         function whetherCheck($args){
+            if(isset($args->sizeof)){
+                $args->is = sizeof($args->sizeof);
+            }
+
             if (isset($args->is)) {
                 if (isset($args->eq)) {
                     if ($args->is == $args->eq) {

From 6b3fb67d63f2e600b6015aabfbcac77238113ca8 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 23 Jul 2016 15:08:26 +0300
Subject: [PATCH 101/114] fix current directory call when CLI, add constant
 __CWD__

---
 system/core/_globals.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/system/core/_globals.php b/system/core/_globals.php
index 656ce4b..37e6d3b 100644
--- a/system/core/_globals.php
+++ b/system/core/_globals.php
@@ -1,4 +1,11 @@
 <?php
+
+/*
+ * set current working directory to the main index path
+ */
+define(__CWD__, getcwd());
+chdir(dirname($_SERVER["SCRIPT_FILENAME"]));
+
 /*
  * auto load class when it called (Core Classes Only).
  */

From 9bd56da3519eab7c8c0b3e81427dde23e73b1218 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 23 Jul 2016 15:09:49 +0300
Subject: [PATCH 102/114] rename callable hook instead of event

---
 system/module/Directives.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 99914bf..77d2c6c 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -585,7 +585,7 @@ public static function __bootstrap()
         });
 
         self::register(['hook', '/hook'], function ($args, &$scope) {
-            return Event::trigger($args->trigger, $args);
+            return Hook::trigger($args->trigger, $args);
         });
 
         /*

From 2fa6b29933f9911706b8612a679f813d9b01af70 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 23 Jul 2016 15:10:48 +0300
Subject: [PATCH 103/114] fix notice

---
 system/core/_globals.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/core/_globals.php b/system/core/_globals.php
index 37e6d3b..e4df9ed 100644
--- a/system/core/_globals.php
+++ b/system/core/_globals.php
@@ -3,7 +3,7 @@
 /*
  * set current working directory to the main index path
  */
-define(__CWD__, getcwd());
+define('__CWD__', getcwd());
 chdir(dirname($_SERVER["SCRIPT_FILENAME"]));
 
 /*

From 9e30218897405738ae76fd94b351573c4fd4c5b9 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Tue, 16 Aug 2016 15:51:57 +0300
Subject: [PATCH 104/114] fix brackets with value in query

---
 system/module/QueryBuilder.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/module/QueryBuilder.php b/system/module/QueryBuilder.php
index 867d2a4..a047610 100644
--- a/system/module/QueryBuilder.php
+++ b/system/module/QueryBuilder.php
@@ -523,7 +523,7 @@ private function _col()
 
 
 
-        if (strpos($args[0], '(') !== FALSE) {
+        if (strpos($args[0], '(') !== FALSE && ((isset($args[1]) && $args[1] != "string") || !isset($args[1]))) {
             // TODO : fix 2 arguments sql functions
             return preg_replace_callback("#\((.*)\)#six", function($match){
                 if(empty($match[1]))return "()";
@@ -590,6 +590,7 @@ private function _order()
         if (!sizeof($this->order)) {
             return '';
         }
+        // TODO : fix if sended one argument in order
 
         foreach ($this->order as $col) {
             array_push($arr, $this->_col($col[0]).(isset($col[1])?" ".$col[1]:""));

From a05b5ec169584c69c3579fedf5f1cc41fab00f3e Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Wed, 17 Aug 2016 20:08:05 +0300
Subject: [PATCH 105/114] fix event with pointer args

---
 system/core/Event.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/core/Event.php b/system/core/Event.php
index a8f0336..382fd18 100644
--- a/system/core/Event.php
+++ b/system/core/Event.php
@@ -58,7 +58,7 @@ public static function trigger($event, $args = false)
         $r = '';
         if (isset(self::$events[$event])) {
             foreach (self::$events[$event] as $c) {
-                $r .= call_user_func_array($c, array(&Controller::$scope, $args));
+                $r .= call_user_func_array($c, array(&Controller::$scope, &$args));
             }
         }
 

From 5be12fbe2dc286ac7e1fea2df711dfca32278d7e Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Wed, 17 Aug 2016 20:08:21 +0300
Subject: [PATCH 106/114] fix hooks as events

---
 system/core/Hook.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/core/Hook.php b/system/core/Hook.php
index 35feb9d..4c13e41 100644
--- a/system/core/Hook.php
+++ b/system/core/Hook.php
@@ -35,7 +35,7 @@ public static function on($event, $callback)
      *
      * @return function
      */
-    public static function trigger($event, $args = false)
+    public static function trigger($event, &$args = false)
     {
         return Event::trigger($event, $args);
     }

From 90c83d478bb0092f999489cda2b55d63d2550a74 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Wed, 17 Aug 2016 20:17:47 +0300
Subject: [PATCH 107/114] fix json, JSON_NUMERIC_CHECK to return numbers in
 json_encode

---
 system/module/API.php    | 14 +++++++++++++-
 system/module/Router.php |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/system/module/API.php b/system/module/API.php
index 9e3f638..cd97b99 100644
--- a/system/module/API.php
+++ b/system/module/API.php
@@ -167,7 +167,19 @@ public static function then($a, $b = false, $c = false, $method = true)
             $callback = $a;
             $args = array();
             $text = false;
+        }else{
+            // TODO : fix pattern /url/:id pattern
+            // if ( preg_match_all("(:\w+)", $text, $matches) ) {
+            //     $temp = [];
+            //     foreach($matches[0] as $match){
+            //         array_push($temp, ltrim($match, ':'));
+            //     }
+            // }
+            // array_merge($temp, $args);
+            // $text = explode("/", $text);
+            // $text = $text[0];
         }
+
         if ($text == false) {
             --self::$current;
         }
@@ -181,7 +193,7 @@ public static function then($a, $b = false, $c = false, $method = true)
             ++self::$current;
             $cb = call_user_func_array($callback, array(&Controller::$scope, $router));
             if (is_array($cb) || is_object($cb)) {
-                $cb = json_encode($cb);
+                $cb = json_encode($cb, JSON_NUMERIC_CHECK);
             }
             echo $cb;
             exit;
diff --git a/system/module/Router.php b/system/module/Router.php
index 06f1507..e903e8b 100644
--- a/system/module/Router.php
+++ b/system/module/Router.php
@@ -115,7 +115,7 @@ public static function trigger($mod){
 
             $cb = Controller::trigger(self::$callback[$mod], $cls);
             if (is_array($cb) || is_object($cb)) {
-                $cb = json_encode($cb);
+                $cb = json_encode($cb, JSON_NUMERIC_CHECK);
             }
             return $cb;
         }

From 53661e091be51adb8b92f10625be5742237426bd Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Fri, 19 Aug 2016 18:04:28 +0300
Subject: [PATCH 108/114] fix cast as signed to allow use cast as date or any
 extra type by order in query

---
 system/module/Query.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/module/Query.php b/system/module/Query.php
index 5410b57..e521b7d 100644
--- a/system/module/Query.php
+++ b/system/module/Query.php
@@ -396,7 +396,9 @@ public static function execute($arr)
                 $a = array();
                 foreach ($or as $key => $value) {
                     if (!isset($config['database']['essential'])) {
-                        $key = 'CAST('.$key.' AS SIGNED)';
+                        if (strpos($key, '(') === false) {
+                            $key = 'CAST('.$key.' AS SIGNED)';
+                        }
                     }
                     array_push($a, $key.' '.$value);
                 }

From 6fb0b71986d347dc26358c9c49f4fd0f0cdfac9f Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Fri, 19 Aug 2016 18:05:10 +0300
Subject: [PATCH 109/114] allow directive query order to accept object

---
 system/module/Directives.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 77d2c6c..5eed85b 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -136,7 +136,15 @@ public static function __bootstrap()
             }
             
             $limit = isset($args->limit) ? isset($args->offset) ? "{$args->offset},{$args->limit}" : $args->limit : null;
-            $order = isset($args->order) ? $args->order : null;
+
+            $order = $args->order;
+            if(isset($order)){
+                if(strpos($order, '{') !== false){
+                    $order = (array) String::json(Shortcode::trigger($order));
+                }else{
+                    $order = $order;
+                } 
+            } 
             $query = Object::fetch($args->taxonomy, $args->param, $where, ['limit' => $limit,"order"=>$order]);
             // d($query);
             

From faf11781fdc8b3f93afe8afc8b5b3cbb23716d42 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Fri, 19 Aug 2016 18:07:59 +0300
Subject: [PATCH 110/114] fix notice order not set

---
 system/module/Directives.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 5eed85b..23d5f64 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -137,8 +137,8 @@ public static function __bootstrap()
             
             $limit = isset($args->limit) ? isset($args->offset) ? "{$args->offset},{$args->limit}" : $args->limit : null;
 
-            $order = $args->order;
-            if(isset($order)){
+            $order = isset($args->order)?$args->order:null;
+            if($order){
                 if(strpos($order, '{') !== false){
                     $order = (array) String::json(Shortcode::trigger($order));
                 }else{

From 51607fe009e54f998a56749b8197108668b0f9af Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 27 Aug 2016 23:46:46 +0300
Subject: [PATCH 111/114] adding json filter to interpulation

---
 system/module/Directives.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 23d5f64..4be2e5e 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -396,6 +396,8 @@ public static function __bootstrap()
                         $val = strtoupper($val);
                     } elseif ($f == 'escape') {
                         $val = htmlspecialchars($val, ENT_QUOTES, 'UTF-8');
+                    } elseif ($f == 'json') {
+                        $val = json_encode($val);
                     }
                 }
 

From 9c16158c24a098ef3a23dfb33e17de88d9967706 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sat, 27 Aug 2016 23:47:05 +0300
Subject: [PATCH 112/114] fix default rules

---
 system/sql/purecis-v1.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/sql/purecis-v1.0.0.sql b/system/sql/purecis-v1.0.0.sql
index 04b8704..10b880d 100644
--- a/system/sql/purecis-v1.0.0.sql
+++ b/system/sql/purecis-v1.0.0.sql
@@ -139,7 +139,7 @@ LOCK TABLES `users` WRITE;
 INSERT INTO `users` (`id`, `oauth`, `name`, `email`, `pass`, `rules`, `group`, `status`, `rel`)
 VALUES
 	(1,'0','Anonymous','---','---','new',0,'new',NULL),
-	(2,'0','Master Admin','abo.al.tot@gmail.com','7bbb77da01df3defcd33ea207f8cd3935bd9d4893550d5bc63a85b72b47ce91d6121dd02','manage-contact,manage-yousef,admin-zone,manage-home,manage-menu,manage-place,manage-products,manage-callus',0,'new',NULL);
+	(2,'0','Master Admin','abo.al.tot@gmail.com','7bbb77da01df3defcd33ea207f8cd3935bd9d4893550d5bc63a85b72b47ce91d6121dd02','admin-zone,master-admin,manage-users',0,'new',NULL);
 
 /*!40000 ALTER TABLE `users` ENABLE KEYS */;
 UNLOCK TABLES;

From 4f779de2382effaa7dccb079f74ab2ebedb2b0e8 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Sun, 28 Aug 2016 21:29:45 +0300
Subject: [PATCH 113/114] swap hook, event and add title hooks

---
 system/module/Directives.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/system/module/Directives.php b/system/module/Directives.php
index 4be2e5e..dd198a5 100644
--- a/system/module/Directives.php
+++ b/system/module/Directives.php
@@ -40,6 +40,12 @@ public static function __bootstrap()
         // request .. to get
         // router to route
 
+        /*
+        * title hook
+        */
+		Hook::on("title", function(&$scope, $args) { $scope->title = $args->title; });
+        Event::addListener("head", function(&$scope, $args) { return "<title>{$scope->title}</title>"; });
+
         /*
         * import module
         */
@@ -147,6 +153,7 @@ public static function __bootstrap()
             } 
             $query = Object::fetch($args->taxonomy, $args->param, $where, ['limit' => $limit,"order"=>$order]);
             // d($query);
+            // print_r($query);
             
             $scope->{$args->as} = $query->status?$query->record:[];
         });
@@ -590,14 +597,14 @@ public static function __bootstrap()
             },
         ));
 
-        self::register(['event', '/event'], function ($args, &$scope) {
-            return Event::trigger($args->trigger, $args);
-        });
-
         self::register(['hook', '/hook'], function ($args, &$scope) {
             return Hook::trigger($args->trigger, $args);
         });
 
+        self::register(['event', '/event'], function ($args, &$scope) {
+            return Event::trigger($args->trigger, $args);
+        });
+
         /*
         * directive Localization
         * Description : trigger event

From 78327daf3388f7bd1adfdc1f6371cab1864025d4 Mon Sep 17 00:00:00 2001
From: Tamer Zorba <abo.al.tot@gmail.com>
Date: Mon, 5 Sep 2016 19:17:24 +0300
Subject: [PATCH 114/114] fix getting started

---
 docs/Getting-Started.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Getting-Started.md b/docs/Getting-Started.md
index 1f7170b..132ec8a 100644
--- a/docs/Getting-Started.md
+++ b/docs/Getting-Started.md
@@ -33,6 +33,6 @@ check the requirements then upload and have fun
 
 
 ### PHP.ini Customization
-1. short_open_tag = off
+1. short_open_tag = on
 2. error_reporting = E_ALL ~ E_NOTICE