diff options
| author | Udo Walter | 2017-12-28 17:22:22 +0100 |
|---|---|---|
| committer | Udo Walter | 2017-12-28 17:22:22 +0100 |
| commit | c274a1545da0f09c1360734221e551d0ccd3c3b6 (patch) | |
| tree | d40db1b03b14cc7524f879e7cf443b93c310d5c2 /modules-available/eventlog | |
| parent | [vmstore] added permissions to choose internal, nfs or cifs vm storage (diff) | |
| download | slx-admin-c274a1545da0f09c1360734221e551d0ccd3c3b6.tar.gz slx-admin-c274a1545da0f09c1360734221e551d0ccd3c3b6.tar.xz slx-admin-c274a1545da0f09c1360734221e551d0ccd3c3b6.zip | |
[eventlog] added permission to view the log
Diffstat (limited to 'modules-available/eventlog')
7 files changed, 39 insertions, 23 deletions
diff --git a/modules-available/eventlog/lang/de/permissions.json b/modules-available/eventlog/lang/de/permissions.json new file mode 100644 index 00000000..7f1087bf --- /dev/null +++ b/modules-available/eventlog/lang/de/permissions.json @@ -0,0 +1,3 @@ +{ + "view": "Server Log anschauen." +}
\ No newline at end of file diff --git a/modules-available/eventlog/lang/en/module.json b/modules-available/eventlog/lang/en/module.json index 8217fc02..0fc536f3 100644 --- a/modules-available/eventlog/lang/en/module.json +++ b/modules-available/eventlog/lang/en/module.json @@ -1,3 +1,3 @@ { - "module_name": "Server-Log" + "module_name": "Server Log" }
\ No newline at end of file diff --git a/modules-available/eventlog/lang/en/permissions.json b/modules-available/eventlog/lang/en/permissions.json new file mode 100644 index 00000000..ec438a4b --- /dev/null +++ b/modules-available/eventlog/lang/en/permissions.json @@ -0,0 +1,3 @@ +{ + "view": "View server log." +}
\ No newline at end of file diff --git a/modules-available/eventlog/page.inc.php b/modules-available/eventlog/page.inc.php index 87957479..320c3b07 100644 --- a/modules-available/eventlog/page.inc.php +++ b/modules-available/eventlog/page.inc.php @@ -6,36 +6,43 @@ class Page_EventLog extends Page protected function doPreprocess() { User::load(); - if (!User::hasPermission('superadmin')) { + if (!User::isLoggedIn()) { Message::addError('main.no-permission'); Util::redirect('?do=Main'); } - User::setLastSeenEvent(Property::getLastWarningId()); + if (User::hasPermission("view")) { + User::setLastSeenEvent(Property::getLastWarningId()); + } } protected function doRender() { - $today = date('d.m.Y'); - $yesterday = date('d.m.Y', time() - 86400); - $lines = array(); - $paginate = new Paginate("SELECT logid, dateline, logtypeid, description, extra FROM eventlog 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'); + Render::addTemplate("heading"); + if (User::hasPermission("view")) { + $today = date('d.m.Y'); + $yesterday = date('d.m.Y', time() - 86400); + $lines = array(); + $paginate = new Paginate("SELECT logid, dateline, logtypeid, description, extra FROM eventlog 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['icon'] = $this->typeToIcon($row['logtypeid']); + $row['color'] = $this->typeToColor($row['logtypeid']); + $lines[] = $row; } - $row['date'] = $day . date(' H:i', $row['dateline']); - $row['icon'] = $this->typeToIcon($row['logtypeid']); - $row['color'] = $this->typeToColor($row['logtypeid']); - $lines[] = $row; - } - $paginate->render('_page', array( - 'list' => $lines - )); + $paginate->render('_page', array( + 'list' => $lines + )); + } else { + Message::addError('main.no-permission'); + } } private function typeToIcon($type) diff --git a/modules-available/eventlog/permissions/permissions.json b/modules-available/eventlog/permissions/permissions.json new file mode 100644 index 00000000..f04ea714 --- /dev/null +++ b/modules-available/eventlog/permissions/permissions.json @@ -0,0 +1,3 @@ +[ + "view" +]
\ No newline at end of file diff --git a/modules-available/eventlog/templates/_page.html b/modules-available/eventlog/templates/_page.html index 0875664e..239286f8 100644 --- a/modules-available/eventlog/templates/_page.html +++ b/modules-available/eventlog/templates/_page.html @@ -1,4 +1,3 @@ -<h1>{{lang_eventLog}}</h1> {{{pagenav}}} <table class="table table-striped table-condensed"> <thead> diff --git a/modules-available/eventlog/templates/heading.html b/modules-available/eventlog/templates/heading.html new file mode 100644 index 00000000..37612a77 --- /dev/null +++ b/modules-available/eventlog/templates/heading.html @@ -0,0 +1 @@ +<h1>{{lang_eventLog}}</h1>
\ No newline at end of file |