dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] MO: pscleaner - fixed bugs

Browse Source 
We need to know that 'editorial' is a module and not always install (so, table can not be there).

ps2 need to be _DB_PREFIX_ !
This commit is contained in:
PrestaEdit
2013-03-08 20:07:08 +01:00
parent a273b34038
commit 025badd0ce
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/pscleaner/pscleaner.php
+10 -7
View File
@@ -85,7 +85,7 @@ class PSCleaner extends Module
// Simple Cascade Delete // Simple Cascade Delete
$queries = array( $queries = array(
// 0 => DELETE FROM __table__, 1 => WHERE __id__ NOT IN, 2 => NOT IN __table__, 3 => __id__ used in the "NOT IN" table // 0 => DELETE FROM __table__, 1 => WHERE __id__ NOT IN, 2 => NOT IN __table__, 3 => __id__ used in the "NOT IN" table, 4 => module_name
array('access', 'id_profile', 'profile', 'id_profile'), array('access', 'id_profile', 'profile', 'id_profile'),
array('access', 'id_tab', 'tab', 'id_tab'), array('access', 'id_tab', 'tab', 'id_tab'),
array('accessory', 'id_product_1', 'product', 'id_product'), array('accessory', 'id_product_1', 'product', 'id_product'),
@@ -138,7 +138,7 @@ class PSCleaner extends Module
array('delivery', 'id_shop_group', 'shop_group', 'id_shop_group'), array('delivery', 'id_shop_group', 'shop_group', 'id_shop_group'),
array('delivery', 'id_carrier', 'carrier', 'id_carrier'), array('delivery', 'id_carrier', 'carrier', 'id_carrier'),
array('delivery', 'id_zone', 'zone', 'id_zone'), array('delivery', 'id_zone', 'zone', 'id_zone'),
array('editorial', 'id_shop', 'shop', 'id_shop'), array('editorial', 'id_shop', 'shop', 'id_shop', 'editorial'),
array('favorite_product', 'id_product', 'product', 'id_product'), array('favorite_product', 'id_product', 'product', 'id_product'),
array('favorite_product', 'id_customer', 'customer', 'id_customer'), array('favorite_product', 'id_customer', 'customer', 'id_customer'),
array('favorite_product', 'id_shop', 'shop', 'id_shop'), array('favorite_product', 'id_shop', 'shop', 'id_shop'),
@@ -244,10 +244,13 @@ class PSCleaner extends Module
$queries = self::bulle($queries); $queries = self::bulle($queries);
foreach ($queries as $query_array) foreach ($queries as $query_array)
{ {
$query = 'DELETE FROM `'._DB_PREFIX_.$query_array[0].'` WHERE `'.$query_array[1].'` NOT IN (SELECT `'.$query_array[3].'` FROM `'._DB_PREFIX_.$query_array[2].'`)'; if(!isset($query_array[4]) || (isset($query_array[4]) && Module::isInstalled($query_array[4])))
$db->Execute($query); {
if ($affected_rows = $db->Affected_Rows()) $query = 'DELETE FROM `'._DB_PREFIX_.$query_array[0].'` WHERE `'.$query_array[1].'` NOT IN (SELECT `'.$query_array[3].'` FROM `'._DB_PREFIX_.$query_array[2].'`)';
$logs[$query] = $affected_rows; $db->Execute($query);
if ($affected_rows = $db->Affected_Rows())
$logs[$query] = $affected_rows;
}
} }
// _lang table cleaning // _lang table cleaning
@@ -277,7 +280,7 @@ class PSCleaner extends Module
$table = str_replace('_shop', '', $table_shop); $table = str_replace('_shop', '', $table_shop);
$id_table = 'id_'.preg_replace('/^'._DB_PREFIX_.'/', '', $table); $id_table = 'id_'.preg_replace('/^'._DB_PREFIX_.'/', '', $table);
if (in_array($table_shop, array('ps2_carrier_tax_rules_group_shop'))) if (in_array($table_shop, array(_DB_PREFIX_.'carrier_tax_rules_group_shop')))
continue; continue;
$query = 'DELETE FROM `'.bqSQL($table_shop).'` WHERE `'.bqSQL($id_table).'` NOT IN (SELECT `'.bqSQL($id_table).'` FROM `'.bqSQL($table).'`)'; $query = 'DELETE FROM `'.bqSQL($table_shop).'` WHERE `'.bqSQL($id_table).'` NOT IN (SELECT `'.bqSQL($id_table).'` FROM `'.bqSQL($table).'`)';