[-] PROJECT : Module controller now handle the column display (time to go to MacDo :)

This commit is contained in:
fSerny committed 2011-12-22 19:09:50 +00:00
1 parent 17d9a30e97
commit da4d54e7a2
3 files changed
+9 -2

No files matched your search

+7 -2
View File
@@ -49,6 +49,9 @@ class FrontControllerCore extends Controller
protected $restrictedCountry = false; protected $restrictedCountry = false;
protected $maintenance = false; protected $maintenance = false;
public $display_column_left = true;
public $display_column_right = true;
public static $initialized = false; public static $initialized = false;
protected static $currentCustomerGroups; protected static $currentCustomerGroups;
@@ -236,6 +239,8 @@ class FrontControllerCore extends Controller
// Are we in a module ? // Are we in a module ?
if (preg_match('#^'.preg_quote($this->context->shop->getPhysicalURI(), '#').'modules/([a-zA-Z0-9_-]+?)/(.*)$#', $_SERVER['REQUEST_URI'], $m)) 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]); $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(Tools::getMetaTags($this->context->language->id, $page_name));
$this->context->smarty->assign('request_uri', Tools::safeOutput(urldecode($_SERVER['REQUEST_URI']))); $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( $this->context->smarty->assign(array(
'HOOK_HEADER' => Hook::exec('displayHeader'), 'HOOK_HEADER' => Hook::exec('displayHeader'),
'HOOK_TOP' => Hook::exec('displayTop'), 'HOOK_TOP' => Hook::exec('displayTop'),
'HOOK_LEFT_COLUMN' => Hook::exec('displayLeftColumn'), 'HOOK_LEFT_COLUMN' => ($this->display_column_left ? Hook::exec('displayLeftColumn') : ''),
'HOOK_RIGHT_COLUMN' => Hook::exec('displayRightColumn', array('cart' => $this->context->cart)), 'HOOK_RIGHT_COLUMN' => ($this->display_column_right ? Hook::exec('displayRightColumn', array('cart' => $this->context->cart)) : ''),
)); ));
} }
+1
View File
@@ -35,6 +35,7 @@ class ModuleBankwireController extends ModuleController
*/ */
public function postProcess() public function postProcess()
{ {
$this->display_column_left = false;
if ($this->process == 'validation') if ($this->process == 'validation')
$this->processValidation(); $this->processValidation();
} }
+1
View File
@@ -35,6 +35,7 @@ class ModuleChequeController extends ModuleController
*/ */
public function postProcess() public function postProcess()
{ {
$this->display_column_left = false;
if ($this->process == 'validation') if ($this->process == 'validation')
$this->processValidation(); $this->processValidation();
} }