Template code for user trackig moved to the template. Event test rewritten to match new settings set.

Author: viteksafronov

event/listener.php

@@ -65,11 +65,11 @@ static public function getSubscribedEvents()
 	*/
 	public function load_google_analytics()
 	{
-		$this->template->assign_var('GOOGLEANALYTICS_ID', $this->config['googleanalytics_id']);
-		if ($this->config['googleanalytics_track_user_id'] && $this->user->data['is_registered'])
-		{
-			$this->template->assign_var('GOOGLEANALYTICS_USER_ID', "ga('set', 'userId', {$this->user->data['user_id']});");
-		}
+		$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']),
+		));
 	}
 
 	/**

language/en/googleanalytics_acp.php

@@ -42,5 +42,5 @@
 	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'			=> 'Enter your Google Analytics ID code, e.g.: <samp>UA-0000000-00</samp>.',
 	'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'			=> 'Track user id',
-	'ACP_GOOGLEANALYTICS_TRACK_USER_ID_EXPLAIN'	=> 'If enabled, Google Analytics will track the unique userId value for each authenticated user.',
+	'ACP_GOOGLEANALYTICS_TRACK_USER_ID_EXPLAIN'	=> 'If enabled, Google Analytics will track the unique userId value for each authenticated user. This functionality must be enabled and set up according to <a href="https://support.google.com/analytics/answer/3123666">this article</a>.',
 ));

language/ru/googleanalytics_acp.php

@@ -0,0 +1,46 @@
+<?php
+/**
+*
+* Google Analytics extension for the phpBB Forum Software package.
+*
+* @copyright (c) 2014 phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+//
+// Some characters you may want to copy&paste:
+// ’ » “ ” …
+//
+
+$lang = array_merge($lang, array(
+	'ACP_GOOGLEANALYTICS_ID'					=> 'Google Analytics ID',
+	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'			=> 'Введите ваш идентификатор Google Analytics, например: <samp>UA-0000000-00</samp>.',
+	'ACP_GOOGLEANALYTICS_ID_INVALID'			=> '“%s” не является корректным идентификатором Google Analytics.<br />Он должен быть в формате “UA-0000000-00”.',
+	'ACP_GOOGLEANALYTICS_TRACK_USER_ID'			=> 'Отслеживать ID пользователя',
+	'ACP_GOOGLEANALYTICS_TRACK_USER_ID_EXPLAIN'	=> 'Если включено, Google Analytics будет отслеживать уникальное значение userId для каждого аутентифицированного пользователя. Данная функциональность должна быть включена и настроена согласно <a href="https://support.google.com/analytics/answer/3123666">этой статье</a>.',
+));

styles/all/template/event/overall_header_stylesheets_after.html

@@ -6,7 +6,9 @@
 	})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
 	ga('create', '{GOOGLEANALYTICS_ID}', 'auto');
-	{GOOGLEANALYTICS_USER_ID}
+	<!-- IF S_GOOGLEANALYTICS_USER_ID -->
+	ga('set', 'userId', {GOOGLEANALYTICS_USER_ID});
+	<!-- ENDIF -->
 	<!-- EVENT phpbb_googleanalytics_alter_ga_requirements -->
 	ga('send', 'pageview');
 </script>

tests/event/listener_test.php

@@ -106,7 +106,7 @@ public function add_googleanalytics_configs_data()
 			array( // expected config and mode
 				'settings',
 				array('vars' => array('board_timezone' => array())),
-				array('board_timezone', 'googleanalytics_id'),
+				array('board_timezone', 'googleanalytics_id', 'googleanalytics_track_user_id'),
 			),
 			array( // unexpected mode
 				'foobar',