From 4e5ae47c05b109ed1b5a282c7e8d762c6edda246 Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@matomo.org>
Date: Wed, 29 Jul 2020 10:57:43 +0200
Subject: [PATCH] adjustments for Matomo 4

---
 .gitattributes       |  6 ++++++
 Controller.php       |  4 ++--
 Menu.php             |  4 ++--
 README.md            |  4 ++--
 SecurityInfo.php     | 10 +++-------
 templates/index.twig |  6 +++---
 6 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..d6be3a7
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+# Files excluded from git packages
+tests/ export-ignore
+.github/ export-ignore
+.gitignore export-ignore
+.gitattributes export-ignore
+.travis.yml export-ignore
diff --git a/Controller.php b/Controller.php
index b9d7fb1..c683c91 100644
--- a/Controller.php
+++ b/Controller.php
@@ -2,10 +2,10 @@
 /**
  * Matomo - free/libre analytics platform
  *
- * @link https://matomo.org
+ * @link    https://matomo.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
  */
+
 namespace Piwik\Plugins\SecurityInfo;
 
 use PhpSecInfo;
diff --git a/Menu.php b/Menu.php
index deac99c..e13b251 100644
--- a/Menu.php
+++ b/Menu.php
@@ -2,10 +2,10 @@
 /**
  * Matomo - free/libre analytics platform
  *
- * @link https://matomo.org
+ * @link    https://matomo.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
  */
+
 namespace Piwik\Plugins\SecurityInfo;
 
 use Piwik\Menu\MenuAdmin;
diff --git a/README.md b/README.md
index 5629f26..613c976 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # Matomo SecurityInfo Plugin
 
-[![Build Status](https://travis-ci.org/matomo-org/plugin-SecurityInfo.svg?branch=master)](https://travis-ci.org/matomo-org/plugin-SecurityInfo)
+[![Build Status](https://travis-ci.org/matomo-org/plugin-SecurityInfo.svg?branch=4.x-dev)](https://travis-ci.org/matomo-org/plugin-SecurityInfo)
 
 ## Description
 
 We highly recommend that all Matomo administrators enable the SecurityInfo plugin, and then view the Settings. The plugin is a tool in a multilayered security approach.
 
-Performed checks include for instance usage of latest PHP version, usage of latest Piwik version, usage of PHP ini settings like magic_quotes_gpc and more. 
+Performed checks include for instance usage of latest PHP version, usage of latest Matomo version, usage of PHP ini settings like magic_quotes_gpc and more. 
diff --git a/SecurityInfo.php b/SecurityInfo.php
index 2b804be..8db3bb5 100644
--- a/SecurityInfo.php
+++ b/SecurityInfo.php
@@ -2,21 +2,18 @@
 /**
  * Matomo - free/libre analytics platform
  *
- * @link https://matomo.org
+ * @link    https://matomo.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
  */
-namespace Piwik\Plugins\SecurityInfo;
 
-use Piwik\Config;
-use Piwik\Db;
+namespace Piwik\Plugins\SecurityInfo;
 
 /**
  */
 class SecurityInfo extends \Piwik\Plugin
 {
     /**
-     * @see Piwik\Plugin::registerEvents
+     * @see \Piwik\Plugin::registerEvents
      */
     public function registerEvents()
     {
@@ -29,5 +26,4 @@ public function getStylesheetFiles(&$stylesheets)
     {
         $stylesheets[] = "plugins/SecurityInfo/stylesheets/securityinfo.less";
     }
-
 }
diff --git a/templates/index.twig b/templates/index.twig
index 6141b6d..6d93e25 100755
--- a/templates/index.twig
+++ b/templates/index.twig
@@ -6,12 +6,12 @@
 <div piwik-content-intro>
     <h2>{{ title }}</h2>
     <p>{{ 'SecurityInfo_PluginDescription'|translate }}</p>
-    <p>Learn more: read our guide <a rel='noreferrer' target='_blank' href='https://matomo.org/docs/security/'>Hardening Piwik: How to make Piwik and your web server
+    <p>Learn more: read our guide <a rel='noreferrer' target='_blank' href='https://matomo.org/docs/security/'>Hardening Matomo: How to make Matomo and your web server
             more secure?</a></p>
 
     <p class="alert-info alert">Did you know?
-        The <a target='_blank' href='https://plugins.piwik.org/ActivityLog' rel="noreferrer noopener">Activity Log plugin for Piwik</a> improves your security and diagnostic
-        by letting you quickly review the actions performed by members of your organization or clients in your Piwik.
+        The <a target='_blank' href='https://plugins.matomo.org/ActivityLog' rel="noreferrer noopener">Activity Log plugin for Matomo</a> improves your security and diagnostic
+        by letting you quickly review the actions performed by members of your organization or clients in your Matomo.
     </p>
 </div>
 {% for i,section in results.test_results %}