Fixes #2795 The campaign name and keywords were not URL decoded and trimmed,...

Fixes #2795 The campaign name and keywords were not URL decoded and trimmed, before recorded in the log table (as opposed to search engine keywords which were correctly decoded and trimmed)
This caused the same keyword to be recorded as Hello%20World and Hello+World
This fix will only fix reports for new data AFTER applying the patch


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

core/Tracker/Visit.php

@@ -264,8 +264,8 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface
 		{
 			$refererTimestamp = Piwik_Common::getRequestVar('_refts', 0, 'int', $this->request);
 			$refererUrl = Piwik_Common::getRequestVar('_ref', '', 'string', $this->request);
-			$refererCampaignName = Piwik_Common::getRequestVar('_rcn', '', 'string', $this->request);
-			$refererCampaignKeyword = Piwik_Common::getRequestVar('_rck', '', 'string', $this->request);
+			$refererCampaignName = trim(urldecode(Piwik_Common::getRequestVar('_rcn', '', 'string', $this->request)));
+			$refererCampaignKeyword = trim(urldecode(Piwik_Common::getRequestVar('_rck', '', 'string', $this->request)));
 
 			$this->goalManager->recordGoals( 
 										$this->idsite,
@@ -1416,7 +1416,7 @@ class Piwik_Tracker_Visit_Referer
 			$campaignNames = $campaignParameters[0];
 			foreach($campaignNames as $campaignNameParameter)
 			{
-				$campaignName = Piwik_Common::getParameterFromQueryString($this->currentUrlParse['query'], $campaignNameParameter);
+				$campaignName = trim(urldecode(Piwik_Common::getParameterFromQueryString($this->currentUrlParse['query'], $campaignNameParameter)));
 				if( !empty($campaignName))
 				{
 					break;
@@ -1434,7 +1434,7 @@ class Piwik_Tracker_Visit_Referer
 					$campaignKeyword = Piwik_Common::getParameterFromQueryString($this->currentUrlParse['query'], $campaignKeywordParameter);
 					if( !empty($campaignKeyword))
 					{
-						$this->keywordRefererAnalyzed = $campaignKeyword;
+						$this->keywordRefererAnalyzed = trim(urldecode($campaignKeyword));
 						break;
 					}
 				}