From d1bbc4a23c292c681dc5c3082fd4c55f54386b65 Mon Sep 17 00:00:00 2001 From: Fabian Dellwing Date: Tue, 14 May 2019 10:42:02 +0200 Subject: [PATCH 1/2] allow to disable tracking failure notifications --- config/global.ini.php | 5 +++++ plugins/CoreAdminHome/Tasks.php | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config/global.ini.php b/config/global.ini.php index f32b4104b71..eccde69b0ce 100755 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -701,6 +701,11 @@ ; breaks and reencrypts SSL connections you can set your custom file here. custom_cacert_pem= +; Whether or not to send weekly emails to superuser about tracking failures. +; Default is 1. +notify_tracking_failures = 1 + + [Tracker] ; Matomo uses "Privacy by default" model. When one of your users visit multiple of your websites tracked in this Matomo, diff --git a/plugins/CoreAdminHome/Tasks.php b/plugins/CoreAdminHome/Tasks.php index 136dfdf7e04..f4fadd43665 100644 --- a/plugins/CoreAdminHome/Tasks.php +++ b/plugins/CoreAdminHome/Tasks.php @@ -174,7 +174,8 @@ public function cleanupTrackingFailures() public function notifyTrackingFailures() { $failures = $this->trackingFailures->getAllFailures(); - if (!empty($failures)) { + $general = Config::getInstance()->General; + if (!empty($failures) && $general['notify_tracking_failures']) { $superUsers = Piwik::getAllSuperUserAccessEmailAddresses(); foreach ($superUsers as $login => $email) { $email = new TrackingFailuresEmail($login, $email, count($failures)); From 358df60019c9580e6cddf51dea615768bd0fcb80 Mon Sep 17 00:00:00 2001 From: Fabian Dellwing Date: Mon, 17 Jun 2019 08:48:10 +0200 Subject: [PATCH 2/2] update wording --- config/global.ini.php | 4 ++-- plugins/CoreAdminHome/Tasks.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/global.ini.php b/config/global.ini.php index eccde69b0ce..d1d26fb0004 100755 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -701,9 +701,9 @@ ; breaks and reencrypts SSL connections you can set your custom file here. custom_cacert_pem= -; Whether or not to send weekly emails to superuser about tracking failures. +; Whether or not to send weekly emails to superusers about tracking failures. ; Default is 1. -notify_tracking_failures = 1 +enable_tracking_failures_notification = 1 [Tracker] diff --git a/plugins/CoreAdminHome/Tasks.php b/plugins/CoreAdminHome/Tasks.php index f4fadd43665..67bbf983650 100644 --- a/plugins/CoreAdminHome/Tasks.php +++ b/plugins/CoreAdminHome/Tasks.php @@ -175,7 +175,7 @@ public function notifyTrackingFailures() { $failures = $this->trackingFailures->getAllFailures(); $general = Config::getInstance()->General; - if (!empty($failures) && $general['notify_tracking_failures']) { + if (!empty($failures) && $general['enable_tracking_failures_notification']) { $superUsers = Piwik::getAllSuperUserAccessEmailAddresses(); foreach ($superUsers as $login => $email) { $email = new TrackingFailuresEmail($login, $email, count($failures));