From 40fb2947dcda59f525d649114287c0a04bc79484 Mon Sep 17 00:00:00 2001
From: Messerbill <ole.hoppe@gmx.de>
Date: Fri, 12 Jun 2015 00:39:44 +0200
Subject: [PATCH 01/24] changed path of lib/animate changed path of
 lib/lettering

---
 lib/animate   | 2 +-
 lib/lettering | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/animate b/lib/animate
index 1b177f2..6665446 160000
--- a/lib/animate
+++ b/lib/animate
@@ -1 +1 @@
-Subproject commit 1b177f228ddd1e43b4422995332956e19ad70afe
+Subproject commit 666544655bf5365e4f77aec0fa0f497673f6e69a
diff --git a/lib/lettering b/lib/lettering
index c5336db..8a7a337 160000
--- a/lib/lettering
+++ b/lib/lettering
@@ -1 +1 @@
-Subproject commit c5336db4a661246ecc3d0d62d79be4d07493a296
+Subproject commit 8a7a3377e82231ecf09d40732c75e8bee032228e

From c822f8de473dd3bf88fde20502ff2f635dbd8e0d Mon Sep 17 00:00:00 2001
From: Messerbill <ole.hoppe@gmx.de>
Date: Mon, 15 Jun 2015 15:54:58 +0200
Subject: [PATCH 02/24] added growl to submodule

---
 .gitmodules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitmodules b/.gitmodules
index 76eac3b..e29da0e 100644
--- a/.gitmodules
+++ b/.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

From 8c8c396aed00cb92fe5a65d3029fdd8b16c395ed Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Mon, 15 Jun 2015 16:27:42 +0200
Subject: [PATCH 03/24] cron2sqlite creates folders now

---
 cron/cron_log2sqlite.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cron/cron_log2sqlite.php b/cron/cron_log2sqlite.php
index f963ea3..3ebd42f 100644
--- a/cron/cron_log2sqlite.php
+++ b/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));

From c4d0082a69c9ae500a449d16d131f80b757a7a37 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Mon, 15 Jun 2015 22:26:34 +0200
Subject: [PATCH 04/24] git small fix to work with submodules

---
 git/GitRepo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/GitRepo.php b/git/GitRepo.php
index 738a325..d0f6cfc 100644
--- a/git/GitRepo.php
+++ b/git/GitRepo.php
@@ -82,7 +82,7 @@ class GitRepo {
 				$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")) {
+					if (file_exists($repo_path."/.git") || is_dir($repo_path."/.git")) {
 						$this->repo_path = $repo_path;
 						$this->bare = false;
 					// Is this a bare repo?

From 8fafd737a4d92ea7a5d1c273e2f883c796678c92 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Tue, 16 Jun 2015 04:09:00 +0200
Subject: [PATCH 05/24] calculated git versions of project & system, linked
 them hardcoded

---
 sai/modules/saimod_sys_git/saimod_sys_git.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sai/modules/saimod_sys_git/saimod_sys_git.php b/sai/modules/saimod_sys_git/saimod_sys_git.php
index ba26ef6..ae8ced6 100644
--- a/sai/modules/saimod_sys_git/saimod_sys_git.php
+++ b/sai/modules/saimod_sys_git/saimod_sys_git.php
@@ -12,12 +12,14 @@ class saimod_sys_git extends \SYSTEM\SAI\SaiModule {
         $result = array('git_project' => '', 'git_system' => '');
         try{
             $repo = \SYSTEM\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>';
         } 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));
+            $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>';
         } catch (\Exception $ex) {
             $result['git_system'] = $ex->getMessage();
         }

From 344a2b7ab9e30bd79a3c5910f8586a2c2e03c030 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Tue, 16 Jun 2015 04:26:36 +0200
Subject: [PATCH 06/24] saimod git included last it message

---
 sai/modules/saimod_sys_git/saimod_sys_git.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sai/modules/saimod_sys_git/saimod_sys_git.php b/sai/modules/saimod_sys_git/saimod_sys_git.php
index ae8ced6..be1cb56 100644
--- a/sai/modules/saimod_sys_git/saimod_sys_git.php
+++ b/sai/modules/saimod_sys_git/saimod_sys_git.php
@@ -12,14 +12,18 @@ class saimod_sys_git extends \SYSTEM\SAI\SaiModule {
         $result = array('git_project' => '', 'git_system' => '');
         try{
             $repo = \SYSTEM\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>';
+            $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));
-            $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>';
+            $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();
         }

From cf69cfa2d9f312c9cac148facf5a97fb4dd0b555 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Tue, 16 Jun 2015 13:17:32 +0200
Subject: [PATCH 07/24] removed git, included git lib submodule

---
 .gitmodules                                   |   3 +
 autoload.inc                                  |   3 +-
 git/Git.php                                   | 113 ----
 git/GitRepo.php                               | 572 ------------------
 git/autoload.inc                              |   2 -
 lib/autoload.inc                              |   3 +-
 lib/git                                       |   1 +
 sai/modules/saimod_sys_git/saimod_sys_git.php |   5 +-
 8 files changed, 10 insertions(+), 692 deletions(-)
 delete mode 100644 git/Git.php
 delete mode 100644 git/GitRepo.php
 delete mode 100644 git/autoload.inc
 create mode 160000 lib/git

diff --git a/.gitmodules b/.gitmodules
index e29da0e..13a18d0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,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
diff --git a/autoload.inc b/autoload.inc
index 9682377..b9327a7 100644
--- a/autoload.inc
+++ b/autoload.inc
@@ -20,5 +20,4 @@ require_once dirname(__FILE__).'/docu/autoload.inc';
 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';
\ No newline at end of file
+require_once dirname(__FILE__).'/lib/autoload.inc';
\ No newline at end of file
diff --git a/git/Git.php b/git/Git.php
deleted file mode 100644
index 51c8ec5..0000000
--- a/git/Git.php
+++ /dev/null
@@ -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');
-	}
-
-}
\ No newline at end of file
diff --git a/git/GitRepo.php b/git/GitRepo.php
deleted file mode 100644
index d0f6cfc..0000000
--- a/git/GitRepo.php
+++ /dev/null
@@ -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 */
\ No newline at end of file
diff --git a/git/autoload.inc b/git/autoload.inc
deleted file mode 100644
index 3f1c2c2..0000000
--- a/git/autoload.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\GIT');
\ No newline at end of file
diff --git a/lib/autoload.inc b/lib/autoload.inc
index d3f46f9..6f9b801 100644
--- a/lib/autoload.inc
+++ b/lib/autoload.inc
@@ -9,4 +9,5 @@ require_once dirname(__FILE__).'/tinymce/autoload.inc';
 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';
\ No newline at end of file
+require_once dirname(__FILE__).'/bootstrap_growl/autoload.inc';
+require_once dirname(__FILE__).'/git/autoload.inc';
\ No newline at end of file
diff --git a/lib/git b/lib/git
new file mode 160000
index 0000000..f9b9a5a
--- /dev/null
+++ b/lib/git
@@ -0,0 +1 @@
+Subproject commit f9b9a5ad101b15e95094560b8c48064a4147b7b7
diff --git a/sai/modules/saimod_sys_git/saimod_sys_git.php b/sai/modules/saimod_sys_git/saimod_sys_git.php
index be1cb56..f334a81 100644
--- a/sai/modules/saimod_sys_git/saimod_sys_git.php
+++ b/sai/modules/saimod_sys_git/saimod_sys_git.php
@@ -9,9 +9,10 @@ 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');
             
@@ -20,7 +21,7 @@ class saimod_sys_git extends \SYSTEM\SAI\SaiModule {
         }
         
         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');

From dacfa39f776cf6a7811cb7cfc91f8c99d21352bb Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Thu, 18 Jun 2015 02:12:17 +0200
Subject: [PATCH 08/24] saimod git texts

---
 dbd/sql/mysql/data/system_text.sql                | 12 +++++++++++-
 sai/modules/saimod_sys_git/tpl/saimod_sys_git.tpl |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/dbd/sql/mysql/data/system_text.sql b/dbd/sql/mysql/data/system_text.sql
index 7712622..4f337c9 100644
--- a/dbd/sql/mysql/data/system_text.sql
+++ b/dbd/sql/mysql/data/system_text.sql
@@ -918,7 +918,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 +926,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';
diff --git a/sai/modules/saimod_sys_git/tpl/saimod_sys_git.tpl b/sai/modules/saimod_sys_git/tpl/saimod_sys_git.tpl
index f43157a..6a7b19b 100644
--- a/sai/modules/saimod_sys_git/tpl/saimod_sys_git.tpl
+++ b/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}
\ No newline at end of file
+<b>Current SYSTEM Version:</b> ${git_system}
\ No newline at end of file

From 47f0547e6028060e0ac65c782613fd11cac33331 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Thu, 18 Jun 2015 02:16:47 +0200
Subject: [PATCH 09/24] saimod todo - fixed problem with todo counting

---
 sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php | 9 +++++++--
 sai/modules/saimod_sys_todo/saimod_sys_todo.php          | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php
index 9d4cb38..db4e15a 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php
@@ -5,7 +5,12 @@ class SYS_SAIMOD_TODO_COUNT extends \SYSTEM\DB\QP {
     protected static function query(){
         return new \SYSTEM\DB\QQuery(get_class(),
 //pg            
-'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_todo::NAME_PG.' WHERE '.\SYSTEM\DBD\system_todo::FIELD_STATE.'=?;',
+'TODO',
 //mys
-'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' WHERE '.\SYSTEM\DBD\system_todo::FIELD_STATE.'=?;'
+'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' as todo'.
+' LEFT JOIN '.\SYSTEM\DBD\system_todo_assign::NAME_MYS.' as assign ON todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.'=assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.
+' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as creator ON todo.'.\SYSTEM\DBD\system_todo::FIELD_USER.'=creator.'.\SYSTEM\DBD\system_user::FIELD_ID.
+' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as assignee ON assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.'=assignee.'.\SYSTEM\DBD\system_user::FIELD_ID.
+' WHERE '.\SYSTEM\DBD\system_todo::FIELD_STATE.'=?'.
+' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?);'
 );}}
diff --git a/sai/modules/saimod_sys_todo/saimod_sys_todo.php b/sai/modules/saimod_sys_todo/saimod_sys_todo.php
index 3e1a1a2..7562bd8 100644
--- a/sai/modules/saimod_sys_todo/saimod_sys_todo.php
+++ b/sai/modules/saimod_sys_todo/saimod_sys_todo.php
@@ -97,7 +97,7 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule {
                 $vars['filter_report'] = 'active';
                 break;
             default:
-                $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT::Q1(array($state))['count'];
+                $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT::Q1(array($state,$search,$search,$search))['count'];
                 $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_LIST::QQ(array($state,$search,$search,$search,$userid));
                 $vars['filter_all'] = 'active';
                 break;

From ade2dfe5d60c73c02df36067e6df9fa1ebdc8e1b Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Thu, 18 Jun 2015 02:24:38 +0200
Subject: [PATCH 10/24] saimod login register account fix

---
 dbd/sql/mysql/data/system_page.sql                      | 1 +
 sai/modules/saimod_sys_login/js/sai_sys_login_submit.js | 9 ++-------
 sai/modules/saimod_sys_login/tpl/login.tpl              | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/dbd/sql/mysql/data/system_page.sql b/dbd/sql/mysql/data/system_page.sql
index 170bd28..ce12354 100644
--- a/dbd/sql/mysql/data/system_page.sql
+++ b/dbd/sql/mysql/data/system_page.sql
@@ -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');
diff --git a/sai/modules/saimod_sys_login/js/sai_sys_login_submit.js b/sai/modules/saimod_sys_login/js/sai_sys_login_submit.js
index e63b117..d42e096 100644
--- a/sai/modules/saimod_sys_login/js/sai_sys_login_submit.js
+++ b/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');
     });
     
    
diff --git a/sai/modules/saimod_sys_login/tpl/login.tpl b/sai/modules/saimod_sys_login/tpl/login.tpl
index 71b62b8..a31a806 100644
--- a/sai/modules/saimod_sys_login/tpl/login.tpl
+++ b/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>
\ No newline at end of file

From 37d5ca468a7115a59272212ac8a031314f546557 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Thu, 18 Jun 2015 04:10:39 +0200
Subject: [PATCH 11/24] started qq->qq2 conversion

---
 db/qq/QP.php                                  | 48 ++++++++++---------
 db/qq/QQ.php                                  | 46 ++++++++++--------
 db/qq/QQuery.php                              | 16 -------
 dbd/qq/SYS_API_TREE.php                       | 16 +++----
 dbd/qq/SYS_CRON_GET.php                       | 16 +++----
 dbd/qq/SYS_CRON_LAST_VISIT.php                | 16 +++----
 dbd/qq/SYS_PAGE_GROUP.php                     | 16 +++----
 dbd/qq/SYS_SECURITY_CHECK.php                 | 15 +++---
 dbd/qq/SYS_TEXT_GET_TAG.php                   | 13 ++---
 .../saimod_sys_cron/qq/SYS_SAIMOD_CRON.php    | 16 +++----
 .../qq/SYS_SAIMOD_LOG_ANALYTICS.php           | 13 ++---
 .../qq/SYS_SAIMOD_LOG_FILTER.php              | 16 +++----
 .../qq/SYS_SAIMOD_LOG_FILTERS.php             | 17 ++++---
 .../qq/SYS_SAIMOD_LOG_FILTER_COUNT.php        | 17 ++++---
 .../qq/SYS_SAIMOD_TODO_ASSIGN.php             | 14 ++----
 .../qq/SYS_SAIMOD_TODO_ASSIGNEES.php          | 13 ++---
 .../qq/SYS_SAIMOD_TODO_CLOSE.php              | 17 ++++---
 .../qq/SYS_SAIMOD_TODO_CLOSE_ALL.php          | 17 ++++---
 .../qq/SYS_SAIMOD_TODO_COUNT.php              | 13 ++---
 .../qq/SYS_SAIMOD_TODO_COUNT_FREE.php         | 13 ++---
 .../qq/SYS_SAIMOD_TODO_COUNT_MINE.php         | 13 ++---
 .../qq/SYS_SAIMOD_TODO_COUNT_OTHERS.php       | 13 ++---
 .../qq/SYS_SAIMOD_TODO_COUNT_TYPE.php         | 13 ++---
 .../qq/SYS_SAIMOD_TODO_DEASSIGN.php           | 14 ++----
 .../qq/SYS_SAIMOD_TODO_EDIT.php               | 17 ++++---
 .../qq/SYS_SAIMOD_TODO_EXCEPTION_INSERT.php   | 13 ++---
 .../qq/SYS_SAIMOD_TODO_LIST.php               | 13 ++---
 .../qq/SYS_SAIMOD_TODO_LIST_FREE.php          | 13 ++---
 .../qq/SYS_SAIMOD_TODO_LIST_MINE.php          | 13 ++---
 .../qq/SYS_SAIMOD_TODO_LIST_OTHERS.php        | 13 ++---
 .../qq/SYS_SAIMOD_TODO_LIST_TYPE.php          | 13 ++---
 .../qq/SYS_SAIMOD_TODO_OPEN.php               | 17 ++++---
 .../qq/SYS_SAIMOD_TODO_PRIORITY.php           | 13 ++---
 .../SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN.php  | 16 +++----
 .../SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER.php | 16 +++----
 ..._SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED.php | 13 ++---
 .../SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN.php  | 16 +++----
 .../SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER.php | 16 +++----
 .../qq/SYS_SAIMOD_TODO_STATS_USERS.php        | 13 ++---
 .../qq/SYS_SAIMOD_TODO_TODO.php               | 14 ++----
 40 files changed, 287 insertions(+), 363 deletions(-)
 delete mode 100644 db/qq/QQuery.php

diff --git a/db/qq/QP.php b/db/qq/QP.php
index 534b5d7..f152998 100644
--- a/db/qq/QP.php
+++ b/db/qq/QP.php
@@ -1,35 +1,39 @@
 <?php
 namespace SYSTEM\DB;
 
-class QP {                       
-    public static function QQ($params,$params_mys = null){
-        $query = static::query();        
-        $con = new \SYSTEM\DB\Connection($query->dbinfo);                
-        $is_pg = \SYSTEM\system::isSystemDbInfoPG();
-        if($query->dbinfo){
-            $is_pg = $query->dbinfo instanceof \SYSTEM\DB\DBInfoPG;}            
-        if($is_pg){
-            return $con->prepare($query->name,$query->sql_pg,$params);
-        } else {
-            return $con->prepare($query->name,$query->sql_mys,$params_mys ? $params_mys : $params);}
+class QP {
+    public static function QQ($params,$dbinfo = null){
+        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);
+            } else if ($dbinfo instanceof \SYSTEM\DB\DBInfoMYS){
+                return $con->prepare(static::get_class(),static::mysql(),$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){
-        $res = self::QQ($params,$params_mys);
+    public static function QA($params,$dbinfo = null){
+        $res = self::QQ($params,$dbinfo);
         $result = array();
         while($row = $res->next()){
             $result[] = $row;}
         return $result;
     }
     
-    public static function Q1($params,$params_mys = null){
-        return self::QQ($params,$params_mys)->next();}
+    public static function Q1($params,$dbinfo = null){
+        return self::QQ($params,$dbinfo)->next();}
     
-    public static function QI($params,$params_mys = null){
-        $qq = self::QQ($params,$params_mys);
-        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();}    
+    public static function QI($params,$dbinfo = null){
+        $qq = self::QQ($params,$dbinfo);
+        return $qq->affectedRows() != (0||null);}
 }
\ No newline at end of file
diff --git a/db/qq/QQ.php b/db/qq/QQ.php
index ab86314..d8b3de7 100644
--- a/db/qq/QQ.php
+++ b/db/qq/QQ.php
@@ -2,33 +2,37 @@
 namespace SYSTEM\DB;
 
 class QQ {                       
-    public static function QQ(){
-        $query = static::query();        
-        $con = new \SYSTEM\DB\Connection($query->dbinfo);                
-        $is_pg = \SYSTEM\system::isSystemDbInfoPG();
-        if($query->dbinfo){
-            $is_pg = $query->dbinfo instanceof \SYSTEM\DB\DBInfoPG;}            
-        if($is_pg){
-            return $con->query($query->sql_pg);
-        } else {
-            return $con->query($query->sql_mys);}
+    public static function QQ($dbinfo = null){
+        if(!$dbinfo){
+            $dbinfo = \SYSTEM\system::getSystemDBInfo();}
+        $con = new \SYSTEM\DB\Connection($dbinfo);
+        
+        try{
+            if($dbinfo instanceof \SYSTEM\DB\DBInfoPG){
+                return $con->query(static::pgsql());
+            } else if ($dbinfo instanceof \SYSTEM\DB\DBInfoMYS){
+                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(){
-        $res = self::QQ();
+    public static function QA($dbinfo = null){
+        $res = self::QQ($dbinfo);
         $result = array();
         while($row = $res->next()){
             $result[] = $row;}
         return $result;
     }
     
-    public static function Q1(){
-        return self::QQ()->next();}
-    public static function QI(){
-        $qq = self::QQ();
-        return $qq;}
-    //override this
-    protected static function query(){
-        throw new \SYSTEM\LOG\ERROR('query function of your QQ Class not overwritten!');}
-        //return new QQuery();}    
+    public static function Q1($dbinfo = null){
+        return self::QQ($dbinfo)->next();}
+    public static function QI($dbinfo = null){
+        return self::QQ($dbinfo);}
 }
\ No newline at end of file
diff --git a/db/qq/QQuery.php b/db/qq/QQuery.php
deleted file mode 100644
index 3b7a306..0000000
--- a/db/qq/QQuery.php
+++ /dev/null
@@ -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;
-    }
-}
diff --git a/dbd/qq/SYS_API_TREE.php b/dbd/qq/SYS_API_TREE.php
index e77d418..f0aa452 100644
--- a/dbd/qq/SYS_API_TREE.php
+++ b/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(){
-        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_api::NAME_PG
 .' WHERE "'.\SYSTEM\DBD\system_api::FIELD_GROUP.'" = $1'
-.' ORDER BY "'.\SYSTEM\DBD\system_api::FIELD_ID.'"',
-//mys
+.' ORDER BY "'.\SYSTEM\DBD\system_api::FIELD_ID.'"';
+    }
+    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
-);}}
\ No newline at end of file
+.' ORDER BY '.\SYSTEM\DBD\system_api::FIELD_ID;
+    }    
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_CRON_GET.php b/dbd/qq/SYS_CRON_GET.php
index 5c5810f..ba846c6 100644
--- a/dbd/qq/SYS_CRON_GET.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.' WHERE class = $1;',
-//mys
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' WHERE class = ?;'
-);}}
\ 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.' WHERE class = $1;';
+    }
+    public static function mysql(){return
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' WHERE class = ?;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_CRON_LAST_VISIT.php b/dbd/qq/SYS_CRON_LAST_VISIT.php
index c87e994..9c3b580 100644
--- a/dbd/qq/SYS_CRON_LAST_VISIT.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT time FROM '.\SYSTEM\DBD\system_log::NAME_PG.' WHERE class =  \'SYSTEM\LOG\WARNING\' ORDER BY time DESC LIMIT 1;',
-//mys
-'SELECT time FROM '.\SYSTEM\DBD\system_log::NAME_MYS.' WHERE class = "SYSTEM\\\\LOG\\\\CRON" ORDER BY time DESC LIMIT 1'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'SELECT time FROM '.\SYSTEM\DBD\system_log::NAME_PG.' WHERE class =  \'SYSTEM\LOG\WARNING\' ORDER BY time DESC LIMIT 1;';
+    }
+    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';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_PAGE_GROUP.php b/dbd/qq/SYS_PAGE_GROUP.php
index b0b8325..b441e7e 100644
--- a/dbd/qq/SYS_PAGE_GROUP.php
+++ b/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(){
-        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_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;',
-//mys
+.' ORDER BY "'.\SYSTEM\DBD\system_page::FIELD_ID.'" ASC;';
+    }
+    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;'
-);}}
\ No newline at end of file
+.' ORDER BY '.\SYSTEM\DBD\system_page::FIELD_ID.' ASC;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_SECURITY_CHECK.php b/dbd/qq/SYS_SECURITY_CHECK.php
index 7ea3e31..7f32612 100644
--- a/dbd/qq/SYS_SECURITY_CHECK.php
+++ b/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(){
-        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\UserRightsTable::NAME_PG.
 ' WHERE "'.\SYSTEM\DBD\UserRightsTable::FIELD_USERID.'" = $1'.
-' AND "'.\SYSTEM\DBD\UserRightsTable::FIELD_RIGHTID.'" = $2;',
-//mys
+' AND "'.\SYSTEM\DBD\UserRightsTable::FIELD_RIGHTID.'" = $2;';
+    }
+    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.' = ?;'
-);}}
\ No newline at end of file
+' AND '.\SYSTEM\DBD\UserRightsTable::FIELD_RIGHTID.' = ?;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_TEXT_GET_TAG.php b/dbd/qq/SYS_TEXT_GET_TAG.php
index bc8d9d9..483037c 100644
--- a/dbd/qq/SYS_TEXT_GET_TAG.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 '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 = ?;'
-);}}
\ No newline at end of file
+ WHERE tag = ? and lang = ?;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON.php b/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON.php
index 5fa8721..a49cd66 100644
--- a/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.' ORDER BY class;',
-//mys
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' ORDER BY class;'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.' ORDER BY class;';
+    }
+    public static function mysql(){return
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' ORDER BY class;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_ANALYTICS.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_ANALYTICS.php
index da49f4d..c2ba637 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_ANALYTICS.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
+    public static function get_class(){return \get_class();}
+    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,'                                        
@@ -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;';
+    }
+}
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER.php
index e75ca91..1bc6c0a 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER.php
+++ b/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(){
-        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_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;',
-//mys
+' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME.' DESC, '.\SYSTEM\DBD\system_log::NAME_PG.'."'.\SYSTEM\DBD\system_log::FIELD_ID.'" DESC;';
+    }
+    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;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTERS.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTERS.php
index 6f45092..cdca35e 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTERS.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
 '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.';',
-//mys
+' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_CLASS.';';
+    }
+    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.';';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER_COUNT.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER_COUNT.php
index 3d24f35..f664ae8 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER_COUNT.php
+++ b/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(){
-        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_log::NAME_PG.
 ' WHERE '.\SYSTEM\DBD\system_log::FIELD_CLASS.
-' LIKE $1;',
-//mys
+' LIKE $1;';
+    }
+    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 ?);';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_ASSIGN.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_ASSIGN.php
index d86e049..61fc14e 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_ASSIGN.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_ASSIGN.php
@@ -1,14 +1,10 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_ASSIGN 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
 'INSERT INTO '.\SYSTEM\DBD\system_todo_assign::NAME_MYS.
 ' ('.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.','.\SYSTEM\DBD\system_todo_assign::FIELD_USER.','.\SYSTEM\DBD\system_todo_assign::FIELD_TIME.')'.
-' VALUES(?,?, NOW());'
-);}}
-
+' VALUES(?,?, NOW());';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_ASSIGNEES.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_ASSIGNEES.php
index 6237d36..8bcb5bd 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_ASSIGNEES.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_ASSIGNEES.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_ASSIGNEES 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 assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.' as todo_id,'.
     ' assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' as assignee,'.
     ' assignee.'.\SYSTEM\DBD\system_user::FIELD_ID.' as assignee_id'.
@@ -14,5 +10,6 @@ class SYS_SAIMOD_TODO_ASSIGNEES extends \SYSTEM\DB\QP {
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as assignee ON assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.'=assignee.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' WHERE assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.' = ?'.
 ' ORDER BY case when assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ? then 1 else 2 end'.
-' LIMIT 10'
-);}}
\ No newline at end of file
+' LIMIT 10';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_CLOSE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_CLOSE.php
index 7f2a4ea..d02dc6d 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_CLOSE.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_CLOSE.php
@@ -1,14 +1,13 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_CLOSE 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_todo::NAME_PG.' SET '.\SYSTEM\DBD\system_todo::FIELD_STATE.'='.\SYSTEM\DBD\system_todo::FIELD_STATE_CLOSED.
-' WHERE "'.\SYSTEM\DBD\system_todo::FIELD_ID.'"= $1;',
-//mys
+' WHERE "'.\SYSTEM\DBD\system_todo::FIELD_ID.'"= $1;';
+    }
+    public static function mysql(){return
 'UPDATE '.\SYSTEM\DBD\system_todo::NAME_MYS.' SET '.\SYSTEM\DBD\system_todo::FIELD_STATE.'='.\SYSTEM\DBD\system_todo::FIELD_STATE_CLOSED.', '.\SYSTEM\DBD\system_todo::FIELD_TIME_CLOSED.'=NOW()'.
-' WHERE '.\SYSTEM\DBD\system_todo::FIELD_ID.'= ?;'
-);}}
-
+' WHERE '.\SYSTEM\DBD\system_todo::FIELD_ID.'= ?;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_CLOSE_ALL.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_CLOSE_ALL.php
index 9ce76a0..d7cd1cc 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_CLOSE_ALL.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_CLOSE_ALL.php
@@ -1,14 +1,13 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_CLOSE_ALL extends \SYSTEM\DB\QQ {
-    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_todo::NAME_PG.' SET '.\SYSTEM\DBD\system_todo::FIELD_STATE.'='.\SYSTEM\DBD\system_todo::FIELD_STATE_CLOSED.
-' WHERE "'.\SYSTEM\DBD\system_todo::FIELD_TYPE.'"='.\SYSTEM\DBD\system_todo::FIELD_TYPE_EXCEPTION.';',
-//mys
+' WHERE "'.\SYSTEM\DBD\system_todo::FIELD_TYPE.'"='.\SYSTEM\DBD\system_todo::FIELD_TYPE_EXCEPTION.';';
+    }
+    public static function mysql(){return
 'UPDATE '.\SYSTEM\DBD\system_todo::NAME_MYS.' SET '.\SYSTEM\DBD\system_todo::FIELD_STATE.'='.\SYSTEM\DBD\system_todo::FIELD_STATE_CLOSED.', '.\SYSTEM\DBD\system_todo::FIELD_TIME_CLOSED.'=NOW()'.
-' WHERE `'.\SYSTEM\DBD\system_todo::FIELD_TYPE.'`='.\SYSTEM\DBD\system_todo::FIELD_TYPE_EXCEPTION.';'
-);}}
-
+' WHERE `'.\SYSTEM\DBD\system_todo::FIELD_TYPE.'`='.\SYSTEM\DBD\system_todo::FIELD_TYPE_EXCEPTION.';';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php
index db4e15a..a356bcb 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php
@@ -1,16 +1,13 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_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\DBD\system_todo::NAME_MYS.' as todo'.
 ' LEFT JOIN '.\SYSTEM\DBD\system_todo_assign::NAME_MYS.' as assign ON todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.'=assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as creator ON todo.'.\SYSTEM\DBD\system_todo::FIELD_USER.'=creator.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as assignee ON assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.'=assignee.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' WHERE '.\SYSTEM\DBD\system_todo::FIELD_STATE.'=?'.
-' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?);'
-);}}
+' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?);';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_FREE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_FREE.php
index 8064264..d9899e6 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_FREE.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_FREE.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_COUNT_FREE 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\DBD\system_todo::NAME_MYS.' as todo'.
 ' LEFT JOIN '.\SYSTEM\DBD\system_todo_assign::NAME_MYS.' as assign ON todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.'=assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.
@@ -14,5 +10,6 @@ class SYS_SAIMOD_TODO_COUNT_FREE extends \SYSTEM\DB\QP {
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as assignee ON assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.'=assignee.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' WHERE '.\SYSTEM\DBD\system_todo::FIELD_STATE.'=?'.
 ' AND assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' IS NULL'.
-' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?);'
-);}}
+' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?);';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_MINE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_MINE.php
index 723f8bd..2876a44 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_MINE.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_MINE.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_COUNT_MINE 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\DBD\system_todo::NAME_MYS.' as todo'.
 ' LEFT JOIN '.\SYSTEM\DBD\system_todo_assign::NAME_MYS.' as assign ON todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.'=assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.
@@ -14,5 +10,6 @@ class SYS_SAIMOD_TODO_COUNT_MINE extends \SYSTEM\DB\QP {
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as assignee ON assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.'=assignee.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' WHERE '.\SYSTEM\DBD\system_todo::FIELD_STATE.'=?'.
 ' AND assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ?'.
-' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?);'
-);}}
+' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?);';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_OTHERS.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_OTHERS.php
index 4719298..327c438 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_OTHERS.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_OTHERS.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_COUNT_OTHERS 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 ('.
 ' SELECT todo.id'.
 ' FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' as todo'.
@@ -17,5 +13,6 @@ class SYS_SAIMOD_TODO_COUNT_OTHERS extends \SYSTEM\DB\QP {
 ' AND NOT assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ?'.
 ' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?)'.
 ' GROUP BY todo.id'.
-') as a;'
-);}}
+') as a;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_TYPE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_TYPE.php
index 617afbe..3f01686 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_TYPE.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_TYPE.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_COUNT_TYPE 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 ('.
 ' SELECT todo.id'.
 ' FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' as todo'.
@@ -17,5 +13,6 @@ class SYS_SAIMOD_TODO_COUNT_TYPE extends \SYSTEM\DB\QP {
 ' AND todo.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' = ?'.
 ' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?)'.
 ' GROUP BY todo.id'.
-') as a;'
-);}}
+') as a;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_DEASSIGN.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_DEASSIGN.php
index 10be81c..a841bbb 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_DEASSIGN.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_DEASSIGN.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_DEASSIGN extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'TODO',
-//mys
-'DELETE FROM '.\SYSTEM\DBD\system_todo_assign::NAME_MYS.' WHERE '.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.' = ? AND '.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ?;'
-);}}
-
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'DELETE FROM '.\SYSTEM\DBD\system_todo_assign::NAME_MYS.' WHERE '.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.' = ? AND '.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ?;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EDIT.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EDIT.php
index a67b5ec..7490a8c 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EDIT.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EDIT.php
@@ -1,15 +1,14 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_EDIT 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_todo::NAME_PG.' SET '.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.'= $1'.
-' WHERE "'.\SYSTEM\DBD\system_todo::FIELD_ID.'"= $2;',
-//mys
+' WHERE "'.\SYSTEM\DBD\system_todo::FIELD_ID.'"= $2;';
+    }
+    public static function pqsql(){return
 'UPDATE '.\SYSTEM\DBD\system_todo::NAME_MYS.' SET '.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.'= ?, '
          .\SYSTEM\DBD\system_todo::FIELD_MESSAGE_HASH.'= SHA1(?)'.
-' WHERE '.\SYSTEM\DBD\system_todo::FIELD_ID.'= ?;'
-);}}
-
+' WHERE '.\SYSTEM\DBD\system_todo::FIELD_ID.'= ?;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EXCEPTION_INSERT.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EXCEPTION_INSERT.php
index 54b2392..d3de2c4 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EXCEPTION_INSERT.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EXCEPTION_INSERT.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_EXCEPTION_INSERT 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
 'INSERT INTO '.\SYSTEM\DBD\system_todo::NAME_MYS.
 '('.\SYSTEM\DBD\system_todo::FIELD_CLASS.','.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.','.
     \SYSTEM\DBD\system_todo::FIELD_CODE.','.\SYSTEM\DBD\system_todo::FIELD_FILE.','.
@@ -35,5 +31,6 @@ class SYS_SAIMOD_TODO_EXCEPTION_INSERT extends \SYSTEM\DB\QP {
             \SYSTEM\DBD\system_todo::FIELD_HTTP_REFERER.'=VALUES('.\SYSTEM\DBD\system_todo::FIELD_HTTP_REFERER.'), '.
             \SYSTEM\DBD\system_todo::FIELD_HTTP_USER_AGENT.'=VALUES('.\SYSTEM\DBD\system_todo::FIELD_HTTP_USER_AGENT.'), '.
             \SYSTEM\DBD\system_todo::FIELD_USER.'=VALUES('.\SYSTEM\DBD\system_todo::FIELD_USER.'), '.
-            \SYSTEM\DBD\system_todo::FIELD_THROWN.'=VALUES('.\SYSTEM\DBD\system_todo::FIELD_THROWN.');'
-);}}
\ No newline at end of file
+            \SYSTEM\DBD\system_todo::FIELD_THROWN.'=VALUES('.\SYSTEM\DBD\system_todo::FIELD_THROWN.');';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST.php
index 11a655a..8282ba4 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_LIST 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 * FROM('.
     ' SELECT todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.' as todo_id,'.
         ' todo.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_CLASS.', todo.'.\SYSTEM\DBD\system_todo::FIELD_TIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_REQUEST_URI.', todo.'.\SYSTEM\DBD\system_todo::FIELD_FILE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_LINE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_NAME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_PORT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_QUERYTIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_IP.', todo.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.','.
@@ -23,5 +19,6 @@ class SYS_SAIMOD_TODO_LIST extends \SYSTEM\DB\QP {
     ' ORDER BY case when assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ? then 1 else 2 end'.
 ') as a'.
 ' GROUP BY a.todo_id'.
-' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC'
-);}}
\ No newline at end of file
+' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_FREE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_FREE.php
index 885a8bc..6941814 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_FREE.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_FREE.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_LIST_FREE 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 * FROM('.
     ' SELECT todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.' as todo_id,'.
         ' todo.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_CLASS.', todo.'.\SYSTEM\DBD\system_todo::FIELD_TIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_REQUEST_URI.', todo.'.\SYSTEM\DBD\system_todo::FIELD_FILE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_LINE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_NAME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_PORT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_QUERYTIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_IP.', todo.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.','.
@@ -23,5 +19,6 @@ class SYS_SAIMOD_TODO_LIST_FREE extends \SYSTEM\DB\QP {
     ' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?)'.
 ') as a'.
 ' GROUP BY a.todo_id'.
-' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC'
-);}}
\ No newline at end of file
+' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_MINE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_MINE.php
index b7500a7..1835a25 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_MINE.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_MINE.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_LIST_MINE 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 * FROM('.
     ' SELECT todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.' as todo_id,'.
         ' todo.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_CLASS.', todo.'.\SYSTEM\DBD\system_todo::FIELD_TIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_REQUEST_URI.', todo.'.\SYSTEM\DBD\system_todo::FIELD_FILE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_LINE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_NAME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_PORT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_QUERYTIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_IP.', todo.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.','.
@@ -23,5 +19,6 @@ class SYS_SAIMOD_TODO_LIST_MINE extends \SYSTEM\DB\QP {
     ' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?)'.
 ') as a'.
 ' GROUP BY a.todo_id'.
-' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC'
-);}}
\ No newline at end of file
+' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC';    
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_OTHERS.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_OTHERS.php
index 8a8edff..f086109 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_OTHERS.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_OTHERS.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_LIST_OTHERS 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 * FROM('.
     ' SELECT todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.' as todo_id,'.
         ' todo.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_CLASS.', todo.'.\SYSTEM\DBD\system_todo::FIELD_TIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_REQUEST_URI.', todo.'.\SYSTEM\DBD\system_todo::FIELD_FILE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_LINE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_NAME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_PORT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_QUERYTIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_IP.', todo.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.','.
@@ -23,5 +19,6 @@ class SYS_SAIMOD_TODO_LIST_OTHERS extends \SYSTEM\DB\QP {
     ' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?)'.
 ') as a'.
 ' GROUP BY a.todo_id'.
-' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC'
-);}}
\ No newline at end of file
+' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_TYPE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_TYPE.php
index eff9771..3f3f9d4 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_TYPE.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_TYPE.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_LIST_TYPE 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 * FROM('.
     ' SELECT todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.' as todo_id,'.
         ' todo.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_CLASS.', todo.'.\SYSTEM\DBD\system_todo::FIELD_TIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_REQUEST_URI.', todo.'.\SYSTEM\DBD\system_todo::FIELD_FILE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_LINE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_NAME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_PORT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_QUERYTIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_IP.', todo.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.','.
@@ -24,5 +20,6 @@ class SYS_SAIMOD_TODO_LIST_TYPE extends \SYSTEM\DB\QP {
     ' ORDER BY case when assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ? then 1 else 2 end'.
 ') as a'.
 ' GROUP BY a.todo_id'.
-' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC'
-);}}
\ No newline at end of file
+' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_OPEN.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_OPEN.php
index 736afe5..d579c93 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_OPEN.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_OPEN.php
@@ -1,14 +1,13 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_OPEN 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_todo::NAME_PG.' SET '.\SYSTEM\DBD\system_todo::FIELD_STATE.'='.\SYSTEM\DBD\system_todo::FIELD_STATE_OPEN.
-' WHERE "'.\SYSTEM\DBD\system_todo::FIELD_ID.'"= $1;',
-//mys
+' WHERE "'.\SYSTEM\DBD\system_todo::FIELD_ID.'"= $1;';
+    }
+    public static function pqsql(){return
 'UPDATE '.\SYSTEM\DBD\system_todo::NAME_MYS.' SET '.\SYSTEM\DBD\system_todo::FIELD_STATE.'='.\SYSTEM\DBD\system_todo::FIELD_STATE_OPEN.
-' WHERE '.\SYSTEM\DBD\system_todo::FIELD_ID.'= ?;'
-);}}
-
+' WHERE '.\SYSTEM\DBD\system_todo::FIELD_ID.'= ?;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_PRIORITY.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_PRIORITY.php
index ca43eac..8ce5474 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_PRIORITY.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_PRIORITY.php
@@ -1,13 +1,10 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_PRIORITY 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
 'UPDATE '.\SYSTEM\DBD\system_todo::NAME_MYS.' SET '.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' = '.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' + ?'.
-' WHERE '.\SYSTEM\DBD\system_todo::FIELD_ID.'= ?;'
-);}}
+' WHERE '.\SYSTEM\DBD\system_todo::FIELD_ID.'= ?;';
+    }
+}
 
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN.php
index 3ef0f45..37c00e0 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN.php
@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 0',
-//mys
-'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 0'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 0;';
+    }
+    public static function mysql(){return
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 0;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER.php
index db14c33..c7cf3ff 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER.php
@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 1',
-//mys
-'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 1'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 1';
+    }
+    public static function mysql(){return
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 1';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED.php
index 9eb035f..cb00a1b 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED.php
@@ -1,13 +1,10 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED extends \SYSTEM\DB\QQ {
-    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_todo'.
 ' LEFT JOIN system_todo_assign ON system_todo.id = system_todo_assign.todo'.
-' WHERE state = 0 AND `type` = 1 AND system_todo_assign.user IS NOT NULL;'
-);}}
+' WHERE state = 0 AND `type` = 1 AND system_todo_assign.user IS NOT NULL;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN.php
index 8d3b143..aa5cae7 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN.php
@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 0',
-//mys
-'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 0'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 0';
+    }
+    public static function mysql(){return
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 0';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER.php
index 038a106..e066556 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER.php
@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 1',
-//mys
-'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 1'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 1';
+    }
+    public static function mysql(){return
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 1';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_USERS.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_USERS.php
index 94fa9e0..11bce96 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_USERS.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_USERS.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_STATS_USERS extends \SYSTEM\DB\QQ {
-    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 *, state_closed/(state_open+state_closed) as best '.
 'FROM ('.
     'SELECT username,'.
@@ -19,5 +15,6 @@ class SYS_SAIMOD_TODO_STATS_USERS extends \SYSTEM\DB\QQ {
     'GROUP BY system_todo_assign.user '.
     'ORDER BY count DESC'.
 ') a '.
-'ORDER BY best DESC;'
-);}}
+'ORDER BY best DESC;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_TODO.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_TODO.php
index be7f715..0789fa1 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_TODO.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_TODO.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_TODO 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 * FROM('.
     ' SELECT todo.*, assignee.'.\SYSTEM\DBD\system_user::FIELD_ID.' as assignee_id, assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' as assignee, creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' as username'.
     ' FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' as todo'.
@@ -16,6 +12,6 @@ class SYS_SAIMOD_TODO_TODO extends \SYSTEM\DB\QP {
     ' WHERE todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.' = ?'.
     ' ORDER BY case when assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ? then 1 else 2 end'.
 ') as a'.
-' GROUP BY '.\SYSTEM\DBD\system_todo::FIELD_ID.';'
-);}}
-
+' GROUP BY '.\SYSTEM\DBD\system_todo::FIELD_ID.';';
+    }
+}
\ No newline at end of file

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 12/24] 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");                        

From df894334418bc3b69ab7c1093ed48a4bf1c1b248 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Thu, 18 Jun 2015 16:18:15 +0200
Subject: [PATCH 13/24] corrected remaining qqs

---
 .../saimod_sys_cron/qq/SYS_SAIMOD_CRON_ADD.php  | 16 ++++++++--------
 .../qq/SYS_SAIMOD_CRON_CHANGE.php               | 16 ++++++++--------
 .../saimod_sys_cron/qq/SYS_SAIMOD_CRON_DEL.php  | 16 ++++++++--------
 .../qq/SYS_SAIMOD_CRON_SINGLE_SELECT.php        | 16 ++++++++--------
 .../qq/SYS_SAIMOD_LOG_BASIC_QUERYTIME.php       | 17 ++++++++---------
 .../qq/SYS_SAIMOD_LOG_BASIC_SUCCESS.php         | 17 ++++++++---------
 .../qq/SYS_SAIMOD_LOG_BASIC_VISITOR.php         | 17 ++++++++---------
 .../qq/SYS_SAIMOD_LOG_CLASS_BASIC.php           | 17 ++++++++---------
 .../qq/SYS_SAIMOD_LOG_CLASS_OTHER.php           | 17 ++++++++---------
 .../qq/SYS_SAIMOD_LOG_CLASS_SYSTEM.php          | 17 ++++++++---------
 .../saimod_sys_log/qq/SYS_SAIMOD_LOG_ERROR.php  | 17 ++++++++---------
 .../qq/SYS_SAIMOD_LOG_TRUNCATE.php              | 17 ++++++++---------
 .../qq/SYS_SAIMOD_LOG_UNIQUE_BASIC.php          | 17 ++++++++---------
 .../qq/SYS_SAIMOD_LOG_UNIQUE_EXCEPTION.php      | 17 ++++++++---------
 .../qq/SYS_SAIMOD_LOG_UNIQUE_REFERER.php        | 17 ++++++++---------
 .../qq/SYS_SAIMOD_LOG_UNIQUE_REQUEST.php        | 17 ++++++++---------
 16 files changed, 128 insertions(+), 140 deletions(-)

diff --git a/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_ADD.php b/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_ADD.php
index 6bc9116..fbfb315 100644
--- a/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_ADD.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'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 get_class(){return \get_class();}
+    public static function pgsql(){return 
+'INSERT INTO '.\SYSTEM\DBD\system_cron::NAME_PG.' (class, min, hour, day, day_week, month) VALUES ($1, $2, $3, $4, $5, $6);';
+    }
+    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`);';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_CHANGE.php b/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_CHANGE.php
index aa278b5..8049b7a 100644
--- a/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_CHANGE.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'UPDATE '.\SYSTEM\DBD\system_cron::NAME_PG.' SET status = $1 WHERE class = $2;',
-//mys
-'UPDATE '.\SYSTEM\DBD\system_cron::NAME_MYS.' SET status = ? WHERE `class` = ?;'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return           
+'UPDATE '.\SYSTEM\DBD\system_cron::NAME_PG.' SET status = $1 WHERE class = $2;';
+    }
+    public static function mysql(){return 
+'UPDATE '.\SYSTEM\DBD\system_cron::NAME_MYS.' SET status = ? WHERE `class` = ?;';
+    }
+}
diff --git a/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_DEL.php b/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_DEL.php
index 4c927d6..10327e2 100644
--- a/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_DEL.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'DELETE FROM '.\SYSTEM\DBD\system_cron::NAME_PG.' WHERE class = $1;',
-//mys
-'DELETE FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' WHERE class = ?;'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return          
+'DELETE FROM '.\SYSTEM\DBD\system_cron::NAME_PG.' WHERE class = $1;';
+    }
+    public static function mysql(){return 
+'DELETE FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' WHERE class = ?;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_SINGLE_SELECT.php b/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_SINGLE_SELECT.php
index b8f110e..9856c0a 100644
--- a/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_SINGLE_SELECT.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.'  WHERE class = $1;',
-//mys
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' WHERE class = ?;'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return 
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.'  WHERE class = $1;';
+    }
+    public static function mysql(){return 
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' WHERE class = ?;';
+    }
+}
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_BASIC_QUERYTIME.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_BASIC_QUERYTIME.php
index d2afbf4..f54ce7e 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_BASIC_QUERYTIME.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return 
 '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;',
-//mys
+.' LIMIT 30;';
+    }
+    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;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_BASIC_SUCCESS.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_BASIC_SUCCESS.php
index 4831355..661f17d 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_BASIC_SUCCESS.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return        
 '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;',
-//mys
+.' LIMIT 30;';
+    }
+    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;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_BASIC_VISITOR.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_BASIC_VISITOR.php
index 0e410d3..f536178 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_BASIC_VISITOR.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return 
 '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;',
-//mys
+.' LIMIT 30;';
+    }
+    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;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_CLASS_BASIC.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_CLASS_BASIC.php
index 262bc49..99780ca 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_CLASS_BASIC.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return          
 '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;',
-//mys
+.' LIMIT 30;';
+    }
+    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;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_CLASS_OTHER.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_CLASS_OTHER.php
index fc9b43a..2571017 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_CLASS_OTHER.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return
 '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;',
-//mys
+.' LIMIT 30;';
+    }
+    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;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_CLASS_SYSTEM.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_CLASS_SYSTEM.php
index 6cf59c9..f2e3966 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_CLASS_SYSTEM.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return 
 '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;',
-//mys
+.' LIMIT 30;';
+    }
+    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;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_ERROR.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_ERROR.php
index 91264f3..7671176 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_ERROR.php
+++ b/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(){
-        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::NAME_PG.'."'.\SYSTEM\DBD\system_log::FIELD_ID.'" = $1;',
-//mys
+' WHERE '.\SYSTEM\DBD\system_log::NAME_PG.'."'.\SYSTEM\DBD\system_log::FIELD_ID.'" = $1;';
+    }
+    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.' = ?;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_TRUNCATE.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_TRUNCATE.php
index a2552c6..f9c1576 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_TRUNCATE.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'TRUNCATE '.\SYSTEM\DBD\system_log::NAME_PG.';',
-//mys
-'TRUNCATE '.\SYSTEM\DBD\system_log::NAME_MYS.';'
-);}}
-
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return             
+'TRUNCATE '.\SYSTEM\DBD\system_log::NAME_PG.';';
+    }
+    public static function mysql(){return 
+'TRUNCATE '.\SYSTEM\DBD\system_log::NAME_MYS.';';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_UNIQUE_BASIC.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_UNIQUE_BASIC.php
index a86a623..c2db4c8 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_UNIQUE_BASIC.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return           
 '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;',
-//mys
+.' LIMIT 30;';
+    }
+    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;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_UNIQUE_EXCEPTION.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_UNIQUE_EXCEPTION.php
index 1f3d0fa..32a945e 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_UNIQUE_EXCEPTION.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return            
 '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;',
-//mys
+.' LIMIT 30;';
+    }
+    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;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_UNIQUE_REFERER.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_UNIQUE_REFERER.php
index e22f8dd..5397b83 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_UNIQUE_REFERER.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return 
 '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;',
-//mys
+.' LIMIT 30;';
+    }
+    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;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_UNIQUE_REQUEST.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_UNIQUE_REQUEST.php
index 5c8f782..6fec846 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_UNIQUE_REQUEST.php
+++ b/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(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pgsql(){return           
 '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;',
-//mys
+.' LIMIT 30;';
+    }
+    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;';
+    }
+}
\ No newline at end of file

From 428365049d93c0d5e25b32900169d623e965d4a8 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Thu, 18 Jun 2015 22:16:14 +0200
Subject: [PATCH 14/24] fixed saimod todo various problems, system.js typo

---
 files/sys/system.js                                       | 2 +-
 sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php  | 7 +++++--
 .../saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_FREE.php     | 8 +++++---
 .../saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_MINE.php     | 8 +++++---
 sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EDIT.php   | 2 +-
 sai/modules/saimod_sys_todo/saimod_sys_todo.php           | 2 +-
 sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo.tpl  | 2 +-
 .../saimod_sys_todo/tpl/saimod_sys_todo_todo_user.tpl     | 2 +-
 sai/modules/saimod_sys_todo/tpl/todo_list_pagination.tpl  | 2 +-
 9 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/files/sys/system.js b/files/sys/system.js
index 1cbd474..eb92be7 100644
--- a/files/sys/system.js
+++ b/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){
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php
index a356bcb..64d6038 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php
@@ -3,11 +3,14 @@ namespace SYSTEM\DBD;
 class SYS_SAIMOD_TODO_COUNT extends \SYSTEM\DB\QP {
     public static function get_class(){return \get_class();}
     public static function mysql(){return
-'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' as todo'.
+'SELECT COUNT(*) as count FROM('.
+'SELECT todo.id FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' as todo'.
 ' LEFT JOIN '.\SYSTEM\DBD\system_todo_assign::NAME_MYS.' as assign ON todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.'=assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as creator ON todo.'.\SYSTEM\DBD\system_todo::FIELD_USER.'=creator.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as assignee ON assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.'=assignee.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' WHERE '.\SYSTEM\DBD\system_todo::FIELD_STATE.'=?'.
-' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?);';
+' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?)'.
+' GROUP BY todo.id'.
+') as a;';
     }
 }
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_FREE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_FREE.php
index d9899e6..84793c2 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_FREE.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_FREE.php
@@ -3,13 +3,15 @@ namespace SYSTEM\DBD;
 class SYS_SAIMOD_TODO_COUNT_FREE extends \SYSTEM\DB\QP {
     public static function get_class(){return \get_class();}
     public static function mysql(){return
-'SELECT COUNT(*) as count'.
-' FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' as todo'.
+'SELECT COUNT(*) as count FROM('.
+'SELECT todo.id FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' as todo'.
 ' LEFT JOIN '.\SYSTEM\DBD\system_todo_assign::NAME_MYS.' as assign ON todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.'=assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as creator ON todo.'.\SYSTEM\DBD\system_todo::FIELD_USER.'=creator.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as assignee ON assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.'=assignee.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' WHERE '.\SYSTEM\DBD\system_todo::FIELD_STATE.'=?'.
 ' AND assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' IS NULL'.
-' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?);';
+' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?)'.
+' GROUP BY todo.id'.
+') as a;';
     }
 }
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_MINE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_MINE.php
index 2876a44..05fdb46 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_MINE.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_MINE.php
@@ -3,13 +3,15 @@ namespace SYSTEM\DBD;
 class SYS_SAIMOD_TODO_COUNT_MINE extends \SYSTEM\DB\QP {
     public static function get_class(){return \get_class();}
     public static function mysql(){return
-'SELECT COUNT(*) as count'.
-' FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' as todo'.
+'SELECT COUNT(*) as count FROM('.
+'SELECT todo.id FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' as todo'.
 ' LEFT JOIN '.\SYSTEM\DBD\system_todo_assign::NAME_MYS.' as assign ON todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.'=assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as creator ON todo.'.\SYSTEM\DBD\system_todo::FIELD_USER.'=creator.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as assignee ON assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.'=assignee.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' WHERE '.\SYSTEM\DBD\system_todo::FIELD_STATE.'=?'.
 ' AND assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ?'.
-' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?);';
+' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?)'.
+' GROUP BY todo.id'.
+') as a;';
     }
 }
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EDIT.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EDIT.php
index 7490a8c..28258b2 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EDIT.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EDIT.php
@@ -6,7 +6,7 @@ class SYS_SAIMOD_TODO_EDIT extends \SYSTEM\DB\QP {
 'UPDATE '.\SYSTEM\DBD\system_todo::NAME_PG.' SET '.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.'= $1'.
 ' WHERE "'.\SYSTEM\DBD\system_todo::FIELD_ID.'"= $2;';
     }
-    public static function pqsql(){return
+    public static function mysql(){return
 'UPDATE '.\SYSTEM\DBD\system_todo::NAME_MYS.' SET '.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.'= ?, '
          .\SYSTEM\DBD\system_todo::FIELD_MESSAGE_HASH.'= SHA1(?)'.
 ' WHERE '.\SYSTEM\DBD\system_todo::FIELD_ID.'= ?;';
diff --git a/sai/modules/saimod_sys_todo/saimod_sys_todo.php b/sai/modules/saimod_sys_todo/saimod_sys_todo.php
index 7562bd8..0f5b91e 100644
--- a/sai/modules/saimod_sys_todo/saimod_sys_todo.php
+++ b/sai/modules/saimod_sys_todo/saimod_sys_todo.php
@@ -157,7 +157,7 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule {
         $vars['userstats'] = '';
         $userstats = \SYSTEM\DBD\SYS_SAIMOD_TODO_STATS_USERS::QQ();
         while($stat = $userstats->next()){
-            $stat['perc'] = round($stat['state_closed'] / ($stat['state_open']+$stat['state_closed']),2)*100;
+            $stat['perc'] = round(($stat['state_closed'] / ($stat['state_open']+$stat['state_closed']))*100,2);
             $vars['userstats'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_stats_users_entry.tpl'), $stat);
         }
         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_stats.tpl'), $vars);        
diff --git a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo.tpl b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo.tpl
index 0d4d774..3b59aaf 100644
--- a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo.tpl
+++ b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo.tpl
@@ -21,7 +21,7 @@
     <tr><td>thrown</td><td>${thrown}</td></tr>    
     <tr><td>message</td><td>${message}</td></tr>
 </table>
-<button id="btn_back" onClick="system.load('todo');" class="btn btn-sm btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: left;"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span> ${basic_back}</button>
+<button id="btn_back" onClick="system.back();" class="btn btn-sm btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: left;"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span> ${basic_back}</button>
 <button id="btn_prio_up" class="btn btn-sm btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-thumbs-up" aria-hidden="true"></span></button>
 <button id="btn_prio_down" class="btn btn-sm btn-danger" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-thumbs-down" aria-hidden="true"></span></button>
 <button id="btn_close" class="btn btn-sm btn-danger" style="display: none; margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span> ${basic_close}</button>
diff --git a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user.tpl b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user.tpl
index 80b057f..dcfbac0 100644
--- a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user.tpl
+++ b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user.tpl
@@ -20,7 +20,7 @@
         </td>
     </tr>
 </table>
-<button id="btn_back" onClick="system.load('todo');" class="btn btn-sm btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: left;"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span> ${basic_back}</button>
+<button id="btn_back" onClick="system.back();" class="btn btn-sm btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: left;"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span> ${basic_back}</button>
 <button id="btn_edit" class="btn btn-sm btn-warning" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> ${basic_edit}</button>
 <button id="btn_prio_up" class="btn btn-sm btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-thumbs-up" aria-hidden="true"></span></button>
 <button id="btn_prio_down" class="btn btn-sm btn-danger" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-thumbs-down" aria-hidden="true"></span></button>
diff --git a/sai/modules/saimod_sys_todo/tpl/todo_list_pagination.tpl b/sai/modules/saimod_sys_todo/tpl/todo_list_pagination.tpl
index 9ba0130..32fa8a8 100644
--- a/sai/modules/saimod_sys_todo/tpl/todo_list_pagination.tpl
+++ b/sai/modules/saimod_sys_todo/tpl/todo_list_pagination.tpl
@@ -1 +1 @@
-<li class="${active}"><a href="#!${state};filter.all;search.${search};page.${page}">${page}</a></li>
\ No newline at end of file
+<li class="${active}"><a href="#!${state};filter.${filter};search.${search};page.${page}">${page}</a></li>
\ No newline at end of file

From 9381bff7d3d4cdfde00b91a910f35c7f400192bd Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Thu, 18 Jun 2015 22:18:02 +0200
Subject: [PATCH 15/24] saimod todo statistics layoutfix

---
 sai/modules/saimod_sys_todo/tpl/todo_stats.tpl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sai/modules/saimod_sys_todo/tpl/todo_stats.tpl b/sai/modules/saimod_sys_todo/tpl/todo_stats.tpl
index 6c1a7e2..177e4c8 100644
--- a/sai/modules/saimod_sys_todo/tpl/todo_stats.tpl
+++ b/sai/modules/saimod_sys_todo/tpl/todo_stats.tpl
@@ -14,14 +14,12 @@
         <td>${project_all}</td>
         <td>${project}%</td>
     </tr>
-</table>
-<table class="table table-hover table-condensed sai_table" style="width: 100%">
     <tr>
         <th>${table_username}</th>
         <th>${table_open}</th>
         <th>${table_closed}</th>
         <th>${table_all}</th>
-        <th>${table_percentage}</th>
+        <th>${table_done}</th>
     </tr>
     ${userstats}
 </table>
\ No newline at end of file

From 16555947aa62364f64c261007459a3a15168a737 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Thu, 18 Jun 2015 22:36:27 +0200
Subject: [PATCH 16/24] saimod cache cleaned up, no more html in php, qq's

---
 .../saimod_sys_cache/qq/SYS_SAIMOD_CACHE.php  | 11 +++++
 .../qq/SYS_SAIMOD_CACHE_COUNT.php             | 11 +++++
 .../saimod_sys_cache/saimod_sys_cache.php     | 41 ++++---------------
 .../saimod_sys_cache/tpl/saimod_sys_cache.tpl | 11 +++++
 .../tpl/saimod_sys_cache_entry.tpl            |  6 +++
 5 files changed, 48 insertions(+), 32 deletions(-)
 create mode 100644 sai/modules/saimod_sys_cache/qq/SYS_SAIMOD_CACHE.php
 create mode 100644 sai/modules/saimod_sys_cache/qq/SYS_SAIMOD_CACHE_COUNT.php
 create mode 100644 sai/modules/saimod_sys_cache/tpl/saimod_sys_cache.tpl
 create mode 100644 sai/modules/saimod_sys_cache/tpl/saimod_sys_cache_entry.tpl

diff --git a/sai/modules/saimod_sys_cache/qq/SYS_SAIMOD_CACHE.php b/sai/modules/saimod_sys_cache/qq/SYS_SAIMOD_CACHE.php
new file mode 100644
index 0000000..e2c6a86
--- /dev/null
+++ b/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;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_cache/qq/SYS_SAIMOD_CACHE_COUNT.php b/sai/modules/saimod_sys_cache/qq/SYS_SAIMOD_CACHE_COUNT.php
new file mode 100644
index 0000000..abd103d
--- /dev/null
+++ b/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';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_cache/saimod_sys_cache.php b/sai/modules/saimod_sys_cache/saimod_sys_cache.php
index a306a15..d804f47 100644
--- a/sai/modules/saimod_sys_cache/saimod_sys_cache.php
+++ b/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());
-        if(\SYSTEM\system::isSystemDbInfoPG()){
-            $res = $con->query('SELECT COUNT(*)as "count" FROM system.cache');
-        } else {
-            $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>';}
-            
-        $result .= '</table>';                
-        
-        return $result;
+        $vars = array();
+        $vars['count'] = \SYSTEM\DBD\SYS_SAIMOD_CACHE_COUNT::Q1()['count'];
+        $vars['entries'] = '';
+        $res = \SYSTEM\DBD\SYS_SAIMOD_CACHE::QQ();
+        while($r = $res->next()){
+            $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);}
+        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cache/tpl/saimod_sys_cache.tpl'), $vars);
     }
     
     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);}
diff --git a/sai/modules/saimod_sys_cache/tpl/saimod_sys_cache.tpl b/sai/modules/saimod_sys_cache/tpl/saimod_sys_cache.tpl
new file mode 100644
index 0000000..5044a08
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_cache/tpl/saimod_sys_cache_entry.tpl b/sai/modules/saimod_sys_cache/tpl/saimod_sys_cache_entry.tpl
new file mode 100644
index 0000000..e4bf11e
--- /dev/null
+++ b/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>
\ No newline at end of file

From 755c93bc8d5026f5c738e49f53e3be71decc299a Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Thu, 18 Jun 2015 22:43:20 +0200
Subject: [PATCH 17/24] fixed several text problems (saimod login)

---
 dbd/sql/mysql/data/system_text.sql | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/dbd/sql/mysql/data/system_text.sql b/dbd/sql/mysql/data/system_text.sql
index 4f337c9..88c5924 100644
--- a/dbd/sql/mysql/data/system_text.sql
+++ b/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', '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', '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', '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');

From 2349080bd142ea5037e5ef4e2afbd35598158437 Mon Sep 17 00:00:00 2001
From: Messerbill <ole.hoppe@gmx.de>
Date: Sat, 20 Jun 2015 14:42:19 +0200
Subject: [PATCH 18/24] added time to sai_start

---
 sai/modules/saistart_sys_sai/css/saistart_sys_sai.css | 5 +++++
 sai/modules/saistart_sys_sai/saistart_sys_sai.php     | 6 ++++++
 sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl | 1 +
 3 files changed, 12 insertions(+)

diff --git a/sai/modules/saistart_sys_sai/css/saistart_sys_sai.css b/sai/modules/saistart_sys_sai/css/saistart_sys_sai.css
index e20bd8d..ac456b3 100644
--- a/sai/modules/saistart_sys_sai/css/saistart_sys_sai.css
+++ b/sai/modules/saistart_sys_sai/css/saistart_sys_sai.css
@@ -2,6 +2,11 @@
 /*    width: 1250px;*/
 }
 
+#sai_datetime {
+    font-weight: bold;
+    text-align: right;
+}
+
 #container_top .well{
 /*    height: 220px;*/
 /*    min-width: 250px;*/
diff --git a/sai/modules/saistart_sys_sai/saistart_sys_sai.php b/sai/modules/saistart_sys_sai/saistart_sys_sai.php
index 4a69f7f..4144b5a 100644
--- a/sai/modules/saistart_sys_sai/saistart_sys_sai.php
+++ b/sai/modules/saistart_sys_sai/saistart_sys_sai.php
@@ -21,9 +21,15 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule {
     }
     
     protected static function html_content(){
+        //create timestamp
+        $week_number = date("W", time());
+        $date = date("l M Y", time());
+        
         if(!\SYSTEM\SECURITY\Security::isLoggedIn() || !\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI)){
             return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/content.tpl'));}
         $vars = array();
+        $vars['week_number'] = $week_number;
+        $vars['date'] = $date;
         $vars['project_name'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT);
         $vars['project_url'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL);
         $vars['analytics'] = \SYSTEM\SAI\saimod_sys_log::analytics();
diff --git a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl
index 4d821c3..8ae0d9d 100644
--- a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl
+++ b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl
@@ -1,6 +1,7 @@
 <h4 class="muted"><b>${sai_start_welcome}</b></h4>
     <h4 class="text-info">${sai_start_welcome_description}</h4><hr>
     <div class="row">
+        <div class="col-md-12 sai_margin_bottom_20" id="sai_datetime">Week of the year: ${week_number}, ${date}</div>
         <div class="col-md-6">
             <div id="project" class="panel panel-default sai_gridbox">
                     <div class="panel-heading"><a href="#!config">${basic_project}</a></div>

From 63d4ca2ff882f30fdc930ae94373dfbabf3e5c99 Mon Sep 17 00:00:00 2001
From: Messerbill <ole.hoppe@gmx.de>
Date: Sat, 20 Jun 2015 14:47:09 +0200
Subject: [PATCH 19/24] =?UTF-8?q?UI:=20ToDo=20Suchfelder=20und=20content?=
 =?UTF-8?q?=20ein=20st=C3=BCck=20herabsetzen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl
index 590e29f..21993ae 100644
--- a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl
+++ b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl
@@ -10,7 +10,7 @@
         <button id="btn_close_all" class="btn-danger btn btn-sm" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-minus-sign" aria-hidden="true"></span> ${basic_close_all}</button>
         <button id="btn_new" class="btn-success btn btn-sm" onClick="system.load('todo(new)');" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${basic_add}</button>
     </ul>
-    <div class="tab-content">        
+    <div class="tab-content sai_margin_top_10">        
         <div class="tab-pane active" id="tab_todo"></div>
     </div>
 </div>
\ No newline at end of file

From a2224b12cec1f03b51011e5b6b7190ffb5a4be4a Mon Sep 17 00:00:00 2001
From: Messerbill <ole.hoppe@gmx.de>
Date: Sat, 20 Jun 2015 15:01:17 +0200
Subject: [PATCH 20/24] fixed: UI bug: Textmodul tablesort

---
 .../tpl/saimod_sys_text_list.tpl              | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/sai/modules/saimod_sys_text/tpl/saimod_sys_text_list.tpl b/sai/modules/saimod_sys_text/tpl/saimod_sys_text_list.tpl
index 500f2ee..10f7cc4 100644
--- a/sai/modules/saimod_sys_text/tpl/saimod_sys_text_list.tpl
+++ b/sai/modules/saimod_sys_text/tpl/saimod_sys_text_list.tpl
@@ -6,17 +6,21 @@
 </ul>
 <div id="table_text">
     <h6>${basic_rows}: ${count} ${basic_page}: ${page}</h6>
-    <table class="sai_table table table-hover table-condensed tablesorter" id="sai_mod_text_table" style="overflow: auto;">
-        <tr>
-            <th>${table_id}</th>
-            <th>${table_lang}</th>
-            <th>${table_text}</th>
-            <th>${table_author}</th>
-            <th>${table_time_create}</th>
-            <th>${table_author_edit}</th>
-            <th>${table_time_edit}</th>
-        </tr>
-        ${entries}
+    <table class="table table-hover table-condensed sai_table tablesorter" id="sai_mod_text_table" style="overflow: auto;">
+        <thead>
+            <tr>
+                <th>${table_id}</th>
+                <th>${table_lang}</th>
+                <th>${table_text}</th>
+                <th>${table_author}</th>
+                <th>${table_time_create}</th>
+                <th>${table_author_edit}</th>
+                <th>${table_time_edit}</th>
+            </tr>
+        </thead>
+        <tbody>
+            ${entries}
+        </tbody>    
     </table>
     <ul class="pagination">
         <li><a href="#!text;tag.${tag};filter.${filter};search.${search};page.0">&laquo;</a></li>

From 3744e825517c644684b2d202d0c6b68d6c1cae56 Mon Sep 17 00:00:00 2001
From: Messerbill <ole.hoppe@gmx.de>
Date: Sat, 20 Jun 2015 15:20:06 +0200
Subject: [PATCH 21/24] =?UTF-8?q?UI:=20Projektmen=C3=BC=20redesign?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sai/page/css/sai.css | 4 ++++
 sai/page/tpl/sai.tpl | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/sai/page/css/sai.css b/sai/page/css/sai.css
index 0fe8afe..ddcac5d 100644
--- a/sai/page/css/sai.css
+++ b/sai/page/css/sai.css
@@ -31,6 +31,10 @@
 .sai_main_menu {
     border-radius: 3px 3px 3px 0;
 }
+
+.nav-tabs {
+    border: none;
+}
 /* auto collapsing navbar */
 #sys_autocollapse.collapsed .navbar-header {
   float: none;
diff --git a/sai/page/tpl/sai.tpl b/sai/page/tpl/sai.tpl
index ec49131..1d4061d 100644
--- a/sai/page/tpl/sai.tpl
+++ b/sai/page/tpl/sai.tpl
@@ -36,7 +36,8 @@
             </div>    
             <div class="row">
                 <div class="col-md-2">
-                    <ul class="nav nav-tabs nav-stacked sai_project_modules">                
+                    ${basic_project_menu}
+                    <ul class="nav nav-pills nav-stacked ">                
                         ${menu_proj}
                     </ul>
                 </div>

From fa8e6e46352ace8ada9aee2beab45001fc0f88ad Mon Sep 17 00:00:00 2001
From: Messerbill <ole.hoppe@gmx.de>
Date: Sat, 20 Jun 2015 15:25:57 +0200
Subject: [PATCH 22/24] stylefix saistart

---
 sai/modules/saistart_sys_sai/css/saistart_sys_sai.css | 1 -
 sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/sai/modules/saistart_sys_sai/css/saistart_sys_sai.css b/sai/modules/saistart_sys_sai/css/saistart_sys_sai.css
index ac456b3..4d8ee3c 100644
--- a/sai/modules/saistart_sys_sai/css/saistart_sys_sai.css
+++ b/sai/modules/saistart_sys_sai/css/saistart_sys_sai.css
@@ -6,7 +6,6 @@
     font-weight: bold;
     text-align: right;
 }
-
 #container_top .well{
 /*    height: 220px;*/
 /*    min-width: 250px;*/
diff --git a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl
index 8ae0d9d..6c535a8 100644
--- a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl
+++ b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl
@@ -1,7 +1,7 @@
 <h4 class="muted"><b>${sai_start_welcome}</b></h4>
     <h4 class="text-info">${sai_start_welcome_description}</h4><hr>
     <div class="row">
-        <div class="col-md-12 sai_margin_bottom_20" id="sai_datetime">Week of the year: ${week_number}, ${date}</div>
+        <div class="col-md-12 sai_margin_bottom_20" id="sai_datetime">Week of the year: <font style="color: orange;">${week_number}</font>, ${date}</div>
         <div class="col-md-6">
             <div id="project" class="panel panel-default sai_gridbox">
                     <div class="panel-heading"><a href="#!config">${basic_project}</a></div>

From 83b960cb5b42c1446be902f316a842a0bea0809c Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Sat, 20 Jun 2015 16:30:56 +0200
Subject: [PATCH 23/24] saimod start search buttons work

---
 sai/modules/saimod_sys_log/js/saimod_sys_log.js |  4 ++--
 .../tpl/saimod_sys_log_filter.tpl               |  4 ++--
 .../saimod_sys_todo/js/saimod_sys_todo.js       |  4 ++--
 sai/modules/saimod_sys_todo/tpl/todo_list.tpl   |  4 ++--
 .../saistart_sys_sai/js/saistart_sys_sai.js     | 17 ++++++++++++++---
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/sai/modules/saimod_sys_log/js/saimod_sys_log.js b/sai/modules/saimod_sys_log/js/saimod_sys_log.js
index 61d10f9..f71b785 100644
--- a/sai/modules/saimod_sys_log/js/saimod_sys_log.js
+++ b/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(){
-        system.load($(this).attr('state')+$('#input_search').val(),true);
+    $('#btn_search_log').click(function(){
+        system.load($(this).attr('state')+$('#input_search_log').val(),true);
     });
 }
 
diff --git a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl
index a39cc82..947a271 100644
--- a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl
+++ b/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>
-    <input class="input-medium search-query action-control" id="input_search" type="text" placeholder="${basic_placeholder_search}" size="20" style="float: right;" value="${search}"/>
+    <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_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>
diff --git a/sai/modules/saimod_sys_todo/js/saimod_sys_todo.js b/sai/modules/saimod_sys_todo/js/saimod_sys_todo.js
index 33d6472..4c1939f 100644
--- a/sai/modules/saimod_sys_todo/js/saimod_sys_todo.js
+++ b/sai/modules/saimod_sys_todo/js/saimod_sys_todo.js
@@ -21,8 +21,8 @@ function init_saimod_sys_todo() {
 };
 
 function register_search(){
-    $('#btn_search').click(function(){
-        system.load($(this).attr('state')+$('#input_search').val(),true);
+    $('#btn_search_todo').click(function(){
+        system.load($(this).attr('state')+$('#input_search_todo').val(),true);
     });
 }
 
diff --git a/sai/modules/saimod_sys_todo/tpl/todo_list.tpl b/sai/modules/saimod_sys_todo/tpl/todo_list.tpl
index bc01691..32419f4 100644
--- a/sai/modules/saimod_sys_todo/tpl/todo_list.tpl
+++ b/sai/modules/saimod_sys_todo/tpl/todo_list.tpl
@@ -7,8 +7,8 @@
         <li class="${filter_gen}"><a href="#!${state};filter.gen;search.${search}">${basic_generated}</a></li>
         <li class="${filter_user}"><a href="#!${state};filter.user;search.${search}">${basic_user}</a></li>
         <li class="${filter_report}"><a href="#!${state};filter.report;search.${search}">${basic_report}</a></li>
-        <button class="btn-sm btn btn-success" state="${state};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>
-        <input class="input-medium search-query action-control" id="input_search" type="text" placeholder="${basic_placeholder_search}" size="20" style="float: right;" value="${search}"/>
+        <button class="btn-sm btn btn-success" state="${state};filter.${filter};search." id="btn_search_todo" 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_todo" type="text" placeholder="${basic_placeholder_search}" size="20" style="float: right;" value="${search}"/>
     </ul>
     <h6>${basic_rows}: ${count} ${basic_page}: ${page}</h6>
     <table class="table table-hover table-condensed">
diff --git a/sai/modules/saistart_sys_sai/js/saistart_sys_sai.js b/sai/modules/saistart_sys_sai/js/saistart_sys_sai.js
index 5f64407..40fd629 100644
--- a/sai/modules/saistart_sys_sai/js/saistart_sys_sai.js
+++ b/sai/modules/saistart_sys_sai/js/saistart_sys_sai.js
@@ -1,5 +1,4 @@
-//function init__SYSTEM_SAI_saistart_sys_sai() {  
-function init_saistart_sys_sai() {  
+function init_saistart_sys_sai() {
  
     var heights = $(".inner-page").map(function() {
         return $(this).height();
@@ -40,4 +39,16 @@ function init_saistart_sys_sai() {
         }
     });
 
-};
\ No newline at end of file
+};
+
+function init_saistart_sys_sai_todo(){
+    $('#btn_search_todo').click(function(){
+        system.load($(this).attr('state')+$('#input_search_todo').val(),true);
+    });
+}
+
+function init_saistart_sys_sai_log(){
+    $('#btn_search_log').click(function(){
+        system.load($(this).attr('state')+$('#input_search_log').val(),true);
+    });
+}
\ No newline at end of file

From 3becacffb5e180908f33d5b38312f5fe90362676 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Sat, 20 Jun 2015 16:53:30 +0200
Subject: [PATCH 24/24] missing page references for saistart

---
 dbd/sql/mysql/data/system_page.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dbd/sql/mysql/data/system_page.sql b/dbd/sql/mysql/data/system_page.sql
index ce12354..a45e84a 100644
--- a/dbd/sql/mysql/data/system_page.sql
+++ b/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 (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 (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', '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');