From bd0086a3272f3f8b2901576e8050d91d57670384 Mon Sep 17 00:00:00 2001
From: Christian Nyffenegger <freakpants@gmail.com>
Date: Wed, 10 Apr 2019 09:29:29 +0200
Subject: [PATCH 01/15] implemented workaround to user_logged_in being cached

---
 Classes/Loader.php | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/Classes/Loader.php b/Classes/Loader.php
index 1448467..692ec13 100644
--- a/Classes/Loader.php
+++ b/Classes/Loader.php
@@ -5,19 +5,6 @@
 class Loader
 {
 
-	/**
-	 * Returns whether the current request should be tracked or not
-	 *
-	 * @since 1.2
-	 * @return boolean
-	 *
-	 */
-	function should_track_visit()
-	{
-		return (!is_user_logged_in() || get_option('track_logged_in'));
-	}
-
-
 	/**
 	 * Returns if the cookie is present
 	 *
@@ -36,6 +23,23 @@ function hasWKGoogleAnalyticsCookie() {
 		return ob_get_clean();
 	}
 
+	/** 
+	* Outputs a js function that allows a cached page to check if the user should be tracked
+	*/
+	public function output_should_track_js_function(){
+		?>
+		function shouldTrack(){
+			var trackLoggedIn = <?php get_option('track_logged_in') ?>;
+			var loggedIn = $("body").hasClass("logged-in");
+			if(!loggedin){
+				return true;
+			} else if( trackLoggedIn ) {
+				return true;
+			}
+			return false;
+		}
+		<?php
+	}
 
 	/**
 	 * Outputs the Google Tag Manager script tag if necessary
@@ -46,11 +50,12 @@ function hasWKGoogleAnalyticsCookie() {
 	function google_tag_manager_script()
 	{
 		ob_start();
-		if ($this->should_track_visit() && get_option('ga_use_tag_manager')) {
+		if (get_option('ga_use_tag_manager')) {
 			$TAG_MANAGER_ID = get_option('ga_tag_manager_id');
 
+			output_should_track_js_function();
 			?>
-			if (!hasWKGoogleAnalyticsCookie()) {
+			if (!hasWKGoogleAnalyticsCookie() && shouldTrack()) {
 			//Google Tag Manager
 			(function (w, d, s, l, i) {
 			w[l] = w[l] || [];
@@ -81,7 +86,7 @@ function google_tag_manager_script()
 	function google_tag_manager_noscript()
 	{
 		ob_start();
-		if ($this->should_track_visit() && get_option('ga_use_tag_manager')) {
+		if (get_option('ga_use_tag_manager')) {
 			$TAG_MANAGER_ID = get_option('ga_tag_manager_id');
 			?>
 			<noscript>
@@ -105,13 +110,13 @@ function google_tag_manager_noscript()
 	function google_analytics_script()
 	{
 		ob_start();
-		if ($this->should_track_visit() && !get_option('ga_use_tag_manager')) {
+		if (!get_option('ga_use_tag_manager')) {
 			$GA_TRACKING_CODE = get_option('ga_tracking_code');
 			$ANONYMIZE_IP = (get_option('ga_anonymize_ip') !== false) ? (boolean)get_option('ga_anonymize_ip') : true;
 			?>
-
 			<script>
-				if (!hasWKGoogleAnalyticsCookie()) {
+				<?php output_should_track_js_function(); ?>
+				if (!hasWKGoogleAnalyticsCookie() && shouldTrack()) {
 					//Google Analytics
 					(function (i, s, o, g, r, a, m) {
 						i['GoogleAnalyticsObject'] = r;

From 419824a41db2b43fe3bd50726964302f8fd789ab Mon Sep 17 00:00:00 2001
From: Christian Nyffenegger <freakpants@gmail.com>
Date: Wed, 10 Apr 2019 10:37:41 +0200
Subject: [PATCH 02/15] moved is_logged_in to cookie

---
 Classes/Loader.php | 27 ++++++++++++++++++++++++++-
 Classes/Plugin.php |  3 +++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/Classes/Loader.php b/Classes/Loader.php
index 692ec13..7ae7d4c 100644
--- a/Classes/Loader.php
+++ b/Classes/Loader.php
@@ -28,9 +28,25 @@ function hasWKGoogleAnalyticsCookie() {
 	*/
 	public function output_should_track_js_function(){
 		?>
+		// https://www.w3schools.com/js/js_cookies.asp
+		function getCookie(cname) {
+			var name = cname + "=";
+			var decodedCookie = decodeURIComponent(document.cookie);
+			var ca = decodedCookie.split(';');
+			for(var i = 0; i < ca.length; i++) {
+				var c = ca[i];
+				while (c.charAt(0) == ' ') {
+				c = c.substring(1);
+				}
+				if (c.indexOf(name) == 0) {
+				return c.substring(name.length, c.length);
+				}
+			}
+			return "";
+		}
 		function shouldTrack(){
 			var trackLoggedIn = <?php get_option('track_logged_in') ?>;
-			var loggedIn = $("body").hasClass("logged-in");
+			var loggedIn = getCookie("wk-ga-logged-in");
 			if(!loggedin){
 				return true;
 			} else if( trackLoggedIn ) {
@@ -200,4 +216,13 @@ function load_admin_styles($hook)
 
 	}
 
+	/**
+	 * Set a logged in cookie that is available to cached pages
+	 * Do not use this cookie for security checks!
+	 *  
+	*/ 
+	function set_logged_in_cookie(){
+		setcookie('wk-ga-logged-in', is_user_logged_in(), time() + 31556926, '/');
+	}
+
 }
diff --git a/Classes/Plugin.php b/Classes/Plugin.php
index 4a7cd2b..9c530c8 100644
--- a/Classes/Plugin.php
+++ b/Classes/Plugin.php
@@ -22,6 +22,9 @@ public function run()
 		add_action('admin_init', array($this->settings, 'register_settings'));
 		add_action('admin_menu', array($this->settings, 'settings_page'));
 
+		// set logged in cookie after wp is initialized and auth has happened
+		add_action( 'init', array($this->loader,'set_logged_in_cookie'));
+
 		//loader
 		include_once 'Loader.php';
 		$this->loader = new Loader();

From 27f69c338c940853eac671f88a52e994d264e399 Mon Sep 17 00:00:00 2001
From: Christian Nyffenegger <freakpants@gmail.com>
Date: Wed, 10 Apr 2019 11:00:08 +0200
Subject: [PATCH 03/15] just check for existence of cookie

---
 Classes/Loader.php | 18 +-----------------
 Classes/Plugin.php |  6 +++---
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/Classes/Loader.php b/Classes/Loader.php
index 7ae7d4c..cc7e9d2 100644
--- a/Classes/Loader.php
+++ b/Classes/Loader.php
@@ -28,25 +28,9 @@ function hasWKGoogleAnalyticsCookie() {
 	*/
 	public function output_should_track_js_function(){
 		?>
-		// https://www.w3schools.com/js/js_cookies.asp
-		function getCookie(cname) {
-			var name = cname + "=";
-			var decodedCookie = decodeURIComponent(document.cookie);
-			var ca = decodedCookie.split(';');
-			for(var i = 0; i < ca.length; i++) {
-				var c = ca[i];
-				while (c.charAt(0) == ' ') {
-				c = c.substring(1);
-				}
-				if (c.indexOf(name) == 0) {
-				return c.substring(name.length, c.length);
-				}
-			}
-			return "";
-		}
 		function shouldTrack(){
 			var trackLoggedIn = <?php get_option('track_logged_in') ?>;
-			var loggedIn = getCookie("wk-ga-logged-in");
+			var loggedIn = document.cookie.indeOf("wk-ga-logged-in") !== -1;
 			if(!loggedin){
 				return true;
 			} else if( trackLoggedIn ) {
diff --git a/Classes/Plugin.php b/Classes/Plugin.php
index 9c530c8..163aaed 100644
--- a/Classes/Plugin.php
+++ b/Classes/Plugin.php
@@ -22,13 +22,13 @@ public function run()
 		add_action('admin_init', array($this->settings, 'register_settings'));
 		add_action('admin_menu', array($this->settings, 'settings_page'));
 
-		// set logged in cookie after wp is initialized and auth has happened
-		add_action( 'init', array($this->loader,'set_logged_in_cookie'));
-
 		//loader
 		include_once 'Loader.php';
 		$this->loader = new Loader();
 
+		// set logged in cookie after wp is initialized and auth has happened
+		add_action( 'init', array($this->loader,'set_logged_in_cookie'));
+
 		//cookie handling
 		add_action('admin_enqueue_scripts', array($this->loader, 'load_admin_styles'));
 		add_action('wp_enqueue_scripts', array($this->loader, 'register_public_scripts'));

From bb75d4cce6ece3543f98bcc72f208f51430bcc69 Mon Sep 17 00:00:00 2001
From: Christian Nyffenegger <freakpants@gmail.com>
Date: Wed, 10 Apr 2019 11:03:54 +0200
Subject: [PATCH 04/15] added idea files to ignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 56923c8..e9fa327 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /node_modules/
 /coverage-report/
+/.idea
\ No newline at end of file

From 909561eea18baf3420a6aa276773f73f3d484b98 Mon Sep 17 00:00:00 2001
From: Christian Nyffenegger <freakpants@gmail.com>
Date: Wed, 10 Apr 2019 11:07:39 +0200
Subject: [PATCH 05/15] correctly call local method

---
 Classes/Loader.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Classes/Loader.php b/Classes/Loader.php
index ef51fe5..5217335 100644
--- a/Classes/Loader.php
+++ b/Classes/Loader.php
@@ -53,7 +53,7 @@ function google_tag_manager_script()
 		if (get_option('ga_use_tag_manager')) {
 			$TAG_MANAGER_ID = get_option('ga_tag_manager_id');
 
-			output_should_track_js_function();
+			$this->output_should_track_js_function();
 			?>
 			if (!hasWKGoogleAnalyticsCookie() && shouldTrack()) {
 			//Google Tag Manager
@@ -113,8 +113,8 @@ function google_analytics_script()
 		if (!get_option('ga_use_tag_manager')) {
 			$GA_TRACKING_CODE = get_option('ga_tracking_code');
 			$ANONYMIZE_IP = (get_option('ga_anonymize_ip') !== false) ? (boolean)get_option('ga_anonymize_ip') : true;
+			$this->output_should_track_js_function(); 
 			?>
-      <?php output_should_track_js_function(); ?>
 			if (!hasWKGoogleAnalyticsCookie() && shouldTrack()) {
 			//Google Analytics
 			(function (i, s, o, g, r, a, m) {

From 0896a877bcd011c6d182f2e82822048aecef0625 Mon Sep 17 00:00:00 2001
From: Christian Nyffenegger <freakpants@gmail.com>
Date: Tue, 16 Apr 2019 10:55:07 +0200
Subject: [PATCH 06/15] actually render scripts, small typos

---
 Classes/Loader.php | 29 ++++++++++++++++-------------
 Classes/Plugin.php |  4 +++-
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Classes/Loader.php b/Classes/Loader.php
index 5217335..82f698c 100644
--- a/Classes/Loader.php
+++ b/Classes/Loader.php
@@ -16,9 +16,11 @@ function render_script()
 	{
 		ob_start();
 		?>
+		<script>
 		function hasWKGoogleAnalyticsCookie() {
 		return (new RegExp('wp_wk_ga_untrack_' + document.location.hostname)).test(document.cookie);
 		}
+		</script>
 		<?php
 		return ob_get_clean();
 	}
@@ -27,17 +29,21 @@ function hasWKGoogleAnalyticsCookie() {
 	* Outputs a js function that allows a cached page to check if the user should be tracked
 	*/
 	public function output_should_track_js_function(){
+
+
 		?>
+		<script>
 		function shouldTrack(){
-			var trackLoggedIn = <?php get_option('track_logged_in') ?>;
-			var loggedIn = document.cookie.indeOf("wk-ga-logged-in") !== -1;
-			if(!loggedin){
+			var trackLoggedIn = <?php echo (get_option('track_logged_in') ? get_option('track_logged_in') : '\'\''); ?>;
+			var loggedIn = document.cookie.indexOf("wk-ga-logged-in") !== -1;
+			if(!loggedIn){
 				return true;
 			} else if( trackLoggedIn ) {
 				return true;
 			}
 			return false;
 		}
+		</script>
 		<?php
 	}
 
@@ -55,6 +61,7 @@ function google_tag_manager_script()
 
 			$this->output_should_track_js_function();
 			?>
+			<script>
 			if (!hasWKGoogleAnalyticsCookie() && shouldTrack()) {
 			//Google Tag Manager
 			(function (w, d, s, l, i) {
@@ -71,6 +78,7 @@ function google_tag_manager_script()
 			f.parentNode.insertBefore(j, f);
 			})(window, document, 'script', 'dataLayer', '<?php echo $TAG_MANAGER_ID; ?>');
 			}
+			</script>
 			<?php
 		}
 		return ob_get_clean();
@@ -115,6 +123,7 @@ function google_analytics_script()
 			$ANONYMIZE_IP = (get_option('ga_anonymize_ip') !== false) ? (boolean)get_option('ga_anonymize_ip') : true;
 			$this->output_should_track_js_function(); 
 			?>
+			<script>
 			if (!hasWKGoogleAnalyticsCookie() && shouldTrack()) {
 			//Google Analytics
 			(function (i, s, o, g, r, a, m) {
@@ -140,6 +149,7 @@ function google_analytics_script()
 
 			ga('send', 'pageview');
 			}
+			</script>
 			<?php
 		}
 		return ob_get_clean();
@@ -151,20 +161,13 @@ function google_analytics_script()
 	function register_ga_scripts()
 	{
 		//cookie function
-		wp_register_script('wk-cookie-check', '');
-		wp_enqueue_script('wk-cookie-check');
-		wp_add_inline_script('wk-cookie-check', $this->render_script());
+		echo $this->render_script();
 
 		//Google Analytics script in <head>
-		wp_register_script('wk-tag-manager-script', '');
-		wp_enqueue_script('wk-tag-manager-script');
-		wp_add_inline_script('wk-tag-manager-script', $this->google_tag_manager_script());
+		echo $this->google_tag_manager_script();
 
 		//Google Analytics script in <head>
-		wp_register_script('wk-analytics-script', '');
-		wp_enqueue_script('wk-analytics-script');
-		wp_add_inline_script('wk-analytics-script', $this->google_analytics_script());
-
+		echo $this->google_analytics_script();
 	}
 
 	/**
diff --git a/Classes/Plugin.php b/Classes/Plugin.php
index 163aaed..6c5babb 100644
--- a/Classes/Plugin.php
+++ b/Classes/Plugin.php
@@ -8,6 +8,8 @@ class Plugin
 	public function run()
 	{
 
+
+
 		//i18n
 		add_action('plugins_loaded', array($this, 'load_textdomain'));
 
@@ -34,7 +36,7 @@ public function run()
 		add_action('wp_enqueue_scripts', array($this->loader, 'register_public_scripts'));
 		add_action('admin_enqueue_scripts', array($this->loader, 'register_public_scripts'));
 
-		add_action('wp_enqueue_scripts', array($this->loader, 'register_ga_scripts'));
+		add_action('wp_head', array($this->loader, 'register_ga_scripts'));
 
 		//Google Tag Manager noscript footer
 		add_action('wp_footer', array($this->loader, 'google_tag_manager_noscript'));

From 6bae9c7c269b2eac09bd2e673a9de5a8bbc453a6 Mon Sep 17 00:00:00 2001
From: Christian Nyffenegger <freakpants@gmail.com>
Date: Tue, 16 Apr 2019 11:01:05 +0200
Subject: [PATCH 07/15] changed '' to false

---
 Classes/Loader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/Loader.php b/Classes/Loader.php
index 82f698c..bb75876 100644
--- a/Classes/Loader.php
+++ b/Classes/Loader.php
@@ -34,7 +34,7 @@ public function output_should_track_js_function(){
 		?>
 		<script>
 		function shouldTrack(){
-			var trackLoggedIn = <?php echo (get_option('track_logged_in') ? get_option('track_logged_in') : '\'\''); ?>;
+			var trackLoggedIn = <?php echo (get_option('track_logged_in') ? get_option('track_logged_in') : 'false'); ?>;
 			var loggedIn = document.cookie.indexOf("wk-ga-logged-in") !== -1;
 			if(!loggedIn){
 				return true;

From 0b5d217ba5a52491755849028711d047fb76ad56 Mon Sep 17 00:00:00 2001
From: Christian Nyffenegger <freakpants@gmail.com>
Date: Tue, 16 Apr 2019 11:39:47 +0200
Subject: [PATCH 08/15] nicer output into js

---
 Classes/Loader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/Loader.php b/Classes/Loader.php
index bb75876..dd32985 100644
--- a/Classes/Loader.php
+++ b/Classes/Loader.php
@@ -34,7 +34,7 @@ public function output_should_track_js_function(){
 		?>
 		<script>
 		function shouldTrack(){
-			var trackLoggedIn = <?php echo (get_option('track_logged_in') ? get_option('track_logged_in') : 'false'); ?>;
+			var trackLoggedIn = <?php echo (get_option('track_logged_in') ? 'true' : 'false'); ?>;
 			var loggedIn = document.cookie.indexOf("wk-ga-logged-in") !== -1;
 			if(!loggedIn){
 				return true;

From cf01d5501c54b9b8a7c67c90329c329ff7ec2f84 Mon Sep 17 00:00:00 2001
From: Christian Nyffenegger <freakpants@gmail.com>
Date: Tue, 16 Apr 2019 11:45:12 +0200
Subject: [PATCH 09/15] reverted to class detection because cookies are also
 cached

---
 Classes/Loader.php | 14 +-------------
 Classes/Plugin.php |  7 -------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/Classes/Loader.php b/Classes/Loader.php
index dd32985..a53e6df 100644
--- a/Classes/Loader.php
+++ b/Classes/Loader.php
@@ -29,13 +29,11 @@ function hasWKGoogleAnalyticsCookie() {
 	* Outputs a js function that allows a cached page to check if the user should be tracked
 	*/
 	public function output_should_track_js_function(){
-
-
 		?>
 		<script>
 		function shouldTrack(){
 			var trackLoggedIn = <?php echo (get_option('track_logged_in') ? 'true' : 'false'); ?>;
-			var loggedIn = document.cookie.indexOf("wk-ga-logged-in") !== -1;
+			var loggedIn = $("body").hasClass("logged-in");
 			if(!loggedIn){
 				return true;
 			} else if( trackLoggedIn ) {
@@ -208,14 +206,4 @@ function load_admin_styles($hook)
 		wp_enqueue_style('custom-admin-styles', plugins_url(plugin_basename(WK_GOOGLE_ANALYTICS_DIR)) . '/css/admin-styles.css');
 
 	}
-
-	/**
-	 * Set a logged in cookie that is available to cached pages
-	 * Do not use this cookie for security checks!
-	 *  
-	*/ 
-	function set_logged_in_cookie(){
-		setcookie('wk-ga-logged-in', is_user_logged_in(), time() + 31556926, '/');
-	}
-
 }
diff --git a/Classes/Plugin.php b/Classes/Plugin.php
index 6c5babb..494afdd 100644
--- a/Classes/Plugin.php
+++ b/Classes/Plugin.php
@@ -7,9 +7,6 @@ class Plugin
 
 	public function run()
 	{
-
-
-
 		//i18n
 		add_action('plugins_loaded', array($this, 'load_textdomain'));
 
@@ -28,9 +25,6 @@ public function run()
 		include_once 'Loader.php';
 		$this->loader = new Loader();
 
-		// set logged in cookie after wp is initialized and auth has happened
-		add_action( 'init', array($this->loader,'set_logged_in_cookie'));
-
 		//cookie handling
 		add_action('admin_enqueue_scripts', array($this->loader, 'load_admin_styles'));
 		add_action('wp_enqueue_scripts', array($this->loader, 'register_public_scripts'));
@@ -41,7 +35,6 @@ public function run()
 		//Google Tag Manager noscript footer
 		add_action('wp_footer', array($this->loader, 'google_tag_manager_noscript'));
 
-
 		//additional links to admin plugin page
 		add_filter('plugin_row_meta', array($this, 'additional_admin_information_links'), 10, 2);
 		add_filter('plugin_action_links_' . plugin_basename(__FILE__), array($this, 'additional_admin_action_links'));

From e2d07f53f260c9a6afc0dbba1f3fa2ae186a91dd Mon Sep 17 00:00:00 2001
From: Christian Nyffenegger <freakpants@gmail.com>
Date: Tue, 16 Apr 2019 11:48:34 +0200
Subject: [PATCH 10/15] changed to wp appropriate jQuery call

---
 Classes/Loader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/Loader.php b/Classes/Loader.php
index a53e6df..c1b2c6d 100644
--- a/Classes/Loader.php
+++ b/Classes/Loader.php
@@ -33,7 +33,7 @@ public function output_should_track_js_function(){
 		<script>
 		function shouldTrack(){
 			var trackLoggedIn = <?php echo (get_option('track_logged_in') ? 'true' : 'false'); ?>;
-			var loggedIn = $("body").hasClass("logged-in");
+			var loggedIn = jQuery("body").hasClass("logged-in");
 			if(!loggedIn){
 				return true;
 			} else if( trackLoggedIn ) {

From ad2bf4c151f5db3ee2f3309e30ad368ba06ab6ad Mon Sep 17 00:00:00 2001
From: Christian Nyffenegger <freakpants@gmail.com>
Date: Tue, 16 Apr 2019 12:07:04 +0200
Subject: [PATCH 11/15] raised php version

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 377d661..b663499 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: webkinder
 Tags: google analytics, tracking code, analytics, anonymization, anonymize, anonymizeIp, cookie, Datenschutz, ga, gaoptout, google, googleanalytics, google tag manager, gtm, Datenschutz, datenschutzkonform, script, snippet
 Requires at least: 3.0
-Requires PHP: 5.4
+Requires PHP: 5.6
 Tested up to: 4.9.6
 Stable tag: 1.7.2
 License: GPLv2 or later

From e820c73a8937f4441c832e51c88b1e7a45d56aae Mon Sep 17 00:00:00 2001
From: Christian Nyffenegger <freakpants@gmail.com>
Date: Tue, 30 Apr 2019 08:59:44 +0200
Subject: [PATCH 12/15] ignore .idea

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e9fa327..7996523 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 /node_modules/
 /coverage-report/
-/.idea
\ No newline at end of file
+/.idea.idea

From 96064ea786698b558fb2df63bdfa23046fbd090b Mon Sep 17 00:00:00 2001
From: Christian Nyffenegger <freakpants@gmail.com>
Date: Tue, 30 Apr 2019 09:01:15 +0200
Subject: [PATCH 13/15] correctly ignore idea

---
 .gitignore                 |   2 +-
 .idea/google-analytics.iml |   8 --
 .idea/misc.xml             |   6 -
 .idea/modules.xml          |   8 --
 .idea/vcs.xml              |   6 -
 .idea/workspace.xml        | 228 -------------------------------------
 6 files changed, 1 insertion(+), 257 deletions(-)
 delete mode 100644 .idea/google-analytics.iml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 .idea/workspace.xml

diff --git a/.gitignore b/.gitignore
index 7996523..8cdd5d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 /node_modules/
 /coverage-report/
-/.idea.idea
+.idea
diff --git a/.idea/google-analytics.iml b/.idea/google-analytics.iml
deleted file mode 100644
index c956989..0000000
--- a/.idea/google-analytics.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 28a804d..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 191311c..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/google-analytics.iml" filepath="$PROJECT_DIR$/.idea/google-analytics.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index c8dd8fd..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="667d5fdb-ef24-4cd2-a1f4-7909b3b39aca" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/Classes/Loader.php" beforeDir="false" afterPath="$PROJECT_DIR$/Classes/Loader.php" afterDir="false" />
-    </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="416417787">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.open.time.0" value="1" />
-          <entry key="project.opened" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="Markdown" value="1" />
-          <entry key="PHP" value="4" />
-          <entry key="PLAIN_TEXT" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="PHP" value="164" />
-          <entry key="PLAIN_TEXT" value="31" />
-        </counts>
-      </usages-collector>
-    </session>
-    <session id="-1841760033">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="1" />
-          <entry key="project.open.time.1" value="1" />
-          <entry key="project.opened" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="PHP" value="247" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="PHP" value="2" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>register_</find>
-      <find>register_public_scripts</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/wk-ga.php" />
-        <option value="$PROJECT_DIR$/readme.txt" />
-        <option value="$PROJECT_DIR$/Classes/Plugin.php" />
-        <option value="$PROJECT_DIR$/../test/wp-content/plugins/wk-google-analytics/Classes/Loader.php" />
-        <option value="$PROJECT_DIR$/Classes/Loader.php" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="y" value="323" />
-    <option name="width" value="800" />
-    <option name="height" value="538" />
-  </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="wk-google-analytics" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wk-google-analytics" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wk-google-analytics" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wk-google-analytics" type="462c0819:PsiDirectoryNode" />
-              <item name="Classes" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="667d5fdb-ef24-4cd2-a1f4-7909b3b39aca" name="Default Changelist" comment="" />
-      <created>1554824927820</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1554824927820</updated>
-      <workItem from="1554824929023" duration="772000" />
-      <workItem from="1554825847249" duration="4081000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="4853000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="23" width="2560" height="1353" extended-state="6" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25178713" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Quokka" order="8" />
-      <window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Terminal" order="11" />
-      <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Copy/Paste" order="3" />
-      <window_info anchor="right" id="Database" order="4" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="75">
-            <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/readme.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="25" column="28" selection-start-line="25" selection-start-column="28" selection-end-line="25" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/wk-ga.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="18" selection-start-line="5" selection-start-column="18" selection-end-line="5" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../test/wp-content/plugins/wk-google-analytics/Classes/Loader.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="104" column="38" selection-start-line="104" selection-start-column="38" selection-end-line="104" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Classes/Loader.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="415">
-          <caret line="103" column="7" lean-forward="true" selection-start-line="103" selection-start-column="7" selection-end-line="103" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Classes/Plugin.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="620">
-          <caret line="51" column="61" lean-forward="true" selection-start-line="51" selection-start-column="61" selection-end-line="51" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file

From 4b021fd9ba25e3a71aad5df1c9562fccf54829ae Mon Sep 17 00:00:00 2001
From: Christian Nyffenegger <freakpants@gmail.com>
Date: Tue, 30 Apr 2019 09:48:32 +0200
Subject: [PATCH 14/15] bumped versions

---
 readme.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index b663499..9262461 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,8 +3,8 @@ Contributors: webkinder
 Tags: google analytics, tracking code, analytics, anonymization, anonymize, anonymizeIp, cookie, Datenschutz, ga, gaoptout, google, googleanalytics, google tag manager, gtm, Datenschutz, datenschutzkonform, script, snippet
 Requires at least: 3.0
 Requires PHP: 5.6
-Tested up to: 4.9.6
-Stable tag: 1.7.2
+Tested up to: 5.1.0
+Stable tag: 1.7.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 

From ba25d39e9ced287cb286269b978be8eeccd4b7ff Mon Sep 17 00:00:00 2001
From: Christian Nyffenegger <freakpants@gmail.com>
Date: Tue, 30 Apr 2019 09:54:16 +0200
Subject: [PATCH 15/15] updated plugin title

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 9262461..16eae41 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-=== Google Analytics ===
+=== Google Analytics and Google Tag Manager===
 Contributors: webkinder
 Tags: google analytics, tracking code, analytics, anonymization, anonymize, anonymizeIp, cookie, Datenschutz, ga, gaoptout, google, googleanalytics, google tag manager, gtm, Datenschutz, datenschutzkonform, script, snippet
 Requires at least: 3.0