diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php index 2233d12a3..c8f7bcbef 100644 --- a/controllers/front/AddressController.php +++ b/controllers/front/AddressController.php @@ -268,6 +268,8 @@ class AddressControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + /* Secure restriction for guest */ if ($this->context->customer->is_guest) Tools::redirect('index.php?controller=addresses'); @@ -297,7 +299,6 @@ class AddressControllerCore extends FrontController } $this->setTemplate(_PS_THEME_DIR_.'address.tpl'); - parent::initContent(); } /** diff --git a/controllers/front/AddressesController.php b/controllers/front/AddressesController.php index af7b7c84a..9e0efa374 100644 --- a/controllers/front/AddressesController.php +++ b/controllers/front/AddressesController.php @@ -60,6 +60,8 @@ class AddressesControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + $total = 0; $multiple_addresses_formated = array(); $ordered_fields = array(); @@ -102,7 +104,6 @@ class AddressesControllerCore extends FrontController )); $this->setTemplate(_PS_THEME_DIR_.'addresses.tpl'); - parent::initContent(); } } diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php index 03d57f6fe..f75fe3f89 100644 --- a/controllers/front/AuthController.php +++ b/controllers/front/AuthController.php @@ -77,6 +77,8 @@ class AuthControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + $this->context->smarty->assign('genders', Gender::getGenders()); $this->assignDate(); @@ -146,7 +148,6 @@ class AuthControllerCore extends FrontController die(Tools::jsonEncode($return)); } $this->setTemplate(_PS_THEME_DIR_.'authentication.tpl'); - parent::initContent(); } /** diff --git a/controllers/front/BestSalesController.php b/controllers/front/BestSalesController.php index 876cde628..e3d28d729 100644 --- a/controllers/front/BestSalesController.php +++ b/controllers/front/BestSalesController.php @@ -31,6 +31,8 @@ class BestSalesControllerCore extends FrontController public function initContent() { + parent::initContent(); + $this->productSort(); $nbProducts = (int)ProductSale::getNbSales(); $this->pagination($nbProducts); @@ -43,7 +45,6 @@ class BestSalesControllerCore extends FrontController )); $this->setTemplate(_PS_THEME_DIR_.'best-sales.tpl'); - parent::initContent(); } public function setMedia() diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php index a7bea1253..eb32da72c 100644 --- a/controllers/front/CategoryController.php +++ b/controllers/front/CategoryController.php @@ -88,6 +88,8 @@ class CategoryControllerCore extends FrontController public function initContent() { + parent::initContent(); + if (isset($this->context->cookie->id_compare)) $this->context->smarty->assign('compareProducts', CompareProduct::getCompareProducts((int)$this->context->cookie->id_compare)); @@ -116,7 +118,6 @@ class CategoryControllerCore extends FrontController $this->setTemplate(_PS_THEME_DIR_.'category.tpl'); - parent::initContent(); } /** diff --git a/controllers/front/CmsController.php b/controllers/front/CmsController.php index 68f82f501..2862ce9d4 100644 --- a/controllers/front/CmsController.php +++ b/controllers/front/CmsController.php @@ -80,6 +80,8 @@ class CmsControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + $parent_cat = new CMSCategory(1, $this->context->language->id); $this->context->smarty->assign('id_current_lang', $this->context->language->id); $this->context->smarty->assign('home_title', $parent_cat->name); @@ -107,6 +109,5 @@ class CmsControllerCore extends FrontController } $this->setTemplate(_PS_THEME_DIR_.'cms.tpl'); - parent::initContent(); } } diff --git a/controllers/front/CompareController.php b/controllers/front/CompareController.php index 41c952e1b..6473640fe 100644 --- a/controllers/front/CompareController.php +++ b/controllers/front/CompareController.php @@ -74,6 +74,8 @@ class CompareControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + //Clean compare product table CompareProduct::cleanCompareProducts('week'); @@ -153,7 +155,6 @@ class CompareControllerCore extends FrontController $this->context->smarty->assign('hasProduct', $hasProduct); $this->setTemplate(_PS_THEME_DIR_.'products-comparison.tpl'); - parent::initContent(); } } diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php index 874444e65..3e39e2b3d 100644 --- a/controllers/front/ContactController.php +++ b/controllers/front/ContactController.php @@ -203,6 +203,8 @@ class ContactControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + $this->assignOrderList(); $email = Tools::safeOutput(Tools::getValue('from', @@ -226,7 +228,6 @@ class ContactControllerCore extends FrontController )); $this->setTemplate(_PS_THEME_DIR_.'contact-form.tpl'); - parent::initContent(); } /** diff --git a/controllers/front/DiscountController.php b/controllers/front/DiscountController.php index e39478f7f..a20a5e443 100644 --- a/controllers/front/DiscountController.php +++ b/controllers/front/DiscountController.php @@ -38,6 +38,8 @@ class DiscountControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + $discounts = Discount::getCustomerDiscounts($this->context->language->id, $this->context->customer->id, true, false); $nbDiscounts = 0; foreach ($discounts as $discount) @@ -46,7 +48,6 @@ class DiscountControllerCore extends FrontController $this->context->smarty->assign(array('nbDiscounts' => (int)($nbDiscounts), 'discount' => $discounts)); $this->setTemplate(_PS_THEME_DIR_.'discount.tpl'); - parent::initContent(); } } diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php index d1216cafe..fedd39a7a 100644 --- a/controllers/front/GuestTrackingController.php +++ b/controllers/front/GuestTrackingController.php @@ -96,6 +96,8 @@ class GuestTrackingControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + /* Handle brute force attacks */ if (count($this->errors)) sleep(1); @@ -105,7 +107,6 @@ class GuestTrackingControllerCore extends FrontController 'errors' => $this->errors, )); $this->setTemplate(_PS_THEME_DIR_.'guest-tracking.tpl'); - parent::initContent(); } /** diff --git a/controllers/front/HistoryController.php b/controllers/front/HistoryController.php index 673dca86b..ca40ba357 100644 --- a/controllers/front/HistoryController.php +++ b/controllers/front/HistoryController.php @@ -50,6 +50,8 @@ class HistoryControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + if ($orders = Order::getCustomerOrders($this->context->customer->id)) foreach ($orders as &$order) { @@ -64,7 +66,6 @@ class HistoryControllerCore extends FrontController )); $this->setTemplate(_PS_THEME_DIR_.'history.tpl'); - parent::initContent(); } } diff --git a/controllers/front/IdentityController.php b/controllers/front/IdentityController.php index 7e95945d8..888387848 100644 --- a/controllers/front/IdentityController.php +++ b/controllers/front/IdentityController.php @@ -98,6 +98,8 @@ class IdentityControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + if ($this->customer->birthday) $birthday = explode('-', $this->customer->birthday); else @@ -118,7 +120,6 @@ class IdentityControllerCore extends FrontController $this->context->smarty->assign('newsletter', (int)Module::getInstanceByName('blocknewsletter')->active); $this->setTemplate(_PS_THEME_DIR_.'identity.tpl'); - parent::initContent(); } public function setMedia() diff --git a/controllers/front/IndexController.php b/controllers/front/IndexController.php index 9a7b82211..640f76a0e 100644 --- a/controllers/front/IndexController.php +++ b/controllers/front/IndexController.php @@ -35,8 +35,9 @@ class IndexControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + $this->context->smarty->assign('HOOK_HOME', Hook::exec('displayHome')); $this->setTemplate(_PS_THEME_DIR_.'index.tpl'); - parent::initContent(); } } diff --git a/controllers/front/ManufacturerController.php b/controllers/front/ManufacturerController.php index 60f5e1aed..45a018348 100644 --- a/controllers/front/ManufacturerController.php +++ b/controllers/front/ManufacturerController.php @@ -70,6 +70,8 @@ class ManufacturerControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + if (Validate::isLoadedObject($this->manufacturer) && $this->manufacturer->active && $this->manufacturer->isAssociatedToGroupShop()) { $this->productSort(); @@ -81,7 +83,6 @@ class ManufacturerControllerCore extends FrontController $this->assignAll(); $this->setTemplate(_PS_THEME_DIR_.'manufacturer-list.tpl'); } - parent::initContent(); } /** diff --git a/controllers/front/MyAccountController.php b/controllers/front/MyAccountController.php index 973613277..962cfa040 100644 --- a/controllers/front/MyAccountController.php +++ b/controllers/front/MyAccountController.php @@ -44,6 +44,8 @@ class MyAccountControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + $has_address = $this->context->customer->getAddresses($this->context->language->id); $this->context->smarty->assign(array( 'has_customer_an_address' => empty($has_address), @@ -53,7 +55,6 @@ class MyAccountControllerCore extends FrontController $this->context->smarty->assign('HOOK_CUSTOMER_ACCOUNT', Hook::exec('displayCustomerAccount')); $this->setTemplate(_PS_THEME_DIR_.'my-account.tpl'); - parent::initContent(); } } diff --git a/controllers/front/NewProductsController.php b/controllers/front/NewProductsController.php index 4bee20a2c..bfcafb89f 100644 --- a/controllers/front/NewProductsController.php +++ b/controllers/front/NewProductsController.php @@ -41,6 +41,8 @@ class NewProductsControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + $this->productSort(); $nbProducts = (int)Product::getNewProducts( @@ -60,7 +62,6 @@ class NewProductsControllerCore extends FrontController )); $this->setTemplate(_PS_THEME_DIR_.'new-products.tpl'); - parent::initContent(); } } diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php index dfd3e37d6..1b40ede70 100644 --- a/controllers/front/OrderConfirmationController.php +++ b/controllers/front/OrderConfirmationController.php @@ -70,6 +70,8 @@ class OrderConfirmationControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + $this->context->smarty->assign(array( 'is_guest' => $this->context->customer->is_guest, 'HOOK_ORDER_CONFIRMATION' => $this->displayOrderConfirmation(), @@ -87,7 +89,6 @@ class OrderConfirmationControllerCore extends FrontController } $this->setTemplate(_PS_THEME_DIR_.'order-confirmation.tpl'); - parent::initContent(); } /** diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php index ba2294b10..5617a53ba 100644 --- a/controllers/front/OrderController.php +++ b/controllers/front/OrderController.php @@ -92,6 +92,8 @@ class OrderControllerCore extends ParentOrderController { global $isVirtualCart; + parent::initContent(); + if (Tools::isSubmit('ajax') && Tools::getValue('method') == 'updateExtraCarrier') { // Change virtualy the currents delivery options @@ -186,7 +188,6 @@ class OrderControllerCore extends ParentOrderController 'currencyFormat' => $this->context->currency->format, 'currencyBlank' => $this->context->currency->blank, )); - parent::initContent(); } protected function processAddressFormat() diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index 458388264..dfb1dba3d 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -132,6 +132,8 @@ class OrderDetailControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + if (!($id_order = (int)Tools::getValue('id_order')) || !Validate::isUnsignedId($id_order)) $this->errors[] = Tools::displayError('Order ID required'); else @@ -204,7 +206,6 @@ class OrderDetailControllerCore extends FrontController } $this->setTemplate(_PS_THEME_DIR_.'order-detail.tpl'); - parent::initContent(); } public function setMedia() diff --git a/controllers/front/OrderFollowController.php b/controllers/front/OrderFollowController.php index 5f369b0c8..96c5d6740 100644 --- a/controllers/front/OrderFollowController.php +++ b/controllers/front/OrderFollowController.php @@ -78,6 +78,8 @@ class OrderFollowControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + $ordersReturn = OrderReturn::getOrdersReturn($this->context->customer->id); if (Tools::isSubmit('errorQuantity')) $this->context->smarty->assign('errorQuantity', true); @@ -93,7 +95,6 @@ class OrderFollowControllerCore extends FrontController $this->context->smarty->assign('ordersReturn', $ordersReturn); $this->setTemplate(_PS_THEME_DIR_.'order-follow.tpl'); - parent::initContent(); } public function setMedia() diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index a0acd35c0..0e2baa77d 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -271,6 +271,8 @@ class OrderOpcControllerCore extends ParentOrderController */ public function initContent() { + parent::initContent(); + // SHOPPING CART $this->_assignSummaryInformations(); // WRAPPING AND TOS @@ -324,7 +326,6 @@ class OrderOpcControllerCore extends ParentOrderController $this->_processAddressFormat(); $this->setTemplate(_PS_THEME_DIR_.'order-opc.tpl'); - parent::initContent(); } protected function _getGuestInformations() diff --git a/controllers/front/OrderReturnController.php b/controllers/front/OrderReturnController.php index fd0094c22..4335a68e1 100644 --- a/controllers/front/OrderReturnController.php +++ b/controllers/front/OrderReturnController.php @@ -78,12 +78,13 @@ class OrderReturnControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + $this->context->smarty->assign(array( 'errors' => $this->errors, 'nbdaysreturn' => (int)(Configuration::get('PS_ORDER_RETURN_NB_DAYS')) )); $this->setTemplate(_PS_THEME_DIR_.'order-return.tpl'); - parent::initContent(); } public function displayAjax() diff --git a/controllers/front/OrderSlipController.php b/controllers/front/OrderSlipController.php index 93fc260cb..7639f5211 100644 --- a/controllers/front/OrderSlipController.php +++ b/controllers/front/OrderSlipController.php @@ -47,9 +47,10 @@ class OrderSlipControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + $this->context->smarty->assign('ordersSlip', OrderSlip::getOrdersSlip((int)$this->context->cookie->id_customer)); $this->setTemplate(_PS_THEME_DIR_.'order-slip.tpl'); - parent::initContent(); } } diff --git a/controllers/front/PageNotFoundController.php b/controllers/front/PageNotFoundController.php index ffc2ddf66..723e2ea12 100644 --- a/controllers/front/PageNotFoundController.php +++ b/controllers/front/PageNotFoundController.php @@ -36,8 +36,9 @@ class PageNotFoundControllerCore extends FrontController */ public function initContent() { - $this->setTemplate(_PS_THEME_DIR_.'404.tpl'); parent::initContent(); + + $this->setTemplate(_PS_THEME_DIR_.'404.tpl'); } } diff --git a/controllers/front/PasswordController.php b/controllers/front/PasswordController.php index 985a6e872..9b98f2b2a 100644 --- a/controllers/front/PasswordController.php +++ b/controllers/front/PasswordController.php @@ -111,8 +111,9 @@ class PasswordControllerCore extends FrontController */ public function initContent() { - $this->setTemplate(_PS_THEME_DIR_.'password.tpl'); parent::initContent(); + + $this->setTemplate(_PS_THEME_DIR_.'password.tpl'); } } diff --git a/controllers/front/PricesDropController.php b/controllers/front/PricesDropController.php index d9876f880..6307255ce 100644 --- a/controllers/front/PricesDropController.php +++ b/controllers/front/PricesDropController.php @@ -41,6 +41,8 @@ class PricesDropControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + $this->productSort(); $nbProducts = Product::getPricesDrop($this->context->language->id, null, null, true); $this->pagination($nbProducts); @@ -53,7 +55,6 @@ class PricesDropControllerCore extends FrontController )); $this->setTemplate(_PS_THEME_DIR_.'prices-drop.tpl'); - parent::initContent(); } } diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index b0c1ff775..6df70602e 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -132,6 +132,8 @@ class ProductControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + if (!$this->errors) { // Assign to the template the id of the virtual product. "0" if the product is not downloadable. @@ -228,7 +230,6 @@ class ProductControllerCore extends FrontController $this->context->smarty->assign('errors', $this->errors); $this->setTemplate(_PS_THEME_DIR_.'product.tpl'); - parent::initContent(); } /** diff --git a/controllers/front/SearchController.php b/controllers/front/SearchController.php index c9810f86d..b8a79024a 100644 --- a/controllers/front/SearchController.php +++ b/controllers/front/SearchController.php @@ -56,6 +56,8 @@ class SearchControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + $query = urldecode(Tools::getValue('q')); if ($this->ajax_search) { @@ -122,7 +124,6 @@ class SearchControllerCore extends FrontController $this->context->smarty->assign('add_prod_display', Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY')); $this->setTemplate(_PS_THEME_DIR_.'search.tpl'); - parent::initContent(); } public function displayHeader($display = true) diff --git a/controllers/front/SitemapController.php b/controllers/front/SitemapController.php index bdbd3d2b5..df60789be 100644 --- a/controllers/front/SitemapController.php +++ b/controllers/front/SitemapController.php @@ -42,6 +42,8 @@ class SitemapControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + $this->context->smarty->assign('categoriesTree', Category::getRootCategory()->recurseLiteCategTree(0)); $this->context->smarty->assign('categoriescmsTree', CMSCategory::getRecurseCategory($this->context->language->id, 1, 1, 1)); $this->context->smarty->assign('voucherAllowed', (int)Configuration::get('PS_VOUCHERS')); @@ -54,6 +56,5 @@ class SitemapControllerCore extends FrontController $this->context->smarty->assign('display_store', Configuration::get('PS_STORES_DISPLAY_SITEMAP')); $this->setTemplate(_PS_THEME_DIR_.'sitemap.tpl'); - parent::initContent(); } } diff --git a/controllers/front/StoresController.php b/controllers/front/StoresController.php index 88a8971fe..583b5766e 100644 --- a/controllers/front/StoresController.php +++ b/controllers/front/StoresController.php @@ -238,6 +238,8 @@ class StoresControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + if (Configuration::get('PS_STORES_SIMPLIFIED')) $this->assignStoresSimplified(); else @@ -251,7 +253,6 @@ class StoresControllerCore extends FrontController )); $this->setTemplate(_PS_THEME_DIR_.'stores.tpl'); - parent::initContent(); } public function setMedia() diff --git a/controllers/front/SupplierController.php b/controllers/front/SupplierController.php index 96a3c5be3..15b8a186c 100644 --- a/controllers/front/SupplierController.php +++ b/controllers/front/SupplierController.php @@ -72,6 +72,8 @@ class SupplierControllerCore extends FrontController */ public function initContent() { + parent::initContent(); + if (Validate::isLoadedObject($this->supplier) && $this->supplier->active && $this->supplier->isAssociatedToGroupShop()) { $this->productSort(); // productSort must be called before assignOne @@ -83,7 +85,6 @@ class SupplierControllerCore extends FrontController $this->assignAll(); $this->setTemplate(_PS_THEME_DIR_.'supplier-list.tpl'); } - parent::initContent(); } /**