refs #2048 - remove config setting; enabling/disabling DNT corresponds to...

refs #2048 - remove config setting; enabling/disabling DNT corresponds to activating/deactivating the plugin

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

config/global.ini.php

@@ -350,9 +350,6 @@ page_maximum_length = 1024;
 ; For IPv4 addresses, valid values are 0..4; for IPv6 addresses, valid values are 0..16
 ip_address_mask_length = 1
 
-; Ignore visits with X-Do-Not-Track or DNT header
-do_not_track = 1
-
 ; DO NOT USE THIS SETTING ON PUBLICLY AVAILABLE PIWIK SERVER
 ; !!! Security risk: if set to 0, it would allow anyone to push data to Piwik with custom dates in the past/future and with fake IPs !!!
 ; When using the Tracking API, to override either the datetime and/or the visitor IP, 

plugins/DoNotTrack/DoNotTrack.php

@@ -47,10 +47,8 @@ class Piwik_DoNotTrack extends Piwik_Plugin
 
 	function checkHeader($notification)
 	{
-		$setting = @Piwik_Config::getInstance()->Tracker['do_not_track'];
-		if($setting === '1' &&
-			((isset($_SERVER['HTTP_X_DO_NOT_TRACK']) && $_SERVER['HTTP_X_DO_NOT_TRACK'] === '1') ||
-			(isset($_SERVER['HTTP_DNT']) && substr($_SERVER['HTTP_DNT'], 0, 1) === '1')))
+		if((isset($_SERVER['HTTP_X_DO_NOT_TRACK']) && $_SERVER['HTTP_X_DO_NOT_TRACK'] === '1')
+			|| (isset($_SERVER['HTTP_DNT']) && substr($_SERVER['HTTP_DNT'], 0, 1) === '1'))
 		{
 			$exclude =& $notification->getNotificationObject();
 			$exclude = true;