diff --git a/admin-dev/ajax.php b/admin-dev/ajax.php index d7e4c2108..e21159235 100644 --- a/admin-dev/ajax.php +++ b/admin-dev/ajax.php @@ -704,7 +704,7 @@ if (Tools::isSubmit('updateProductImageShopAsso')) { if ($id_image = (int)Tools::getValue('id_image') AND $id_shop = (int)Tools::getValue('id_shop')) { - if (Tools::getValue('active')) + if ((int)Tools::getValue('active')) Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'image_shop (`id_image`, `id_shop`) VALUES('.(int)$id_image.', '.(int)$id_shop.')'); else Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'image_shop WHERE `id_image`='.(int)$id_image.' AND `id_shop`='.(int)$id_shop); diff --git a/admin-dev/ajax_category_list.php b/admin-dev/ajax_category_list.php index 49a43e882..7e35f8328 100755 --- a/admin-dev/ajax_category_list.php +++ b/admin-dev/ajax_category_list.php @@ -74,7 +74,7 @@ foreach ($categoryBox AS $k => $row) $index[] = $row; } - elseif (Tools::getValue('id_product')) + elseif ((int)Tools::getValue('id_product')) $index = Product::getProductCategories((int)Tools::getValue('id_product')); $adminProducts->recurseCategoryForInclude((int)(Tools::getValue('id_product')), $index, $categories, $categories[0][1], 1, (int)(Tools::getValue('id_category_default'))); echo ' diff --git a/classes/AttributeGroup.php b/classes/AttributeGroup.php index 71fa9c241..38343be50 100644 --- a/classes/AttributeGroup.php +++ b/classes/AttributeGroup.php @@ -86,7 +86,7 @@ class AttributeGroupCore extends ObjectModel $attributeCombinations = Db::getInstance()->ExecuteS('SELECT pac.`id_attribute`, pa.`id_product_attribute` FROM `'._DB_PREFIX_.'product_attribute` pa LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac ON (pa.`id_product_attribute` = pac.`id_product_attribute`)'); $toRemove = array(); foreach ($attributeCombinations AS $attributeCombination) - if ($attributeCombination['id_attribute'] == 0) + if ((int)($attributeCombination['id_attribute']) == 0) $toRemove[] = (int)($attributeCombination['id_product_attribute']); if (!empty($toRemove) AND Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product_attribute` IN ('.implode(', ', $toRemove).')') === false) return false; diff --git a/classes/CMS.php b/classes/CMS.php index c100d9436..302b56b85 100644 --- a/classes/CMS.php +++ b/classes/CMS.php @@ -152,7 +152,7 @@ class CMSCore extends ObjectModel return false; foreach ($res AS $cms) - if ((int)$cms['id_cms'] == (int)$this->id) + if ((int)($cms['id_cms']) == (int)($this->id)) $movedCms = $cms; if (!isset($movedCms) || !isset($position)) diff --git a/classes/CMSCategory.php b/classes/CMSCategory.php index d3e913af4..de00ab4ab 100644 --- a/classes/CMSCategory.php +++ b/classes/CMSCategory.php @@ -576,7 +576,7 @@ class CMSCategoryCore extends ObjectModel )) return false; foreach ($res AS $category) - if ((int)$category['id_cms_category'] == (int)$this->id) + if ((int)($category['id_cms_category']) == (int)($this->id)) $movedCategory = $category; if (!isset($movedCategory) || !isset($position)) diff --git a/classes/Carrier.php b/classes/Carrier.php index e35a636d8..8b9bed4d9 100644 --- a/classes/Carrier.php +++ b/classes/Carrier.php @@ -156,7 +156,7 @@ class CarrierCore extends ObjectModel return false; if (!$numRows = Db::getInstance()->NumRows()) return false; - if ($numRows == 1) + if ((int)($numRows) == 1) Configuration::updateValue('PS_CARRIER_DEFAULT', (int)($this->id)); return true; } @@ -689,7 +689,7 @@ class CarrierCore extends ObjectModel VALUES ('.$this->id.','.(int)$val['id_zone'].')'); //Copy default carrier - if (Configuration::get('PS_CARRIER_DEFAULT') == $oldId) + if ((int)(Configuration::get('PS_CARRIER_DEFAULT')) == $oldId) Configuration::updateValue('PS_CARRIER_DEFAULT', (int)($this->id)); } @@ -718,7 +718,7 @@ class CarrierCore extends ObjectModel if ($this->shipping_method == Carrier::SHIPPING_METHOD_DEFAULT) { // backward compatibility - if (Configuration::get('PS_SHIPPING_METHOD')) + if ((int)Configuration::get('PS_SHIPPING_METHOD')) $method = Carrier::SHIPPING_METHOD_WEIGHT; else $method = Carrier::SHIPPING_METHOD_PRICE; diff --git a/classes/Cart.php b/classes/Cart.php index 9654e20de..f60461ac1 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -464,7 +464,7 @@ class CartCore extends ObjectModel { $paImplode = array(); foreach ($ipaList as $id_product_attribute) - if ($id_product_attribute AND !array_key_exists($id_product_attribute.'-'.$id_lang, self::$_attributesLists)) + if ((int)$id_product_attribute AND !array_key_exists($id_product_attribute.'-'.$id_lang, self::$_attributesLists)) { $paImplode[] = (int)$id_product_attribute; self::$_attributesLists[(int)$id_product_attribute.'-'.$id_lang] = array('attributes' => '', 'attributes_small' => ''); @@ -569,7 +569,7 @@ class CartCore extends ObjectModel unset(self::$_nbProducts[$this->id]); if (isset(self::$_totalWeight[$this->id])) unset(self::$_totalWeight[$this->id]); - if ($quantity <= 0) + if ((int)$quantity <= 0) return $this->deleteProduct($id_product, $id_product_attribute, (int)$id_customization); elseif (!$product->available_for_order OR Configuration::get('PS_CATALOG_MODE')) return false; @@ -631,10 +631,10 @@ class CartCore extends ObjectModel WHERE p.id_product = '.$id_product; $result2 = Db::getInstance()->getRow($sql); if (!Product::isAvailableWhenOutOfStock((int)$result2['out_of_stock'])) - if ($quantity > $result2['quantity']) + if ((int)$quantity > $result2['quantity']) return false; - if ($quantity < $minimalQuantity) + if ((int)$quantity < $minimalQuantity) return -1; $resultAdd = Db::getInstance()->AutoExecute(_DB_PREFIX_.'cart_product', array( @@ -799,7 +799,7 @@ class CartCore extends ObjectModel unset(self::$_nbProducts[$this->id]); if (isset(self::$_totalWeight[$this->id])) unset(self::$_totalWeight[$this->id]); - if ($id_customization) + if ((int)($id_customization)) { $productTotalQuantity = (int)(Db::getInstance()->getValue('SELECT `quantity` FROM `'._DB_PREFIX_.'cart_product` @@ -1101,7 +1101,7 @@ class CartCore extends ObjectModel if (empty($id_carrier)) { - if ($this->id_customer) + if ((int)($this->id_customer)) { $customer = new Customer((int)($this->id_customer)); $result = Carrier::getCarriers((int)(Configuration::get('PS_LANG_DEFAULT')), true, false, (int)($id_zone), $customer->getGroups()); diff --git a/classes/Category.php b/classes/Category.php index 2066de85b..27aa1efc0 100644 --- a/classes/Category.php +++ b/classes/Category.php @@ -262,7 +262,7 @@ class CategoryCore extends ObjectModel public function delete() { - if ((int)$this->id === 0 OR (int)$this->id === 1) return false; + if ((int)($this->id) === 0 OR (int)($this->id) === 1) return false; $this->clearCache(); @@ -891,7 +891,7 @@ class CategoryCore extends ObjectModel return false; foreach ($res AS $category) - if ((int)$category['id_category'] == $this->id) + if ((int)($category['id_category']) == (int)($this->id)) $movedCategory = $category; if (!isset($movedCategory) || !isset($position)) @@ -903,8 +903,8 @@ class CategoryCore extends ObjectModel SET `position`= `position` '.($way ? '- 1' : '+ 1').' WHERE `position` '.($way - ? '> '.(int)($movedCategory['position']).' AND `position` <= '.(int)$position - : '< '.(int)($movedCategory['position']).' AND `position` >= '.(int)$position).' + ? '> '.(int)($movedCategory['position']).' AND `position` <= '.(int)($position) + : '< '.(int)($movedCategory['position']).' AND `position` >= '.(int)($position)).' AND `id_parent`='.(int)($movedCategory['id_parent'])) AND Db::getInstance()->Execute(' UPDATE `'._DB_PREFIX_.'category` diff --git a/classes/FrontController.php b/classes/FrontController.php index db67ac616..933541927 100755 --- a/classes/FrontController.php +++ b/classes/FrontController.php @@ -158,7 +158,7 @@ class FrontControllerCore $_MODULES = array(); /* Cart already exists */ - if ($this->context->cookie->id_cart) + if ((int)$this->context->cookie->id_cart) { $cart = new Cart($this->context->cookie->id_cart); if ($cart->OrderExists()) diff --git a/classes/Image.php b/classes/Image.php index c7d80c076..4f70b1316 100644 --- a/classes/Image.php +++ b/classes/Image.php @@ -257,7 +257,7 @@ class ImageCore extends ObjectModel return ; foreach ($combinationImages['new'] AS $id_product_attribute => $imageIds) foreach ($imageIds AS $key => $imageId) - if ((int)$imageId == (int)$saved_id) + if ((int)($imageId) == (int)($saved_id)) $combinationImages['new'][$id_product_attribute][$key] = (int)($id_image); } diff --git a/classes/Manufacturer.php b/classes/Manufacturer.php index b9bff508c..9908235ac 100644 --- a/classes/Manufacturer.php +++ b/classes/Manufacturer.php @@ -224,7 +224,7 @@ class ManufacturerCore extends ObjectModel } } for ($i = 0; $i < sizeof($manufacturers); $i++) - if (Configuration::get('PS_REWRITING_SETTINGS')) + if ((int)(Configuration::get('PS_REWRITING_SETTINGS'))) $manufacturers[$i]['link_rewrite'] = Tools::link_rewrite($manufacturers[$i]['name'], false); else $manufacturers[$i]['link_rewrite'] = 0; diff --git a/classes/Module.php b/classes/Module.php index 13d4a26f9..8821a09d5 100644 --- a/classes/Module.php +++ b/classes/Module.php @@ -948,7 +948,7 @@ abstract class ModuleCore continue; foreach ($res AS $key => $values) - if ((int)$values[$this->identifier] == (int)$this->id) + if ((int)($values[$this->identifier]) == (int)($this->id)) { $k = $key ; break ; diff --git a/classes/OrderReturn.php b/classes/OrderReturn.php index 5c2481fb4..1a059ea20 100644 --- a/classes/OrderReturn.php +++ b/classes/OrderReturn.php @@ -115,7 +115,7 @@ class OrderReturnCore extends ObjectModel if (!isset($orderedCustomizations[$customizationId])) return false; $quantity = (isset($customizationQtyInput[$customizationId]) ? (int)($customizationQtyInput[$customizationId]) : 0); - if ((int)$orderedCustomizations[$customizationId]['quantity'] - $quantity < 0) + if ((int)($orderedCustomizations[$customizationId]['quantity']) - $quantity < 0) return false; } } diff --git a/classes/PDF.php b/classes/PDF.php index ecc0b610b..fa8a7d883 100644 --- a/classes/PDF.php +++ b/classes/PDF.php @@ -563,7 +563,7 @@ class PDFCore extends PDF_PageGroupCore $pdf->Cell(0, 6, self::l('SLIP #').' '.sprintf('%06d', self::$orderSlip->id).' '.self::l('from') . ' ' .Tools::displayDate(self::$orderSlip->date_upd, self::$order->id_lang), 1, 2, 'L', 1); elseif (self::$delivery) $pdf->Cell(0, 6, self::l('DELIVERY SLIP #').Tools::iconv('utf-8', self::encoding(), Configuration::get('PS_DELIVERY_PREFIX', $context->language->id)).sprintf('%06d', self::$delivery).' '.self::l('from') . ' ' .Tools::displayDate(self::$order->delivery_date, self::$order->id_lang), 1, 2, 'L', 1); - elseif (self::$order->invoice_date) + elseif ((int)self::$order->invoice_date) $pdf->Cell(0, 6, self::l('INVOICE #').' '.Tools::iconv('utf-8', self::encoding(), Configuration::get('PS_INVOICE_PREFIX', $context->language->id)).sprintf('%06d', self::$order->invoice_number).' '.self::l('from') . ' ' .Tools::displayDate(self::$order->invoice_date, self::$order->id_lang), 1, 2, 'L', 1); else $pdf->Cell(0, 6, self::l('Invoice draft'), 1, 2, 'L', 1); diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 97812e8fd..87d01a417 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -431,7 +431,7 @@ abstract class PaymentModuleCore extends Module $data = array_merge($data, $extraVars); // Join PDF invoice - if (Configuration::get('PS_INVOICE') AND Validate::isLoadedObject($orderStatus) AND $orderStatus->invoice AND $order->invoice_number) + if ((int)(Configuration::get('PS_INVOICE')) AND Validate::isLoadedObject($orderStatus) AND $orderStatus->invoice AND $order->invoice_number) { $fileAttachment['content'] = PDF::invoice($order, 'S'); $fileAttachment['name'] = Configuration::get('PS_INVOICE_PREFIX', (int)($order->id_lang)).sprintf('%06d', $order->invoice_number).'.pdf'; diff --git a/classes/Product.php b/classes/Product.php index 077c1afc7..1c50e13c2 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -456,7 +456,7 @@ class ProductCore extends ObjectModel return false; foreach ($res AS $product) - if ((int)$product['id_product'] == (int)$this->id) + if ((int)($product['id_product']) == (int)($this->id)) $movedProduct = $product; if (!isset($movedProduct) || !isset($position)) @@ -1678,7 +1678,7 @@ class ProductCore extends ObjectModel $cur_cart = new Cart($id_cart); } - if ($id_cart) + if ((int)($id_cart)) { if (!isset(self::$_cart_quantity[(int)($id_cart).'_'.(int)($id_product)]) OR self::$_cart_quantity[(int)($id_cart).'_'.(int)($id_product)] != (int)($quantity)) self::$_cart_quantity[(int)($id_cart).'_'.(int)($id_product)] = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue(' @@ -2398,7 +2398,7 @@ class ProductCore extends ObjectModel { $productImplode = array(); foreach ($productIds as $id_product) - if ($id_product AND !array_key_exists($id_product, self::$_cacheFeatures)) + if ((int)$id_product AND !array_key_exists($id_product, self::$_cacheFeatures)) $productImplode[] = (int)$id_product; if (!count($productImplode)) return; @@ -2419,7 +2419,7 @@ class ProductCore extends ObjectModel { $productImplode = array(); foreach ($productIds as $id_product) - if ($id_product AND !array_key_exists($id_product.'-'.$id_lang, self::$_cacheFeatures)) + if ((int)$id_product AND !array_key_exists($id_product.'-'.$id_lang, self::$_cacheFeatures)) $productImplode[] = (int)$id_product; if (!count($productImplode)) return; @@ -2970,11 +2970,11 @@ class ProductCore extends ObjectModel public function createLabels($uploadableFiles, $textFields) { $languages = Language::getLanguages(); - if ($uploadableFiles > 0) + if ((int)($uploadableFiles) > 0) for ($i = 0; $i < (int)($uploadableFiles); $i++) if (!$this->_createLabel($languages, _CUSTOMIZE_FILE_)) return false; - if ((int)$textFields > 0) + if ((int)($textFields) > 0) for ($i = 0; $i < (int)($textFields); $i++) if (!$this->_createLabel($languages, _CUSTOMIZE_TEXTFIELD_)) return false; diff --git a/classes/Referrer.php b/classes/Referrer.php index b077ad59b..efc7a5f49 100644 --- a/classes/Referrer.php +++ b/classes/Referrer.php @@ -241,7 +241,7 @@ class ReferrerCore extends ObjectModel $implode = array(); foreach ($result as $row) - if ($row['id_order']) + if ((int)$row['id_order']) $implode[] = (int)$row['id_order']; if ($implode) @@ -339,7 +339,7 @@ class ReferrerCore extends ObjectModel $statsSales = $referrer->getStatsSales($id_product, $employee); // If it's a product and it has no visits nor orders - if ($id_product AND !$statsVisits['visits'] AND !$statsSales['orders']) + if ((int)($id_product) AND !$statsVisits['visits'] AND !$statsSales['orders']) exit; $jsonArray = array(); diff --git a/classes/Supplier.php b/classes/Supplier.php index 1c1c1824d..fb723f98a 100644 --- a/classes/Supplier.php +++ b/classes/Supplier.php @@ -151,7 +151,7 @@ class SupplierCore extends ObjectModel } } for ($i = 0; $i < sizeof($suppliers); $i++) - if (Configuration::get('PS_REWRITING_SETTINGS')) + if ((int)(Configuration::get('PS_REWRITING_SETTINGS'))) $suppliers[$i]['link_rewrite'] = Tools::link_rewrite($suppliers[$i]['name'], false); else $suppliers[$i]['link_rewrite'] = 0; diff --git a/classes/Tools.php b/classes/Tools.php index 123c7e789..61e62e56a 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -65,7 +65,7 @@ class ToolsCore $url = substr($url, strlen($baseUri)); if (strpos($url, 'index.php?controller=') !== FALSE && strpos($url, 'index.php/') == 0) { $url = substr($url, strlen('index.php?controller=')); - if (Configuration::get('PS_REWRITING_SETTINGS')) + if((int)(Configuration::get('PS_REWRITING_SETTINGS') == 1)) $url = self::strReplaceFirst('&', '?' , $url); } diff --git a/classes/WebserviceSpecificManagementImages.php b/classes/WebserviceSpecificManagementImages.php index 04aed5f48..30d43e7c0 100755 --- a/classes/WebserviceSpecificManagementImages.php +++ b/classes/WebserviceSpecificManagementImages.php @@ -813,7 +813,7 @@ class WebserviceSpecificManagementImagesCore implements WebserviceSpecificManage } else { - if ((int)Configuration::get('PS_IMAGE_GENERATION_METHOD') == 2 OR ((int)Configuration::get('PS_IMAGE_GENERATION_METHOD') == 0 AND $widthDiff > $heightDiff)) + if ((int)(Configuration::get('PS_IMAGE_GENERATION_METHOD')) == 2 OR ((int)(Configuration::get('PS_IMAGE_GENERATION_METHOD')) == 0 AND $widthDiff > $heightDiff)) { $nextHeight = $destHeight; $nextWidth = (int)(($sourceWidth * $nextHeight) / $sourceHeight); diff --git a/controllers/AddressController.php b/controllers/AddressController.php index ba90c7dd8..a02aab404 100644 --- a/controllers/AddressController.php +++ b/controllers/AddressController.php @@ -128,7 +128,7 @@ class AddressControllerCore extends FrontController $this->context->customer->isLogged(true) === true) $this->errors[] = Tools::displayError('Invalid token'); - if ($country->contains_states AND !$address->id_state) + if ((int)($country->contains_states) AND !(int)($address->id_state)) $this->errors[] = Tools::displayError('This country requires a state selection.'); if (!sizeof($this->errors)) diff --git a/controllers/AuthController.php b/controllers/AuthController.php index 7640eb4ae..8d4749146 100644 --- a/controllers/AuthController.php +++ b/controllers/AuthController.php @@ -140,7 +140,7 @@ class AuthControllerCore extends FrontController { if (!$country = new Country($address->id_country, Configuration::get('PS_LANG_DEFAULT')) OR !Validate::isLoadedObject($country)) die(Tools::displayError()); - if ($country->contains_states AND !$address->id_state) + if ((int)($country->contains_states) AND !(int)($address->id_state)) $this->errors[] = Tools::displayError('This country requires a state selection.'); else { diff --git a/controllers/CartController.php b/controllers/CartController.php index 9be617b7a..c86acc68a 100644 --- a/controllers/CartController.php +++ b/controllers/CartController.php @@ -185,7 +185,7 @@ class CartControllerCore extends FrontController if ($updateQuantity < 0) { /* if product has attribute, minimal quantity is set with minimal quantity of attribute*/ - if ($idProductAttribute) + if ((int)$idProductAttribute) $minimal_quantity = Attribute::getAttributeMinimalQty($idProductAttribute); else $minimal_quantity = $producToAdd->minimal_quantity; diff --git a/controllers/ContactController.php b/controllers/ContactController.php index 275a4cf93..6631a7462 100644 --- a/controllers/ContactController.php +++ b/controllers/ContactController.php @@ -121,7 +121,7 @@ class ContactControllerCore extends FrontController foreach ($fields as $key => $row) { $tmp = 0; - if ($row['id_customer'] AND $row['id_customer'] != $customer->id AND $row['email'] != $from) + if ((int)$row['id_customer'] AND $row['id_customer'] != $customer->id AND $row['email'] != $from) continue; if ($row['id_order'] != 0 AND Tools::getValue('id_order') != $row['id_order']) continue; @@ -159,7 +159,7 @@ class ContactControllerCore extends FrontController if ($contact->customer_service) { - if ($id_customer_thread) + if ((int)$id_customer_thread) { $ct = new CustomerThread($id_customer_thread); $ct->status = 'open'; diff --git a/controllers/ParentOrderController.php b/controllers/ParentOrderController.php index dd2af57c8..1e18fb171 100644 --- a/controllers/ParentOrderController.php +++ b/controllers/ParentOrderController.php @@ -141,7 +141,7 @@ class ParentOrderControllerCore extends FrontController if ((Configuration::get('PS_ORDER_PROCESS_TYPE') == 0 AND Tools::getValue('step') == 1) OR Configuration::get('PS_ORDER_PROCESS_TYPE') == 1) $this->addJS(_THEME_JS_DIR_.'order-address.js'); $this->addJS(_PS_JS_DIR_.'jquery/jquery.fancybox-1.3.4.js'); - if (Configuration::get('PS_BLOCK_CART_AJAX') OR Configuration::get('PS_ORDER_PROCESS_TYPE') == 1) + if ((int)(Configuration::get('PS_BLOCK_CART_AJAX')) OR Configuration::get('PS_ORDER_PROCESS_TYPE') == 1) { $this->addJS(_THEME_JS_DIR_.'cart-summary.js'); $this->addJS(_PS_JS_DIR_.'jquery/jquery-typewatch.pack.js'); @@ -200,7 +200,7 @@ class ParentOrderControllerCore extends FrontController { $this->context->cart->recyclable = (int)(Tools::getValue('recyclable')); $this->context->cart->gift = (int)(Tools::getValue('gift')); - if (Tools::getValue('gift')) + if ((int)(Tools::getValue('gift'))) { if (!Validate::isMessage($_POST['gift_message'])) $this->errors[] = Tools::displayError('Invalid gift message'); @@ -427,7 +427,7 @@ class ParentOrderControllerCore extends FrontController if (sizeof($carriers)) { $defaultCarrierIsPresent = false; - if ($this->context->cart->id_carrier) + if ((int)$this->context->cart->id_carrier != 0) foreach ($carriers AS $carrier) if ($carrier['id_carrier'] == (int)$this->context->cart->id_carrier) $defaultCarrierIsPresent = true; diff --git a/install-dev/xml/checkShopInfos.php b/install-dev/xml/checkShopInfos.php index cee33e829..9f20a132d 100644 --- a/install-dev/xml/checkShopInfos.php +++ b/install-dev/xml/checkShopInfos.php @@ -185,7 +185,7 @@ if (isFormValid()) $sqlParams[] = 'UPDATE '._DB_PREFIX_.'configuration SET value = \''.pSQL($_GET['isoCode']).'\' WHERE name = \'PS_LOCALE_LANGUAGE\''; $sqlParams[] = 'UPDATE '._DB_PREFIX_.'configuration SET value = \''.(int)$_GET['catalogMode'].'\' WHERE name = \'PS_CATALOG_MODE\''; $sqlParams[] = "INSERT IGNORE INTO "._DB_PREFIX_."configuration (name, value, date_add, date_upd) VALUES ('PS_SHOP_ACTIVITY', '".(int)($_GET['infosActivity'])."', NOW(), NOW())"; - if ($_GET['infosCountry']) + if ((int)($_GET['infosCountry']) != 0) { $sqlParams[] = 'UPDATE '._DB_PREFIX_.'configuration SET value = '.(int)($_GET['infosCountry']).' WHERE name = \'PS_COUNTRY_DEFAULT\''; $sqlParams[] = 'UPDATE '._DB_PREFIX_.'configuration SET value = "'.pSQL($_GET['infosTimezone']).'" WHERE name = \'PS_TIMEZONE\''; diff --git a/modules/blockcart/blockcart.php b/modules/blockcart/blockcart.php index 71dc8ceae..3e631d471 100644 --- a/modules/blockcart/blockcart.php +++ b/modules/blockcart/blockcart.php @@ -184,7 +184,7 @@ class BlockCart extends Module if (Configuration::get('PS_CATALOG_MODE')) return; $this->context->controller->addCSS(($this->_path).'blockcart.css', 'all'); - if (Configuration::get('PS_BLOCK_CART_AJAX')) + if ((int)(Configuration::get('PS_BLOCK_CART_AJAX'))) $this->context->controller->addJS(($this->_path).'ajax-cart.js'); } } diff --git a/modules/blocklanguages/blocklanguages.php b/modules/blocklanguages/blocklanguages.php index d47919493..0c340f47a 100644 --- a/modules/blocklanguages/blocklanguages.php +++ b/modules/blocklanguages/blocklanguages.php @@ -62,7 +62,7 @@ class BlockLanguages extends Module return; $link = new Link(); - if (Configuration::get('PS_REWRITING_SETTINGS')) + if((int)Configuration::get('PS_REWRITING_SETTINGS')) { $default_rewrite = array(); $phpSelf = isset($_SERVER['PHP_SELF']) ? substr($_SERVER['PHP_SELF'], strlen(__PS_BASE_URI__)) : ''; diff --git a/modules/blocknewproducts/blocknewproducts.php b/modules/blocknewproducts/blocknewproducts.php index 3db3c33c3..7437e7034 100644 --- a/modules/blocknewproducts/blocknewproducts.php +++ b/modules/blocknewproducts/blocknewproducts.php @@ -58,7 +58,7 @@ class BlockNewProducts extends Module { if (!$productNbr = Tools::getValue('productNbr') OR empty($productNbr)) $output .= '
'.$this->l('Please fill in the "products displayed" field.').'
'; - elseif ((int)$productNbr == 0) + elseif ((int)($productNbr) == 0) $output .= '
'.$this->l('Invalid number.').'
'; else { diff --git a/modules/blocktags/blocktags.php b/modules/blocktags/blocktags.php index f095aae1a..df6360d93 100644 --- a/modules/blocktags/blocktags.php +++ b/modules/blocktags/blocktags.php @@ -63,7 +63,7 @@ class BlockTags extends Module { if (!$tagsNbr = Tools::getValue('tagsNbr') OR empty($tagsNbr)) $output .= '
'.$this->l('Please fill in the "tags displayed" field.').'
'; - elseif ((int)$tagsNbr == 0) + elseif ((int)($tagsNbr) == 0) $output .= '
'.$this->l('Invalid number.').'
'; else { diff --git a/modules/blockviewed/blockviewed.php b/modules/blockviewed/blockviewed.php index 209fd068c..3dca50196 100644 --- a/modules/blockviewed/blockviewed.php +++ b/modules/blockviewed/blockviewed.php @@ -64,7 +64,7 @@ class BlockViewed extends Module { if (!$productNbr = Tools::getValue('productNbr') OR empty($productNbr)) $output .= '
'.$this->l('You must fill in the \'Products displayed\' field.').'
'; - elseif ((int)$productNbr == 0) + elseif ((int)($productNbr) == 0) $output .= '
'.$this->l('Invalid number.').'
'; else { diff --git a/modules/canadapost/canadapost.php b/modules/canadapost/canadapost.php index 4b953fb2e..f990679b6 100755 --- a/modules/canadapost/canadapost.php +++ b/modules/canadapost/canadapost.php @@ -1162,7 +1162,7 @@ class CanadaPost extends CarrierModule public function hookupdateCarrier($params) { - if ((int)$params['id_carrier'] != (int)$params['carrier']->id) + if ((int)($params['id_carrier']) != (int)($params['carrier']->id)) { $serviceSelected = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code` WHERE `id_carrier` = '.(int)$params['id_carrier']); $update = array('id_carrier' => (int)($params['carrier']->id), 'id_carrier_history' => pSQL($serviceSelected['id_carrier_history'].'|'.(int)($params['carrier']->id))); diff --git a/modules/dejala/dejala.php b/modules/dejala/dejala.php index a3ce57078..ef284e82f 100644 --- a/modules/dejala/dejala.php +++ b/modules/dejala/dejala.php @@ -839,7 +839,7 @@ class Dejala extends CarrierModule do { $wd = date("w", $balladUtc); - if ((int)$calendar[$wd]['stop_hour'] < (int)$calendar[$wd]['start_hour']) continue ; + if ((int)($calendar[$wd]['stop_hour']) < (int)($calendar[$wd]['start_hour'])) continue ; $dates[$iDate]['value'] = date("Y/m/d", $balladUtc); $dates[$iDate]['ts'] = $balladUtc ; @@ -856,9 +856,9 @@ class Dejala extends CarrierModule return ; $now = (int)(date("H", $ctime)) ; - if ((int)$dates[0]['stop_hour'] > $now && (int)$dates[0]['start_hour'] < $now) + if ((int)($dates[0]['stop_hour']) > $now && (int)($dates[0]['start_hour']) < $now) $dates[0]['start_hour'] = $now ; - elseif ((int)$dates[0]['ts'] == $now && (int)$dates[0]['stop_hour'] < $now) + elseif ((int)($dates[0]['ts']) == $now && (int)($dates[0]['stop_hour']) < $now) array_shift($dates) ; diff --git a/modules/dejala/dejalacarrierutils.php b/modules/dejala/dejalacarrierutils.php index e6cec99e0..485a2412c 100644 --- a/modules/dejala/dejalacarrierutils.php +++ b/modules/dejala/dejalacarrierutils.php @@ -14,7 +14,7 @@ class DejalaCarrierUtils $id_zone = 1; $moduleCountryIsoCode = strtoupper($dejalaConfig->country); $countryID = Country::getByIso($moduleCountryIsoCode); - if ($countryID) + if ((int)($countryID)) $id_zone = Country::getIdZone($countryID); //TODO Will have to review this and apply proper code. diff --git a/modules/favoriteproducts/favoriteproducts-account.php b/modules/favoriteproducts/favoriteproducts-account.php index 25b9d7b4b..297d13a76 100644 --- a/modules/favoriteproducts/favoriteproducts-account.php +++ b/modules/favoriteproducts/favoriteproducts-account.php @@ -38,7 +38,7 @@ if (!Context::getContext()->cookie->isLogged()) include(dirname(__FILE__).'/../../header.php'); -if (Context::getContext()->customer->id) +if ((int)Context::getContext()->customer->id) { $smarty->assign('favoriteProducts', FavoriteProduct::getFavoriteProducts((int)Context::getContext()->customer->id, (int)Context::getContext()->language->id)); diff --git a/modules/fedexcarrier/fedexcarrier.php b/modules/fedexcarrier/fedexcarrier.php index 6c62dac1f..250c29c49 100644 --- a/modules/fedexcarrier/fedexcarrier.php +++ b/modules/fedexcarrier/fedexcarrier.php @@ -1336,7 +1336,7 @@ class FedexCarrier extends CarrierModule public function hookupdateCarrier($params) { - if ((int)$params['id_carrier'] != (int)$params['carrier']->id) + if ((int)($params['id_carrier']) != (int)($params['carrier']->id)) { $serviceSelected = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code` WHERE `id_carrier` = '.(int)$params['id_carrier']); $update = array('id_carrier' => (int)($params['carrier']->id), 'id_carrier_history' => pSQL($serviceSelected['id_carrier_history'].'|'.(int)($params['carrier']->id))); diff --git a/modules/loyalty/loyalty.php b/modules/loyalty/loyalty.php index 090052c07..e79f619ee 100644 --- a/modules/loyalty/loyalty.php +++ b/modules/loyalty/loyalty.php @@ -301,7 +301,7 @@ class Loyalty extends Module foreach ($order_states AS $order_state) { $html .= ''; } @@ -314,7 +314,7 @@ class Loyalty extends Module foreach ($order_states AS $order_state) { $html .= ''; } @@ -542,7 +542,7 @@ class Loyalty extends Module $loyalty->id_customer = (int)$params['customer']->id; $loyalty->id_order = (int)$params['order']->id; $loyalty->points = LoyaltyModule::getOrderNbPoints($params['order']); - if (Configuration::get('PS_LOYALTY_NONE_AWARD') AND (int)$loyalty->points == 0) + if ((int)(Configuration::get('PS_LOYALTY_NONE_AWARD')) AND (int)($loyalty->points) == 0) $loyalty->id_loyalty_state = LoyaltyStateModule::getNoneAwardId(); else $loyalty->id_loyalty_state = LoyaltyStateModule::getDefaultId(); @@ -567,13 +567,13 @@ class Loyalty extends Module { if (!Validate::isLoadedObject($loyalty = new LoyaltyModule(LoyaltyModule::getByOrderId($order->id)))) return false; - if (Configuration::get('PS_LOYALTY_NONE_AWARD') AND $loyalty->id_loyalty_state == LoyaltyStateModule::getNoneAwardId()) + if ((int)(Configuration::get('PS_LOYALTY_NONE_AWARD')) AND $loyalty->id_loyalty_state == LoyaltyStateModule::getNoneAwardId()) return true; if ($newOrder->id == $this->loyaltyStateValidation->id_order_state) { $loyalty->id_loyalty_state = LoyaltyStateModule::getValidationId(); - if ((int)$loyalty->points < 0) + if ((int)($loyalty->points) < 0) $loyalty->points = abs((int)($loyalty->points)); } elseif ($newOrder->id == $this->loyaltyStateCancel->id_order_state) diff --git a/modules/paypal/express/submit.php b/modules/paypal/express/submit.php index cb9f73b95..1e5b747f3 100644 --- a/modules/paypal/express/submit.php +++ b/modules/paypal/express/submit.php @@ -346,7 +346,7 @@ if (!isset(Context::getContext()->cookie->paypal_token) OR !Context::getContext( else { // We have token, we need to confirm user informations (login or signup) - if (Tools::getValue('confirm')) + if ((int)(Tools::getValue('confirm'))) displayConfirm(); elseif (Tools::isSubmit('submitAccount')) submitAccount(); diff --git a/modules/productcomments/productcommentscriterion.php b/modules/productcomments/productcommentscriterion.php index 67170b541..5a26ba39f 100644 --- a/modules/productcomments/productcommentscriterion.php +++ b/modules/productcomments/productcommentscriterion.php @@ -34,7 +34,7 @@ if (empty($_GET['id_lang']) === false && isset($_GET['id_product']) === true) { $criterions = ProductCommentCriterion::get($_GET['id_lang']); - if ($_GET['id_product']) + if ((int)($_GET['id_product'])) $selects = ProductCommentCriterion::getByProduct($_GET['id_product'], $_GET['id_lang']); echo '