summaryrefslogtreecommitdiffstats
path: root/modules-available/eventlog
diff options
context:
space:
mode:
Diffstat (limited to 'modules-available/eventlog')
-rw-r--r--modules-available/eventlog/config.json4
-rw-r--r--modules-available/eventlog/page.inc.php45
-rw-r--r--modules-available/eventlog/permissions/permissions.json8
3 files changed, 21 insertions, 36 deletions
diff --git a/modules-available/eventlog/config.json b/modules-available/eventlog/config.json
index 6778348d..aa23adb5 100644
--- a/modules-available/eventlog/config.json
+++ b/modules-available/eventlog/config.json
@@ -1,3 +1,3 @@
{
- "category":"main.status"
-}
+ "category": "main.status"
+} \ No newline at end of file
diff --git a/modules-available/eventlog/page.inc.php b/modules-available/eventlog/page.inc.php
index 320c3b07..1c81983c 100644
--- a/modules-available/eventlog/page.inc.php
+++ b/modules-available/eventlog/page.inc.php
@@ -6,43 +6,26 @@ class Page_EventLog extends Page
protected function doPreprocess()
{
User::load();
- if (!User::isLoggedIn()) {
- Message::addError('main.no-permission');
- Util::redirect('?do=Main');
- }
- if (User::hasPermission("view")) {
- User::setLastSeenEvent(Property::getLastWarningId());
- }
+ User::assertPermission('view');
+ User::setLastSeenEvent(Property::getLastWarningId());
}
protected function doRender()
{
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;
- }
-
- $paginate->render('_page', array(
- 'list' => $lines
- ));
- } else {
- Message::addError('main.no-permission');
+ $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)) {
+ $row['date'] = Util::prettyTime($row['dateline']);
+ $row['icon'] = $this->typeToIcon($row['logtypeid']);
+ $row['color'] = $this->typeToColor($row['logtypeid']);
+ $lines[] = $row;
}
+
+ $paginate->render('_page', array(
+ 'list' => $lines
+ ));
}
private function typeToIcon($type)
diff --git a/modules-available/eventlog/permissions/permissions.json b/modules-available/eventlog/permissions/permissions.json
index f04ea714..a1748957 100644
--- a/modules-available/eventlog/permissions/permissions.json
+++ b/modules-available/eventlog/permissions/permissions.json
@@ -1,3 +1,5 @@
-[
- "view"
-] \ No newline at end of file
+{
+ "view": {
+ "location-aware": false
+ }
+} \ No newline at end of file