Fixes #2475

* Campaign will now be tracked when the campaign name/keywords parameters are found in the fragment / hash tag For example example.org/bla?hello=world#pk_campaign=CAMPAIGN&utm_term=KEYWORD will be tracked as visit from campaign CAMPAIGN and keyword KEYWORD * Updated tests git-svn-id: http://dev.piwik.org/svn/trunk@5825 59fd770c-687e-43c8-a1e3-f5a4ff64c105

Fixes #2475
3e2b7f76 · mattpiwik · fc928aac · 3e2b7f76 · 3e2b7f76 · 3e2b7f76
--- a/core/Tracker/Visit.php
+++ b/core/Tracker/Visit.php
@@ -1427,45 +1427,66 @@ class Piwik_Tracker_Visit_Referer
 		return true;
 	}
-	/*
+	protected function detectCampaignFromString($string)
-	 * Campaign analysis
-	 */
-	protected function detectRefererCampaign()
 	{
-		if(isset($this->currentUrlParse['query']))
+		foreach($this->campaignNames as $campaignNameParameter)
 		{
-			$campaignParameters = Piwik_Common::getCampaignParameters();
+			$campaignName = trim(urldecode(Piwik_Common::getParameterFromQueryString($string, $campaignNameParameter)));
+			if( !empty($campaignName))
-			$campaignNames = $campaignParameters[0];
-			foreach($campaignNames as $campaignNameParameter)
 			{
-				$campaignName = trim(urldecode(Piwik_Common::getParameterFromQueryString($this->currentUrlParse['query'], $campaignNameParameter)));
+				break;
-				if( !empty($campaignName))
-				{
-					break;
-				}
 			}
+		}
-			if(!empty($campaignName))
+		if(!empty($campaignName))
-			{
+		{
-				$this->typeRefererAnalyzed = Piwik_Common::REFERER_TYPE_CAMPAIGN;
+			$this->typeRefererAnalyzed = Piwik_Common::REFERER_TYPE_CAMPAIGN;
-				$this->nameRefererAnalyzed = $campaignName;
+			$this->nameRefererAnalyzed = $campaignName;
-				$campaignKeywords = $campaignParameters[1];
+			foreach($this->campaignKeywords as $campaignKeywordParameter)
-				foreach($campaignKeywords as $campaignKeywordParameter)
+			{
+				$campaignKeyword = Piwik_Common::getParameterFromQueryString($string, $campaignKeywordParameter);
+				if( !empty($campaignKeyword))
 				{
-					$campaignKeyword = Piwik_Common::getParameterFromQueryString($this->currentUrlParse['query'], $campaignKeywordParameter);
+					$this->keywordRefererAnalyzed = trim(urldecode($campaignKeyword));
-					if( !empty($campaignKeyword))
+					break;
-					{
-						$this->keywordRefererAnalyzed = trim(urldecode($campaignKeyword));
-						break;
-					}
 				}
-				return true;
 			}
+			return true;
 		}
 		return false;
 	}
+	/*
+	 * Campaign analysis
+	 */
+	protected function detectRefererCampaign()
+	{
+		if(!isset($this->currentUrlParse['query'])
+			&& !isset($this->currentUrlParse['fragment']))
+		{
+			return false;
+		}
+		$campaignParameters = Piwik_Common::getCampaignParameters();
+		$this->campaignNames = $campaignParameters[0];
+		$this->campaignKeywords = $campaignParameters[1];
+		$found = false;
+		// 1) Detect campaign from query string
+		if(isset($this->currentUrlParse['query']))
+		{
+			$found = $this->detectCampaignFromString($this->currentUrlParse['query']);
+		}
+		// 2) Detect from fragment #hash
+		if(!$found
+			&& isset($this->currentUrlParse['fragment']))
+		{
+			$found = $this->detectCampaignFromString($this->currentUrlParse['fragment']);
+		}
+		return $found;
+	}
 	/*
 	 * We have previously tried to detect the campaign variables in the URL

--- a/plugins/CoreHome/templates/header.tpl
+++ b/plugins/CoreHome/templates/header.tpl
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>{if !$isCustomLogo}Piwik &rsaquo; {/if} {'CoreHome_WebAnalyticsReports'|translate} - {$siteName}</title>

--- a/plugins/Live/templates/visitorLog.tpl
+++ b/plugins/Live/templates/visitorLog.tpl
@@ -223,7 +223,7 @@
 				{else}
 				{* Goal conversion *}
 					<img src="{$action.icon}" /> 
-					<strong>{$action.goalName}</strong>
+					<strong>{$action.goalName|escape:'html'}</strong>
 					{if $action.revenue > 0}, {'Live_GoalRevenue'|translate}: <strong>{$action.revenue|money:$javascriptVariablesToSet.idSite}</strong>{/if}
 				{/if}
 				</li>

--- a/tests/integration/TrackCustomVariablesAndCampaigns_ForceUsingVisitIdNotHeuristics.test.php
+++ b/tests/integration/TrackCustomVariablesAndCampaigns_ForceUsingVisitIdNotHeuristics.test.php
@@ -53,7 +53,7 @@ class Test_Piwik_Integration_TrackCustomVariablesAndCampaigns_ForceUsingVisitIdN
        $t = $this->getTracker($idSite, $dateTime, $defaultInit = true);
        // Record 1st page view
-        $t->setUrl( 'http://example.org/index.htm?utm_campaign=GA Campaign&piwik_kwd=Piwik kwd&utm_term=GA keyword SHOULD NOT DISPLAY' );
+        $t->setUrl( 'http://example.org/index.htm?utm_campaign=GA Campaign&piwik_kwd=Piwik kwd&utm_term=GA keyword SHOULD NOT DISPLAY#pk_campaign=NOT TRACKED!!&pk_kwd=NOT TRACKED!!' );
        $this->checkResponse($t->doTrackPageView( 'incredible title!'));
        $visitorId = $t->getVisitorId();
@@ -96,7 +96,7 @@ class Test_Piwik_Integration_TrackCustomVariablesAndCampaigns_ForceUsingVisitIdN
        $t3->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1.3)->getDatetime());
        // fake a website ref cookie, the campaign should be credited for conversion, not referrer.example.com nor example.org 
        $t3->DEBUG_APPEND_URL = '&_ref=http%3A%2F%2Freferrer.example.com%2Fpage%2Fsub%3Fquery%3Dtest%26test2%3Dtest3';
-        $t3->setUrl( 'http://example.org/index.htm?pk_campaign=CREDITED TO GOAL PLEASE' );
+        $t3->setUrl( 'http://example.org/index.htm#pk_campaign=CREDITED TO GOAL PLEASE' );
        $this->checkResponse($t3->doTrackGoal($idGoal, 42));
 	}
 }