From 58568161b0fde6af583a22bd5c046fc54fbf9141 Mon Sep 17 00:00:00 2001 From: rylon Date: Sat, 18 Apr 2015 14:28:53 +0200 Subject: [PATCH] time_ago_string now part of system::time, fixes for log and todo --- sai/modules/saimod_sys_log/saimod_sys_log.php | 25 ++---------- .../saimod_sys_todo/saimod_sys_todo.php | 39 ++++--------------- system/time.php | 20 ++++++++++ 3 files changed, 30 insertions(+), 54 deletions(-) diff --git a/sai/modules/saimod_sys_log/saimod_sys_log.php b/sai/modules/saimod_sys_log/saimod_sys_log.php index 290dca0..023a352 100644 --- a/sai/modules/saimod_sys_log/saimod_sys_log.php +++ b/sai/modules/saimod_sys_log/saimod_sys_log.php @@ -299,39 +299,20 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { while($r = $res->next()){ //print_r($r); $r['class_row'] = self::tablerow_class($r['class']); - $r['time'] = self::time_elapsed_string(strtotime($r['time'])); + $r['time'] = \SYSTEM\time::time_ago_string(strtotime($r['time'])); $r['message'] = htmlspecialchars(substr($r['message'],0,255)); $r['request_uri'] = htmlspecialchars($r['request_uri']); $table .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log_table_row.tpl'),$r); } - $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_LOG); + $vars = array(); $vars['count'] = $count['count']; $vars['error_filter'] = self::generate_error_filters($filter_); $vars['active'] = ($filter == '%' ? 'active' : ''); $vars['table'] = $table; + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_LOG)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl'),$vars); } - private static function time_elapsed_string($ptime){ - $etime = time() - $ptime; - if ($etime < 1){ - return '0 seconds';} - - $a = array( 12 * 30 * 24 * 60 * 60 => 'year', - 30 * 24 * 60 * 60 => 'month', - 24 * 60 * 60 => 'day', - 60 * 60 => 'hour', - 60 => 'minute', - 1 => 'second'); - - foreach ($a as $secs => $str){ - $d = $etime / $secs; - if ($d >= 1){ - $r = round($d); - return $r . ' ' . $str . ($r > 1 ? 's' : '') . ' ago';} - } - } - private static function generate_error_filters($filter){ $res = \SYSTEM\DBD\SYS_SAIMOD_LOG_FILTERS::QQ(); $result = ''; diff --git a/sai/modules/saimod_sys_todo/saimod_sys_todo.php b/sai/modules/saimod_sys_todo/saimod_sys_todo.php index abb7d03..fa8b6af 100644 --- a/sai/modules/saimod_sys_todo/saimod_sys_todo.php +++ b/sai/modules/saimod_sys_todo/saimod_sys_todo.php @@ -43,7 +43,7 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_TODO_COUNT::Q1()['count']; while($row = $res->next()){ $row['class_row'] = self::trclass($row['type'],$row['class']); - $row['time_elapsed'] = self::time_elapsed_string(strtotime($row['time'])); + $row['time_elapsed'] = \SYSTEM\time::time_ago_string(strtotime($row['time'])); //$row['report_type'] = self::reporttype($row['type']); $row['state_string'] = self::state($row['count']); $row['state_btn'] = self::statebtn($row['count']); @@ -57,10 +57,11 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { $result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_list_element.tpl'), $row); } } - $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TODO); + $vars = array(); $vars['todo_user_list_elements'] = $result_user; $vars['todo_list_elements'] = $result; $vars['count'] = $count; + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TODO)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_list.tpl'), $vars); } @@ -70,7 +71,7 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_DOTO_COUNT::Q1()['count']; while($row = $res->next()){ $row['class_row'] = self::trclass($row['type'],$row['class']); - $row['time_elapsed'] = self::time_elapsed_string(strtotime($row['time'])); + $row['time_elapsed'] = \SYSTEM\time::time_ago_string(strtotime($row['time'])); $row['state_string'] = self::state($row['count']); $row['state_btn'] = self::statebtn($row['count']); $row['message'] = htmlspecialchars($row['message']); @@ -83,10 +84,11 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { $result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_list_element.tpl'), $row); } } - $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TODO); + $vars = array(); $vars['todo_user_list_elements'] = $result_user; $vars['todo_list_elements'] = $result; $vars['count'] = $count; + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TODO)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_list.tpl'), $vars); } @@ -114,34 +116,7 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { foreach($vars['data'] as $stat){ $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_stats_entry.tpl'), $stat); } - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_stats.tpl'), $vars);} - - private static function time_elapsed_string($ptime) - { - $etime = time() - $ptime; - - if ($etime < 1) - { - return '0 seconds'; - } - - $a = array( 12 * 30 * 24 * 60 * 60 => 'year', - 30 * 24 * 60 * 60 => 'month', - 24 * 60 * 60 => 'day', - 60 * 60 => 'hour', - 60 => 'minute', - 1 => 'second' - ); - - foreach ($a as $secs => $str) - { - $d = $etime / $secs; - if ($d >= 1) - { - $r = round($d); - return $r . ' ' . $str . ($r > 1 ? 's' : '') . ' ago'; - } - } + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_stats.tpl'), $vars); } private static function state($state){ diff --git a/system/time.php b/system/time.php index 06789e5..6a99368 100644 --- a/system/time.php +++ b/system/time.php @@ -10,4 +10,24 @@ class time { public static function getStartTime(){ return self::$start_time;} + + public static function time_ago_string($time){ + $etime = time() - $time; + if ($etime < 1){ + return '0 ${time_ago_second}';} + + $a = array( 12 * 30 * 24 * 60 * 60 => '${time_ago_year}', + 30 * 24 * 60 * 60 => '${time_ago_month}', + 24 * 60 * 60 => '${time_ago_day}', + 60 * 60 => '${time_ago_hour}', + 60 => '${time_ago_minute}', + 1 => '${time_ago_second}'); + + foreach ($a as $secs => $str){ + $d = $etime / $secs; + if ($d >= 1){ + $r = round($d); + return $r . ' ' . $str;} + } + } } \ No newline at end of file