fix market issues over https. Fixes #783

impresspages · May 9, 2016 · ed18158 · ed18158
1 parent f7f163d
commit ed18158
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/Ip/Config.php b/Ip/Config.php
@@ -13,6 +13,7 @@
 class Config
 {
     protected $config;
+    protected $protocolUrl;
     protected $protocol;
 
     /**
@@ -69,10 +70,19 @@ public function __construct($config, $server = null)
 
 
         if ((isset($server['HTTPS']) && strtolower($server['HTTPS']) == "on") || strtolower(getenv('HTTP_X_FORWARDED_PROTO')) === 'https') {
-            $this->protocol = 'https://';
+            $this->protocol = 'https';
         } else {
-            $this->protocol = 'http://';
+            $this->protocol = 'http';
         }
+        $this->protocolUrl = $this->protocol . '://';
+    }
+
+    /**
+     *
+     */
+    public function protocol()
+    {
+        return $this->protocol;
     }
 
     public function database()
@@ -92,7 +102,7 @@ public function tablePrefix()
      */
     public function baseUrl($protocol = null)
     {
-        $prot = $this->protocol;
+        $prot = $this->protocolUrl;
         if ($protocol !== null) {
             $prot = $protocol;
         }

diff --git a/Ip/Internal/Design/Model.php b/Ip/Internal/Design/Model.php
@@ -182,7 +182,7 @@ public function getMarketUrl()
             return '';
         }
 
-        return ipConfig()->get('themeMarketUrl', 'http://market.impresspages.org/themes-v1/?version=4&cms=1');
+        return ipConfig()->get('themeMarketUrl', ipConfig()->protocol() . '://market.impresspages.org/themes-v1/?version=4&cms=1');
     }
 
 

diff --git a/Ip/Internal/Plugins/Model.php b/Ip/Internal/Plugins/Model.php
@@ -389,7 +389,7 @@ public static function marketUrl()
             return '';
         }
 
-        $marketUrl = ipConfig()->get('pluginMarketUrl', 'http://market.impresspages.org/plugins-v1/?version=4&cms=1');
+        $marketUrl = ipConfig()->get('pluginMarketUrl', ipConfig()->protocol() . '://market.impresspages.org/plugins-v1/?version=4&cms=1');
 
         return $marketUrl;
     }

diff --git a/Ip/Internal/Repository/Event.php b/Ip/Internal/Repository/Event.php
@@ -20,7 +20,7 @@ public static function ipBeforeController()
             ipAddJs('Ip/Internal/System/assets/market.js');
             ipAddJs('Ip/Internal/Core/assets/js/easyXDM/easyXDM.min.js');
 
-            $marketUrl = ipConfig()->get('imageMarketUrl', 'http://market.impresspages.org/images-v1/');
+            $marketUrl = ipConfig()->get('imageMarketUrl', ipConfig()->protocol() . '://market.impresspages.org/images-v1/');
 
             $popupData = array(
                 'marketUrl' => $marketUrl,