summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2014-11-28 18:04:59 +0100
committerSimon Rettberg2014-11-28 18:04:59 +0100
commit7b3cc9f97b2ea171eb49c60e026c071827a49581 (patch)
tree0b2e5840eb0adcf22f58d75448deabd97299bfc8
parentWait for reboot to complete after restoring a configuration backup (diff)
downloadslx-admin-7b3cc9f97b2ea171eb49c60e026c071827a49581.tar.gz
slx-admin-7b3cc9f97b2ea171eb49c60e026c071827a49581.tar.xz
slx-admin-7b3cc9f97b2ea171eb49c60e026c071827a49581.zip
Fix wrong event type when displaying event log
-rw-r--r--modules/eventlog.inc.php4
-rw-r--r--modules/minilinux.inc.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/eventlog.inc.php b/modules/eventlog.inc.php
index 0105928b..f67bc8a7 100644
--- a/modules/eventlog.inc.php
+++ b/modules/eventlog.inc.php
@@ -46,7 +46,7 @@ class Page_EventLog extends Page
return 'ok';
case 'warning':
return 'exclamation-sign';
- case 'error':
+ case 'failure':
return 'remove';
default:
return 'question-sign';
@@ -60,7 +60,7 @@ class Page_EventLog extends Page
return 'green';
case 'warning':
return 'orange';
- case 'error':
+ case 'failure':
return 'red';
default:
return '';
diff --git a/modules/minilinux.inc.php b/modules/minilinux.inc.php
index 5027c1b7..46c771c2 100644
--- a/modules/minilinux.inc.php
+++ b/modules/minilinux.inc.php
@@ -65,13 +65,13 @@ class Page_MiniLinux extends Page
return;
}
$file = false;
- $gpg = false;
+ $gpg = 'missing';
foreach ($data['systems'] as &$system) {
if ($system['id'] !== $id) continue;
foreach ($system['files'] as &$f) {
if ($f['name'] !== $name) continue;
$file = $f;
- if (isset($f['gpg'])) $gpg = $f['gpg'];
+ if (!empty($f['gpg'])) $gpg = $f['gpg'];
break;
}
}