From 2f5e91d01d857b4758c4034b546ccd157588a87a Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Thu, 18 Jun 2015 16:08:01 +0200
Subject: [PATCH] updated lots of qq to new qq2 format

---
 db/qq/QP.php                                  |  1 -
 dbd/qq/SYS_CACHE_CHECK.php                    | 12 +++++------
 dbd/qq/SYS_CACHE_DELETE.php                   | 12 +++++------
 dbd/qq/SYS_CACHE_DELETE_ALL.php               | 16 +++++++--------
 dbd/qq/SYS_CACHE_PUT.php                      | 12 +++++------
 dbd/qq/SYS_CRON_LIST.php                      | 16 +++++++--------
 dbd/qq/SYS_CRON_UPD.php                       | 16 +++++++--------
 dbd/qq/SYS_LOCALE_SET_LOCALE.php              | 16 +++++++--------
 dbd/qq/SYS_LOG_DEL.php                        | 16 +++++++--------
 dbd/qq/SYS_LOG_INSERT.php                     | 16 +++++++--------
 dbd/qq/SYS_LOG_MONTH.php                      | 13 +++++-------
 dbd/qq/SYS_LOG_OLDEST.php                     | 16 +++++++--------
 dbd/qq/SYS_SECURITY_AVAILABLE.php             | 16 +++++++--------
 dbd/qq/SYS_SECURITY_CREATE.php                | 16 +++++++--------
 dbd/qq/SYS_SECURITY_LOGIN_MD5.php             | 16 +++++++--------
 dbd/qq/SYS_SECURITY_LOGIN_SHA1.php            | 16 +++++++--------
 dbd/qq/SYS_SECURITY_UPDATE_LASTACTIVE.php     | 20 ++++++++-----------
 dbd/qq/SYS_SECURITY_UPDATE_PW.php             | 16 +++++++--------
 dbd/qq/SYS_TEXT_DELETE.php                    | 13 +++++-------
 dbd/qq/SYS_TEXT_DELETE_TAGS.php               | 13 +++++-------
 dbd/qq/SYS_TEXT_GET_ID.php                    | 13 +++++-------
 dbd/qq/SYS_TEXT_GET_ID_COUNT.php              | 13 +++++-------
 dbd/qq/SYS_TEXT_GET_ID_TAGS.php               | 13 +++++-------
 dbd/qq/SYS_TEXT_RENAME.php                    | 13 +++++-------
 dbd/qq/SYS_TEXT_RENAME_TAGS.php               | 13 +++++-------
 dbd/qq/SYS_TEXT_SAVE.php                      | 13 +++++-------
 dbd/qq/SYS_TEXT_SAVE_TAG.php                  | 13 +++++-------
 log/error_handler/error_handler_dbwriter.php  |  4 ++--
 .../saimod_sys_api/qq/SYS_SAIMOD_API_ADD.php  | 16 +++++++--------
 .../saimod_sys_api/qq/SYS_SAIMOD_API_DEL.php  | 16 +++++++--------
 .../saimod_sys_api/qq/SYS_SAIMOD_API_GET.php  | 16 +++++++--------
 .../qq/SYS_SAIMOD_API_GROUPS.php              | 16 +++++++--------
 .../qq/SYS_SAIMOD_API_SINGLE_SELECT.php       | 16 +++++++--------
 .../qq/SYS_SAIMOD_PAGE_ADD.php                | 16 +++++++--------
 .../qq/SYS_SAIMOD_PAGE_DEL.php                | 16 +++++++--------
 .../qq/SYS_SAIMOD_PAGE_GET.php                | 16 +++++++--------
 .../qq/SYS_SAIMOD_PAGE_GROUPS.php             | 16 +++++++--------
 .../qq/SYS_SAIMOD_PAGE_SINGLE_SELECT.php      | 16 +++++++--------
 .../qq/SYS_SAIMOD_SECURITY_RIGHTS.php         | 16 +++++++--------
 .../qq/SYS_SAIMOD_SECURITY_RIGHT_CHECK.php    | 16 +++++++--------
 .../qq/SYS_SAIMOD_SECURITY_RIGHT_DELETE.php   | 17 ++++++++--------
 .../qq/SYS_SAIMOD_SECURITY_RIGHT_INSERT.php   | 17 ++++++++--------
 .../qq/SYS_SAIMOD_SECURITY_USER.php           | 16 +++++++--------
 .../qq/SYS_SAIMOD_SECURITY_USERS.php          | 16 +++++++--------
 .../qq/SYS_SAIMOD_SECURITY_USERS_FILTER.php   | 13 +++++-------
 .../qq/SYS_SAIMOD_SECURITY_USER_COUNT.php     | 17 ++++++++--------
 .../SYS_SAIMOD_SECURITY_USER_COUNT_FILTER.php | 14 +++++--------
 .../qq/SYS_SAIMOD_SECURITY_USER_LOG.php       | 17 ++++++++--------
 .../qq/SYS_SAIMOD_SECURITY_USER_LOG_COUNT.php | 16 +++++++--------
 .../qq/SYS_SAIMOD_SECURITY_USER_RIGHTS.php    | 16 +++++++--------
 .../SYS_SAIMOD_SECURITY_USER_RIGHT_CHECK.php  | 17 ++++++++--------
 .../SYS_SAIMOD_SECURITY_USER_RIGHT_DELETE.php | 17 ++++++++--------
 .../SYS_SAIMOD_SECURITY_USER_RIGHT_INSERT.php | 16 +++++++--------
 .../saimod_sys_security.php                   |  2 +-
 .../qq/SYS_SAIMOD_TEXT_COUNT.php              | 13 +++++-------
 .../qq/SYS_SAIMOD_TEXT_COUNT_FILTER.php       | 13 +++++-------
 .../qq/SYS_SAIMOD_TEXT_COUNT_NOTAG.php        | 13 +++++-------
 .../qq/SYS_SAIMOD_TEXT_COUNT_NOTAG_FILTER.php | 13 +++++-------
 .../qq/SYS_SAIMOD_TEXT_COUNT_TAG.php          | 13 +++++-------
 .../qq/SYS_SAIMOD_TEXT_COUNT_TAG_FILTER.php   | 13 +++++-------
 .../qq/SYS_SAIMOD_TEXT_TAGS.php               | 16 +++++++--------
 .../qq/SYS_SAIMOD_TEXT_TEXT.php               | 13 +++++-------
 .../qq/SYS_SAIMOD_TEXT_TEXT_FILTER.php        | 13 +++++-------
 .../qq/SYS_SAIMOD_TEXT_TEXT_NOTAG.php         | 13 +++++-------
 .../qq/SYS_SAIMOD_TEXT_TEXT_NOTAG_FILTER.php  | 13 +++++-------
 .../qq/SYS_SAIMOD_TEXT_TEXT_TAG.php           | 13 +++++-------
 .../qq/SYS_SAIMOD_TEXT_TEXT_TAG_FILTER.php    | 13 +++++-------
 security/Security.php                         |  8 ++++----
 68 files changed, 438 insertions(+), 528 deletions(-)

diff --git a/db/qq/QP.php b/db/qq/QP.php
index f152998..0ddb97f 100644
--- a/db/qq/QP.php
+++ b/db/qq/QP.php
@@ -6,7 +6,6 @@ class QP {
         if(!$dbinfo){
             $dbinfo = \SYSTEM\system::getSystemDBInfo();}
         $con = new \SYSTEM\DB\Connection($dbinfo);
-        
         try{
             if($dbinfo instanceof \SYSTEM\DB\DBInfoPG){
                 return $con->prepare(static::get_class(),static::pgsql(),$params);
diff --git a/dbd/qq/SYS_CACHE_CHECK.php b/dbd/qq/SYS_CACHE_CHECK.php
index 43eb27b..fb8de9e 100644
--- a/dbd/qq/SYS_CACHE_CHECK.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return          
 'SELECT "data" FROM system.cache'.
 ' WHERE "CacheID" = $1 AND'.
-' "Ident" = $2;'
-//mys
-);}}
\ No newline at end of file
+' "Ident" = $2;';
+    }    
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_CACHE_DELETE.php b/dbd/qq/SYS_CACHE_DELETE.php
index 2900289..d349eae 100644
--- a/dbd/qq/SYS_CACHE_DELETE.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return           
 'DELETE FROM system.cache'.
 ' WHERE "CacheID" = $1 AND'.
-' "Ident" = $2;'
-//mys
-);}}
\ No newline at end of file
+' "Ident" = $2;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_CACHE_DELETE_ALL.php b/dbd/qq/SYS_CACHE_DELETE_ALL.php
index 14546ca..4a3e4fb 100644
--- a/dbd/qq/SYS_CACHE_DELETE_ALL.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'DELETE FROM system.cache;',
-//mys
-'DELETE FROM system_cache;'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'DELETE FROM system.cache;';
+    }
+    public static function mysql(){return
+'DELETE FROM system_cache;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_CACHE_PUT.php b/dbd/qq/SYS_CACHE_PUT.php
index 3de38f7..ecfcdc5 100644
--- a/dbd/qq/SYS_CACHE_PUT.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return           
 'INSERT INTO system.cache ("CacheID", "Ident", "data")'.
-' VALUES ($1,$2,$3);'
-//mys
-);}}
\ No newline at end of file
+' VALUES ($1,$2,$3);';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_CRON_LIST.php b/dbd/qq/SYS_CRON_LIST.php
index 9c9f1fc..14aa01e 100644
--- a/dbd/qq/SYS_CRON_LIST.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.';',
-//mys
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.';'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.';';
+    }
+    public static function mysql(){return
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.';';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_CRON_UPD.php b/dbd/qq/SYS_CRON_UPD.php
index 648171b..945edc1 100644
--- a/dbd/qq/SYS_CRON_UPD.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//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;',
-//mys
-'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.' = ?;'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return          
+'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;';
+    }
+    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.' = ?;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_LOCALE_SET_LOCALE.php b/dbd/qq/SYS_LOCALE_SET_LOCALE.php
index ccb7165..9ce5acb 100644
--- a/dbd/qq/SYS_LOCALE_SET_LOCALE.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return           
 'UPDATE '.\SYSTEM\DBD\system_user::NAME_PG.
 ' SET '.\SYSTEM\DBD\system_user::FIELD_LOCALE.' = $1'.
-' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = $2;',
-//mys
+' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = $2;';
+    }
+    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.' = ?;'
-);}}
\ No newline at end of file
+'WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = ?;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_LOG_DEL.php b/dbd/qq/SYS_LOG_DEL.php
index d1f592b..1ac8125 100644
--- a/dbd/qq/SYS_LOG_DEL.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'DELETE FROM '.\SYSTEM\DBD\system_log::NAME_PG.' WHERE "ID" = $1;',
-//mys
-'DELETE FROM '.\SYSTEM\DBD\system_log::NAME_MYS.' WHERE ID = ?;'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'DELETE FROM '.\SYSTEM\DBD\system_log::NAME_PG.' WHERE "ID" = $1;';
+    }
+    public static function mysql(){return
+'DELETE FROM '.\SYSTEM\DBD\system_log::NAME_MYS.' WHERE ID = ?;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_LOG_INSERT.php b/dbd/qq/SYS_LOG_INSERT.php
index 6824fbe..976fbf0 100644
--- a/dbd/qq/SYS_LOG_INSERT.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
 '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);',
-//mys
+'VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16);';
+    }
+    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(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);'
-);}}
\ No newline at end of file
+'VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_LOG_MONTH.php b/dbd/qq/SYS_LOG_MONTH.php
index 8501a9a..9147592 100644
--- a/dbd/qq/SYS_LOG_MONTH.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'todo',
-//mys
-'SELECT * FROM '.\SYSTEM\DBD\system_log::NAME_MYS.' WHERE MONTH(time) = ? AND YEAR(time) = ? ORDER BY time DESC LIMIT 10000;'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'SELECT * FROM '.\SYSTEM\DBD\system_log::NAME_MYS.' WHERE MONTH(time) = ? AND YEAR(time) = ? ORDER BY time DESC LIMIT 10000;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_LOG_OLDEST.php b/dbd/qq/SYS_LOG_OLDEST.php
index b5332a1..6cc8836 100644
--- a/dbd/qq/SYS_LOG_OLDEST.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//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',
-//mys
-'SELECT MONTH(time) as month, YEAR(time) as year FROM '.\SYSTEM\DBD\system_log::NAME_MYS.' ORDER BY time ASC LIMIT 1'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'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';
+    }
+    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';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_SECURITY_AVAILABLE.php b/dbd/qq/SYS_SECURITY_AVAILABLE.php
index b2f1488..3b9e302 100644
--- a/dbd/qq/SYS_SECURITY_AVAILABLE.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
 'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_user::NAME_PG.
-' WHERE lower('.\SYSTEM\DBD\system_user::FIELD_USERNAME.') like lower($1) ;',
-//mys
+' WHERE lower('.\SYSTEM\DBD\system_user::FIELD_USERNAME.') like lower($1);';
+    }
+    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(?) ;'
-);}}
\ No newline at end of file
+' WHERE lower('.\SYSTEM\DBD\system_user::FIELD_USERNAME.') like lower(?);';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_SECURITY_CREATE.php b/dbd/qq/SYS_SECURITY_CREATE.php
index 227a359..0525d73 100644
--- a/dbd/qq/SYS_SECURITY_CREATE.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return           
 '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);',
-//mys
+' VALUES ($1, $2, $3, $4, $5);';
+    }
+    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 (?, ?, ?, ?, ?);'
-);}}
\ No newline at end of file
+' VALUES (?, ?, ?, ?, ?);';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_SECURITY_LOGIN_MD5.php b/dbd/qq/SYS_SECURITY_LOGIN_MD5.php
index e74f06c..ec8c110 100644
--- a/dbd/qq/SYS_SECURITY_LOGIN_MD5.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return        
 '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 );',
-//mys
+' AND ('.\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA.' = $2 OR  '.\SYSTEM\DBD\system_user::FIELD_PASSWORD_MD5.' = $3 );';
+    }
+    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.' = ? );'
-);}}
\ No newline at end of file
+' AND ('.\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA.' = ? OR '.\SYSTEM\DBD\system_user::FIELD_PASSWORD_MD5.' = ? );';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_SECURITY_LOGIN_SHA1.php b/dbd/qq/SYS_SECURITY_LOGIN_SHA1.php
index b8de069..99e420e 100644
--- a/dbd/qq/SYS_SECURITY_LOGIN_SHA1.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return           
 '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;',
-//mys
+' AND '.\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA.' = $2;';
+    }
+    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.' = ?;'
-);}}
\ No newline at end of file
+' AND '.\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA.' = ?;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_SECURITY_UPDATE_LASTACTIVE.php b/dbd/qq/SYS_SECURITY_UPDATE_LASTACTIVE.php
index c405f5a..9660633 100644
--- a/dbd/qq/SYS_SECURITY_UPDATE_LASTACTIVE.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
 'UPDATE '.\SYSTEM\DBD\system_user::NAME_PG.
 ' SET '.\SYSTEM\DBD\system_user::FIELD_LAST_ACTIVE.' = NOW()'.
-' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = $1;',
-//mys
+' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = $1;';
+    }
+    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.' = ?;'
-);}}
\ No newline at end of file
+' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = ?;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_SECURITY_UPDATE_PW.php b/dbd/qq/SYS_SECURITY_UPDATE_PW.php
index 49b7adc..a75b40b 100644
--- a/dbd/qq/SYS_SECURITY_UPDATE_PW.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
 'UPDATE '.\SYSTEM\DBD\system_user::NAME_PG.
 ' SET '.\SYSTEM\DBD\system_user::FIELD_PASSWORD_SHA.' = $1'.
-' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = $2;',
-//mys
+' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = $2;';
+    }
+    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.' = ?;'
-);}}
\ No newline at end of file
+' WHERE '.\SYSTEM\DBD\system_user::FIELD_ID.' = ?;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_TEXT_DELETE.php b/dbd/qq/SYS_TEXT_DELETE.php
index 74c962e..f8294a5 100644
--- a/dbd/qq/SYS_TEXT_DELETE.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'DELETE FROM `system_text` WHERE id = ? and lang = ?;'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'DELETE FROM `system_text` WHERE id = ? and lang = ?;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_TEXT_DELETE_TAGS.php b/dbd/qq/SYS_TEXT_DELETE_TAGS.php
index 66efe8b..f530d57 100644
--- a/dbd/qq/SYS_TEXT_DELETE_TAGS.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'DELETE FROM `system_text_tag` WHERE id = ?;'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'DELETE FROM `system_text_tag` WHERE id = ?;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_TEXT_GET_ID.php b/dbd/qq/SYS_TEXT_GET_ID.php
index ede1011..ecdb223 100644
--- a/dbd/qq/SYS_TEXT_GET_ID.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT id,text FROM system_text WHERE id = ? and lang = ?;'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'SELECT id,text FROM system_text WHERE id = ? and lang = ?;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_TEXT_GET_ID_COUNT.php b/dbd/qq/SYS_TEXT_GET_ID_COUNT.php
index 940bc1e..e5b83b4 100644
--- a/dbd/qq/SYS_TEXT_GET_ID_COUNT.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'SELECT count(*) as count FROM system_text
- WHERE id = ?;'
-);}}
\ No newline at end of file
+ WHERE id = ?;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_TEXT_GET_ID_TAGS.php b/dbd/qq/SYS_TEXT_GET_ID_TAGS.php
index 5c7ad54..82d101e 100644
--- a/dbd/qq/SYS_TEXT_GET_ID_TAGS.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'SELECT tag FROM system_text_tag WHERE id = ?'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'SELECT tag FROM system_text_tag WHERE id = ?';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_TEXT_RENAME.php b/dbd/qq/SYS_TEXT_RENAME.php
index f25dc7b..2a0f9f3 100644
--- a/dbd/qq/SYS_TEXT_RENAME.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'UPDATE system_text SET id = ? WHERE id = ?;'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'UPDATE system_text SET id = ? WHERE id = ?;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_TEXT_RENAME_TAGS.php b/dbd/qq/SYS_TEXT_RENAME_TAGS.php
index 910b51a..e08a199 100644
--- a/dbd/qq/SYS_TEXT_RENAME_TAGS.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
-'UPDATE system_text_tag SET id = ? WHERE id = ?;'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'UPDATE system_text_tag SET id = ? WHERE id = ?;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_TEXT_SAVE.php b/dbd/qq/SYS_TEXT_SAVE.php
index 5500964..b3140b9 100644
--- a/dbd/qq/SYS_TEXT_SAVE.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 '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();'
-);}}
\ No newline at end of file
+ ON DUPLICATE KEY UPDATE text=VALUES(text), author_edit = VALUES(author_edit), time_edit = NOW();';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_TEXT_SAVE_TAG.php b/dbd/qq/SYS_TEXT_SAVE_TAG.php
index bf61997..943d4ce 100644
--- a/dbd/qq/SYS_TEXT_SAVE_TAG.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'INSERT IGNORE `system_text_tag` (`id`, `tag`)
- VALUES (?, ?);'
-);}}
\ No newline at end of file
+ VALUES (?, ?);';
+    }
+}
\ No newline at end of file
diff --git a/log/error_handler/error_handler_dbwriter.php b/log/error_handler/error_handler_dbwriter.php
index 64fa717..455e9a7 100644
--- a/log/error_handler/error_handler_dbwriter.php
+++ b/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),
diff --git a/sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_ADD.php b/sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_ADD.php
index c858c26..6bb27ec 100644
--- a/sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_ADD.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'INSERT INTO '.\SYSTEM\DBD\system_api::NAME_PG.' (ID, group, type, parentID, parentValue, name, verify) VALUES ($1, $2, $3, $4, $5, $6, $7);',
-//mys
-'INSERT INTO '.\SYSTEM\DBD\system_api::NAME_MYS.' (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (?, ?, ?, ?, ?, ?, ?);'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return
+'INSERT INTO '.\SYSTEM\DBD\system_api::NAME_PG.' (ID, group, type, parentID, parentValue, name, verify) VALUES ($1, $2, $3, $4, $5, $6, $7);';
+    }
+    public static function mysql(){return
+'INSERT INTO '.\SYSTEM\DBD\system_api::NAME_MYS.' (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (?, ?, ?, ?, ?, ?, ?);';
+    }
+}
diff --git a/sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_DEL.php b/sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_DEL.php
index 64ac997..30d42fd 100644
--- a/sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_DEL.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'DELETE FROM '.\SYSTEM\DBD\system_api::NAME_PG.' WHERE `ID` = $1 AND group = $2;',
-//mys
-'DELETE FROM '.\SYSTEM\DBD\system_api::NAME_MYS.' WHERE `ID` = ? AND `group` = ?;'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return
+'DELETE FROM '.\SYSTEM\DBD\system_api::NAME_PG.' WHERE `ID` = $1 AND group = $2;';
+    }
+    public static function mysql(){return
+'DELETE FROM '.\SYSTEM\DBD\system_api::NAME_MYS.' WHERE `ID` = ? AND `group` = ?;';
+    }
+}
diff --git a/sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_GET.php b/sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_GET.php
index f0543e0..39a2e3c 100644
--- a/sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_GET.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT * FROM system_api ORDER BY `group`, `ID` ASC;',
-//mys
-'SELECT * FROM system_api ORDER BY `group`, `ID` ASC;'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return          
+'SELECT * FROM system_api ORDER BY `group`, `ID` ASC;';
+    }
+    public static function mysql(){return
+'SELECT * FROM system_api ORDER BY `group`, `ID` ASC;';
+    }
+}
diff --git a/sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_GROUPS.php b/sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_GROUPS.php
index 5d3d4f9..4c522d2 100644
--- a/sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_GROUPS.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT "group", count(*) as "count" FROM system.api GROUP BY "group" ORDER BY "group" ASC;',
-//mys
-'SELECT `group`, count(*) as `count` FROM system_api GROUP BY `group` ORDER BY `group` ASC;'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return
+'SELECT "group", count(*) as "count" FROM system.api GROUP BY "group" ORDER BY "group" ASC;';
+    }
+    public static function mysql(){return
+'SELECT `group`, count(*) as `count` FROM system_api GROUP BY `group` ORDER BY `group` ASC;';
+    }
+}
diff --git a/sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_SINGLE_SELECT.php b/sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_SINGLE_SELECT.php
index 9334a78..b5152ea 100644
--- a/sai/modules/saimod_sys_api/qq/SYS_SAIMOD_API_SINGLE_SELECT.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT * FROM '.\SYSTEM\DBD\system_api::NAME_PG.'  WHERE ID = $1 AND group = $2;',
-//mys
-'SELECT * FROM '.\SYSTEM\DBD\system_api::NAME_MYS.' WHERE ID = ? AND `group` = ?;'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return            
+'SELECT * FROM '.\SYSTEM\DBD\system_api::NAME_PG.'  WHERE ID = $1 AND group = $2;';
+    }
+    public static function mysql(){return
+'SELECT * FROM '.\SYSTEM\DBD\system_api::NAME_MYS.' WHERE ID = ? AND `group` = ?;';
+    }
+}
diff --git a/sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_ADD.php b/sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_ADD.php
index eeb7d9e..974b8f8 100644
--- a/sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_ADD.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'INSERT INTO '.\SYSTEM\DBD\system_page::NAME_PG.' (ID, group, type, parentID, parentValue, name, verify) VALUES ($1, $2, $3, $4, $5, $6, $7);',
-//mys
-'INSERT INTO '.\SYSTEM\DBD\system_page::NAME_MYS.' (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (?, ?, ?, ?, ?, ?, ?);'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return           
+'INSERT INTO '.\SYSTEM\DBD\system_page::NAME_PG.' (ID, group, type, parentID, parentValue, name, verify) VALUES ($1, $2, $3, $4, $5, $6, $7);';
+    }
+    public static function mysql(){return 
+'INSERT INTO '.\SYSTEM\DBD\system_page::NAME_MYS.' (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (?, ?, ?, ?, ?, ?, ?);';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_DEL.php b/sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_DEL.php
index a22f1a6..30e4bc4 100644
--- a/sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_DEL.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'DELETE FROM '.\SYSTEM\DBD\system_page::NAME_PG.' WHERE `ID` = $1 AND group = $2;',
-//mys
-'DELETE FROM '.\SYSTEM\DBD\system_page::NAME_MYS.' WHERE `ID` = ? AND `group` = ?;'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return           
+'DELETE FROM '.\SYSTEM\DBD\system_page::NAME_PG.' WHERE `ID` = $1 AND group = $2;';
+    }
+    public static function mysql(){return 
+'DELETE FROM '.\SYSTEM\DBD\system_page::NAME_MYS.' WHERE `ID` = ? AND `group` = ?;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_GET.php b/sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_GET.php
index 3a0d06c..b99e446 100644
--- a/sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_GET.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT * FROM system_page ORDER BY `group`, `ID` ASC;',
-//mys
-'SELECT * FROM system_page ORDER BY `group`, `ID` ASC;'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return 
+'SELECT * FROM system_page ORDER BY `group`, `ID` ASC;';
+    }
+    public static function mysql(){return 
+'SELECT * FROM system_page ORDER BY `group`, `ID` ASC;';
+    }
+}
diff --git a/sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_GROUPS.php b/sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_GROUPS.php
index 714bd26..e81518a 100644
--- a/sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_GROUPS.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT "group", count(*) as "count" FROM system.page GROUP BY "group" ORDER BY "group" ASC;',
-//mys
-'SELECT `group`, count(*) as `count` FROM system_page GROUP BY `group` ORDER BY `group` ASC;'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return             
+'SELECT "group", count(*) as "count" FROM system.page GROUP BY "group" ORDER BY "group" ASC;';
+    }
+    public static function mysql(){return 
+'SELECT `group`, count(*) as `count` FROM system_page GROUP BY `group` ORDER BY `group` ASC;';
+    }
+}
diff --git a/sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_SINGLE_SELECT.php b/sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_SINGLE_SELECT.php
index fbe2198..5da1af0 100644
--- a/sai/modules/saimod_sys_page/qq/SYS_SAIMOD_PAGE_SINGLE_SELECT.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT * FROM '.\SYSTEM\DBD\system_page::NAME_PG.'  WHERE ID = $1 AND group = $2;',
-//mys
-'SELECT * FROM '.\SYSTEM\DBD\system_page::NAME_MYS.' WHERE ID = ? AND `group` = ?;'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return 
+'SELECT * FROM '.\SYSTEM\DBD\system_page::NAME_PG.'  WHERE ID = $1 AND group = $2;';
+    }
+    public static function mysql(){return 
+'SELECT * FROM '.\SYSTEM\DBD\system_page::NAME_MYS.' WHERE ID = ? AND `group` = ?;';
+    }
+}
diff --git a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_RIGHTS.php b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_RIGHTS.php
index 24a2cb2..e3e60f0 100644
--- a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_RIGHTS.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT * FROM system.rights ORDER BY "ID" ASC;',
-//mys
-'SELECT * FROM system_rights ORDER BY ID ASC;'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return 
+'SELECT * FROM system.rights ORDER BY "ID" ASC;';
+    }
+    public static function mysql(){return 
+'SELECT * FROM system_rights ORDER BY ID ASC;';
+    }
+}
 
diff --git a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_RIGHT_CHECK.php b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_RIGHT_CHECK.php
index bbaa5ad..df578b3 100644
--- a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_RIGHT_CHECK.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return            
 'SELECT * FROM system.rights'.
-' WHERE "ID" = $1;',
-//mys
+' WHERE "ID" = $1;';
+    }
+    public static function mysql(){return 
 'SELECT * FROM system_rights'.
-' WHERE ID = ?;'
-);}}
+' WHERE ID = ?;';
+    }
+}
 
diff --git a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_RIGHT_DELETE.php b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_RIGHT_DELETE.php
index 6873458..9c16d80 100644
--- a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_RIGHT_DELETE.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return
 'DELETE FROM system.rights'.
-' WHERE "ID" = $1;',
-//mys
+' WHERE "ID" = $1;';
+    }
+    public static function mysql(){return 
 'DELETE FROM system_rights'.
-' WHERE ID = ?;'
-);}}
-
+' WHERE ID = ?;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_RIGHT_INSERT.php b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_RIGHT_INSERT.php
index c1997d9..c257b7b 100644
--- a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_RIGHT_INSERT.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return 
 'INSERT INTO system.rights ("ID", name, description)'.
-' VALUES($1, $2, $3);',
-//mys
+' VALUES($1, $2, $3);';
+    }
+    public static function mysql(){return 
 'INSERT IGNORE INTO system_rights (ID, name, description)'.
-' VALUES(?, ?, ?);'
-);}}
-
+' VALUES(?, ?, ?);';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER.php b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER.php
index fa2574d..346fd12 100644
--- a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//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;',
-//mys
-'SELECT id,username,email,joindate,locale,last_active,account_flag FROM system_user WHERE username = ? LIMIT 1;'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return
+'SELECT id,username,email,joindate,locale, EXTRACT(EPOCH FROM last_active) as last_active ,account_flag FROM system.user WHERE username = $1 LIMIT 1;';
+    }
+    public static function mysql(){return 
+'SELECT id,username,email,joindate,locale,last_active,account_flag FROM system_user WHERE username = ? LIMIT 1;';
+    }
+}
 
diff --git a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USERS.php b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USERS.php
index ef68526..f4ff21f 100644
--- a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USERS.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//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;',
-//mys
-'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;'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return 
+'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;';
+    }
+    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;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USERS_FILTER.php b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USERS_FILTER.php
index 8852704..0d34599 100644
--- a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USERS_FILTER.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'todo',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return 
 '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;'
-);}}
\ No newline at end of file
+' ORDER BY last_active DESC;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_COUNT.php b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_COUNT.php
index 812d74e..e8d8466 100644
--- a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_COUNT.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT count(*) as count FROM system.user WHERE username LIKE $1 OR email LIKE $1;',
-//mys
-'SELECT count(*) as count FROM system_user WHERE username LIKE ? OR email LIKE ?;'
-);}}
-
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return             
+'SELECT count(*) as count FROM system.user WHERE username LIKE $1 OR email LIKE $1;';
+    }
+    public static function mysql(){return 
+'SELECT count(*) as count FROM system_user WHERE username LIKE ? OR email LIKE ?;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_COUNT_FILTER.php b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_COUNT_FILTER.php
index b6cb68c..753abd5 100644
--- a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_COUNT_FILTER.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'TODO',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return 
 '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 = ?;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_LOG.php b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_LOG.php
index 76fde89..dec8d65 100644
--- a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_LOG.php
+++ b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_LOG.php
@@ -1,22 +1,21 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_SECURITY_USER_LOG extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return 
 '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_USER.'" = $1'.
-' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME.' DESC LIMIT 100;',
-//mys
+' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME.' DESC LIMIT 100;';
+    }
+    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_USER.' = ?'.
-' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME.' DESC LIMIT 100;'
-);}}
-
+' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME.' DESC LIMIT 100;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_LOG_COUNT.php b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_LOG_COUNT.php
index 9343a0f..755283d 100644
--- a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_LOG_COUNT.php
+++ b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_LOG_COUNT.php
@@ -1,17 +1,17 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_SECURITY_USER_LOG_COUNT extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return 
 'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_log::NAME_PG.
 ' WHERE "'.\SYSTEM\DBD\system_log::FIELD_USER.'"'.
-' = $1;',
-//mys
+' = $1;';
+    }
+    public static function mysql(){return 
 'SELECT COUNT(*) as count'.
 ' FROM '.\SYSTEM\DBD\system_log::NAME_MYS.
 ' WHERE '.\SYSTEM\DBD\system_log::FIELD_USER.
-' = ?;'
-);}}
+' = ?;';
+    }
+}
 
diff --git a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_RIGHTS.php b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_RIGHTS.php
index a38f6bf..a8b108b 100644
--- a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_RIGHTS.php
+++ b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_RIGHTS.php
@@ -1,12 +1,12 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_SECURITY_USER_RIGHTS extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT * FROM system.rights LEFT JOIN system.user_to_rights ON system.rights."ID" = system.user_to_rights."rightID" WHERE system.user_to_rights."userID" = $1 ORDER BY system.rights."ID" ASC;',
-//mys
-'SELECT * FROM system_rights LEFT JOIN system_user_to_rights ON system_rights.id = system_user_to_rights.rightID WHERE system_user_to_rights.userID = ? ORDER BY system_rights.id ASC;'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return 
+'SELECT * FROM system.rights LEFT JOIN system.user_to_rights ON system.rights."ID" = system.user_to_rights."rightID" WHERE system.user_to_rights."userID" = $1 ORDER BY system.rights."ID" ASC;';
+    }
+    public static function mysql(){return 
+'SELECT * FROM system_rights LEFT JOIN system_user_to_rights ON system_rights.id = system_user_to_rights.rightID WHERE system_user_to_rights.userID = ? ORDER BY system_rights.id ASC;';
+    }
+}
 
diff --git a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_CHECK.php b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_CHECK.php
index 1d83303..a95678c 100644
--- a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_CHECK.php
+++ b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_CHECK.php
@@ -1,12 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_SECURITY_USER_RIGHT_CHECK extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT COUNT(*) as count FROM system.user_to_rights WHERE "rightID" = $1 AND "userID" = $2 LIMIT 1;',
-//mys
-'SELECT COUNT(*) as count FROM system_user_to_rights WHERE rightID = ? AND userID = ? LIMIT 1;'
-);}}
-
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return 
+'SELECT COUNT(*) as count FROM system.user_to_rights WHERE "rightID" = $1 AND "userID" = $2 LIMIT 1;';
+    }
+    public static function mysql(){return 
+'SELECT COUNT(*) as count FROM system_user_to_rights WHERE rightID = ? AND userID = ? LIMIT 1;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_DELETE.php b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_DELETE.php
index 0550f77..9107e89 100644
--- a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_DELETE.php
+++ b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_DELETE.php
@@ -1,12 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_SECURITY_USER_RIGHT_DELETE extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'DELETE FROM system.user_to_rights WHERE "rightID" = $1 and "userID" = $2;',
-//mys
-'DELETE FROM system_user_to_rights WHERE rightID = ? and userID = ?;'
-);}}
-
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return 
+'DELETE FROM system.user_to_rights WHERE "rightID" = $1 and "userID" = $2;';
+    }
+    public static function mysql(){return 
+'DELETE FROM system_user_to_rights WHERE rightID = ? and userID = ?;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_INSERT.php b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_INSERT.php
index 08bf98f..3109c5c 100644
--- a/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_INSERT.php
+++ b/sai/modules/saimod_sys_security/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_INSERT.php
@@ -1,12 +1,12 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_SECURITY_USER_RIGHT_INSERT extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'INSERT INTO system.user_to_rights ("rightID", "userID") VALUES($1, $2);',
-//mys
-'INSERT INTO system_user_to_rights (rightID, userID) VALUES(?, ?);'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return
+'INSERT INTO system.user_to_rights ("rightID", "userID") VALUES($1, $2);';
+    }
+    public static function mysql(){return 
+'INSERT INTO system_user_to_rights (rightID, userID) VALUES(?, ?);';
+    }
+}
 
diff --git a/sai/modules/saimod_sys_security/saimod_sys_security.php b/sai/modules/saimod_sys_security/saimod_sys_security.php
index 6bd48e0..0c88b2d 100644
--- a/sai/modules/saimod_sys_security/saimod_sys_security.php
+++ b/sai/modules/saimod_sys_security/saimod_sys_security.php
@@ -124,7 +124,7 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule {
         $vars['search'] = $search;
         $vars['page'] = $page;
         $vars['table'] = '';
-        $res = $filter == "all" ? \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USERS::QQ(array($search),array($search,$search)) :
+        $res = $filter == "all" ? \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USERS::QQ(array($search,$search)) :
                                   \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USERS_FILTER::QQ(array($search,$search,$filter));
         $count_filtered = 0;
         $res->seek(100*$page);
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT.php
index 04f13c5..4be120f 100644
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT.php
+++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT.php
@@ -1,15 +1,12 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TEXT_COUNT extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'todo',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return 
 'SELECT COUNT(*) as `count`'.
 ' FROM system_text'.
 ' LEFT JOIN system_user as a ON system_text.author = a.id'.
 ' LEFT JOIN system_user as ae ON system_text.author_edit = ae.id'.                
-' WHERE (a.username LIKE ? OR ae.username LIKE ? OR text LIKE ?);'
-);}}
+' WHERE (a.username LIKE ? OR ae.username LIKE ? OR text LIKE ?);';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_FILTER.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_FILTER.php
index 8ffed3a..584d26c 100644
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_FILTER.php
+++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_FILTER.php
@@ -1,16 +1,13 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TEXT_COUNT_FILTER extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'todo',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return 
 'SELECT COUNT(*) as `count`'.
 ' FROM system_text'.
 ' LEFT JOIN system_user as a ON system_text.author = a.id'.
 ' LEFT JOIN system_user as ae ON system_text.author_edit = ae.id'.                
 ' WHERE lang = ?'.
-' AND (a.username LIKE ? OR ae.username LIKE ? OR text LIKE ?);'
-);}}
+' AND (a.username LIKE ? OR ae.username LIKE ? OR text LIKE ?);';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_NOTAG.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_NOTAG.php
index ef205fb..b32c5c1 100644
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_NOTAG.php
+++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_NOTAG.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TEXT_COUNT_NOTAG extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'todo',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return 
 'SELECT COUNT(*) as `count`'.
 ' FROM system_text'.
 ' LEFT JOIN system_user as a ON system_text.author = a.id'.
@@ -15,5 +11,6 @@ class SYS_SAIMOD_TEXT_COUNT_NOTAG extends \SYSTEM\DB\QP {
 ' AND NOT EXISTS'.
 ' (SELECT id'.
 '  FROM system_text_tag'.
-'  WHERE system_text_tag.id = system_text.id);'
-);}}
+'  WHERE system_text_tag.id = system_text.id);';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_NOTAG_FILTER.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_NOTAG_FILTER.php
index 1ccc1d7..0a7fc94 100644
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_NOTAG_FILTER.php
+++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_NOTAG_FILTER.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TEXT_COUNT_NOTAG_FILTER extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'todo',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'SELECT COUNT(*) as `count`'.
 ' FROM system_text'.
 ' LEFT JOIN system_user as a ON system_text.author = a.id'.
@@ -16,5 +12,6 @@ class SYS_SAIMOD_TEXT_COUNT_NOTAG_FILTER extends \SYSTEM\DB\QP {
 ' (SELECT id'.
 '  FROM system_text_tag'.
 '  WHERE system_text_tag.id = system_text.id)'.
-' AND (a.username LIKE ? OR ae.username LIKE ? OR text LIKE ?);'
-);}}
+' AND (a.username LIKE ? OR ae.username LIKE ? OR text LIKE ?);';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_TAG.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_TAG.php
index 7296aef..f765a15 100644
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_TAG.php
+++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_TAG.php
@@ -1,17 +1,14 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TEXT_COUNT_TAG extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'todo',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return 
 'SELECT COUNT(*) as `count`'.
 ' FROM system_text_tag'.
 ' LEFT JOIN system_text ON system_text_tag.id = system_text.id'.
 ' LEFT JOIN system_user as a ON system_text.author = a.id'.
 ' LEFT JOIN system_user as ae ON system_text.author_edit = ae.id'.
 ' WHERE tag = ?'.
-' AND (a.username LIKE ? OR ae.username LIKE ? OR text LIKE ?);'
-);}}
+' AND (a.username LIKE ? OR ae.username LIKE ? OR text LIKE ?);';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_TAG_FILTER.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_TAG_FILTER.php
index 8f9d53a..bcbd92d 100644
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_TAG_FILTER.php
+++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_COUNT_TAG_FILTER.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TEXT_COUNT_TAG_FILTER extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'todo',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return 
 'SELECT COUNT(*) as `count`'.
 ' FROM system_text_tag'.
 ' LEFT JOIN system_text ON system_text_tag.id = system_text.id'.
@@ -14,5 +10,6 @@ class SYS_SAIMOD_TEXT_COUNT_TAG_FILTER extends \SYSTEM\DB\QP {
 ' LEFT JOIN system_user as ae ON system_text.author_edit = ae.id'.
 ' WHERE tag = ?'.
 ' AND lang = ?'.
-' AND (a.username LIKE ? OR ae.username LIKE ? OR text LIKE ?);'
-);}}
+' AND (a.username LIKE ? OR ae.username LIKE ? OR text LIKE ?);';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TAGS.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TAGS.php
index 0d3941a..ebdeaa8 100644
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TAGS.php
+++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TAGS.php
@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TEXT_TAGS extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT "tag", COUNT(*) as "count" FROM system_text_tag GROUP BY "tag" ORDER BY "tag" ASC;',
-//mys
-'SELECT `tag`, COUNT(*) as `count` FROM system_text_tag GROUP BY `tag` ORDER BY `tag` ASC;'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return 
+'SELECT "tag", COUNT(*) as "count" FROM system_text_tag GROUP BY "tag" ORDER BY "tag" ASC;';
+    }
+    public static function mysql(){return 
+'SELECT `tag`, COUNT(*) as `count` FROM system_text_tag GROUP BY `tag` ORDER BY `tag` ASC;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT.php
index b5b6536..06bae5d 100644
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT.php
+++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TEXT_TEXT extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-            //pg            
-            'todo',
-            //mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return 
 'SELECT system_text_tag.tag, system_text.*, a.username as author_name, ae.username as author_edit_name'.
 ' FROM system_text_tag'.
 ' LEFT JOIN system_text ON system_text_tag.id = system_text.id'.
@@ -14,5 +10,6 @@ class SYS_SAIMOD_TEXT_TEXT extends \SYSTEM\DB\QP {
 ' LEFT JOIN system_user as ae ON system_text.author_edit = ae.id'.
 ' WHERE (a.username LIKE ? OR ae.username LIKE ? OR text LIKE ?)'.
 ' GROUP BY id, lang'.
-' ORDER BY time_edit DESC;'
-);}}
+' ORDER BY time_edit DESC;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_FILTER.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_FILTER.php
index 0351e06..f0f139c 100644
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_FILTER.php
+++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_FILTER.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TEXT_TEXT_FILTER extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-            //pg            
-            'todo',
-            //mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return 
 'SELECT system_text_tag.tag, system_text.*, a.username as author_name, ae.username as author_edit_name'.
 ' FROM system_text_tag'.
 ' LEFT JOIN system_text ON system_text_tag.id = system_text.id'.
@@ -15,5 +11,6 @@ class SYS_SAIMOD_TEXT_TEXT_FILTER extends \SYSTEM\DB\QP {
 ' WHERE lang = ?'.
 ' AND(a.username LIKE ? OR ae.username LIKE ? OR text LIKE ?)'.
 ' GROUP BY id, lang'.
-' ORDER BY time_edit DESC;'
-);}}
+' ORDER BY time_edit DESC;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_NOTAG.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_NOTAG.php
index ed2d54b..6a6ae75 100644
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_NOTAG.php
+++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_NOTAG.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TEXT_TEXT_NOTAG extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-            //pg            
-            'todo',
-            //mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return 
 'SELECT system_text_tag.tag, system_text.*, a.username as author_name, ae.username as author_edit_name'.
 ' FROM system_text_tag'.
 ' LEFT JOIN system_text ON system_text_tag.id = system_text.id'.
@@ -18,5 +14,6 @@ class SYS_SAIMOD_TEXT_TEXT_NOTAG extends \SYSTEM\DB\QP {
 '  FROM system_text_tag'.
 '  WHERE system_text_tag.id = system_text.id)'.
 ' GROUP BY id, lang'.
-' ORDER BY time_edit DESC;'
-);}}
+' ORDER BY time_edit DESC;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_NOTAG_FILTER.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_NOTAG_FILTER.php
index 24a61ef..79044cb 100644
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_NOTAG_FILTER.php
+++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_NOTAG_FILTER.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TEXT_TEXT_NOTAG_FILTER extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-            //pg            
-            'todo',
-            //mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return 
 'SELECT system_text_tag.tag, system_text.*, a.username as author_name, ae.username as author_edit_name'.
 ' FROM system_text_tag'.
 ' LEFT JOIN system_text ON system_text_tag.id = system_text.id'.
@@ -19,5 +15,6 @@ class SYS_SAIMOD_TEXT_TEXT_NOTAG_FILTER extends \SYSTEM\DB\QP {
 '  FROM system_text_tag'.
 '  WHERE system_text_tag.id = system_text.id)'.
 ' GROUP BY id, lang'.
-' ORDER BY time_edit DESC;'
-);}}
+' ORDER BY time_edit DESC;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_TAG.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_TAG.php
index fe8853f..93cd596 100644
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_TAG.php
+++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_TAG.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TEXT_TEXT_TAG extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-            //pg            
-            'todo',
-            //mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return 
 'SELECT system_text_tag.tag, system_text.*, a.username as author_name, ae.username as author_edit_name'.
 ' FROM system_text_tag'.
 ' LEFT JOIN system_text ON system_text_tag.id = system_text.id'.
@@ -15,5 +11,6 @@ class SYS_SAIMOD_TEXT_TEXT_TAG extends \SYSTEM\DB\QP {
 ' WHERE tag = ?'.
 ' AND (a.username LIKE ? OR ae.username LIKE ? OR text LIKE ?)'.
 ' GROUP BY id, lang'.
-' ORDER BY time_edit DESC;'
-);}}
+' ORDER BY time_edit DESC;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_TAG_FILTER.php b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_TAG_FILTER.php
index 4ed7fb6..ce8f121 100644
--- a/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_TAG_FILTER.php
+++ b/sai/modules/saimod_sys_text/qq/SYS_SAIMOD_TEXT_TEXT_TAG_FILTER.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TEXT_TEXT_TAG_FILTER extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-            //pg            
-            'todo',
-            //mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return 
 'SELECT system_text_tag.tag, system_text.*, a.username as author_name, ae.username as author_edit_name'.
 ' FROM system_text_tag'.
 ' LEFT JOIN system_text ON system_text_tag.id = system_text.id'.
@@ -15,5 +11,6 @@ class SYS_SAIMOD_TEXT_TEXT_TAG_FILTER extends \SYSTEM\DB\QP {
 ' WHERE tag = ? AND lang = ?'.
 ' AND(a.username LIKE ? OR ae.username LIKE ? OR text LIKE ?)'.
 ' GROUP BY id, lang'.
-' ORDER BY time_edit DESC;'
-);}}
+' ORDER BY time_edit DESC;';
+    }
+}
\ No newline at end of file
diff --git a/security/Security.php b/security/Security.php
index fb87951..9dfabaa 100644
--- a/security/Security.php
+++ b/security/Security.php
@@ -13,11 +13,11 @@ class Security {
         $result = \SYSTEM\DBD\SYS_SECURITY_CREATE::QI(array( $username , $password, $email, $locale, 1 ));
         if(!$result || !self::login($username, $password, $locale)){            
                 return self::FAIL;}                 
-        return ($advancedResult ? \SYSTEM\DBD\SYS_SECURITY_LOGIN_SHA1::Q1(array($username, $password),array($username, $username, $password)) : self::OK);
+        return ($advancedResult ? \SYSTEM\DBD\SYS_SECURITY_LOGIN_SHA1::Q1(array($username, $username, $password)) : self::OK);
     }
      
     public static function changePassword($username, $password_sha_old, $password_sha_new){        
-        $row = \SYSTEM\DBD\SYS_SECURITY_LOGIN_SHA1::Q1(array($username, $password_sha_old),array($username, $username, $password_sha_old));                        
+        $row = \SYSTEM\DBD\SYS_SECURITY_LOGIN_SHA1::Q1(array($username, $username, $password_sha_old));                        
         if(!$row){
             return self::FAIL;} // old password wrong                  
         $userID = $row['id'];        
@@ -31,9 +31,9 @@ class Security {
                 
         //Database check
         if(isset($password_md5)){      
-            $row = \SYSTEM\DBD\SYS_SECURITY_LOGIN_MD5::Q1(array($username, $password_sha, $password_md5),array($username, $username, $password_sha, $password_md5));
+            $row = \SYSTEM\DBD\SYS_SECURITY_LOGIN_MD5::Q1(array($username, $username, $password_sha, $password_md5));
         }else{
-            $row = \SYSTEM\DBD\SYS_SECURITY_LOGIN_SHA1::Q1(array($username, $password_sha),array($username, $username, $password_sha));}                    
+            $row = \SYSTEM\DBD\SYS_SECURITY_LOGIN_SHA1::Q1(array($username, $username, $password_sha));}                    
                     
         if(!$row){
             new \SYSTEM\LOG\WARNING("Login Failed, User was not found in db");