Remove config/setting for user id tracking

Author: iMattPro

event/listener.php

@@ -68,7 +68,7 @@ public function load_google_analytics()
 		$this->template->assign_vars(array(
 			'GOOGLEANALYTICS_ID'		=> $this->config['googleanalytics_id'],
 			'GOOGLEANALYTICS_USER_ID'	=> $this->user->data['user_id'],
-			'S_GOOGLEANALYTICS_USER_ID'	=> $this->config['googleanalytics_track_user_id'] && $this->user->data['is_registered'],
+			'S_GOOGLEANALYTICS_USER_ID'	=> $this->user->data['is_registered'],
 		));
 	}
 
@@ -99,16 +99,11 @@ public function add_googleanalytics_configs($event)
 					'type'		=> 'text:40:20',
 					'explain'	=> true,
 				),
-				'googleanalytics_track_user_id' => array(
-					'lang'		=> 'ACP_GOOGLEANALYTICS_TRACK_USER_ID',
-					'validate'	=> 'bool',
-					'type'		=> 'radio:yes_no',
-					'explain'	=> true,
-				),
 			);
 
 			// Add the new config vars after warnings_expire_days in the display_vars config array
-			$display_vars['vars'] = phpbb_insert_config_array($display_vars['vars'], $ga_config_vars, array('after' => 'warnings_expire_days'));
+			$insert_after = array('after' => 'warnings_expire_days');
+			$display_vars['vars'] = phpbb_insert_config_array($display_vars['vars'], $ga_config_vars, $insert_after);
 
 			// Update the display_vars event with the new array
 			$event['display_vars'] = $display_vars;

language/en/googleanalytics_acp.php

@@ -40,8 +40,6 @@
 $lang = array_merge($lang, array(
 	'ACP_GOOGLEANALYTICS'						=> 'Google Analytics',
 	'ACP_GOOGLEANALYTICS_ID'					=> 'Google Analytics ID',
-	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'			=> 'Enter your Google Analytics ID code, e.g.: <samp>UA-0000000-00</samp>.',
+	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'			=> 'Enter your Google Analytics ID code, e.g.: <samp>UA-0000000-00</samp>.<br /><br />Google Analytics can track your registered users across multiple devices and sessions, for a more accurate user count in your reports. To enable this enhanced functionality it must be configured in your Google Analytics account. <a href="https://support.google.com/analytics/answer/3123666">Click for more information</a>.',
 	'ACP_GOOGLEANALYTICS_ID_INVALID'			=> '“%s” is not a valid Google Analytics ID code.<br />It should be in the form “UA-0000000-00”.',
-	'ACP_GOOGLEANALYTICS_TRACK_USER_ID'			=> 'Enable user ID tracking',
-	'ACP_GOOGLEANALYTICS_TRACK_USER_ID_EXPLAIN'	=> 'If enabled, Google Analytics will track your registered users across multiple devices and sessions, for a more accurate user count in your reports. This functionality must also be enabled and configured in your Google Analytics account. <a href="https://support.google.com/analytics/answer/3123666">Click for more information</a>.',
 ));

migrations/v10x/m2_track_user_id.php

@@ -6,10 +6,10 @@
 	})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
 	ga('create', '{{ GOOGLEANALYTICS_ID }}', 'auto');
-{% if S_GOOGLEANALYTICS_USER_ID %}
+	{% if S_GOOGLEANALYTICS_USER_ID -%}
 	ga('set', 'userId', {{ GOOGLEANALYTICS_USER_ID }});
-{% endif %}
-{% EVENT phpbb_googleanalytics_alter_ga_requirements %}
+	{% endif -%}
+	{% EVENT phpbb_googleanalytics_alter_ga_requirements -%}
 	ga('send', 'pageview');
 </script>
 {% endif %}

styles/all/template/event/overall_header_stylesheets_after.html

@@ -98,7 +98,7 @@ public function test_load_google_analytics()
 			->with(array(
 				'GOOGLEANALYTICS_ID'		=> $this->config['googleanalytics_id'],
 				'GOOGLEANALYTICS_USER_ID'	=> $this->user->data['user_id'],
-				'S_GOOGLEANALYTICS_USER_ID'	=> $this->config['googleanalytics_track_user_id'] && $this->user->data['is_registered'],
+				'S_GOOGLEANALYTICS_USER_ID'	=> $this->user->data['is_registered'],
 			));
 
 		$dispatcher = new \Symfony\Component\EventDispatcher\EventDispatcher();