Changed display widget hook strategy; refs #45733 (#34)

Author: denys202

src/Hook/CommonHook.php

@@ -25,18 +25,23 @@
 
 use AxeptiocookiesAddon\Service\HookService;
 use AxeptiocookiesAddon\Smarty\CookiesCompletePrefilter;
+use AxeptiocookiesAddon\Smarty\WidgetPrefilter;
 use AxeptiocookiesAddon\Utils\ServiceContainer;
 use AxeptiocookiesClasslib\Hook\AbstractHook;
 
 class CommonHook extends AbstractHook
 {
     const AVAILABLE_HOOKS = [
-        'displayFooter',
         'actionDispatcherBefore',
+        'displayAxeptioWidget',
     ];
 
-    public function displayFooter($params)
+    public function displayAxeptioWidget($params)
     {
+        if (\Tools::getValue('ajax') !== false) {
+            return;
+        }
+
         /** @var HookService $hookService */
         $hookService = ServiceContainer::getInstance()->get(HookService::class);
 
@@ -67,6 +72,14 @@ public function actionDispatcherBefore($params)
                 ],
                 'handleCookiesComplete'
             );
+            \Context::getContext()->smarty->registerFilter(
+                'pre',
+                [
+                    WidgetPrefilter::class,
+                    'addAxeptioWidget',
+                ],
+                'addAxeptioWidget'
+            );
         }
 
         if ($params['controller_type'] != \Dispatcher::FC_FRONT) {

src/Smarty/WidgetPrefilter.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright since 2022 Axeptio
+ *
+ * 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.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 tech@202-ecommerce.com so we can send you a copy immediately.
+ *
+ * @author    202 ecommerce <tech@202-ecommerce.com>
+ * @copyright 2022 Axeptio
+ * @license   https://opensource.org/licenses/AFL-3.0  Academic Free License (AFL 3.0)
+ */
+
+namespace AxeptiocookiesAddon\Smarty;
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+class WidgetPrefilter
+{
+    public static function addAxeptioWidget($source)
+    {
+        $stringToSearch = '/<\/body>/ims';
+        preg_match($stringToSearch, $source, $matches, PREG_OFFSET_CAPTURE, 0);
+        if (empty($matches)) {
+            return $source;
+        }
+
+        $replace = "{hook h='displayAxeptioWidget'}\r" . '</body>';
+
+        return preg_replace($stringToSearch, $replace, $source);
+    }
+}

upgrade/upgrade-2.0.8.php

@@ -28,6 +28,8 @@
 function upgrade_module_2_0_8($module)
 {
     try {
+        $installer = new \AxeptiocookiesClasslib\Install\ModuleInstaller($module);
+        $installer->registerHooks();
         $cache = new \AxeptiocookiesAddon\Cache\ProjectCache();
         $cache->cleanCacheDirectory();
         \Tools::clearCache();