diff --git a/controllers/front/CmsController.php b/controllers/front/CmsController.php index 01a4726bb..4eca2e8f6 100644 --- a/controllers/front/CmsController.php +++ b/controllers/front/CmsController.php @@ -79,8 +79,7 @@ class CmsControllerCore extends FrontController } elseif (Validate::isLoadedObject($this->cms_category) && $this->cms_category->active && $this->cms_category->isAssociatedToShop()) { $this->assignCase = 2; } else { - header('HTTP/1.1 404 Not Found'); - header('Status: 404 Not Found'); + Tools::redirect($this->context->link->getPageLink('pagenotfound')); } } @@ -134,6 +133,8 @@ class CmsControllerCore extends FrontController 'path' => ($this->cms_category->id !== 1) ? Tools::getPath($this->cms_category->id, $this->cms_category->name, false, 'CMS') : '', 'body_classes' => array($this->php_self.'-'.$this->cms_category->id, $this->php_self.'-'.$this->cms_category->link_rewrite) )); + } else { + Tools::redirect($this->context->link->getPageLink('pagenotfound')); } $this->setTemplate(_PS_THEME_DIR_.'cms.tpl'); diff --git a/modules/blocknavigationmenu/blocknavigationmenu.php b/modules/blocknavigationmenu/blocknavigationmenu.php index b6d2437b5..0c75505cc 100644 --- a/modules/blocknavigationmenu/blocknavigationmenu.php +++ b/modules/blocknavigationmenu/blocknavigationmenu.php @@ -103,6 +103,45 @@ class blocknavigationmenu extends Module } } + public function hookActionObjectCMSUpdateAfter($params) + { + $id_cms = $params['object']->id; + // Disabling all the related navigation links to disabled CMS page + if (!$params['object']->active) { + $this->disableRelatedLinks($id_cms); + } + } + + public function hookActionObjectCMSDeleteAfter($params) + { + $id_cms = $params['object']->id; + // Disabling all the related navigation links to deleted CMS page + $this->deleteRelatedLinks($id_cms); + } + + public function disableRelatedLinks($id_cms) + { + $objCustomNavigationLink = new WkCustomNavigationLink(); + if ($navLinks = $objCustomNavigationLink->getRelatedNavLinksByIdCMS($id_cms)) { + foreach ($navLinks as $navLink) { + $objCustomNavigationLink = new WkCustomNavigationLink((int) $navLink['id_navigation_link']); + $objCustomNavigationLink->active = 0; + $objCustomNavigationLink->save(); + } + } + } + + public function deleteRelatedLinks($id_cms) + { + $objCustomNavigationLink = new WkCustomNavigationLink(); + if ($navLinks = $objCustomNavigationLink->getRelatedNavLinksByIdCMS($id_cms)) { + foreach ($navLinks as $navLink) { + $objCustomNavigationLink = new WkCustomNavigationLink((int) $navLink['id_navigation_link']); + $objCustomNavigationLink->delete(); + } + } + } + public function install() { $objModuleDb = new WkBlockNavigationMenuDb(); @@ -125,6 +164,8 @@ class blocknavigationmenu extends Module array ( 'footer', 'actionObjectLanguageAddAfter', + 'actionObjectCMSUpdateAfter', + 'actionObjectCMSDeleteAfter', 'displayDefaultNavigationHook', 'displayNavigationHook', 'top', diff --git a/modules/blocknavigationmenu/classes/WkCustomNavigationLink.php b/modules/blocknavigationmenu/classes/WkCustomNavigationLink.php index b7e62b93e..8fc7a70f8 100644 --- a/modules/blocknavigationmenu/classes/WkCustomNavigationLink.php +++ b/modules/blocknavigationmenu/classes/WkCustomNavigationLink.php @@ -237,4 +237,13 @@ class WkCustomNavigationLink extends ObjectModel $objCustomNavigationLink->save(); return true; } + + public function getRelatedNavLinksByIdCMS($idCMS) + { + return Db::getInstance()->executeS(' + SELECT * FROM `'._DB_PREFIX_.'htl_custom_navigation_link` + WHERE `id_cms`='.(int) $idCMS + ); + } + } diff --git a/modules/blocknavigationmenu/controllers/admin/AdminCustomNavigationLinkSettingController.php b/modules/blocknavigationmenu/controllers/admin/AdminCustomNavigationLinkSettingController.php index 6e1668b84..fda9152e1 100644 --- a/modules/blocknavigationmenu/controllers/admin/AdminCustomNavigationLinkSettingController.php +++ b/modules/blocknavigationmenu/controllers/admin/AdminCustomNavigationLinkSettingController.php @@ -179,6 +179,16 @@ class AdminCustomNavigationLinkSettingController extends ModuleAdminController if (Validate::isLoadedObject($objNavigationLink)) { $smartyVars['navigationLinkInfo'] = (array) $objNavigationLink; $smartyVars['edit'] = 1; + if (!$objNavigationLink->is_custom_link + && Validate::isLoadedObject($objCMS = new CMS($objNavigationLink->id_cms)) + ) { + $smartyVars['id_cms_category'] = $objCMS->id_cms_category; + if (empty($this->errors) + && !$objCMS->active + ) { + $this->warnings[] = $this->l('To enable this link you need to enable the related CMS page first'); + } + } } // send theme's front pages $themePages = array(); @@ -196,7 +206,31 @@ class AdminCustomNavigationLinkSettingController extends ModuleAdminController $smartyVars['themePages'] = $themePages; $smartyVars['languages'] = Language::getLanguages(false); $smartyVars['currentLang'] = Language::getLanguage((int) Configuration::get('PS_LANG_DEFAULT')); - $smartyVars['cmsPages'] = CMS::getCMSPages($smartyVars['currentLang'], 1); + $categoryWiseCmsPages = array(); + if ($cmsPages = CMS::getCMSPages($smartyVars['currentLang'], null, false)) { + foreach ($cmsPages as $page) { + $cmsPage['id_cms'] = $page['id_cms']; + $cmsPage['meta_title'] = $page['meta_title']; + $categoryWiseCmsPages[$page['id_cms_category']][] = $cmsPage; + } + } + + if ($cmsCategories = CMSCategory::getCategories($this->context->language->id, false, false)) { + foreach ($cmsCategories as $cmsCatKey => $cmsCategory) { + if (!isset($categoryWiseCmsPages[$cmsCategory['id_cms_category']])) { + unset($cmsCategories[$cmsCatKey]); + } + } + } + + Media::addJsDef( + array( + 'catFormatCmsPages' => json_encode($categoryWiseCmsPages) + ) + ); + + $smartyVars['cmsPages'] = $cmsPages; + $smartyVars['categories'] = $cmsCategories; $this->context->smarty->assign($smartyVars); $this->fields_form = array( 'submit' => array( @@ -261,6 +295,10 @@ class AdminCustomNavigationLinkSettingController extends ModuleAdminController } if ($isCmsPage) { $objCustomNavigationLink->id_cms = $idCms; + $objCMS = new CMS((int) $idCms); + if (!$objCMS->active) { + $active = $objCMS->active; + } } else { $objCustomNavigationLink->id_cms = 0; foreach ($languages as $language) { @@ -381,6 +419,24 @@ class AdminCustomNavigationLinkSettingController extends ModuleAdminController } } + public function processStatus() + { + if (Validate::isLoadedObject($this->loadObject()) + && !$this->object->is_custom_link //Check for CMS related navigation link + ) { + $objCMS = new CMS($this->object->id_cms); + if (!$objCMS->active) { + $this->errors[] = $this->l('Please activate the relate CMS page to activate this link'); + } + } + + if (empty($this->errors)) { + return parent::processStatus(); + } + + return $this->object; + } + public function setMedia() { parent::setMedia(); diff --git a/modules/blocknavigationmenu/views/js/admin/wk_navigation_link.js b/modules/blocknavigationmenu/views/js/admin/wk_navigation_link.js index db7a3ff7e..b6339aaa4 100644 --- a/modules/blocknavigationmenu/views/js/admin/wk_navigation_link.js +++ b/modules/blocknavigationmenu/views/js/admin/wk_navigation_link.js @@ -18,24 +18,17 @@ */ $(document).ready(function() { + setCategoryWiseCmsPages(); $("input[name='is_cms_block_link").on('change', function () { - if (parseInt($(this).val())) { - $("#cms_block_content").removeClass('hidden'); - $("#non_cms_block_content").addClass('hidden'); - } else { - $("#cms_block_content").addClass('hidden'); - $("#non_cms_block_content").removeClass('hidden'); - } + toggleElements(this, "#cms_block_content", "#non_cms_block_content"); }); $("input[name='is_custom_redirect_link").on('change', function () { - if (parseInt($(this).val())) { - $(".custom_redirect_link_div").removeClass('hidden'); - $(".custom_redirect_page_div").addClass('hidden'); - } else { - $(".custom_redirect_link_div").addClass('hidden'); - $(".custom_redirect_page_div").removeClass('hidden'); - } + toggleElements(this, ".custom_redirect_link_div", ".custom_redirect_page_div"); + }); + + $(document).on('change', '#id_cms_category', function(){ + setCategoryWiseCmsPages(); }); }); @@ -45,4 +38,39 @@ function showNavigationLinkLangField(lang_iso_code, id_lang) $('.navigation_link_name_all').hide(); $('#navigation_link_name_'+id_lang).show(); +} + +function toggleElements(element, selectorFirst, selectorSecond) +{ + if (parseInt($(element).val())) { + $(selectorFirst).removeClass('hidden'); + $(selectorSecond).addClass('hidden'); + } else { + $(selectorFirst).addClass('hidden'); + $(selectorSecond).removeClass('hidden'); + } +} + +function setCategoryWiseCmsPages() +{ + var selectedPage = parseInt($('input[name="id_cms"]:checked').val()); + var selectedCategory = parseInt($('#id_cms_category').val()); + var formattedData = JSON.parse(catFormatCmsPages); + if (!isNaN(selectedCategory)) { + formattedData = formattedData[selectedCategory]; + var html = ''; + $.each(formattedData, function(i, v) { + html += '