diff options
| author | Andreas Berenz | 2016-09-29 16:59:40 +0200 |
|---|---|---|
| committer | Andreas Berenz | 2016-09-29 16:59:40 +0200 |
| commit | 3ef3e6b39cf0254c0b02b724a42696adaab94e7a (patch) | |
| tree | 4a6f6b3a86fd7ce08ad885a53d6ff6fa79dbcd88 | |
| parent | some added comments (diff) | |
| parent | use INET_ATON() on `clientip` so fix #3000. (diff) | |
| download | slx-admin-3ef3e6b39cf0254c0b02b724a42696adaab94e7a.tar.gz slx-admin-3ef3e6b39cf0254c0b02b724a42696adaab94e7a.tar.xz slx-admin-3ef3e6b39cf0254c0b02b724a42696adaab94e7a.zip | |
Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into modularization
| -rw-r--r-- | modules-available/statistics/inc/filterset.inc.php | 8 |
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"; } |