diff --git a/cron/cron.php b/cron/cron.php index 245eb1b..319eea2 100644 --- a/cron/cron.php +++ b/cron/cron.php @@ -68,5 +68,5 @@ class cron { return \SYSTEM\SQL\SYS_CRON_UPD::QI(array($status,time(),$class));} public static function last_visit(){ - return \SYSTEM\SQL\SYS_CRON_LAST_VISIT::Q1()['time'];} + return \SYSTEM\SQL\SYS_CRON_LAST_VISIT::Q1()['last_run'];} } \ No newline at end of file diff --git a/cron/qq/SYS_CRON_LAST_VISIT.php b/cron/qq/SYS_CRON_LAST_VISIT.php index edab632..07ba8c4 100644 --- a/cron/qq/SYS_CRON_LAST_VISIT.php +++ b/cron/qq/SYS_CRON_LAST_VISIT.php @@ -3,9 +3,9 @@ namespace SYSTEM\SQL; class SYS_CRON_LAST_VISIT extends \SYSTEM\DB\QQ { public static function get_class(){return \get_class();} public static function pqsql(){return -'SELECT time FROM '.\SYSTEM\SQL\system_log::NAME_PG.' WHERE class = \'SYSTEM\LOG\WARNING\' ORDER BY time DESC LIMIT 1;'; +'SELECT last_run FROM '.\SYSTEM\SQL\system_cron::NAME_PG.' ORDER BY last_run DESC LIMIT 1;'; } public static function mysql(){return -'SELECT time FROM '.\SYSTEM\SQL\system_log::NAME_MYS.' WHERE class = "SYSTEM\\\\LOG\\\\CRON" ORDER BY time DESC LIMIT 1'; +'SELECT last_run FROM '.\SYSTEM\SQL\system_cron::NAME_MYS.' ORDER BY last_run DESC LIMIT 1'; } } \ No newline at end of file diff --git a/sai/modules/saimod_sys_cron/saimod_sys_cron.php b/sai/modules/saimod_sys_cron/saimod_sys_cron.php index adf7247..b974cd4 100644 --- a/sai/modules/saimod_sys_cron/saimod_sys_cron.php +++ b/sai/modules/saimod_sys_cron/saimod_sys_cron.php @@ -4,7 +4,7 @@ namespace SYSTEM\SAI; class saimod_sys_cron extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_cron(){ $vars['content'] = ''; - $vars['last_visit'] = \SYSTEM\CRON\cron::last_visit(); + $vars['last_visit'] = \SYSTEM\time::time_ago_string(strtotime(\SYSTEM\CRON\cron::last_visit())); $res = \SYSTEM\SQL\SYS_SAIMOD_CRON::QQ(); $i = 0; while($r = $res->next()){ @@ -13,7 +13,7 @@ class saimod_sys_cron extends \SYSTEM\SAI\SaiModule { $r['selected_'.$r['status']] = 'selected'; $r['i'] = $i++; $vars['content'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/tpl/list_entry.tpl'), $r);} - $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_CRON)); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_CRON), \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_TIME)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/tpl/tabs.tpl'), $vars); } diff --git a/sai/modules/saimod_sys_log/saimod_sys_log.php b/sai/modules/saimod_sys_log/saimod_sys_log.php index fbb5dcf..abec10c 100644 --- a/sai/modules/saimod_sys_log/saimod_sys_log.php +++ b/sai/modules/saimod_sys_log/saimod_sys_log.php @@ -28,7 +28,8 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats(){ $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_LOG); $vars['dbfile_entries'] = ''; - if(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH)){ + if( \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH) && + file_exists(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH))){ $scanned_directory = array_diff(scandir(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH)), array('..', '.')); foreach($scanned_directory as $file){ $vars['dbfile_entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log_stats_menu.tpl'), array('file' => $file));}