Merge pull request #137 from Digitalist-Open-Cloud/URL_email_report

Adding Matomo URL to email report

Author: snake14

BanIpNotificationEmail.php

@@ -36,10 +36,15 @@ public function send($ipRange, $ip, $email, $maxActionsAllowed, $locationData, $
             $mail->setFrom($mail->getFrom(), 'Web Analytics Reports');
         }
 
+
         $mailBody = 'This is for your information. The following IP was banned because visit tried to track more than ' . Common::sanitizeInputValue($maxActionsAllowed) . ' actions:';
         $mailBody .= PHP_EOL . PHP_EOL . '"' . Common::sanitizeInputValue($ipRange) . '"' . PHP_EOL;
         $instanceId = SettingsPiwik::getPiwikInstanceId();
-
+        $matomoUrl = SettingsPiwik::getPiwikUrl();
+        if (!empty($matomoUrl)) {
+            $url = parse_url($matomoUrl);
+            $matomoHost = $url['host'];
+        }
 
         if (!empty($_GET)) {
             $get = $_GET;
@@ -62,6 +67,9 @@ public function send($ipRange, $ip, $email, $maxActionsAllowed, $locationData, $
         if (!empty($instanceId)) {
             $mailBody .= PHP_EOL . 'Instance ID: ' . Common::sanitizeInputValue($instanceId);
         }
+        if (!empty($matomoHost)) {
+            $mailBody .= PHP_EOL . 'URL: ' . Common::sanitizeInputValue($matomoHost);
+        }
         $mailBody .= PHP_EOL . 'Current date (UTC): ' . Common::sanitizeInputValue($nowDateTime) . '
 IP as detected in header: ' . Common::sanitizeInputValue($ip) . '
 GET request info: ' . json_encode($get) . '

tests/Integration/NotificationEmailTest.php

@@ -43,6 +43,7 @@ public function test_send_ValidEmail()
 
 "10.10.10.10/12"
 
+URL: localhost
 Current date (UTC): 2020-12-14 01:42:27
 IP as detected in header: 127.0.0.1
 GET request info: []