From d2d7f27f58235db9ac428b9dd952e7b108f3c381 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 9 Sep 2016 18:16:46 +0200
Subject: [locations/statistics] Make machine counting more consistent
---
modules-available/statistics/inc/filter.inc.php | 2 +-
modules-available/statistics/page.inc.php | 1 +
modules-available/statistics/templates/clientlist.html | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
(limited to 'modules-available/statistics')
diff --git a/modules-available/statistics/inc/filter.inc.php b/modules-available/statistics/inc/filter.inc.php
index 19d38140..b35075bc 100644
--- a/modules-available/statistics/inc/filter.inc.php
+++ b/modules-available/statistics/inc/filter.inc.php
@@ -220,7 +220,7 @@ class LocationFilter extends Filter
$joins[] = ' INNER JOIN subnet ON (INET_ATON(clientip) BETWEEN startaddr AND endaddr) ';
$args['lid'] = $this->argument;
$neg = $this->operator == '=' ? '' : 'NOT';
- return "$neg (subnet.locationid = :lid OR machine.locationid = :lid)";
+ return "$neg ((subnet.locationid = :lid AND machine.locationid IS NULL) OR machine.locationid = :lid)";
}
}
}
diff --git a/modules-available/statistics/page.inc.php b/modules-available/statistics/page.inc.php
index c8fcaa43..9383944e 100644
--- a/modules-available/statistics/page.inc.php
+++ b/modules-available/statistics/page.inc.php
@@ -532,6 +532,7 @@ class Page_Statistics extends Page
$rows[] = $row;
}
Render::addTemplate('clientlist', array(
+ 'rowCount' => count($rows),
'rows' => $rows,
'query' => $this->query,
'delimiter' => Filter::DELIMITER,
diff --git a/modules-available/statistics/templates/clientlist.html b/modules-available/statistics/templates/clientlist.html
index ca4b971a..2bac29fa 100644
--- a/modules-available/statistics/templates/clientlist.html
+++ b/modules-available/statistics/templates/clientlist.html
@@ -1,7 +1,7 @@
-{{lang_clientList}}
+{{lang_clientList}} ({{rowCount}})