diff options
Diffstat (limited to 'modules-available/statistics/inc/filter.inc.php')
| -rw-r--r-- | modules-available/statistics/inc/filter.inc.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/modules-available/statistics/inc/filter.inc.php b/modules-available/statistics/inc/filter.inc.php index 03dba6c3..6af6eed1 100644 --- a/modules-available/statistics/inc/filter.inc.php +++ b/modules-available/statistics/inc/filter.inc.php @@ -214,13 +214,11 @@ class LocationFilter extends Filter { settype($this->argument, 'int'); if ($this->argument === 0) { - $joins[] = 'LEFT JOIN subnet s ON (INET_ATON(machine.clientip) BETWEEN s.startaddr AND s.endaddr)'; - return 'machine.locationid IS NULL AND s.locationid IS NULL'; + $neg = $this->operator === '=' ? '' : 'NOT'; + return "machine.locationid IS $neg NULL"; } else { - $joins[] = ' LEFT JOIN subnet ON (INET_ATON(clientip) BETWEEN startaddr AND endaddr AND machine.locationid IS NULL) '; $args['lid'] = $this->argument; - $neg = $this->operator == '=' ? '' : 'NOT'; - return "$neg ((subnet.locationid = :lid) OR (machine.locationid = :lid))"; + return "machine.locationid {$this->operator} :lid"; } } } |