Update Piwik using HTTPS + add a system check

- Piwik will update over HTTPS if curl is supported
- the system check verifies that updating over HTTPS is supported (= curl supported)

1 files changed, 10 insertions, 1 deletions

diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
index 90b0d13aa5..ca72b62ac0 100644
--- a/plugins/CoreUpdater/Controller.php
+++ b/plugins/CoreUpdater/Controller.php
@@ -48,7 +48,8 @@ class Controller extends \Piwik\Plugin\Controller
     protected static function getLatestZipUrl($newVersion)
     {
         if (@Config::getInstance()->Debug['allow_upgrades_to_beta']) {
-            return 'http://builds.piwik.org/piwik-' . $newVersion . '.zip';
+            $url = Config::getInstance()->General['latest_beta_version_url'];
+            return sprintf($url, $newVersion);
         }
         return Config::getInstance()->General['latest_version_url'];
     }
@@ -426,4 +427,12 @@ class Controller extends \Piwik\Plugin\Controller
         return PluginManager::getInstance()->getIncompatiblePlugins($piwikVersion);
     }
 
+    public static function isUpdatingOverHttps()
+    {
+        if (strpos(self::getLatestZipUrl(''), 'https') === false) {
+            return false;
+        }
+
+        return Http::getTransportMethod() === 'curl';
+    }
 }