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 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules-available/statistics/inc')

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)";
 		}
 	}
 }
-- 
cgit v1.2.3-55-g7522