dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] FO : https on TOS in fancybox, follow up https://github.com/PrestaShop/PrestaShop/pull/956

Browse Source
This commit is contained in:
gRoussac
2013-11-12 15:56:04 +01:00
parent 175da3ecf6
commit f0f3679cbd
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/CmsController.php
+7 -3
View File
@@ -30,12 +30,13 @@ class CmsControllerCore extends FrontController
public $assignCase; public $assignCase;
public $cms; public $cms;
public $cms_category; public $cms_category;
public $ssl = false;
public function canonicalRedirection($canonicalURL = '') public function canonicalRedirection($canonicalURL = '')
{ {
if (Tools::getValue('live_edit')) if (Tools::getValue('live_edit'))
return ; return ;
if (Validate::isLoadedObject($this->cms) && ($canonicalURL = $this->context->link->getCMSLink($this->cms))) if (Validate::isLoadedObject($this->cms) && ($canonicalURL = $this->context->link->getCMSLink($this->cms, $this->cms->link_rewrite, $this->ssl)))
parent::canonicalRedirection($canonicalURL); parent::canonicalRedirection($canonicalURL);
else if (Validate::isLoadedObject($this->cms_category) && ($canonicalURL = $this->context->link->getCMSCategoryLink($this->cms_category))) else if (Validate::isLoadedObject($this->cms_category) && ($canonicalURL = $this->context->link->getCMSCategoryLink($this->cms_category)))
parent::canonicalRedirection($canonicalURL); parent::canonicalRedirection($canonicalURL);
@@ -47,13 +48,16 @@ class CmsControllerCore extends FrontController
*/ */
public function init() public function init()
{ {
parent::init();
if ($id_cms = (int)Tools::getValue('id_cms')) if ($id_cms = (int)Tools::getValue('id_cms'))
$this->cms = new CMS($id_cms, $this->context->language->id); $this->cms = new CMS($id_cms, $this->context->language->id);
else if ($id_cms_category = (int)Tools::getValue('id_cms_category')) else if ($id_cms_category = (int)Tools::getValue('id_cms_category'))
$this->cms_category = new CMSCategory($id_cms_category, $this->context->language->id); $this->cms_category = new CMSCategory($id_cms_category, $this->context->language->id);
if (Configuration::get('PS_SSL_ENABLED') && Tools::getValue('content_only') && Tools::getValue('id_cms') == (int)Configuration::get('PS_CONDITIONS_CMS_ID') && Validate::isLoadedObject($this->cms))
$this->ssl = true;
parent::init();
$this->canonicalRedirection(); $this->canonicalRedirection();
// assignCase (1 = CMS page, 2 = CMS category) // assignCase (1 = CMS page, 2 = CMS category)
controllers/front/ParentOrderController.php
+1 -1
View File
@@ -511,7 +511,7 @@ class ParentOrderControllerCore extends FrontController
// TOS // TOS
$cms = new CMS(Configuration::get('PS_CONDITIONS_CMS_ID'), $this->context->language->id); $cms = new CMS(Configuration::get('PS_CONDITIONS_CMS_ID'), $this->context->language->id);
$this->link_conditions = $this->context->link->getCMSLink($cms, $cms->link_rewrite); $this->link_conditions = $this->context->link->getCMSLink($cms, $cms->link_rewrite, (bool)Configuration::get('PS_SSL_ENABLED'));
if (!strpos($this->link_conditions, '?')) if (!strpos($this->link_conditions, '?'))
$this->link_conditions .= '?content_only=1'; $this->link_conditions .= '?content_only=1';
else else