diff --git a/sai/modules/saimod_sys_log/saimod_sys_log.php b/sai/modules/saimod_sys_log/saimod_sys_log.php index 8a998aa..99b8ada 100644 --- a/sai/modules/saimod_sys_log/saimod_sys_log.php +++ b/sai/modules/saimod_sys_log/saimod_sys_log.php @@ -291,7 +291,7 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { $vars = \SYSTEM\SQL\SYS_SAIMOD_LOG_ERROR::QQ(array($error))->next(); $vars['trace'] = implode('
', array_slice(explode('#', $vars['trace']), 1, -1)); $vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_LOG)); - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log_error.tpl'), $vars);} + return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_log/tpl/saimod_sys_log_error.tpl'))->SERVERPATH(), $vars);} public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_filter($filter = "%",$search="%",$page=0){ $filter = str_replace('\\', '\\\\', $filter); 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 c84bd29..b438bd1 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 @@ -2,6 +2,11 @@ namespace SYSTEM\SQL; class SYS_SAIMOD_TODO_ASSIGN extends \SYSTEM\DB\QP { public static function get_class(){return \get_class();} + public static function pgsql(){return +'INSERT INTO '.\SYSTEM\SQL\system_todo_assign::NAME_PG. +' ('.\SYSTEM\SQL\system_todo_assign::FIELD_TODO.',"'.\SYSTEM\SQL\system_todo_assign::FIELD_USER.'",'.\SYSTEM\SQL\system_todo_assign::FIELD_TIME.')'. +' VALUES($1,$2, NOW());'; + } public static function mysql(){return 'INSERT INTO '.\SYSTEM\SQL\system_todo_assign::NAME_MYS. ' ('.\SYSTEM\SQL\system_todo_assign::FIELD_TODO.','.\SYSTEM\SQL\system_todo_assign::FIELD_USER.','.\SYSTEM\SQL\system_todo_assign::FIELD_TIME.')'. 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 2530722..13ebd50 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 @@ -2,8 +2,8 @@ namespace SYSTEM\SQL; class SYS_SAIMOD_TODO_CLOSE extends \SYSTEM\DB\QP { public static function get_class(){return \get_class();} - public static function pqsql(){return -'UPDATE '.\SYSTEM\SQL\system_todo::NAME_PG.' SET '.\SYSTEM\SQL\system_todo::FIELD_STATE.'='.\SYSTEM\SQL\system_todo::FIELD_STATE_CLOSED. + public static function pgsql(){return +'UPDATE '.\SYSTEM\SQL\system_todo::NAME_PG.' SET '.\SYSTEM\SQL\system_todo::FIELD_STATE.'='.\SYSTEM\SQL\system_todo::FIELD_STATE_CLOSED.', '.\SYSTEM\SQL\system_todo::FIELD_TIME_CLOSED.'=NOW()'. ' WHERE "'.\SYSTEM\SQL\system_todo::FIELD_ID.'"= $1;'; } public static function mysql(){return 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 69763b4..9a1bb4a 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 @@ -2,6 +2,9 @@ namespace SYSTEM\SQL; class SYS_SAIMOD_TODO_DEASSIGN extends \SYSTEM\DB\QP { public static function get_class(){return \get_class();} + public static function pgsql(){return +'DELETE FROM '.\SYSTEM\SQL\system_todo_assign::NAME_PG.' WHERE '.\SYSTEM\SQL\system_todo_assign::FIELD_TODO.' = $1 AND "'.\SYSTEM\SQL\system_todo_assign::FIELD_USER.'" = $2;'; + } public static function mysql(){return 'DELETE FROM '.\SYSTEM\SQL\system_todo_assign::NAME_MYS.' WHERE '.\SYSTEM\SQL\system_todo_assign::FIELD_TODO.' = ? AND '.\SYSTEM\SQL\system_todo_assign::FIELD_USER.' = ?;'; } 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 6af71a0..b5a84b7 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 @@ -2,11 +2,11 @@ namespace SYSTEM\SQL; class SYS_SAIMOD_TODO_OPEN extends \SYSTEM\DB\QP { public static function get_class(){return \get_class();} - public static function pqsql(){return + public static function pgsql(){return 'UPDATE '.\SYSTEM\SQL\system_todo::NAME_PG.' SET '.\SYSTEM\SQL\system_todo::FIELD_STATE.'='.\SYSTEM\SQL\system_todo::FIELD_STATE_OPEN. ' WHERE "'.\SYSTEM\SQL\system_todo::FIELD_ID.'"= $1;'; } - public static function pqsql(){return + public static function mysql(){return 'UPDATE '.\SYSTEM\SQL\system_todo::NAME_MYS.' SET '.\SYSTEM\SQL\system_todo::FIELD_STATE.'='.\SYSTEM\SQL\system_todo::FIELD_STATE_OPEN. ' WHERE '.\SYSTEM\SQL\system_todo::FIELD_ID.'= ?;'; }