From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/monitor/datalog_list.php | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/interface/web/monitor/datalog_list.php b/interface/web/monitor/datalog_list.php
index 82ab334..a67501f 100644
--- a/interface/web/monitor/datalog_list.php
+++ b/interface/web/monitor/datalog_list.php
@@ -28,8 +28,8 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
/******************************************
* Begin Form configuration
@@ -49,16 +49,16 @@
$servers = $app->db->queryAllRecords("SELECT server_id, updated FROM server");
$sql = '(';
-foreach($servers as $s) {
- $sql .= " (datalog_id > ".$s['updated']." AND server_id = ".$s['server_id'].") AND ";
+foreach($servers as $sv) {
+ $sql .= " (sys_datalog.datalog_id > ".$sv['updated']." AND sys_datalog.server_id = ".$sv['server_id'].") OR ";
}
-$sql = substr($sql,0,-4);
+$sql = substr($sql, 0, -4);
$sql .= ')';
$app->listform_actions->SQLExtWhere = $sql;
-$app->listform_actions->SQLOrderBy = "ORDER BY tstamp DESC, datalog_id DESC";
+$app->listform_actions->SQLOrderBy = "ORDER BY sys_datalog.tstamp DESC, sys_datalog.datalog_id DESC";
$app->listform_actions->onLoad();
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1