From 19ad53faba918a6104c5acffb05752ac4767aef7 Mon Sep 17 00:00:00 2001
From: archnous <archnous@users.noreply.github.com>
Date: Tue, 31 Oct 2017 00:00:17 +0200
Subject: [PATCH 1/3] Create GAnalytics.french.php

---
 GAnalytics.french.php | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 GAnalytics.french.php

diff --git a/GAnalytics.french.php b/GAnalytics.french.php
new file mode 100644
index 0000000..ff51108
--- /dev/null
+++ b/GAnalytics.french.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Google Analytics tracking
+ */
+
+$txt['ga_tracking_code'] = 'Code de suivi Google Analytics.';
+$txt['ga_tracking_code_description'] = 'Le code de suivi est une partie du code javascript fourni par Google qui ressemble à <strong>UA-1234567-1</strong>';
+
+$txt['ga_tracking_adminpages'] = 'Ajouter le code aux pages d\'administation.';
+$txt['ga_tracking_only_guests'] = 'Suivre uniquement les invités.';

From 1e264b5a8e551d7ab227d70e7601084b97c47e59 Mon Sep 17 00:00:00 2001
From: archnous <archnous@users.noreply.github.com>
Date: Tue, 31 Oct 2017 00:05:50 +0200
Subject: [PATCH 2/3] Spuds' update to 0.0.4

---
 GAnalytics.integrate.php | 59 ++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 14 deletions(-)

diff --git a/GAnalytics.integrate.php b/GAnalytics.integrate.php
index b74ee48..9807c49 100644
--- a/GAnalytics.integrate.php
+++ b/GAnalytics.integrate.php
@@ -1,39 +1,56 @@
 <?php
 /**
  * Google Analytics tracking
+ *
+ * @author emanuele
+ * @license   BSD http://opensource.org/licenses/BSD-3-Clause
+ *
+ * @version 0.0.4
  */
 
-if (!defined('ELK'))
-	die('No access...');
-
 class GAnalytics_Integrate
 {
+	/**
+	 * @var string
+	 */
+	const TRACKREGEX = 'UA-\d{7,9}-\d{1,2}';
+
+	public function __construct()
+	{
+	}
+
 	public static function load_theme()
 	{
 		global $modSettings, $user_info;
 
 		// No tracking code on xml or api requests
 		if (isset($_REQUEST['xml']) || isset($_REQUEST['api']))
+		{
 			return;
+		}
 
 		// As well as if the tracking code is not set
 		if (empty($modSettings['ga_tracking_code']))
+		{
 			return;
+		}
 
 		if (!empty($modSettings['ga_tracking_only_guests']) && !$user_info['is_guest'])
+		{
 			return;
+		}
 
 		if (empty($modSettings['ga_tracking_adminpages']) && isset($_REQUEST['action']) && $_REQUEST['action'] == 'admin')
+		{
 			return;
+		}
 
 		addInlineJavascript('
-	(function(i,s,o,g,r,a,m){i[\'GoogleAnalyticsObject\']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,\'script\',\'//www.google-analytics.com/analytics.js\',\'ga\');
-
+	window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
 	ga(\'create\', \'' . $modSettings['ga_tracking_code'] . '\', \'auto\');
 	ga(\'send\', \'pageview\');', true);
+
+		loadJavascriptFile('https://www.google-analytics.com/analytics.js', array('defer' => true, 'async' => 'true'));
 	}
 
 	public static function general_mod_settings(&$config_vars)
@@ -51,8 +68,9 @@ public static function general_mod_settings(&$config_vars)
 					var val = $(this).val();
 					if (val.indexOf("<script") !== -1)
 					{
-						var regex = /UA-\d{7}-\d/;
-						var match = regex.exec(val)
+						var regex = /' . self::TRACKREGEX . '/,
+							match = regex.exec(val);
+
 						$(this).val(match);
 					}
 				});
@@ -65,23 +83,36 @@ public static function save_general_mod_settings()
 		{
 			// I doubt this will ever happen, because Elk strips the script tag
 			if (strpos('<script', $_POST['ga_tracking_code']) !== false)
+			{
 				$clean_tracking = self::extractUA($_POST['ga_tracking_code']);
+			}
 			else
+			{
 				$clean_tracking = preg_replace('~[^\w\d\-]~', '', $_POST['ga_tracking_code']);
-			if (preg_match('~^UA-\d{7}-\d$~', $clean_tracking) === 0)
+			}
+
+			if (preg_match('~^' . self::TRACKREGEX . '$~', $clean_tracking) === 0)
+			{
 				unset($_POST['ga_tracking_code']);
+			}
 			else
+			{
 				$_POST['ga_tracking_code'] = $clean_tracking;
+			}
 		}
 	}
 
 	protected static function extractUA($val)
 	{
-		preg_match('~\'(UA-\d{7}-\d)\'~', $val, $matches);
-		print_r($matches);die();
+		preg_match('~' . self::TRACKREGEX . '~', $val, $matches);
+
 		if (isset($matches[1]))
+		{
 			return $matches[1];
+		}
 		else
+		{
 			return '';
+		}
 	}
-}
\ No newline at end of file
+}

From d29db586c08f53d502f714223425533df08215fd Mon Sep 17 00:00:00 2001
From: archnous <archnous@users.noreply.github.com>
Date: Tue, 31 Oct 2017 00:07:15 +0200
Subject: [PATCH 3/3] update to 0.0.4 for elk-1.1

---
 package-info.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-info.xml b/package-info.xml
index 5dfa261..1d6ea06 100644
--- a/package-info.xml
+++ b/package-info.xml
@@ -8,25 +8,26 @@
  * @author emanuele
  * @license   BSD http://opensource.org/licenses/BSD-3-Clause
  *
- * @version 0.0.1
+ * @version 0.0.4
  */
 	]]></license>
 	<id>emanuele:ga_tracking</id>
 	<name>Google Analytics tracking</name>
-	<version>0.0.1</version>
+	<version>0.0.4</version>
 	<type>modification</type>
-	<install for="1.0 - 1.0.99">
+	<install for="1.0 - 1.1">
 		<require-file name="GAnalytics.integrate.php" destination="SOURCEDIR" />
 		<require-file name="GAnalytics.english.php" destination="LANGUAGEDIR/english" />
 		<hook hook="integrate_load_theme" file="SOURCEDIR/GAnalytics.integrate.php" function="GAnalytics_Integrate::load_theme" />
 		<hook hook="integrate_general_mod_settings" file="SOURCEDIR/GAnalytics.integrate.php" function="GAnalytics_Integrate::general_mod_settings" />
 		<hook hook="integrate_save_general_mod_settings" file="SOURCEDIR/GAnalytics.integrate.php" function="GAnalytics_Integrate::save_general_mod_settings" />
+		<redirect url="?action=admin;area=addonsettings;sa=general" timeout="5000"></redirect>
 	</install>
-	<uninstall for="1.0 - 1.0.99">
+	<uninstall for="1.0 - 1.1">
 		<remove-file name="SOURCEDIR/GAnalytics.integrate.php" />
 		<remove-file name="LANGUAGEDIR/english/GAnalytics.english.php" />
 		<hook reverse="true" hook="integrate_load_theme" file="SOURCEDIR/GAnalytics.integrate.php" function="GAnalytics_Integrate::load_theme" />
 		<hook reverse="true" hook="integrate_general_mod_settings" file="SOURCEDIR/GAnalytics.integrate.php" function="GAnalytics_Integrate::general_mod_settings" />
 		<hook reverse="true" hook="integrate_save_general_mod_settings" file="SOURCEDIR/GAnalytics.integrate.php" function="GAnalytics_Integrate::save_general_mod_settings" />
 	</uninstall>
-</package-info>
\ No newline at end of file
+</package-info>