From 82cb9f8ba9a9e45fc6ab033b43c211adbd9d3c41 Mon Sep 17 00:00:00 2001 From: emily-d Date: Wed, 23 Jan 2013 22:30:18 +0100 Subject: [PATCH 1/3] [-] FO : PS_SSL_ENABLED and mod_rewrite yields a 301 error (Too Many Redirects) on pages served by https. See http://www.prestashop.com/forums/topic/217724-activer-le-ssl-url-simplifiee-mod-rewrite-ne-marche-pas-erreur-301-sur-les-pages-commandes for more info. --- classes/Tools.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/classes/Tools.php b/classes/Tools.php index 8ec0b5ac0..b8c511c8a 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -267,6 +267,9 @@ class ToolsCore // $_SERVER['SSL'] exists only in some specific configuration if (isset($_SERVER['SSL'])) return ($_SERVER['SSL'] == 1 || strtolower($_SERVER['SSL']) == 'on'); + // $_SERVER['REDIRECT_HTTPS'] exists only in some specific configuration (e.g. Gandi's simple hosting) + if (isset($_SERVER['REDIRECT_HTTPS'])) + return ($_SERVER['REDIRECT_HTTPS'] == 1 || strtolower($_SERVER['REDIRECT_HTTPS']) == 'on'); return false; } From 43a333ff03f582ee7563467315bac2b61e0f25bf Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Tue, 21 May 2013 11:28:24 +0200 Subject: [PATCH 2/3] //remove useless comments --- classes/Tools.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Tools.php b/classes/Tools.php index dffeb9528..f5ca5a939 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -267,7 +267,7 @@ class ToolsCore // $_SERVER['SSL'] exists only in some specific configuration if (isset($_SERVER['SSL'])) return ($_SERVER['SSL'] == 1 || strtolower($_SERVER['SSL']) == 'on'); - // $_SERVER['REDIRECT_HTTPS'] exists only in some specific configuration (e.g. Gandi's simple hosting) + // $_SERVER['REDIRECT_HTTPS'] exists only in some specific configuration if (isset($_SERVER['REDIRECT_HTTPS'])) return ($_SERVER['REDIRECT_HTTPS'] == 1 || strtolower($_SERVER['REDIRECT_HTTPS']) == 'on'); From 2542e9716409d5c9c29d8dc7599e8e10e6a615b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 21 May 2013 15:25:58 +0200 Subject: [PATCH 3/3] [-] BO: Fix PHP warning on orderslip generation without ecotax #PSCFV-8743 --- classes/pdf/HTMLTemplateOrderSlip.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/pdf/HTMLTemplateOrderSlip.php b/classes/pdf/HTMLTemplateOrderSlip.php index 06b8b2e23..70f395b75 100644 --- a/classes/pdf/HTMLTemplateOrderSlip.php +++ b/classes/pdf/HTMLTemplateOrderSlip.php @@ -211,6 +211,8 @@ class HTMLTemplateOrderSlipCore extends HTMLTemplateInvoice if ($ecotax) foreach ($tmp_tax_infos as $rate => &$row) { + if (!isset($ecotax[$rate])) + continue $row['total_price_tax_excl'] -= $ecotax[$rate]['ecotax_tax_excl']; $row['total_amount'] -= ($ecotax[$rate]['ecotax_tax_incl'] - $ecotax[$rate]['ecotax_tax_excl']); }