Merge branch 'ticket-12487-HTTPS' into develop

This commit is contained in:
Marion Muszynski 2017-03-09 12:17:21 +01:00
commit b28f3dbd7e

View File

@ -84,7 +84,7 @@ class soflexibilite extends CarrierModule
$this->author = 'Common-Services';
$this->limited_countries = array('fr');
$this->protocol = Configuration::get('PS_SSL_ENABLED') ? 'https://' : 'http://';
$this->protocol = (Configuration::get('PS_SSL_ENABLED') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PORT'] == '443')) ? 'https://' : 'http://';
$this->url = $this->protocol.htmlspecialchars($_SERVER['HTTP_HOST'], ENT_COMPAT, 'UTF-8').
__PS_BASE_URI__.'modules/'.$this->name;
$this->point_list_url = $this->url.'/functions/point_list.php';