diff options
author | Simon Rettberg | 2016-07-29 12:18:36 +0200 |
---|---|---|
committer | Simon Rettberg | 2016-07-29 12:18:36 +0200 |
commit | 6abbd2bf9a0dafa93e92928a269820eaa127b12b (patch) | |
tree | d44eb55035a84f73e1795d93e2f26be6ddada0df /modules-available/statistics/inc/filterset.inc.php | |
parent | [baseconfig] Rework makeInput to prevent generating invalid tag attribs (diff) | |
download | slx-admin-6abbd2bf9a0dafa93e92928a269820eaa127b12b.tar.gz slx-admin-6abbd2bf9a0dafa93e92928a269820eaa127b12b.tar.xz slx-admin-6abbd2bf9a0dafa93e92928a269820eaa127b12b.zip |
[statistics] Make filtering more dynamic, remove hard cutoff from summary
Diffstat (limited to 'modules-available/statistics/inc/filterset.inc.php')
-rw-r--r-- | modules-available/statistics/inc/filterset.inc.php | 58 |
1 files changed, 33 insertions, 25 deletions
diff --git a/modules-available/statistics/inc/filterset.inc.php b/modules-available/statistics/inc/filterset.inc.php index ac928ac4..7cc075c3 100644 --- a/modules-available/statistics/inc/filterset.inc.php +++ b/modules-available/statistics/inc/filterset.inc.php @@ -2,27 +2,31 @@ class FilterSet { - private $filters; - private $sortDirection; - private $sortColumn; + private $filters; + private $sortDirection; + private $sortColumn; - public function __construct($filters) { - $this->filters = $filters; - } + public function __construct($filters) + { + $this->filters = $filters; + } - public function setSort($col, $direction) { - $this->sortDirection = $direction === 'DESC' ? 'DESC' : 'ASC'; + public function setSort($col, $direction) + { + $this->sortDirection = $direction === 'DESC' ? 'DESC' : 'ASC'; if (array_key_exists($col, Page_Statistics::$columns)) { - $isMapped = array_key_exists('map_sort', Page_Statistics::$columns[$col]); - $this->sortColumn = $isMapped ? Page_Statistics::$columns[$col]['map_sort'] : $col; - } else { - /* default sorting column is clientip */ - $this->sortColumn = 'clientip'; - } - - } - public function makeFragments(&$where, &$join, &$sort, &$args) { + $isMapped = array_key_exists('map_sort', Page_Statistics::$columns[$col]); + $this->sortColumn = $isMapped ? Page_Statistics::$columns[$col]['map_sort'] : $col; + } else { + /* default sorting column is clientip */ + $this->sortColumn = 'clientip'; + } + + } + + public function makeFragments(&$where, &$join, &$sort, &$args) + { /* generate where clause & arguments */ $where = ''; $joins = []; @@ -39,12 +43,16 @@ class FilterSet $join = implode('', array_unique($joins)); - $sort = " ORDER BY " . $this->sortColumn . " " . $this->sortDirection; - } - public function getSortDirection() { - return $this->sortDirection; - } - public function getSortColumn() { - return $this->sortColumn; - } + $sort = " ORDER BY " . $this->sortColumn . " " . $this->sortDirection; + } + + public function getSortDirection() + { + return $this->sortDirection; + } + + public function getSortColumn() + { + return $this->sortColumn; + } } |