From b8a3ea0404642850de7174ca5a271543f776fa1d Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Wed, 14 Dec 2011 18:34:59 +0000 Subject: [PATCH] // Fix some XSS --- classes/helper/HelperList.php | 11 +++-------- controllers/admin/AdminCategoriesController.php | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php index 5eb0d1af6..db61a6249 100644 --- a/classes/helper/HelperList.php +++ b/classes/helper/HelperList.php @@ -180,8 +180,8 @@ class HelperListCore extends Helper $tpl_enable = $this->createTemplate('list_action_enable.tpl'); $tpl_enable->assign(array( 'enabled' => (bool)$value, - 'url_enable' => $this->currentIndex.'&'.$this->identifier.'='.$id.'&'.$active.$this->table. - ((int)$id_category && (int)$id_product ? '&id_category='.$id_category : '').'&token='.($token != null ? $token : $this->token) + 'url_enable' => $this->currentIndex.'&'.$this->identifier.'='.(int)$id.'&'.$active.$this->table. + ((int)$id_category && (int)$id_product ? '&id_category='.(int)$id_category : '').'&token='.($token != null ? $token : $this->token) )); return $tpl_enable->fetch(); } @@ -491,7 +491,7 @@ class HelperListCore extends Helper */ public function displayListHeader($token = null) { - $id_cat = Tools::getValue('id_'.($this->is_cms ? 'cms_' : '').'category'); + $id_cat = (int)Tools::getValue('id_'.($this->is_cms ? 'cms_' : '').'category'); if (!isset($token) || empty($token)) $token = $this->token; @@ -621,8 +621,6 @@ class HelperListCore extends Helper 'table_dnd' => isset($table_dnd) ? $table_dnd : null, 'name' => isset($name) ? $name : null, 'name_id' => isset($name_id) ? $name_id : null, - /*'back' => Tools::getValue('back'), - 'no_back' => $this->no_back,*/ ))); return $this->header_tpl->fetch(); @@ -637,10 +635,7 @@ class HelperListCore extends Helper 'token' => $this->token, 'table' => $this->table, 'current' => $this->currentIndex, - 'simple_header' => $this->simple_header, 'bulk_actions' => $this->bulk_actions, - 'back' => Tools::getValue('back'), - 'no_back' => $this->no_back, ))); return $this->footer_tpl->fetch(); } diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php index cb765b839..9e6d61911 100644 --- a/controllers/admin/AdminCategoriesController.php +++ b/controllers/admin/AdminCategoriesController.php @@ -147,7 +147,7 @@ class AdminCategoriesControllerCore extends AdminController if (Tools::getValue('id_category') && !Tools::isSubmit('updatecategory')) { $this->toolbar_btn['edit'] = array( - 'href' => self::$currentIndex.'&update'.$this->table.'&id_category='.Tools::getValue('id_category').'&token='.$this->token, + 'href' => self::$currentIndex.'&update'.$this->table.'&id_category='.(int)Tools::getValue('id_category').'&token='.$this->token, 'desc' => $this->l('Edit') ); $back = Tools::safeOutput(Tools::getValue('back', '')); @@ -160,7 +160,7 @@ class AdminCategoriesControllerCore extends AdminController } if ($this->display == 'view') $this->toolbar_btn['new'] = array( - 'href' => self::$currentIndex.'&add'.$this->table.'&id_parent='.Tools::getValue('id_category').'&token='.$this->token, + 'href' => self::$currentIndex.'&add'.$this->table.'&id_parent='.(int)Tools::getValue('id_category').'&token='.$this->token, 'desc' => $this->l('Add new') ); parent::initToolbar();