Merge pull request #6 from phpbb-extensions/master

Up to date v1.0.5

Author: Galixte

.travis.yml

@@ -1,30 +1,24 @@
 language: php
-sudo: required
+dist: xenial
 
 matrix:
   include:
-    - php: 5.5
+    - php: 7.1
       env: DB=none;NOTESTS=1
-    - php: 5.4
-      env: DB=mysqli #myisam
-    - php: 5.4
-      env: DB=mysql
-    - php: 5.4
+    - php: 7.1
       env: DB=mariadb
-    - php: 5.4
+    - php: 7.1
       env: DB=postgres
-    - php: 5.4
+    - php: 7.1
       env: DB=sqlite3
-    - php: 5.5
-      env: DB=mysqli
-    - php: 5.6
-      env: DB=mysqli
-    - php: 7.0
-      env: DB=mysqli
     - php: 7.1
-      env: DB=mysqli
+      env: DB=mysqli # MyISAM
     - php: 7.2
       env: DB=mysqli
+    - php: 7.3
+      env: DB=mysqli
+    - php: 7.4snapshot
+      env: DB=mysqli
     - php: nightly
       env: DB=mysqli
   allow_failures:
@@ -37,7 +31,7 @@ env:
     - SNIFF="1"        # Should we run code sniffer on your code?
     - IMAGE_ICC="1"    # Should we run icc profile sniffer on your images?
     - EPV="1"          # Should we run EPV (Extension Pre Validator) on your code?
-    - PHPBB_BRANCH="3.2.x"
+    - PHPBB_BRANCH="3.3.x"
 
 branches:
   only:
@@ -46,8 +40,12 @@ branches:
     - /^develop-.*$/
     - /^\d+(\.\d+)?\.x$/
 
+services:
+  - postgresql
+  - mysql
+
 install:
-  - travis/prepare-phpbb.sh $EXTNAME $PHPBB_BRANCH
+  - travis/prepare-phpbb.sh $PHPBB_BRANCH
   - cd ../../phpBB3
   - travis/prepare-extension.sh $EXTNAME $PHPBB_BRANCH
   - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
@@ -59,5 +57,5 @@ before_script:
 script:
   - sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME $NOTESTS; fi"
   - sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION $NOTESTS; fi"
-  - sh -c "if [ '$EPV' != '0' ] && [ '$NOTESTS' = '1' ]; then phpBB/vendor/bin/EPV.php run --dir='phpBB/ext/$EXTNAME/'; fi"
+  - sh -c "if [ '$EPV' != '0' -a '$NOTESTS' = '1' ]; then phpBB/vendor/bin/EPV.php run --dir='phpBB/ext/$EXTNAME/'; fi"
   - sh -c "if [ '$NOTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/travis/phpunit-$DB-travis.xml --bootstrap ./tests/bootstrap.php; fi"

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.0.5 - 2019-11-15
+
+- Support added for Google Analytics new Global Site tag. Now there is an option to select whether you want to use the new Global Site tag (gtag.js), or the older Analytics tag (analytics.js). Existing installations will not be automatically switched over to the newer Global Site tag, however, fresh installs will default to the newer Global Site tag. Details about the new Global Site tag can be found in your Google Analytics Account Admin.
+- Fixed a bug where Google Analytics ACP Board settings could conflict with other extensions ACP Board settings that resulted in a PHP error.
+- Added Spanish casual honorifics translation.
+
 ## 1.0.4 - 2018-05-17
 
 - Added an option to enable visitor IP anonymization. This is recommended by Google to make the data collected for Analytics compliant with the EU‘s GDPR laws which go into effect May 25, 2018.

composer.json

@@ -3,7 +3,7 @@
 	"type": "phpbb-extension",
 	"description": "An extension that allows administrators to easily add their Google Analytics tracking code to their phpBB forum.",
 	"homepage": "https://www.phpbb.com",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"keywords": ["phpbb", "extension", "google", "analytics"],
 	"license": "GPL-2.0-only",
 	"authors": [
@@ -21,7 +21,7 @@
 		},
 		{
 			"name": "Matt Friedman",
-			"homepage": "http://vsephpbb.github.io",
+			"homepage": "https://imattpro.github.io",
 			"role": "Extensions Development Team Lead"
 		},
 		{

event/listener.php

@@ -48,7 +48,7 @@ public function __construct(\phpbb\config\config $config, \phpbb\template\templa
 	* @static
 	* @access public
 	*/
-	static public function getSubscribedEvents()
+	public static function getSubscribedEvents()
 	{
 		return array(
 			'core.acp_board_config_edit_add'	=> 'add_googleanalytics_configs',
@@ -67,6 +67,7 @@ public function load_google_analytics()
 	{
 		$this->template->assign_vars(array(
 			'GOOGLEANALYTICS_ID'		=> $this->config['googleanalytics_id'],
+			'GOOGLEANALYTICS_TAG'		=> $this->config['googleanalytics_tag'],
 			'GOOGLEANALYTICS_USER_ID'	=> $this->user->data['user_id'],
 			'S_ANONYMIZE_IP'			=> $this->config['ga_anonymize_ip'],
 		));
@@ -105,6 +106,17 @@ public function add_googleanalytics_configs($event)
 					'type'		=> 'radio:yes_no',
 					'explain'	=> true,
 				),
+				'googleanalytics_tag' => array(
+					'lang'		=> 'ACP_GOOGLEANALYTICS_TAG',
+					'validate'	=> 'int',
+					'type'		=> 'select',
+					'function'	=> 'build_select',
+					'params'	=> array(array(
+						0	=> 'ACP_GA_ANALYTICS_TAG',
+						1	=> 'ACP_GA_GTAGS_TAG',
+					), '{CONFIG_VALUE}'),
+					'explain'	=> true,
+				),
 			);
 
 			// Add the new config vars after warnings_expire_days in the display_vars config array
@@ -125,7 +137,7 @@ public function add_googleanalytics_configs($event)
 	*/
 	public function validate_googleanalytics_id($event)
 	{
-		$input = $event['cfg_array']['googleanalytics_id'];
+		$input = isset($event['cfg_array']['googleanalytics_id']) ? $event['cfg_array']['googleanalytics_id'] : '';
 
 		// Check if the validate test is for google_analytics
 		if ($input !== '' && $event['config_definition']['validate'] === 'googleanalytics_id')

language/ar/googleanalytics_acp.php

@@ -41,8 +41,12 @@
 $lang = array_merge($lang, array(
 	'ACP_GOOGLEANALYTICS'				=> 'Google Analytics',
 	'ACP_GOOGLEANALYTICS_ID'			=> 'Google Analytics ID',
-	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'	=> 'أكتب كود Google Analytics ID الخاص بك، مثل: <br /><br /><samp>UA-0000000-00</samp>.إحصائيات قوقل يمكنها تتبع أعضاء منتداك المسجلين عبر الأجهزة والجلسات المتعددة، حتى يكون عدد الأعضاء أكثر دقة. لتفعيل هذه الوظيفة المحَسِّنة يجب أن يكون رقم تتبع المستخدم ID مضبوط في حسابك إحصائيات قوقل. <a href="https://support.google.com/analytics/answer/3123666">اضغط هنا للمعلومات أكثر</a>.',
+	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'	=> 'أكتب كود Google Analytics ID الخاص بك، مثل: <br /><br /><samp>UA-0000000-00</samp>.إحصائيات قوقل يمكنها تتبع أعضاء منتداك المسجلين عبر الأجهزة والجلسات المتعددة، حتى يكون عدد الأعضاء أكثر دقة. لتفعيل هذه الوظيفة المحَسِّنة يجب أن يكون رقم تتبع المستخدم ID مضبوط في حسابك إحصائيات قوقل. <a href="https://support.google.com/analytics/answer/3123666">اضغط هنا للمعلومات أكثر <i class="icon fa-external-link fa-fw" aria-hidden="true"></i></a>.',
 	'ACP_GOOGLEANALYTICS_ID_INVALID'	=> '“%s” كود Google Analytics ID الذي أدخلته غير صالح.<br />يجب أن يكون على الشكل “UA-0000000-00”.',
 	'ACP_GA_ANONYMIZE_IP'				=> 'Turn on IP Anonymization',
 	'ACP_GA_ANONYMIZE_IP_EXPLAIN'		=> 'Enable this option if you want the data collected by Google Analytics to be compliant with the EU‘s General Data Protection Regulation (GDPR). Note that enabling this option may slightly reduce the accuracy of geographic reporting.',
+	'ACP_GOOGLEANALYTICS_TAG'			=> 'Google Analytics Script Tag',
+	'ACP_GOOGLEANALYTICS_TAG_EXPLAIN'	=> 'Choose your preferred Google Analytics code snippet. Global site tag (gtag.js) is the current snippet recommended by Google. Google Analytics tag (analytics.js) is the legacy code snippet. <a href="https://developers.google.com/analytics/devguides/collection/gtagjs/migration">Click for more information <i class="icon fa-external-link fa-fw" aria-hidden="true"></i></a>.',
+	'ACP_GA_ANALYTICS_TAG'				=> 'Google Analytics Tag (analytics.js)',
+	'ACP_GA_GTAGS_TAG'					=> 'Global Site Tag (gtag.js)',
 ));

language/cs/googleanalytics_acp.php

@@ -40,8 +40,12 @@
 $lang = array_merge($lang, array(
 	'ACP_GOOGLEANALYTICS'				=> 'Google Analytics',
 	'ACP_GOOGLEANALYTICS_ID'			=> 'Google Analytics ID',
-	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'	=> 'Zadejte Vaše ID ve službě Google Analytics, např.: <samp>UA-0000000-00</samp>.<br /><br />Google Analytics dokáže sledovat přihlášené uživatele napříč zařízeními pro přesnější informace o návštěvnících. Pro povolení této rozšířené funkcionality musíte povolit funkci User ID ve svém účtu Google Analytics. <a href="https://support.google.com/analytics/answer/3123666">Klikněte pro více informací</a>.',
+	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'	=> 'Zadejte Vaše ID ve službě Google Analytics, např.: <samp>UA-0000000-00</samp>.<br /><br />Google Analytics dokáže sledovat přihlášené uživatele napříč zařízeními pro přesnější informace o návštěvnících. Pro povolení této rozšířené funkcionality musíte povolit funkci User ID ve svém účtu Google Analytics. <a href="https://support.google.com/analytics/answer/3123666">Klikněte pro více informací <i class="icon fa-external-link fa-fw" aria-hidden="true"></i></a>.',
 	'ACP_GOOGLEANALYTICS_ID_INVALID'	=> '“%s” není platné ID klienta ve službě Google Analytics.<br />Mělo by být ve tvaru “UA-0000000-00”.',
 	'ACP_GA_ANONYMIZE_IP'				=> 'Turn on IP Anonymization',
 	'ACP_GA_ANONYMIZE_IP_EXPLAIN'		=> 'Enable this option if you want the data collected by Google Analytics to be compliant with the EU‘s General Data Protection Regulation (GDPR). Note that enabling this option may slightly reduce the accuracy of geographic reporting.',
+	'ACP_GOOGLEANALYTICS_TAG'			=> 'Google Analytics Script Tag',
+	'ACP_GOOGLEANALYTICS_TAG_EXPLAIN'	=> 'Vyberte preferovaný kód Google Analytics. Global Site Tag (gtag.js) je aktuální kód doporučený společností Google. Google Analytics Tag (analytics.js) je starý kód. <a href="https://developers.google.com/analytics/devguides/collection/gtagjs/migration">Klikněte pro více informací <i class="icon fa-external-link fa-fw" aria-hidden="true"></i></a>.',
+	'ACP_GA_ANALYTICS_TAG'				=> 'Google Analytics Tag (analytics.js)',
+	'ACP_GA_GTAGS_TAG'					=> 'Global Site Tag (gtag.js)',
 ));

language/da/googleanalytics_acp.php

@@ -42,8 +42,12 @@
 $lang = array_merge($lang, array(
 	'ACP_GOOGLEANALYTICS'				=> 'Google Analytics',
 	'ACP_GOOGLEANALYTICS_ID'			=> 'Google Analytics ID',
-	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'	=> 'Indtast din Google Analytics ID kode, f.eks.: <samp>UA-0000000-00</samp>.<br /><br />Google Analytics kan spore dine registrerede brugere på tværs af flere enheder og sessioner, for et mere præcist bruger tal i dine rapportere. For at aktivere denne forbedrede funktionalitet skal User ID sporing være konfigureret i din Google Analytics konto. <a href="https://support.google.com/analytics/answer/3123666">Klik for yderligere information</a>.',
+	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'	=> 'Indtast din Google Analytics ID kode, f.eks.: <samp>UA-0000000-00</samp>.<br /><br />Google Analytics kan spore dine registrerede brugere på tværs af flere enheder og sessioner, for et mere præcist bruger tal i dine rapportere. For at aktivere denne forbedrede funktionalitet skal User ID sporing være konfigureret i din Google Analytics konto. <a href="https://support.google.com/analytics/answer/3123666">Klik for yderligere information <i class="icon fa-external-link fa-fw" aria-hidden="true"></i></a>.',
 	'ACP_GOOGLEANALYTICS_ID_INVALID'	=> '“%s” er ikke en gyldig Google Analytics ID kode.<br />Det skal være i formen: “UA-0000000-00”.',
 	'ACP_GA_ANONYMIZE_IP'				=> 'Turn on IP Anonymization',
 	'ACP_GA_ANONYMIZE_IP_EXPLAIN'		=> 'Enable this option if you want the data collected by Google Analytics to be compliant with the EU‘s General Data Protection Regulation (GDPR). Note that enabling this option may slightly reduce the accuracy of geographic reporting.',
+	'ACP_GOOGLEANALYTICS_TAG'			=> 'Google Analytics Script Tag',
+	'ACP_GOOGLEANALYTICS_TAG_EXPLAIN'	=> 'Vælg din foretrukne Google Analytics-kode. Global Site Tag (gtag.js) er den aktuelle kode, der er anbefalet af Google. Google Analytics Tag (analytics.js) er den gamle kode. <a href="https://developers.google.com/analytics/devguides/collection/gtagjs/migration">Klik for yderligere information <i class="icon fa-external-link fa-fw" aria-hidden="true"></i></a>.',
+	'ACP_GA_ANALYTICS_TAG'				=> 'Google Analytics Tag (analytics.js)',
+	'ACP_GA_GTAGS_TAG'					=> 'Global Site Tag (gtag.js)',
 ));

language/de/googleanalytics_acp.php

@@ -40,8 +40,12 @@
 $lang = array_merge($lang, array(
 	'ACP_GOOGLEANALYTICS'				=> 'Google Analytics',
 	'ACP_GOOGLEANALYTICS_ID'			=> 'Google Analytics-ID',
-	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'	=> 'Gib deine Google Analytics-ID ein, z.B.: <samp>UA-0000000-00</samp>.<br /><br />Google Analytics kann deine registrierten Benutzer für eine genauere Benutzerzählung über mehrere Geräte und Sitzungen hinweg verfolgen. Um diese verbesserte User ID-Funktion nutzen zu können, muss sie in deinem Google Analytics-Account aktiviert sein. <a href="https://support.google.com/analytics/answer/3123666">Klicke hier für mehr Informationen</a>.',
+	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'	=> 'Gib deine Google Analytics-ID ein, z.B.: <samp>UA-0000000-00</samp>.<br /><br />Google Analytics kann deine registrierten Benutzer für eine genauere Benutzerzählung über mehrere Geräte und Sitzungen hinweg verfolgen. Um diese verbesserte User ID-Funktion nutzen zu können, muss sie in deinem Google Analytics-Account aktiviert sein. <a href="https://support.google.com/analytics/answer/3123666">Klicke hier für mehr Informationen <i class="icon fa-external-link fa-fw" aria-hidden="true"></i></a>.',
 	'ACP_GOOGLEANALYTICS_ID_INVALID'	=> '“%s” ist keine valide Google Analytics-ID.<br />Sie sollte die folgende Form haben: “UA-0000000-00”.',
 	'ACP_GA_ANONYMIZE_IP'				=> 'Turn on IP Anonymization',
 	'ACP_GA_ANONYMIZE_IP_EXPLAIN'		=> 'Enable this option if you want the data collected by Google Analytics to be compliant with the EU‘s General Data Protection Regulation (GDPR). Note that enabling this option may slightly reduce the accuracy of geographic reporting.',
+	'ACP_GOOGLEANALYTICS_TAG'			=> 'Google Analytics Script Tag',
+	'ACP_GOOGLEANALYTICS_TAG_EXPLAIN'	=> 'Wählen Sie Ihren bevorzugten Google Analytics-Code. Global Site Tag (gtag.js) ist der aktuelle von Google empfohlene Code. Google Analytics Tag (analytics.js) ist das alte Code. <a href="https://developers.google.com/analytics/devguides/collection/gtagjs/migration">Klicken Sie hier für mehr Informationen <i class="icon fa-external-link fa-fw" aria-hidden="true"></i></a>.',
+	'ACP_GA_ANALYTICS_TAG'				=> 'Google Analytics Tag (analytics.js)',
+	'ACP_GA_GTAGS_TAG'					=> 'Global Site Tag (gtag.js)',
 ));

language/de_x_sie/googleanalytics_acp.php

@@ -40,8 +40,12 @@
 $lang = array_merge($lang, array(
 	'ACP_GOOGLEANALYTICS'				=> 'Google Analytics',
 	'ACP_GOOGLEANALYTICS_ID'			=> 'Google Analytics-ID',
-	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'	=> 'Geben Sie Ihre Google Analytics-ID ein, z.B.: <samp>UA-0000000-00</samp>.<br /><br />Google Analytics kann Ihre registrierten Benutzer für eine genauere Benutzerzählung über mehrere Geräte und Sitzungen hinweg verfolgen. Um diese verbesserte User ID-Funktion nutzen zu können, muss sie in Ihrem Google Analytics-Account aktiviert sein. <a href="https://support.google.com/analytics/answer/3123666">Klicken Sie hier für mehr Informationen</a>.',
+	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'	=> 'Geben Sie Ihre Google Analytics-ID ein, z.B.: <samp>UA-0000000-00</samp>.<br /><br />Google Analytics kann Ihre registrierten Benutzer für eine genauere Benutzerzählung über mehrere Geräte und Sitzungen hinweg verfolgen. Um diese verbesserte User ID-Funktion nutzen zu können, muss sie in Ihrem Google Analytics-Account aktiviert sein. <a href="https://support.google.com/analytics/answer/3123666">Klicken Sie hier für mehr Informationen <i class="icon fa-external-link fa-fw" aria-hidden="true"></i></a>.',
 	'ACP_GOOGLEANALYTICS_ID_INVALID'	=> '“%s” ist keine valide Google Analytics-ID.<br />Sie sollte die folgende Form haben: “UA-0000000-00”.',
 	'ACP_GA_ANONYMIZE_IP'				=> 'Turn on IP Anonymization',
 	'ACP_GA_ANONYMIZE_IP_EXPLAIN'		=> 'Enable this option if you want the data collected by Google Analytics to be compliant with the EU‘s General Data Protection Regulation (GDPR). Note that enabling this option may slightly reduce the accuracy of geographic reporting.',
+	'ACP_GOOGLEANALYTICS_TAG'			=> 'Google Analytics Script Tag',
+	'ACP_GOOGLEANALYTICS_TAG_EXPLAIN'	=> 'Wählen Sie Ihren bevorzugten Google Analytics-Code. Global Site Tag (gtag.js) ist der aktuelle von Google empfohlene Code. Google Analytics Tag (analytics.js) ist das alte Code. <a href="https://developers.google.com/analytics/devguides/collection/gtagjs/migration">Klicken Sie hier für mehr Informationen <i class="icon fa-external-link fa-fw" aria-hidden="true"></i></a>.',
+	'ACP_GA_ANALYTICS_TAG'				=> 'Google Analytics Tag (analytics.js)',
+	'ACP_GA_GTAGS_TAG'					=> 'Global Site Tag (gtag.js)',
 ));

language/el/googleanalytics_acp.php

@@ -41,8 +41,12 @@
 $lang = array_merge($lang, array(
 	'ACP_GOOGLEANALYTICS'				=> 'Google Analytics',
 	'ACP_GOOGLEANALYTICS_ID'			=> 'Google Analytics ID',
-	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'	=> 'Εισάγετε το αναγνωριστικό παρακολούθησης (ID code) του Google Analytics, π.χ.: <samp>UA-0000000-00</samp>.<br /><br />Το Google Analytics μπορεί να παρακολουθεί εγγεγραμμένους χρήστες σας σε πολλαπλές συσκευές και συνεδρίες, για μια πιο ακριβή καταμέτρηση των χρηστών στις αναφορές σας. Για να ενεργοποιήσετε αυτή τη βελτιωμένη λειτουργία παρακολούθησης του User ID πρέπει να ρυθμίσετε το λογαριασμό σας στο Google Analytics. <a href="https://support.google.com/analytics/answer/3123666?hl=el">Πατήστε εδώ για περισσότερες πληροφορίες</a>.',
+	'ACP_GOOGLEANALYTICS_ID_EXPLAIN'	=> 'Εισάγετε το αναγνωριστικό παρακολούθησης (ID code) του Google Analytics, π.χ.: <samp>UA-0000000-00</samp>.<br /><br />Το Google Analytics μπορεί να παρακολουθεί εγγεγραμμένους χρήστες σας σε πολλαπλές συσκευές και συνεδρίες, για μια πιο ακριβή καταμέτρηση των χρηστών στις αναφορές σας. Για να ενεργοποιήσετε αυτή τη βελτιωμένη λειτουργία παρακολούθησης του User ID πρέπει να ρυθμίσετε το λογαριασμό σας στο Google Analytics. <a href="https://support.google.com/analytics/answer/3123666?hl=el">Πατήστε εδώ για περισσότερες πληροφορίες <i class="icon fa-external-link fa-fw" aria-hidden="true"></i></a>.',
 	'ACP_GOOGLEANALYTICS_ID_INVALID'	=> 'Το "%s" δεν είναι έγκυρο αναγνωριστικό παρακολούθησης (ID code) του Google Analytics.<br />Πρέπει να είναι μορφής "UA-0000000-00".',
 	'ACP_GA_ANONYMIZE_IP'				=> 'Turn on IP Anonymization',
 	'ACP_GA_ANONYMIZE_IP_EXPLAIN'		=> 'Enable this option if you want the data collected by Google Analytics to be compliant with the EU‘s General Data Protection Regulation (GDPR). Note that enabling this option may slightly reduce the accuracy of geographic reporting.',
+	'ACP_GOOGLEANALYTICS_TAG'			=> 'Google Analytics Script Tag',
+	'ACP_GOOGLEANALYTICS_TAG_EXPLAIN'	=> 'Επιλέξτε τον προτιμώμενο κωδικό σας Google Analytics. Global Tag Site (gtag.js) είναι το τρέχον απόσπασμα που συνιστά η Google. Google Analytics Tag (analytics.js) είναι το παλιό απόσπασμα κώδικα. <a href="https://developers.google.com/analytics/devguides/collection/gtagjs/migration">Πατήστε εδώ για περισσότερες πληροφορίες <i class="icon fa-external-link fa-fw" aria-hidden="true"></i></a>.',
+	'ACP_GA_ANALYTICS_TAG'				=> 'Google Analytics Tag (analytics.js)',
+	'ACP_GA_GTAGS_TAG'					=> 'Global Site Tag (gtag.js)',
 ));