diff options
Diffstat (limited to 'modules-available/statistics')
| -rw-r--r-- | modules-available/statistics/inc/filter.inc.php | 37 | ||||
| -rw-r--r-- | modules-available/statistics/page.inc.php | 10 |
2 files changed, 1 insertions, 46 deletions
diff --git a/modules-available/statistics/inc/filter.inc.php b/modules-available/statistics/inc/filter.inc.php index 8f61e44b..46de467b 100644 --- a/modules-available/statistics/inc/filter.inc.php +++ b/modules-available/statistics/inc/filter.inc.php @@ -106,14 +106,6 @@ class Filter $filters[] = new LocationFilter($operator, $rhs); } elseif ($lhs === 'subnet') { $filters[] = new SubnetFilter($operator, $rhs); - } elseif ($lhs === 'lastboot') { - $filters[] = new ByDateFilter($operator, $rhs, $lhs); - } elseif ($lhs === 'firstseen') { - $filters[] = new ByDateFilter($operator, $rhs, $lhs); - } elseif ($lhs === 'lastseen') { - $filters[] = new ByDateFilter($operator, $rhs, $lhs); - } elseif ($lhs === 'logintime') { - $filters[] = new ByDateFilter($operator, $rhs, $lhs); } else { if (array_key_exists($lhs, Page_Statistics::$columns) && Page_Statistics::$columns[$lhs]['column']) { $filters[] = new Filter($lhs, $operator, $rhs); @@ -168,6 +160,7 @@ class RuntimeFilter extends Filter public function whereClause(&$args, &$joins) { + global $SIZE_RAM; $upper = time() - (int)$this->argument * 3600; $lower = $upper - 3600; $common = "state IN ('OCCUPIED', 'IDLE', 'STANDBY') AND"; @@ -190,34 +183,6 @@ class RuntimeFilter extends Filter } } -class ByDateFilter extends Filter -{ - public function __construct($operator, $argument, $filter) - { - parent::__construct($filter, $operator, $argument); - } - - public function whereClause(&$args, &$joins) - { - if ($this->operator == '=') { - return " DATE(FROM_UNIXTIME($this->column)) = '$this->argument'"; - } elseif ($this->operator == '<') { - return " DATE(FROM_UNIXTIME($this->column)) < '$this->argument'"; - } elseif ($this->operator == '<=') { - return " DATE(FROM_UNIXTIME($this->column)) <= '$this->argument'"; - } elseif ($this->operator == '>') { - return " DATE(FROM_UNIXTIME($this->column)) > '$this->argument'"; - } elseif ($this->operator == '>=') { - return " DATE(FROM_UNIXTIME($this->column)) >= '$this->argument'"; - } elseif ($this->operator == '!=') { - return " DATE(FROM_UNIXTIME($this->column)) != '$this->argument'"; - } else { - error_log("unimplemented operator in ByDateFilter: $this->operator"); - return ' 1'; - } - } -} - class Id44Filter extends Filter { public function __construct($operator, $argument) diff --git a/modules-available/statistics/page.inc.php b/modules-available/statistics/page.inc.php index bc5726ef..c5da85fe 100644 --- a/modules-available/statistics/page.inc.php +++ b/modules-available/statistics/page.inc.php @@ -137,16 +137,6 @@ class Page_Statistics extends Page 'type' => 'int', 'column' => true ], - 'runtime' => [ - 'op' => Page_Statistics::OP_ORDINAL, - 'type' => 'int', - 'column' => true - ], - 'lastboot' => [ - 'op' => Page_Statistics::OP_ORDINAL, - 'type' => 'date', - 'column' => true - ], ]; if (Module::isAvailable('locations')) { Page_Statistics::$columns['location'] = [ |