fixes #2962 - add RangeCheck filter

git-svn-id: http://dev.piwik.org/svn/trunk@6258 59fd770c-687e-43c8-a1e3-f5a4ff64c105

core/DataTable/Filter/RangeCheck.php

+<?php
+/**
+ * Piwik - Open source web analytics
+ * 
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ * @version $Id: RangeCheck.php 5791 2012-02-09 05:58:45Z matt $
+ * 
+ * @category Piwik
+ * @package Piwik
+ */
+
+/**
+ * Check range
+ *
+ * @package Piwik
+ * @subpackage Piwik_DataTable
+ */
+class Piwik_DataTable_Filter_RangeCheck extends Piwik_DataTable_Filter
+{
+	static public $minimumValue = 0.00;
+	static public $maximumValue = 100.0;
+
+	public function __construct( $table, $columnToFilter, $minimumValue, $maximum )
+	{
+		parent::__construct($table);
+
+		$this->columnToFilter = $columnToFilter;
+		self::$minimumValue = $minimumValue;
+		self::$maximumValue = $maximumValue;
+	}
+
+	public function filter($table)
+	{
+		foreach($table->getRows() as $row)
+		{
+			$value = $row->getColumn($this->columnToFilter);
+			if($value !== false)
+			{
+				if ($value < self::$minimumValue)
+				{
+					$row->setColumn($this->columnToFilter, self::$minimumValue);
+				}
+				elseif ($value > self::$maximumValue)
+				{
+					$row->setColumn($this->columnToFilter, self::$maximumValue);
+				}
+			}
+		}
+	}
+}

plugins/UserSettings/API.php

 <?php
 /**
  * Piwik - Open source web analytics
- * 
+ *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  * @version $Id$
- * 
+ *
  * @category Piwik_Plugins
  * @package Piwik_UserSettings
  */
@@ -16,12 +16,12 @@
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php';
 
 /**
- * The UserSettings API lets you access reports about your Visitors technical settings: browsers, browser types (rendering engine), 
+ * The UserSettings API lets you access reports about your Visitors technical settings: browsers, browser types (rendering engine),
  * operating systems, plugins supported in their browser, Screen resolution and Screen types (normal, widescreen, dual screen or mobile).
- *  
+ *
  * @package Piwik_UserSettings
  */
-class Piwik_UserSettings_API 
+class Piwik_UserSettings_API
 {
 	static private $instance = null;
 	static public function getInstance()
@@ -32,7 +32,7 @@ class Piwik_UserSettings_API
 		}
 		return self::$instance;
 	}
-	
+
 	protected function getDataTable($name, $idSite, $period, $date, $segment)
 	{
 		Piwik::checkUserHasViewAccess( $idSite );
@@ -65,7 +65,7 @@ class Piwik_UserSettings_API
 		$dataTable->queueFilter('ColumnCallbackReplace', array( 'label', 'Piwik_getOSLabel') );
 		return $dataTable;
 	}
-		
+
 	public function getBrowser( $idSite, $period, $date, $segment = false )
 	{
 		$dataTable = $this->getDataTable('UserSettings_browser', $idSite, $period, $date, $segment);
@@ -74,7 +74,7 @@ class Piwik_UserSettings_API
 		$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik_getBrowserLabel'));
 		return $dataTable;
 	}
-	
+
 	public function getBrowserType( $idSite, $period, $date, $segment = false )
 	{
 		$dataTable = $this->getDataTable('UserSettings_browserType', $idSite, $period, $date, $segment);
@@ -82,7 +82,7 @@ class Piwik_UserSettings_API
 		$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik_getBrowserTypeLabel'));
 		return $dataTable;
 	}
-	
+
 	public function getWideScreen( $idSite, $period, $date, $segment = false )
 	{
 		$dataTable = $this->getDataTable('UserSettings_wideScreen', $idSite, $period, $date, $segment);
@@ -90,7 +90,7 @@ class Piwik_UserSettings_API
 		$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'ucfirst'));
 		return $dataTable;
 	}
-	
+
 	public function getPlugin( $idSite, $period, $date, $segment = false )
 	{
 		// fetch all archive data required
@@ -109,17 +109,17 @@ class Piwik_UserSettings_API
 			$browserTypesArray 	= Array($browserTypes);
 			$visitSumsArray 	= Array($visitsSums);
 		}
-		
+
 		// walk through the results and calculate the percentage
 		foreach($tableArray as $key => $table) {
-			
+
 			// get according browserType table
 			foreach($browserTypesArray AS $k => $browsers) {
 				if($k == $key) {
 					$browserType = $browsers;
 				}
 			}
-			
+
 			// get according visitsSum
 			foreach($visitSumsArray AS $k => $visits) {
 				if($k == $key) {
@@ -130,26 +130,27 @@ class Piwik_UserSettings_API
 					}
 				}
 			}
-			
-			$ieStats		= $browserType->getRowFromLabel('ie');
 
-			$ieVisits 	= 0;
+			// Calculate percentage, but ignore IE users because plugin detection doesn't work on IE
+			$ieVisits = 0;
+
+			$ieStats = $browserType->getRowFromLabel('ie');
 			if($ieStats !== false)
 			{
 				$ieVisits = $ieStats->getColumn(Piwik_Archive::INDEX_NB_VISITS);
 			}
-			$visitsSum		= $visitsSumTotal - $ieVisits;
-		
-			// Calculate percentage, but ignore IE users because plugin detection doesn't work on IE
-			// The filter must be applied now so that the new column can 
-			// be sorted by the generic filters (applied right after this function exits)
+
+			$visitsSum = $visitsSumTotal - $ieVisits;
+
+			// The filter must be applied now so that the new column can
+			// be sorted by the generic filters (applied right after this loop exits)
 			$table->filter('ColumnCallbackAddColumnPercentage', array('nb_visits_percentage', Piwik_Archive::INDEX_NB_VISITS, $visitsSum, 1));
+			$table->filter('RangeCheck', array('nb_visits_percentage'));
 		}
-		
+
 		$dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'logo', 'Piwik_getPluginsLogo'));
 		$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'ucfirst'));
-		
+
 		return $dataTable;
 	}
-	
 }