Skip to content

Commit 768cde4

Browse files
nicosombnicosomb
committed
Fixed conflicts
2 parents 5016048 + e98003d commit 768cde4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+114
-87
lines changed

‎admin-dev/filemanager/config/config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
$cms_accesses = Profile::getProfileAccess(Context::getContext()->employee->id_profile, Tab::getIdFromClassName('AdminCmsContent'));
4040

4141
if (!$products_accesses['edit'] && !$cms_accesses['edit']) {
42-
die(Tools::displayError());
42+
die(Tools::displayError('Access forbidden.'));
4343
}
4444
//------------------------------------------------------------------------------
4545
// DON'T COPY THIS VARIABLES IN FOLDERS config.php FILES

‎classes/CMSCategory.php

+8-5
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,11 @@ public static function recurseCMSCategory($categories, $current, $id_cms_categor
241241
*/
242242
protected function recursiveDelete(&$to_delete, $id_cms_category)
243243
{
244-
if (!is_array($to_delete) || !$id_cms_category) {
245-
die(Tools::displayError());
244+
if (!is_array($to_delete)) {
245+
die(Tools::displayError('Parameter "to_delete" is invalid.'));
246+
}
247+
if (!$id_cms_category) {
248+
die(Tools::displayError('Parameter "id_cms_category" is invalid.'));
246249
}
247250

248251
$result = Db::getInstance()->executeS('
@@ -341,7 +344,7 @@ public function calcLevelDepth()
341344
public static function getCategories($id_lang, $active = true, $order = true)
342345
{
343346
if (!Validate::isBool($active)) {
344-
die(Tools::displayError());
347+
die(Tools::displayError('Parameter "active" is invalid.'));
345348
}
346349

347350
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
@@ -385,7 +388,7 @@ public static function getSimpleCategories($id_lang)
385388
public function getSubCategories($id_lang, $active = true)
386389
{
387390
if (!Validate::isBool($active)) {
388-
die(Tools::displayError());
391+
die(Tools::displayError('Parameter "active" is invalid.'));
389392
}
390393

391394
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
@@ -433,7 +436,7 @@ public static function getHomeCategories($id_lang, $active = true)
433436
public static function getChildren($id_parent, $id_lang, $active = true)
434437
{
435438
if (!Validate::isBool($active)) {
436-
die(Tools::displayError());
439+
die(Tools::displayError('Parameter "active" is invalid.'));
437440
}
438441

439442
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('

‎classes/Carrier.php

+6-3
Original file line numberDiff line numberDiff line change
@@ -612,8 +612,11 @@ public static function getIdTaxRulesGroupMostUsed()
612612
*/
613613
public static function getDeliveredCountries($id_lang, $active_countries = false, $active_carriers = false, $contain_states = null)
614614
{
615-
if (!Validate::isBool($active_countries) || !Validate::isBool($active_carriers)) {
616-
die(Tools::displayError());
615+
if (!Validate::isBool($active_countries)) {
616+
die(Tools::displayError('Parameter "active_countries" is invalid.'));
617+
}
618+
if (!Validate::isBool($active_carriers)) {
619+
die(Tools::displayError('Parameter "active_carriers" is invalid.'));
617620
}
618621

619622
$states = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
@@ -1244,7 +1247,7 @@ public static function getIdTaxRulesGroupByIdCarrier($id_carrier, Context $conte
12441247
public function setTaxRulesGroup($id_tax_rules_group, $all_shops = false)
12451248
{
12461249
if (!Validate::isUnsignedId($id_tax_rules_group)) {
1247-
die(Tools::displayError());
1250+
die(Tools::displayError('Parameter "id_tax_rules_group" is invalid.'));
12481251
}
12491252

12501253
if (!$all_shops) {

‎classes/Cart.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1456,7 +1456,7 @@ public function updateQty(
14561456
}
14571457

14581458
if (!Validate::isLoadedObject($product)) {
1459-
die(Tools::displayError());
1459+
die(Tools::displayError(sprintf('Product with ID "%s" could not be loaded.', $id_product)));
14601460
}
14611461

14621462
if (isset(self::$_nbProducts[$this->id])) {
@@ -1892,7 +1892,7 @@ public static function getTotalCart($id_cart, $use_tax_display = false, $type =
18921892
{
18931893
$cart = new Cart($id_cart);
18941894
if (!Validate::isLoadedObject($cart)) {
1895-
die(Tools::displayError());
1895+
die(Tools::displayError(sprintf('Cart with ID "%s" could not be loaded.', $id_cart)));
18961896
}
18971897

18981898
$with_taxes = $use_tax_display ? $cart->_taxCalculationMethod != PS_TAX_EXC : true;

‎classes/Category.php

+12-9
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,11 @@ public function recurseLiteCategTree($maxDepth = 3, $currentDepth = 0, $idLang =
350350
*/
351351
protected function recursiveDelete(&$toDelete, $idCategory)
352352
{
353-
if (!is_array($toDelete) || !$idCategory) {
354-
die(Tools::displayError());
353+
if (!is_array($toDelete)) {
354+
die(Tools::displayError('Parameter "toDelete" is invalid.'));
355+
}
356+
if (!$idCategory) {
357+
die(Tools::displayError('Parameter "idCategory" is invalid.'));
355358
}
356359

357360
$sql = new DbQuery();
@@ -614,7 +617,7 @@ public function recalculateLevelDepth($idParentCategory)
614617
public static function getCategories($idLang = false, $active = true, $order = true, $sqlFilter = '', $orderBy = '', $limit = '')
615618
{
616619
if (!Validate::isBool($active)) {
617-
die(Tools::displayError());
620+
die(Tools::displayError('Parameter "active" is invalid.'));
618621
}
619622
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(
620623
'
@@ -684,11 +687,11 @@ public static function getAllCategoriesName(
684687
$limit = ''
685688
) {
686689
if (isset($idRootCategory) && !Validate::isInt($idRootCategory)) {
687-
die(Tools::displayError());
690+
die(Tools::displayError('Parameter "idRootCategory" was provided, but it\'s not a valid integer.'));
688691
}
689692

690693
if (!Validate::isBool($active)) {
691-
die(Tools::displayError());
694+
die(Tools::displayError('Parameter "active" is invalid.'));
692695
}
693696

694697
if (isset($groups) && Group::isFeatureActive() && !is_array($groups)) {
@@ -759,11 +762,11 @@ public static function getNestedCategories(
759762
$limit = ''
760763
) {
761764
if (isset($idRootCategory) && !Validate::isInt($idRootCategory)) {
762-
die(Tools::displayError());
765+
die(Tools::displayError('Parameter "idRootCategory" was provided, but it\'s not a valid integer.'));
763766
}
764767

765768
if (!Validate::isBool($active)) {
766-
die(Tools::displayError());
769+
die(Tools::displayError('Parameter "active" is invalid.'));
767770
}
768771

769772
if (isset($groups) && Group::isFeatureActive() && !is_array($groups)) {
@@ -1134,7 +1137,7 @@ public static function getRootCategory($idLang = null, Shop $shop = null)
11341137
public static function getChildren($idParent, $idLang, $active = true, $idShop = false)
11351138
{
11361139
if (!Validate::isBool($active)) {
1137-
die(Tools::displayError());
1140+
die(Tools::displayError('Parameter "active" is invalid.'));
11381141
}
11391142

11401143
$cacheId = 'Category::getChildren_' . (int) $idParent . '-' . (int) $idLang . '-' . (bool) $active . '-' . (int) $idShop;
@@ -1170,7 +1173,7 @@ public static function getChildren($idParent, $idLang, $active = true, $idShop =
11701173
public static function hasChildren($idParent, $idLang, $active = true, $idShop = false)
11711174
{
11721175
if (!Validate::isBool($active)) {
1173-
die(Tools::displayError());
1176+
die(Tools::displayError('Parameter "active" is invalid.'));
11741177
}
11751178

11761179
$cacheId = 'Category::hasChildren_' . (int) $idParent . '-' . (int) $idLang . '-' . (bool) $active . '-' . (int) $idShop;

‎classes/Cookie.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public function __isset($key)
228228
public function __set($key, $value)
229229
{
230230
if (is_array($value)) {
231-
die(Tools::displayError());
231+
die(Tools::displayError('Cookie value can\'t be an array.'));
232232
}
233233
if (preg_match('/¤|\|/', $key . $value)) {
234234
throw new Exception('Forbidden chars in cookie');

‎classes/Country.php

+7-4
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public static function getCountriesByIdShop($idShop, $idLang)
184184
public static function getByIso($isoCode, $active = false)
185185
{
186186
if (!Validate::isLanguageIsoCode($isoCode)) {
187-
die(Tools::displayError());
187+
die(Tools::displayError('Given iso code (' . $isoCode . ') is not valid.'));
188188
}
189189
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow(
190190
'
@@ -211,7 +211,7 @@ public static function getByIso($isoCode, $active = false)
211211
public static function getIdZone($idCountry)
212212
{
213213
if (!Validate::isUnsignedId($idCountry)) {
214-
die(Tools::displayError());
214+
die(Tools::displayError('Country ID is invalid.'));
215215
}
216216

217217
if (isset(self::$_idZones[$idCountry])) {
@@ -362,8 +362,11 @@ public static function getZipCodeFormat($idCountry)
362362
*/
363363
public static function getCountriesByZoneId($idZone, $idLang)
364364
{
365-
if (empty($idZone) || empty($idLang)) {
366-
die(Tools::displayError());
365+
if (empty($idZone)) {
366+
die(Tools::displayError('Zone ID is invalid.'));
367+
}
368+
if (empty($idLang)) {
369+
die(Tools::displayError('Lang ID is invalid.'));
367370
}
368371

369372
$sql = ' SELECT DISTINCT c.*, cl.*

‎classes/Customer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ public static function getAddressesTotalById($idCustomer)
828828
public static function checkPassword($idCustomer, $passwordHash)
829829
{
830830
if (!Validate::isUnsignedId($idCustomer)) {
831-
die(Tools::displayError());
831+
die(Tools::displayError('Customer ID is invalid.'));
832832
}
833833

834834
// Check that customers password hasn't changed since last login

‎classes/Employee.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ public static function getEmployees($activeOnly = true)
306306
public function getByEmail($email, $plaintextPassword = null, $activeOnly = true)
307307
{
308308
if (!Validate::isEmail($email)) {
309-
die(Tools::displayError());
309+
die(Tools::displayError('Email address is invalid.'));
310310
}
311311

312312
$sql = new DbQuery();
@@ -359,7 +359,7 @@ public function getByEmail($email, $plaintextPassword = null, $activeOnly = true
359359
public static function employeeExists($email)
360360
{
361361
if (!Validate::isEmail($email)) {
362-
die(Tools::displayError());
362+
die(Tools::displayError('Email address is invalid.'));
363363
}
364364

365365
return (bool) Db::getInstance()->getValue('
@@ -379,7 +379,7 @@ public static function employeeExists($email)
379379
public static function checkPassword($idEmployee, $passwordHash)
380380
{
381381
if (!Validate::isUnsignedId($idEmployee)) {
382-
die(Tools::displayError());
382+
die(Tools::displayError('Employee ID is invalid.'));
383383
}
384384

385385
$sql = new DbQuery();

‎classes/Feature.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public function update($nullValues = false)
155155
foreach ($fields as $field) {
156156
foreach (array_keys($field) as $key) {
157157
if (!Validate::isTableOrIdentifier($key)) {
158-
die(Tools::displayError());
158+
die(Tools::displayError('Invalid column name in feature_lang table.'));
159159
}
160160
}
161161

‎classes/Image.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ public static function getHighestPosition($idProduct)
367367
public static function deleteCover($idProduct)
368368
{
369369
if (!Validate::isUnsignedId($idProduct)) {
370-
die(Tools::displayError());
370+
die(Tools::displayError('Product ID is invalid.'));
371371
}
372372

373373
if (file_exists(_PS_TMP_IMG_DIR_ . 'product_' . $idProduct . '.jpg')) {

‎classes/ImageType.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public static function getImageTypeById(int $id): array
136136
public static function typeAlreadyExists($typeName)
137137
{
138138
if (!Validate::isImageTypeName($typeName)) {
139-
die(Tools::displayError());
139+
die(Tools::displayError(sprintf('"%s" is not valid image type name.', $typeName)));
140140
}
141141

142142
Db::getInstance()->executeS('

‎classes/Language.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ public function delete()
692692
public function deleteSelection($selection)
693693
{
694694
if (!is_array($selection)) {
695-
die(Tools::displayError());
695+
die(Tools::displayError('Parameter "selection" must be an array.'));
696696
}
697697

698698
$result = true;

‎classes/Manufacturer.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public function delete()
148148
public function deleteSelection($selection)
149149
{
150150
if (!is_array($selection)) {
151-
die(Tools::displayError());
151+
die(Tools::displayError('Parameter "selection" must be an array.'));
152152
}
153153

154154
$result = true;
@@ -404,7 +404,7 @@ public static function getProducts(
404404
}
405405

406406
if (!Validate::isOrderBy($orderBy) || !Validate::isOrderWay($orderWay)) {
407-
die(Tools::displayError());
407+
die(Tools::displayError('Invalid sorting parameters provided.'));
408408
}
409409

410410
$groups = FrontController::getCurrentCustomerGroups();

‎classes/Message.php

+7-4
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public static function getMessageByCartId($idCart)
114114
public static function getMessagesByOrderId($idOrder, $private = false, Context $context = null)
115115
{
116116
if (!Validate::isBool($private)) {
117-
die(Tools::displayError());
117+
die(Tools::displayError('Parameter "private" is invalid.'));
118118
}
119119

120120
if (!$context) {
@@ -149,7 +149,7 @@ public static function getMessagesByOrderId($idOrder, $private = false, Context
149149
public static function getMessagesByCartId($idCart, $private = false, Context $context = null)
150150
{
151151
if (!Validate::isBool($private)) {
152-
die(Tools::displayError());
152+
die(Tools::displayError('Parameter "private" is invalid.'));
153153
}
154154

155155
if (!$context) {
@@ -180,8 +180,11 @@ public static function getMessagesByCartId($idCart, $private = false, Context $c
180180
*/
181181
public static function markAsReaded($idMessage, $idEmployee)
182182
{
183-
if (!Validate::isUnsignedId($idMessage) || !Validate::isUnsignedId($idEmployee)) {
184-
die(Tools::displayError());
183+
if (!Validate::isUnsignedId($idMessage)) {
184+
die(Tools::displayError('Message ID is invalid.'));
185+
}
186+
if (!Validate::isUnsignedId($idEmployee)) {
187+
die(Tools::displayError('Employee ID is invalid.'));
185188
}
186189

187190
$result = Db::getInstance()->execute('

‎classes/Meta.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ public function delete()
255255
public function deleteSelection($selection)
256256
{
257257
if (!is_array($selection)) {
258-
die(Tools::displayError());
258+
die(Tools::displayError('Parameter "selection" must be an array.'));
259259
}
260260
$result = true;
261261
foreach ($selection as $id) {

‎classes/PaymentModule.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,12 @@ public function validateOrder(
239239
if (!Validate::isLoadedObject($order_status)) {
240240
PrestaShopLogger::addLog('PaymentModule::validateOrder - Order Status cannot be loaded', 3, null, 'Cart', (int) $id_cart, true);
241241

242-
throw new PrestaShopException('Can\'t load Order status');
242+
throw new PrestaShopException('Error processing order. Can\'t load Order status.');
243243
}
244244

245245
if (!$this->active) {
246246
PrestaShopLogger::addLog('PaymentModule::validateOrder - Module is not active', 3, null, 'Cart', (int) $id_cart, true);
247-
die(Tools::displayError());
247+
die(Tools::displayError('Error processing order. Payment module is not active.'));
248248
}
249249

250250
// Make sure cart is loaded and not related to an existing order
@@ -257,7 +257,7 @@ public function validateOrder(
257257

258258
if ($secure_key !== false && $secure_key != $this->context->cart->secure_key) {
259259
PrestaShopLogger::addLog('PaymentModule::validateOrder - Secure key does not match', 3, null, 'Cart', (int) $id_cart, true);
260-
die(Tools::displayError());
260+
die(Tools::displayError('Error processing order. Secure key does not match.'));
261261
}
262262

263263
// For each package, generate an order

‎classes/PrestaShopBackup.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public static function getBackupPath($filename = '')
132132
}
133133

134134
if ($backupfile === false || strncmp($backupdir, $backupfile, strlen($backupdir)) != 0) {
135-
die(Tools::displayError());
135+
die(Tools::displayError('Invalid backup file.'));
136136
}
137137

138138
return $backupfile;

0 commit comments

Comments
 (0)