diff --git a/autoload.inc.php b/autoload.inc.php index d5cf2ca..37c1862 100644 --- a/autoload.inc.php +++ b/autoload.inc.php @@ -23,10 +23,12 @@ spl_autoload_register('__autoload_system'); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/page','SYSTEM\PAGE'); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/dbd/tbl/','SYSTEM\DBD'); +\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/dbd/qq/','SYSTEM\DBD'); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db','SYSTEM\DB'); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db/dbinfo','SYSTEM\DB'); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db/connection','SYSTEM\DB'); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db/result','SYSTEM\DB'); +\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db/qq','SYSTEM\DB'); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/security','SYSTEM\SECURITY'); diff --git a/db/connection/Connection.php b/db/connection/Connection.php index 8dd21ce..fc4e869 100644 --- a/db/connection/Connection.php +++ b/db/connection/Connection.php @@ -9,8 +9,10 @@ class Connection extends ConnectionAbstr{ //private $dbinfo = NULL; //Connects to DB, dependent on DBInfo a connection to a PG or MYS will be established - public function __construct(DBInfo $dbinfo){ + public function __construct(DBInfo $dbinfo = null){ //$this->dbinfo = $dbinfo; + if(!$dbinfo){ + $dbinfo = \SYSTEM\system::getSystemDBInfo();} if($dbinfo instanceof \SYSTEM\DB\DBInfoPG){ $this->connection = new \SYSTEM\DB\ConnectionPG($dbinfo); diff --git a/db/connection/ConnectionMYS.php b/db/connection/ConnectionMYS.php index a711113..32a9175 100644 --- a/db/connection/ConnectionMYS.php +++ b/db/connection/ConnectionMYS.php @@ -38,7 +38,7 @@ class ConnectionMYS extends ConnectionAbstr { if(!mysqli_stmt_execute($prepStmt)){ throw new \SYSTEM\LOG\ERROR("Could not execute prepare statement: ". \mysqli_stmt_error($prepStmt));} - return new ResultMysqliPrepare($prepStmt); + return new ResultMysqliPrepare($prepStmt,$this); } public function close(){ diff --git a/db/connection/ConnectionPG.php b/db/connection/ConnectionPG.php index cc24637..149515a 100644 --- a/db/connection/ConnectionPG.php +++ b/db/connection/ConnectionPG.php @@ -38,7 +38,7 @@ class ConnectionPG extends ConnectionAbstr { if(!$result) throw new \SYSTEM\LOG\ERROR("Could not execute prepare statement: ". \pg_last_error($this->connection)); - return new ResultPostgres($result); + return new ResultPostgres($result,$this); } public function close(){ diff --git a/db/qq/QP.php b/db/qq/QP.php new file mode 100644 index 0000000..9f39e7e --- /dev/null +++ b/db/qq/QP.php @@ -0,0 +1,28 @@ +dbinfo); + if($is_pg = \SYSTEM\system::isSystemDbInfoPG() && $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);} + } + + public static function QA($params){ + $res = self::QQ($params); + $result = array(); + while($row = $res->next()){ + $result[] = $row;} + return $result; + } + + //override this + protected static function query(){ + throw new \SYSTEM\LOG\ERROR('query function of your QQ Object not overritten!');} + //return new QQuery();} +} \ No newline at end of file diff --git a/db/qq/QQ.php b/db/qq/QQ.php new file mode 100644 index 0000000..d1f4b95 --- /dev/null +++ b/db/qq/QQ.php @@ -0,0 +1,28 @@ +dbinfo); + if($is_pg = \SYSTEM\system::isSystemDbInfoPG() && $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 QA(){ + $res = self::QQ(); + $result = array(); + while($row = $res->next()){ + $result[] = $row;} + return $result; + } + + //override this + protected static function query(){ + throw new \SYSTEM\LOG\ERROR('query function of your QQ Object not overritten!');} + //return new QQuery();} +} \ No newline at end of file diff --git a/db/qq/QQuery.php b/db/qq/QQuery.php new file mode 100644 index 0000000..3b7a306 --- /dev/null +++ b/db/qq/QQuery.php @@ -0,0 +1,16 @@ +name = $name; + $this->sql_pg = $sql_pg; + $this->sql_mys = $sql_mys; + $this->dbinfo = $dbinfo; + } +} diff --git a/db/result/ResultMysqliPrepare.php b/db/result/ResultMysqliPrepare.php index d009507..dd43ee4 100644 --- a/db/result/ResultMysqliPrepare.php +++ b/db/result/ResultMysqliPrepare.php @@ -7,10 +7,12 @@ class ResultMysqliPrepare extends \SYSTEM\DB\Result{ private $res = NULL; private $meta = NULL; private $binds = array(); + private $connection = NULL; //Result from mysql_query - public function __construct($res){ + public function __construct($res,$connection){ $this->res = $res; + $this->connection = $connection; $this->meta = \mysqli_stmt_result_metadata($this->res); diff --git a/db/result/ResultPostgres.php b/db/result/ResultPostgres.php index 4a3adbb..012f3f1 100644 --- a/db/result/ResultPostgres.php +++ b/db/result/ResultPostgres.php @@ -5,11 +5,13 @@ namespace SYSTEM\DB; class ResultPostgres extends \SYSTEM\DB\Result{ private $res = NULL; - private $current = NULL; + private $current = NULL; + private $connection = NULL; //Result from mysql_query - public function __construct($res){ - $this->res = $res;} + public function __construct($res,$connection){ + $this->res = $res; + $this->connection = $connection;} public function __destruct(){ $this->close();} diff --git a/dbd/qq/SYS_SAIMOD_LOG_BASIC_QUERYTIME.php b/dbd/qq/SYS_SAIMOD_LOG_BASIC_QUERYTIME.php new file mode 100644 index 0000000..1756349 --- /dev/null +++ b/dbd/qq/SYS_SAIMOD_LOG_BASIC_QUERYTIME.php @@ -0,0 +1,28 @@ +query('TRUNCATE '.\SYSTEM\DBD\system_log::NAME_PG.';'); - } else { - $con->query('TRUNCATE '.\SYSTEM\DBD\system_log::NAME_MYS.';');} - return \SYSTEM\LOG\JsonResult::ok(); - } + \SYSTEM\DBD\SYS_SAIMOD_LOG_TRUNCATE::QQ(); + return \SYSTEM\LOG\JsonResult::ok();} public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats(){ $vars = array(); - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/saimod_sys_log_stats.tpl'), $vars); - } + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/saimod_sys_log_stats.tpl'), $vars);} public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_admin(){ $vars = array(); - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/saimod_sys_log_admin.tpl'), $vars); - } + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/saimod_sys_log_admin.tpl'), $vars);} public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_class_system($filter){ - $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo()); - if(\SYSTEM\system::isSystemDbInfoPG()){ - $res = $con->query('SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % '.$filter.')) 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,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\INFO\' then 1 else 0 end) class_SYSTEM_LOG_INFO,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\DEPRECATED\' then 1 else 0 end) class_SYSTEM_LOG_DEPRECATED,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\WARNING\' then 1 else 0 end) class_SYSTEM_LOG_WARNING,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\ERROR\' then 1 else 0 end) class_SYSTEM_LOG_ERROR,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\ERROR_EXCEPTION\' then 1 else 0 end) class_SYSTEM_LOG_ERROR_EXCEPTION,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\SHUTDOWN_EXCEPTION\' then 1 else 0 end) class_SYSTEM_LOG_SHUTDOWN_EXCEPTION' - .' FROM '.\SYSTEM\DBD\system_log::NAME_PG - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } else { - $res = $con->query('SELECT FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),'.$filter.')) 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,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\INFO\' then 1 else 0 end) class_SYSTEM_LOG_INFO,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\DEPRECATED\' then 1 else 0 end) class_SYSTEM_LOG_DEPRECATED,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\WARNING\' then 1 else 0 end) class_SYSTEM_LOG_WARNING,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\ERROR\' then 1 else 0 end) class_SYSTEM_LOG_ERROR,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\ERROR_EXCEPTION\' then 1 else 0 end) class_SYSTEM_LOG_ERROR_EXCEPTION,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\SHUTDOWN_EXCEPTION\' then 1 else 0 end) class_SYSTEM_LOG_SHUTDOWN_EXCEPTION' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } - $result = array(); - while($row = $res->next()){ - $result[] = $row;} - - return \SYSTEM\LOG\JsonResult::toString($result); - } + $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_CLASS_SYSTEM::QA(array($filter)); + return \SYSTEM\LOG\JsonResult::toString($result);} public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_class_other($filter){ - $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo()); - if(\SYSTEM\system::isSystemDbInfoPG()){ - $res = $con->query('SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % '.$filter.')) as day,' - .'count(*) as count,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'Exception\' then 1 else 0 end) class_Exception,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'RuntimeException\' then 1 else 0 end) class_RuntimeException,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'ErrorException\' then 1 else 0 end) class_ErrorException' - .' FROM '.\SYSTEM\DBD\system_log::NAME_PG - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } else { - $res = $con->query('SELECT FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),'.$filter.')) as day,' - .'count(*) as count,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'Exception\' then 1 else 0 end) class_Exception,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'RuntimeException\' then 1 else 0 end) class_RuntimeException,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'ErrorException\' then 1 else 0 end) class_ErrorException' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } - $result = array(); - while($row = $res->next()){ - $result[] = $row;} - - return \SYSTEM\LOG\JsonResult::toString($result); - } + $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_CLASS_OTHER::QA(array($filter)); + return \SYSTEM\LOG\JsonResult::toString($result);} public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_class_basic($filter){ - $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo()); - if(\SYSTEM\system::isSystemDbInfoPG()){ - $res = $con->query('SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % '.$filter.')) as day,' - .'count(*) as count,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'ERROR\' then 1 else 0 end) class_ERROR,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'WARNING\' then 1 else 0 end) class_WARNING,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'INFO\' then 1 else 0 end) class_INFO,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'DEPRECATED\' then 1 else 0 end) class_DEPRECATED,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'AppError\' then 1 else 0 end) class_AppError' - .' FROM '.\SYSTEM\DBD\system_log::NAME_PG - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } else { - $res = $con->query('SELECT FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),'.$filter.')) as day,' - .'count(*) as count,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'ERROR\' then 1 else 0 end) class_ERROR,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'WARNING\' then 1 else 0 end) class_WARNING,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'INFO\' then 1 else 0 end) class_INFO,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'DEPRECATED\' then 1 else 0 end) class_DEPRECATED,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'AppError\' then 1 else 0 end) class_AppError' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } - $result = array(); - while($row = $res->next()){ - $result[] = $row;} - - return \SYSTEM\LOG\JsonResult::toString($result); - } + $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_CLASS_BASIC::QA(array($filter)); + return \SYSTEM\LOG\JsonResult::toString($result);} public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_unique_basic($filter){ - $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo()); - if(\SYSTEM\system::isSystemDbInfoPG()){ - $res = $con->query('SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % '.$filter.')) as day,' - .'count(*) as count,' - .'sum(case when not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\COUNTER\' and' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\INFO\' and' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'INFO\' and' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\DEPRECATED\' and' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'DEPRECATED\' and ' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'PreprocessingLog\' ' - .'then 1 else 0 end) class_fail,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\INFO\' or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\INFO\' or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'INFO\' or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\DEPRECATED\' or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'DEPRECATED\' or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'PreprocessingLog\' ' - .'then 1 else 0 end) class_log,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\COUNTER\' then 1 else 0 end) class_sucess' - .' FROM '.\SYSTEM\DBD\system_log::NAME_PG - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } else { - $res = $con->query('SELECT FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),'.$filter.')) as day,' - .'count(*) as count,' - .'count(distinct "'.\SYSTEM\DBD\system_log::FIELD_USER.'") as user_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_NAME.') as server_name_unique' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } - $result = array(); - while($row = $res->next()){ - $result[] = $row;} - - return \SYSTEM\LOG\JsonResult::toString($result); - } + $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_UNIQUE_BASIC::QA(array($filter)); + return \SYSTEM\LOG\JsonResult::toString($result);} public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_unique_request($filter){ - $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo()); - if(\SYSTEM\system::isSystemDbInfoPG()){ - $res = $con->query('SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % '.$filter.')) as day,' - .'count(*) as count,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_NAME.') as server_name_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_PORT.') as server_port_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_REQUEST_URI.') as request_uri_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_POST.') as post_unique' - .' FROM '.\SYSTEM\DBD\system_log::NAME_PG - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } else { - $res = $con->query('SELECT FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),'.$filter.')) as day,' - .'count(*) as count,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_NAME.') as server_name_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_PORT.') as server_port_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_REQUEST_URI.') as request_uri_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_POST.') as post_unique' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } - $result = array(); - while($row = $res->next()){ - $result[] = $row;} - - return \SYSTEM\LOG\JsonResult::toString($result); - } + $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_UNIQUE_REQUEST::QA(array($filter)); + return \SYSTEM\LOG\JsonResult::toString($result);} public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_unique_exception($filter){ - $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo()); - if(\SYSTEM\system::isSystemDbInfoPG()){ - $res = $con->query('SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % '.$filter.')) as day,' - .'count(*) as count,' - .'count(distinct "'.\SYSTEM\DBD\system_log::FIELD_USER.'") as user_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_NAME.') as server_name_unique' - .' FROM '.\SYSTEM\DBD\system_log::NAME_PG - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } else { - $res = $con->query('SELECT FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),'.$filter.')) as day,' - .'count(*) as count,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_FILE.') as file_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_LINE.') as line_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_CLASS.') as class_unique' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } - $result = array(); - while($row = $res->next()){ - $result[] = $row;} - - return \SYSTEM\LOG\JsonResult::toString($result); - } + $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_UNIQUE_EXCEPTION::QA(array($filter)); + return \SYSTEM\LOG\JsonResult::toString($result);} public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_unique_referer($filter){ - $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo()); - if(\SYSTEM\system::isSystemDbInfoPG()){ - $res = $con->query('SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % '.$filter.')) as day,' - .'count(*) as count,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_NAME.') as server_name_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_SERVER_PORT.') as server_port_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_REQUEST_URI.') as request_uri_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_POST.') as post_unique' - .' FROM '.\SYSTEM\DBD\system_log::NAME_PG - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } else { - $res = $con->query('SELECT FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),'.$filter.')) as day,' - .'count(*) as count,' - .'count(distinct "'.\SYSTEM\DBD\system_log::FIELD_USER.'") as user_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_HTTP_REFERER.') as http_referer_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_HTTP_USER_AGENT.') as http_user_agent_unique' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } - $result = array(); - while($row = $res->next()){ - $result[] = $row;} - - return \SYSTEM\LOG\JsonResult::toString($result); - } + $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_UNIQUE_REFERER::QA(array($filter)); + return \SYSTEM\LOG\JsonResult::toString($result);} public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_basic_visitor($filter){ - $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo()); - if(\SYSTEM\system::isSystemDbInfoPG()){ - $res = $con->query('SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % '.$filter.')) as day,' - .'count(*) as count,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_FILE.') as file_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_LINE.') as line_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_CLASS.') as class_unique' - .' FROM '.\SYSTEM\DBD\system_log::NAME_PG - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } else { - $res = $con->query('SELECT FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),'.$filter.')) as day,' - .'count(*) as count,' - .'count(distinct "'.\SYSTEM\DBD\system_log::FIELD_USER.'") as user_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } - $result = array(); - while($row = $res->next()){ - $result[] = $row;} - - return \SYSTEM\LOG\JsonResult::toString($result); - } + $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_BASIC_VISITOR::QA(array($filter)); + return \SYSTEM\LOG\JsonResult::toString($result);} public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_basic_sucess($filter){ - $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo()); - if(\SYSTEM\system::isSystemDbInfoPG()){ - $res = $con->query('SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % '.$filter.')) as day,' - .'count(*) as count,' - .'count(distinct "'.\SYSTEM\DBD\system_log::FIELD_USER.'") as user_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_HTTP_REFERER.') as http_referer_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_HTTP_USER_AGENT.') as http_user_agent_unique' - .' FROM '.\SYSTEM\DBD\system_log::NAME_PG - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } else { - $res = $con->query('SELECT FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),'.$filter.')) as day,' - .'count(*) as count,' - .'sum(case when not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\COUNTER\' and' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\INFO\' and' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'INFO\' and' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\DEPRECATED\' and' - .' not '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'EPRECATED\' ' - .'then 1 else 0 end) class_fail,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\INFO\' or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\INFO\' or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'INFO\' or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\DEPRECATED\' or ' - .\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'EPRECATED\' ' - .'then 1 else 0 end) class_log,' - .'sum(case when '.\SYSTEM\DBD\system_log::FIELD_CLASS.' = \'SYSTEM\LOG\COUNTER\' then 1 else 0 end) class_sucess' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } - $result = array(); - while($row = $res->next()){ - $result[] = $row;} - - return \SYSTEM\LOG\JsonResult::toString($result); - } + $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_BASIC_SUCCESS::QA(array($filter)); + return \SYSTEM\LOG\JsonResult::toString($result);} public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats_name_basic_querytime($filter){ - $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo()); - if(\SYSTEM\system::isSystemDbInfoPG()){ - $res = $con->query('SELECT to_timestamp(extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int - (extract(epoch from '.\SYSTEM\DBD\system_log::FIELD_TIME.')::int % '.$filter.')) as day,' - .'count(*) as count,' - .'count(distinct "'.\SYSTEM\DBD\system_log::FIELD_USER.'") as user_unique,' - .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_IP.') as ip_unique' - .' FROM '.\SYSTEM\DBD\system_log::NAME_PG - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } else { - $res = $con->query('SELECT FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),'.$filter.')) as day,' - .'count(*) as count,' - .'avg('.\SYSTEM\DBD\system_log::FIELD_QUERYTIME.') as querytime_avg,' - .'max('.\SYSTEM\DBD\system_log::FIELD_QUERYTIME.') as querytime_max,' - .'min('.\SYSTEM\DBD\system_log::FIELD_QUERYTIME.') as querytime_min,' - .'variance('.\SYSTEM\DBD\system_log::FIELD_QUERYTIME.') as querytime_var' - .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS - .' GROUP BY day' - .' ORDER BY day DESC' - .' LIMIT 30;'); - } - $result = array(); - while($row = $res->next()){ - $result[] = $row;} - - return \SYSTEM\LOG\JsonResult::toString($result); - } + $result = \SYSTEM\DBD\SYS_SAIMOD_LOG_BASIC_QUERYTIME::QA(array($filter)); + return \SYSTEM\LOG\JsonResult::toString($result);} public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_error($error){ - $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo()); - if(\SYSTEM\system::isSystemDbInfoPG()){ - $res = $con->prepare( 'selectSysLogError', - '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;', - array($error)); - } else { - $res = $con->prepare( 'selectSysLogError', - '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.' = ?;', - array($error)); - } - - $vars = $res->next(); + $vars = \SYSTEM\DBD\SYS_SAIMOD_LOG_ERROR::QQ(array($error))->next(); $vars['trace'] = implode('
', array_slice(explode('#', $vars['trace']), 1, -1)); - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/saimod_sys_log_error.tpl'), $vars); - } + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/saimod_sys_log_error.tpl'), $vars);} - public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_filter($filter = ""){ - $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo()); - $res = null; - if($filter !== ""){ - if(\SYSTEM\system::isSystemDbInfoPG()){ - $res = $con->prepare( 'selectCountSysLogFilter', - 'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_log::NAME_PG.' WHERE '.\SYSTEM\DBD\system_log::FIELD_CLASS.' LIKE $1;', - array($filter))->next(); - $count = $res['count']; - $res = $con->prepare( 'selectSysLogFilter', - '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 LIMIT 100;', - array($filter)); - } else { - $res = $con->prepare( 'selectCountSysLogFilter', - 'SELECT COUNT(*) as count'. - ' FROM '.\SYSTEM\DBD\system_log::NAME_MYS. - ' WHERE '.\SYSTEM\DBD\system_log::FIELD_CLASS.' LIKE ?;', - array(mysql_escape_string($filter)))->next(); - $count = $res['count']; - $res = $con->prepare( 'selectSysLogFilter', - '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 ?'. - ' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME.' DESC LIMIT 100;', - array(mysql_escape_string($filter))); - } - } else { - if(\SYSTEM\system::isSystemDbInfoPG()){ - $res = $con->query('SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_log::NAME_PG)->next(); - $count = $res['count']; - $res = $con->query( '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. - ' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME. - ' DESC LIMIT 100;'); - } else { - $res = $con->query('SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_log::NAME_MYS)->next(); - $count = $res['count']; - $res = $con->query( '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. - ' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME. - ' DESC LIMIT 100;'); - } - } - - $now = microtime(true); - + public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_filter($filter = "%"){ + $res = \SYSTEM\DBD\SYS_SAIMOD_LOG_FILTER_COUNT::QQ(array(mysql_escape_string($filter)))->next(); + $count = $res['count']; + $res = \SYSTEM\DBD\SYS_SAIMOD_LOG_FILTER::QQ(array(mysql_escape_string($filter))); + $now = microtime(true); $table=''; while($r = $res->next()){ //print_r($r); @@ -484,19 +107,7 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { } private static function generate_error_filters(){ - $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo()); - if(\SYSTEM\system::isSystemDbInfoPG()){ - $res = $con->query( '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.';'); - }else{ - $res = $con->query( '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.';'); - } - + $res = \SYSTEM\DBD\SYS_SAIMOD_LOG_FILTERS::QQ(); $result = ''; while($row = $res->next()){ $result .= '
  • '.$row['class'].'
    • ';} diff --git a/sai/modules/saimod_sys_log/saimod_sys_log_filter.tpl b/sai/modules/saimod_sys_log/saimod_sys_log_filter.tpl index c37d94e..cc7ae2b 100644 --- a/sai/modules/saimod_sys_log/saimod_sys_log_filter.tpl +++ b/sai/modules/saimod_sys_log/saimod_sys_log_filter.tpl @@ -1,5 +1,5 @@