From 83b9ac77c774a49ca61a8179f0eac9972742dbe7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 04:05:35 +0000 Subject: [PATCH 001/119] Bump eslint from 8.12.0 to 8.13.0 Bumps [eslint](https://github.com/eslint/eslint) from 8.12.0 to 8.13.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.12.0...v8.13.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 64ebb983..5283e9a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "babel-loader": "^8.2.4", "clean-webpack-plugin": "^4.0.0", "css-loader": "^6.7.1", - "eslint": "^8.12.0", + "eslint": "^8.13.0", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-prestashop": "^0.2.1", "eslint-plugin-import": "^2.26.0", @@ -1959,9 +1959,9 @@ } }, "node_modules/eslint": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz", - "integrity": "sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.13.0.tgz", + "integrity": "sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ==", "dev": true, "dependencies": { "@eslint/eslintrc": "^1.2.1", @@ -7947,9 +7947,9 @@ "dev": true }, "eslint": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz", - "integrity": "sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.13.0.tgz", + "integrity": "sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ==", "dev": true, "requires": { "@eslint/eslintrc": "^1.2.1", diff --git a/package.json b/package.json index efd79bd0..56db4b5f 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "babel-loader": "^8.2.4", "clean-webpack-plugin": "^4.0.0", "css-loader": "^6.7.1", - "eslint": "^8.12.0", + "eslint": "^8.13.0", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-prestashop": "^0.2.1", "eslint-plugin-import": "^2.26.0", From dad71d9e69a6dd8904f6fdd91a88a5b8616fa232 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Apr 2022 04:05:50 +0000 Subject: [PATCH 002/119] Bump babel-loader from 8.2.4 to 8.2.5 Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.2.4 to 8.2.5. - [Release notes](https://github.com/babel/babel-loader/releases) - [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel-loader/compare/v8.2.4...v8.2.5) --- updated-dependencies: - dependency-name: babel-loader dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5283e9a9..0ebd34bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "devDependencies": { "@babel/core": "^7.17.9", "@babel/eslint-parser": "^7.17.0", - "babel-loader": "^8.2.4", + "babel-loader": "^8.2.5", "clean-webpack-plugin": "^4.0.0", "css-loader": "^6.7.1", "eslint": "^8.13.0", @@ -1165,9 +1165,9 @@ "dev": true }, "node_modules/babel-loader": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.4.tgz", - "integrity": "sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A==", + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz", + "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==", "dev": true, "dependencies": { "find-cache-dir": "^3.3.1", @@ -7339,9 +7339,9 @@ "dev": true }, "babel-loader": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.4.tgz", - "integrity": "sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A==", + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz", + "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==", "dev": true, "requires": { "find-cache-dir": "^3.3.1", diff --git a/package.json b/package.json index 56db4b5f..df030169 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "devDependencies": { "@babel/eslint-parser": "^7.17.0", "@babel/core": "^7.17.9", - "babel-loader": "^8.2.4", + "babel-loader": "^8.2.5", "clean-webpack-plugin": "^4.0.0", "css-loader": "^6.7.1", "eslint": "^8.13.0", From 50196e41fc068c651498408ca27165c960f4c53a Mon Sep 17 00:00:00 2001 From: matks Date: Fri, 22 Apr 2022 17:01:05 +0200 Subject: [PATCH 003/119] Fix license headers --- _dev/back/index.js | 20 ++++----- _dev/back/index.php | 22 ++++------ _dev/front/index.js | 22 ++++------ _dev/front/index.php | 22 ++++------ _dev/index.php | 22 ++++------ blockreassurance.php | 22 ++++------ classes/ReassuranceActivity.php | 22 ++++------ classes/index.php | 22 ++++------ .../admin/AdminBlockListingController.php | 22 ++++------ controllers/admin/index.php | 22 ++++------ controllers/index.php | 22 ++++------ index.php | 22 ++++------ tests/index.php | 10 +---- tests/phpstan/index.php | 10 +---- translations/index.php | 22 ++++------ upgrade/index.php | 22 ++++------ upgrade/upgrade-4.0.0.php | 22 ++++------ upgrade/upgrade-5.1.0.php | 6 +-- views/img/Essentials/index.php | 22 ++++------ views/img/ITIcons/index.php | 22 ++++------ views/img/img_perso/index.php | 22 ++++------ views/img/index.php | 22 ++++------ views/img/reassurance/index.php | 22 ++++------ views/img/reassurance/oldpack1/index.php | 22 ++++------ views/img/reassurance/oldpack2/index.php | 22 ++++------ views/img/reassurance/oldpack3/index.php | 22 ++++------ views/img/reassurance/pack1/index.php | 22 ++++------ views/img/reassurance/pack2/index.php | 22 ++++------ views/img/reassurance/pack3/index.php | 22 ++++------ views/index.php | 22 ++++------ .../templates/admin/alert_folder_writable.tpl | 42 ++++++++----------- views/templates/admin/configure.tpl | 42 ++++++++----------- views/templates/admin/index.php | 22 ++++------ views/templates/admin/tabs/appearance.tpl | 42 ++++++++----------- views/templates/admin/tabs/content.tpl | 42 ++++++++----------- views/templates/admin/tabs/content/config.tpl | 42 ++++++++----------- .../tabs/content/config_elements/cms.tpl | 42 ++++++++----------- .../content/config_elements/description.tpl | 42 ++++++++----------- .../tabs/content/config_elements/icon.tpl | 42 ++++++++----------- .../tabs/content/config_elements/index.php | 22 ++++------ .../tabs/content/config_elements/language.tpl | 42 ++++++++----------- .../config_elements/reassurance_block.tpl | 42 ++++++++----------- .../content/config_elements/redirection.tpl | 42 ++++++++----------- .../tabs/content/config_elements/title.tpl | 42 ++++++++----------- .../tabs/content/config_elements/url.tpl | 42 ++++++++----------- views/templates/admin/tabs/content/index.php | 22 ++++------ .../templates/admin/tabs/content/listing.tpl | 42 ++++++++----------- views/templates/admin/tabs/display.tpl | 42 ++++++++----------- .../templates/admin/tabs/display/checkout.tpl | 42 ++++++++----------- views/templates/admin/tabs/display/global.tpl | 42 ++++++++----------- views/templates/admin/tabs/display/index.php | 22 ++++------ .../templates/admin/tabs/display/product.tpl | 42 ++++++++----------- views/templates/admin/tabs/index.php | 22 ++++------ views/templates/hook/blockreassurance.tpl | 42 ++++++++----------- views/templates/hook/displayBlock.tpl | 42 ++++++++----------- views/templates/hook/displayBlockProduct.tpl | 42 ++++++++----------- views/templates/hook/displayBlockWhite.tpl | 42 ++++++++----------- views/templates/hook/index.php | 22 ++++------ views/templates/index.php | 22 ++++------ webpack.config.js | 20 ++++----- 60 files changed, 681 insertions(+), 1035 deletions(-) diff --git a/_dev/back/index.js b/_dev/back/index.js index ece0b6b0..133809f0 100644 --- a/_dev/back/index.js +++ b/_dev/back/index.js @@ -1,26 +1,20 @@ /** - * 2007-2019 PrestaShop. + * Copyright since 2007 PrestaShop SA and Contributors + * PrestaShop is an International Registered Trademark & Property of PrestaShop SA * * 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. + * This source file is subject to the Academic Free License version 3.0 + * that is bundled with this package in the file LICENSE.md. * 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-2019 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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ import Pickr from '@simonwep/pickr'; import Vue from 'vue/dist/vue.min'; diff --git a/_dev/back/index.php b/_dev/back/index.php index 283d87b7..296d682e 100644 --- a/_dev/back/index.php +++ b/_dev/back/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/_dev/front/index.js b/_dev/front/index.js index 35fa86e8..8033a4a7 100644 --- a/_dev/front/index.js +++ b/_dev/front/index.js @@ -1,26 +1,20 @@ /** - * 2007-2019 PrestaShop + * Copyright since 2007 PrestaShop SA and Contributors + * PrestaShop is an International Registered Trademark & Property of PrestaShop SA * * 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. + * This source file is subject to the Academic Free License version 3.0 + * that is bundled with this package in the file LICENSE.md. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * 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-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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ import './front.scss'; diff --git a/_dev/front/index.php b/_dev/front/index.php index 283d87b7..296d682e 100644 --- a/_dev/front/index.php +++ b/_dev/front/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/_dev/index.php b/_dev/index.php index 283d87b7..296d682e 100644 --- a/_dev/index.php +++ b/_dev/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/blockreassurance.php b/blockreassurance.php index 2d102b8d..0d64bf01 100644 --- a/blockreassurance.php +++ b/blockreassurance.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ if (!defined('_PS_VERSION_')) { exit; diff --git a/classes/ReassuranceActivity.php b/classes/ReassuranceActivity.php index 12768209..3dbe844e 100644 --- a/classes/ReassuranceActivity.php +++ b/classes/ReassuranceActivity.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ class ReassuranceActivity extends ObjectModel { diff --git a/classes/index.php b/classes/index.php index 283d87b7..296d682e 100755 --- a/classes/index.php +++ b/classes/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/controllers/admin/AdminBlockListingController.php b/controllers/admin/AdminBlockListingController.php index 7930b030..14b5483a 100644 --- a/controllers/admin/AdminBlockListingController.php +++ b/controllers/admin/AdminBlockListingController.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ class AdminBlockListingController extends ModuleAdminController { diff --git a/controllers/admin/index.php b/controllers/admin/index.php index 283d87b7..296d682e 100755 --- a/controllers/admin/index.php +++ b/controllers/admin/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/controllers/index.php b/controllers/index.php index 283d87b7..296d682e 100755 --- a/controllers/index.php +++ b/controllers/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/index.php b/index.php index 283d87b7..296d682e 100755 --- a/index.php +++ b/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/tests/index.php b/tests/index.php index 45df26c5..296d682e 100644 --- a/tests/index.php +++ b/tests/index.php @@ -5,7 +5,7 @@ * * NOTICE OF LICENSE * - * This source file is subject to the Academic Free License 3.0 (AFL-3.0) + * This source file is subject to the Academic Free License version 3.0 * that is bundled with this package in the file LICENSE.md. * It is also available through the world-wide-web at this URL: * https://opensource.org/licenses/AFL-3.0 @@ -13,15 +13,9 @@ * 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 https://devdocs.prestashop.com/ for more information. - * * @author PrestaShop SA and Contributors * @copyright Since 2007 PrestaShop SA and Contributors - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/tests/phpstan/index.php b/tests/phpstan/index.php index 45df26c5..296d682e 100644 --- a/tests/phpstan/index.php +++ b/tests/phpstan/index.php @@ -5,7 +5,7 @@ * * NOTICE OF LICENSE * - * This source file is subject to the Academic Free License 3.0 (AFL-3.0) + * This source file is subject to the Academic Free License version 3.0 * that is bundled with this package in the file LICENSE.md. * It is also available through the world-wide-web at this URL: * https://opensource.org/licenses/AFL-3.0 @@ -13,15 +13,9 @@ * 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 https://devdocs.prestashop.com/ for more information. - * * @author PrestaShop SA and Contributors * @copyright Since 2007 PrestaShop SA and Contributors - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/translations/index.php b/translations/index.php index 283d87b7..296d682e 100755 --- a/translations/index.php +++ b/translations/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/upgrade/index.php b/upgrade/index.php index 283d87b7..296d682e 100755 --- a/upgrade/index.php +++ b/upgrade/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/upgrade/upgrade-4.0.0.php b/upgrade/upgrade-4.0.0.php index e3755d6d..72b14335 100644 --- a/upgrade/upgrade-4.0.0.php +++ b/upgrade/upgrade-4.0.0.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ if (!defined('_PS_VERSION_')) { exit; diff --git a/upgrade/upgrade-5.1.0.php b/upgrade/upgrade-5.1.0.php index e4c54662..fcd5e6d5 100644 --- a/upgrade/upgrade-5.1.0.php +++ b/upgrade/upgrade-5.1.0.php @@ -5,7 +5,7 @@ * * NOTICE OF LICENSE * - * This source file is subject to the Academic Free License 3.0 (AFL-3.0) + * This source file is subject to the Academic Free License version 3.0 * that is bundled with this package in the file LICENSE.md. * It is also available through the world-wide-web at this URL: * https://opensource.org/licenses/AFL-3.0 @@ -13,9 +13,9 @@ * obtain it through the world-wide-web, please send an email * to license@prestashop.com so we can send you a copy immediately. * - * @author PrestaShop SA + * @author PrestaShop SA and Contributors * @copyright Since 2007 PrestaShop SA and Contributors - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ if (!defined('_PS_VERSION_')) { exit; diff --git a/views/img/Essentials/index.php b/views/img/Essentials/index.php index 283d87b7..296d682e 100755 --- a/views/img/Essentials/index.php +++ b/views/img/Essentials/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/img/ITIcons/index.php b/views/img/ITIcons/index.php index 283d87b7..296d682e 100755 --- a/views/img/ITIcons/index.php +++ b/views/img/ITIcons/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/img/img_perso/index.php b/views/img/img_perso/index.php index 283d87b7..296d682e 100755 --- a/views/img/img_perso/index.php +++ b/views/img/img_perso/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/img/index.php b/views/img/index.php index 283d87b7..296d682e 100755 --- a/views/img/index.php +++ b/views/img/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/img/reassurance/index.php b/views/img/reassurance/index.php index 283d87b7..296d682e 100755 --- a/views/img/reassurance/index.php +++ b/views/img/reassurance/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/img/reassurance/oldpack1/index.php b/views/img/reassurance/oldpack1/index.php index 283d87b7..296d682e 100755 --- a/views/img/reassurance/oldpack1/index.php +++ b/views/img/reassurance/oldpack1/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/img/reassurance/oldpack2/index.php b/views/img/reassurance/oldpack2/index.php index 283d87b7..296d682e 100755 --- a/views/img/reassurance/oldpack2/index.php +++ b/views/img/reassurance/oldpack2/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/img/reassurance/oldpack3/index.php b/views/img/reassurance/oldpack3/index.php index 283d87b7..296d682e 100755 --- a/views/img/reassurance/oldpack3/index.php +++ b/views/img/reassurance/oldpack3/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/img/reassurance/pack1/index.php b/views/img/reassurance/pack1/index.php index 283d87b7..296d682e 100755 --- a/views/img/reassurance/pack1/index.php +++ b/views/img/reassurance/pack1/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/img/reassurance/pack2/index.php b/views/img/reassurance/pack2/index.php index 283d87b7..296d682e 100755 --- a/views/img/reassurance/pack2/index.php +++ b/views/img/reassurance/pack2/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/img/reassurance/pack3/index.php b/views/img/reassurance/pack3/index.php index 283d87b7..296d682e 100755 --- a/views/img/reassurance/pack3/index.php +++ b/views/img/reassurance/pack3/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/index.php b/views/index.php index 283d87b7..296d682e 100755 --- a/views/index.php +++ b/views/index.php @@ -1,27 +1,21 @@ - * @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 + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ 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/alert_folder_writable.tpl b/views/templates/admin/alert_folder_writable.tpl index 56255461..d8f542d4 100755 --- a/views/templates/admin/alert_folder_writable.tpl +++ b/views/templates/admin/alert_folder_writable.tpl @@ -1,27 +1,21 @@ -{* -* 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 -*} +{** + * Copyright since 2007 PrestaShop SA and Contributors + * PrestaShop is an International Registered Trademark & Property of PrestaShop SA + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License version 3.0 + * that is bundled with this package in the file LICENSE.md. + * 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. + * + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + *}