Merge branch 'ticket-12487-HTTPS' into develop

This commit is contained in:
Marion Muszynski 2017-03-09 15:11:41 +01:00
commit 0cd71bde80

View File

@ -17,7 +17,7 @@ $customer = new Customer((int)$cart->id_customer);
if (!Validate::isLoadedObject($customer))
die(Tools::displayError());
$ps_url = 'http://'.$_SERVER['HTTP_HOST'].__PS_BASE_URI__;
$ps_url = ((Configuration::get('PS_SSL_ENABLED') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PORT'] == '443')) ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].__PS_BASE_URI__;
$pbx_site = trim(Configuration::get('PBX_SITE'));
$pbx_rang = trim(Configuration::get('PBX_RANG'));