Refs #3134, fixing build & make sure PiwikTracker throws when token auth not...

Refs #3134, fixing build & make sure PiwikTracker throws when token auth not set and bulk track attempted.


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

libs/PiwikTracker/PiwikTracker.php

@@ -341,17 +341,18 @@ class PiwikTracker
      */
     public function doBulkTrack()
     {
-    	if (empty($this->storedTrackingActions))
+    	if (empty($this->token_auth))
     	{
-    		return '';
+    		throw new Exception("Token auth is required for bulk tracking.");
     	}
     	
-    	$data = array('requests' => $this->storedTrackingActions);
-    	if (!empty($this->token_auth))
+    	if (empty($this->storedTrackingActions))
     	{
-    		$data['token_auth'] = $this->token_auth;
+    		return '';
     	}
     	
+    	$data = array('requests' => $this->storedTrackingActions, 'token_auth' => $this->token_auth);
+		
     	$postData = json_encode($data);
     	$response = $this->sendRequest($this->getBaseUrl(), 'POST', $postData, $force = true);
     	

tests/integration/TwoVisitors_TwoWebsites_DifferentDays.test.php

@@ -127,7 +127,10 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays extends Test_
 		// Second new visitor on Idsite 1: one page view 
 		$visitorB = $this->getTracker($idSite, $dateTime, $defaultInit = true);
 		$visitorB->enableBulkTracking();
-		$visitorB->setTokenAuth(Piwik::getCurrentUserTokenAuth());
+		// calc token auth by hand in test environment
+		$tokenAuth = md5(
+			Piwik_Config::getInstance()->superuser['login'].Piwik_Config::getInstance()->superuser['password']);
+		$visitorB->setTokenAuth($tokenAuth);
 		$visitorB->setIp('100.52.156.83');
 		$visitorB->setResolution(800, 300);
 		$visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime());