[statistics] Handle runmode and its isclient flag

2 files changed, 32 insertions, 4 deletions

diff --git a/modules-available/statistics/inc/filter.inc.php b/modules-available/statistics/inc/filter.inc.php
index b16bd9fb..6e437a71 100644
--- a/modules-available/statistics/inc/filter.inc.php
+++ b/modules-available/statistics/inc/filter.inc.php
@@ -29,7 +29,7 @@ class Filter
 		$addendum = '';
 
 		/* check if we have to do some parsing*/
-		if (Page_Statistics::$columns[$this->column]['type'] == 'date') {
+		if (Page_Statistics::$columns[$this->column]['type'] === 'date') {
 			$args[$key] = strtotime($this->argument);
 		} else {
 			$args[$key] = $this->argument;
@@ -180,8 +180,7 @@ class StateFilter extends Filter
 {
 	public function __construct($operator, $argument)
 	{
-		$this->operator = $operator;
-		$this->argument = $argument;
+		parent::__construct(null, $operator, $argument);
 	}
 
 	public function whereClause(&$args, &$joins)
@@ -236,3 +235,20 @@ class SubnetFilter extends Filter
 	}
 }
 
+class IsClientFilter extends Filter
+{
+	public function __construct($argument)
+	{
+		parent::__construct(null, null, $argument);
+	}
+
+	public function whereClause(&$args, &$joins)
+	{
+		if ($this->argument) {
+			$joins[] = ' LEFT JOIN runmode USING (machineuuid)';
+			return "(runmode.isclient <> 0 OR runmode.isclient IS NULL)";
+		}
+		$joins[] = ' INNER JOIN runmode USING (machineuuid)';
+		return "runmode.isclient = 0";
+	}
+}
diff --git a/modules-available/statistics/inc/filterset.inc.php b/modules-available/statistics/inc/filterset.inc.php
index c73feeef..25c5c8fa 100644
--- a/modules-available/statistics/inc/filterset.inc.php
+++ b/modules-available/statistics/inc/filterset.inc.php
@@ -2,6 +2,9 @@
 
 class FilterSet
 {
+	/**
+	 * @var \Filter[]
+	 */
 	private $filters;
 	private $sortDirection;
 	private $sortColumn;
@@ -39,7 +42,7 @@ class FilterSet
 				$where .= $sep . $filter->whereClause($args, $joins);
 			}
 		}
-		$join = implode('', array_unique($joins));
+		$join = implode(' ', array_unique($joins));
 
 		$col = $this->sortColumn;
 		$isMapped = array_key_exists('map_sort', Page_Statistics::$columns[$col]);
@@ -72,4 +75,13 @@ class FilterSet
 	{
 		return $this->sortColumn;
 	}
+
+	public function filterNonClients()
+	{
+		if (Module::get('runmode') === false)
+			return;
+		// Runmode module exists, add filter
+		$this->filters[] = new IsClientFilter(true);
+	}
+
 }