summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Klinger2016-09-29 10:37:04 +0200
committerChristian Klinger2016-09-29 10:37:04 +0200
commit368e1d42d7b87f21645ed8cfe9959562aab99c26 (patch)
tree0d5d2d49b83d89fae1f3a95c12a25ad729832745
parent[locations] Show percent of occupied machines per location (diff)
downloadslx-admin-368e1d42d7b87f21645ed8cfe9959562aab99c26.tar.gz
slx-admin-368e1d42d7b87f21645ed8cfe9959562aab99c26.tar.xz
slx-admin-368e1d42d7b87f21645ed8cfe9959562aab99c26.zip
use INET_ATON() on `clientip` so fix #3000.
-rw-r--r--modules-available/statistics/inc/filterset.inc.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/modules-available/statistics/inc/filterset.inc.php b/modules-available/statistics/inc/filterset.inc.php
index 8f506654..9676732a 100644
--- a/modules-available/statistics/inc/filterset.inc.php
+++ b/modules-available/statistics/inc/filterset.inc.php
@@ -43,7 +43,13 @@ class FilterSet
$col = $this->sortColumn;
$isMapped = array_key_exists('map_sort', Page_Statistics::$columns[$col]);
- $sort = " ORDER BY " . ($isMapped ? Page_Statistics::$columns[$col]['map_sort'] : $col) . " " . $this->sortDirection
+ $concreteCol = ($isMapped ? Page_Statistics::$columns[$col]['map_sort'] : $col) ;
+
+ if ($concreteCol === 'clientip') {
+ $concreteCol = "INET_ATON(clientip)";
+ }
+
+ $sort = " ORDER BY " . $concreteCol . " " . $this->sortDirection
. ", machineuuid ASC";
}