From 1139530fbf3fb0fdce1bf5cfee311cd6f0fbf816 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 10:04:06 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'
---
interface/web/remote/monitor.php | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/interface/web/remote/monitor.php b/interface/web/remote/monitor.php
index ae138d5..f49b169 100644
--- a/interface/web/remote/monitor.php
+++ b/interface/web/remote/monitor.php
@@ -29,6 +29,11 @@
if($type == 'serverlist') {
$sql = 'SELECT server_id, server_name FROM server WHERE 1 ORDER BY server_id';
$records = $app->db->queryAllRecords($sql);
+ foreach($records as $index => $rec) {
+ $rec = $app->db->queryOneRecord("SELECT * FROM monitor_data WHERE server_id = " . $rec['server_id'] . " AND state NOT IN ('ok', 'no_state', 'info')");
+ if($rec) $records[$index]['state'] = 'warn';
+ else $records[$index]['state'] = 'ok';
+ }
$out['state'] = 'ok';
$out['data'] = $records;
$out['time'] = date('Y-m-d H:i',$rec['created']);
--
Gitblit v1.9.1