diff options
Diffstat (limited to 'modules-available/syslog')
| -rw-r--r-- | modules-available/syslog/lang/de/permissions.json | 3 | ||||
| -rw-r--r-- | modules-available/syslog/lang/en/permissions.json | 3 | ||||
| -rw-r--r-- | modules-available/syslog/page.inc.php | 24 | ||||
| -rw-r--r-- | modules-available/syslog/permissions/permissions.json | 3 | ||||
| -rw-r--r-- | modules-available/syslog/templates/heading.html | 1 | ||||
| -rw-r--r-- | modules-available/syslog/templates/page-syslog.html | 1 |
6 files changed, 32 insertions, 3 deletions
diff --git a/modules-available/syslog/lang/de/permissions.json b/modules-available/syslog/lang/de/permissions.json new file mode 100644 index 00000000..0cd05451 --- /dev/null +++ b/modules-available/syslog/lang/de/permissions.json @@ -0,0 +1,3 @@ +{ + "view": "Client Log anschauen." +}
\ No newline at end of file diff --git a/modules-available/syslog/lang/en/permissions.json b/modules-available/syslog/lang/en/permissions.json new file mode 100644 index 00000000..497e199e --- /dev/null +++ b/modules-available/syslog/lang/en/permissions.json @@ -0,0 +1,3 @@ +{ + "view": "View client log." +}
\ No newline at end of file diff --git a/modules-available/syslog/page.inc.php b/modules-available/syslog/page.inc.php index e63ada85..a26ed9be 100644 --- a/modules-available/syslog/page.inc.php +++ b/modules-available/syslog/page.inc.php @@ -27,6 +27,13 @@ class Page_SysLog extends Page protected function doRender() { + Render::addTemplate("heading"); + + if (!User::hasPermission("view")) { + Message::addError('main.no-permission'); + return; + } + $cutoff = strtotime('-1 month'); $res = Database::simpleQuery("SELECT logtypeid, Count(*) AS counter FROM clientlog WHERE dateline > $cutoff GROUP BY logtypeid ORDER BY counter ASC"); $types = array(); @@ -69,9 +76,22 @@ class Page_SysLog extends Page $whereClause .= "machineuuid='" . preg_replace('/[^0-9a-zA-Z\-]/', '', Request::get('machineuuid', '', 'string')) . "'"; } + + $allowedLocations = User::getAllowedLocations("view"); + $joinClause = ""; + if (!in_array(0, $allowedLocations)) { + $joinClause = "INNER JOIN machine USING (machineuuid)"; + if (empty($whereClause)) + $whereClause .= ' WHERE '; + else + $whereClause .= ' AND '; + + $whereClause .= 'locationid IN (:allowedLocations)'; + } + $lines = array(); - $paginate = new Paginate("SELECT logid, dateline, logtypeid, clientip, machineuuid, description, extra FROM clientlog $whereClause ORDER BY logid DESC", 50); - $res = $paginate->exec(); + $paginate = new Paginate("SELECT logid, dateline, logtypeid, clientlog.clientip, clientlog.machineuuid, description, extra FROM clientlog $joinClause $whereClause ORDER BY logid DESC", 50); + $res = $paginate->exec(array("allowedLocations" => $allowedLocations)); while ($row = $res->fetch(PDO::FETCH_ASSOC)) { $row['date'] = Util::prettyTime($row['dateline']); $row['icon'] = $this->eventToIconName($row['logtypeid']); diff --git a/modules-available/syslog/permissions/permissions.json b/modules-available/syslog/permissions/permissions.json new file mode 100644 index 00000000..f04ea714 --- /dev/null +++ b/modules-available/syslog/permissions/permissions.json @@ -0,0 +1,3 @@ +[ + "view" +]
\ No newline at end of file diff --git a/modules-available/syslog/templates/heading.html b/modules-available/syslog/templates/heading.html new file mode 100644 index 00000000..d6790a21 --- /dev/null +++ b/modules-available/syslog/templates/heading.html @@ -0,0 +1 @@ +<h1>{{lang_clientLog}}</h1>
\ No newline at end of file diff --git a/modules-available/syslog/templates/page-syslog.html b/modules-available/syslog/templates/page-syslog.html index 585aa310..7ab81067 100644 --- a/modules-available/syslog/templates/page-syslog.html +++ b/modules-available/syslog/templates/page-syslog.html @@ -1,7 +1,6 @@ <button type="button" class="btn btn-default pull-right" data-toggle="modal" data-target="#modal-settings"> <span class="glyphicon glyphicon-cog"></span> {{lang_settings}} </button> -<h1>{{lang_clientLog}}</h1> <style type="text/css"> .selectize-dropdown { max-width: 500px; |