From c8ab097af4d981630e4efb059ad6197a705f10be Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Mon, 16 Jun 2025 13:33:14 +0530 Subject: [PATCH] Fixed: added type castings in the queries to prevent sql injectios --- controllers/admin/AdminModulesController.php | 1 + controllers/front/OrderOpcController.php | 2 +- .../blocknavigationmenu.php | 6 +-- .../classes/HotelCartBookingData.php | 46 +++++++------------ .../classes/HotelHelper.php | 2 +- .../classes/HotelOrderRefundRules.php | 2 +- .../classes/HotelRoomInformation.php | 10 ++-- .../classes/HotelRoomType.php | 4 +- .../classes/HotelRoomTypeFeaturePricing.php | 2 +- 9 files changed, 29 insertions(+), 46 deletions(-) diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 31b58d8fe..e9d8ab801 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -748,6 +748,7 @@ class AdminModulesControllerCore extends AdminController $modules_list_save = implode('|', $modules); } } elseif (($modules = Tools::getValue($key)) && $key != 'checkAndUpdate' && $key != 'updateAll') { + $modules = strip_tags($modules); if (strpos($modules, '|')) { $modules_list_save = $modules; $modules = explode('|', $modules); diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index 1851a2acc..d1814c445 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -572,7 +572,7 @@ class OrderOpcControllerCore extends ParentOrderController $date_from = Tools::getValue('date_from'); $date_to = Tools::getValue('date_to'); $objCartBookingData = new HotelCartBookingData(); - if ($cart_data_dlt = $objCartBookingData->deleteRoomDataFromOrderLine( + if ($objCartBookingData->deleteRoomDataFromOrderLine( $this->context->cart->id, $this->context->cart->id_guest, $id_product, diff --git a/modules/blocknavigationmenu/blocknavigationmenu.php b/modules/blocknavigationmenu/blocknavigationmenu.php index 3000bc5ef..ea7b297c8 100644 --- a/modules/blocknavigationmenu/blocknavigationmenu.php +++ b/modules/blocknavigationmenu/blocknavigationmenu.php @@ -53,11 +53,7 @@ class blocknavigationmenu extends Module public function hookDisplayTopSubSecondaryBlock($params) { - Media::addJsDef( - array( - 'currentPage' => Tools::getValue('controller') - ) - ); + Media::addJsDef(array('currentPage' => $this->context->controller->php_self)); $this->context->controller->addJS($this->_path.'/views/js/htlnevigationmenu.js'); $this->context->controller->addCSS($this->_path.'/views/css/blocknavigation.css'); diff --git a/modules/hotelreservationsystem/classes/HotelCartBookingData.php b/modules/hotelreservationsystem/classes/HotelCartBookingData.php index 8a7a1d2c0..112335d6e 100644 --- a/modules/hotelreservationsystem/classes/HotelCartBookingData.php +++ b/modules/hotelreservationsystem/classes/HotelCartBookingData.php @@ -121,7 +121,7 @@ class HotelCartBookingData extends ObjectModel */ public function getCountRoomsInCart($id_cart, $guest) { - $sql = 'SELECT Count(`id`) FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart` = '.$id_cart.' AND `id_guest` = '.$guest.' AND `id_order` = 0'; + $sql = 'SELECT Count(`id`) FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart` = '.(int) $id_cart.' AND `id_guest` = '.(int) $guest.' AND `id_order` = 0'; $count_rooms = Db::getInstance()->getValue($sql); if ($count_rooms) { @@ -144,8 +144,8 @@ class HotelCartBookingData extends ObjectModel $sql = 'SELECT cbd.id AS id_cart_book_data, cbd.id_cart, cbd.id_guest, cbd.id_product, cbd.id_room, cbd.id_hotel, cbd.quantity, cbd.date_from, cbd.date_to, ri.room_num, pl.name AS room_type FROM `'._DB_PREFIX_.'htl_cart_booking_data` AS cbd INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS ri ON (cbd.id_room = ri.id) - INNER JOIN `'._DB_PREFIX_.'product_lang` AS pl ON (cbd.id_product = pl.id_product AND pl.`id_lang`='.$id_lang.') - WHERE cbd.id_cart = '.$id_cart.' AND cbd.id_guest = '.$id_guest; + INNER JOIN `'._DB_PREFIX_.'product_lang` AS pl ON (cbd.id_product = pl.id_product AND pl.`id_lang`='.(int) $id_lang.') + WHERE cbd.id_cart = '.(int) $id_cart.' AND cbd.id_guest = '.(int) $id_guest; $cart_book_data = Db::getInstance()->executeS($sql); if ($cart_book_data) { @@ -182,10 +182,10 @@ class HotelCartBookingData extends ObjectModel */ public function getOnlyCartBookingData($id_cart, $id_guest, $id_product, $id_customer = 0) { - $sql = 'SELECT * FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart` = '.$id_cart.' AND `id_product` = '.$id_product; + $sql = 'SELECT * FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart` = '.(int) $id_cart.' AND `id_product` = '.(int) $id_product; if ($id_customer) { - $sql .= ' AND `id_customer` = '.$id_customer; + $sql .= ' AND `id_customer` = '.(int) $id_customer; } $cart_book_data = Db::getInstance()->executeS($sql); @@ -209,7 +209,7 @@ class HotelCartBookingData extends ObjectModel */ public function getCountRoomsByIdCartIdProduct($id_cart, $id_product, $date_from, $date_to) { - $sql = 'SELECT Count(`id`) FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart` = '.$id_cart.' AND `id_product` = '.$id_product." AND `date_from` <= '$date_from' AND `date_to` >= '$date_to'"; + $sql = 'SELECT Count(`id`) FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart` = '.(int) $id_cart.' AND `id_product` = '.(int) $id_product." AND `date_from` <= '".pSql($date_from)."' AND `date_to` >= '".pSQL($date_to)."'"; $count_rooms = Db::getInstance()->getValue($sql); @@ -268,7 +268,7 @@ class HotelCartBookingData extends ObjectModel if ($cart_id) { return Db::getInstance()->getRow(' SELECT * FROM `'._DB_PREFIX_.'htl_cart_booking_data` - WHERE `id_cart`='.$cart_id.' ORDER BY `date_add` DESC + WHERE `id_cart`='.(int) $cart_id.' ORDER BY `date_add` DESC '); } @@ -284,7 +284,7 @@ class HotelCartBookingData extends ObjectModel */ public function getCartCurrentDataByOrderId($id_order) { - $result = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_order`='.$id_order); + $result = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_order`='.(int) $id_order); if ($result) { return $result; } else { @@ -320,13 +320,13 @@ class HotelCartBookingData extends ObjectModel */ public function changeProductDataByRoomId($idRoom, $idProduct, $daysDiff, $idCart) { - $cartProductQuantity = Db::getInstance()->getValue('SELECT `quantity` FROM `'._DB_PREFIX_.'cart_product` WHERE `id_cart`='.$idCart.' AND `id_product`='.$idProduct); + $cartProductQuantity = Db::getInstance()->getValue('SELECT `quantity` FROM `'._DB_PREFIX_.'cart_product` WHERE `id_cart`='.(int) $idCart.' AND `id_product`='.(int) $idProduct); $newQuantity = $cartProductQuantity - $daysDiff; if ($newQuantity > 0) { - return Db::getInstance()->update('cart_product', array('quantity' => $newQuantity), '`id_cart`='.$idCart.' AND `id_product`='.$idProduct); + return Db::getInstance()->update('cart_product', array('quantity' => $newQuantity), '`id_cart`='.(int) $idCart.' AND `id_product`='.(int) $idProduct); } else { - return Db::getInstance()->delete('cart_product', '`id_cart`='.$idCart.' AND `id_product`='.$idProduct); + return Db::getInstance()->delete('cart_product', '`id_cart`='.(int) $idCart.' AND `id_product`='.(int) $idProduct); } } @@ -670,7 +670,7 @@ class HotelCartBookingData extends ObjectModel */ public function checkExistanceOfRoomInCurrentCart($id_room, $date_from, $date_to, $id_cart, $id_guest) { - $result = Db::getInstance()->getValue('SELECT id FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_room`='.$id_room." AND `date_from`='$date_from' AND `date_to`='$date_to' AND `id_cart`=".$id_cart.' AND `id_guest`='.$id_guest); + $result = Db::getInstance()->getValue('SELECT id FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_room`='.(int) $id_room." AND `date_from`='".pSQL($date_from)."' AND `date_to`='".pSQL($date_to)."' AND `id_cart`=".(int) $id_cart.' AND `id_guest`='.(int) $id_guest); if ($result) { return $result; @@ -720,8 +720,8 @@ class HotelCartBookingData extends ObjectModel */ public function deleteRoomDataFromOrderLine($id_cart, $id_guest, $id_product, $date_from, $date_to) { - $result = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart`='.$id_cart.' AND `id_guest`='.$id_guest.' AND `id_product`='.$id_product." AND `date_from`= '$date_from' AND `date_to`= '$date_to'"); - + // To get the num_rm + Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart`='.(int) $id_cart.' AND `id_guest`='.(int) $id_guest.' AND `id_product`='.(int) $id_product." AND `date_from`= '".pSQL($date_from)."' AND `date_to`= '".pSQL($date_to)."'"); $num_rm = Db::getInstance()->NumRows(); $num_days = HotelHelper::getNumberOfDays($date_from, $date_to); @@ -729,20 +729,6 @@ class HotelCartBookingData extends ObjectModel $qty = (int) $num_rm * (int) $num_days; if ($qty) { return $this->deleteCartBookingData($id_cart, $id_product, 0, $date_from, $date_to); - // $this->context = Context::getContext(); - // $update_quantity = $this->context->cart->updateQty($qty, $id_product, null, false, 'down'); - - // if (is_array($result) && count($result)) { - // $return = true; - // foreach ($result as $row) { - // $objHotelCartBookingData = new self($row['id']); - // if (Validate::isLoadedObject($objHotelCartBookingData)) { - // $return &= $objHotelCartBookingData->delete(); - // } - // } - // } - - // return $return; } return false; @@ -818,7 +804,7 @@ class HotelCartBookingData extends ObjectModel */ public function getCustomerIdRoomsByIdCartIdProduct($id_cart, $id_product, $date_from, $date_to) { - $rooms_ids = Db::getInstance()->executeS('SELECT `id_room` FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart`='.$id_cart.' AND `id_product`='.$id_product." AND `date_from`='$date_from' AND `date_to`='$date_to'"); + $rooms_ids = Db::getInstance()->executeS('SELECT `id_room` FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart`='.(int) $id_cart.' AND `id_product`='.(int) $id_product." AND `date_from`='".pSQL($date_from)."' AND `date_to`='".pSQL($date_to)."'"); if ($rooms_ids) { return $rooms_ids; } @@ -1852,7 +1838,7 @@ class HotelCartBookingData extends ObjectModel } else { Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'cart_product` - SET `quantity` = '.$new_qty.', `date_add` = NOW() + SET `quantity` = '.(int) $new_qty.', `date_add` = NOW() WHERE `id_product` = '.(int)$id_product.' AND `id_cart` = '.(int)$id_cart.' AND `id_address_delivery` = '.(int)$cart->id_address_delivery ); diff --git a/modules/hotelreservationsystem/classes/HotelHelper.php b/modules/hotelreservationsystem/classes/HotelHelper.php index 79e5aa259..19a7e729c 100644 --- a/modules/hotelreservationsystem/classes/HotelHelper.php +++ b/modules/hotelreservationsystem/classes/HotelHelper.php @@ -2529,7 +2529,7 @@ class HotelHelper $languages = Language::getLanguages(true); if ($is_hotel && $id_hotel) { $cat_id_hotel = Db::getInstance()->getValue( - 'SELECT `id_category` FROM `'._DB_PREFIX_.'htl_branch_info` WHERE id='.$id_hotel + 'SELECT `id_category` FROM `'._DB_PREFIX_.'htl_branch_info` WHERE id='.(int) $id_hotel ); if ($cat_id_hotel) { $obj_cat = new Category($cat_id_hotel); diff --git a/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php b/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php index 4a013647a..2acf95b78 100644 --- a/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php +++ b/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php @@ -123,7 +123,7 @@ class HotelOrderRefundRules extends ObjectModel */ public function checkIfRuleExistsByCancelationdays($days) { - return Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'htl_order_refund_rules` WHERE days='.$days); + return Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'htl_order_refund_rules` WHERE days='.(int) $days); } public function getBookingCancellationDetails($idOrder, $idOrderReturn = 0, $idHtlBooking = 0) diff --git a/modules/hotelreservationsystem/classes/HotelRoomInformation.php b/modules/hotelreservationsystem/classes/HotelRoomInformation.php index d1f8dc2de..62c3575f7 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomInformation.php +++ b/modules/hotelreservationsystem/classes/HotelRoomInformation.php @@ -179,7 +179,7 @@ class HotelRoomInformation extends ObjectModel */ public function getHotelRoomInfoByProductId($id_product) { - $result = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_room_information` WHERE `id_product`='.$id_product); + $result = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_room_information` WHERE `id_product`='.(int) $id_product); if ($result) { return $result; } @@ -206,7 +206,7 @@ class HotelRoomInformation extends ObjectModel */ public function getHotelRoomInfo($id_product, $id_hotel, $is_getNum = 0) { - $sql = "SELECT * FROM `"._DB_PREFIX_."htl_room_information` WHERE `id_product` = ".$id_product." AND `id_hotel` = ".$id_hotel; + $sql = "SELECT * FROM `"._DB_PREFIX_."htl_room_information` WHERE `id_product` = ".(int) $id_product." AND `id_hotel` = ".(int) $id_hotel; $rm_info = Db::getInstance()->executeS($sql); @@ -229,7 +229,7 @@ class HotelRoomInformation extends ObjectModel */ public function getHotelRoomInfoById($id) { - $sql = "SELECT `room_num` FROM `"._DB_PREFIX_."htl_room_information` WHERE `id` = ".$id; + $sql = "SELECT `room_num` FROM `"._DB_PREFIX_."htl_room_information` WHERE `id` = ".(int) $id; $rm_num = Db::getInstance()->getValue($sql); if ($rm_num) { @@ -275,12 +275,12 @@ class HotelRoomInformation extends ObjectModel public function getRoomTypeAvailableRoomsForDateRange($id_hotel, $id_product, $date_from, $date_to) { - return Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_room_information` where `id_hotel`='.$id_hotel.' AND `id_product`='.$id_product.' AND `id` NOT IN (SELECT `id_room` from `'._DB_PREFIX_.'htl_booking_detail` where `date_from`< \''.pSQL($date_to).'\' AND `date_to`>\''.$date_from.'\' AND `id_product`='.(int) $id_product.' AND `id_hotel`='.(int) $id_hotel.')'); + return Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_room_information` where `id_hotel`='.(int) $id_hotel.' AND `id_product`='.(int) $id_product.' AND `id` NOT IN (SELECT `id_room` from `'._DB_PREFIX_.'htl_booking_detail` where `date_from`< \''.pSQL($date_to).'\' AND `date_to`>\''.pSQL($date_from).'\' AND `id_product`='.(int) $id_product.' AND `id_hotel`='.(int) $id_hotel.')'); } public function getRoomTypeDisabledRoomsForDateRange($id_hotel, $id_product, $date_from, $date_to) { - return Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_room_information` where `id_hotel`='.$id_hotel.' AND `id_product`='.$id_product.' AND `id_status`=3 AND `id` NOT IN (SELECT `id_room` from `'._DB_PREFIX_.'htl_booking_detail` where `date_from`< \''.pSQL($date_to).'\' AND `date_to`>\''.$date_from.'\' AND `id_product`='.(int) $id_product.' AND `id_hotel`='.(int) $id_hotel.')'); + return Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'htl_room_information` where `id_hotel`='.(int) $id_hotel.' AND `id_product`='.(int) $id_product.' AND `id_status`=3 AND `id` NOT IN (SELECT `id_room` from `'._DB_PREFIX_.'htl_booking_detail` where `date_from`< \''.pSQL($date_to).'\' AND `date_to`>\''.pSQL($date_from).'\' AND `id_product`='.(int) $id_product.' AND `id_hotel`='.(int) $id_hotel.')'); } public function getRoomTypeBookedRoomsForDateRange($id_hotel, $id_product, $date_from, $date_to) diff --git a/modules/hotelreservationsystem/classes/HotelRoomType.php b/modules/hotelreservationsystem/classes/HotelRoomType.php index 03112f59b..4d82879a6 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomType.php +++ b/modules/hotelreservationsystem/classes/HotelRoomType.php @@ -378,7 +378,7 @@ class HotelRoomType extends ObjectModel */ public static function getMaxAdults($id_hotel) { - $sql = 'SELECT MAX(adults) AS max_adult FROM '._DB_PREFIX_.'htl_room_type WHERE id_hotel='.$id_hotel; + $sql = 'SELECT MAX(adults) AS max_adult FROM '._DB_PREFIX_.'htl_room_type WHERE id_hotel='.(int) $id_hotel; $max_adult = Db::getInstance()->getValue($sql); @@ -398,7 +398,7 @@ class HotelRoomType extends ObjectModel */ public static function getMaxChild($id_hotel) { - $sql = 'SELECT MAX(children) AS max_child FROM '._DB_PREFIX_.'htl_room_type WHERE id_hotel='.$id_hotel; + $sql = 'SELECT MAX(children) AS max_child FROM '._DB_PREFIX_.'htl_room_type WHERE id_hotel='.(int) $id_hotel; $max_child = Db::getInstance()->getValue($sql); diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php index e20ccf9e0..6c839aa39 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php +++ b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php @@ -162,7 +162,7 @@ class HotelRoomTypeFeaturePricing extends ObjectModel return Db::getInstance()->executeS( 'SELECT * FROM `'._DB_PREFIX_.'htl_room_type_feature_pricing` WHERE (`id_product`=0 OR `id_product`='.(int) $id_product.') - AND `active`=1 AND `date_from` <= \''.$date_to.'\' AND `date_to` >= \''.$date_from.'\'' + AND `active`=1 AND `date_from` <= \''.pSQL($date_to).'\' AND `date_to` >= \''.pSQL($date_from).'\'' ); }