diff options
Diffstat (limited to 'modules-available/syslog/page.inc.php')
| -rw-r--r-- | modules-available/syslog/page.inc.php | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/modules-available/syslog/page.inc.php b/modules-available/syslog/page.inc.php index f2bc4854..c679877a 100644 --- a/modules-available/syslog/page.inc.php +++ b/modules-available/syslog/page.inc.php @@ -21,12 +21,13 @@ class Page_SysLog extends Page while ($row = $res->fetch(PDO::FETCH_ASSOC)) { $types[$row['logtypeid']] = $row; } - if (isset($_GET['filter'])) { - $filter = $_GET['filter']; - $not = isset($_GET['not']) ? 'NOT' : ''; - } elseif (isset($_POST['filter'])) { - $filter = $_POST['filter']; - $not = isset($_POST['not']) ? 'NOT' : ''; + if (Request::get('filter') !== false) { + $filter = Request::get('filter'); + $not = Request::get('not') ? 'NOT' : ''; + } elseif (Request::post('filter') !== false) { + $filter = Request::post('filter'); + $not = Request::post('not') ? 'NOT' : ''; + Session::set('log_filter', $filter); Session::set('log_not', $not); Session::save(); @@ -48,27 +49,19 @@ class Page_SysLog extends Page if (!empty($whereClause)) $whereClause = ' WHERE logtypeid ' . $not . ' IN (' . implode(', ', $whereClause) . ')'; } if (!isset($whereClause) || empty($whereClause)) $whereClause = ''; - if (Request::get('ip')) { + if (Request::get('machineuuid')) { if (empty($whereClause)) $whereClause .= ' WHERE '; else $whereClause .= ' AND '; - $whereClause .= "clientip LIKE '" . preg_replace('/[^0-9\.\:]/', '', Request::get('ip')) . "%'"; - } - $today = date('d.m.Y'); - $yesterday = date('d.m.Y', time() - 86400); + $whereClause .= "machineuuid='" . preg_replace('/[^0-9a-zA-Z\-]/', '', Request::get('machineuuid', '', 'string')) . "'"; + } $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; } @@ -78,9 +71,10 @@ class Page_SysLog extends Page 'not' => $not, 'list' => $lines, 'types' => json_encode(array_values($types)), + 'machineuuid' => Request::get('machineuuid'), )); } - + private function eventToIconName($event) { switch ($event) { |