Merge pull request #9478 from piwik/7213

Adds "Segmented Visitor Log" icon to more reports and subtables

plugins/DevicesDetection/API.php

@@ -96,6 +96,7 @@ class API extends \Piwik\Plugin\API
         $dataTable = $this->getDataTable('DevicesDetection_brands', $idSite, $period, $date, $segment);
         $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getDeviceBrandLabel'));
         $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getBrandLogo'));
+        $dataTable->filter('AddSegmentByLabel', array('deviceBrand'));
         return $dataTable;
     }
 

plugins/DevicesDetection/Columns/DeviceBrand.php

@@ -8,7 +8,9 @@
  */
 namespace Piwik\Plugins\DevicesDetection\Columns;
 
+use DeviceDetector\Parser\Device\DeviceParserAbstract;
 use Piwik\Piwik;
+use Piwik\Plugins\DevicesDetection\Segment;
 use Piwik\Tracker\Request;
 use Piwik\Tracker\Visitor;
 use Piwik\Tracker\Action;
@@ -23,6 +25,28 @@ class DeviceBrand extends Base
         return Piwik::translate('DevicesDetection_DeviceBrand');
     }
 
+    protected function configureSegments()
+    {
+        $brands = DeviceParserAbstract::$deviceBrands;
+        $brandList = implode(", ", $brands);
+
+        $segment = new Segment();
+        $segment->setSegment('deviceBrand');
+        $segment->setName('DevicesDetection_DeviceBrand');
+        $segment->setAcceptedValues($brandList);
+        $segment->setSqlFilter(function ($brand) use ($brandList, $brands) {
+            if ($brand == Piwik::translate('General_Unknown')) {
+                return '';
+            }
+            $index = array_search(trim(urldecode($brand)), $brands);
+            if ($index === false) {
+                throw new \Exception("deviceBrand segment must be one of: $brandList");
+            }
+            return $index;
+        });
+        $this->addSegment($segment);
+    }
+
     /**
      * @param Request $request
      * @param Visitor $visitor

plugins/DevicesDetection/functions.php

@@ -127,7 +127,7 @@ function getDeviceTypeLabel($label)
         'desktop'       => 'General_Desktop',
         'smartphone'    => 'DevicesDetection_Smartphone',
         'tablet'        => 'DevicesDetection_Tablet',
-        'phablet'        => 'DevicesDetection_Phablet',
+        'phablet'       => 'DevicesDetection_Phablet',
         'feature phone' => 'DevicesDetection_FeaturePhone',
         'console'       => 'DevicesDetection_Console',
         'tv'            => 'DevicesDetection_TV',

plugins/Referrers/API.php

@@ -106,6 +106,15 @@ class API extends \Piwik\Plugin\API
         // set subtable IDs for each row to the label (which holds the int referrer type)
         $dataTable->filter('Piwik\Plugins\Referrers\DataTable\Filter\SetGetReferrerTypeSubtables', array($idSite, $period, $date, $segment, $expanded));
 
+        $dataTable->filter('AddSegmentByLabelMapping', array(
+            'referrerType',
+            array(
+                Common::REFERRER_TYPE_DIRECT_ENTRY  => 'direct',
+                Common::REFERRER_TYPE_CAMPAIGN      => 'campaign',
+                Common::REFERRER_TYPE_SEARCH_ENGINE => 'search',
+                Common::REFERRER_TYPE_WEBSITE       => 'website',
+            )
+        ));
         // set referrer type column to readable value
         $dataTable->queueFilter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getReferrerTypeLabel'));
 
@@ -218,9 +227,12 @@ class API extends \Piwik\Plugin\API
     public function getSearchEnginesFromKeywordId($idSite, $period, $date, $idSubtable, $segment = false)
     {
         $dataTable = $this->getDataTable(Archiver::KEYWORDS_RECORD_NAME, $idSite, $period, $date, $segment, $expanded = false, $idSubtable);
+        $keywords  = $this->getKeywords($idSite, $period, $date, $segment);
+        $keyword   = $keywords->getRowFromIdSubDataTable($idSubtable)->getColumn('label');
 
-        $keywords = $this->getKeywords($idSite, $period, $date, $segment);
         $dataTable->filter('Piwik\Plugins\Referrers\DataTable\Filter\SearchEnginesFromKeywordId', array($keywords, $idSubtable));
+        $dataTable->filter('AddSegmentByLabel', array('referrerName'));
+        $dataTable->queueFilter('PrependSegment', array('referrerKeyword=='.$keyword.';referrerType==search;'));
 
         return $dataTable;
     }
@@ -250,8 +262,11 @@ class API extends \Piwik\Plugin\API
         // get the search engine and create the URL to the search result page
         $searchEngines = $this->getSearchEngines($idSite, $period, $date, $segment);
         $searchEngines->applyQueuedFilters();
+        $searchEngine  = $searchEngines->getRowFromIdSubDataTable($idSubtable)->getColumn('label');
 
         $dataTable->filter('Piwik\Plugins\Referrers\DataTable\Filter\KeywordsFromSearchEngineId', array($searchEngines, $idSubtable));
+        $dataTable->filter('AddSegmentByLabel', array('referrerKeyword'));
+        $dataTable->queueFilter('PrependSegment', array('referrerName=='.$searchEngine.';referrerType==search;'));
 
         return $dataTable;
     }
@@ -268,7 +283,13 @@ class API extends \Piwik\Plugin\API
 
     public function getKeywordsFromCampaignId($idSite, $period, $date, $idSubtable, $segment = false)
     {
+        $campaigns = $this->getCampaigns($idSite, $period, $date, $segment);
+        $campaigns->applyQueuedFilters();
+        $campaign  = $campaigns->getRowFromIdSubDataTable($idSubtable)->getColumn('label');
+
         $dataTable = $this->getDataTable(Archiver::CAMPAIGNS_RECORD_NAME, $idSite, $period, $date, $segment, $expanded = false, $idSubtable);
+        $dataTable->filter('AddSegmentByLabel', array('referrerKeyword'));
+        $dataTable->queueFilter('PrependSegment', array('referrerName=='.$campaign.';referrerType==campaign;'));
         return $dataTable;
     }
 
@@ -289,6 +310,7 @@ class API extends \Piwik\Plugin\API
     {
         $dataTable = $this->getDataTable(Archiver::WEBSITES_RECORD_NAME, $idSite, $period, $date, $segment, $expanded = false, $idSubtable);
         $dataTable->filter('Piwik\Plugins\Referrers\DataTable\Filter\UrlsFromWebsiteId');
+        $dataTable->filter('AddSegmentByLabel', array('referrerUrl'));
 
         return $dataTable;
     }
@@ -369,6 +391,7 @@ class API extends \Piwik\Plugin\API
         // merge the datatable's subtables which contain the individual URLs
         $dataTable = $dataTable->mergeSubtables();
 
+        $dataTable->filter('AddSegmentByLabel', array('referrerUrl'));
         $dataTable->filter('Piwik\Plugins\Referrers\DataTable\Filter\UrlsForSocial', array($expanded));
 
         return $dataTable;

plugins/Referrers/tests/System/expected/test_Referrers_getReferrerType__API.getProcessedReport_day.xml

@@ -874,249 +874,311 @@
 		<result prettyDate="Wednesday, February 3, 2010"/>
 		<result prettyDate="Thursday, February 4, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Friday, February 5, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Saturday, February 6, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Sunday, February 7, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Monday, February 8, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Tuesday, February 9, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Wednesday, February 10, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Thursday, February 11, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Friday, February 12, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Saturday, February 13, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Sunday, February 14, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Monday, February 15, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Tuesday, February 16, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Wednesday, February 17, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Thursday, February 18, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Friday, February 19, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Saturday, February 20, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Sunday, February 21, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Monday, February 22, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Tuesday, February 23, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Wednesday, February 24, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Thursday, February 25, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Friday, February 26, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Saturday, February 27, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Sunday, February 28, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Monday, March 1, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Tuesday, March 2, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Wednesday, March 3, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Thursday, March 4, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Friday, March 5, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Saturday, March 6, 2010">
 			<row>
+				<segment>referrerType==search</segment>
 				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
+				<segment>referrerType==website</segment>
 				<idsubdatatable>3</idsubdatatable>
 			</row>
 		</result>

tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php

@@ -73,6 +73,11 @@ class TwoVisitsWithCustomVariablesSegmentMatchNONETest extends SystemTestCase
             if ($segment == 'deviceType') {
                 $matchNone = $segment . '==car%20browser';
             }
+
+            if ($segment == 'deviceBrand') {
+                $matchNone = $segment . '==Yarvik';
+            }
+
             $segmentExpression[] = $matchNone;
         }
 

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml

+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>Unknown</row>
+</result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml

+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<nb_visits>35</nb_visits>
+	<nb_actions>95</nb_actions>
+	<nb_visits_converted>35</nb_visits_converted>
+	<bounce_count>18</bounce_count>
+	<sum_visit_length>27557</sum_visit_length>
+	<max_actions>5</max_actions>
+	<bounce_rate>51%</bounce_rate>
+	<nb_actions_per_visit>2.7</nb_actions_per_visit>
+	<avg_time_on_site>787</avg_time_on_site>
+</result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml

@@ -11,6 +11,7 @@
 		<sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo>
+		<segment>deviceBrand==Unknown</segment>
 	</row>
 	<row>
 		<label>HTC</label>
@@ -23,6 +24,7 @@
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/brand/HTC.ico</logo>
+		<segment>deviceBrand==HTC</segment>
 	</row>
 	<row>
 		<label>Apple</label>
@@ -35,6 +37,7 @@
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/brand/Apple.ico</logo>
+		<segment>deviceBrand==Apple</segment>
 	</row>
 	<row>
 		<label>Samsung</label>
@@ -47,5 +50,6 @@
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/brand/Samsung.ico</logo>
+		<segment>deviceBrand==Samsung</segment>
 	</row>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml

@@ -19,6 +19,7 @@
 		<sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==direct</segment>
 	</row>
 	<row>
 		<label>Websites</label>
@@ -38,6 +39,7 @@
 		<revenue>20</revenue>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<segment>referrerType==website</segment>
 		<subtable>
 			<row>
 				<label>example.com</label>

tests/PHPUnit/System/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml

@@ -10,6 +10,7 @@
 		<sum_visit_length>1441</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerName==Google;referrerType==search;referrerKeyword==%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</segment>
 		<url>http://google.com/search?q=%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</url>
 	</row>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml

@@ -10,5 +10,6 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo>
+		<segment>deviceBrand==Unknown</segment>
 	</row>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml

@@ -17,6 +17,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>1</revenue>
+		<segment>referrerType==search</segment>
 		<subtable>
 			<row>
 				<label>purchase</label>
@@ -55,6 +56,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>42</revenue>
+		<segment>referrerType==website</segment>
 		<subtable>
 			<row>
 				<label>referrer.com</label>

tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml

@@ -11,5 +11,6 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo>
+		<segment>deviceBrand==Unknown</segment>
 	</row>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml

@@ -18,6 +18,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>1</revenue>
+		<segment>referrerType==search</segment>
 		<subtable>
 			<row>
 				<label>purchase</label>
@@ -58,6 +59,7 @@
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>42</revenue>
+		<segment>referrerType==website</segment>
 		<subtable>
 			<row>
 				<label>referrer.com</label>

tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml

@@ -136,6 +136,13 @@
 		<segment>browserVersion</segment>
 		<acceptedValues>1.0, 8.0, etc.</acceptedValues>
 	</row>
+	<row>
+		<type>dimension</type>
+		<category>Visit</category>
+		<name>Device brand</name>
+		<segment>deviceBrand</segment>
+		<acceptedValues>3Q, Acer, Ainol, Airness, Alcatel, Altech UEC, Arnova, Amazon, Amoi, Apple, Archos, ARRIS, Airties, Asus, Avvio, Audiovox, Axxion, BBK, Becker, Bird, Beetel, Bmobile, Barnes &amp; Noble, BangOlufsen, BenQ, BenQ-Siemens, Blu, Boway, bq, Brondi, CUBOT, Casio, Cat, Celkon, ConCorde, Changhong, Cherry Mobile, Cricket, Crosscall, Compal, CnM, Crius Mea, CreNova, Capitel, Compaq, Coolpad, Cowon, Cube, Coby Kyros, Danew, Denver, Dbtel, DoCoMo, Dicam, Dell, DMM, Doogee, Doov, Dopod, Dune HD, E-Boda, Ericsson, ECS, Ezio, Elephone, Easypix, Ericy, eTouch, Evertek, Ezze, Fly, Fujitsu, Garmin-Asus, Gateway, Gemini, Gionee, Gigabyte, Gigaset, Google, Gradiente, Grundig, Haier, Hisense, Hi-Level, HP, HTC, Huawei, Humax, Hyrican, Hyundai, Ikea, iBall, i-Joy, iBerry, iKoMo, i-mate, Infinix, Innostream, Inkti, Intex, i-mobile, INQ, Intek, Inverto, iTel, Jiayu, Jolla, Karbonn, KDDI, Kingsun, Konka, Komu, K-Touch, KT-Tech, Kyocera, Kazam, Lava, Lanix, LCT, Lenovo, Lenco, Le Pan, LG, Loewe, Logicom, Lexibook, Manta Multimedia, Mobistel, Medion, Meizu, Metz, MEU, MicroMax, Mediacom, MediaTek, Mio, Mpman, Motorola, Microsoft, MSI, Memup, Mitsubishi, MLLED, M.T.T., MyPhone, NEC, Netgear, NGM, Nintendo, Nokia, Nikon, Newgen, Nexian, Onda, OnePlus, OPPO, Orange, O2, OUYA, Opsson, Panasonic, PEAQ, Philips, Polaroid, Palm, phoneOne, Pantech, Point of View, PolyPad, Positivo, Prestigio, ProScan, PULID, Qilive, Qtek, Quechua, Overmax, Oysters, Ramos, RCA Tablets, Rikomagic, RIM, Roku, Rover, Samsung, Sega, Sony Ericsson, Sencor, Softbank, SFR, Sagem, Sharp, Siemens, Sendo, Skyworth, Smartfren, Sony, Spice, SuperSonic, Selevision, Sanyo, Symphony, Smart, Storex, Stonex, Sumvision, Tesla, TCL, Telit, TiPhone, Tecno Mobile, Tesco, TIANYU, Telefunken, Telenor, T-Mobile, Thomson, Tolino, Toplux, Toshiba, TechnoTrend, Trevi, Tunisie Telecom, Turbo-X, TVC, TechniSat, teXet, Unowhy, UTStarcom, Videocon, Vertu, Vitelcom, VK Mobile, ViewSonic, Vestel, Vivo, Voxtel, Vodafone, Vizio, Videoweb, Walton, Web TV, WellcoM, Wexler, Wiko, Wolder, Wonu, Woxter, Xiaomi, Xolo, Unknown, Yarvik, Yuandao, Yusun, Zonda, Zopo, ZTE</acceptedValues>
+	</row>
 	<row>
 		<type>dimension</type>
 		<category>Visit</category>

tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml

@@ -10,6 +10,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>referrerUrl==http%3A%2F%2Ffacebook.com%2Fwhatever</segment>
 		<url>http://facebook.com/whatever</url>
 	</row>
 	<row>
@@ -22,6 +23,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>referrerUrl==http%3A%2F%2Ffb.me%2F%3Fq%3Dsdlfjs%26n%3Dslfjsd</segment>
 		<url>http://fb.me/?q=sdlfjs&amp;n=slfjsd</url>
 	</row>
 	<row>
@@ -34,6 +36,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<segment>referrerUrl==http%3A%2F%2Fwww.facebook.com%2Fanother%2Fpath</segment>
 		<url>http://www.facebook.com/another/path</url>
 	</row>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml

@@ -11,6 +11,7 @@
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerUrl==http%3A%2F%2Ffacebook.com%2Fwhatever</segment>
 			<url>http://facebook.com/whatever</url>
 		</row>
 		<row>
@@ -23,6 +24,7 @@
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerUrl==http%3A%2F%2Ffb.me%2F%3Fq%3Dsdlfjs%26n%3Dslfjsd</segment>
 			<url>http://fb.me/?q=sdlfjs&amp;n=slfjsd</url>
 		</row>
 		<row>
@@ -35,6 +37,7 @@
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerUrl==http%3A%2F%2Fmixi.jp</segment>
 			<url>http://mixi.jp</url>
 		</row>
 		<row>
@@ -47,6 +50,7 @@
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerUrl==http%3A%2F%2Fskyrock.com</segment>
 			<url>http://skyrock.com</url>
 		</row>
 		<row>
@@ -59,6 +63,7 @@
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerUrl==http%3A%2F%2Ft.co%2Fid%2F%3Fy%3Ddsfs</segment>
 			<url>http://t.co/id/?y=dsfs</url>
 		</row>
 		<row>
@@ -71,6 +76,7 @@
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerUrl==http%3A%2F%2Ftwitter.com%2Fwhatever2</segment>
 			<url>http://twitter.com/whatever2</url>
 		</row>
 		<row>
@@ -83,6 +89,7 @@
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerUrl==http%3A%2F%2Fwww.facebook.com%2Fanother%2Fpath</segment>
 			<url>http://www.facebook.com/another/path</url>
 		</row>
 		<row>
@@ -95,6 +102,7 @@
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerUrl==http%3A%2F%2Fwww.flickr.com</segment>
 			<url>http://www.flickr.com</url>
 		</row>
 		<row>
@@ -107,6 +115,7 @@
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerUrl==http%3A%2F%2Fwww.twitter.com%2Findex%3Fa%3D2334</segment>
 			<url>http://www.twitter.com/index?a=2334</url>
 		</row>
 		<row>
@@ -119,6 +128,7 @@
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerUrl==http%3A%2F%2Fxanga.com</segment>
 			<url>http://xanga.com</url>
 		</row>
 	</result>
@@ -133,6 +143,7 @@
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerUrl==http%3A%2F%2Ft.co%2Fid%2F%3Fy%3Ddsfs</segment>
 			<url>http://t.co/id/?y=dsfs</url>
 		</row>
 		<row>
@@ -145,6 +156,7 @@
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerUrl==http%3A%2F%2Ftwitter.com%2Fwhatever2</segment>
 			<url>http://twitter.com/whatever2</url>
 		</row>
 		<row>
@@ -157,6 +169,7 @@
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			<sum_daily_nb_users>0</sum_daily_nb_users>
+			<segment>referrerUrl==http%3A%2F%2Fwww.facebook.com%2Fanother%2Fpath</segment>
 			<url>http://www.facebook.com/another/path</url>
 		</row>
 	</result>

tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml

@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>55</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==direct</segment>
 	</row>
 	<row>
 		<label>Search Engines</label>
@@ -21,6 +22,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>12</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==search</segment>
 		<subtable>
 			<row>
 				<label>search term 2</label>
@@ -67,6 +69,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>8</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==website</segment>
 		<subtable>
 			<row>
 				<label>whatever0.com</label>

tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml

@@ -10,6 +10,7 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>55</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
+		<segment>referrerType==direct</segment>
 	</row>
 	<row>
 		<label>Search Engines - Others</label>