From 27cab2cf9283b8454306c20db32f9722511069bc Mon Sep 17 00:00:00 2001 From: Presta Module Date: Wed, 26 Oct 2016 10:17:23 +0200 Subject: [PATCH 01/35] Delete CHANGELOG.txt This file was never updated since 3 years. --- CHANGELOG.txt | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 CHANGELOG.txt diff --git a/CHANGELOG.txt b/CHANGELOG.txt deleted file mode 100644 index 187e515..0000000 --- a/CHANGELOG.txt +++ /dev/null @@ -1,6 +0,0 @@ -2014-04-17 11:25:39 +0200 [-] MO : pscleaner - Fix 1.5 ps_version_compliancy issue -2014-04-09 17:21:40 +0200 // Add version to config.xml -2014-04-04 14:28:26 +0200 [MO] Fix error when homeslider isn't installed -2014-03-31 19:12:05 +0200 [-] MO : pscleaner - FixBug #PSCFV-11805 - Delete home and root categories on 1.5 -2014-03-24 18:26:42 +0100 / MO pscleaner : ps_versions_compliancy added -2014-03-21 10:55:18 +0100 Initial commit From 469fcb31aa5011f9206f52317a9efe1e7a7fc6f9 Mon Sep 17 00:00:00 2001 From: Adonis Karavokyros Date: Mon, 13 Mar 2017 12:02:50 +0100 Subject: [PATCH 02/35] Fix missing table in Catalog Related Tables Attribute table is not truncated and they are issues with import --- pscleaner.php | 1 + 1 file changed, 1 insertion(+) diff --git a/pscleaner.php b/pscleaner.php index 8a97264..f5d77f4 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -723,6 +723,7 @@ public static function getCatalogRelatedTables() 'product_attribute_shop', 'product_attribute_combination', 'product_attribute_image', + 'attribute', 'attribute_impact', 'attribute_lang', 'attribute_group', From d40756217c1c526ecdecb9db41761933752123a6 Mon Sep 17 00:00:00 2001 From: Uebix Date: Wed, 26 Apr 2017 16:03:05 +0200 Subject: [PATCH 03/35] MO: Add cart_rule_lang in Check And Fix to delete old cart rule's names and prevent Duplicate entry for key 'PRIMARY'. --- pscleaner.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pscleaner.php b/pscleaner.php index 8a97264..d07b579 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -552,6 +552,8 @@ public static function getCheckAndFixQueries() array('cart_rule_country', 'id_country', 'country', 'id_country'), array('cart_rule_group', 'id_cart_rule', 'cart_rule', 'id_cart_rule'), array('cart_rule_group', 'id_group', 'group', 'id_group'), + array('cart_rule_lang', 'id_cart_rule', 'cart_rule', 'id_cart_rule'), + array('cart_rule_lang', 'id_lang', 'lang', 'id_lang'), array('cart_rule_product_rule_group', 'id_cart_rule', 'cart_rule', 'id_cart_rule'), array('cart_rule_product_rule', 'id_product_rule_group', 'cart_rule_product_rule_group', 'id_product_rule_group'), array('cart_rule_product_rule_value', 'id_product_rule', 'cart_rule_product_rule', 'id_product_rule'), From 72e765765e921c5c4b5a2603f01509824b43622a Mon Sep 17 00:00:00 2001 From: sadlyblue Date: Thu, 26 Jul 2018 15:00:02 +0100 Subject: [PATCH 04/35] Deleting from category_group and setting auto_increment When truncating the catalog, it could remove the categories deleted from the table category_group and set the auto_increment the max existing + 1. --- pscleaner.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pscleaner.php b/pscleaner.php index 8a97264..e6c787b 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -259,6 +259,8 @@ public function truncate($case) $db->execute('DELETE FROM `'._DB_PREFIX_.'category` WHERE id_category NOT IN ('.implode(',', array_map('intval', $id_home)).', '.implode(',', array_map('intval', $id_root)).')'); $db->execute('DELETE FROM `'._DB_PREFIX_.'category_lang` WHERE id_category NOT IN ('.implode(',', array_map('intval', $id_home)).', '.implode(',', array_map('intval', $id_root)).')'); $db->execute('DELETE FROM `'._DB_PREFIX_.'category_shop` WHERE id_category NOT IN ('.implode(',', array_map('intval', $id_home)).', '.implode(',', array_map('intval', $id_root)).')'); + $db->execute('DELETE FROM `'._DB_PREFIX_.'category_group` WHERE id_category NOT IN ('.implode(',', array_map('intval', $id_home)).', '.implode(',', array_map('intval', $id_root)).')'); + $db->execute('ALTER TABLE `'._DB_PREFIX_.'category` AUTO_INCREMENT = '. (1 + max(array_merge($id_home, $id_root)))); foreach (scandir(_PS_CAT_IMG_DIR_) as $dir) { if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $dir)) { unlink(_PS_CAT_IMG_DIR_.$dir); From 78620363e69c0ab3eb00a5e1cff0263a6ea98732 Mon Sep 17 00:00:00 2001 From: sadlyblue Date: Fri, 27 Jul 2018 13:35:33 +0100 Subject: [PATCH 05/35] Truncate the attribute table also Needs to truncate the attribute table also. If not, after creating new attribute groups after a "cleaning" the old values will show again. --- pscleaner.php | 1 + 1 file changed, 1 insertion(+) diff --git a/pscleaner.php b/pscleaner.php index 8a97264..2c7ba2f 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -725,6 +725,7 @@ public static function getCatalogRelatedTables() 'product_attribute_image', 'attribute_impact', 'attribute_lang', + 'attribute', 'attribute_group', 'attribute_group_lang', 'attribute_group_shop', From 898a1b6c485a6b6a3c2a349aa76f844650c019b0 Mon Sep 17 00:00:00 2001 From: Pablo Borowicz Date: Wed, 7 Nov 2018 15:21:40 -0300 Subject: [PATCH 06/35] Fixed indentation --- pscleaner.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pscleaner.php b/pscleaner.php index f5d77f4..369ed84 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -723,7 +723,7 @@ public static function getCatalogRelatedTables() 'product_attribute_shop', 'product_attribute_combination', 'product_attribute_image', - 'attribute', + 'attribute', 'attribute_impact', 'attribute_lang', 'attribute_group', From d73dce6a43f34a14afba6f205bd06cf62e547b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Hennes?= Date: Thu, 31 Jan 2019 14:49:17 +0100 Subject: [PATCH 07/35] add mail table for cleaning --- pscleaner.php | 1 + 1 file changed, 1 insertion(+) diff --git a/pscleaner.php b/pscleaner.php index 8a97264..cc160f2 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -779,6 +779,7 @@ public static function getSalesRelatedTables() 'customer_message_sync_imap', 'customer_thread', 'guest', + 'mail', 'message', 'message_readed', 'orders', From 8bb5c2fce721885a5f9216c6cde806a79638cd57 Mon Sep 17 00:00:00 2001 From: MathiasReker Date: Sun, 10 Feb 2019 22:27:13 +0100 Subject: [PATCH 08/35] Blank line before return statement --- pscleaner.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pscleaner.php b/pscleaner.php index 8a97264..4fe06cd 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -375,6 +375,7 @@ protected static function bulle($array) } } } + return $array; } @@ -531,6 +532,7 @@ public static function getCheckAndFixQueries() ); } + return array_merge($append, array( // 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'), @@ -690,6 +692,7 @@ public static function getCatalogRelatedTables() 'scene_shop', ); } + return array_merge($append, array( 'product', 'product_shop', From 44ab67a67c11c9cf07fa3c3188d0e55d1f53b92f Mon Sep 17 00:00:00 2001 From: MathiasReker Date: Sun, 10 Feb 2019 22:27:14 +0100 Subject: [PATCH 09/35] Ekstra blank line --- pscleaner.php | 1 - 1 file changed, 1 deletion(-) diff --git a/pscleaner.php b/pscleaner.php index 4fe06cd..3bbc8c3 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -529,7 +529,6 @@ public static function getCheckAndFixQueries() array('scene_products', 'id_product', 'product', 'id_product'), array('theme_specific', 'id_theme', 'theme', 'id_theme'), array('theme_specific', 'id_shop', 'shop', 'id_shop'), - ); } From 0eb087a32cca55e4525ab768ac17d90ec447cfae Mon Sep 17 00:00:00 2001 From: MathiasReker Date: Sun, 10 Feb 2019 22:27:56 +0100 Subject: [PATCH 10/35] Cast spaces --- pscleaner.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pscleaner.php b/pscleaner.php index 8a97264..a4fab1b 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -145,7 +145,7 @@ public static function checkAndFix() foreach ($result as $row) { $key = $row['id_shop_group'].'-|-'.$row['id_shop'].'-|-'.$row['name']; if (in_array($key, $filtered_configuration)) { - $query = 'DELETE FROM '._DB_PREFIX_.'configuration WHERE id_configuration = '.(int)$row['id_configuration']; + $query = 'DELETE FROM '._DB_PREFIX_.'configuration WHERE id_configuration = '.(int) $row['id_configuration']; $db->Execute($query); $logs[$query] = 1; } else { @@ -343,10 +343,10 @@ public static function cleanAndOptimize() $parents = Db::getInstance()->ExecuteS('SELECT DISTINCT id_parent FROM '._DB_PREFIX_.'tab'); foreach ($parents as $parent) { - $children = Db::getInstance()->ExecuteS('SELECT id_tab FROM '._DB_PREFIX_.'tab WHERE id_parent = '.(int)$parent['id_parent'].' ORDER BY IF(class_name IN ("AdminHome", "AdminDashboard"), 1, 2), position ASC'); + $children = Db::getInstance()->ExecuteS('SELECT id_tab FROM '._DB_PREFIX_.'tab WHERE id_parent = '.(int) $parent['id_parent'].' ORDER BY IF(class_name IN ("AdminHome", "AdminDashboard"), 1, 2), position ASC'); $i = 1; foreach ($children as $child) { - $query = 'UPDATE '._DB_PREFIX_.'tab SET position = '.(int)($i++).' WHERE id_tab = '.(int)$child['id_tab'].' AND id_parent = '.(int)$parent['id_parent']; + $query = 'UPDATE '._DB_PREFIX_.'tab SET position = '.(int) ($i++).' WHERE id_tab = '.(int) $child['id_tab'].' AND id_parent = '.(int) $parent['id_parent']; if (Db::getInstance()->Execute($query)) { if ($affected_rows = Db::getInstance()->Affected_Rows()) { $logs[$query] = $affected_rows; @@ -489,11 +489,11 @@ public function renderForm() $helper->module = $this; $helper->show_toolbar = false; $helper->table = $this->table; - $lang = new Language((int)Configuration::get('PS_LANG_DEFAULT')); + $lang = new Language((int) Configuration::get('PS_LANG_DEFAULT')); $helper->default_form_language = $lang->id; $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0; $this->fields_form = array(); - $helper->id = (int)Tools::getValue('id_carrier'); + $helper->id = (int) Tools::getValue('id_carrier'); $helper->identifier = $this->identifier; $helper->submit_action = 'btnSubmit'; $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name; From 4316a74b0fc56f1ff201ce3fb55ad1ec1f991f68 Mon Sep 17 00:00:00 2001 From: MathiasReker Date: Sun, 10 Feb 2019 22:28:24 +0100 Subject: [PATCH 11/35] Single quote --- index.php | 12 ++++++------ translations/index.php | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/index.php b/index.php index 2a40ec7..1d9e487 100644 --- a/index.php +++ b/index.php @@ -24,12 +24,12 @@ * International Registered Trademark & Property of PrestaShop SA */ -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); -header("Location: ../"); +header('Location: ../'); exit; diff --git a/translations/index.php b/translations/index.php index 2a40ec7..1d9e487 100644 --- a/translations/index.php +++ b/translations/index.php @@ -24,12 +24,12 @@ * International Registered Trademark & Property of PrestaShop SA */ -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); -header("Location: ../"); +header('Location: ../'); exit; From c0834cc4ec8bf797c260d43f820c9a7df2012ecb Mon Sep 17 00:00:00 2001 From: MathiasReker Date: Sun, 10 Feb 2019 22:28:46 +0100 Subject: [PATCH 12/35] Lossless compression --- logo.png | Bin 935 -> 798 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/logo.png b/logo.png index 0d3efb276e7585478427e33125a4bdead970ad8b..b4c7b0bd490ad6d9f9ca23b477b1d39966837110 100644 GIT binary patch delta 774 zcmV+h1Nr=?2c8CyB!9qAOjJex|Nj7tJOG3}0e?OKdOrbUEC5F(0hl=fSSd1&LJ^lm z37k9{jzT7dJpoTA0FycwgFl$gu4%S=OsIEAu}%SNFb`obKdeg=pFcXBN*$s>6l*hA zwo=gP*xT94zv0d)c{(+!NGYd98Fw}Tf;PCFD03*Oi0H zhKI*zDRBNp00001bW%=J06^y0W&i*J3`s;mRCr!x)75(8Knw-oK`=9hnK?z+egC&w z$;mcJdv5<@jeq=kOm3M@R@*c!25B5Uli%5WJw3JCSQrlLI_~}8_pj~KU7;+U{q)|S z|8Al1X7zJOE5w2>JCDA7>-*||vJXdVJ9_XJU=zCT;V_d>S!x{w*BS5VeWhB}U;z7- zjuT``NhsKtJ#atpa{=BIwAN!^$snK!dI#2jK`$tkSIQ#tCrvBm1B1K1@*xrn z2{Y=%SVH17^;8SFt_>(=OzHZ_GQY*xh7?6HQlrKXhz62@b2j&L#yEk)b2S4l%NZ(0 zqO-YaF@Mep42J@6>AYT9uGirFRv4)nu%pL~qR-i-z_}p%x(<~DJ^_!csDexnFcDvn*QfMr*%o9TF2-$1x0*3-yoR&)%a3qBE;6c~qb%6PZ zV-KCNaCwFS&E?($oJWm=Aw#%paRDo0rZ&(5_0G8)3K3qfe#ZuQWG*n@7eBIZeCH9` z{S5ZN;ltlIO}_Q&$&@^%m)!HQM}B7)B^$&|676pA4?kc&VPpsVUjP6A07*qoM6N<$ Ef`p=FoB#j- delta 913 zcmbQoww!%}O1)%>YeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK4R1_p)$0X`wF zJ}b)04#t|U^3YuFI^*0rsXnI*FK;kLXfh`2WbO%P=&@mFvF+b7nPIY3`LYyKBt#2?%jX?#BGWjW3~Zz zsWD@@1%INxLT~u@-(Q92+cW0tv2|L;Yz*R=Y$eof<-0AHp~{}YUG@L}|NGrMp8!4M zP!i-94CI1AJ(MPuVmMU2(S?D5$hH*Z)8Bh9r_E{kV~fd8 z^&kFSdbL{Ul+lhi^I9L?7vq?Jb5VneB3InaT$U$m&$otre-hvLytilff}hd}+9qe; zzh`EB`lfQ*-L#(+H$w;-zkL+#Y;6f7S9#iVE9`@)v`pLTgO zzWqMns(j|^!XqEI%~G=e6eX}oN&GmcDC-_ZoAZ}UUVqm-+wb&bn)WK;nNw1iJTaRt zcJ`59x`Dy6$f^?u7n-y%9cj4AEpgu~==kSdufJwzY(8-|&~WuBh2IJsPIL5*`BucP zzpnY`*a_R`JEKFd&Wq8XCoXd7)E7A)M}Z&p^B14}$-{bV!))q)O6KUU+brdM?C z@MkWr2W9d43}MA*XYw6aJnIuO)z0AhU5q>4Hmo}I>qP8s Date: Sun, 10 Feb 2019 22:29:18 +0100 Subject: [PATCH 13/35] Update licens of PHP files --- index.php | 4 ++-- pscleaner.php | 4 ++-- translations/index.php | 4 ++-- views/index.php | 4 ++-- views/templates/admin/_configure/helpers/form/index.php | 4 ++-- views/templates/admin/_configure/helpers/index.php | 4 ++-- views/templates/admin/_configure/index.php | 4 ++-- views/templates/admin/index.php | 4 ++-- views/templates/index.php | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/index.php b/index.php index 2a40ec7..8a1ebf9 100644 --- a/index.php +++ b/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2016 PrestaShop SA +* @copyright 2007-2019 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/pscleaner.php b/pscleaner.php index 8a97264..3d3c766 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -1,6 +1,6 @@ - * @copyright 2007-2016 PrestaShop SA + * @copyright 2007-2019 PrestaShop SA * @version Release: $Revision: 7060 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA diff --git a/translations/index.php b/translations/index.php index 2a40ec7..8a1ebf9 100644 --- a/translations/index.php +++ b/translations/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2016 PrestaShop SA +* @copyright 2007-2019 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/views/index.php b/views/index.php index 3cc8f39..4ef8000 100755 --- a/views/index.php +++ b/views/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2016 PrestaShop SA +* @copyright 2007-2019 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/views/templates/admin/_configure/helpers/form/index.php b/views/templates/admin/_configure/helpers/form/index.php index 3cc8f39..4ef8000 100755 --- a/views/templates/admin/_configure/helpers/form/index.php +++ b/views/templates/admin/_configure/helpers/form/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2016 PrestaShop SA +* @copyright 2007-2019 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/views/templates/admin/_configure/helpers/index.php b/views/templates/admin/_configure/helpers/index.php index 3cc8f39..4ef8000 100755 --- a/views/templates/admin/_configure/helpers/index.php +++ b/views/templates/admin/_configure/helpers/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2016 PrestaShop SA +* @copyright 2007-2019 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/views/templates/admin/_configure/index.php b/views/templates/admin/_configure/index.php index 3cc8f39..4ef8000 100755 --- a/views/templates/admin/_configure/index.php +++ b/views/templates/admin/_configure/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2016 PrestaShop SA +* @copyright 2007-2019 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/views/templates/admin/index.php b/views/templates/admin/index.php index 3cc8f39..4ef8000 100755 --- a/views/templates/admin/index.php +++ b/views/templates/admin/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2016 PrestaShop SA +* @copyright 2007-2019 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/views/templates/index.php b/views/templates/index.php index 3cc8f39..4ef8000 100755 --- a/views/templates/index.php +++ b/views/templates/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2016 PrestaShop SA +* @copyright 2007-2019 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ From 905f6da70a6b2dd040f6322e945205c223f7d4cf Mon Sep 17 00:00:00 2001 From: MathiasReker Date: Sun, 10 Feb 2019 22:29:19 +0100 Subject: [PATCH 14/35] Update licens of TPL files --- views/templates/admin/_configure/helpers/form/form.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/templates/admin/_configure/helpers/form/form.tpl b/views/templates/admin/_configure/helpers/form/form.tpl index de18b7d..831cfa1 100755 --- a/views/templates/admin/_configure/helpers/form/form.tpl +++ b/views/templates/admin/_configure/helpers/form/form.tpl @@ -1,5 +1,5 @@ {* -* 2007-2016 PrestaShop +* 2007-2019 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2016 PrestaShop SA +* @copyright 2007-2019 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} From 44046353b4e09692b869f9b3b3a1b9897542ecd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Hennes?= Date: Thu, 31 Jan 2019 14:34:25 +0100 Subject: [PATCH 15/35] Remove 1.7 conditions --- pscleaner.php | 73 +++++++++++++++++---------------------------------- 1 file changed, 24 insertions(+), 49 deletions(-) diff --git a/pscleaner.php b/pscleaner.php index 504ae59..17698ff 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -38,9 +38,7 @@ public function __construct() $this->version = '2.0.0'; $this->author = 'PrestaShop'; $this->need_instance = 0; - if (version_compare(_PS_VERSION_, '1.5.0.0 ', '>=')) { - $this->multishop_context = Shop::CONTEXT_ALL; - } + $this->multishop_context = Shop::CONTEXT_ALL; $this->bootstrap = true; parent::__construct(); @@ -49,25 +47,12 @@ public function __construct() $this->description = $this->trans('Check and fix functional integrity constraints and remove default data', array(), 'Modules.Pscleaner.Admin'); $this->secure_key = Tools::encrypt($this->name); - $this->ps_versions_compliancy = array('min' => '1.7.1.0', 'max' => _PS_VERSION_); + $this->ps_versions_compliancy = array('min' => '1.7.1.0', 'max' => _PS_VERSION_); } protected function getMultiShopValues($key) { - if (version_compare(_PS_VERSION_, '1.6.0.3', '>=') === true) { return Configuration::getMultiShopValues($key); - } else { - $shops = Shop::getShops(false, null, true); - $id_lang = (int) $this->context->language->id; - $results = array(); - array_push($results, Configuration::get($key)); - - foreach ($shops as $id_shop) { - array_push($results, Configuration::get($key, $id_lang, null, $id_shop)); - } - - return $results; - } } public function getContent() @@ -515,24 +500,8 @@ public function getConfigFieldsValues() public static function getCheckAndFixQueries() { - $append = array(); - if (version_compare('1.7.0.0', _PS_VERSION_, '>')) { - $append = array( - array('access', 'id_tab', 'tab', 'id_tab'), - array('compare_product', 'id_compare', 'compare', 'id_compare'), - array('compare_product', 'id_product', 'product', 'id_product'), - array('compare', 'id_customer', 'customer', 'id_customer'), - array('module_access', 'id_module', 'module', 'id_module'), - array('scene_category', 'id_scene', 'scene', 'id_scene'), - array('scene_category', 'id_category', 'category', 'id_category'), - array('scene_products', 'id_scene', 'scene', 'id_scene'), - array('scene_products', 'id_product', 'product', 'id_product'), - array('theme_specific', 'id_theme', 'theme', 'id_theme'), - array('theme_specific', 'id_shop', 'shop', 'id_shop'), - ); - } - return array_merge($append, array( + return array( // 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('accessory', 'id_product_1', 'product', 'id_product'), @@ -676,25 +645,24 @@ public static function getCheckAndFixQueries() array('warehouse_carrier', 'id_carrier', 'carrier', 'id_carrier'), array('warehouse_product_location', 'id_product', 'product', 'id_product'), array('warehouse_product_location', 'id_warehouse', 'warehouse', 'id_warehouse'), - )); + array('access', 'id_tab', 'tab', 'id_tab'), + array('compare_product', 'id_compare', 'compare', 'id_compare'), + array('compare_product', 'id_product', 'product', 'id_product'), + array('compare', 'id_customer', 'customer', 'id_customer'), + array('module_access', 'id_module', 'module', 'id_module'), + array('scene_category', 'id_scene', 'scene', 'id_scene'), + array('scene_category', 'id_category', 'category', 'id_category'), + array('scene_products', 'id_scene', 'scene', 'id_scene'), + array('scene_products', 'id_product', 'product', 'id_product'), + array('theme_specific', 'id_theme', 'theme', 'id_theme'), + array('theme_specific', 'id_shop', 'shop', 'id_shop'), + ); } public static function getCatalogRelatedTables() { - $append = array(); - if (version_compare('1.7.0.0', _PS_VERSION_, '>')) { - $append = array( - 'compare_product', - 'scene_products', - 'scene', - 'scene_category', - 'scene_lang', - 'scene_products', - 'scene_shop', - ); - } - return array_merge($append, array( + return array( 'product', 'product_shop', 'feature_product', @@ -767,7 +735,14 @@ public static function getCatalogRelatedTables() 'stock_available', 'stock_mvt', 'warehouse', - )); + 'compare_product', + 'scene_products', + 'scene', + 'scene_category', + 'scene_lang', + 'scene_products', + 'scene_shop', + ); } public static function getSalesRelatedTables() From 1994cab2f6bc28fabafc68605eeb044c032a5b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Hennes?= Date: Mon, 15 Jul 2019 15:14:07 +0200 Subject: [PATCH 16/35] Remove unwanted Tab --- pscleaner.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pscleaner.php b/pscleaner.php index 17698ff..ea2aa23 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -46,8 +46,7 @@ public function __construct() $this->displayName = $this->trans('PrestaShop Cleaner', array(), 'Modules.Pscleaner.Admin'); $this->description = $this->trans('Check and fix functional integrity constraints and remove default data', array(), 'Modules.Pscleaner.Admin'); $this->secure_key = Tools::encrypt($this->name); - - $this->ps_versions_compliancy = array('min' => '1.7.1.0', 'max' => _PS_VERSION_); + $this->ps_versions_compliancy = array('min' => '1.7.1.0', 'max' => _PS_VERSION_); } protected function getMultiShopValues($key) From 4d09dba3a7abb7bdc67ec0fe186226c23b789aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Hennes?= Date: Mon, 15 Jul 2019 15:28:49 +0200 Subject: [PATCH 17/35] Format Fix --- pscleaner.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pscleaner.php b/pscleaner.php index ea2aa23..c2d8982 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -51,7 +51,7 @@ public function __construct() protected function getMultiShopValues($key) { - return Configuration::getMultiShopValues($key); + return Configuration::getMultiShopValues($key); } public function getContent() From bb52af07c3ef2a0b36adaf2de48c43c75e8f27ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Hennes?= Date: Mon, 30 Sep 2019 22:06:13 +0200 Subject: [PATCH 18/35] # Remove wrong tables --- pscleaner.php | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/pscleaner.php b/pscleaner.php index c2d8982..b47fef5 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -643,18 +643,7 @@ public static function getCheckAndFixQueries() array('warehouse_carrier', 'id_warehouse', 'warehouse', 'id_warehouse'), array('warehouse_carrier', 'id_carrier', 'carrier', 'id_carrier'), array('warehouse_product_location', 'id_product', 'product', 'id_product'), - array('warehouse_product_location', 'id_warehouse', 'warehouse', 'id_warehouse'), - array('access', 'id_tab', 'tab', 'id_tab'), - array('compare_product', 'id_compare', 'compare', 'id_compare'), - array('compare_product', 'id_product', 'product', 'id_product'), - array('compare', 'id_customer', 'customer', 'id_customer'), - array('module_access', 'id_module', 'module', 'id_module'), - array('scene_category', 'id_scene', 'scene', 'id_scene'), - array('scene_category', 'id_category', 'category', 'id_category'), - array('scene_products', 'id_scene', 'scene', 'id_scene'), - array('scene_products', 'id_product', 'product', 'id_product'), - array('theme_specific', 'id_theme', 'theme', 'id_theme'), - array('theme_specific', 'id_shop', 'shop', 'id_shop'), + array('warehouse_product_location', 'id_warehouse', 'warehouse', 'id_warehouse') ); } @@ -733,14 +722,7 @@ public static function getCatalogRelatedTables() 'stock', 'stock_available', 'stock_mvt', - 'warehouse', - 'compare_product', - 'scene_products', - 'scene', - 'scene_category', - 'scene_lang', - 'scene_products', - 'scene_shop', + 'warehouse' ); } From 41d199d11fd3a856721cab74efa5ec37982e93cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Hennes?= Date: Fri, 18 Oct 2019 14:20:41 +0200 Subject: [PATCH 19/35] remove attribute_impact declared twice --- pscleaner.php | 1 - 1 file changed, 1 deletion(-) diff --git a/pscleaner.php b/pscleaner.php index dbaea42..0651206 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -678,7 +678,6 @@ public static function getCatalogRelatedTables() 'customization', 'customization_field', 'supply_order_detail', - 'attribute_impact', 'product_attribute', 'product_attribute_shop', 'product_attribute_combination', From 3e08fe9b3711ae4fc173c0f079c9c02cbd3afd6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Hennes?= Date: Tue, 22 Oct 2019 14:19:38 +0200 Subject: [PATCH 20/35] remove duplicated tables in getCatalogRelatedTables() --- pscleaner.php | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pscleaner.php b/pscleaner.php index 0651206..65ee4e9 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -653,7 +653,6 @@ public static function getCatalogRelatedTables() return array( 'product', 'product_shop', - 'feature_product', 'product_lang', 'category_product', 'product_tag', @@ -661,8 +660,6 @@ public static function getCatalogRelatedTables() 'image', 'image_lang', 'image_shop', - 'specific_price', - 'specific_price_priority', 'product_carrier', 'cart_product', 'product_attachment', @@ -672,20 +669,10 @@ public static function getCatalogRelatedTables() 'product_sale', 'product_supplier', 'warehouse_product_location', - 'stock', - 'stock_available', - 'stock_mvt', - 'customization', - 'customization_field', 'supply_order_detail', - 'product_attribute', - 'product_attribute_shop', - 'product_attribute_combination', - 'product_attribute_image', 'attribute', 'attribute_impact', 'attribute_lang', - 'attribute', 'attribute_group', 'attribute_group_lang', 'attribute_group_shop', @@ -694,7 +681,6 @@ public static function getCatalogRelatedTables() 'product_attribute_shop', 'product_attribute_combination', 'product_attribute_image', - 'stock_available', 'manufacturer', 'manufacturer_lang', 'manufacturer_shop', From 071b7bc429cbd4004722eb9e0c7ac9d1022c914e Mon Sep 17 00:00:00 2001 From: marionf Date: Fri, 21 Feb 2020 16:51:49 +0100 Subject: [PATCH 21/35] Update readme to add multistore compatibility --- Readme.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Readme.md b/Readme.md index 8259be6..17ff19c 100644 --- a/Readme.md +++ b/Readme.md @@ -4,6 +4,11 @@ Check and fix functional integrity constraints and remove default data +## Multistore compatibility + +This module is not compatible with the multistore :x:
+It can't be configured differently from one store to another.
+ ## Contributing PrestaShop modules are open-source extensions to the PrestaShop e-commerce solution. Everyone is welcome and even encouraged to contribute with their own improvements. From 8c1b5ddd123871d61cbbbae72e37337dfb4c02a7 Mon Sep 17 00:00:00 2001 From: marionf Date: Tue, 25 Feb 2020 12:43:17 +0100 Subject: [PATCH 22/35] Update the wording --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 17ff19c..5da60e6 100644 --- a/Readme.md +++ b/Readme.md @@ -7,7 +7,7 @@ Check and fix functional integrity constraints and remove default data ## Multistore compatibility This module is not compatible with the multistore :x:
-It can't be configured differently from one store to another.
+It means that its configuration applies for all stores.
## Contributing From 74d85b21b9f332dc1ba4c8870d7c27d2726a9d17 Mon Sep 17 00:00:00 2001 From: matks Date: Mon, 30 Mar 2020 18:42:47 +0200 Subject: [PATCH 23/35] Add Pull Request template for github --- .github/PULL_REQUEST_TEMPLATE.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..1deac3a --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,19 @@ + + +| Questions | Answers +| ------------- | ------------------------------------------------------- +| Description? | Please be specific when describing the PR.
Every detail helps: versions, browser/server configuration, specific module/theme, etc. Feel free to add more information below this table. +| Type? | bug fix / improvement / new feature / refacto / critical +| BC breaks? | yes / no +| Deprecations? | yes / no +| Fixed ticket? | Fixes PrestaShop/Prestashop#{issue number here}. +| How to test? | Please indicate how to best verify that this PR is correct. + + From 68e4c119b262ce4353afaf079465d7a7c28503ce Mon Sep 17 00:00:00 2001 From: matks Date: Wed, 1 Apr 2020 18:01:36 +0200 Subject: [PATCH 24/35] Enable Release Drafter --- .github/release-drafter.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/release-drafter.yml diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml new file mode 100644 index 0000000..e9b1f18 --- /dev/null +++ b/.github/release-drafter.yml @@ -0,0 +1,14 @@ +branches: + - master +name-template: v$NEXT_PATCH_VERSION +tag-template: v$NEXT_PATCH_VERSION +categories: + - title: 🚀 Improvements + label: enhancement + - title: 🐛 Bug Fixes + label: bug +change-template: '- #$NUMBER: $TITLE by @$AUTHOR' +template: | + # Changes + + $CHANGES From 117bd3cf30cdf1ea389c737f3892df8938ba9dcd Mon Sep 17 00:00:00 2001 From: Progi1984 Date: Thu, 14 May 2020 15:05:39 +0200 Subject: [PATCH 25/35] Fixed spacing --- pscleaner.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pscleaner.php b/pscleaner.php index e6c787b..0eb7d01 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -259,7 +259,7 @@ public function truncate($case) $db->execute('DELETE FROM `'._DB_PREFIX_.'category` WHERE id_category NOT IN ('.implode(',', array_map('intval', $id_home)).', '.implode(',', array_map('intval', $id_root)).')'); $db->execute('DELETE FROM `'._DB_PREFIX_.'category_lang` WHERE id_category NOT IN ('.implode(',', array_map('intval', $id_home)).', '.implode(',', array_map('intval', $id_root)).')'); $db->execute('DELETE FROM `'._DB_PREFIX_.'category_shop` WHERE id_category NOT IN ('.implode(',', array_map('intval', $id_home)).', '.implode(',', array_map('intval', $id_root)).')'); - $db->execute('DELETE FROM `'._DB_PREFIX_.'category_group` WHERE id_category NOT IN ('.implode(',', array_map('intval', $id_home)).', '.implode(',', array_map('intval', $id_root)).')'); + $db->execute('DELETE FROM `'._DB_PREFIX_.'category_group` WHERE id_category NOT IN ('.implode(',', array_map('intval', $id_home)).', '.implode(',', array_map('intval', $id_root)).')'); $db->execute('ALTER TABLE `'._DB_PREFIX_.'category` AUTO_INCREMENT = '. (1 + max(array_merge($id_home, $id_root)))); foreach (scandir(_PS_CAT_IMG_DIR_) as $dir) { if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $dir)) { From 55b8ef151c3c65fffdb68aa1044b9293e7134ee2 Mon Sep 17 00:00:00 2001 From: Progi1984 Date: Wed, 3 Jun 2020 16:46:14 +0200 Subject: [PATCH 26/35] Fixed check of the status of checkboxes --- pscleaner.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pscleaner.php b/pscleaner.php index 5f3cb18..48ef5e6 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -93,24 +93,18 @@ public function getContent() '; From 5622a0ea5e2a9fb71c4f96d58f401f059ad8f649 Mon Sep 17 00:00:00 2001 From: matks Date: Fri, 5 Jun 2020 10:31:32 +0200 Subject: [PATCH 27/35] Add AFL LICENSE file --- LICENSE.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..5e4bd60 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,47 @@ +Academic Free License ("AFL") v. 3.0 + +This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Academic Free License version 3.0 + +1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + a) to reproduce the Original Work in copies, either alone or as part of a collective work; + + b) to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + c) to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License; + + d) to perform the Original Work publicly; and + + e) to display the Original Work publicly. + +2) Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + +3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + +4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + +5) External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + +6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + +7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + +8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + +9) Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + +10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + +11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + +12) Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + +13) Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + +14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + +16) Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. From 951dd48aa787ee0700f7fe2580223fe57e124349 Mon Sep 17 00:00:00 2001 From: matks Date: Fri, 5 Jun 2020 23:30:07 +0200 Subject: [PATCH 28/35] Add CONTRIBUTORS file --- CONTRIBUTORS.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 CONTRIBUTORS.md diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 0000000..44f1632 --- /dev/null +++ b/CONTRIBUTORS.md @@ -0,0 +1,23 @@ +GitHub contributors: +-------------------------------- + - AntoineMille + - Damien Metzger + - Francois Gaillard + - Gregory Roussac + - Jerome Nadaud + - Jérôme Nadaud + - Maxime Biloé + - PrestaEdit + - Quetzacoalt91 + - SebBareyre + - Shudrum + - aleeks + - antoin-m + - eternoendless + - gaillafr + - great9 + - maximebiloe + - michalurva + - prestamodule + - tchauviere + - xBorderie From 31b81179ba45d3279da698757f214d58fc4ef48f Mon Sep 17 00:00:00 2001 From: Progi1984 Date: Wed, 3 Jun 2020 17:20:33 +0200 Subject: [PATCH 29/35] Rename README.md --- Readme.md => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Readme.md => README.md (100%) diff --git a/Readme.md b/README.md similarity index 100% rename from Readme.md rename to README.md From 2a45b9b5945234a6963408a196f4f3e11917be20 Mon Sep 17 00:00:00 2001 From: Progi1984 Date: Wed, 3 Jun 2020 17:21:11 +0200 Subject: [PATCH 30/35] Added composer.lock --- composer.lock | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 composer.lock diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000..b13f131 --- /dev/null +++ b/composer.lock @@ -0,0 +1,19 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "content-hash": "25e638f9b1c565510ad0234505e2fb85", + "packages": [], + "packages-dev": [], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": ">=5.3.2" + }, + "platform-dev": [] +} From 8f1d2c2458809e63eae3c7675e3857247f8b14b3 Mon Sep 17 00:00:00 2001 From: Progi1984 Date: Wed, 3 Jun 2020 17:32:42 +0200 Subject: [PATCH 31/35] Added .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..61ead86 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/vendor From 5f7e00cef06c97308d27f8cb83fcc2b931d461fc Mon Sep 17 00:00:00 2001 From: Progi1984 Date: Wed, 3 Jun 2020 17:33:16 +0200 Subject: [PATCH 32/35] Add CI --- .travis.yml | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..6506634 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,69 @@ +language: node_js + +notifications: + email: + on_success: never + +jobs: + include: + - stage: "PHP" + name: "PHPStan on PS nightly and unit tests" + language: php + php: 7.2 + script: + - composer install + # PHP syntax check + - bash -c '! (find . -name "*.php" ! -path "./vendor/*" -print0 | xargs -0 -n1 -P4 php -l | grep "Parse error")' + # PHP cs fixer + # - composer run lint + # PHP Unit + # - composer run test + # PHP Stan + - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:nightly + # - docker exec -ti temp-ps rm -rf /var/www/html/modules/pscleaner + # - docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/pscleaner -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/pscleaner/tests/php/phpstan/phpstan.neon + - stage: "PHP" + name: "PHPStan on PS 1.7.5.2" + language: php + php: 7.2 + script: + - composer install + - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:1.7.5.1 + # - docker exec -ti temp-ps rm -rf /var/www/html/modules/pscleaner + # - docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/pscleaner -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/pscleaner/tests/php/phpstan/phpstan.neon + - stage: "PHP" + name: "PHPStan on PS 1.7.4.4" + language: php + php: 7.2 + script: + - composer install + - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:1.7.4.4 + # - docker exec -ti temp-ps rm -rf /var/www/html/modules/pscleaner + # - docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/pscleaner -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/pscleaner/tests/php/phpstan/phpstan.neon + - stage: "PHP" + name: "PHPStan on PS 1.7.3.4" + language: php + php: 7.2 + script: + - composer install + - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:1.7.3.4 + # - docker exec -ti temp-ps rm -rf /var/www/html/modules/pscleaner + # - docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/pscleaner -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/pscleaner/tests/php/phpstan/phpstan.neon + - stage: "PHP" + name: "PHPStan on PS 1.7.2.5" + language: php + php: 7.2 + script: + - composer install + - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:1.7.2.5 + #- docker exec -ti temp-ps rm -rf /var/www/html/modules/pscleaner + #- docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/pscleaner -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/pscleaner/tests/php/phpstan/phpstan.neon + - stage: "PHP" + name: "PHPStan on PS 1.7.1.2" + language: php + php: 7.2 + script: + - composer install + - docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:1.7.1.2 + # - docker exec -ti temp-ps rm -rf /var/www/html/modules/pscleaner + # - docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/pscleaner -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/pscleaner/tests/php/phpstan/phpstan.neon From 16500544ef50a0fc78ba6d935accfc81d74b6f5e Mon Sep 17 00:00:00 2001 From: Progi1984 Date: Wed, 3 Jun 2020 17:36:53 +0200 Subject: [PATCH 33/35] Fixed composer.json license --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d79cb19..56d6754 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "prestashop/pscleaner", "description": "PrestaShop module pscleaner", "homepage": "https://github.com/PrestaShop/pscleaner", - "license": "AFL - Academic Free License (AFL 3.0)", + "license": "AFL-3.0", "authors": [ { "name": "PrestaShop SA", From cef0c76618cfcec01fb9e56e0b5091c2a24c9175 Mon Sep 17 00:00:00 2001 From: Progi1984 Date: Wed, 3 Jun 2020 17:37:22 +0200 Subject: [PATCH 34/35] Update license headers --- index.php | 54 +++++++++---------- pscleaner.php | 17 +++--- translations/index.php | 54 +++++++++---------- views/index.php | 48 ++++++++--------- .../admin/_configure/helpers/form/form.tpl | 46 ++++++++-------- .../admin/_configure/helpers/form/index.php | 48 ++++++++--------- .../admin/_configure/helpers/index.php | 48 ++++++++--------- views/templates/admin/_configure/index.php | 48 ++++++++--------- views/templates/admin/index.php | 48 ++++++++--------- views/templates/index.php | 48 ++++++++--------- 10 files changed, 229 insertions(+), 230 deletions(-) diff --git a/index.php b/index.php index d4ae810..fda1188 100644 --- a/index.php +++ b/index.php @@ -1,35 +1,35 @@ -* @copyright 2007-2019 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - +/** + * 2007-2020 PrestaShop. + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License 3.0 (AFL-3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade PrestaShop to newer + * versions in the future. If you wish to customize PrestaShop for your + * needs please refer to http://www.prestashop.com for more information. + * + * @author PrestaShop SA + * @copyright 2007-2020 PrestaShop SA + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + * International Registered Trademark & Property of PrestaShop SA + */ + header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); - + header('Cache-Control: no-store, no-cache, must-revalidate'); header('Cache-Control: post-check=0, pre-check=0', false); header('Pragma: no-cache'); - + header('Location: ../'); exit; diff --git a/pscleaner.php b/pscleaner.php index 5f3cb18..5b2b2b2 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -1,13 +1,13 @@ - * @copyright 2007-2019 PrestaShop SA - * @version Release: $Revision: 7060 $ - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA + * @copyright 2007-2020 PrestaShop SA + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + * International Registered Trademark & Property of PrestaShop SA */ if (!defined('_CAN_LOAD_FILES_')) { diff --git a/translations/index.php b/translations/index.php index d4ae810..fda1188 100644 --- a/translations/index.php +++ b/translations/index.php @@ -1,35 +1,35 @@ -* @copyright 2007-2019 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - +/** + * 2007-2020 PrestaShop. + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License 3.0 (AFL-3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade PrestaShop to newer + * versions in the future. If you wish to customize PrestaShop for your + * needs please refer to http://www.prestashop.com for more information. + * + * @author PrestaShop SA + * @copyright 2007-2020 PrestaShop SA + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + * International Registered Trademark & Property of PrestaShop SA + */ + header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); - + header('Cache-Control: no-store, no-cache, must-revalidate'); header('Cache-Control: post-check=0, pre-check=0', false); header('Pragma: no-cache'); - + header('Location: ../'); exit; diff --git a/views/index.php b/views/index.php index 4ef8000..fda1188 100755 --- a/views/index.php +++ b/views/index.php @@ -1,28 +1,28 @@ -* @copyright 2007-2019 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ +/** + * 2007-2020 PrestaShop. + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License 3.0 (AFL-3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade PrestaShop to newer + * versions in the future. If you wish to customize PrestaShop for your + * needs please refer to http://www.prestashop.com for more information. + * + * @author PrestaShop SA + * @copyright 2007-2020 PrestaShop SA + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + * International Registered Trademark & Property of PrestaShop SA + */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); diff --git a/views/templates/admin/_configure/helpers/form/form.tpl b/views/templates/admin/_configure/helpers/form/form.tpl index 831cfa1..0386399 100755 --- a/views/templates/admin/_configure/helpers/form/form.tpl +++ b/views/templates/admin/_configure/helpers/form/form.tpl @@ -1,26 +1,26 @@ {* -* 2007-2019 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2019 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA + * 2007-2020 PrestaShop. + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License 3.0 (AFL-3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade PrestaShop to newer + * versions in the future. If you wish to customize PrestaShop for your + * needs please refer to http://www.prestashop.com for more information. + * + * @author PrestaShop SA + * @copyright 2007-2020 PrestaShop SA + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + * International Registered Trademark & Property of PrestaShop SA *} {extends file="helpers/form/form.tpl"} @@ -56,4 +56,4 @@ {$smarty.block.parent} {/if} -{/block} \ No newline at end of file +{/block} diff --git a/views/templates/admin/_configure/helpers/form/index.php b/views/templates/admin/_configure/helpers/form/index.php index 4ef8000..fda1188 100755 --- a/views/templates/admin/_configure/helpers/form/index.php +++ b/views/templates/admin/_configure/helpers/form/index.php @@ -1,28 +1,28 @@ -* @copyright 2007-2019 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ +/** + * 2007-2020 PrestaShop. + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License 3.0 (AFL-3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade PrestaShop to newer + * versions in the future. If you wish to customize PrestaShop for your + * needs please refer to http://www.prestashop.com for more information. + * + * @author PrestaShop SA + * @copyright 2007-2020 PrestaShop SA + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + * International Registered Trademark & Property of PrestaShop SA + */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); diff --git a/views/templates/admin/_configure/helpers/index.php b/views/templates/admin/_configure/helpers/index.php index 4ef8000..fda1188 100755 --- a/views/templates/admin/_configure/helpers/index.php +++ b/views/templates/admin/_configure/helpers/index.php @@ -1,28 +1,28 @@ -* @copyright 2007-2019 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ +/** + * 2007-2020 PrestaShop. + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License 3.0 (AFL-3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade PrestaShop to newer + * versions in the future. If you wish to customize PrestaShop for your + * needs please refer to http://www.prestashop.com for more information. + * + * @author PrestaShop SA + * @copyright 2007-2020 PrestaShop SA + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + * International Registered Trademark & Property of PrestaShop SA + */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); diff --git a/views/templates/admin/_configure/index.php b/views/templates/admin/_configure/index.php index 4ef8000..fda1188 100755 --- a/views/templates/admin/_configure/index.php +++ b/views/templates/admin/_configure/index.php @@ -1,28 +1,28 @@ -* @copyright 2007-2019 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ +/** + * 2007-2020 PrestaShop. + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License 3.0 (AFL-3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade PrestaShop to newer + * versions in the future. If you wish to customize PrestaShop for your + * needs please refer to http://www.prestashop.com for more information. + * + * @author PrestaShop SA + * @copyright 2007-2020 PrestaShop SA + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + * International Registered Trademark & Property of PrestaShop SA + */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); diff --git a/views/templates/admin/index.php b/views/templates/admin/index.php index 4ef8000..fda1188 100755 --- a/views/templates/admin/index.php +++ b/views/templates/admin/index.php @@ -1,28 +1,28 @@ -* @copyright 2007-2019 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ +/** + * 2007-2020 PrestaShop. + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License 3.0 (AFL-3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade PrestaShop to newer + * versions in the future. If you wish to customize PrestaShop for your + * needs please refer to http://www.prestashop.com for more information. + * + * @author PrestaShop SA + * @copyright 2007-2020 PrestaShop SA + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + * International Registered Trademark & Property of PrestaShop SA + */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); diff --git a/views/templates/index.php b/views/templates/index.php index 4ef8000..fda1188 100755 --- a/views/templates/index.php +++ b/views/templates/index.php @@ -1,28 +1,28 @@ -* @copyright 2007-2019 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ +/** + * 2007-2020 PrestaShop. + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License 3.0 (AFL-3.0) + * that is bundled with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * DISCLAIMER + * + * Do not edit or add to this file if you wish to upgrade PrestaShop to newer + * versions in the future. If you wish to customize PrestaShop for your + * needs please refer to http://www.prestashop.com for more information. + * + * @author PrestaShop SA + * @copyright 2007-2020 PrestaShop SA + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + * International Registered Trademark & Property of PrestaShop SA + */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); From 444bfec2ef2812dcbbe448efbc01ccaf832132b1 Mon Sep 17 00:00:00 2001 From: Progi1984 Date: Wed, 10 Jun 2020 16:04:54 +0200 Subject: [PATCH 35/35] Bump version to 2.1.0 --- config.xml | 2 +- pscleaner.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.xml b/config.xml index b196c76..acdeccf 100644 --- a/config.xml +++ b/config.xml @@ -2,7 +2,7 @@ pscleaner - + diff --git a/pscleaner.php b/pscleaner.php index 5b2b2b2..abbd092 100644 --- a/pscleaner.php +++ b/pscleaner.php @@ -34,7 +34,7 @@ public function __construct() { $this->name = 'pscleaner'; $this->tab = 'administration'; - $this->version = '2.0.0'; + $this->version = '2.1.0'; $this->author = 'PrestaShop'; $this->need_instance = 0; $this->multishop_context = Shop::CONTEXT_ALL;