Add event to update policy description to support cloud only links appearing #23723
+22
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
michalkleiner
requested changes
Oct 31, 2025
Comment on lines
+23
to
+37
| $description = Piwik::translate('General_ComplianceCNILDescription'); | ||
|
|
||
| $isCloud = false; | ||
|
|
||
| /** | ||
| * This event should only be used by the cloud plugin, to determine that the | ||
| * current instance is a cloud instance. | ||
| */ | ||
| Piwik::postEvent('Policy.onCloudInstance', [$isCloud]); | ||
|
|
||
| if ($isCloud) { | ||
| $description .= ' ' . Piwik::translate('General_ComplianceDPALink', ['<a href="https://matomo.org/matomo-cloud-dpa/">', '</a>']); | ||
| } | ||
|
|
||
| return $description; |
There was a problem hiding this comment.
As we don't want any cloud specific code in core, we should only post an event to update the description, and handle the rest in the cloud plugin.
Passing the policy class through the event as well if the event consumer wanted different updates per policy.
Suggested change
| $description = Piwik::translate('General_ComplianceCNILDescription'); | |
| $isCloud = false; | |
| /** | |
| * This event should only be used by the cloud plugin, to determine that the | |
| * current instance is a cloud instance. | |
| */ | |
| Piwik::postEvent('Policy.onCloudInstance', [$isCloud]); | |
| if ($isCloud) { | |
| $description .= ' ' . Piwik::translate('General_ComplianceDPALink', ['<a href="https://matomo.org/matomo-cloud-dpa/">', '</a>']); | |
| } | |
| return $description; | |
| $description = Piwik::translate('General_ComplianceCNILDescription'); | |
| Piwik::postEvent('CompliancePolicy.updateDescription', [&$description, self::class]); | |
| return $description; |
| "Comparisons": "Comparisons", | ||
| "ComplianceCNILTitle": "CNIL website analytics consent exemption conditions", | ||
| "ComplianceCNILDescription": "This table provides an indication of whether certain settings align with CNIL guidance. It does not guarantee full legal compliance. To qualify for the consent exemption under CNIL rules, all required configurations must be implemented. If any setting is shown as “Non-Compliant,” the exemption conditions are not met, and consent must be obtained from users. If any setting is shown as “Unknown” Matomo cannot determine whether this requirement has been implemented. In such cases, these measures must be manually verified.", | ||
| "ComplianceDPALink": "%1$sData Processing Agreement.%2$s", |
There was a problem hiding this comment.
This would live in the cloud plugin
Comment on lines
+1943
to
+1947
| - | ||
| message: "#^If condition is always false\\.$#" | ||
| count: 1 | ||
| path: core/Policy/CnilPolicy.php | ||
|
|
There was a problem hiding this comment.
This would be gone as we remove the conditional logic and handle it in cloud plugin.
michalkleiner
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
Please include a description of this change and which issue it fixes. If no issue exists yet please include context and what problem it solves.
Review