Merge branch 'master' of mojotrollz.eu:system

.gitmodules

@@ -10,6 +10,9 @@
 [submodule "lib/tinymce"]
 	path = lib/tinymce
 	url = git@mojotrollz.eu:webcraft/lib_tinymce.git
+[submodule "lib/bootstrap_growl"]
+	path = lib/bootstrap_growl
+	url = git@mojotrollz.eu:webcraft/lib_bootstrap-growl.git
 [submodule "lib/textillate"]
 	path = lib/textillate
 	url = git@mojotrollz.eu:webcraft/lib_textillate.git
@@ -22,3 +25,6 @@
 [submodule "lib/tablesorter"]
 	path = lib/tablesorter
 	url = git@mojotrollz.eu:webcraft/lib_tablesorter.git
+[submodule "lib/git"]
+	path = lib/git
+	url = git@mojotrollz.eu:webcraft/lib_git.git

autoload.inc

@@ -21,4 +21,3 @@ require_once dirname(__FILE__).'/files/autoload.inc';
 require_once dirname(__FILE__).'/cron/autoload.inc';
 require_once dirname(__FILE__).'/sai/autoload.inc';
 require_once dirname(__FILE__).'/lib/autoload.inc';
-require_once dirname(__FILE__).'/git/autoload.inc';

cron/cron_log2sqlite.php

@@ -9,6 +9,9 @@ class cron_log2sqlite extends \SYSTEM\CRON\cronjob{
         if( $oldest['year'] >= $now_year &&
             $oldest['month'] >= $now_month){
             return cronstatus::CRON_STATUS_SUCCESFULLY;}
+        //create folder if required
+        if (!file_exists(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH))) {
+            mkdir(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH), 0777, true);}
         $filename = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH).$oldest['year'].'.'.$oldest['month'].'.db';
         //extract whole month to file
         $con = new \SYSTEM\DB\Connection(new \SYSTEM\DB\DBInfoSQLite($filename));

db/qq/QP.php

@@ -2,34 +2,37 @@
 namespace SYSTEM\DB;
 
 class QP {
-    public static function QQ($params,$params_mys = null){
+    public static function QQ($params,$dbinfo = null){
-        $query = static::query();        
+        if(!$dbinfo){
-        $con = new \SYSTEM\DB\Connection($query->dbinfo);                
+            $dbinfo = \SYSTEM\system::getSystemDBInfo();}
-        $is_pg = \SYSTEM\system::isSystemDbInfoPG();
+        $con = new \SYSTEM\DB\Connection($dbinfo);
-        if($query->dbinfo){
+        try{
-            $is_pg = $query->dbinfo instanceof \SYSTEM\DB\DBInfoPG;}            
+            if($dbinfo instanceof \SYSTEM\DB\DBInfoPG){
-        if($is_pg){
+                return $con->prepare(static::get_class(),static::pgsql(),$params);
-            return $con->prepare($query->name,$query->sql_pg,$params);
+            } else if ($dbinfo instanceof \SYSTEM\DB\DBInfoMYS){
-        } else {
+                return $con->prepare(static::get_class(),static::mysql(),$params);
-            return $con->prepare($query->name,$query->sql_mys,$params_mys ? $params_mys : $params);}
+            } else if ($dbinfo instanceof \SYSTEM\DB\DBInfoAMQP){
+                return $con->prepare(static::get_class(),static::amqp(),$params);
+            } else if ($dbinfo instanceof \SYSTEM\DB\DBInfoSQLite){
+                return $con->prepare(static::get_class(),static::sqlite(),$params);
+            }
+        } catch (\Exception $e){
+            throw new \SYSTEM\LOG\ERROR(static::get_class().' failed causing: '.$e->getMessage(),$e->getCode(),$e);}
+        throw new \Exception('Could not understand Database Settings. Check ur Database Settings');
     }
     
-    public static function QA($params,$params_mys = null){
+    public static function QA($params,$dbinfo = null){
-        $res = self::QQ($params,$params_mys);
+        $res = self::QQ($params,$dbinfo);
         $result = array();
         while($row = $res->next()){
             $result[] = $row;}
         return $result;
     }
     
-    public static function Q1($params,$params_mys = null){
+    public static function Q1($params,$dbinfo = null){
-        return self::QQ($params,$params_mys)->next();}
+        return self::QQ($params,$dbinfo)->next();}
     
-    public static function QI($params,$params_mys = null){
+    public static function QI($params,$dbinfo = null){
-        $qq = self::QQ($params,$params_mys);
+        $qq = self::QQ($params,$dbinfo);
         return $qq->affectedRows() != (0||null);}
-    //override this
-    protected static function query(){
-        throw new \SYSTEM\LOG\ERROR('query function of your QP Class not overwritten!');}
-        //return new QQuery();}    
 }

db/qq/QQ.php

@@ -2,33 +2,37 @@
 namespace SYSTEM\DB;
 
 class QQ {                       
-    public static function QQ(){
+    public static function QQ($dbinfo = null){
-        $query = static::query();        
+        if(!$dbinfo){
-        $con = new \SYSTEM\DB\Connection($query->dbinfo);                
+            $dbinfo = \SYSTEM\system::getSystemDBInfo();}
-        $is_pg = \SYSTEM\system::isSystemDbInfoPG();
+        $con = new \SYSTEM\DB\Connection($dbinfo);
-        if($query->dbinfo){
+        
-            $is_pg = $query->dbinfo instanceof \SYSTEM\DB\DBInfoPG;}            
+        try{
-        if($is_pg){
+            if($dbinfo instanceof \SYSTEM\DB\DBInfoPG){
-            return $con->query($query->sql_pg);
+                return $con->query(static::pgsql());
-        } else {
+            } else if ($dbinfo instanceof \SYSTEM\DB\DBInfoMYS){
-            return $con->query($query->sql_mys);}
+                return $con->query(static::mysql());
+            } else if ($dbinfo instanceof \SYSTEM\DB\DBInfoAMQP){
+                return $con->query(static::amqp());
+            } else if ($dbinfo instanceof \SYSTEM\DB\DBInfoSQLite){
+                return $con->query(static::sqlite());
+            }
+        } catch (\Exception $e){
+            throw new \SYSTEM\LOG\ERROR(static::get_class().' failed causing: '.$e->getMessage(),$e->getCode(),$e);}
+        
+        throw new \Exception('Could not understand Database Settings. Check ur Database Settings');
     }
     
-    public static function QA(){
+    public static function QA($dbinfo = null){
-        $res = self::QQ();
+        $res = self::QQ($dbinfo);
         $result = array();
         while($row = $res->next()){
             $result[] = $row;}
         return $result;
     }
     
-    public static function Q1(){
+    public static function Q1($dbinfo = null){
-        return self::QQ()->next();}
+        return self::QQ($dbinfo)->next();}
-    public static function QI(){
+    public static function QI($dbinfo = null){
-        $qq = self::QQ();
+        return self::QQ($dbinfo);}
-        return $qq;}
-    //override this
-    protected static function query(){
-        throw new \SYSTEM\LOG\ERROR('query function of your QQ Class not overwritten!');}
-        //return new QQuery();}    
 }

db/qq/QQuery.php

@@ -1,16 +0,0 @@
-<?php
-namespace SYSTEM\DB;
-
-class QQuery{
-    public $name = null;
-    public $sql_pg = null;
-    public $sql_mys = null;
-    public $dbinfo = null;
-    
-    public function __construct($name,$sql_pg=null,$sql_mys=null,$dbinfo = null){
-        $this->name = $name;
-        $this->sql_pg = $sql_pg;
-        $this->sql_mys = $sql_mys;
-        $this->dbinfo = $dbinfo;
-    }
-}

dbd/qq/SYS_API_TREE.php

@@ -1,15 +1,15 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_API_TREE extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return
-//pg            
 'SELECT * FROM '.\SYSTEM\DBD\system_api::NAME_PG
 .' WHERE "'.\SYSTEM\DBD\system_api::FIELD_GROUP.'" = $1'
-.' ORDER BY "'.\SYSTEM\DBD\system_api::FIELD_ID.'"',
+.' ORDER BY "'.\SYSTEM\DBD\system_api::FIELD_ID.'"';
-//mys
+    }
+    public static function mysql(){return
 'SELECT * FROM '.\SYSTEM\DBD\system_api::NAME_MYS
 .' WHERE `'.\SYSTEM\DBD\system_api::FIELD_GROUP.'` = ?'
-.' ORDER BY '.\SYSTEM\DBD\system_api::FIELD_ID
+.' ORDER BY '.\SYSTEM\DBD\system_api::FIELD_ID;
-);}}
+    }    
+}

dbd/qq/SYS_CACHE_CHECK.php

@@ -1,12 +1,10 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_CACHE_CHECK extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return          
-//pg            
 'SELECT "data" FROM system.cache'.
 ' WHERE "CacheID" = $1 AND'.
-' "Ident" = $2;'
+' "Ident" = $2;';
-//mys
+    }    
-);}}
+}

dbd/qq/SYS_CACHE_DELETE.php

@@ -1,12 +1,10 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_CACHE_DELETE extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return           
-//pg            
 'DELETE FROM system.cache'.
 ' WHERE "CacheID" = $1 AND'.
-' "Ident" = $2;'
+' "Ident" = $2;';
-//mys
+    }
-);}}
+}

dbd/qq/SYS_CACHE_DELETE_ALL.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_CACHE_DELETE_ALL extends \SYSTEM\DB\QQ {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return
-//pg            
+'DELETE FROM system.cache;';
-'DELETE FROM system.cache;',
+    }
-//mys
+    public static function mysql(){return
-'DELETE FROM system_cache;'
+'DELETE FROM system_cache;';
-);}}
+    }
+}

dbd/qq/SYS_CACHE_PUT.php

@@ -1,11 +1,9 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_CACHE_PUT extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return           
-//pg            
 'INSERT INTO system.cache ("CacheID", "Ident", "data")'.
-' VALUES ($1,$2,$3);'
+' VALUES ($1,$2,$3);';
-//mys
+    }
-);}}
+}

dbd/qq/SYS_CRON_GET.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_CRON_GET extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return          
-//pg            
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.' WHERE class = $1;';
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.' WHERE class = $1;',
+    }
-//mys
+    public static function mysql(){return
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' WHERE class = ?;'
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' WHERE class = ?;';
-);}}
+    }
+}

dbd/qq/SYS_CRON_LAST_VISIT.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_CRON_LAST_VISIT extends \SYSTEM\DB\QQ {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return
-//pg            
+'SELECT time FROM '.\SYSTEM\DBD\system_log::NAME_PG.' WHERE class =  \'SYSTEM\LOG\WARNING\' ORDER BY time DESC LIMIT 1;';
-'SELECT time FROM '.\SYSTEM\DBD\system_log::NAME_PG.' WHERE class =  \'SYSTEM\LOG\WARNING\' ORDER BY time DESC LIMIT 1;',
+    }
-//mys
+    public static function mysql(){return
-'SELECT time FROM '.\SYSTEM\DBD\system_log::NAME_MYS.' WHERE class = "SYSTEM\\\\LOG\\\\CRON" ORDER BY time DESC LIMIT 1'
+'SELECT time FROM '.\SYSTEM\DBD\system_log::NAME_MYS.' WHERE class = "SYSTEM\\\\LOG\\\\CRON" ORDER BY time DESC LIMIT 1';
-);}}
+    }
+}

dbd/qq/SYS_CRON_LIST.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_CRON_LIST extends \SYSTEM\DB\QQ {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return
-//pg            
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.';';
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.';',
+    }
-//mys
+    public static function mysql(){return
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.';'
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.';';
-);}}
+    }
+}

dbd/qq/SYS_CRON_UPD.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_CRON_UPD extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return          
-//pg            
+'UPDATE '.\SYSTEM\DBD\system_cron::NAME_PG.' SET '.\SYSTEM\DBD\system_cron::FIELD_STATUS.' = $1,'.\SYSTEM\DBD\system_cron::FIELD_LAST_RUN.' = to_timestamp($2) WHERE '.\SYSTEM\DBD\system_cron::FIELD_CLASS.' = $3;';
-'UPDATE '.\SYSTEM\DBD\system_cron::NAME_PG.' SET '.\SYSTEM\DBD\system_cron::FIELD_STATUS.' = $1,'.\SYSTEM\DBD\system_cron::FIELD_LAST_RUN.' = to_timestamp($2) WHERE '.\SYSTEM\DBD\system_cron::FIELD_CLASS.' = $3;',
+    }
-//mys
+    public static function pqsql(){return
-'UPDATE '.\SYSTEM\DBD\system_cron::NAME_MYS.' SET '.\SYSTEM\DBD\system_cron::FIELD_STATUS.' = ?,'.\SYSTEM\DBD\system_cron::FIELD_LAST_RUN.' = FROM_UNIXTIME(?)  WHERE '.\SYSTEM\DBD\system_cron::FIELD_CLASS.' = ?;'
+'UPDATE '.\SYSTEM\DBD\system_cron::NAME_MYS.' SET '.\SYSTEM\DBD\system_cron::FIELD_STATUS.' = ?,'.\SYSTEM\DBD\system_cron::FIELD_LAST_RUN.' = FROM_UNIXTIME(?)  WHERE '.\SYSTEM\DBD\system_cron::FIELD_CLASS.' = ?;';
-);}}
+    }
+}

dbd/qq/SYS_LOCALE_SET_LOCALE.php

@@ -1,15 +1,15 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_LOCALE_SET_LOCALE extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return           
-//pg            
 'UPDATE '.\SYSTEM\DBD\system_user::NAME_PG.
 ' SET '.\SYSTEM\DBD\system_user::FIELD_LOCALE.' = $1'.
-' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = $2;',
+' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = $2;';
-//mys
+    }
+    public static function mysql(){return
 'UPDATE '.\SYSTEM\DBD\system_user::NAME_MYS.
 ' SET '.\SYSTEM\DBD\system_user::FIELD_LOCALE.' = ? '.
-'WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = ?;'
+'WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = ?;';
-);}}
+    }
+}

dbd/qq/SYS_LOG_DEL.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_LOG_DEL extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return
-//pg            
+'DELETE FROM '.\SYSTEM\DBD\system_log::NAME_PG.' WHERE "ID" = $1;';
-'DELETE FROM '.\SYSTEM\DBD\system_log::NAME_PG.' WHERE "ID" = $1;',
+    }
-//mys
+    public static function mysql(){return
-'DELETE FROM '.\SYSTEM\DBD\system_log::NAME_MYS.' WHERE ID = ?;'
+'DELETE FROM '.\SYSTEM\DBD\system_log::NAME_MYS.' WHERE ID = ?;';
-);}}
+    }
+}

dbd/qq/SYS_LOG_INSERT.php

@@ -1,10 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_LOG_INSERT extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return
-//pg            
 'INSERT INTO '.\SYSTEM\DBD\system_log::NAME_PG.
 '("'.\SYSTEM\DBD\system_log::FIELD_CLASS.'","'.\SYSTEM\DBD\system_log::FIELD_MESSAGE.'","'.
     \SYSTEM\DBD\system_log::FIELD_CODE.'","'.\SYSTEM\DBD\system_log::FIELD_FILE.'","'.
@@ -14,8 +12,9 @@ class SYS_LOG_INSERT extends \SYSTEM\DB\QP {
     \SYSTEM\DBD\system_log::FIELD_REQUEST_URI.'","'.\SYSTEM\DBD\system_log::FIELD_POST.'","'.
     \SYSTEM\DBD\system_log::FIELD_HTTP_REFERER.'","'.\SYSTEM\DBD\system_log::FIELD_HTTP_USER_AGENT.'","'.
     \SYSTEM\DBD\system_log::FIELD_USER.'","'.\SYSTEM\DBD\system_log::FIELD_THROWN.'")'.
-'VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16);',
+'VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16);';
-//mys
+    }
+    public static function mysql(){return
 'INSERT INTO '.\SYSTEM\DBD\system_log::NAME_MYS.
 '('.\SYSTEM\DBD\system_log::FIELD_CLASS.','.\SYSTEM\DBD\system_log::FIELD_MESSAGE.','.
     \SYSTEM\DBD\system_log::FIELD_CODE.','.\SYSTEM\DBD\system_log::FIELD_FILE.','.
@@ -26,5 +25,6 @@ class SYS_LOG_INSERT extends \SYSTEM\DB\QP {
     \SYSTEM\DBD\system_log::FIELD_POST.','.\SYSTEM\DBD\system_log::FIELD_HTTP_REFERER.','.
     \SYSTEM\DBD\system_log::FIELD_HTTP_USER_AGENT.','.\SYSTEM\DBD\system_log::FIELD_USER.','.
     \SYSTEM\DBD\system_log::FIELD_THROWN.')'.
-'VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);'
+'VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);';
-);}}
+    }
+}

dbd/qq/SYS_LOG_MONTH.php

@@ -1,11 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_LOG_MONTH extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function mysql(){return
-//pg            
+'SELECT * FROM '.\SYSTEM\DBD\system_log::NAME_MYS.' WHERE MONTH(time) = ? AND YEAR(time) = ? ORDER BY time DESC LIMIT 10000;';
-'todo',
+    }
-//mys
+}
-'SELECT * FROM '.\SYSTEM\DBD\system_log::NAME_MYS.' WHERE MONTH(time) = ? AND YEAR(time) = ? ORDER BY time DESC LIMIT 10000;'
-);}}

dbd/qq/SYS_LOG_OLDEST.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_LOG_OLDEST extends \SYSTEM\DB\QQ {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return
-//pg            
+'SELECT  EXTRACT(MONTH FROM time)::INTEGER as month, EXTRACT(YEAR FROM time)::INTEGER as year FROM '.\SYSTEM\DBD\system_log::NAME_PG.' ORDER BY time ASC LIMIT 1';
-'SELECT  EXTRACT(MONTH FROM time)::INTEGER as month, EXTRACT(YEAR FROM time)::INTEGER as year FROM '.\SYSTEM\DBD\system_log::NAME_PG.' ORDER BY time ASC LIMIT 1',
+    }
-//mys
+    public static function msql(){return
-'SELECT MONTH(time) as month, YEAR(time) as year FROM '.\SYSTEM\DBD\system_log::NAME_MYS.' ORDER BY time ASC LIMIT 1'
+'SELECT MONTH(time) as month, YEAR(time) as year FROM '.\SYSTEM\DBD\system_log::NAME_MYS.' ORDER BY time ASC LIMIT 1';
-);}}
+    }
+}

dbd/qq/SYS_PAGE_GROUP.php

@@ -1,17 +1,17 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_PAGE_GROUP extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return
-//pg            
 'SELECT * FROM '.\SYSTEM\DBD\system_page::NAME_PG
 .' WHERE "'.\SYSTEM\DBD\system_page::FIELD_GROUP.'" = $1'
 .' AND "'.\SYSTEM\DBD\system_page::FIELD_STATE.'" = $2'
-.' ORDER BY "'.\SYSTEM\DBD\system_page::FIELD_ID.'" ASC;',
+.' ORDER BY "'.\SYSTEM\DBD\system_page::FIELD_ID.'" ASC;';
-//mys
+    }
+    public static function mysql(){return
 'SELECT * FROM '.\SYSTEM\DBD\system_page::NAME_MYS
 .' WHERE `'.\SYSTEM\DBD\system_page::FIELD_GROUP.'` = ?'
 .' AND `'.\SYSTEM\DBD\system_page::FIELD_STATE.'` = ?'
-.' ORDER BY '.\SYSTEM\DBD\system_page::FIELD_ID.' ASC;'
+.' ORDER BY '.\SYSTEM\DBD\system_page::FIELD_ID.' ASC;';
-);}}
+    }
+}

dbd/qq/SYS_SECURITY_AVAILABLE.php

@@ -1,13 +1,13 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SECURITY_AVAILABLE extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return
-//pg            
 'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_user::NAME_PG.
-' WHERE lower('.\SYSTEM\DBD\system_user::FIELD_USERNAME.') like lower($1) ;',
+' WHERE lower('.\SYSTEM\DBD\system_user::FIELD_USERNAME.') like lower($1);';
-//mys
+    }
+    public static function mysql(){return
 'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_user::NAME_MYS.
-' WHERE lower('.\SYSTEM\DBD\system_user::FIELD_USERNAME.') like lower(?) ;'
+' WHERE lower('.\SYSTEM\DBD\system_user::FIELD_USERNAME.') like lower(?);';
-);}}
+    }
+}

dbd/qq/SYS_SECURITY_CHECK.php

@@ -2,14 +2,15 @@
 namespace SYSTEM\DBD;
 
 class SYS_SECURITY_CHECK extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return
-//pg            
 'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\UserRightsTable::NAME_PG.
 ' WHERE "'.\SYSTEM\DBD\UserRightsTable::FIELD_USERID.'" = $1'.
-' AND "'.\SYSTEM\DBD\UserRightsTable::FIELD_RIGHTID.'" = $2;',
+' AND "'.\SYSTEM\DBD\UserRightsTable::FIELD_RIGHTID.'" = $2;';
-//mys
+    }
+    public static function mysql(){return
 'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\UserRightsTable::NAME_MYS.
 ' WHERE '.\SYSTEM\DBD\UserRightsTable::FIELD_USERID.' = ?'.
-' AND '.\SYSTEM\DBD\UserRightsTable::FIELD_RIGHTID.' = ?;'
+' AND '.\SYSTEM\DBD\UserRightsTable::FIELD_RIGHTID.' = ?;';
-);}}
+    }
+}

dbd/qq/SYS_SECURITY_CREATE.php

@@ -1,17 +1,17 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SECURITY_CREATE extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return           
-//pg            
 'INSERT INTO '.\SYSTEM\DBD\system_user::NAME_PG.
 ' ('.\SYSTEM\DBD\system_user::FIELD_USERNAME.','.\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA.','
     .\SYSTEM\DBD\system_user::FIELD_EMAIL.','.\SYSTEM\DBD\system_user::FIELD_LOCALE.','.\SYSTEM\DBD\system_user::FIELD_ACCOUNT_FLAG.')'.
-' VALUES ($1, $2, $3, $4, $5);',
+' VALUES ($1, $2, $3, $4, $5);';
-//mys
+    }
+    public static function mysql(){return
 'INSERT INTO '.\SYSTEM\DBD\system_user::NAME_MYS.
 ' ('.\SYSTEM\DBD\system_user::FIELD_USERNAME.','.\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA.','
     .\SYSTEM\DBD\system_user::FIELD_EMAIL.','.\SYSTEM\DBD\system_user::FIELD_LOCALE.','.\SYSTEM\DBD\system_user::FIELD_ACCOUNT_FLAG.')'.
-' VALUES (?, ?, ?, ?, ?);'
+' VALUES (?, ?, ?, ?, ?);';
-);}}
+    }
+}

dbd/qq/SYS_SECURITY_LOGIN_MD5.php

@@ -1,15 +1,15 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SECURITY_LOGIN_MD5 extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return        
-//pg            
 'SELECT * FROM '.\SYSTEM\DBD\system_user::NAME_PG.
 ' WHERE (lower('.\SYSTEM\DBD\system_user::FIELD_USERNAME.') LIKE lower($1) OR lower('.\SYSTEM\DBD\system_user::FIELD_EMAIL.') LIKE lower($1))'.
-' AND ('.\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA.' = $2 OR  '.\SYSTEM\DBD\system_user::FIELD_PASSWORD_MD5.' = $3 );',
+' AND ('.\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA.' = $2 OR  '.\SYSTEM\DBD\system_user::FIELD_PASSWORD_MD5.' = $3 );';
-//mys
+    }
+    public static function mysql(){return
 'SELECT * FROM '.\SYSTEM\DBD\system_user::NAME_MYS.
 ' WHERE (lower('.\SYSTEM\DBD\system_user::FIELD_USERNAME.') LIKE lower(?) OR lower('.\SYSTEM\DBD\system_user::FIELD_EMAIL.') LIKE lower(?))'.
-' AND ('.\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA.' = ? OR '.\SYSTEM\DBD\system_user::FIELD_PASSWORD_MD5.' = ? );'
+' AND ('.\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA.' = ? OR '.\SYSTEM\DBD\system_user::FIELD_PASSWORD_MD5.' = ? );';
-);}}
+    }
+}

dbd/qq/SYS_SECURITY_LOGIN_SHA1.php

@@ -1,15 +1,15 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SECURITY_LOGIN_SHA1 extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return           
-//pg            
 'SELECT * FROM '.\SYSTEM\DBD\system_user::NAME_PG.
 ' WHERE (lower('.\SYSTEM\DBD\system_user::FIELD_USERNAME.') LIKE lower($1) OR lower('.\SYSTEM\DBD\system_user::FIELD_EMAIL.') LIKE lower($1))'.
-' AND '.\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA.' = $2;',
+' AND '.\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA.' = $2;';
-//mys
+    }
+    public static function mysql(){return
 'SELECT * FROM '.\SYSTEM\DBD\system_user::NAME_MYS.
 ' WHERE (lower('.\SYSTEM\DBD\system_user::FIELD_USERNAME.') LIKE lower(?) OR lower('.\SYSTEM\DBD\system_user::FIELD_EMAIL.') LIKE lower(?))'.
-' AND '.\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA.' = ?;'
+' AND '.\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA.' = ?;';
-);}}
+    }
+}

dbd/qq/SYS_SECURITY_UPDATE_LASTACTIVE.php

@@ -1,19 +1,15 @@
 <?php
 namespace SYSTEM\DBD;
-
-//using QI:
-//this does not return true nessecary,
-//since if called in a very short time twice
-//the affected row count could be zero and therefore return false!
 class SYS_SECURITY_UPDATE_LASTACTIVE extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return
-//pg            
 'UPDATE '.\SYSTEM\DBD\system_user::NAME_PG.
 ' SET '.\SYSTEM\DBD\system_user::FIELD_LAST_ACTIVE.' = NOW()'.
-' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = $1;',
+' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = $1;';
-//mys
+    }
+    public static function mysql(){return
 'UPDATE '.\SYSTEM\DBD\system_user::NAME_MYS.
 ' SET '.\SYSTEM\DBD\system_user::FIELD_LAST_ACTIVE.' = NOW()'.
-' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = ?;'
+' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = ?;';
-);}}
+    }
+}

dbd/qq/SYS_SECURITY_UPDATE_PW.php

@@ -1,15 +1,15 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SECURITY_UPDATE_PW extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return
-//pg            
 'UPDATE '.\SYSTEM\DBD\system_user::NAME_PG.
 ' SET '.\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA.' = $1'.
-' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = $2;',
+' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = $2;';
-//mys
+    }
+    public static function mysql(){return
 'UPDATE '.\SYSTEM\DBD\system_user::NAME_MYS.
 ' SET '.\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA.' = ?'.
-' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = ?;'
+' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = ?;';
-);}}
+    }
+}

dbd/qq/SYS_TEXT_DELETE.php

@@ -1,11 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_TEXT_DELETE extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function mysql(){return
-//pg            
+'DELETE FROM `system_text` WHERE id = ? and lang = ?;';
-'',
+    }
-//mys
+}
-'DELETE FROM `system_text` WHERE id = ? and lang = ?;'
-);}}

dbd/qq/SYS_TEXT_DELETE_TAGS.php

@@ -1,11 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_TEXT_DELETE_TAGS extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function mysql(){return
-//pg            
+'DELETE FROM `system_text_tag` WHERE id = ?;';
-'',
+    }
-//mys
+}
-'DELETE FROM `system_text_tag` WHERE id = ?;'
-);}}

dbd/qq/SYS_TEXT_GET_ID.php

@@ -1,11 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_TEXT_GET_ID extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function mysql(){return
-//pg            
+'SELECT id,text FROM system_text WHERE id = ? and lang = ?;';
-'',
+    }
-//mys
+}
-'SELECT id,text FROM system_text WHERE id = ? and lang = ?;'
-);}}

dbd/qq/SYS_TEXT_GET_ID_COUNT.php

@@ -1,12 +1,9 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_TEXT_GET_ID_COUNT extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function mysql(){return
-//pg            
-'',
-//mys
 'SELECT count(*) as count FROM system_text
- WHERE id = ?;'
+ WHERE id = ?;';
-);}}
+    }
+}

dbd/qq/SYS_TEXT_GET_ID_TAGS.php

@@ -1,11 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_TEXT_GET_ID_TAGS extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function mysql(){return
-//pg            
+'SELECT tag FROM system_text_tag WHERE id = ?';
-'',
+    }
-//mys
+}
-'SELECT tag FROM system_text_tag WHERE id = ?'
-);}}

dbd/qq/SYS_TEXT_GET_TAG.php

@@ -1,13 +1,10 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_TEXT_GET_TAG extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function mysql(){return
-//pg            
-'',
-//mys
 'SELECT system_text.id,text FROM system_text
  LEFT JOIN system_text_tag ON system_text.id = system_text_tag.id
- WHERE tag = ? and lang = ?;'
+ WHERE tag = ? and lang = ?;';
-);}}
+    }
+}

dbd/qq/SYS_TEXT_RENAME.php

@@ -1,11 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_TEXT_RENAME extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function mysql(){return
-//pg            
+'UPDATE system_text SET id = ? WHERE id = ?;';
-'',
+    }
-//mys
+}
-'UPDATE system_text SET id = ? WHERE id = ?;'
-);}}

dbd/qq/SYS_TEXT_RENAME_TAGS.php

@@ -1,11 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_TEXT_RENAME_TAGS extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function mysql(){return
-//pg            
+'UPDATE system_text_tag SET id = ? WHERE id = ?;';
-'',
+    }
-//mys
+}
-'UPDATE system_text_tag SET id = ? WHERE id = ?;'
-);}}

dbd/qq/SYS_TEXT_SAVE.php

@@ -1,13 +1,10 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_TEXT_SAVE extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function mysql(){return
-//pg            
-'',
-//mys
 'INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`)
  VALUES (?, ?, ?, ?, ?, NOW(), NOW())
- ON DUPLICATE KEY UPDATE text=VALUES(text), author_edit = VALUES(author_edit), time_edit = NOW();'
+ ON DUPLICATE KEY UPDATE text=VALUES(text), author_edit = VALUES(author_edit), time_edit = NOW();';
-);}}
+    }
+}

dbd/qq/SYS_TEXT_SAVE_TAG.php

@@ -1,12 +1,9 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_TEXT_SAVE_TAG extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function mysql(){return
-//pg            
-'',
-//mys
 'INSERT IGNORE `system_text_tag` (`id`, `tag`)
- VALUES (?, ?);'
+ VALUES (?, ?);';
-);}}
+    }
+}

dbd/sql/mysql/data/system_page.sql

@@ -1,6 +1,6 @@
 INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (0, 42, 'start', 'start', -1, 0, 0, '#content', './sai.php?sai_mod=.SYSTEM.SAI.saistart_sys_sai', 'init_saistart_sys_sai', '\\SYSTEM\\SAI\\saistart_sys_sai');
-INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (1, 42, 'todo', 'start', 0, 1, 0, '#todo_entries', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_todo&action=todolist', '', '');
+INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (1, 42, 'todo', 'start', 0, 1, 0, '#todo_entries', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_todo&action=todolist', 'init_saistart_sys_sai_todo', '\\SYSTEM\\SAI\\saistart_sys_sai');
-INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (2, 42, 'log', 'start', 0, 1, 0, '#log_entries', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_log&action=filter', '', '');
+INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (2, 42, 'log', 'start', 0, 1, 0, '#log_entries', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_log&action=filter', 'init_saistart_sys_sai_log', '\\SYSTEM\\SAI\\saistart_sys_sai');
 
 INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (10, 42, 'api', 'api', -1, 0, 0, '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_api', 'init_saimod_sys_api', '\\SYSTEM\\SAI\\saimod_sys_api');
 INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (11, 42, 'all', 'api', 10, 0, 0, '#tab_api', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_api&action=list&group=${group}', 'init_saimod_sys_api_list', '\\SYSTEM\\SAI\\saimod_sys_api');
@@ -29,6 +29,7 @@ INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`,
 INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (73, 42, 'error', 'log', 70, 0, 1, '#tab_log', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_log&action=error&error=${error}', '', '');
 
 INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (80, 42, 'login', 'login', -1, 0, 0, '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_login', 'init_saimod_sys_login', '\\SYSTEM\\SAI\\saimod_sys_login');
+INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (81, 42, 'register', 'login', 80, 0, 1, '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_login&action=registerform', 'init_saimod_sys_register', '\\SYSTEM\\SAI\\saimod_sys_login');
 
 INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (90, 42, 'mod', 'mod', -1, 0, 0, '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_mod', 'init_saimod_sys_mod', '\\SYSTEM\\SAI\\saimod_sys_mod');
 INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (91, 42, 'system', 'mod', 90, 0, 0, '#tab_mod', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_mod&action=system', 'init_saimod_sys_mod_system', '\\SYSTEM\\SAI\\saimod_sys_mod');

dbd/sql/mysql/data/system_text.sql

@@ -56,6 +56,7 @@
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_cancel', 'frFR', 'Annuler', 3, 3, '2015-04-18 04:46:32', '2015-04-18 04:46:32');
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_cancel', 'jaJA', 'キャンシル', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_cancel', 'basic');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_cancel', 'sai_login');
 
     DELETE FROM `system_text` WHERE id = 'basic_close';
     DELETE FROM `system_text_tag` WHERE id = 'basic_close';
@@ -213,6 +214,7 @@
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_password_long', 'enUS', 'Password too long', 0, 0, '2015-04-18 13:16:18', '0000-00-00 00:00:00');
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_password_long', 'frFR', 'Mot de passe trop long!', 3, 3, '2015-04-20 16:28:21', '2015-04-20 16:28:21');
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_long', 'basic');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_long', 'sai_login');
 
     DELETE FROM `system_text` WHERE id = 'basic_password_match';
     DELETE FROM `system_text_tag` WHERE id = 'basic_password_match';
@@ -220,6 +222,7 @@
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_password_match', 'enUS', 'Passwords do not match!', 0, 0, '2015-04-18 13:16:33', '0000-00-00 00:00:00');
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_password_match', 'frFR', 'Les mots de passe ne lui correspondent pas!', 3, 3, '2015-04-20 16:20:57', '2015-04-20 16:20:57');
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_match', 'basic');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_match', 'sai_login');
 
     DELETE FROM `system_text` WHERE id = 'basic_password_miss';
     DELETE FROM `system_text_tag` WHERE id = 'basic_password_miss';
@@ -227,6 +230,7 @@
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_password_miss', 'enUS', 'Password required', 0, 0, '2015-04-18 13:16:46', '0000-00-00 00:00:00');
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_password_miss', 'frFR', 'Mot de passe demandé!', 3, 3, '2015-04-20 16:18:30', '2015-04-20 16:18:30');
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_miss', 'basic');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_miss', 'sai_login');
 
     DELETE FROM `system_text` WHERE id = 'basic_password_short';
     DELETE FROM `system_text_tag` WHERE id = 'basic_password_short';
@@ -234,6 +238,7 @@
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_password_short', 'enUS', 'Password too short', 0, 0, '2015-04-18 13:16:58', '0000-00-00 00:00:00');
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_password_short', 'frFR', 'Mot de passe est trop court!', 3, 3, '2015-04-20 16:24:50', '2015-04-20 16:24:50');
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_short', 'basic');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_short', 'sai_login');
 
     DELETE FROM `system_text` WHERE id = 'basic_placeholder_email';
     DELETE FROM `system_text_tag` WHERE id = 'basic_placeholder_email';
@@ -244,6 +249,7 @@
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_email', 'jaJA', 'peter@world.org', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_email', 'trTR', 'peter@world.org', 0, 0, '2015-04-15 18:29:17', '0000-00-00 00:00:00');
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_email', 'basic');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_email', 'sai_login');
 
     DELETE FROM `system_text` WHERE id = 'basic_placeholder_password';
     DELETE FROM `system_text_tag` WHERE id = 'basic_placeholder_password';
@@ -251,6 +257,7 @@
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_password', 'enUS', 'secret123', 0, 2, '2015-04-20 01:42:30', '2015-04-20 01:42:30');
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_password', 'jaJA', '丸秘のパスワード', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_password', 'basic');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_password', 'sai_login');
 
     DELETE FROM `system_text` WHERE id = 'basic_placeholder_username';
     DELETE FROM `system_text_tag` WHERE id = 'basic_placeholder_username';
@@ -261,6 +268,7 @@
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_username', 'jaJA', 'peter / peter@world.org', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_username', 'trTR', 'peter@world.org', 0, 0, '2015-04-15 18:29:17', '0000-00-00 00:00:00');
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_username', 'basic');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_username', 'sai_login');
     
     DELETE FROM `system_text` WHERE id = 'basic_placeholder_search';
     DELETE FROM `system_text_tag` WHERE id = 'basic_placeholder_search';
@@ -669,8 +677,8 @@
 
     DELETE FROM `system_text` WHERE id = 'sai_files_title';
     DELETE FROM `system_text_tag` WHERE id = 'sai_files_title';
-    INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('sai_files_title', 'deDE', 'System - Dateien', 3, 3, '2015-05-16 13:53:33', '2015-05-16 13:53:33');
+    INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('sai_files_title', 'deDE', 'System Dateien', 3, 3, '2015-05-16 13:53:33', '2015-05-16 13:53:33');
-    INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('sai_files_title', 'enUS', 'System - ファイル', 2, 1, '2015-04-20 16:18:27', '2015-04-20 16:18:27');
+    INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('sai_files_title', 'enUS', 'System ファイル', 2, 1, '2015-04-20 16:18:27', '2015-04-20 16:18:27');
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('sai_files_title', 'frFR', 'System Fichiers', 3, 3, '2015-04-20 19:15:58', '2015-04-20 19:15:58');
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_files_title', 'sai');
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_files_title', 'sai_files');
@@ -918,7 +926,7 @@
 
     DELETE FROM `system_text` WHERE id = 'sai_todo_title';
     DELETE FROM `system_text_tag` WHERE id = 'sai_todo_title';
-    INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('sai_todo_title', 'deDE', 'System To-do', 2, 2, '2015-04-23 01:53:37', '2015-04-23 01:53:37');
+    INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('sai_todo_title', 'deDE', 'System ToDo', 2, 2, '2015-04-23 01:53:37', '2015-04-23 01:53:37');
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('sai_todo_title', 'enUS', 'System ToDo', 2, 2, '2015-04-17 19:22:57', '2015-04-17 19:22:57');
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('sai_todo_title', 'frFR', 'System ToDo', 2, 2, '2015-04-17 19:22:57', '2015-04-17 19:22:57');
     INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('sai_todo_title', 'esES', 'System ToDo', 2, 2, '2015-04-17 19:22:57', '2015-04-17 19:22:57');
@@ -926,6 +934,16 @@
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_todo_title', 'sai');
     INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_todo_title', 'sai_todo');
 
+    DELETE FROM `system_text` WHERE id = 'sai_git_title';
+    DELETE FROM `system_text_tag` WHERE id = 'sai_git_title';
+    INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('sai_git_title', 'deDE', 'System Git', 2, 2, '2015-04-23 01:53:37', '2015-04-23 01:53:37');
+    INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('sai_git_title', 'enUS', 'System Git', 2, 2, '2015-04-17 19:22:57', '2015-04-17 19:22:57');
+    INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('sai_git_title', 'frFR', 'System Git', 2, 2, '2015-04-17 19:22:57', '2015-04-17 19:22:57');
+    INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('sai_git_title', 'esES', 'System Git', 2, 2, '2015-04-17 19:22:57', '2015-04-17 19:22:57');
+    INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('sai_git_title', 'trTR', 'System Git', 2, 2, '2015-04-17 19:22:57', '2015-04-17 19:22:57');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_git_title', 'sai');
+    INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_git_title', 'sai_git');
+
 -- Table
 
     DELETE FROM `system_text` WHERE id = 'table_author';

files/sys/system.js

@@ -200,7 +200,7 @@ SYSTEM.prototype.go_state = function(default_state,forced){
 
 SYSTEM.prototype.back = function(){
     window.history.back();};
-SYSTEM.prototype.forwad = function(){
+SYSTEM.prototype.forward = function(){
     window.history.forward();};
 SYSTEM.prototype.reload = function(href){
     if('#!'+this.cur_state() === href){

git/Git.php

@@ -1,113 +0,0 @@
-<?php
-/*
- * Git.php
- *
- * A PHP git library
- *
- * @package    Git.php
- * @version    0.1.4
- * @author     James Brumond
- * @copyright  Copyright 2013 James Brumond
- * @repo       http://github.com/kbjr/Git.php
- */
-
-
-
-namespace SYSTEM\GIT;
-/**
- * Git Interface Class
- *
- * This class enables the creating, reading, and manipulation
- * of git repositories.
- *
- * @class  Git
- */
-class Git {
-
-	/**
-	 * Git executable location
-	 *
-	 * @var string
-	 */
-	protected static $bin = '/usr/bin/git';
-
-	/**
-	 * Sets git executable path
-	 *
-	 * @param string $path executable location
-	 */
-	public static function set_bin($path) {
-		self::$bin = $path;
-	}
-
-	/**
-	 * Gets git executable path
-	 */
-	public static function get_bin() {
-		return self::$bin;
-	}
-
-	/**
-	 * Sets up library for use in a default Windows environment
-	 */
-	public static function windows_mode() {
-		self::set_bin('git');
-	}
-
-	/**
-	 * Create a new git repository
-	 *
-	 * Accepts a creation path, and, optionally, a source path
-	 *
-	 * @access  public
-	 * @param   string  repository path
-	 * @param   string  directory to source
-	 * @return  GitRepo
-	 */
-	public static function &create($repo_path, $source = null) {
-		return GitRepo::create_new($repo_path, $source);
-	}
-
-	/**
-	 * Open an existing git repository
-	 *
-	 * Accepts a repository path
-	 *
-	 * @access  public
-	 * @param   string  repository path
-	 * @return  GitRepo
-	 */
-	public static function open($repo_path) {
-		return new GitRepo($repo_path);
-	}
-
-	/**
-	 * Clones a remote repo into a directory and then returns a GitRepo object
-	 * for the newly created local repo
-	 *
-	 * Accepts a creation path and a remote to clone from
-	 *
-	 * @access  public
-	 * @param   string  repository path
-	 * @param   string  remote source
-	 * @param   string  reference path
-	 * @return  GitRepo
-	 **/
-	public static function &clone_remote($repo_path, $remote, $reference = null) {
-		return GitRepo::create_new($repo_path, $remote, true, $reference);
-	}
-
-	/**
-	 * Checks if a variable is an instance of GitRepo
-	 *
-	 * Accepts a variable
-	 *
-	 * @access  public
-	 * @param   mixed   variable
-	 * @return  bool
-	 */
-	public static function is_repo($var) {
-		return (get_class($var) == 'GitRepo');
-	}
-
-}

git/GitRepo.php

@@ -1,572 +0,0 @@
-<?php
-namespace SYSTEM\GIT;
-/**
- * Git Repository Interface Class
- *
- * This class enables the creating, reading, and manipulation
- * of a git repository
- *
- * @class  GitRepo
- */
-class GitRepo {
-
-	protected $repo_path = null;
-	protected $bare = false;
-	protected $envopts = array();
-
-	/**
-	 * Create a new git repository
-	 *
-	 * Accepts a creation path, and, optionally, a source path
-	 *
-	 * @access  public
-	 * @param   string  repository path
-	 * @param   string  directory to source
-	 * @param   string  reference path
-	 * @return  GitRepo
-	 */
-	public static function &create_new($repo_path, $source = null, $remote_source = false, $reference = null) {
-		if (is_dir($repo_path) && file_exists($repo_path."/.git") && is_dir($repo_path."/.git")) {
-			throw new \Exception('"'.$repo_path.'" is already a git repository');
-		} else {
-			$repo = new self($repo_path, true, false);
-			if (is_string($source)) {
-				if ($remote_source) {
-					if (!is_dir($reference) || !is_dir($reference.'/.git')) {
-						throw new \Exception('"'.$reference.'" is not a git repository. Cannot use as reference.');
-					} else if (strlen($reference)) {
-						$reference = realpath($reference);
-						$reference = "--reference $reference";
-					}
-					$repo->clone_remote($source, $reference);
-				} else {
-					$repo->clone_from($source);
-				}
-			} else {
-				$repo->run('init');
-			}
-			return $repo;
-		}
-	}
-
-	/**
-	 * Constructor
-	 *
-	 * Accepts a repository path
-	 *
-	 * @access  public
-	 * @param   string  repository path
-	 * @param   bool    create if not exists?
-	 * @return  void
-	 */
-	public function __construct($repo_path = null, $create_new = false, $_init = true) {
-		if (is_string($repo_path)) {
-			$this->set_repo_path($repo_path, $create_new, $_init);
-		}
-	}
-
-	/**
-	 * Set the repository's path
-	 *
-	 * Accepts the repository path
-	 *
-	 * @access  public
-	 * @param   string  repository path
-	 * @param   bool    create if not exists?
-	 * @param   bool    initialize new Git repo if not exists?
-	 * @return  void
-	 */
-	public function set_repo_path($repo_path, $create_new = false, $_init = true) {
-		if (is_string($repo_path)) {
-			if ($new_path = realpath($repo_path)) {
-				$repo_path = $new_path;
-				if (is_dir($repo_path)) {
-					// Is this a work tree?
-					if (file_exists($repo_path."/.git") && is_dir($repo_path."/.git")) {
-						$this->repo_path = $repo_path;
-						$this->bare = false;
-					// Is this a bare repo?
-					} else if (is_file($repo_path."/config")) {
-					  $parse_ini = parse_ini_file($repo_path."/config");
-						if ($parse_ini['bare']) {
-							$this->repo_path = $repo_path;
-							$this->bare = true;
-						}
-					} else {
-						if ($create_new) {
-							$this->repo_path = $repo_path;
-							if ($_init) {
-								$this->run('init');
-							}
-						} else {
-							throw new \Exception('"'.$repo_path.'" is not a git repository');
-						}
-					}
-				} else {
-					throw new \Exception('"'.$repo_path.'" is not a directory');
-				}
-			} else {
-				if ($create_new) {
-					if ($parent = realpath(dirname($repo_path))) {
-						mkdir($repo_path);
-						$this->repo_path = $repo_path;
-						if ($_init) $this->run('init');
-					} else {
-						throw new \Exception('cannot create repository in non-existent directory');
-					}
-				} else {
-					throw new \Exception('"'.$repo_path.'" does not exist');
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Get the path to the git repo directory (eg. the ".git" directory)
-	 * 
-	 * @access public
-	 * @return string
-	 */
-	public function git_directory_path() {
-		return ($this->bare) ? $this->repo_path : $this->repo_path."/.git";
-	}
-
-	/**
-	 * Tests if git is installed
-	 *
-	 * @access  public
-	 * @return  bool
-	 */
-	public function test_git() {
-		$descriptorspec = array(
-			1 => array('pipe', 'w'),
-			2 => array('pipe', 'w'),
-		);
-		$pipes = array();
-		$resource = proc_open(Git::get_bin(), $descriptorspec, $pipes);
-
-		$stdout = stream_get_contents($pipes[1]);
-		$stderr = stream_get_contents($pipes[2]);
-		foreach ($pipes as $pipe) {
-			fclose($pipe);
-		}
-
-		$status = trim(proc_close($resource));
-		return ($status != 127);
-	}
-
-	/**
-	 * Run a command in the git repository
-	 *
-	 * Accepts a shell command to run
-	 *
-	 * @access  protected
-	 * @param   string  command to run
-	 * @return  string
-	 */
-	protected function run_command($command) {
-		$descriptorspec = array(
-			1 => array('pipe', 'w'),
-			2 => array('pipe', 'w'),
-		);
-		$pipes = array();
-		/* Depending on the value of variables_order, $_ENV may be empty.
-		 * In that case, we have to explicitly set the new variables with
-		 * putenv, and call proc_open with env=null to inherit the reset
-		 * of the system.
-		 *
-		 * This is kind of crappy because we cannot easily restore just those
-		 * variables afterwards.
-		 *
-		 * If $_ENV is not empty, then we can just copy it and be done with it.
-		 */
-		if(count($_ENV) === 0) {
-			$env = NULL;
-			foreach($this->envopts as $k => $v) {
-				putenv(sprintf("%s=%s",$k,$v));
-			}
-		} else {
-			$env = array_merge($_ENV, $this->envopts);
-		}
-		$cwd = $this->repo_path;
-		$resource = proc_open($command, $descriptorspec, $pipes, $cwd, $env);
-
-		$stdout = stream_get_contents($pipes[1]);
-		$stderr = stream_get_contents($pipes[2]);
-		foreach ($pipes as $pipe) {
-			fclose($pipe);
-		}
-
-		$status = trim(proc_close($resource));
-		if ($status) throw new \Exception($stderr);
-
-		return $stdout;
-	}
-
-	/**
-	 * Run a git command in the git repository
-	 *
-	 * Accepts a git command to run
-	 *
-	 * @access  public
-	 * @param   string  command to run
-	 * @return  string
-	 */
-	public function run($command) {
-		return $this->run_command(Git::get_bin()." ".$command);
-	}
-
-	/**
-	 * Runs a 'git status' call
-	 *
-	 * Accept a convert to HTML bool
-	 *
-	 * @access public
-	 * @param bool  return string with <br />
-	 * @return string
-	 */
-	public function status($html = false) {
-		$msg = $this->run("status");
-		if ($html == true) {
-			$msg = str_replace("\n", "<br />", $msg);
-		}
-		return $msg;
-	}
-
-	/**
-	 * Runs a `git add` call
-	 *
-	 * Accepts a list of files to add
-	 *
-	 * @access  public
-	 * @param   mixed   files to add
-	 * @return  string
-	 */
-	public function add($files = "*") {
-		if (is_array($files)) {
-			$files = '"'.implode('" "', $files).'"';
-		}
-		return $this->run("add $files -v");
-	}
-
-	/**
-	 * Runs a `git rm` call
-	 *
-	 * Accepts a list of files to remove
-	 *
-	 * @access  public
-	 * @param   mixed    files to remove
-	 * @param   Boolean  use the --cached flag?
-	 * @return  string
-	 */
-	public function rm($files = "*", $cached = false) {
-		if (is_array($files)) {
-			$files = '"'.implode('" "', $files).'"';
-		}
-		return $this->run("rm ".($cached ? '--cached ' : '').$files);
-	}
-
-
-	/**
-	 * Runs a `git commit` call
-	 *
-	 * Accepts a commit message string
-	 *
-	 * @access  public
-	 * @param   string  commit message
-	 * @param   boolean  should all files be committed automatically (-a flag)
-	 * @return  string
-	 */
-	public function commit($message = "", $commit_all = true) {
-		$flags = $commit_all ? '-av' : '-v';
-		return $this->run("commit ".$flags." -m ".escapeshellarg($message));
-	}
-
-	/**
-	 * Runs a `git clone` call to clone the current repository
-	 * into a different directory
-	 *
-	 * Accepts a target directory
-	 *
-	 * @access  public
-	 * @param   string  target directory
-	 * @return  string
-	 */
-	public function clone_to($target) {
-		return $this->run("clone --local ".$this->repo_path." $target");
-	}
-
-	/**
-	 * Runs a `git clone` call to clone a different repository
-	 * into the current repository
-	 *
-	 * Accepts a source directory
-	 *
-	 * @access  public
-	 * @param   string  source directory
-	 * @return  string
-	 */
-	public function clone_from($source) {
-		return $this->run("clone --local $source ".$this->repo_path);
-	}
-
-	/**
-	 * Runs a `git clone` call to clone a remote repository
-	 * into the current repository
-	 *
-	 * Accepts a source url
-	 *
-	 * @access  public
-	 * @param   string  source url
-	 * @param   string  reference path
-	 * @return  string
-	 */
-	public function clone_remote($source, $reference) {
-		return $this->run("clone $reference $source ".$this->repo_path);
-	}
-
-	/**
-	 * Runs a `git clean` call
-	 *
-	 * Accepts a remove directories flag
-	 *
-	 * @access  public
-	 * @param   bool    delete directories?
-	 * @param   bool    force clean?
-	 * @return  string
-	 */
-	public function clean($dirs = false, $force = false) {
-		return $this->run("clean".(($force) ? " -f" : "").(($dirs) ? " -d" : ""));
-	}
-
-	/**
-	 * Runs a `git branch` call
-	 *
-	 * Accepts a name for the branch
-	 *
-	 * @access  public
-	 * @param   string  branch name
-	 * @return  string
-	 */
-	public function create_branch($branch) {
-		return $this->run("branch $branch");
-	}
-
-	/**
-	 * Runs a `git branch -[d|D]` call
-	 *
-	 * Accepts a name for the branch
-	 *
-	 * @access  public
-	 * @param   string  branch name
-	 * @return  string
-	 */
-	public function delete_branch($branch, $force = false) {
-		return $this->run("branch ".(($force) ? '-D' : '-d')." $branch");
-	}
-
-	/**
-	 * Runs a `git branch` call
-	 *
-	 * @access  public
-	 * @param   bool    keep asterisk mark on active branch
-	 * @return  array
-	 */
-	public function list_branches($keep_asterisk = false) {
-		$branchArray = explode("\n", $this->run("branch"));
-		foreach($branchArray as $i => &$branch) {
-			$branch = trim($branch);
-			if (! $keep_asterisk) {
-				$branch = str_replace("* ", "", $branch);
-			}
-			if ($branch == "") {
-				unset($branchArray[$i]);
-			}
-		}
-		return $branchArray;
-	}
-
-	/**
-	 * Lists remote branches (using `git branch -r`).
-	 *
-	 * Also strips out the HEAD reference (e.g. "origin/HEAD -> origin/master").
-	 *
-	 * @access  public
-	 * @return  array
-	 */
-	public function list_remote_branches() {
-		$branchArray = explode("\n", $this->run("branch -r"));
-		foreach($branchArray as $i => &$branch) {
-			$branch = trim($branch);
-			if ($branch == "" || strpos($branch, 'HEAD -> ') !== false) {
-				unset($branchArray[$i]);
-			}
-		}
-		return $branchArray;
-	}
-
-	/**
-	 * Returns name of active branch
-	 *
-	 * @access  public
-	 * @param   bool    keep asterisk mark on branch name
-	 * @return  string
-	 */
-	public function active_branch($keep_asterisk = false) {
-		$branchArray = $this->list_branches(true);
-		$active_branch = preg_grep("/^\*/", $branchArray);
-		reset($active_branch);
-		if ($keep_asterisk) {
-			return current($active_branch);
-		} else {
-			return str_replace("* ", "", current($active_branch));
-		}
-	}
-
-	/**
-	 * Runs a `git checkout` call
-	 *
-	 * Accepts a name for the branch
-	 *
-	 * @access  public
-	 * @param   string  branch name
-	 * @return  string
-	 */
-	public function checkout($branch) {
-		return $this->run("checkout $branch");
-	}
-
-
-	/**
-	 * Runs a `git merge` call
-	 *
-	 * Accepts a name for the branch to be merged
-	 *
-	 * @access  public
-	 * @param   string $branch
-	 * @return  string
-	 */
-	public function merge($branch) {
-		return $this->run("merge $branch --no-ff");
-	}
-
-
-	/**
-	 * Runs a git fetch on the current branch
-	 *
-	 * @access  public
-	 * @return  string
-	 */
-	public function fetch() {
-		return $this->run("fetch");
-	}
-
-	/**
-	 * Add a new tag on the current position
-	 *
-	 * Accepts the name for the tag and the message
-	 *
-	 * @param string $tag
-	 * @param string $message
-	 * @return string
-	 */
-	public function add_tag($tag, $message = null) {
-		if ($message === null) {
-			$message = $tag;
-		}
-		return $this->run("tag -a $tag -m " . escapeshellarg($message));
-	}
-
-	/**
-	 * List all the available repository tags.
-	 *
-	 * Optionally, accept a shell wildcard pattern and return only tags matching it.
-	 *
-	 * @access	public
-	 * @param	string	$pattern	Shell wildcard pattern to match tags against.
-	 * @return	array				Available repository tags.
-	 */
-	public function list_tags($pattern = null) {
-		$tagArray = explode("\n", $this->run("tag -l $pattern"));
-		foreach ($tagArray as $i => &$tag) {
-			$tag = trim($tag);
-			if ($tag == '') {
-				unset($tagArray[$i]);
-			}
-		}
-
-		return $tagArray;
-	}
-
-	/**
-	 * Push specific branch to a remote
-	 *
-	 * Accepts the name of the remote and local branch
-	 *
-	 * @param string $remote
-	 * @param string $branch
-	 * @return string
-	 */
-	public function push($remote, $branch) {
-		return $this->run("push --tags $remote $branch");
-	}
-
-	/**
-	 * Pull specific branch from remote
-	 *
-	 * Accepts the name of the remote and local branch
-	 *
-	 * @param string $remote
-	 * @param string $branch
-	 * @return string
-	 */
-	public function pull($remote, $branch) {
-		return $this->run("pull $remote $branch");
-	}
-
-	/**
-	 * List log entries.
-	 *
-	 * @param strgin $format
-	 * @return string
-	 */
-	public function log($format = null) {
-		if ($format === null)
-			return $this->run('log');
-		else
-			return $this->run('log --pretty=format:"' . $format . '"');
-	}
-
-	/**
-	 * Sets the project description.
-	 *
-	 * @param string $new
-	 */
-	public function set_description($new) {
-		$path = $this->git_directory_path();
-		file_put_contents($path."/description", $new);
-	}
-
-	/**
-	 * Gets the project description.
-	 *
-	 * @return string
-	 */
-	public function get_description() {
-		$path = $this->git_directory_path();
-		return file_get_contents($path."/description");
-	}
-
-	/**
-	 * Sets custom environment options for calling Git
-	 *
-	 * @param string key
-	 * @param string value
-	 */
-	public function setenv($key, $value) {
-		$this->envopts[$key] = $value;
-	}
-
-}
-
-/* End of file */

git/autoload.inc

@@ -1,2 +0,0 @@
-<?php
-\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\GIT');

lib/animate

@@ -1 +1 @@
-Subproject commit 1b177f228ddd1e43b4422995332956e19ad70afe
+Subproject commit 666544655bf5365e4f77aec0fa0f497673f6e69a

lib/autoload.inc

@@ -10,3 +10,4 @@ require_once dirname(__FILE__).'/textillate/autoload.inc';
 require_once dirname(__FILE__).'/animate/autoload.inc';
 require_once dirname(__FILE__).'/lettering/autoload.inc';
 require_once dirname(__FILE__).'/bootstrap_growl/autoload.inc';
+require_once dirname(__FILE__).'/git/autoload.inc';

lib/git

@@ -0,0 +1 @@
+Subproject commit f9b9a5ad101b15e95094560b8c48064a4147b7b7

lib/lettering

@@ -1 +1 @@
-Subproject commit c5336db4a661246ecc3d0d62d79be4d07493a296
+Subproject commit 8a7a3377e82231ecf09d40732c75e8bee032228e

log/error_handler/error_handler_dbwriter.php

@@ -10,12 +10,12 @@ class error_handler_dbwriter extends \SYSTEM\LOG\error_handler {
             if(\property_exists(get_class($E), 'logged') && $E->logged){                
                 return false;} //alrdy logged(this prevents proper thrown value for every system exception)
             
-            \SYSTEM\DBD\SYS_LOG_INSERT::Q1( array(  get_class($E), $E->getMessage(), $E->getCode(), $E->getFile(), $E->getLine(), $E->getTraceAsString(),
+            \SYSTEM\DBD\SYS_LOG_INSERT::Q1( /*array(  get_class($E), $E->getMessage(), $E->getCode(), $E->getFile(), $E->getLine(), $E->getTraceAsString(),
                                                     getenv('REMOTE_ADDR'),round(microtime(true) - \SYSTEM\time::getStartTime(),5),
                                                     $_SERVER["SERVER_NAME"],$_SERVER["SERVER_PORT"],$_SERVER['REQUEST_URI'], serialize($_POST),
                                                     array_key_exists('HTTP_REFERER', $_SERVER) ? $_SERVER['HTTP_REFERER'] : null,
                                                     array_key_exists('HTTP_USER_AGENT',$_SERVER) ? $_SERVER['HTTP_USER_AGENT'] : null,
-                                                    ($user = \SYSTEM\SECURITY\Security::getUser()) ? $user->id : null, $thrown ? 1 : 0),
+                                                    ($user = \SYSTEM\SECURITY\Security::getUser()) ? $user->id : null, $thrown ? 1 : 0),*/
                                             array(  get_class($E), $E->getMessage(), $E->getCode(), $E->getFile(), $E->getLine(), $E->getTraceAsString(),
                                                     getenv('REMOTE_ADDR'),round(microtime(true) - \SYSTEM\time::getStartTime(),5),date('Y-m-d H:i:s', microtime(true)),
                                                     $_SERVER["SERVER_NAME"],$_SERVER["SERVER_PORT"],$_SERVER['REQUEST_URI'], serialize($_POST),

sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_ADD.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_API_ADD extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return
-//pg            
+'INSERT INTO '.\SYSTEM\DBD\system_api::NAME_PG.' (ID, group, type, parentID, parentValue, name, verify) VALUES ($1, $2, $3, $4, $5, $6, $7);';
-'INSERT INTO '.\SYSTEM\DBD\system_api::NAME_PG.' (ID, group, type, parentID, parentValue, name, verify) VALUES ($1, $2, $3, $4, $5, $6, $7);',
+    }
-//mys
+    public static function mysql(){return
-'INSERT INTO '.\SYSTEM\DBD\system_api::NAME_MYS.' (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (?, ?, ?, ?, ?, ?, ?);'
+'INSERT INTO '.\SYSTEM\DBD\system_api::NAME_MYS.' (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (?, ?, ?, ?, ?, ?, ?);';
-);}}
+    }
+}

sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_DEL.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_API_DEL extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return
-//pg            
+'DELETE FROM '.\SYSTEM\DBD\system_api::NAME_PG.' WHERE `ID` = $1 AND group = $2;';
-'DELETE FROM '.\SYSTEM\DBD\system_api::NAME_PG.' WHERE `ID` = $1 AND group = $2;',
+    }
-//mys
+    public static function mysql(){return
-'DELETE FROM '.\SYSTEM\DBD\system_api::NAME_MYS.' WHERE `ID` = ? AND `group` = ?;'
+'DELETE FROM '.\SYSTEM\DBD\system_api::NAME_MYS.' WHERE `ID` = ? AND `group` = ?;';
-);}}
+    }
+}

sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_GET.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_API_GET extends \SYSTEM\DB\QQ {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return          
-//pg            
+'SELECT * FROM system_api ORDER BY `group`, `ID` ASC;';
-'SELECT * FROM system_api ORDER BY `group`, `ID` ASC;',
+    }
-//mys
+    public static function mysql(){return
-'SELECT * FROM system_api ORDER BY `group`, `ID` ASC;'
+'SELECT * FROM system_api ORDER BY `group`, `ID` ASC;';
-);}}
+    }
+}

sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_GROUPS.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_API_GROUPS extends \SYSTEM\DB\QQ {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return
-//pg            
+'SELECT "group", count(*) as "count" FROM system.api GROUP BY "group" ORDER BY "group" ASC;';
-'SELECT "group", count(*) as "count" FROM system.api GROUP BY "group" ORDER BY "group" ASC;',
+    }
-//mys
+    public static function mysql(){return
-'SELECT `group`, count(*) as `count` FROM system_api GROUP BY `group` ORDER BY `group` ASC;'
+'SELECT `group`, count(*) as `count` FROM system_api GROUP BY `group` ORDER BY `group` ASC;';
-);}}
+    }
+}

sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_SINGLE_SELECT.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_API_SINGLE_SELECT extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return            
-//pg            
+'SELECT * FROM '.\SYSTEM\DBD\system_api::NAME_PG.'  WHERE ID = $1 AND group = $2;';
-'SELECT * FROM '.\SYSTEM\DBD\system_api::NAME_PG.'  WHERE ID = $1 AND group = $2;',
+    }
-//mys
+    public static function mysql(){return
-'SELECT * FROM '.\SYSTEM\DBD\system_api::NAME_MYS.' WHERE ID = ? AND `group` = ?;'
+'SELECT * FROM '.\SYSTEM\DBD\system_api::NAME_MYS.' WHERE ID = ? AND `group` = ?;';
-);}}
+    }
+}

sai/modules/saimod_sys_cache/qq/SYS_SAIMOD_CACHE.php

@@ -0,0 +1,11 @@
+<?php
+namespace SYSTEM\DBD;
+class SYS_SAIMOD_CACHE extends \SYSTEM\DB\QQ {
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'SELECT *, encode(data,\'base64\') FROM system.cache ORDER BY "ID" ASC LIMIT 100;';
+    }
+    public static function mysql(){return
+'SELECT * FROM system_cache ORDER BY ID ASC LIMIT 100;';
+    }
+}

sai/modules/saimod_sys_cache/qq/SYS_SAIMOD_CACHE_COUNT.php

@@ -0,0 +1,11 @@
+<?php
+namespace SYSTEM\DBD;
+class SYS_SAIMOD_CACHE_COUNT extends \SYSTEM\DB\QQ {
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'SELECT COUNT(*) as "count" FROM system.cache';
+    }
+    public static function mysql(){return
+'SELECT COUNT(*) as count FROM system_cache';
+    }
+}

sai/modules/saimod_sys_cache/saimod_sys_cache.php

@@ -1,45 +1,22 @@
 <?php
 namespace SYSTEM\SAI;
-
 class saimod_sys_cache extends \SYSTEM\SAI\SaiModule {    
     public static function sai_mod__SYSTEM_SAI_saimod_sys_cache(){
-        $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo());
+        $vars = array();
-        if(\SYSTEM\system::isSystemDbInfoPG()){
+        $vars['count'] = \SYSTEM\DBD\SYS_SAIMOD_CACHE_COUNT::Q1()['count'];
-            $res = $con->query('SELECT COUNT(*)as "count" FROM system.cache');
+        $vars['entries'] = '';
-        } else {
+        $res = \SYSTEM\DBD\SYS_SAIMOD_CACHE::QQ();
-            $res = $con->query('SELECT COUNT(*) as count FROM system_cache');
-        }
-        
-        $r = $res->next();
-        
-        $result =   '<h4>System Cache</h4><hr>'.
-                    'Entries: '.$r['count'].' showing 100'.
-                    '<table class="sai_table table table-hover table-condensed" style="overflow: auto;">'.                    
-                    '<tr>'.'<th>'.'ID'.'</th>'.'<th>'.'CacheID'.'</th>'.'<th>'.'Ident'.'</th>'.'<th>'.'Data'.'</th>'.'</tr>';        
-        
-        
-        if(\SYSTEM\system::isSystemDbInfoPG()){
-            $res = $con->query('SELECT *, encode(data,\'base64\') FROM system.cache ORDER BY "ID" ASC LIMIT 100;');
-        } else {
-            $res = $con->query('SELECT * FROM system_cache ORDER BY ID ASC LIMIT 100;');
-        }                        
-                
         while($r = $res->next()){
-            $result .= '<tr class="'.self::tablerow_class($r['CacheID']).'">'.'<td>'.$r['ID'].'</td>'.'<td>'.$r['CacheID'].'</td>'.'<td>'.$r['Ident'].'</td>'.'<td>'.'<img src="data:image/png;base64,'.$r['encode'].'">'.'</td>'.'</tr>';}
+            $r['class'] = self::tablerow_class($r['CacheID']);
-            
+            $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cache/tpl/saimod_sys_cache_entry.tpl'), $r);}
-        $result .= '</table>';                
+        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cache/tpl/saimod_sys_cache.tpl'), $vars);
-        
-        return $result;
     }
     
     private static function tablerow_class($cacheID){
         if($cacheID == 1){
             return 'info';}
+        return 'success';}
     
-        return 'success';                
-    }
-    
-    //public static function html_li_menu(){return '<li><a id="menu_cache" href="#!cache">${sai_menu_cache}</a></li>';}
     public static function html_li_menu(){return '<li><a id="menu_cache" data-toggle="tooltip" data-placement="bottom" title="${sai_menu_cache}" href="#!cache"><span class="glyphicon glyphicon-level-up" aria-hidden="true"></span></a></li>';}
     public static function right_public(){return false;}    
     public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}

sai/modules/saimod_sys_cache/tpl/saimod_sys_cache.tpl

@@ -0,0 +1,11 @@
+<h4>System Cache</h4><hr>
+Entries: ${count} showing 100
+<table class="sai_table table table-hover table-condensed" style="overflow: auto;">
+    <tr>
+        <th>ID</th>
+        <th>CacheID</th>
+        <th>Ident</th>
+        <th>Data</th>
+    </tr>
+    ${entries}
+</table>

sai/modules/saimod_sys_cache/tpl/saimod_sys_cache_entry.tpl

@@ -0,0 +1,6 @@
+<tr class="${class}">
+    <td>${ID}</td>
+    <td>${CacheID}</td>
+    <td>${Ident}</td>
+    <td><img src="data:image/png;base64,'.${encode}"></td>
+</tr>

sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_CRON extends \SYSTEM\DB\QQ {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return
-//pg            
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.' ORDER BY class;';
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.' ORDER BY class;',
+    }
-//mys
+    public static function mysql(){return
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' ORDER BY class;'
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' ORDER BY class;';
-);}}
+    }
+}

sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_ADD.php

@@ -1,12 +1,12 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_CRON_ADD extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return 
-//pg            
+'INSERT INTO '.\SYSTEM\DBD\system_cron::NAME_PG.' (class, min, hour, day, day_week, month) VALUES ($1, $2, $3, $4, $5, $6);';
-'INSERT INTO '.\SYSTEM\DBD\system_cron::NAME_PG.' (class, min, hour, day, day_week, month) VALUES ($1, $2, $3, $4, $5, $6);',
+    }
-//mys
+    public static function mysql(){return 
 'INSERT INTO '.\SYSTEM\DBD\system_cron::NAME_MYS.' (class, min, hour, day, day_week, month) VALUES (?, ?, ?, ?, ?, ?)'.
-' ON DUPLICATE KEY UPDATE `min`=VALUES(`min`),`hour`=VALUES(`hour`),`day`=VALUES(`day`),`day_week`=VALUES(`day_week`),`month`=VALUES(`month`);'
+' ON DUPLICATE KEY UPDATE `min`=VALUES(`min`),`hour`=VALUES(`hour`),`day`=VALUES(`day`),`day_week`=VALUES(`day_week`),`month`=VALUES(`month`);';
-);}}
+    }
+}

sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_CHANGE.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_CRON_CHANGE extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return           
-//pg            
+'UPDATE '.\SYSTEM\DBD\system_cron::NAME_PG.' SET status = $1 WHERE class = $2;';
-'UPDATE '.\SYSTEM\DBD\system_cron::NAME_PG.' SET status = $1 WHERE class = $2;',
+    }
-//mys
+    public static function mysql(){return 
-'UPDATE '.\SYSTEM\DBD\system_cron::NAME_MYS.' SET status = ? WHERE `class` = ?;'
+'UPDATE '.\SYSTEM\DBD\system_cron::NAME_MYS.' SET status = ? WHERE `class` = ?;';
-);}}
+    }
+}

sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_DEL.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_CRON_DEL extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return          
-//pg            
+'DELETE FROM '.\SYSTEM\DBD\system_cron::NAME_PG.' WHERE class = $1;';
-'DELETE FROM '.\SYSTEM\DBD\system_cron::NAME_PG.' WHERE class = $1;',
+    }
-//mys
+    public static function mysql(){return 
-'DELETE FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' WHERE class = ?;'
+'DELETE FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' WHERE class = ?;';
-);}}
+    }
+}

sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_SINGLE_SELECT.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_CRON_SINGLE_SELECT extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return 
-//pg            
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.'  WHERE class = $1;';
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.'  WHERE class = $1;',
+    }
-//mys
+    public static function mysql(){return 
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' WHERE class = ?;'
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' WHERE class = ?;';
-);}}
+    }
+}

sai/modules/saimod_sys_git/saimod_sys_git.php

@@ -9,15 +9,22 @@ class saimod_sys_git extends \SYSTEM\SAI\SaiModule {
     }
     
     public static function getGitInfo(){
+        \LIB\lib_git::php();
         $result = array('git_project' => '', 'git_system' => '');
         try{
-            $repo = \SYSTEM\GIT\Git::open(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH));
+            $repo = \GIT\Git::open(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH));
+            $result['git_project'] = '<a href="http://www.mojotrollz.eu/git/hosting/commit/'.$repo->run('rev-parse HEAD').'" target="_blank">'.$repo->run('rev-parse --short HEAD').'</a><br/>';
+            $result['git_project'] .= $repo->run('log -1 --pretty=%B');
+            
         } catch (\Exception $ex) {
             $result['git_project'] = $ex->getMessage();
         }
         
         try{
-            $repo = \SYSTEM\GIT\Git::open(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH).\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL));
+            $repo = \GIT\Git::open(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH).\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL));
+            $result['git_system'] .= '<li>';
+            $result['git_system'] = '<a href="http://www.mojotrollz.eu/git/system/commit/'.$repo->run('rev-parse HEAD').'" target="_blank">'.$repo->run('rev-parse --short HEAD').'</a><br/>';
+            $result['git_system'] .= $repo->run('log -1 --pretty=%B');
         } catch (\Exception $ex) {
             $result['git_system'] = $ex->getMessage();
         }

sai/modules/saimod_sys_git/tpl/saimod_sys_git.tpl

@@ -1,5 +1,5 @@
 <h4>${sai_git_title}</h4>
 <hr>
-<b>${sai_git_project_version}:</b> ${git_project}
+<b>Current Project Version:</b> ${git_project}
 <br>
-<b>${sai_git_system_version}:</b> ${git_system}
+<b>Current SYSTEM Version:</b> ${git_system}

sai/modules/saimod_sys_log/js/saimod_sys_log.js

@@ -9,8 +9,8 @@ function init_saimod_sys_log() {
 };
 
 function register_search(){
-    $('#btn_search').click(function(){
+    $('#btn_search_log').click(function(){
-        system.load($(this).attr('state')+$('#input_search').val(),true);
+        system.load($(this).attr('state')+$('#input_search_log').val(),true);
     });
 }
 

sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_ANALYTICS.php

@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_ANALYTICS extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function mysql(){return
-//pg            
-'',
-//mys
 'SELECT DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),?)),"%Y/%m/%d %H:%i:%s") as day,'
     .'count(*) as count,'
     .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_USER.') as user_unique,'                                        
@@ -14,5 +10,6 @@ class SYS_SAIMOD_LOG_ANALYTICS extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 1;'
+.' LIMIT 1;';
-);}}
+    }
+}

sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_BASIC_QUERYTIME.php

@@ -1,10 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_BASIC_QUERYTIME extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return 
-//pg            
 'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,'
     .'count(*) as count,'
     .'avg('.\SYSTEM\DBD\system_log::FIELD_QUERYTIME.') as querytime_avg,'
@@ -14,8 +12,9 @@ class SYS_SAIMOD_LOG_BASIC_QUERYTIME extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_PG
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;',
+.' LIMIT 30;';
-//mys
+    }
+    public static function mysql(){return 
 'SELECT DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),?)),"%Y/%m/%d %H:%i:%s") as day,'
     .'count(*) as count,'                                                                                
     .'avg('.\SYSTEM\DBD\system_log::FIELD_QUERYTIME.') as querytime_avg,'
@@ -25,6 +24,6 @@ class SYS_SAIMOD_LOG_BASIC_QUERYTIME extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;'
+.' LIMIT 30;';
-);}}
+    }
-
+}

sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_BASIC_SUCCESS.php

@@ -1,10 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_BASIC_SUCCESS extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return        
-//pg            
 'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,'
     .'count(*) as count,'
     .'sum(case when not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\COUNTER\' and'
@@ -27,8 +25,9 @@ class SYS_SAIMOD_LOG_BASIC_SUCCESS extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_PG
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;',
+.' LIMIT 30;';
-//mys
+    }
+    public static function mysql(){return 
 'SELECT DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),?)),"%Y/%m/%d %H:%i:%s") as day,'
     .'count(*) as count,'                                                                                
     .'sum(case when not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\\\LOG\\\\COUNTER" and'
@@ -50,6 +49,6 @@ class SYS_SAIMOD_LOG_BASIC_SUCCESS extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;'
+.' LIMIT 30;';
-);}}
+    }
-
+}

sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_BASIC_VISITOR.php

@@ -1,10 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_BASIC_VISITOR extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return 
-//pg            
 'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,'
     .'count(*) as count,'
     .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_USER.') as user_unique,'                                        
@@ -12,8 +10,9 @@ class SYS_SAIMOD_LOG_BASIC_VISITOR extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_PG
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;',
+.' LIMIT 30;';
-//mys
+    }
+    public static function mysql(){return 
 'SELECT DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),?)),"%Y/%m/%d %H:%i:%s") as day,'
     .'count(*) as count,'
     .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_USER.') as user_unique,'                                        
@@ -21,6 +20,6 @@ class SYS_SAIMOD_LOG_BASIC_VISITOR extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;'
+.' LIMIT 30;';
-);}}
+    }
-
+}

sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_CLASS_BASIC.php

@@ -1,10 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_CLASS_BASIC extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return          
-//pg            
 'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,'
     .'count(*) as count,'                                                                                
     .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'ERROR\' then 1 else 0 end) class_ERROR,'                                        
@@ -15,8 +13,9 @@ class SYS_SAIMOD_LOG_CLASS_BASIC extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_PG
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;',
+.' LIMIT 30;';
-//mys
+    }
+    public static function mysql(){return 
 'SELECT DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),?)),"%Y/%m/%d %H:%i:%s") as day,'
     .'count(*) as count,'                                                                                
     .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'ERROR\' then 1 else 0 end) class_ERROR,'                                        
@@ -27,6 +26,6 @@ class SYS_SAIMOD_LOG_CLASS_BASIC extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;'
+.' LIMIT 30;';
-);}}
+    }
-
+}

sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_CLASS_OTHER.php

@@ -1,10 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_CLASS_OTHER extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return
-//pg            
 'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,'
     .'count(*) as count,'                                                                                
     .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'Exception\' then 1 else 0 end) class_Exception,'
@@ -13,8 +11,9 @@ class SYS_SAIMOD_LOG_CLASS_OTHER extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_PG
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;',
+.' LIMIT 30;';
-//mys
+    }
+    public static function mysql(){return 
 'SELECT DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),?)),"%Y/%m/%d %H:%i:%s") as day,'
     .'count(*) as count,'                                                                                
     .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'Exception\' then 1 else 0 end) class_Exception,'
@@ -23,6 +22,6 @@ class SYS_SAIMOD_LOG_CLASS_OTHER extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;'
+.' LIMIT 30;';
-);}}
+    }
-
+}

sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_CLASS_SYSTEM.php

@@ -1,10 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_CLASS_SYSTEM extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return 
-//pg            
 'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,'
     .'count(*) as count,'
     .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\COUNTER\' then 1 else 0 end) class_SYSTEM_LOG_COUNTER,'
@@ -17,8 +15,9 @@ class SYS_SAIMOD_LOG_CLASS_SYSTEM extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_PG
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;',
+.' LIMIT 30;';
-//mys
+    }
+    public static function mysql(){return 
 'SELECT DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),?)),"%Y/%m/%d %H:%i:%s") as day,'
     .'count(*) as count,'
     .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = "SYSTEM\\\\LOG\\\\COUNTER" then 1 else 0 end) class_SYSTEM_LOG_COUNTER,'
@@ -31,6 +30,6 @@ class SYS_SAIMOD_LOG_CLASS_SYSTEM extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;'
+.' LIMIT 30;';
-);}}
+    }
-
+}

sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_ERROR.php

@@ -1,20 +1,19 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_ERROR extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return             
-//pg            
 'SELECT * FROM '.\SYSTEM\DBD\system_log::NAME_PG.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_PG.
 ' ON '.\SYSTEM\DBD\system_log::NAME_PG.'.'.\SYSTEM\DBD\system_log::FIELD_USER.
 ' = '.\SYSTEM\DBD\system_user::NAME_PG.'.'.\SYSTEM\DBD\system_user::FIELD_ID.
-' WHERE '.\SYSTEM\DBD\system_log::NAME_PG.'."'.\SYSTEM\DBD\system_log::FIELD_ID.'" = $1;',
+' WHERE '.\SYSTEM\DBD\system_log::NAME_PG.'."'.\SYSTEM\DBD\system_log::FIELD_ID.'" = $1;';
-//mys
+    }
+    public static function mysql(){return 
 'SELECT * FROM '.\SYSTEM\DBD\system_log::NAME_MYS.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.
 ' ON '.\SYSTEM\DBD\system_log::NAME_MYS.'.'.\SYSTEM\DBD\system_log::FIELD_USER.
 ' = '.\SYSTEM\DBD\system_user::NAME_MYS.'.'.\SYSTEM\DBD\system_user::FIELD_ID.
-' WHERE '.\SYSTEM\DBD\system_log::NAME_MYS.'.'.\SYSTEM\DBD\system_log::FIELD_ID.' = ?;'
+' WHERE '.\SYSTEM\DBD\system_log::NAME_MYS.'.'.\SYSTEM\DBD\system_log::FIELD_ID.' = ?;';
-);}}
+    }
-
+}

sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER.php

@@ -1,22 +1,22 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_FILTER extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return
-//pg            
 'SELECT * FROM '.\SYSTEM\DBD\system_log::NAME_PG.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_PG.
 ' ON '.\SYSTEM\DBD\system_log::NAME_PG.'.'.\SYSTEM\DBD\system_log::FIELD_USER.
 ' = '.\SYSTEM\DBD\system_user::NAME_PG.'.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' WHERE '.\SYSTEM\DBD\system_log::FIELD_CLASS.' LIKE $1'.
-' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME.' DESC, '.\SYSTEM\DBD\system_log::NAME_PG.'."'.\SYSTEM\DBD\system_log::FIELD_ID.'" DESC;',
+' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME.' DESC, '.\SYSTEM\DBD\system_log::NAME_PG.'."'.\SYSTEM\DBD\system_log::FIELD_ID.'" DESC;';
-//mys
+    }
+    public static function mysql(){return
 'SELECT * FROM '.\SYSTEM\DBD\system_log::NAME_MYS.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.
 ' ON '.\SYSTEM\DBD\system_log::NAME_MYS.'.'.\SYSTEM\DBD\system_log::FIELD_USER.
 ' = '.\SYSTEM\DBD\system_user::NAME_MYS.'.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' WHERE '.\SYSTEM\DBD\system_log::FIELD_CLASS.' LIKE ?'.
 ' AND ('.\SYSTEM\DBD\system_log::FIELD_MESSAGE.' LIKE ? OR '.\SYSTEM\DBD\system_log::FIELD_FILE.' LIKE ? OR '.\SYSTEM\DBD\system_log::FIELD_IP.' LIKE ?)'.
-' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME.' DESC, '.\SYSTEM\DBD\system_log::NAME_MYS.'.'.\SYSTEM\DBD\system_log::FIELD_ID.' DESC;'
+' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME.' DESC, '.\SYSTEM\DBD\system_log::NAME_MYS.'.'.\SYSTEM\DBD\system_log::FIELD_ID.' DESC;';
-);}}
+    }
+}

sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTERS.php

@@ -1,18 +1,17 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_FILTERS extends \SYSTEM\DB\QQ {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return
-//pg            
 'SELECT '.\SYSTEM\DBD\system_log::FIELD_CLASS.
 ' FROM '.\SYSTEM\DBD\system_log::NAME_PG.
 ' GROUP BY '.\SYSTEM\DBD\system_log::FIELD_CLASS.
-' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_CLASS.';',
+' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_CLASS.';';
-//mys
+    }
+    public static function mysql(){return
 'SELECT '.\SYSTEM\DBD\system_log::FIELD_CLASS.
 ' FROM '.\SYSTEM\DBD\system_log::NAME_MYS.
 ' GROUP BY '.\SYSTEM\DBD\system_log::FIELD_CLASS.
-' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_CLASS.';'
+' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_CLASS.';';
-);}}
+    }
-
+}

sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER_COUNT.php

@@ -1,17 +1,16 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_FILTER_COUNT extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pqsql(){return
-//pg            
 'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_log::NAME_PG.
 ' WHERE '.\SYSTEM\DBD\system_log::FIELD_CLASS.
-' LIKE $1;',
+' LIKE $1;';
-//mys
+    }
+    public static function mysql(){return
 'SELECT COUNT(*) as count'.
 ' FROM '.\SYSTEM\DBD\system_log::NAME_MYS.
 ' WHERE '.\SYSTEM\DBD\system_log::FIELD_CLASS.' LIKE ?'.
-' AND ('.\SYSTEM\DBD\system_log::FIELD_MESSAGE.' LIKE ? OR '.\SYSTEM\DBD\system_log::FIELD_FILE.' LIKE ? OR '.\SYSTEM\DBD\system_log::FIELD_IP.' LIKE ?);'
+' AND ('.\SYSTEM\DBD\system_log::FIELD_MESSAGE.' LIKE ? OR '.\SYSTEM\DBD\system_log::FIELD_FILE.' LIKE ? OR '.\SYSTEM\DBD\system_log::FIELD_IP.' LIKE ?);';
-);}}
+    }
-
+}

sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_TRUNCATE.php

@@ -1,12 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_TRUNCATE extends \SYSTEM\DB\QQ {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return             
-//pg            
+'TRUNCATE '.\SYSTEM\DBD\system_log::NAME_PG.';';
-'TRUNCATE '.\SYSTEM\DBD\system_log::NAME_PG.';',
+    }
-//mys
+    public static function mysql(){return 
-'TRUNCATE '.\SYSTEM\DBD\system_log::NAME_MYS.';'
+'TRUNCATE '.\SYSTEM\DBD\system_log::NAME_MYS.';';
-);}}
+    }
-
+}

sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_UNIQUE_BASIC.php

@@ -1,10 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_UNIQUE_BASIC extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return           
-//pg            
 'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,'
     .'count(*) as count,'                                                                                
     .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_USER.') as user_unique,'                                        
@@ -13,8 +11,9 @@ class SYS_SAIMOD_LOG_UNIQUE_BASIC extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_PG
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;',
+.' LIMIT 30;';
-//mys
+    }
+    public static function mysql(){return 
 'SELECT DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),?)),"%Y/%m/%d %H:%i:%s") as day,'
     .'count(*) as count,'
     .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_USER.') as user_unique,'                                        
@@ -23,6 +22,6 @@ class SYS_SAIMOD_LOG_UNIQUE_BASIC extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;'
+.' LIMIT 30;';
-);}}
+    }
-
+}

sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_UNIQUE_EXCEPTION.php

@@ -1,10 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_UNIQUE_EXCEPTION extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return            
-//pg            
 'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,'
     .'count(*) as count,'
     .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_FILE.') as file_unique,'
@@ -13,8 +11,9 @@ class SYS_SAIMOD_LOG_UNIQUE_EXCEPTION extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_PG
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;',
+.' LIMIT 30;';
-//mys
+    }
+    public static function mysql(){return 
 'SELECT DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),?)),"%Y/%m/%d %H:%i:%s") as day,'
     .'count(*) as count,'                                        
     .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_FILE.') as file_unique,'
@@ -23,6 +22,6 @@ class SYS_SAIMOD_LOG_UNIQUE_EXCEPTION extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;'
+.' LIMIT 30;';
-);}}
+    }
-
+}

sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_UNIQUE_REFERER.php

@@ -1,10 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_UNIQUE_REFERER extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return 
-//pg            
 'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,'
     .'count(*) as count,'                               
     .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_USER.') as user_unique,'
@@ -14,8 +12,9 @@ class SYS_SAIMOD_LOG_UNIQUE_REFERER extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_PG
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;',
+.' LIMIT 30;';
-//mys
+    }
+    public static function mysql(){return 
 'SELECT DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),?)),"%Y/%m/%d %H:%i:%s") as day,'
     .'count(*) as count,'
     .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_USER.') as user_unique,'
@@ -25,6 +24,6 @@ class SYS_SAIMOD_LOG_UNIQUE_REFERER extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;'
+.' LIMIT 30;';
-);}}
+    }
-
+}

sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_UNIQUE_REQUEST.php

@@ -1,10 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_UNIQUE_REQUEST extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return           
-//pg            
 'SELECT to_char(to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % $1)), \'YYYY/MM/DD HH24:MI:SS\') as day,'
     .'count(*) as count,'                                        
     .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_NAME.') as server_name_unique,'
@@ -14,8 +12,9 @@ class SYS_SAIMOD_LOG_UNIQUE_REQUEST extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_PG
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;',
+.' LIMIT 30;';
-//mys
+    }
+    public static function mysql(){return 
 'SELECT DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),?)),"%Y/%m/%d %H:%i:%s") as day,'
     .'count(*) as count,'                                        
     .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_NAME.') as server_name_unique,'
@@ -25,6 +24,6 @@ class SYS_SAIMOD_LOG_UNIQUE_REQUEST extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 30;'
+.' LIMIT 30;';
-);}}
+    }
-
+}

sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl

@@ -1,8 +1,8 @@
 <ul class="nav nav-pills" id="error_filter">    
     <li class="${active}"><a href="#!log;filter.%;search.${search}">${basic_all}</a></li>
     ${error_filter}
-    <button class="btn-sm btn btn-success" state="log;filter.${filter};search." id="btn_search" type="submit" style="float: right; margin-left: 10px;"><span class="glyphicon glyphicon-search" aria-hidden="true"></span> ${basic_search}</button>
+    <button class="btn-sm btn btn-success" state="log;filter.${filter};search." id="btn_search_log" type="submit" style="float: right; margin-left: 10px;"><span class="glyphicon glyphicon-search" aria-hidden="true"></span> ${basic_search}</button>
-    <input class="input-medium search-query action-control" id="input_search" type="text" placeholder="${basic_placeholder_search}" size="20" style="float: right;" value="${search}"/>
+    <input class="input-medium search-query action-control" id="input_search_log" type="text" placeholder="${basic_placeholder_search}" size="20" style="float: right;" value="${search}"/>
 </ul>
 <div id="table_log">
     <h6>${basic_rows}: ${count} ${basic_page}: ${page}</h6>

sai/modules/saimod_sys_login/js/sai_sys_login_submit.js

@@ -43,16 +43,11 @@ function init_saimod_sys_login() {
         }
     });
     
-    $("#register_link").click(function(){
-        $('div#content-wrapper').load('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_login&action=registerform',function(){
-            init__SYSTEM_SAI_saimod_sys_login_register();
-        });
-    });
 };
 
-function init__SYSTEM_SAI_saimod_sys_login_register(){        
+function init_saimod_sys_register(){        
     $('#btn_user_registration_cancel').click(function(){         
-        loadModuleContent('.SYSTEM.SAI.saimod_sys_login');
+        system.load('login');
     });
     
    

sai/modules/saimod_sys_login/tpl/login.tpl

@@ -29,5 +29,5 @@
         <button class="btn-sm btn btn-primary" style="clear: left; height: 32px; font-size: 13px;" type="submit" id="login_submit"><span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> ${basic_login}</button>
     </div>
 </form>
-<a href="#" id="register_link">${basic_text_register}</a></br>
+<a href="#!login(register)" id="register_link">${basic_text_register}</a></br>
 <a href="#" id="password_link">${basic_text_password_miss}</a>

sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_ADD.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_PAGE_ADD extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return           
-//pg            
+'INSERT INTO '.\SYSTEM\DBD\system_page::NAME_PG.' (ID, group, type, parentID, parentValue, name, verify) VALUES ($1, $2, $3, $4, $5, $6, $7);';
-'INSERT INTO '.\SYSTEM\DBD\system_page::NAME_PG.' (ID, group, type, parentID, parentValue, name, verify) VALUES ($1, $2, $3, $4, $5, $6, $7);',
+    }
-//mys
+    public static function mysql(){return 
-'INSERT INTO '.\SYSTEM\DBD\system_page::NAME_MYS.' (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (?, ?, ?, ?, ?, ?, ?);'
+'INSERT INTO '.\SYSTEM\DBD\system_page::NAME_MYS.' (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (?, ?, ?, ?, ?, ?, ?);';
-);}}
+    }
+}

sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_DEL.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_PAGE_DEL extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return           
-//pg            
+'DELETE FROM '.\SYSTEM\DBD\system_page::NAME_PG.' WHERE `ID` = $1 AND group = $2;';
-'DELETE FROM '.\SYSTEM\DBD\system_page::NAME_PG.' WHERE `ID` = $1 AND group = $2;',
+    }
-//mys
+    public static function mysql(){return 
-'DELETE FROM '.\SYSTEM\DBD\system_page::NAME_MYS.' WHERE `ID` = ? AND `group` = ?;'
+'DELETE FROM '.\SYSTEM\DBD\system_page::NAME_MYS.' WHERE `ID` = ? AND `group` = ?;';
-);}}
+    }
+}

sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_GET.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_PAGE_GET extends \SYSTEM\DB\QQ {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return 
-//pg            
+'SELECT * FROM system_page ORDER BY `group`, `ID` ASC;';
-'SELECT * FROM system_page ORDER BY `group`, `ID` ASC;',
+    }
-//mys
+    public static function mysql(){return 
-'SELECT * FROM system_page ORDER BY `group`, `ID` ASC;'
+'SELECT * FROM system_page ORDER BY `group`, `ID` ASC;';
-);}}
+    }
+}

sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_GROUPS.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_PAGE_GROUPS extends \SYSTEM\DB\QQ {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return             
-//pg            
+'SELECT "group", count(*) as "count" FROM system.page GROUP BY "group" ORDER BY "group" ASC;';
-'SELECT "group", count(*) as "count" FROM system.page GROUP BY "group" ORDER BY "group" ASC;',
+    }
-//mys
+    public static function mysql(){return 
-'SELECT `group`, count(*) as `count` FROM system_page GROUP BY `group` ORDER BY `group` ASC;'
+'SELECT `group`, count(*) as `count` FROM system_page GROUP BY `group` ORDER BY `group` ASC;';
-);}}
+    }
+}

sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_SINGLE_SELECT.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_PAGE_SINGLE_SELECT extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return 
-//pg            
+'SELECT * FROM '.\SYSTEM\DBD\system_page::NAME_PG.'  WHERE ID = $1 AND group = $2;';
-'SELECT * FROM '.\SYSTEM\DBD\system_page::NAME_PG.'  WHERE ID = $1 AND group = $2;',
+    }
-//mys
+    public static function mysql(){return 
-'SELECT * FROM '.\SYSTEM\DBD\system_page::NAME_MYS.' WHERE ID = ? AND `group` = ?;'
+'SELECT * FROM '.\SYSTEM\DBD\system_page::NAME_MYS.' WHERE ID = ? AND `group` = ?;';
-);}}
+    }
+}

sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_RIGHTS.php

@@ -1,12 +1,12 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_SECURITY_RIGHTS extends \SYSTEM\DB\QQ {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return 
-//pg            
+'SELECT * FROM system.rights ORDER BY "ID" ASC;';
-'SELECT * FROM system.rights ORDER BY "ID" ASC;',
+    }
-//mys
+    public static function mysql(){return 
-'SELECT * FROM system_rights ORDER BY ID ASC;'
+'SELECT * FROM system_rights ORDER BY ID ASC;';
-);}}
+    }
+}
 

sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_RIGHT_CHECK.php

@@ -1,14 +1,14 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_SECURITY_RIGHT_CHECK extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return            
-//pg            
 'SELECT * FROM system.rights'.
-' WHERE "ID" = $1;',
+' WHERE "ID" = $1;';
-//mys
+    }
+    public static function mysql(){return 
 'SELECT * FROM system_rights'.
-' WHERE ID = ?;'
+' WHERE ID = ?;';
-);}}
+    }
+}
 

sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_RIGHT_DELETE.php

@@ -1,14 +1,13 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_SECURITY_RIGHT_DELETE extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return
-//pg            
 'DELETE FROM system.rights'.
-' WHERE "ID" = $1;',
+' WHERE "ID" = $1;';
-//mys
+    }
+    public static function mysql(){return 
 'DELETE FROM system_rights'.
-' WHERE ID = ?;'
+' WHERE ID = ?;';
-);}}
+    }
-
+}

sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_RIGHT_INSERT.php

@@ -1,14 +1,13 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_SECURITY_RIGHT_INSERT extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return 
-//pg            
 'INSERT INTO system.rights ("ID", name, description)'.
-' VALUES($1, $2, $3);',
+' VALUES($1, $2, $3);';
-//mys
+    }
+    public static function mysql(){return 
 'INSERT IGNORE INTO system_rights (ID, name, description)'.
-' VALUES(?, ?, ?);'
+' VALUES(?, ?, ?);';
-);}}
+    }
-
+}

sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER.php

@@ -1,12 +1,12 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_SECURITY_USER extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return
-//pg            
+'SELECT id,username,email,joindate,locale, EXTRACT(EPOCH FROM last_active) as last_active ,account_flag FROM system.user WHERE username = $1 LIMIT 1;';
-'SELECT id,username,email,joindate,locale, EXTRACT(EPOCH FROM last_active) as last_active ,account_flag FROM system.user WHERE username = $1 LIMIT 1;',
+    }
-//mys
+    public static function mysql(){return 
-'SELECT id,username,email,joindate,locale,last_active,account_flag FROM system_user WHERE username = ? LIMIT 1;'
+'SELECT id,username,email,joindate,locale,last_active,account_flag FROM system_user WHERE username = ? LIMIT 1;';
-);}}
+    }
+}
 

sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USERS.php

@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_SECURITY_USERS extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return 
-//pg            
+'SELECT id,username,email,joindate,locale, EXTRACT(EPOCH FROM last_active) as last_active, account_flag FROM system.user WHERE username LIKE $1 OR email LIKE $1 ORDER BY last_active DESC;';
-'SELECT id,username,email,joindate,locale, EXTRACT(EPOCH FROM last_active) as last_active, account_flag FROM system.user WHERE username LIKE $1 OR email LIKE $1 ORDER BY last_active DESC;',
+    }
-//mys
+    public static function mysql(){return 
-'SELECT id,username,email,joindate,locale,unix_timestamp(last_active)as last_active, account_flag FROM system_user WHERE username LIKE ? OR email LIKE ? ORDER BY last_active DESC;'
+'SELECT id,username,email,joindate,locale,unix_timestamp(last_active)as last_active, account_flag FROM system_user WHERE username LIKE ? OR email LIKE ? ORDER BY last_active DESC;';
-);}}
+    }
+}

sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USERS_FILTER.php

@@ -1,15 +1,12 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_SECURITY_USERS_FILTER extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function mysql(){return 
-//pg            
-'todo',
-//mys
 'SELECT id,username,email,joindate,locale,unix_timestamp(last_active)as last_active, account_flag'.
 ' FROM system_user'.
 ' LEFT JOIN system_user_to_rights ON system_user.ID = system_user_to_rights.userID'.
 ' WHERE (username LIKE ? OR email LIKE ?) AND rightID = ?'.
-' ORDER BY last_active DESC;'
+' ORDER BY last_active DESC;';
-);}}
+    }
+}

sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_COUNT.php

@@ -1,12 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_SECURITY_USER_COUNT extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function pgsql(){return             
-//pg            
+'SELECT count(*) as count FROM system.user WHERE username LIKE $1 OR email LIKE $1;';
-'SELECT count(*) as count FROM system.user WHERE username LIKE $1 OR email LIKE $1;',
+    }
-//mys
+    public static function mysql(){return 
-'SELECT count(*) as count FROM system_user WHERE username LIKE ? OR email LIKE ?;'
+'SELECT count(*) as count FROM system_user WHERE username LIKE ? OR email LIKE ?;';
-);}}
+    }
-
+}

sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_COUNT_FILTER.php

@@ -1,14 +1,10 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_SECURITY_USER_COUNT_FILTER extends \SYSTEM\DB\QP {
-    protected static function query(){
+    public static function get_class(){return \get_class();}
-        return new \SYSTEM\DB\QQuery(get_class(),
+    public static function mysql(){return 
-//pg            
-'TODO',
-//mys
 'SELECT count(*) as count FROM system_user'.
 ' LEFT JOIN system_user_to_rights ON system_user.ID = system_user_to_rights.userID'.
-' WHERE (username LIKE ? OR email LIKE ?) AND rightID = ?;'
+' WHERE (username LIKE ? OR email LIKE ?) AND rightID = ?;';
-);}}
+    }
-
+}