diff --git a/admin-dev/ajax.php b/admin-dev/ajax.php index abe23a12e..f97376757 100644 --- a/admin-dev/ajax.php +++ b/admin-dev/ajax.php @@ -466,9 +466,9 @@ if (Tools::getValue('submitPublishCMS')) if (Tools::getIsset('id_cms')) { $id_cms = (int)(Tools::getValue('id_cms')); - $id_tab_cms = (int)(Tab::getIdFromClassName('AdminCMSContent')); - $token = Tools::getAdminToken('AdminCMSContent'.(int)($id_tab_cms).(int)$context->employee->id); - $bo_cms_url = dirname($_SERVER['PHP_SELF']).'/index.php?tab=AdminCMSContent&id_cms='.(int)$id_cms.'&updatecms&token='.$token; + $id_tab_cms = (int)(Tab::getIdFromClassName('AdminCmsContent')); + $token = Tools::getAdminToken('AdminCmsContent'.(int)($id_tab_cms).(int)$context->employee->id); + $bo_cms_url = dirname($_SERVER['PHP_SELF']).'/index.php?tab=AdminCmsContent&id_cms='.(int)$id_cms.'&updatecms&token='.$token; if (Tools::getValue('redirect')) die($bo_cms_url); diff --git a/admin-dev/functions.php b/admin-dev/functions.php index 04c99cbb6..a0bce977e 100644 --- a/admin-dev/functions.php +++ b/admin-dev/functions.php @@ -180,12 +180,12 @@ function getPath($urlBase, $id_category, $path = '', $highlight = '', $categoryT return $path; $name = ($highlight != NULL) ? str_ireplace($highlight, ''.$highlight.'', CMSCategory::hideCMSCategoryPosition($category->name)) : CMSCategory::hideCMSCategoryPosition($category->name); - $edit = ' + $edit = ' Modify '; if ($category->id == 1) - $edit = ' + $edit = ' Home '; - $path = $edit.' + $path = $edit.' '.$name.' > '.$path; if ($category->id == 1) return substr($path, 0, strlen($path) - 3); diff --git a/classes/AdminTab.php b/classes/AdminTab.php index 0336d8acc..32533da5e 100644 --- a/classes/AdminTab.php +++ b/classes/AdminTab.php @@ -189,8 +189,8 @@ abstract class AdminTabCore public static $tabParenting = array( // 'AdminProducts' => 'AdminCatalog', // 'AdminCategories' => 'AdminCatalog', - 'AdminCMS' => 'AdminCMSContent', - 'AdminCMSCategories' => 'AdminCMSContent', + 'AdminCms' => 'AdminCmsContent', + 'AdminCmsCategories' => 'AdminCmsContent', 'AdminOrdersStates' => 'AdminStatuses', 'AdminAttributeGenerator' => 'AdminProducts', 'AdminAttributes' => 'AdminAttributesGroups', diff --git a/controllers/admin/AdminCmsCategoriesController.php b/controllers/admin/AdminCmsCategoriesController.php index 465c16e54..71f722e7a 100644 --- a/controllers/admin/AdminCmsCategoriesController.php +++ b/controllers/admin/AdminCmsCategoriesController.php @@ -25,7 +25,7 @@ * International Registered Trademark & Property of PrestaShop SA */ -class AdminCMSCategoriesControllerCore extends AdminController +class AdminCmsCategoriesControllerCore extends AdminController { /** @var object CMSCategory() instance for navigation*/ private $_CMSCategory; @@ -47,7 +47,7 @@ class AdminCMSCategoriesControllerCore extends AdminController 'position' => array('title' => $this->l('Position'), 'width' => 40,'filter_key' => 'position', 'align' => 'center', 'position' => 'position'), 'active' => array('title' => $this->l('Displayed'), 'width' => 25, 'active' => 'status', 'align' => 'center', 'type' => 'bool', 'orderby' => false)); - $this->_CMSCategory = AdminCMSContentController::getCurrentCMSCategory(); + $this->_CMSCategory = AdminCmsContentController::getCurrentCMSCategory(); $this->_filter = 'AND `id_parent` = '.(int)($this->_CMSCategory->id); $this->_select = 'position '; @@ -145,7 +145,7 @@ class AdminCMSCategoriesControllerCore extends AdminController elseif (!$object->updatePosition((int)(Tools::getValue('way')), (int)(Tools::getValue('position')))) $this->_errors[] = Tools::displayError('Failed to update the position.'); else - Tools::redirectAdmin(self::$currentIndex.'&'.$this->table.'Orderby=position&'.$this->table.'Orderway=asc&conf=5'.(($id_category = (int)(Tools::getValue($this->identifier, Tools::getValue('id_cms_category_parent', 1)))) ? ('&'.$this->identifier.'='.$id_category) : '').'&token='.Tools::getAdminTokenLite('AdminCMSContent')); + Tools::redirectAdmin(self::$currentIndex.'&'.$this->table.'Orderby=position&'.$this->table.'Orderway=asc&conf=5'.(($id_category = (int)(Tools::getValue($this->identifier, Tools::getValue('id_cms_category_parent', 1)))) ? ('&'.$this->identifier.'='.$id_category) : '').'&token='.Tools::getAdminTokenLite('AdminCmsContent')); } /* Delete multiple objects */ elseif (Tools::getValue('submitDel'.$this->table)) @@ -160,7 +160,7 @@ class AdminCMSCategoriesControllerCore extends AdminController if ($result) { $cms_category->cleanPositions((int)(Tools::getValue('id_cms_category'))); - Tools::redirectAdmin(self::$currentIndex.'&conf=2&token='.Tools::getAdminTokenLite('AdminCMSContent').'&id_category='.(int)(Tools::getValue('id_cms_category'))); + Tools::redirectAdmin(self::$currentIndex.'&conf=2&token='.Tools::getAdminTokenLite('AdminCmsContent').'&id_category='.(int)(Tools::getValue('id_cms_category'))); } $this->_errors[] = Tools::displayError('An error occurred while deleting selection.'); diff --git a/controllers/admin/AdminCmsContentController.php b/controllers/admin/AdminCmsContentController.php index 215137c7d..a08e5fef9 100644 --- a/controllers/admin/AdminCmsContentController.php +++ b/controllers/admin/AdminCmsContentController.php @@ -25,7 +25,7 @@ * International Registered Trademark & Property of PrestaShop SA */ -class AdminCMSContentControllerCore extends AdminController +class AdminCmsContentControllerCore extends AdminController { /** @var object adminCMSCategories() instance */ private $adminCMSCategories; @@ -45,8 +45,8 @@ class AdminCMSContentControllerCore extends AdminController die('Category cannot be loaded'); $this->table = array('cms_category', 'cms'); - $this->adminCMSCategories = new AdminCMSCategoriesController(); - $this->adminCMS = new AdminCMSController(); + $this->adminCMSCategories = new AdminCmsCategoriesController(); + $this->adminCMS = new AdminCmsController(); parent::__construct(); } diff --git a/controllers/admin/AdminCmsController.php b/controllers/admin/AdminCmsController.php index c1b1980a9..d6df031f3 100644 --- a/controllers/admin/AdminCmsController.php +++ b/controllers/admin/AdminCmsController.php @@ -25,7 +25,7 @@ * International Registered Trademark & Property of PrestaShop SA */ -class AdminCMSControllerCore extends AdminController +class AdminCmsControllerCore extends AdminController { private $_category; @@ -49,7 +49,7 @@ class AdminCMSControllerCore extends AdminController 'active' => array('title' => $this->l('Enabled'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false) ); - $this->_category = AdminCMSContentController::getCurrentCMSCategory(); + $this->_category = AdminCmsContentController::getCurrentCMSCategory(); $this->_join = ' LEFT JOIN `'._DB_PREFIX_.'cms_category` c ON (c.`id_cms_category` = a.`id_cms_category`)'; $this->_select = 'a.position '; @@ -236,7 +236,7 @@ class AdminCMSControllerCore extends AdminController if (!$cms->delete()) $this->_errors[] = Tools::displayError('An error occurred while deleting object.').' '.$this->table.' ('.Db::getInstance()->getMsgError().')'; else - Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=1&token='.Tools::getAdminTokenLite('AdminCMSContent')); + Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=1&token='.Tools::getAdminTokenLite('AdminCmsContent')); }/* Delete multiple objects */ elseif (Tools::getValue('submitDel'.$this->table)) { @@ -250,7 +250,7 @@ class AdminCMSControllerCore extends AdminController if ($result) { $cms->cleanPositions((int)(Tools::getValue('id_cms_category'))); - Tools::redirectAdmin(self::$currentIndex.'&conf=2&token='.Tools::getAdminTokenLite('AdminCMSContent').'&id_category='.(int)(Tools::getValue('id_cms_category'))); + Tools::redirectAdmin(self::$currentIndex.'&conf=2&token='.Tools::getAdminTokenLite('AdminCmsContent').'&id_category='.(int)(Tools::getValue('id_cms_category'))); } $this->_errors[] = Tools::displayError('An error occurred while deleting selection.'); @@ -289,7 +289,7 @@ class AdminCMSControllerCore extends AdminController Tools::redirectAdmin($preview_url); } else - Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=3&token='.Tools::getAdminTokenLite('AdminCMSContent')); + Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=3&token='.Tools::getAdminTokenLite('AdminCmsContent')); } else { @@ -313,7 +313,7 @@ class AdminCMSControllerCore extends AdminController Tools::redirectAdmin($preview_url); } else - Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=4&token='.Tools::getAdminTokenLite('AdminCMSContent')); + Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=4&token='.Tools::getAdminTokenLite('AdminCmsContent')); } } } @@ -326,7 +326,7 @@ class AdminCMSControllerCore extends AdminController elseif (!$object->updatePosition((int)(Tools::getValue('way')), (int)(Tools::getValue('position')))) $this->_errors[] = Tools::displayError('Failed to update the position.'); else - Tools::redirectAdmin(self::$currentIndex.'&'.$this->table.'Orderby=position&'.$this->table.'Orderway=asc&conf=4'.(($id_category = (int)(Tools::getValue('id_cms_category'))) ? ('&id_cms_category='.$id_category) : '').'&token='.Tools::getAdminTokenLite('AdminCMSContent')); + Tools::redirectAdmin(self::$currentIndex.'&'.$this->table.'Orderby=position&'.$this->table.'Orderway=asc&conf=4'.(($id_category = (int)(Tools::getValue('id_cms_category'))) ? ('&id_cms_category='.$id_category) : '').'&token='.Tools::getAdminTokenLite('AdminCmsContent')); } /* Change object statuts (active, inactive) */ elseif (Tools::isSubmit('status') AND Tools::isSubmit($this->identifier)) diff --git a/modules/autoupgrade/AdminSelfTab.php b/modules/autoupgrade/AdminSelfTab.php index c08fbe9e8..7a1936650 100644 --- a/modules/autoupgrade/AdminSelfTab.php +++ b/modules/autoupgrade/AdminSelfTab.php @@ -152,8 +152,8 @@ abstract class AdminSelfTab public static $tabParenting = array( 'AdminProducts' => 'AdminCatalog', 'AdminCategories' => 'AdminCatalog', - 'AdminCMS' => 'AdminCMSContent', - 'AdminCMSCategories' => 'AdminCMSContent', + 'AdminCms' => 'AdminCmsContent', + 'AdminCmsCategories' => 'AdminCmsContent', 'AdminOrdersStates' => 'AdminStatuses', 'AdminAttributeGenerator' => 'AdminProducts', 'AdminAttributes' => 'AdminAttributesGroups', diff --git a/modules/autoupgrade/functions.php b/modules/autoupgrade/functions.php index 57417ec0f..cd4ebb36a 100644 --- a/modules/autoupgrade/functions.php +++ b/modules/autoupgrade/functions.php @@ -175,12 +175,12 @@ function getPath($urlBase, $id_category, $path = '', $highlight = '', $categoryT return $path; $name = ($highlight != NULL) ? str_ireplace($highlight, ''.$highlight.'', CMSCategory::hideCMSCategoryPosition($category->name)) : CMSCategory::hideCMSCategoryPosition($category->name); - $edit = ' + $edit = ' Modify '; if ($category->id == 1) - $edit = ' + $edit = ' Home '; - $path = $edit.' + $path = $edit.' '.$name.' > '.$path; if ($category->id == 1) return substr($path, 0, strlen($path) - 3);