summaryrefslogtreecommitdiffstats
path: root/modules-available/statistics/inc/filter.inc.php
diff options
context:
space:
mode:
authorSimon Rettberg2016-09-09 18:16:46 +0200
committerSimon Rettberg2016-09-09 18:16:46 +0200
commitd2d7f27f58235db9ac428b9dd952e7b108f3c381 (patch)
tree6d59083fd82fb09e2db7444af0525e78b5b5fa76 /modules-available/statistics/inc/filter.inc.php
parent[exams] Less bla (diff)
downloadslx-admin-d2d7f27f58235db9ac428b9dd952e7b108f3c381.tar.gz
slx-admin-d2d7f27f58235db9ac428b9dd952e7b108f3c381.tar.xz
slx-admin-d2d7f27f58235db9ac428b9dd952e7b108f3c381.zip
[locations/statistics] Make machine counting more consistent
Diffstat (limited to 'modules-available/statistics/inc/filter.inc.php')
-rw-r--r--modules-available/statistics/inc/filter.inc.php2
1 files changed, 1 insertions, 1 deletions
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)";
}
}
}