diff --git a/classes/FrontController.php b/classes/FrontController.php index ab58f4dc0..ca491b509 100755 --- a/classes/FrontController.php +++ b/classes/FrontController.php @@ -412,9 +412,9 @@ class FrontControllerCore extends ControllerCore exit; } - protected function canonicalRedirection($canonicalURL) + protected function canonicalRedirection($canonicalURL = '') { - if (!Configuration::get('PS_CANONICAL_REDIRECT')) + if (!$canonicalURL || !Configuration::get('PS_CANONICAL_REDIRECT')) return; $matchUrl = (($this->ssl && Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; @@ -599,11 +599,11 @@ class FrontControllerCore extends ControllerCore asort($nArray); $this->n = abs((int)(Tools::getValue('n', ((isset($this->context->cookie->nb_item_per_page) AND $this->context->cookie->nb_item_per_page >= 10) ? $this->context->cookie->nb_item_per_page : (int)(Configuration::get('PS_PRODUCTS_PER_PAGE')))))); $this->p = abs((int)(Tools::getValue('p', 1))); - + $current_url = tools::htmlentitiesUTF8($_SERVER['REQUEST_URI']); //delete parameter page $current_url = preg_replace('/(\?)?(&)?p=\d+/', '$1', $current_url); - + $range = 2; /* how many pages around page selected */ if ($this->p < 0) diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php index ff384f800..0573d4850 100644 --- a/controllers/front/AddressController.php +++ b/controllers/front/AddressController.php @@ -281,13 +281,13 @@ class AddressControllerCore extends FrontController $this->context->smarty->assign('ordered_adr_fields', $dlv_adr_fields); } - public function displayHeader() + public function displayHeader($display = true) { if (Tools::getValue('ajax') != 'true') parent::displayHeader(); } - public function displayFooter() + public function displayFooter($display = true) { if (Tools::getValue('ajax') != 'true') parent::displayFooter(); diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php index 90994f718..3555fefb9 100644 --- a/controllers/front/CartController.php +++ b/controllers/front/CartController.php @@ -30,7 +30,7 @@ class CartControllerCore extends FrontController public $php_self = 'cart'; // This is not a public page, so the canonical redirection is disabled - public function canonicalRedirection(){} + public function canonicalRedirection($canonicalURL = ''){} public function ajaxProcess() { diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php index 5e835cc74..b756df14b 100644 --- a/controllers/front/CategoryController.php +++ b/controllers/front/CategoryController.php @@ -43,13 +43,13 @@ class CategoryControllerCore extends FrontController $this->addJS(_THEME_JS_DIR_.'products-comparison.js'); } - public function displayHeader() + public function displayHeader($display = true) { parent::displayHeader(); $this->productSort(); } - public function canonicalRedirection() + public function canonicalRedirection($canonicalURL = '') { if (!Tools::getValue('noredirect') && Validate::isLoadedObject($this->category)) parent::canonicalRedirection($this->context->link->getCategoryLink($this->category)); diff --git a/controllers/front/CmsController.php b/controllers/front/CmsController.php index 7d73635b7..678310746 100644 --- a/controllers/front/CmsController.php +++ b/controllers/front/CmsController.php @@ -32,7 +32,7 @@ class CmsControllerCore extends FrontController public $cms; public $cms_category; - public function canonicalRedirection() + public function canonicalRedirection($canonicalURL = '') { if (Validate::isLoadedObject($this->cms) && ($canonicalURL = $this->context->link->getCMSLink($this->cms))) parent::canonicalRedirection($canonicalURL); diff --git a/controllers/front/ManufacturerController.php b/controllers/front/ManufacturerController.php index f096932a6..4751086fa 100644 --- a/controllers/front/ManufacturerController.php +++ b/controllers/front/ManufacturerController.php @@ -36,7 +36,7 @@ class ManufacturerControllerCore extends FrontController $this->addCSS(_THEME_CSS_DIR_.'product_list.css'); } - public function canonicalRedirection() + public function canonicalRedirection($canonicalURL = '') { if (Validate::isLoadedObject($this->manufacturer)) parent::canonicalRedirection($this->context->link->getManufacturerLink($this->manufacturer)); @@ -103,7 +103,7 @@ class ManufacturerControllerCore extends FrontController } } - public function displayHeader() + public function displayHeader($display = true) { parent::displayHeader(); $this->productSort(); diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php index 53d111399..ad95d8a00 100644 --- a/controllers/front/OrderController.php +++ b/controllers/front/OrderController.php @@ -65,7 +65,7 @@ class OrderControllerCore extends ParentOrderController $this->context->smarty->assign('virtual_cart', $isVirtualCart); } - public function displayHeader() + public function displayHeader($display = true) { if (!Tools::getValue('ajax')) parent::displayHeader(); @@ -149,7 +149,7 @@ class OrderControllerCore extends ParentOrderController 'dlv_adr_fields' => $deliveryAddressFields)); } - public function displayFooter() + public function displayFooter($display = true) { if (!Tools::getValue('ajax')) parent::displayFooter(); diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index 40cbb555b..5384006a7 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -194,13 +194,13 @@ class OrderDetailControllerCore extends FrontController } } - public function displayHeader() + public function displayHeader($display = true) { if (Tools::getValue('ajax') != 'true') parent::displayHeader(); } - public function displayFooter() + public function displayFooter($display = true) { if (Tools::getValue('ajax') != 'true') parent::displayFooter(); diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index b7834d3e8..9a77612e5 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -278,13 +278,13 @@ class OrderOpcControllerCore extends ParentOrderController $this->setTemplate(_PS_THEME_DIR_.'order-opc.tpl'); } - public function displayHeader() + public function displayHeader($display = true) { if (Tools::getValue('ajax') != 'true') parent::displayHeader(); } - public function displayFooter() + public function displayFooter($display = true) { if (Tools::getValue('ajax') != 'true') parent::displayFooter(); diff --git a/controllers/front/OrderReturnController.php b/controllers/front/OrderReturnController.php index 5a1da4554..633bc3c7c 100644 --- a/controllers/front/OrderReturnController.php +++ b/controllers/front/OrderReturnController.php @@ -78,13 +78,13 @@ class OrderReturnControllerCore extends FrontController $this->setTemplate(_PS_THEME_DIR_.'order-return.tpl'); } - public function displayHeader() + public function displayHeader($display = true) { if (Tools::getValue('ajax') != 'true') parent::displayHeader(); } - public function displayFooter() + public function displayFooter($display = true) { if (Tools::getValue('ajax') != 'true') parent::displayFooter(); diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index 01988c024..cd4157e68 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -50,7 +50,7 @@ class ProductControllerCore extends FrontController } } - public function canonicalRedirection() + public function canonicalRedirection($canonicalURL = '') { if (Validate::isLoadedObject($this->product)) parent::canonicalRedirection($this->context->link->getProductLink($this->product)); diff --git a/controllers/front/SearchController.php b/controllers/front/SearchController.php index 1b4b4c09c..335687593 100644 --- a/controllers/front/SearchController.php +++ b/controllers/front/SearchController.php @@ -109,7 +109,7 @@ class SearchControllerCore extends FrontController $this->setTemplate(_PS_THEME_DIR_.'search.tpl'); } - public function displayHeader() + public function displayHeader($display = true) { if (!$this->instantSearch AND !$this->ajaxSearch) parent::displayHeader(); @@ -117,7 +117,7 @@ class SearchControllerCore extends FrontController $this->context->smarty->assign('static_token', Tools::getToken(false)); } - public function displayFooter() + public function displayFooter($display = true) { if (!$this->instantSearch AND !$this->ajaxSearch) parent::displayFooter(); diff --git a/controllers/front/SupplierController.php b/controllers/front/SupplierController.php index 159b11c83..b58842b6d 100644 --- a/controllers/front/SupplierController.php +++ b/controllers/front/SupplierController.php @@ -37,7 +37,7 @@ class SupplierControllerCore extends FrontController $this->addCSS(_THEME_CSS_DIR_.'product_list.css'); } - public function canonicalRedirection() + public function canonicalRedirection($canonicalURL = '') { if (Validate::isLoadedObject($this->supplier)) parent::canonicalRedirection($this->context->link->getSupplierLink($this->supplier)) @@ -105,7 +105,7 @@ class SupplierControllerCore extends FrontController $this->setTemplate(_PS_THEME_DIR_.'supplier-list.tpl'); } - public function displayHeader() + public function displayHeader($display = true) { parent::displayHeader(); $this->productSort(); diff --git a/footer.php b/footer.php index 1de6f6c64..28bf43f72 100644 --- a/footer.php +++ b/footer.php @@ -1,6 +1,6 @@ controller)) $controller = Context::getContext()->controller; else +{ $controller = new FrontController(); - -$controller->displayFooter(); + $controller->init(); +} + +$controller->processFooter(); +Context::getContext()->smarty->display(_PS_THEME_DIR_.'footer.tpl'); \ No newline at end of file diff --git a/header.php b/header.php index 160e00204..caabdf4c7 100644 --- a/header.php +++ b/header.php @@ -1,6 +1,6 @@ controller)) $controller = Context::getContext()->controller; else +{ $controller = new FrontController(); + $controller->init(); +} -$controller->displayHeader(); - +$controller->processHeader(); +Context::getContext()->smarty->display(_PS_THEME_DIR_.'header.tpl'); \ No newline at end of file diff --git a/modules/cheque/payment.php b/modules/cheque/payment.php index 7c923fcaf..0d369afa5 100644 --- a/modules/cheque/payment.php +++ b/modules/cheque/payment.php @@ -1,6 +1,6 @@ customer->isLogged(true)) Tools::redirect('index.php?controller=authentication&back=order.php'); - + $cheque = new Cheque(); echo $cheque->execPayment($cart);