From cfd181a3ee8025ac39886a8ba422fefd8545fb2c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 1 Dec 2017 23:07:06 +0100
Subject: [syslog, statistics] Pretty print time, shorten CPU model in list

---
 modules-available/syslog/page.inc.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'modules-available/syslog')

diff --git a/modules-available/syslog/page.inc.php b/modules-available/syslog/page.inc.php
index 927a3adf..c679877a 100644
--- a/modules-available/syslog/page.inc.php
+++ b/modules-available/syslog/page.inc.php
@@ -57,19 +57,11 @@ class Page_SysLog extends Page
 
 				$whereClause .= "machineuuid='" . preg_replace('/[^0-9a-zA-Z\-]/', '', Request::get('machineuuid', '', 'string')) . "'";
 		}
-		$today = date('d.m.Y');
-		$yesterday = date('d.m.Y', time() - 86400);
 		$lines = array();
 		$paginate = new Paginate("SELECT logid, dateline, logtypeid, clientip, description, extra FROM clientlog $whereClause ORDER BY logid DESC", 50);
 		$res = $paginate->exec();
 		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			$day = date('d.m.Y', $row['dateline']);
-			if ($day === $today) {
-				$day = Dictionary::translate('lang_today');
-			} elseif ($day === $yesterday) {
-				$day = Dictionary::translate('lang_yesterday');
-			}
-			$row['date'] = $day . date(' H:i', $row['dateline']);
+			$row['date'] = Util::prettyTime($row['dateline']);
 			$row['icon'] = $this->eventToIconName($row['logtypeid']);
 			$lines[] = $row;
 		}
-- 
cgit v1.2.3-55-g7522