-added Tracker.saveVisitorInformation and Tracker.saveVisitorInformationEnd events,

-formatting description of plugins (nl2br),
-protected instead of private methods in core/Tracker.php

2 files changed, 23 insertions, 11 deletions

diff --git a/core/Tracker.php b/core/Tracker.php
index 97cd1519e3..11b24c30b2 100644
--- a/core/Tracker.php
+++ b/core/Tracker.php
@@ -216,33 +216,33 @@ class Piwik_Tracker
 		header($header);
 	}
 	
-	private function isVisitValid()
+	protected function isVisitValid()
 	{
 		return $this->stateValid !== self::STATE_LOGGING_DISABLE
 				&&  $this->stateValid !== self::STATE_NO_GET_VARIABLE;
 	}
 	
-	private function getState()
+	protected function getState()
 	{
 		return $this->stateValid;
 	}
 	
-	private function setUrlToRedirect( $url )
+	protected function setUrlToRedirect( $url )
 	{
 		$this->urlToRedirect = $url;
 	}
 	
-	private function getUrlToRedirect()
+	protected function getUrlToRedirect()
 	{
 		return $this->urlToRedirect;
 	}
 	
-	private function setState( $value )
+	protected function setState( $value )
 	{
 		$this->stateValid = $value;
 	}
 
-	private function loadTrackerPlugins()
+	protected function loadTrackerPlugins()
 	{
 		try{
 			$pluginsTracker = Piwik_Tracker_Config::getInstance()->Plugins_Tracker;
@@ -259,7 +259,7 @@ class Piwik_Tracker
 		}
 	}
 	
-	private function handleDownloadRedirect()
+	protected function handleDownloadRedirect()
 	{
 		$downloadVariableName = Piwik_Tracker_Config::getInstance()->Tracker['download_url_var_name'];
 		$urlDownload = Piwik_Common::getRequestVar( $downloadVariableName, '', 'string', $this->request);
@@ -274,7 +274,7 @@ class Piwik_Tracker
 		}
 	}
 	
-	private function handleOutlinkRedirect()
+	protected function handleOutlinkRedirect()
 	{
 		$outlinkVariableName = Piwik_Tracker_Config::getInstance()->Tracker['outlink_url_var_name'];
 		$urlOutlink = Piwik_Common::getRequestVar( $outlinkVariableName, '', 'string', $this->request);
@@ -290,7 +290,7 @@ class Piwik_Tracker
 		}
 	}
 	
-	private function handleEmptyGetVariable()
+	protected function handleEmptyGetVariable()
 	{
 		if( count($_GET) == 0)
 		{
@@ -298,7 +298,7 @@ class Piwik_Tracker
 		}
 	}
 	
-	private function handleDisabledTracker()
+	protected function handleDisabledTracker()
 	{
 		$saveStats = Piwik_Tracker_Config::getInstance()->Tracker['record_statistics'];
 		if($saveStats == 0)
diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php
index 0a54946d84..1286beac54 100644
--- a/core/Tracker/Visit.php
+++ b/core/Tracker/Visit.php
@@ -101,7 +101,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface
 		}
 		$actionId = $action->getIdAction();
 
-		if($GLOBALS['PIWIK_TRACKER_DEBUG'])
+		if(isset($GLOBALS['PIWIK_TRACKER_DEBUG']) && $GLOBALS['PIWIK_TRACKER_DEBUG'])
 		{
 			switch($action->getActionType()) {
 				case Piwik_Tracker_Action::TYPE_ACTION:
@@ -291,6 +291,16 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface
 		);
 		
 		Piwik_PostEvent('Tracker.newVisitorInformation', $this->visitorInfo);
+		
+		$this->saveVisitorInformation();
+	}
+	
+	protected function saveVisitorInformation()
+	{
+		Piwik_PostEvent('Tracker.saveVisitorInformation', $this->visitorInfo);
+		
+		$serverTime 	= $this->getCurrentTimestamp();	
+		
 		$this->visitorInfo['location_continent'] = Piwik_Common::getContinent( $this->visitorInfo['location_country'] );		
 		$this->visitorInfo['location_browser_lang'] = substr($this->visitorInfo['location_browser_lang'], 0, 20);
 		$this->visitorInfo['referer_name'] = substr($this->visitorInfo['referer_name'], 0, 70);
@@ -309,6 +319,8 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface
 		$this->visitorInfo['idvisit'] = $idVisit;
 		$this->visitorInfo['visit_first_action_time'] = $serverTime;
 		$this->visitorInfo['visit_last_action_time'] = $serverTime;
+		
+		Piwik_PostEvent('Tracker.saveVisitorInformation.end', $this->visitorInfo);
 	}
 	
 	/**