Minor code review items: anonimise URL referrer, split strings in two...

3 files changed, 6 insertions, 4 deletions

diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php
index a4bf64480f..0f9bf60702 100644
--- a/plugins/CoreAdminHome/CoreAdminHome.php
+++ b/plugins/CoreAdminHome/CoreAdminHome.php
@@ -76,11 +76,12 @@ class CoreAdminHome extends \Piwik\Plugin
             $isHttps = 'false';
         }
 
-        $out .= "piwik.hasServerDetectedHttps = $isHttps;";
+        $out .= "piwik.hasServerDetectedHttps = $isHttps;\n";
     }
 
     public function getClientSideTranslationKeys(&$translationKeys)
     {
         $translationKeys[] = 'CoreAdminHome_ProtocolNotDetectedCorrectly';
+        $translationKeys[] = 'CoreAdminHome_ProtocolNotDetectedCorrectlySolution';
     }
 }
diff --git a/plugins/CoreAdminHome/javascripts/protocolCheck.js b/plugins/CoreAdminHome/javascripts/protocolCheck.js
index 94b3cdb23b..5bd4148e10 100644
--- a/plugins/CoreAdminHome/javascripts/protocolCheck.js
+++ b/plugins/CoreAdminHome/javascripts/protocolCheck.js
@@ -32,10 +32,10 @@ $(document).ready(function () {
         '"config/config.ini.php"',
         '"assume_secure_protocol=1"',
         '"[General]"',
-        '<a href="https://piwik.org/faq/how-to-install/faq_98/" target="_blank">',
+        '<a href="?module=Proxy&action=redirect&url=https://piwik.org/faq/how-to-install/faq_98/" target="_blank">',
         '</a>'
     ];
-    var message = _pk_translate('CoreAdminHome_ProtocolNotDetectedCorrectly', params);
+    var message = _pk_translate('CoreAdminHome_ProtocolNotDetectedCorrectly') + " " + _pk_translate('CoreAdminHome_ProtocolNotDetectedCorrectlySolution', params);
 
     var UI = require('piwik/UI');
     var notification = new UI.Notification();
diff --git a/plugins/CoreAdminHome/lang/en.json b/plugins/CoreAdminHome/lang/en.json
index b7bb7f7f04..25a85f6475 100644
--- a/plugins/CoreAdminHome/lang/en.json
+++ b/plugins/CoreAdminHome/lang/en.json
@@ -88,6 +88,7 @@
         "YouMayOptOut": "You may choose not to have a unique web analytics cookie identification number assigned to your computer to avoid the aggregation and analysis of data collected on this website.",
         "YouMayOptOutBis": "To make that choice, please click below to receive an opt-out cookie.",
         "OptingYouOut": "Opting you out, please wait...",
-        "ProtocolNotDetectedCorrectly": "You are currently viewing Piwik over a secure SSL connection (using https), but Piwik could only detect a non secure connection on the server. To make sure Piwik correctly requests your content over HTTPS, you may edit your %s file and configure either your proxy settings, or you may add the line %s below the %s section. %sLearn more%s"
+        "ProtocolNotDetectedCorrectly": "You are currently viewing Piwik over a secure SSL connection (using https), but Piwik could only detect a non secure connection on the server. ",
+        "ProtocolNotDetectedCorrectlySolution": "To make sure Piwik securely requests and serves your content over HTTPS, you may edit your %s file and either configure your proxy settings, or you may add the line %s below the %s section. %sLearn more%s"
     }
 }