diff --git a/classes/FrontController.php b/classes/FrontController.php index 1b39e5590..e77e6f1f7 100755 --- a/classes/FrontController.php +++ b/classes/FrontController.php @@ -49,6 +49,9 @@ class FrontControllerCore extends Controller protected $restrictedCountry = false; protected $maintenance = false; + public $display_column_left = true; + public $display_column_right = true; + public static $initialized = false; protected static $currentCustomerGroups; @@ -236,6 +239,8 @@ class FrontControllerCore extends Controller // Are we in a module ? if (preg_match('#^'.preg_quote($this->context->shop->getPhysicalURI(), '#').'modules/([a-zA-Z0-9_-]+?)/(.*)$#', $_SERVER['REQUEST_URI'], $m)) $page_name = 'module-'.$m[1].'-'.str_replace(array('.php', '/'), array('', '-'), $m[2]); + if (Tools::getValue('controller') == 'module' && Tools::getValue('module') != '') + $page_name = 'module-paypal-payment-submit'; $this->context->smarty->assign(Tools::getMetaTags($this->context->language->id, $page_name)); $this->context->smarty->assign('request_uri', Tools::safeOutput(urldecode($_SERVER['REQUEST_URI']))); @@ -382,8 +387,8 @@ class FrontControllerCore extends Controller $this->context->smarty->assign(array( 'HOOK_HEADER' => Hook::exec('displayHeader'), 'HOOK_TOP' => Hook::exec('displayTop'), - 'HOOK_LEFT_COLUMN' => Hook::exec('displayLeftColumn'), - 'HOOK_RIGHT_COLUMN' => Hook::exec('displayRightColumn', array('cart' => $this->context->cart)), + 'HOOK_LEFT_COLUMN' => ($this->display_column_left ? Hook::exec('displayLeftColumn') : ''), + 'HOOK_RIGHT_COLUMN' => ($this->display_column_right ? Hook::exec('displayRightColumn', array('cart' => $this->context->cart)) : ''), )); } diff --git a/modules/bankwire/bankwireController.php b/modules/bankwire/bankwireController.php index c3a0a97eb..af112658b 100644 --- a/modules/bankwire/bankwireController.php +++ b/modules/bankwire/bankwireController.php @@ -35,6 +35,7 @@ class ModuleBankwireController extends ModuleController */ public function postProcess() { + $this->display_column_left = false; if ($this->process == 'validation') $this->processValidation(); } @@ -106,4 +107,4 @@ class ModuleBankwireController extends ModuleController $this->setTemplate('payment_execution.tpl'); } -} \ No newline at end of file +} diff --git a/modules/cheque/chequeController.php b/modules/cheque/chequeController.php index 926cb13c2..41a581371 100644 --- a/modules/cheque/chequeController.php +++ b/modules/cheque/chequeController.php @@ -35,6 +35,7 @@ class ModuleChequeController extends ModuleController */ public function postProcess() { + $this->display_column_left = false; if ($this->process == 'validation') $this->processValidation(); } @@ -112,4 +113,4 @@ class ModuleChequeController extends ModuleController $this->setTemplate('payment_execution.tpl'); } -} \ No newline at end of file +}