From c4e1e2099fca730240adce94ad781c600dad3ef4 Mon Sep 17 00:00:00 2001
From: TheCoreDev <laurent@thecoredev.fr>
Date: Thu, 2 Jul 2020 11:56:04 +0200
Subject: [PATCH] =?UTF-8?q?Correction=20anomalie=200000038=20par=20install?=
 =?UTF-8?q?ation=20d'un=20module=20(pr=C3=A9ventif=20+=20correctif)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addevhtmlentities/addevhtmlentities.php   |  44 +++++++++++++++
 web/modules/addevhtmlentities/index.php       |  35 ++++++++++++
 web/modules/addevhtmlentities/logo.png        | Bin 0 -> 858 bytes
 .../override/classes/CustomerMessage.php      |  43 +++++++++++++++
 .../override/classes/index.php                |  35 ++++++++++++
 .../addevhtmlentities/override/index.php      |  35 ++++++++++++
 web/override/classes/CustomerMessage.php      |  51 ++++++++++++++++++
 7 files changed, 243 insertions(+)
 create mode 100644 web/modules/addevhtmlentities/addevhtmlentities.php
 create mode 100644 web/modules/addevhtmlentities/index.php
 create mode 100644 web/modules/addevhtmlentities/logo.png
 create mode 100644 web/modules/addevhtmlentities/override/classes/CustomerMessage.php
 create mode 100644 web/modules/addevhtmlentities/override/classes/index.php
 create mode 100644 web/modules/addevhtmlentities/override/index.php
 create mode 100644 web/override/classes/CustomerMessage.php

diff --git a/web/modules/addevhtmlentities/addevhtmlentities.php b/web/modules/addevhtmlentities/addevhtmlentities.php
new file mode 100644
index 00000000..826a9a09
--- /dev/null
+++ b/web/modules/addevhtmlentities/addevhtmlentities.php
@@ -0,0 +1,44 @@
+<?php
+
+class AddevHtmlEntities extends Module
+{
+    public function __construct()
+    {
+        $this->name = 'addevhtmlentities';
+        $this->author = 'AD-DEV';
+        $this->version = '1.0.1';
+        $this->description = $this->l('Removes HTML entities present in customer messages.');
+        $this->displayName = $this->l('Customer messages - HTML entities remover');
+        $this->ps_versions_compliancy = array('min' => '1.7', 'max' => _PS_VERSION_);
+
+        $this->bootstrap = true;
+        parent::__construct();
+    }
+
+    public function install()
+    {
+        $rows = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
+            SELECT `id_customer_message`, `message` FROM `'._DB_PREFIX_.'customer_message`
+        ');
+        $update_sqls = [];
+        foreach($rows as $row) {
+            $id = (int)$row['id_customer_message'];
+            if ($id > 0) {
+                $decoded = strip_tags(html_entity_decode($row['message']));
+                $update_sqls[] = '
+                    UPDATE `'._DB_PREFIX_.'customer_message`
+                    SET `message`="'.pSQL($decoded).'"
+                    WHERE `id_customer_message`='.$id.';
+                ';
+            }
+        }
+        if (count($update_sqls) > 0) {
+//            die(var_export(
+            Db::getInstance(_PS_USE_SQL_SLAVE_)->query(
+                implode("\n", $update_sqls)
+//                ,true)
+            );
+        }
+        return parent::install();
+    }
+}
diff --git a/web/modules/addevhtmlentities/index.php b/web/modules/addevhtmlentities/index.php
new file mode 100644
index 00000000..f799c144
--- /dev/null
+++ b/web/modules/addevhtmlentities/index.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * 2007-2018 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 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/OSL-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 <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 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/web/modules/addevhtmlentities/logo.png b/web/modules/addevhtmlentities/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ce27db8f3a2e4f1e4d04168284349d1a83d17f4
GIT binary patch
literal 858
zcmV-g1Eu_lP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000XU000XU0RWnu7ytkQ{7FPXRA_<im`#XHVHn4M_iHXDW|C%Q
zAsZVkBok#Q8y_2CBICOxnv#@I7LtwBY(&Y%hJ_7TnAkBSV~hruW{gYCa3e~@M2y8d
zhjX4e=Y7t(=UlTn|9b1*^E}W0`9J6VIL|qdB1MW6DN>|RaUK|TjdMv6XOkjQutfa7
z`=9bAf=0Y|e-xNKp^7466<+ZbAd?h%5=&@?V)t7<qakBe#3`T&=m733ezJgjuHW6j
zX%Z+T3L1eEz*o$j9J2W4U4G73?6OzJu6+TH0}VCM`xo`VVc?SxWGi5S@Erk)E_+4T
zKLUq<DM<=10_{G@!W7Uhe7l4_i1Qt=52%YHJP+&uUI!#`Mz@9IlJGqx?7a$i8Q2cw
zq6p6dt-y1Id|-^cVBvZrV%7?K0oVz=RC1Mo4Je0B26JXVQpjEaTQD<Z!%UyprU2hO
zunp)}a`yl$@p+E40C$w&XTT=HPiL!$9|#eX2inkQ|2DAH3F=gwpNxr#`poDMJQpLx
z=75dBQ$^biEXK#cx+;V_cp&)pRKbzOto=TVPTz}XV+aRxj{g*#b7Syj8Q+py3vf0}
zwKLEnxIS0Olfx`u+i}Zfi_zJ<ZRn?t8%G33XGGxz%&BDC%)c?u835)3*OWpAf!%mp
zfgoHLvByFRFJkseS<!M8nCC~(4BS$Jhk*SA_bVApPveeRp$M-B4gkYS?wi0Og$sb?
z{Oj9;#(PY2H%-LO5q`gbsR4N!fTO?%C07@)ER1kBGQeu|ex+Z;?GpB0OO96xcMqmJ
zi1h}i^+vKAy&&voEZjleXbD&!SGYtD)4a(ICJQJD`(_KLEMO4WO2qCnD(Zl}z+1)_
zFrD#tbC!k6DPRb5`q(<##4#B-h-o<-tidaO82d8l!<;^oYNRm~+{sVkE#OLo*s74k
zXO$7xZ`&6LEq20D0KVa!f#wNS6cG#YivLc`m+~-3^5d>tKHb2N1o?dtrNh)v#(bP|
k@GwE{6e&`qNKqU70gS$ypl-cE^Z)<=07*qoM6N<$g6L&<n*aa+

literal 0
HcmV?d00001

diff --git a/web/modules/addevhtmlentities/override/classes/CustomerMessage.php b/web/modules/addevhtmlentities/override/classes/CustomerMessage.php
new file mode 100644
index 00000000..fea454f3
--- /dev/null
+++ b/web/modules/addevhtmlentities/override/classes/CustomerMessage.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * 2007-2018 PrestaShop.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 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/OSL-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 <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ */
+
+/**
+ * Class CustomerMessageCore.
+ */
+class CustomerMessage extends CustomerMessageCore
+{
+    public function add($auto_date = true, $null_values = false)
+    {
+        $this->message = strip_tags(html_entity_decode($this->message, ENT_QUOTES|ENT_HTML401));
+        return parent::add($auto_date, $null_values);
+    }
+
+    public function save($null_values = false, $auto_date = true)
+    {
+        $this->message = strip_tags(html_entity_decode($this->message, ENT_QUOTES|ENT_HTML401));
+        return parent::save($null_values, $auto_date);
+    }
+}
diff --git a/web/modules/addevhtmlentities/override/classes/index.php b/web/modules/addevhtmlentities/override/classes/index.php
new file mode 100644
index 00000000..f799c144
--- /dev/null
+++ b/web/modules/addevhtmlentities/override/classes/index.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * 2007-2018 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 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/OSL-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 <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 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/web/modules/addevhtmlentities/override/index.php b/web/modules/addevhtmlentities/override/index.php
new file mode 100644
index 00000000..f799c144
--- /dev/null
+++ b/web/modules/addevhtmlentities/override/index.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * 2007-2018 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 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/OSL-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 <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 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/web/override/classes/CustomerMessage.php b/web/override/classes/CustomerMessage.php
new file mode 100644
index 00000000..b69e1fb5
--- /dev/null
+++ b/web/override/classes/CustomerMessage.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * 2007-2018 PrestaShop.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 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/OSL-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 <contact@prestashop.com>
+ * @copyright 2007-2018 PrestaShop SA
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ */
+/**
+ * Class CustomerMessageCore.
+ */
+class CustomerMessage extends CustomerMessageCore
+{
+    /*
+    * module: addevhtmlentities
+    * date: 2020-07-02 11:49:58
+    * version: 1.0.1
+    */
+    public function add($auto_date = true, $null_values = false)
+    {
+        $this->message = strip_tags(html_entity_decode($this->message, ENT_QUOTES|ENT_HTML401));
+        return parent::add($auto_date, $null_values);
+    }
+    /*
+    * module: addevhtmlentities
+    * date: 2020-07-02 11:49:58
+    * version: 1.0.1
+    */
+    public function save($null_values = false, $auto_date = true)
+    {
+        $this->message = strip_tags(html_entity_decode($this->message, ENT_QUOTES|ENT_HTML401));
+        return parent::save($null_values, $auto_date);
+    }
+}