diff options
author | Jannik Schönartz | 2018-02-06 13:45:54 +0100 |
---|---|---|
committer | Jannik Schönartz | 2018-02-06 13:45:54 +0100 |
commit | 3d801dcde21c8166e3281a180ef21ff05b175fd6 (patch) | |
tree | f8508e11bc6df5a27f0417ad8098c4ed013a691c /modules-available/syslog/page.inc.php | |
parent | [usb-lock-off] Reworked config chooser. Switched from the dropdown config sel... (diff) | |
parent | [statistics_reporting] Translation for 'settings' (diff) | |
download | slx-admin-3d801dcde21c8166e3281a180ef21ff05b175fd6.tar.gz slx-admin-3d801dcde21c8166e3281a180ef21ff05b175fd6.tar.xz slx-admin-3d801dcde21c8166e3281a180ef21ff05b175fd6.zip |
Merge branch 'origin/master' into usb-lock-off
Diffstat (limited to 'modules-available/syslog/page.inc.php')
-rw-r--r-- | modules-available/syslog/page.inc.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules-available/syslog/page.inc.php b/modules-available/syslog/page.inc.php index c679877a..153b591f 100644 --- a/modules-available/syslog/page.inc.php +++ b/modules-available/syslog/page.inc.php @@ -55,10 +55,10 @@ class Page_SysLog extends Page else $whereClause .= ' AND '; - $whereClause .= "machineuuid='" . preg_replace('/[^0-9a-zA-Z\-]/', '', Request::get('machineuuid', '', 'string')) . "'"; + $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); + $paginate = new Paginate("SELECT logid, dateline, logtypeid, clientip, machineuuid, description, extra FROM clientlog $whereClause ORDER BY logid DESC", 50); $res = $paginate->exec(); while ($row = $res->fetch(PDO::FETCH_ASSOC)) { $row['date'] = Util::prettyTime($row['dateline']); |