From 6ad8083c6ad550cb04d346149f7a684e3347bdbb Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Fri, 6 Sep 2013 15:24:57 +1200
Subject: [PATCH] fixing typos REFERRER
---
core/Common.php | 8 ++++----
core/Tracker/GoalManager.php | 6 +++---
core/Tracker/Referrer.php | 12 +++++------
plugins/Referers/API.php | 10 +++++-----
plugins/Referers/Archiver.php | 26 ++++++++++++------------
plugins/Referers/Controller.php | 26 ++++++++++++------------
plugins/Referers/Referers.php | 14 ++++++-------
plugins/Referers/functions.php | 16 +++++++--------
plugins/Transitions/API.php | 32 +++++++++++++++---------------
tests/PHPUnit/Core/SegmentTest.php | 4 ++--
10 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/core/Common.php b/core/Common.php
index 9b7373ef2c..0f71597b0e 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -31,10 +31,10 @@ class Common
/**
* Const used to map the referer type to an integer in the log_visit table
*/
- const REFERER_TYPE_DIRECT_ENTRY = 1;
- const REFERER_TYPE_SEARCH_ENGINE = 2;
- const REFERER_TYPE_WEBSITE = 3;
- const REFERER_TYPE_CAMPAIGN = 6;
+ const REFERRER_TYPE_DIRECT_ENTRY = 1;
+ const REFERRER_TYPE_SEARCH_ENGINE = 2;
+ const REFERRER_TYPE_WEBSITE = 3;
+ const REFERRER_TYPE_CAMPAIGN = 6;
/**
* Flag used with htmlspecialchar
diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php
index bc9d3d3f29..cca7e90887 100644
--- a/core/Tracker/GoalManager.php
+++ b/core/Tracker/GoalManager.php
@@ -297,13 +297,13 @@ class GoalManager
// 0) In some (unknown!?) cases the campaign is not found in the attribution cookie, but the URL ref was found.
// In this case we look up if the current visit is credited to a campaign and will credit this campaign rather than the URL ref (since campaigns have higher priority)
if (empty($refererCampaignName)
- && $type == Common::REFERER_TYPE_CAMPAIGN
+ && $type == Common::REFERRER_TYPE_CAMPAIGN
&& !empty($name)
) {
// Use default values per above
} // 1) Campaigns from 1st party cookie
elseif (!empty($refererCampaignName)) {
- $type = Common::REFERER_TYPE_CAMPAIGN;
+ $type = Common::REFERRER_TYPE_CAMPAIGN;
$name = $refererCampaignName;
$keyword = $refererCampaignKeyword;
$time = $refererTimestamp;
@@ -313,7 +313,7 @@ class GoalManager
$referrer = $referrer->getRefererInformation($refererUrl, $currentUrl = '', $idSite);
// if the parsed referer is interesting enough, ie. website or search engine
- if (in_array($referrer['referer_type'], array(Common::REFERER_TYPE_SEARCH_ENGINE, Common::REFERER_TYPE_WEBSITE))) {
+ if (in_array($referrer['referer_type'], array(Common::REFERRER_TYPE_SEARCH_ENGINE, Common::REFERRER_TYPE_WEBSITE))) {
$type = $referrer['referer_type'];
$name = $referrer['referer_name'];
$keyword = $referrer['referer_keyword'];
diff --git a/core/Tracker/Referrer.php b/core/Tracker/Referrer.php
index 49cfd158fb..bd30880432 100644
--- a/core/Tracker/Referrer.php
+++ b/core/Tracker/Referrer.php
@@ -78,7 +78,7 @@ class Referrer
$this->refererUrl = $refererUrl;
$this->refererUrlParse = @parse_url($this->refererUrl);
$this->currentUrlParse = @parse_url($currentUrl);
- $this->typeRefererAnalyzed = Common::REFERER_TYPE_DIRECT_ENTRY;
+ $this->typeRefererAnalyzed = Common::REFERRER_TYPE_DIRECT_ENTRY;
$this->nameRefererAnalyzed = '';
$this->keywordRefererAnalyzed = '';
$this->refererHost = '';
@@ -106,7 +106,7 @@ class Referrer
if (!empty($this->refererHost)
&& !$refererDetected
) {
- $this->typeRefererAnalyzed = Common::REFERER_TYPE_WEBSITE;
+ $this->typeRefererAnalyzed = Common::REFERRER_TYPE_WEBSITE;
$this->nameRefererAnalyzed = mb_strtolower($this->refererHost, 'UTF-8');
}
@@ -131,7 +131,7 @@ class Referrer
if ($searchEngineInformation === false) {
return false;
}
- $this->typeRefererAnalyzed = Common::REFERER_TYPE_SEARCH_ENGINE;
+ $this->typeRefererAnalyzed = Common::REFERRER_TYPE_SEARCH_ENGINE;
$this->nameRefererAnalyzed = $searchEngineInformation['name'];
$this->keywordRefererAnalyzed = $searchEngineInformation['keywords'];
return true;
@@ -151,7 +151,7 @@ class Referrer
}
if (!empty($campaignName)) {
- $this->typeRefererAnalyzed = Common::REFERER_TYPE_CAMPAIGN;
+ $this->typeRefererAnalyzed = Common::REFERRER_TYPE_CAMPAIGN;
$this->nameRefererAnalyzed = $campaignName;
foreach ($this->campaignKeywords as $campaignKeywordParameter) {
@@ -243,12 +243,12 @@ class Referrer
if (isset($this->currentUrlParse['host'])) {
$currentHost = mb_strtolower($this->currentUrlParse['host'], 'UTF-8');
if ($currentHost == mb_strtolower($this->refererHost, 'UTF-8')) {
- $this->typeRefererAnalyzed = Common::REFERER_TYPE_DIRECT_ENTRY;
+ $this->typeRefererAnalyzed = Common::REFERRER_TYPE_DIRECT_ENTRY;
return true;
}
}
if (Visit::isHostKnownAliasHost($this->refererHost, $this->idsite)) {
- $this->typeRefererAnalyzed = Common::REFERER_TYPE_DIRECT_ENTRY;
+ $this->typeRefererAnalyzed = Common::REFERRER_TYPE_DIRECT_ENTRY;
return true;
}
}
diff --git a/plugins/Referers/API.php b/plugins/Referers/API.php
index 1c3e5b3793..8bdc379a42 100644
--- a/plugins/Referers/API.php
+++ b/plugins/Referers/API.php
@@ -88,13 +88,13 @@ class API
if ($idSubtable !== false) {
$result = false;
switch ($idSubtable) {
- case Common::REFERER_TYPE_SEARCH_ENGINE:
+ case Common::REFERRER_TYPE_SEARCH_ENGINE:
$result = $this->getKeywords($idSite, $period, $date, $segment);
break;
- case Common::REFERER_TYPE_WEBSITE:
+ case Common::REFERRER_TYPE_WEBSITE:
$result = $this->getWebsites($idSite, $period, $date, $segment);
break;
- case Common::REFERER_TYPE_CAMPAIGN:
+ case Common::REFERRER_TYPE_CAMPAIGN:
$result = $this->getCampaigns($idSite, $period, $date, $segment);
break;
default: // invalid idSubtable, return whole report
@@ -107,7 +107,7 @@ class API
}
// get visits by referrer type
- $dataTable = $this->getDataTable(Archiver::REFERER_TYPE_RECORD_NAME, $idSite, $period, $date, $segment);
+ $dataTable = $this->getDataTable(Archiver::REFERRER_TYPE_RECORD_NAME, $idSite, $period, $date, $segment);
if ($typeReferer !== false) // filter for a specific referrer type
{
@@ -516,7 +516,7 @@ class API
{
foreach ($dataTable->getRows() as $row) {
$typeReferrer = $row->getColumn('label');
- if ($typeReferrer != Common::REFERER_TYPE_DIRECT_ENTRY) {
+ if ($typeReferrer != Common::REFERRER_TYPE_DIRECT_ENTRY) {
if (!$expanded) // if we don't want the expanded datatable, then don't do any extra queries
{
$row->c[Row::DATATABLE_ASSOCIATED] = $typeReferrer;
diff --git a/plugins/Referers/Archiver.php b/plugins/Referers/Archiver.php
index f883b53e2a..466a546818 100644
--- a/plugins/Referers/Archiver.php
+++ b/plugins/Referers/Archiver.php
@@ -25,7 +25,7 @@ class Archiver extends PluginsArchiver
const KEYWORDS_RECORD_NAME = 'Referers_searchEngineByKeyword';
const CAMPAIGNS_RECORD_NAME = 'Referers_keywordByCampaign';
const WEBSITES_RECORD_NAME = 'Referers_urlByWebsite';
- const REFERER_TYPE_RECORD_NAME = 'Referers_type';
+ const REFERRER_TYPE_RECORD_NAME = 'Referers_type';
const METRIC_DISTINCT_SEARCH_ENGINE_RECORD_NAME = 'Referers_distinctSearchEngines';
const METRIC_DISTINCT_KEYWORD_RECORD_NAME = 'Referers_distinctKeywords';
const METRIC_DISTINCT_CAMPAIGN_RECORD_NAME = 'Referers_distinctCampaigns';
@@ -64,7 +64,7 @@ class Archiver extends PluginsArchiver
protected function getRecordNames()
{
return array(
- self::REFERER_TYPE_RECORD_NAME,
+ self::REFERRER_TYPE_RECORD_NAME,
self::KEYWORDS_RECORD_NAME,
self::SEARCH_ENGINES_RECORD_NAME,
self::WEBSITES_RECORD_NAME,
@@ -83,14 +83,14 @@ class Archiver extends PluginsArchiver
protected function makeRefererTypeNonEmpty(&$row)
{
if (empty($row['referer_type'])) {
- $row['referer_type'] = Common::REFERER_TYPE_DIRECT_ENTRY;
+ $row['referer_type'] = Common::REFERRER_TYPE_DIRECT_ENTRY;
}
}
protected function aggregateVisit($row)
{
switch ($row['referer_type']) {
- case Common::REFERER_TYPE_SEARCH_ENGINE:
+ case Common::REFERRER_TYPE_SEARCH_ENGINE:
if (empty($row['referer_keyword'])) {
$row['referer_keyword'] = API::LABEL_KEYWORD_NOT_DEFINED;
}
@@ -102,7 +102,7 @@ class Archiver extends PluginsArchiver
$keywordsDataArray->sumMetricsVisitsPivot($row['referer_keyword'], $row['referer_name'], $row);
break;
- case Common::REFERER_TYPE_WEBSITE:
+ case Common::REFERRER_TYPE_WEBSITE:
$this->getDataArray(self::WEBSITES_RECORD_NAME)->sumMetricsVisits($row['referer_name'], $row);
$this->getDataArray(self::WEBSITES_RECORD_NAME)->sumMetricsVisitsPivot($row['referer_name'], $row['referer_url'], $row);
@@ -112,14 +112,14 @@ class Archiver extends PluginsArchiver
}
break;
- case Common::REFERER_TYPE_CAMPAIGN:
+ case Common::REFERRER_TYPE_CAMPAIGN:
if (!empty($row['referer_keyword'])) {
$this->getDataArray(self::CAMPAIGNS_RECORD_NAME)->sumMetricsVisitsPivot($row['referer_name'], $row['referer_keyword'], $row);
}
$this->getDataArray(self::CAMPAIGNS_RECORD_NAME)->sumMetricsVisits($row['referer_name'], $row);
break;
- case Common::REFERER_TYPE_DIRECT_ENTRY:
+ case Common::REFERRER_TYPE_DIRECT_ENTRY:
// direct entry are aggregated below in $this->metricsByType array
break;
@@ -127,7 +127,7 @@ class Archiver extends PluginsArchiver
throw new Exception("Non expected referer_type = " . $row['referer_type']);
break;
}
- $this->getDataArray(self::REFERER_TYPE_RECORD_NAME)->sumMetricsVisits($row['referer_type'], $row);
+ $this->getDataArray(self::REFERRER_TYPE_RECORD_NAME)->sumMetricsVisits($row['referer_type'], $row);
}
/**
@@ -149,7 +149,7 @@ class Archiver extends PluginsArchiver
$skipAggregateByType = $this->aggregateConversion($row);
if (!$skipAggregateByType) {
- $this->getDataArray(self::REFERER_TYPE_RECORD_NAME)->sumMetricsGoals($row['referer_type'], $row);
+ $this->getDataArray(self::REFERRER_TYPE_RECORD_NAME)->sumMetricsGoals($row['referer_type'], $row);
}
}
@@ -163,7 +163,7 @@ class Archiver extends PluginsArchiver
{
$skipAggregateByType = false;
switch ($row['referer_type']) {
- case Common::REFERER_TYPE_SEARCH_ENGINE:
+ case Common::REFERRER_TYPE_SEARCH_ENGINE:
if (empty($row['referer_keyword'])) {
$row['referer_keyword'] = API::LABEL_KEYWORD_NOT_DEFINED;
}
@@ -172,18 +172,18 @@ class Archiver extends PluginsArchiver
$this->getDataArray(self::KEYWORDS_RECORD_NAME)->sumMetricsGoals($row['referer_keyword'], $row);
break;
- case Common::REFERER_TYPE_WEBSITE:
+ case Common::REFERRER_TYPE_WEBSITE:
$this->getDataArray(self::WEBSITES_RECORD_NAME)->sumMetricsGoals($row['referer_name'], $row);
break;
- case Common::REFERER_TYPE_CAMPAIGN:
+ case Common::REFERRER_TYPE_CAMPAIGN:
if (!empty($row['referer_keyword'])) {
$this->getDataArray(self::CAMPAIGNS_RECORD_NAME)->sumMetricsGoalsPivot($row['referer_name'], $row['referer_keyword'], $row);
}
$this->getDataArray(self::CAMPAIGNS_RECORD_NAME)->sumMetricsGoals($row['referer_name'], $row);
break;
- case Common::REFERER_TYPE_DIRECT_ENTRY:
+ case Common::REFERRER_TYPE_DIRECT_ENTRY:
// Direct entry, no sub dimension
break;
diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php
index 536cd071dc..9641f3bd5c 100644
--- a/plugins/Referers/Controller.php
+++ b/plugins/Referers/Controller.php
@@ -29,7 +29,7 @@ class Controller extends \Piwik\Controller
{
$view = new View('@Referers/index');
- $view->graphEvolutionReferers = $this->getEvolutionGraph(true, Common::REFERER_TYPE_DIRECT_ENTRY, array('nb_visits'));
+ $view->graphEvolutionReferers = $this->getEvolutionGraph(true, Common::REFERRER_TYPE_DIRECT_ENTRY, array('nb_visits'));
$view->nameGraphEvolutionReferers = 'Referers.getEvolutionGraph';
// building the referers summary report
@@ -75,10 +75,10 @@ class Controller extends \Piwik\Controller
}
// sparkline for the historical data of the above values
- $view->urlSparklineSearchEngines = $this->getReferrerUrlSparkline(Common::REFERER_TYPE_SEARCH_ENGINE);
- $view->urlSparklineDirectEntry = $this->getReferrerUrlSparkline(Common::REFERER_TYPE_DIRECT_ENTRY);
- $view->urlSparklineWebsites = $this->getReferrerUrlSparkline(Common::REFERER_TYPE_WEBSITE);
- $view->urlSparklineCampaigns = $this->getReferrerUrlSparkline(Common::REFERER_TYPE_CAMPAIGN);
+ $view->urlSparklineSearchEngines = $this->getReferrerUrlSparkline(Common::REFERRER_TYPE_SEARCH_ENGINE);
+ $view->urlSparklineDirectEntry = $this->getReferrerUrlSparkline(Common::REFERRER_TYPE_DIRECT_ENTRY);
+ $view->urlSparklineWebsites = $this->getReferrerUrlSparkline(Common::REFERRER_TYPE_WEBSITE);
+ $view->urlSparklineCampaigns = $this->getReferrerUrlSparkline(Common::REFERRER_TYPE_CAMPAIGN);
// sparklines for the evolution of the distinct keywords count/websites count/ etc
$view->urlSparklineDistinctSearchEngines = $this->getUrlSparkline('getLastDistinctSearchEnginesGraph');
@@ -236,10 +236,10 @@ class Controller extends \Piwik\Controller
"Referers.getRefererType", array('disable_queued_filters' => '1', 'date' => $date));
$nameToColumnId = array(
- 'visitorsFromSearchEngines' => Common::REFERER_TYPE_SEARCH_ENGINE,
- 'visitorsFromDirectEntry' => Common::REFERER_TYPE_DIRECT_ENTRY,
- 'visitorsFromWebsites' => Common::REFERER_TYPE_WEBSITE,
- 'visitorsFromCampaigns' => Common::REFERER_TYPE_CAMPAIGN,
+ 'visitorsFromSearchEngines' => Common::REFERRER_TYPE_SEARCH_ENGINE,
+ 'visitorsFromDirectEntry' => Common::REFERRER_TYPE_DIRECT_ENTRY,
+ 'visitorsFromWebsites' => Common::REFERRER_TYPE_WEBSITE,
+ 'visitorsFromCampaigns' => Common::REFERRER_TYPE_CAMPAIGN,
);
$return = array();
foreach ($nameToColumnId as $nameVar => $columnId) {
@@ -254,10 +254,10 @@ class Controller extends \Piwik\Controller
}
protected $referrerTypeToLabel = array(
- Common::REFERER_TYPE_DIRECT_ENTRY => 'Referers_DirectEntry',
- Common::REFERER_TYPE_SEARCH_ENGINE => 'Referers_SearchEngines',
- Common::REFERER_TYPE_WEBSITE => 'Referers_Websites',
- Common::REFERER_TYPE_CAMPAIGN => 'Referers_Campaigns',
+ Common::REFERRER_TYPE_DIRECT_ENTRY => 'Referers_DirectEntry',
+ Common::REFERRER_TYPE_SEARCH_ENGINE => 'Referers_SearchEngines',
+ Common::REFERRER_TYPE_WEBSITE => 'Referers_Websites',
+ Common::REFERRER_TYPE_CAMPAIGN => 'Referers_Campaigns',
);
public function getEvolutionGraph($fetch = false, $typeReferer = false, array $columns = array())
diff --git a/plugins/Referers/Referers.php b/plugins/Referers/Referers.php
index 5f6451548b..66a7b853d5 100644
--- a/plugins/Referers/Referers.php
+++ b/plugins/Referers/Referers.php
@@ -315,13 +315,13 @@ class Referers extends \Piwik\Plugin
$idSubtable = Common::getRequestVar('idSubtable', false);
$labelColumnTitle = Piwik_Translate('Referers_ColumnRefererType');
switch ($idSubtable) {
- case Common::REFERER_TYPE_SEARCH_ENGINE:
+ case Common::REFERRER_TYPE_SEARCH_ENGINE:
$labelColumnTitle = Piwik_Translate('Referers_ColumnSearchEngine');
break;
- case Common::REFERER_TYPE_WEBSITE:
+ case Common::REFERRER_TYPE_WEBSITE:
$labelColumnTitle = Piwik_Translate('Referers_ColumnWebsite');
break;
- case Common::REFERER_TYPE_CAMPAIGN:
+ case Common::REFERRER_TYPE_CAMPAIGN:
$labelColumnTitle = Piwik_Translate('Referers_ColumnCampaign');
break;
default:
@@ -517,16 +517,16 @@ class Referers extends \Piwik\Plugin
// get singular label for referrer type
$indexTranslation = '';
switch ($referrerType) {
- case Common::REFERER_TYPE_DIRECT_ENTRY:
+ case Common::REFERRER_TYPE_DIRECT_ENTRY:
$indexTranslation = 'Referers_DirectEntry';
break;
- case Common::REFERER_TYPE_SEARCH_ENGINE:
+ case Common::REFERRER_TYPE_SEARCH_ENGINE:
$indexTranslation = 'Referers_ColumnKeyword';
break;
- case Common::REFERER_TYPE_WEBSITE:
+ case Common::REFERRER_TYPE_WEBSITE:
$indexTranslation = 'Referers_ColumnWebsite';
break;
- case Common::REFERER_TYPE_CAMPAIGN:
+ case Common::REFERRER_TYPE_CAMPAIGN:
$indexTranslation = 'Referers_ColumnCampaign';
break;
default:
diff --git a/plugins/Referers/functions.php b/plugins/Referers/functions.php
index edac8f3c5f..930be01b7e 100644
--- a/plugins/Referers/functions.php
+++ b/plugins/Referers/functions.php
@@ -220,16 +220,16 @@ function getRefererTypeLabel($label)
{
$indexTranslation = '';
switch ($label) {
- case Common::REFERER_TYPE_DIRECT_ENTRY:
+ case Common::REFERRER_TYPE_DIRECT_ENTRY:
$indexTranslation = 'Referers_DirectEntry';
break;
- case Common::REFERER_TYPE_SEARCH_ENGINE:
+ case Common::REFERRER_TYPE_SEARCH_ENGINE:
$indexTranslation = 'Referers_SearchEngines';
break;
- case Common::REFERER_TYPE_WEBSITE:
+ case Common::REFERRER_TYPE_WEBSITE:
$indexTranslation = 'Referers_Websites';
break;
- case Common::REFERER_TYPE_CAMPAIGN:
+ case Common::REFERRER_TYPE_CAMPAIGN:
$indexTranslation = 'Referers_Campaigns';
break;
default:
@@ -249,10 +249,10 @@ function getRefererTypeLabel($label)
function getRefererTypeFromShortName($name)
{
$map = array(
- Common::REFERER_TYPE_SEARCH_ENGINE => 'search',
- Common::REFERER_TYPE_WEBSITE => 'website',
- Common::REFERER_TYPE_DIRECT_ENTRY => 'direct',
- Common::REFERER_TYPE_CAMPAIGN => 'campaign',
+ Common::REFERRER_TYPE_SEARCH_ENGINE => 'search',
+ Common::REFERRER_TYPE_WEBSITE => 'website',
+ Common::REFERRER_TYPE_DIRECT_ENTRY => 'direct',
+ Common::REFERRER_TYPE_CAMPAIGN => 'campaign',
);
if (isset($map[$name])) {
return $map[$name];
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
index e019005aed..05b3f3244c 100644
--- a/plugins/Transitions/API.php
+++ b/plugins/Transitions/API.php
@@ -361,18 +361,18 @@ class API
$rankingQuery->addLabelColumn('referrer_data');
$selects = array(
'CASE log_visit.referer_type
- WHEN ' . Common::REFERER_TYPE_DIRECT_ENTRY . ' THEN \'\'
- WHEN ' . Common::REFERER_TYPE_SEARCH_ENGINE . ' THEN log_visit.referer_keyword
- WHEN ' . Common::REFERER_TYPE_WEBSITE . ' THEN log_visit.referer_url
- WHEN ' . Common::REFERER_TYPE_CAMPAIGN . ' THEN CONCAT(log_visit.referer_name, \' \', log_visit.referer_keyword)
+ WHEN ' . Common::REFERRER_TYPE_DIRECT_ENTRY . ' THEN \'\'
+ WHEN ' . Common::REFERRER_TYPE_SEARCH_ENGINE . ' THEN log_visit.referer_keyword
+ WHEN ' . Common::REFERRER_TYPE_WEBSITE . ' THEN log_visit.referer_url
+ WHEN ' . Common::REFERRER_TYPE_CAMPAIGN . ' THEN CONCAT(log_visit.referer_name, \' \', log_visit.referer_keyword)
END AS `referrer_data`');
// get one limited group per referrer type
$rankingQuery->partitionResultIntoMultipleGroups('referer_type', array(
- Common::REFERER_TYPE_DIRECT_ENTRY,
- Common::REFERER_TYPE_SEARCH_ENGINE,
- Common::REFERER_TYPE_WEBSITE,
- Common::REFERER_TYPE_CAMPAIGN
+ Common::REFERRER_TYPE_DIRECT_ENTRY,
+ Common::REFERRER_TYPE_SEARCH_ENGINE,
+ Common::REFERRER_TYPE_WEBSITE,
+ Common::REFERRER_TYPE_CAMPAIGN
));
$type = $this->getColumnTypeSuffix($actionType);
@@ -386,12 +386,12 @@ class API
foreach ($data as $referrerType => &$subData) {
$referrerData[$referrerType] = array(Metrics::INDEX_NB_VISITS => 0);
- if ($referrerType != Common::REFERER_TYPE_DIRECT_ENTRY) {
+ if ($referrerType != Common::REFERRER_TYPE_DIRECT_ENTRY) {
$referrerSubData[$referrerType] = array();
}
foreach ($subData as &$row) {
- if ($referrerType == Common::REFERER_TYPE_SEARCH_ENGINE && empty($row['referrer_data'])) {
+ if ($referrerType == Common::REFERRER_TYPE_SEARCH_ENGINE && empty($row['referrer_data'])) {
$row['referrer_data'] = \Piwik\Plugins\Referers\API::LABEL_KEYWORD_NOT_DEFINED;
}
@@ -598,8 +598,8 @@ class API
// causes an exception.
if (count($report['referrers']) == 0) {
$report['referrers'][] = array(
- 'label' => $this->getReferrerLabel(Common::REFERER_TYPE_DIRECT_ENTRY),
- 'shortName' => \Piwik\Plugins\Referers\getRefererTypeLabel(Common::REFERER_TYPE_DIRECT_ENTRY),
+ 'label' => $this->getReferrerLabel(Common::REFERRER_TYPE_DIRECT_ENTRY),
+ 'shortName' => \Piwik\Plugins\Referers\getRefererTypeLabel(Common::REFERRER_TYPE_DIRECT_ENTRY),
'visits' => 0
);
}
@@ -608,13 +608,13 @@ class API
private function getReferrerLabel($referrerId)
{
switch ($referrerId) {
- case Common::REFERER_TYPE_DIRECT_ENTRY:
+ case Common::REFERRER_TYPE_DIRECT_ENTRY:
return Controller::getTranslation('directEntries');
- case Common::REFERER_TYPE_SEARCH_ENGINE:
+ case Common::REFERRER_TYPE_SEARCH_ENGINE:
return Controller::getTranslation('fromSearchEngines');
- case Common::REFERER_TYPE_WEBSITE:
+ case Common::REFERRER_TYPE_WEBSITE:
return Controller::getTranslation('fromWebsites');
- case Common::REFERER_TYPE_CAMPAIGN:
+ case Common::REFERRER_TYPE_CAMPAIGN:
return Controller::getTranslation('fromCampaigns');
default:
return Piwik_Translate('General_Others');
diff --git a/tests/PHPUnit/Core/SegmentTest.php b/tests/PHPUnit/Core/SegmentTest.php
index 110880bc12..15ff24173d 100644
--- a/tests/PHPUnit/Core/SegmentTest.php
+++ b/tests/PHPUnit/Core/SegmentTest.php
@@ -64,8 +64,8 @@ class SegmentTest extends PHPUnit_Framework_TestCase
// OR, with 2 value rewrites
array('referrerType==search,referrerType==direct', array(
'where' => ' (log_visit.referer_type = ? OR log_visit.referer_type = ? )',
- 'bind' => array(Common::REFERER_TYPE_SEARCH_ENGINE,
- Common::REFERER_TYPE_DIRECT_ENTRY))),
+ 'bind' => array(Common::REFERRER_TYPE_SEARCH_ENGINE,
+ Common::REFERRER_TYPE_DIRECT_ENTRY))),
// IS NOT NULL
array('browserCode==ff;referrerKeyword!=', array(
--
GitLab