diff options
| author | Simon Rettberg | 2019-01-21 12:19:35 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-01-21 12:19:35 +0100 |
| commit | d42a3b1f1d30d54f89ff4830163b00364f775e83 (patch) | |
| tree | 215bae197a13793e2261a76d78e1a5368f8bb386 | |
| parent | [dozmod] Re-allow old resources for migration (diff) | |
| download | slx-admin-d42a3b1f1d30d54f89ff4830163b00364f775e83.tar.gz slx-admin-d42a3b1f1d30d54f89ff4830163b00364f775e83.tar.xz slx-admin-d42a3b1f1d30d54f89ff4830163b00364f775e83.zip | |
[statistics] Improve ID44 filter matching
| -rw-r--r-- | modules-available/statistics/inc/filter.inc.php | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/modules-available/statistics/inc/filter.inc.php b/modules-available/statistics/inc/filter.inc.php index 565ea5f0..3ccea2c3 100644 --- a/modules-available/statistics/inc/filter.inc.php +++ b/modules-available/statistics/inc/filter.inc.php @@ -187,20 +187,24 @@ class Id44Filter extends Filter public function whereClause(&$args, &$joins) { global $SIZE_ID44; - $lower = floor(Page_Statistics::findBestValue($SIZE_ID44, $this->argument, false) * 1024 - 100); - $upper = ceil(Page_Statistics::findBestValue($SIZE_ID44, $this->argument, true) * 1024 + 100); + if ($this->operator === '=' || $this->operator === '!=') { + $lower = floor(Page_Statistics::findBestValue($SIZE_ID44, $this->argument, false) * 1024 - 100); + $upper = ceil(Page_Statistics::findBestValue($SIZE_ID44, $this->argument, true) * 1024 + 100); + } else { + $lower = $upper = round($this->argument * 1024); + } - if ($this->operator == '=') { + if ($this->operator === '=') { return " id44mb BETWEEN $lower AND $upper"; - } elseif ($this->operator == '!=') { + } elseif ($this->operator === '!=') { return " id44mb < $lower OR id44mb > $upper"; - } elseif ($this->operator == '<=') { - return " id44mb < $upper"; - } elseif ($this->operator == '>=') { - return " id44mb > $lower"; - } elseif ($this->operator == '<') { + } elseif ($this->operator === '<=') { + return " id44mb <= $upper"; + } elseif ($this->operator === '>=') { + return " id44mb >= $lower"; + } elseif ($this->operator === '<') { return " id44mb < $lower"; - } elseif ($this->operator == '>') { + } elseif ($this->operator === '>') { return " id44mb > $upper"; } else { error_log("unimplemented operator in Id44Filter: $this->operator"); |