Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@matomo.org>2020-10-27 18:19:45 +0300
committerGitHub <noreply@github.com>2020-10-27 18:19:45 +0300
commiteb1543097d188c322b8470fea240fb62e39d01dd (patch)
tree542900fe35e0c24bb03fa1ea37326b34ec23259e /plugins/PrivacyManager/templates/privacySettings.twig
parent8f703bbc9d914d013c124d1e1d0f2ecd47d88ec4 (diff)
Adds possibility to force cookie less tracking (#16592)
* Add system and measurable setting to enable cookie less tracking * Never return a visitor id if cookieless tracking is forced * Adds custom tracker.js to prevent cookies * ignore exceptions * cache setting in site attributes for faster tracking * updates expected test files * ensure getVisitorId also works without idSite in request * fix js tests * store global cookie flag in config to avoid failures when building tracker js * use config instead of systemsetting * use a new event to update the tracker file * Fix handling in Request::getVisitorId() * improve setting descriptions * Revert "use config instead of systemsetting" This reverts commit 1fdfb6808415d2984726cedfe2644de31086f927. * Revert "store global cookie flag in config to avoid failures when building tracker js" This reverts commit 2587dbb851d3e44f2740e39c91af3213930cad6f. * code improvements * Reset storage to ensure it's not filled with invalid database objects * updates expected test files * Remove measurable setting again * move setting from systemsettings to ip anonymization settings * Show a warning if tracker file is not writable * updates expected test file * apply some review feedback * fix test * updates expected screenshot * apply review feedback * submodule update
Diffstat (limited to 'plugins/PrivacyManager/templates/privacySettings.twig')
-rw-r--r--plugins/PrivacyManager/templates/privacySettings.twig10
1 files changed, 10 insertions, 0 deletions
diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig
index 8c5515578a..a7609d77f7 100644
--- a/plugins/PrivacyManager/templates/privacySettings.twig
+++ b/plugins/PrivacyManager/templates/privacySettings.twig
@@ -56,6 +56,16 @@
inline-help="{{ 'PrivacyManager_AnonymizeOrderIdNote'|translate|e('html_attr') }}">
</div>
+ <div piwik-field uicontrol="checkbox" name="forceCookielessTracking"
+ ng-model="anonymizeIp.forceCookielessTracking"
+ data-title="{{ 'PrivacyManager_ForceCookielessTracking'|translate|e('html_attr') }}"
+ value="{{ anonymizeIP.forceCookielessTracking }}"
+ inline-help="{{ 'PrivacyManager_ForceCookielessTrackingDescription'|translate(trackerFileName)|e('html_attr') }}<br/><br/><em>{{ 'PrivacyManager_ForceCookielessTrackingDescription2'|translate|e('html_attr') }}</em>
+ {%- if not trackerWritable %}
+ <br /><br /><p class='alert-warning alert'>{{ 'PrivacyManager_ForceCookielessTrackingDescriptionNotWritable'|translate(trackerFileName)|e('html_attr') }}</p>
+ {% endif -%}">
+ </div>
+
<div piwik-field uicontrol="select" name="anonymizeReferrer"
ng-model="anonymizeIp.anonymizeReferrer"
options='{{ referrerAnonymizationOptions|json_encode|e('html_attr') }}'