From 3c3627004eb6e816139f4ae24c0d8a9f8b39874c Mon Sep 17 00:00:00 2001
From: Julien Stoeffler <julien.stoeffler@gmail.com>
Date: Sun, 27 Jul 2014 15:18:32 +0200
Subject: [PATCH 1/2] Added support for analytics.js

---
 phpab.php | 43 +++++++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/phpab.php b/phpab.php
index 5e0075f..8fc09f7 100644
--- a/phpab.php
+++ b/phpab.php
@@ -71,40 +71,54 @@ private function grab_content ()
 	
 	private function setup_ga ()
 	{
+
 		$try_auto = FALSE;
 		$sync = '{' . $this->tag . ' ' . $this->test_name . ' ga_sync}';
 		$async = '{' . $this->tag . ' ' . $this->test_name . ' ga_async}';
+		$analyticsjs = '{' . $this->tag . ' ' . $this->test_name . ' analytics_js}';
 		$syncPos = strpos($this->content, $sync);
+		$asyncPos = strpos($this->content, $async);
+		$analyticsjsPos = strpos($this->content, $analyticsjs);
 		if($syncPos !== FALSE)
 		{
 			$this->content = str_replace($sync, 'pageTracker._setCustomVar(' . $this->ga_slot . ', "' . $this->test_name . '", "' . $this->current_variation . '", 3);', $this->content);
 		}
+		elseif ($asyncPos !== FALSE) 
+		{
+			$this->content = str_replace($async, '_gaq.push(["_setCustomVar", ' . $this->ga_slot . ', "' . $this->test_name . '", "' . $this->current_variation . '", 3]);', $this->content);
+		}
+		elseif ($analyticsjsPos !== FALSE) 
+		{
+			$this->content = str_replace($analyticsjs, 'ga("set", "dimension' . $this->ga_slot . '", "' . $this->current_variation  .'");', $this->content);
+		}
 		else
 		{
-			$asyncPos = strpos($this->content, $async);
-			if($asyncPos !== FALSE)
-			{
-				$this->content = str_replace($async, '_gaq.push(["_setCustomVar", ' . $this->ga_slot . ', "' . $this->test_name . '", "' . $this->current_variation . '", 3]);', $this->content);
-			}
-			else
-			{
-				$try_auto = TRUE;
-			}
+			$try_auto = TRUE;
 		}
 		
 		if($this->auto_ga == TRUE && $try_auto == TRUE)
 		{
+				          																error_log("BAAAM");
+
 			$sync = strpos($this->content, 'pageTracker._trackPageview');
 			if($sync === FALSE)
 			{
 				$async = preg_match('/_gaq\.push\(\[[\'\"]_trackPageview[\'\"]\]\)/', $this->content, $matches, PREG_OFFSET_CAPTURE);
-				if($async == FALSE)
+				if($async === FALSE || $async === 0)
 				{
-          $auto_fail = TRUE;
 					$async = FALSE;
+					$analyticsjs = strpos($this->content, "ga('send', 'pageview');");
+					if ($analyticsjs === FALSE) 
+					{
+	          			$auto_fail = TRUE;
+					} else
+					{
+	          			$auto_fail = FALSE;
+					}
 				}
 				else
 				{
+					error_log("ASYNC:".$async);
 					$auto_fail = FALSE;
 					$async = $matches[0][1];
 				}
@@ -122,6 +136,11 @@ private function setup_ga ()
 			{
 				$this->content = substr($this->content, 0, $async - 1) . '_gaq.push(["_setCustomVar", ' . $this->ga_slot . ', "' . $this->test_name . '", "' . $this->current_variation . '", 3]);' . substr($this->content, $async);
 			}
+			elseif ($auto_fail === FALSE && $analyticsjs !== FALSE) 
+			{
+				$this->content = substr($this->content, 0, $analyticsjs - 1) . 'ga("set", "dimension' . $this->ga_slot . '", "' . $this->current_variation  .'");' . substr($this->content, $analyticsjs);
+			}
+
 		}
 	}
 	
@@ -297,4 +316,4 @@ public function run_test ()
 		
 		$this->test_ran = TRUE;
 	}
-}
+}
\ No newline at end of file

From 70e27b42b15812fd0defac3831cddbdaa414a123 Mon Sep 17 00:00:00 2001
From: Julien Stoeffler <julien.stoeffler@gmail.com>
Date: Fri, 2 Jan 2015 15:19:03 +0100
Subject: [PATCH 2/2] Removed error logs and added new line at the end of the
 file

---
 phpab.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/phpab.php b/phpab.php
index 8fc09f7..16a65b5 100644
--- a/phpab.php
+++ b/phpab.php
@@ -98,7 +98,6 @@ private function setup_ga ()
 		
 		if($this->auto_ga == TRUE && $try_auto == TRUE)
 		{
-				          																error_log("BAAAM");
 
 			$sync = strpos($this->content, 'pageTracker._trackPageview');
 			if($sync === FALSE)
@@ -118,7 +117,6 @@ private function setup_ga ()
 				}
 				else
 				{
-					error_log("ASYNC:".$async);
 					$auto_fail = FALSE;
 					$async = $matches[0][1];
 				}
@@ -316,4 +314,4 @@ public function run_test ()
 		
 		$this->test_ran = TRUE;
 	}
-}
\ No newline at end of file
+}