Merge pull request #9221 from piwik/9145

Show a warning when https was not detected correctly on the server

3 files changed, 68 insertions, 2 deletions

diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php
index 305506038a..0f9bf60702 100644
--- a/plugins/CoreAdminHome/CoreAdminHome.php
+++ b/plugins/CoreAdminHome/CoreAdminHome.php
@@ -10,6 +10,7 @@ namespace Piwik\Plugins\CoreAdminHome;
 
 use Piwik\Db;
 use Piwik\Piwik;
+use Piwik\ProxyHttp;
 use Piwik\Settings\UserSetting;
 
 /**
@@ -26,7 +27,9 @@ class CoreAdminHome extends \Piwik\Plugin
             'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
             'AssetManager.getJavaScriptFiles' => 'getJsFiles',
             'UsersManager.deleteUser'         => 'cleanupUser',
-            'API.DocumentationGenerator.@hideExceptForSuperUser' => 'displayOnlyForSuperUser'
+            'API.DocumentationGenerator.@hideExceptForSuperUser' => 'displayOnlyForSuperUser',
+            'Template.jsGlobalVariables' => 'addJsGlobalVariables',
+            'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys'
         );
     }
 
@@ -57,10 +60,28 @@ class CoreAdminHome extends \Piwik\Plugin
         $jsFiles[] = "plugins/CoreAdminHome/javascripts/generalSettings.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/donate.js";
         $jsFiles[] = "plugins/CoreAdminHome/javascripts/pluginSettings.js";
+        $jsFiles[] = "plugins/CoreAdminHome/javascripts/protocolCheck.js";
     }
 
     public function displayOnlyForSuperUser(&$hide)
     {
         $hide = !Piwik::hasUserSuperUserAccess();
     }
+
+    public function addJsGlobalVariables(&$out)
+    {
+        if (ProxyHttp::isHttps()) {
+            $isHttps = 'true';
+        } else {
+            $isHttps = 'false';
+        }
+
+        $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
new file mode 100644
index 0000000000..5bd4148e10
--- /dev/null
+++ b/plugins/CoreAdminHome/javascripts/protocolCheck.js
@@ -0,0 +1,43 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+$(document).ready(function () {
+
+    if (!piwik || !location.protocol) {
+        return;
+    }
+
+    if (!piwik.hasSuperUserAccess) {
+        // we show a potential notification only to super users
+        return;
+    }
+
+    if (piwik.hasServerDetectedHttps) {
+        // https was detected, not needed to show a message
+        return;
+    }
+
+    var isHttpsUsed = 0 === location.protocol.indexOf('https');
+
+    if (!isHttpsUsed) {
+        // not using https anyway, we do not show a message
+        return;
+    }
+
+    var params  = [
+        '"config/config.ini.php"',
+        '"assume_secure_protocol=1"',
+        '"[General]"',
+        '<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') + " " + _pk_translate('CoreAdminHome_ProtocolNotDetectedCorrectlySolution', params);
+
+    var UI = require('piwik/UI');
+    var notification = new UI.Notification();
+    notification.show(message, {context: 'warning'});
+});
diff --git a/plugins/CoreAdminHome/lang/en.json b/plugins/CoreAdminHome/lang/en.json
index 5fe5d64d39..25a85f6475 100644
--- a/plugins/CoreAdminHome/lang/en.json
+++ b/plugins/CoreAdminHome/lang/en.json
@@ -87,6 +87,8 @@
         "YouAreOptedOut": "You are currently opted out.",
         "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..."
+        "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. ",
+        "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"
     }
 }