Skip to content

Commit 04bf275

Browse files
iMattProiMattPro
committed
Merge branch 'master' into dev/4.0
2 parents 04ff5cb + c0c2427 commit 04bf275

32 files changed

Lines changed: 186 additions & 250 deletions

‎.github/workflows/merge-master-to-develop.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,5 @@ jobs:
5959
if git rev-parse -q --verify MERGE_HEAD > /dev/null; then
6060
git merge --abort
6161
fi
62+
exit 1
6263
fi

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "phpbb-extension",
44
"description": "A phpBB official extension that allows administrators to easily add Google Analytics to their forums.",
55
"homepage": "https://www.phpbb.com/customise/db/extension/googleanalytics/",
6-
"version": "1.1.0",
6+
"version": "1.2.0-dev",
77
"keywords": ["phpbb", "extension", "google", "analytics"],
88
"license": "GPL-2.0-only",
99
"authors": [
@@ -44,7 +44,7 @@
4444
"extra": {
4545
"display-name": "Google Analytics",
4646
"soft-require": {
47-
"phpbb/phpbb": ">=4.0.0@dev"
47+
"phpbb/phpbb": ">=3.2.0"
4848
},
4949
"version-check": {
5050
"host": "www.phpbb.com",

‎event/listener.php‎

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static function getSubscribedEvents()
6161
{
6262
return [
6363
'core.page_header' => 'load_google_analytics',
64-
'core.acp_board_config_edit_add' => 'add_googleanalytics_configs',
64+
'core.acp_board_config_edit_add'=> 'add_googleanalytics_configs',
6565
'core.validate_config_variable' => 'validate_googleanalytics_id',
6666
'core.page_footer_after' => 'append_agreement',
6767
];
@@ -77,10 +77,9 @@ public function load_google_analytics()
7777
{
7878
$this->template->assign_vars([
7979
'GOOGLEANALYTICS_ID' => $this->config['googleanalytics_id'],
80-
'GOOGLEANALYTICS_TAG' => $this->config['googleanalytics_tag'],
81-
'GOOGLEANALYTICS_USER_ID' => $this->user->data['user_id'],
82-
'S_ANONYMIZE_IP' => $this->config['ga_anonymize_ip'],
83-
'S_COOKIE_SECURE' => $this->config['cookie_secure'],
80+
'GOOGLEANALYTICS_USER_ID' => (int) $this->user->data['user_id'],
81+
'S_ANONYMIZE_IP' => (bool) $this->config['ga_anonymize_ip'],
82+
'S_COOKIE_SECURE' => (bool) $this->config['cookie_secure'],
8483
]);
8584
}
8685

@@ -117,17 +116,6 @@ public function add_googleanalytics_configs($event)
117116
'type' => 'radio:yes_no',
118117
'explain' => true,
119118
],
120-
'googleanalytics_tag' => [
121-
'lang' => 'ACP_GOOGLEANALYTICS_TAG',
122-
'validate' => 'int',
123-
'type' => 'select',
124-
'function' => [$this, 'build_select'],
125-
'params' => [[
126-
0 => 'ACP_GA_ANALYTICS_TAG',
127-
1 => 'ACP_GA_GTAGS_TAG',
128-
], '{CONFIG_VALUE}'],
129-
'explain' => true,
130-
],
131119
];
132120

133121
// Add the new config vars after warnings_expire_days in the display_vars config array
@@ -148,7 +136,7 @@ public function add_googleanalytics_configs($event)
148136
*/
149137
public function validate_googleanalytics_id($event)
150138
{
151-
// Check if the validate test is for google_analytics
139+
// Check if the validation test is for googleanalytics_id
152140
if ($event['config_definition']['validate'] !== 'googleanalytics_id' || empty($event['cfg_array']['googleanalytics_id']))
153141
{
154142
return;
@@ -159,17 +147,11 @@ public function validate_googleanalytics_id($event)
159147
$error = $event['error'];
160148

161149
// Add error message if the input is not a valid Google Analytics ID
162-
if (!preg_match('/^UA-\d{4,9}-\d{1,4}$|^G-[A-Z0-9]{10}$/', $input))
150+
if (!preg_match('/^G-[A-Z0-9]{10}$/', $input))
163151
{
164152
$error[] = $this->language->lang('ACP_GOOGLEANALYTICS_ID_INVALID', $input);
165153
}
166154

167-
// Add error message if GTAG is not selected for use with a Measurement ID
168-
if ((int) $event['cfg_array']['googleanalytics_tag'] === 0 && preg_match('/^G-[A-Z0-9]{10}$/', $input))
169-
{
170-
$error[] = $this->language->lang('ACP_GOOGLEANALYTICS_TAG_INVALID', $input);
171-
}
172-
173155
// Update error event data
174156
$event['error'] = $error;
175157
}

‎ext.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ class ext extends base
1919
*/
2020
public function is_enableable()
2121
{
22-
return phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '>=');
22+
return phpbb_version_compare(PHPBB_VERSION, '3.2.0', '>=');
2323
}
2424
}

‎language/ar/googleanalytics_acp.php‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,8 @@
4141
$lang = array_merge($lang, array(
4242
'ACP_GOOGLEANALYTICS' => 'Google Analytics',
4343
'ACP_GOOGLEANALYTICS_ID' => 'Google Analytics ID',
44-
'ACP_GOOGLEANALYTICS_ID_EXPLAIN' => 'أكتب كود Google Analytics ID الخاص بك، مثل: <br><br><samp>UA-000000-00</samp> or Measurement ID <samp>G-XXXXXXXXXX</samp>.إحصائيات قوقل يمكنها تتبع أعضاء منتداك المسجلين عبر الأجهزة والجلسات المتعددة، حتى يكون عدد الأعضاء أكثر دقة. لتفعيل هذه الوظيفة المحَسِّنة يجب أن يكون رقم تتبع المستخدم ID مضبوط في حسابك إحصائيات قوقل. <a href="https://support.google.com/analytics/answer/3123666">اضغط هنا للمعلومات أكثر <i class="fa-arrow-up-right-from-square fas fa-fw" aria-hidden="true"></i></a>.',
45-
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” كود Google Analytics ID الذي أدخلته غير صالح.<br>يجب أن يكون على الشكل “UA-000000-00” or “G-XXXXXXXXXX”.',
46-
'ACP_GOOGLEANALYTICS_TAG_INVALID' => '“Global Site Tag (gtag.js)” must be the selected Google Analytics Script Tag when using a Measurement ID.',
44+
'ACP_GOOGLEANALYTICS_ID_EXPLAIN' => 'أكتب كود Google Analytics ID الخاص بك، مثل: <br><br><samp>G-XXXXXXXXXX</samp>.إحصائيات قوقل يمكنها تتبع أعضاء منتداك المسجلين عبر الأجهزة والجلسات المتعددة، حتى يكون عدد الأعضاء أكثر دقة. لتفعيل هذه الوظيفة المحَسِّنة يجب أن يكون رقم تتبع المستخدم ID مضبوط في حسابك إحصائيات قوقل. <a href="https://support.google.com/analytics/answer/9213390" target="_blank">اضغط هنا للمعلومات أكثر <i class="icon fa-external-link fa-fw" aria-hidden="true"></i></a>.',
45+
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” كود Google Analytics ID الذي أدخلته غير صالح.<br>يجب أن يكون على الشكل “G-XXXXXXXXXX”.',
4746
'ACP_GA_ANONYMIZE_IP' => 'Turn on IP Anonymization',
4847
'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.',
49-
'ACP_GOOGLEANALYTICS_TAG' => 'Google Analytics Script Tag',
50-
'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="fa-arrow-up-right-from-square fas fa-fw" aria-hidden="true"></i></a>.',
51-
'ACP_GA_ANALYTICS_TAG' => 'Google Analytics Tag (analytics.js)',
52-
'ACP_GA_GTAGS_TAG' => 'Global Site Tag (gtag.js)',
5348
));

‎language/cs/googleanalytics_acp.php‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,8 @@
4040
$lang = array_merge($lang, array(
4141
'ACP_GOOGLEANALYTICS' => 'Google Analytics',
4242
'ACP_GOOGLEANALYTICS_ID' => 'Google Analytics ID',
43-
'ACP_GOOGLEANALYTICS_ID_EXPLAIN' => 'Zadejte Vaše ID ve službě Google Analytics, např.: <samp>UA-000000-00</samp> or Measurement ID <samp>G-XXXXXXXXXX</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="fa-arrow-up-right-from-square fas fa-fw" aria-hidden="true"></i></a>.',
44-
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” není platné ID klienta ve službě Google Analytics.<br>Mělo by být ve tvaru “UA-000000-00” or “G-XXXXXXXXXX”.',
45-
'ACP_GOOGLEANALYTICS_TAG_INVALID' => '“Global Site Tag (gtag.js)” must be the selected Google Analytics Script Tag when using a Measurement ID.',
43+
'ACP_GOOGLEANALYTICS_ID_EXPLAIN' => 'Zadejte Vaše ID ve službě Google Analytics, např.: <samp>G-XXXXXXXXXX</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/9213390" target="_blank">Klikněte pro více informací <i class="icon fa-external-link fa-fw" aria-hidden="true"></i></a>.',
44+
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” není platné ID klienta ve službě Google Analytics.<br>Mělo by být ve tvaru “G-XXXXXXXXXX”.',
4645
'ACP_GA_ANONYMIZE_IP' => 'Turn on IP Anonymization',
4746
'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.',
48-
'ACP_GOOGLEANALYTICS_TAG' => 'Google Analytics Script Tag',
49-
'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="fa-arrow-up-right-from-square fas fa-fw" aria-hidden="true"></i></a>.',
50-
'ACP_GA_ANALYTICS_TAG' => 'Google Analytics Tag (analytics.js)',
51-
'ACP_GA_GTAGS_TAG' => 'Global Site Tag (gtag.js)',
5247
));

‎language/da/googleanalytics_acp.php‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,8 @@
4242
$lang = array_merge($lang, array(
4343
'ACP_GOOGLEANALYTICS' => 'Google Analytics',
4444
'ACP_GOOGLEANALYTICS_ID' => 'Google Analytics ID',
45-
'ACP_GOOGLEANALYTICS_ID_EXPLAIN' => 'Indtast din Google Analytics ID kode, f.eks.: <samp>UA-000000-00</samp> or Measurement ID <samp>G-XXXXXXXXXX</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="fa-arrow-up-right-from-square fas fa-fw" aria-hidden="true"></i></a>.',
46-
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” er ikke en gyldig Google Analytics ID kode.<br>Det skal være i formen: “UA-000000-00” or “G-XXXXXXXXXX”.',
47-
'ACP_GOOGLEANALYTICS_TAG_INVALID' => '“Global Site Tag (gtag.js)” must be the selected Google Analytics Script Tag when using a Measurement ID.',
45+
'ACP_GOOGLEANALYTICS_ID_EXPLAIN' => 'Indtast din Google Analytics ID kode, f.eks.: <samp>G-XXXXXXXXXX</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/9213390" target="_blank">Klik for yderligere information <i class="icon fa-external-link fa-fw" aria-hidden="true"></i></a>.',
46+
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” er ikke en gyldig Google Analytics ID kode.<br>Det skal være i formen: “G-XXXXXXXXXX”.',
4847
'ACP_GA_ANONYMIZE_IP' => 'Turn on IP Anonymization',
4948
'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.',
50-
'ACP_GOOGLEANALYTICS_TAG' => 'Google Analytics Script Tag',
51-
'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="fa-arrow-up-right-from-square fas fa-fw" aria-hidden="true"></i></a>.',
52-
'ACP_GA_ANALYTICS_TAG' => 'Google Analytics Tag (analytics.js)',
53-
'ACP_GA_GTAGS_TAG' => 'Global Site Tag (gtag.js)',
5449
));

‎language/de/googleanalytics_acp.php‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,8 @@
4040
$lang = array_merge($lang, array(
4141
'ACP_GOOGLEANALYTICS' => 'Google Analytics',
4242
'ACP_GOOGLEANALYTICS_ID' => 'Google Analytics-ID',
43-
'ACP_GOOGLEANALYTICS_ID_EXPLAIN' => 'Gib deine Google Analytics-ID ein, z.B.: <samp>UA-000000-00</samp> or Measurement ID <samp>G-XXXXXXXXXX</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="fa-arrow-up-right-from-square fas fa-fw" aria-hidden="true"></i></a>.',
44-
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” ist keine valide Google Analytics-ID.<br>Sie sollte die folgende Form haben: “UA-000000-00” or “G-XXXXXXXXXX”.',
45-
'ACP_GOOGLEANALYTICS_TAG_INVALID' => '“Global Site Tag (gtag.js)” must be the selected Google Analytics Script Tag when using a Measurement ID.',
43+
'ACP_GOOGLEANALYTICS_ID_EXPLAIN' => 'Gib deine Google Analytics-ID ein, z.B.: <samp>G-XXXXXXXXXX</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/9213390" target="_blank">Klicke hier für mehr Informationen <i class="icon fa-external-link fa-fw" aria-hidden="true"></i></a>.',
44+
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” ist keine valide Google Analytics-ID.<br>Sie sollte die folgende Form haben: “G-XXXXXXXXXX”.',
4645
'ACP_GA_ANONYMIZE_IP' => 'Turn on IP Anonymization',
4746
'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.',
48-
'ACP_GOOGLEANALYTICS_TAG' => 'Google Analytics Script Tag',
49-
'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="fa-arrow-up-right-from-square fas fa-fw" aria-hidden="true"></i></a>.',
50-
'ACP_GA_ANALYTICS_TAG' => 'Google Analytics Tag (analytics.js)',
51-
'ACP_GA_GTAGS_TAG' => 'Global Site Tag (gtag.js)',
5247
));

‎language/de_x_sie/googleanalytics_acp.php‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,8 @@
4040
$lang = array_merge($lang, array(
4141
'ACP_GOOGLEANALYTICS' => 'Google Analytics',
4242
'ACP_GOOGLEANALYTICS_ID' => 'Google Analytics-ID',
43-
'ACP_GOOGLEANALYTICS_ID_EXPLAIN' => 'Geben Sie Ihre Google Analytics-ID ein, z.B.: <samp>UA-000000-00</samp> or Measurement ID <samp>G-XXXXXXXXXX</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="fa-arrow-up-right-from-square fas fa-fw" aria-hidden="true"></i></a>.',
44-
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” ist keine valide Google Analytics-ID.<br>Sie sollte die folgende Form haben: “UA-000000-00” or “G-XXXXXXXXXX”.',
45-
'ACP_GOOGLEANALYTICS_TAG_INVALID' => '“Global Site Tag (gtag.js)” must be the selected Google Analytics Script Tag when using a Measurement ID.',
43+
'ACP_GOOGLEANALYTICS_ID_EXPLAIN' => 'Geben Sie Ihre Google Analytics-ID ein, z.B.: <samp>G-XXXXXXXXXX</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/9213390" target="_blank">Klicken Sie hier für mehr Informationen <i class="icon fa-external-link fa-fw" aria-hidden="true"></i></a>.',
44+
'ACP_GOOGLEANALYTICS_ID_INVALID' => '“%s” ist keine valide Google Analytics-ID.<br>Sie sollte die folgende Form haben: “G-XXXXXXXXXX”.',
4645
'ACP_GA_ANONYMIZE_IP' => 'Turn on IP Anonymization',
4746
'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.',
48-
'ACP_GOOGLEANALYTICS_TAG' => 'Google Analytics Script Tag',
49-
'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="fa-arrow-up-right-from-square fas fa-fw" aria-hidden="true"></i></a>.',
50-
'ACP_GA_ANALYTICS_TAG' => 'Google Analytics Tag (analytics.js)',
51-
'ACP_GA_GTAGS_TAG' => 'Global Site Tag (gtag.js)',
5247
));

0 commit comments

Comments
 (0)