From ea0268c684304c26c2fcdec533a011acaee79b98 Mon Sep 17 00:00:00 2001
From: WaPoNe <michele.fantetti@gmail.com>
Date: Wed, 25 Mar 2026 16:14:44 +0100
Subject: [PATCH] Added configuration for enabling the module

---
 Plugin/ImageContentValidatorExtension.php   | 20 +++++++-
 Plugin/ImageProcessorRestrictExtensions.php | 21 +++++++-
 Utility/Configurations.php                  | 56 +++++++++++++++++++++
 Utility/Constants.php                       | 14 ++++++
 etc/acl.xml                                 | 18 +++++++
 etc/adminhtml/system.xml                    | 27 ++++++++++
 etc/config.xml                              | 11 ++++
 7 files changed, 163 insertions(+), 4 deletions(-)
 create mode 100644 Utility/Configurations.php
 create mode 100644 Utility/Constants.php
 create mode 100644 etc/acl.xml
 create mode 100644 etc/adminhtml/system.xml
 create mode 100644 etc/config.xml

diff --git a/Plugin/ImageContentValidatorExtension.php b/Plugin/ImageContentValidatorExtension.php
index a7dd627..0d56b18 100644
--- a/Plugin/ImageContentValidatorExtension.php
+++ b/Plugin/ImageContentValidatorExtension.php
@@ -7,8 +7,10 @@
 use Magento\Framework\Api\Data\ImageContentInterface;
 use Magento\Framework\Api\ImageContentValidator;
 use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem\Io\File as IoFile;
 use Magento\Framework\Phrase;
+use MarkShust\PolyshellPatch\Utility\Configurations;
 
 /**
  * Validate that the uploaded filename has a safe image extension.
@@ -26,12 +28,20 @@ class ImageContentValidatorExtension
      */
     private IoFile $ioFile;
 
+    /**
+     * @var Configurations
+     */
+    private Configurations $configurations;
+
     /**
      * @param IoFile $ioFile
      */
-    public function __construct(IoFile $ioFile)
-    {
+    public function __construct(
+        IoFile $ioFile,
+        Configurations $configurations
+    ) {
         $this->ioFile = $ioFile;
+        $this->configurations = $configurations;
     }
 
     /**
@@ -40,8 +50,10 @@ public function __construct(IoFile $ioFile)
      * @param ImageContentValidator $subject
      * @param bool $result
      * @param ImageContentInterface $imageContent
+     *
      * @return bool
      * @throws InputException
+     * *@throws NoSuchEntityException
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -50,6 +62,10 @@ public function afterIsValid(
         bool $result,
         ImageContentInterface $imageContent
     ): bool {
+        if (!$this->configurations->isModuleEnabled()) {
+            return $result;
+        }
+
         $fileName = $imageContent->getName();
         $pathInfo = $this->ioFile->getPathInfo($fileName);
         $extension = strtolower($pathInfo['extension'] ?? '');
diff --git a/Plugin/ImageProcessorRestrictExtensions.php b/Plugin/ImageProcessorRestrictExtensions.php
index 8cd3431..534b587 100644
--- a/Plugin/ImageProcessorRestrictExtensions.php
+++ b/Plugin/ImageProcessorRestrictExtensions.php
@@ -7,6 +7,8 @@
 use Magento\Framework\Api\Data\ImageContentInterface;
 use Magento\Framework\Api\ImageProcessor;
 use Magento\Framework\Api\Uploader;
+use Magento\Framework\Exception\NoSuchEntityException;
+use MarkShust\PolyshellPatch\Utility\Configurations;
 
 /**
  * Enforce an allowlist of file extensions before ImageProcessor saves uploaded files.
@@ -23,12 +25,21 @@ class ImageProcessorRestrictExtensions
      */
     private Uploader $uploader;
 
+    /**
+     * @var Configurations
+     */
+    private Configurations $configurations;
+
     /**
      * @param Uploader $uploader
+     * @param Configurations $configurations
      */
-    public function __construct(Uploader $uploader)
-    {
+    public function __construct(
+        Uploader $uploader,
+        Configurations $configurations
+    ) {
         $this->uploader = $uploader;
+        $this->configurations = $configurations;
     }
 
     /**
@@ -37,15 +48,21 @@ public function __construct(Uploader $uploader)
      * @param ImageProcessor $subject
      * @param string $entityType
      * @param ImageContentInterface $imageContent
+     *
      * @return null
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @throws NoSuchEntityException
      */
     public function beforeProcessImageContent(
         ImageProcessor $subject,
         $entityType,
         $imageContent
     ) {
+        if (!$this->configurations->isModuleEnabled()) {
+            return null;
+        }
+
         $this->uploader->setAllowedExtensions(self::ALLOWED_EXTENSIONS);
         return null;
     }
diff --git a/Utility/Configurations.php b/Utility/Configurations.php
new file mode 100644
index 0000000..c065855
--- /dev/null
+++ b/Utility/Configurations.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MarkShust\PolyshellPatch\Utility;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Class Configurations
+ */
+class Configurations
+{
+    /**
+     * Configurations constructor.
+     *
+     * @param ScopeConfigInterface $scopeConfig
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        private readonly ScopeConfigInterface $scopeConfig,
+        private readonly StoreManagerInterface $storeManager
+    ) {
+    }
+
+    /**
+     * Get boolean configuration value
+     *
+     * @param $path
+     *
+     * @return bool
+     * @throws NoSuchEntityException
+     */
+    private function _isSetFlag($path): bool
+    {
+        return $this->scopeConfig->isSetFlag(
+            $path,
+            ScopeInterface::SCOPE_STORE,
+            $this->storeManager->getStore()->getStoreId()
+        );
+    }
+
+    /**
+     * Check if the module is enabled
+     *
+     * @return bool
+     * @throws NoSuchEntityException
+     */
+    public function isModuleEnabled(): bool
+    {
+        return $this->_isSetFlag(Constants::POLYSHELL_ENABLED_PATH);
+    }
+}
diff --git a/Utility/Constants.php b/Utility/Constants.php
new file mode 100644
index 0000000..74846b9
--- /dev/null
+++ b/Utility/Constants.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MarkShust\PolyshellPatch\Utility;
+
+/**
+ * Class Constants
+ */
+class Constants
+{
+    // Configurations paths
+    public const POLYSHELL_ENABLED_PATH = 'polyshellpatch/general/enabled';
+}
diff --git a/etc/acl.xml b/etc/acl.xml
new file mode 100644
index 0000000..f512134
--- /dev/null
+++ b/etc/acl.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+    <acl>
+        <resources>
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Config::config">
+                            <resource id="MarkShust_PolyshellPatch::polyshellpatch_config"
+                                      title="PolyShell Patch Section" sortOrder="30"/>
+                        </resource>
+                    </resource>
+                </resource>
+            </resource>
+        </resources>
+    </acl>
+</config>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
new file mode 100644
index 0000000..8a1f333
--- /dev/null
+++ b/etc/adminhtml/system.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <tab id="mark_shust" translate="label" sortOrder="130">
+            <label>Mark Shust</label>
+        </tab>
+        <section id="polyshellpatch" translate="label" sortOrder="1"
+                 showInDefault="1" showInWebsite="1" showInStore="1">
+            <class>separator-top</class>
+            <label>PolyShell Patch</label>
+            <tab>mark_shust</tab>
+            <resource>MarkShust_PolyshellPatch::polyshellpatch_config</resource>
+            <!-- General -->
+            <group id="general" translate="label" type="text" sortOrder="10"
+                   showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>General</label>
+                <field id="enabled" translate="label comment" type="select" sortOrder="10"
+                       showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Enable</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>Enable Polyshell Patch</comment>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/etc/config.xml b/etc/config.xml
new file mode 100644
index 0000000..a30aa17
--- /dev/null
+++ b/etc/config.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <polyshellpatch>
+            <general>
+                <enabled>1</enabled>
+            </general>
+        </polyshellpatch>
+    </default>
+</config>