Rebase on google upstream by zorglube · Pull Request #1 · Cube707/phpbb-matomoanalytics

zorglube · 2026-02-09T15:46:42Z

I'm working on the integration of Matomo on my PHPBB forum.
I found you plugin, and I thought it need an update based on th evolution of the origin : https://github.com/phpbb-extensions/googleanalytics

Hop my PR is good,
BR

Signed-off-by: Matt Friedman <maf675@gmail.com>

Maintenance

Repo fixes

Add Google Analytics privacy information

Bump to 1.1.0

Support secure cookies

Cube707 · 2026-02-10T14:00:04Z

Sorry but this can't be merged, the history is quite mangled. Please reset to current master and Marge the upstream changes cleanly. (If you don't know how I can give some more pointers or do it later today myself)

Then open a separate PR for your addition.

Thanks

zorglube · 2026-02-10T14:24:36Z

Sorry but this can't be merged, the history is quite mangled. Please reset to current master and Marge the upstream changes cleanly. (If you don't know how I can give some more pointers or do it later today myself)

Do you mean squash the commis ?

zorglube · 2026-02-10T15:28:49Z

@Cube707 Is this better now ?

Cube707 · 2026-02-10T15:59:00Z

No your still recreating commit which already exists in this repo. You need to reset to this repos current master before merging upstream.

I can writeup an example once I am done at work

Cube707 · 2026-02-10T17:09:16Z

heres what you need to do:

ensure you have all repos configured as remotes, your fork, this repo and the upstream for google. Skip what you already have and replace the names accordingly in the later steps
```
git remote add Cube707 https://github.com/Cube707/phpbb-matomoanalytics.git
git remote add upstream https://github.com/phpbb-extensions/googleanalytics.git
```
ensure you are up to date with all remotes:
```
git fetch upstream
git fetch Cube707
```
reset you branch to get a clean starting state (IMPORTANT: this is a destructive action which removes commit. Save all work you want to keep on separate branches)
```
git reset --hard Cube707/main
```
merge the updates from the upstream
```
git merge upstream/master
```
this will most likely have merge-conflicts you need to solve
now you can update this PR
```
git push --force
```

Note that this doesn't yet include your modifications, those should be a separate PR

Cube707 · 2026-02-10T17:16:50Z

your your new commit, separate it back into multiple commits, each one on topic. And than create new PRs for your additions.

Here also don't mix concerns, a typos in the existing text are seperate from adding new stuff and can probably be merged much faster and without discussion, so they should be separate PRs. Also deleting stuff needs a good reason.

You should also note that I will not merge changes to the pre-exisitng google-analytics code, for that you would need to open a PR upstream and I will sync my fork once the upstream accepted the merge. I can offer you to provide a feature branch and a pre-release version if you want it quickly in the matomo version.

zorglube · 2026-02-10T17:47:10Z

I'll do like that, thank you !

zorglube · 2026-02-11T10:05:44Z

@Cube707, you should be happier now.

The work isn't fnished yet. Please, tell me if I'm on the wright path.

Cube707 · 2026-02-11T14:56:51Z

This looks much better, I will review the details later

Signed-off-by: Zorglube <630192+zorglube@users.noreply.github.com>

zorglube · 2026-02-11T20:21:39Z

This looks much better, I will review the details later

Ready for review.

Cube707

There are changes to event/listener.php missing from the merge.

I also think we should keep the feature which adds a paragraph about the tracking-tool beeping used. I suggest merging the Google-Analytics text an then rewriting it to match matomo as a new commit

Cube707 · 2026-02-11T20:58:51Z

.github/workflows/tests.yml

+        name: Extension tests
+        uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@3.3.x
+        with:
+            EXTNAME: phpbb/googleanalytics # Your extension vendor/package name


This needs to be the correct extension name

Cube707 · 2026-02-11T20:59:57Z

composer.json

 			"email": "mail@janwille.de",
 			"homepage": "https://janwille.de",
-			"role": "Extension Developer"
+			"role": "Upstream Extension Developer"


This is me 😄

It can stay as "Extension developer"

Cube707 · 2026-02-11T21:01:53Z

language/fr/matomoanalytics_acp.php

@@ -0,0 +1,50 @@
+<?php


Please don't add in your own addition into the merge, open a separate PR for new features

Cube707 · 2026-02-11T21:03:43Z

tests/event/listener_test.php

 	}

-	/**
+	/** 


What changed here? Please don't commit whitespace changes

- Cube707#1 (comment) - Cube707#1 (comment) - Cube707#1 (comment) Signed-off-by: Zorglube <630192+zorglube@users.noreply.github.com>

- Cube707#1 (comment) - Cube707#1 (comment) - Cube707#1 (comment) - Cube707#1 (comment) Signed-off-by: Zorglube <630192+zorglube@users.noreply.github.com>

- Cube707#1 (review) Signed-off-by: Zorglube <630192+zorglube@users.noreply.github.com>

zorglube · 2026-02-12T11:38:26Z

There are changes to event/listener.php missing from the merge.

I also think we should keep the feature which adds a paragraph about the tracking-tool beeping used. I suggest merging the Google-Analytics text an then rewriting it to match matomo as a new commit

I'm note sure the correction for that part is good, you should pay attention on this one.

- Cube707#1 (review) Signed-off-by: Zorglube <630192+zorglube@users.noreply.github.com>

zorglube · 2026-02-12T11:42:38Z

language/de/matomoanalytics_ups.php

+//
+
+$lang = array_merge($lang, [
+    'PHPBB_ANALYTICS_PRIVACY_POLICY' => '


Sorry @Cube707 I don't speak German enough, can you translate please ?

Cube707 · 2026-02-12T12:40:53Z

event/listener.php

+     */
+    public function append_agreement()
+    {
+    	if (!$this->config['googleanalytics_id']


this needs to reference one of our config settings

Cube707 · 2026-02-12T12:41:16Z

event/listener.php

+    		return;
+    	}
+
+    	$this->language->add_lang('googleanalytics_ucp', 'cube/matomoanalytics');


this needs to reference the correct file

Cube707 · 2026-02-12T12:43:55Z

language/de/matomoanalytics_ups.php

+//
+
+$lang = array_merge($lang, [
+    'PHPBB_ANALYTICS_PRIVACY_POLICY' => '


Cube707 · 2026-02-12T12:45:15Z

language/en/matomoanalytics_ups.php

+        <br><br>
+        Thoses informations may be transfer to a third parties. To learn more about how the statistics informations are used, contact the website owner.
+        <br><br>
+        If you want to opt out of the statistics collection <div id="matomo-opt-out"></div><script src="%1$s/index.php?module=CoreAdminHome&action=optOutJS&div=matomo-opt-out></script>.


this link will not work, as it references the phpbb domain, which is mostlikely different from the matomo-url.

Hm, I will need to think about how to solve this

I guess following the Matomo doc: https://developer.matomo.org/guides/tracking-optout this template should be customised using the parameter MATOMOANALYTICS_URL.

language/en/matomoanalytics_ups.php

Cube707 · 2026-02-12T12:48:05Z

language/en/matomoanalytics_ups.php

matomo also has a secion about how to write a privacy notice which could be helpfull for this:

https://matomo.org/faq/how-to/how-to-write-a-gdpr-compliant-privacy-notice/

I propose, first finish the update, then work on the GDPR notice. Is this ok for you ?

not sure If we are missunderstanding each other or not, but I only meant we should reference it when transferring the message for matomo. A shorte paragraph about matomo usage is enough same as for google-ananlytics, I just meant we dont have to keep the wording so close to the upstream one and might be better of going more in the direction recommended by matomo

I guess you're right, there's a misunderstanding somewhere.

I'll fork your code, follow my ideas, you'll be free to integrate if you like.

Just to make it clear, there absolutely no bad feelings in my words.

I wanted to start a branch with some of the current progress, but didn't get to it

I'll try to do so, do not hesitate to participate ;-)

Signed-off-by: Zorglube <630192+zorglube@users.noreply.github.com>

Cube707 · 2026-02-13T20:40:25Z

I thought about this a bit and decided to push back the discussion and only merge up to f1d39a3 for now. This splits up concenes a but, allows the CI to run properly on master and means we can take a bit more time to work out how to implement the howle privacy notice thing

Cube707 · 2026-02-13T21:02:04Z

superseded by #5

Cube707 · 2026-02-16T21:50:58Z

@zorglube just created a release containing the french translation (and the spelling fixes)

I also merged the upstream changes into the branch dev/privacy-information, but won't continue to work on it today. Next steps would be to migrate the googleanalytics_ucp files to matomo and work on the texts as well as the opt-out button.

If you want to add any of your work, feel free to commit them based on that and open a draft-PR, that way we can both work on it (if I open the PR, you won't have access...)

zorglube · 2026-02-17T10:49:48Z

@zorglube just created a release containing the french translation (and the spelling fixes)

Whoop Whoop !! \o/

I also merged the upstream changes into the branch dev/privacy-information, but won't continue to work on it today. Next steps would be to migrate the googleanalytics_ucp files to matomo and work on the texts as well as the opt-out button.

If you want to add any of your work, feel free to commit them based on that and open a draft-PR, that way we can both work on it (if I open the PR, you won't have access...)

I'll have a look !

iMattPro added 18 commits July 5, 2024 16:14

Update test env.

be04634

Signed-off-by: Matt Friedman <maf675@gmail.com>

Update phpBB requirements

9f84fef

Signed-off-by: Matt Friedman <maf675@gmail.com>

Merge pull request phpbb-extensions#94 from iMattPro/updates

a1f0c51

Maintenance

Repo fixes

91bc050

Merge pull request phpbb-extensions#95 from iMattPro/fixes

9cd33ea

Repo fixes

Update tests.yml

4bf0ee7

Update tests.yml [ci skip]

c81f629

Update tests.yml [ci skip]

bee0df5

Update tests.yml to reusable test framework

6dd2aef

Update tests.yml

2e15661

Update .gitattributes [ci skip]

f1d39a3

Add google analytics privacy information

8d00dfe

Add all translations

f9dd245

Only show privacy info if analytics enabled

c731359

Merge pull request phpbb-extensions#97 from iMattPro/agreement

c930c23

Add Google Analytics privacy information

Bump to 1.1.0

f71af5f

Merge pull request phpbb-extensions#98 from phpbb-extensions/prep-1.1.0

e6798b6

Bump to 1.1.0

Support secure cookies over https

4cfd71c

zorglube marked this pull request as draft February 9, 2026 16:00

Merge pull request phpbb-extensions#100 from iMattPro/issue/99

d1411ab

Support secure cookies

zorglube marked this pull request as ready for review February 10, 2026 12:19

zorglube force-pushed the rebase-on-google-upstream branch from ee796d4 to 511557f Compare February 10, 2026 14:33

zorglube closed this Feb 10, 2026

zorglube force-pushed the rebase-on-google-upstream branch from 08f6d2f to 6300548 Compare February 10, 2026 14:38

zorglube reopened this Feb 10, 2026

zorglube force-pushed the rebase-on-google-upstream branch 2 times, most recently from 1f4461a to 5c1cf99 Compare February 10, 2026 15:27

zorglube closed this Feb 11, 2026

zorglube force-pushed the rebase-on-google-upstream branch from 5c1cf99 to 6300548 Compare February 11, 2026 09:43

zorglube reopened this Feb 11, 2026

Merge branch 'master-googleanalytics' into rebase-on-google-upstream

b74f2c9

Signed-off-by: Zorglube <630192+zorglube@users.noreply.github.com>

zorglube force-pushed the rebase-on-google-upstream branch from 7e17487 to b74f2c9 Compare February 11, 2026 15:08

Cube707 requested changes Feb 11, 2026

View reviewed changes

zorglube added a commit to zorglube/phpbb-matomoanalytics that referenced this pull request Feb 12, 2026

Review

6199449

- Cube707#1 (comment) - Cube707#1 (comment) - Cube707#1 (comment) Signed-off-by: Zorglube <630192+zorglube@users.noreply.github.com>

Review

407b726

- Cube707#1 (comment) - Cube707#1 (comment) - Cube707#1 (comment) - Cube707#1 (comment) Signed-off-by: Zorglube <630192+zorglube@users.noreply.github.com>

zorglube force-pushed the rebase-on-google-upstream branch from 6199449 to 407b726 Compare February 12, 2026 10:48

zorglube added a commit to zorglube/phpbb-matomoanalytics that referenced this pull request Feb 12, 2026

Review:

ffb1769

- Cube707#1 (review) Signed-off-by: Zorglube <630192+zorglube@users.noreply.github.com>

zorglube added a commit to zorglube/phpbb-matomoanalytics that referenced this pull request Feb 12, 2026

Review:

67a60a2

- Cube707#1 (review) Signed-off-by: Zorglube <630192+zorglube@users.noreply.github.com>

zorglube force-pushed the rebase-on-google-upstream branch from ffb1769 to 67a60a2 Compare February 12, 2026 11:39

Review:

51ea72e

- Cube707#1 (review) Signed-off-by: Zorglube <630192+zorglube@users.noreply.github.com>

zorglube force-pushed the rebase-on-google-upstream branch from 67a60a2 to 51ea72e Compare February 12, 2026 11:41

zorglube commented Feb 12, 2026

View reviewed changes

Cube707 requested changes Feb 12, 2026

View reviewed changes

Review : Cube707#1 (comment)

ba8bfb0

Signed-off-by: Zorglube <630192+zorglube@users.noreply.github.com>

Cube707 closed this Feb 13, 2026

               	}
-              	/**
+              	/**

Conversation

zorglube commented Feb 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Cube707 commented Feb 10, 2026

Uh oh!

zorglube commented Feb 10, 2026

Uh oh!

zorglube commented Feb 10, 2026

Uh oh!

Cube707 commented Feb 10, 2026

Uh oh!

Cube707 commented Feb 10, 2026

Uh oh!

Cube707 commented Feb 10, 2026

Uh oh!

zorglube commented Feb 10, 2026 via email • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zorglube commented Feb 11, 2026

Uh oh!

Cube707 commented Feb 11, 2026

Uh oh!

zorglube commented Feb 11, 2026

Uh oh!

Cube707 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zorglube commented Feb 12, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Cube707 commented Feb 13, 2026

Uh oh!

Cube707 commented Feb 13, 2026

Uh oh!

Cube707 commented Feb 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zorglube commented Feb 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

zorglube commented Feb 9, 2026 •

edited

Loading

zorglube commented Feb 10, 2026 via email •

edited

Loading

Cube707 commented Feb 16, 2026 •

edited

Loading