refs #2048 - update DoNotTrack plugin to conform to core plugin style; update DNT detection to only look at the 1st character per TPE working draft; enable by default in config

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

1 files changed, 9 insertions, 9 deletions

diff --git a/plugins/DoNotTrack/DoNotTrack.php b/plugins/DoNotTrack/DoNotTrack.php
index b9f7b51d2e..2c963b836e 100644
--- a/plugins/DoNotTrack/DoNotTrack.php
+++ b/plugins/DoNotTrack/DoNotTrack.php
@@ -1,11 +1,11 @@
 <?php
 /**
  * Piwik - Open source web analytics
- * 
+ *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  * @version $Id$
- * 
+ *
  * @category Piwik_Plugins
  * @package Piwik_DoNotTrack
  */
@@ -30,14 +30,14 @@ class Piwik_DoNotTrack extends Piwik_Plugin
 	{
 		return array(
 			'description' => 'Ignore visits with X-Do-Not-Track or DNT header',
-			'author' => 'VIP Software Technologies Inc.',
-			'author_homepage' => 'http://activeanalytics.com/',
-			'version' => '0.3',
+			'author' => 'Piwik',
+			'author_homepage' => 'http://piwik.org/',
+			'version' => Piwik_Version::VERSION,
 			'translationAvailable' => false,
 			'TrackerPlugin' => true,
 		);
 	}
-	
+
 	public function getListHooksRegistered()
 	{
 		return array(
@@ -47,16 +47,16 @@ class Piwik_DoNotTrack extends Piwik_Plugin
 
 	function checkHeader($notification)
 	{
-		$setting = @Piwik_Tracker_Config::getInstance()->Tracker['do_not_track'];
+		$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']) && $_SERVER['HTTP_DNT'] === '1')))
+			(isset($_SERVER['HTTP_DNT']) && substr($_SERVER['HTTP_DNT'], 0, 1) === '1')))
 		{
 			$exclude =& $notification->getNotificationObject();
 			$exclude = true;
 
 			$trackingCookie = Piwik_Tracker_IgnoreCookie::getTrackingCookie();
-			$trackingCookie->delete();			
+			$trackingCookie->delete();
 		}
 	}
 }