From 91a1fcac746f8c783f775dadf580c16df5cdf7a7 Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Wed, 6 Nov 2024 13:27:21 +0000
Subject: [PATCH 01/42] possible cache fix on option update

---
 includes/Performance.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/includes/Performance.php b/includes/Performance.php
index ac50c2f..8d2c9c2 100644
--- a/includes/Performance.php
+++ b/includes/Performance.php
@@ -200,7 +200,11 @@ public function onCacheLevelChange( $cacheLevel ) {
 		 */
 		$responseHeaderManager = $this->container->get( 'responseHeaderManager' );
 		$responseHeaderManager->addHeader( 'X-Newfold-Cache-Level', absint( $cacheLevel ) );
-
+		
+		Browser::maybeAddRules( $cacheLevel );
+		File::maybeAddRules( $cacheLevel );
+		Skip404::maybeAddRules( $cacheLevel );
+		
 		// Remove the old option from EPC, if it exists
 		if ( $this->container->get( 'hasMustUsePlugin' ) && absint( get_option( 'endurance_cache_level', 0 ) ) ) {
 			update_option( 'endurance_cache_level', 0 );

From b3a6f4992a0ad09a8638af3b03c627d15e7b6d39 Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Wed, 6 Nov 2024 14:10:21 +0000
Subject: [PATCH 02/42] added restApi class to update the option

---
 includes/Performance.php           |   4 +-
 includes/RestApi/CacheSettings.php | 112 +++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 includes/RestApi/CacheSettings.php

diff --git a/includes/Performance.php b/includes/Performance.php
index 8d2c9c2..4fa5d13 100644
--- a/includes/Performance.php
+++ b/includes/Performance.php
@@ -200,11 +200,11 @@ public function onCacheLevelChange( $cacheLevel ) {
 		 */
 		$responseHeaderManager = $this->container->get( 'responseHeaderManager' );
 		$responseHeaderManager->addHeader( 'X-Newfold-Cache-Level', absint( $cacheLevel ) );
-		
+
 		Browser::maybeAddRules( $cacheLevel );
 		File::maybeAddRules( $cacheLevel );
 		Skip404::maybeAddRules( $cacheLevel );
-		
+
 		// Remove the old option from EPC, if it exists
 		if ( $this->container->get( 'hasMustUsePlugin' ) && absint( get_option( 'endurance_cache_level', 0 ) ) ) {
 			update_option( 'endurance_cache_level', 0 );
diff --git a/includes/RestApi/CacheSettings.php b/includes/RestApi/CacheSettings.php
new file mode 100644
index 0000000..894de2a
--- /dev/null
+++ b/includes/RestApi/CacheSettings.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace NewfoldLabs\WP\Module\Performance\RestApi;
+
+use NewfoldLabs\WP\Module\ECommerce\Permissions;
+use NewfoldLabs\WP\ModuleLoader\Container;
+
+/**
+ * Class CacheSettings
+ */
+class CacheSettings {
+
+
+	/**
+	 * REST namespace
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'newfold-ecommerce/v1';
+
+	/**
+	 * REST base
+	 *
+	 * @var string
+	 */
+	protected $rest_base = '/cachesettings';
+
+	/**
+	 * Container loaded from the brand plugin.
+	 *
+	 * @var Container
+	 */
+	protected $container;
+
+	/**
+	 * Constructor
+	 *
+	 * @param Container $container the container.
+	 */
+	public function __construct( Container $container ) {
+		$this->container = $container;
+	}
+
+	/**
+	 * Registers rest routes for PluginsController class.
+	 *
+	 * @return void
+	 */
+	public function register_routes() {
+		\register_rest_route(
+			$this->namespace,
+			$this->rest_base . '/settings',
+			array(
+				array(
+					'methods'             => \WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_settings' ),
+					'permission_callback' => array( Permissions::class, 'rest_is_authorized_admin' ),
+				),
+			)
+		);
+		\register_rest_route(
+			$this->namespace,
+			$this->rest_base . '/update',
+			array(
+				array(
+					'methods'             => \WP_REST_Server::CREATABLE,
+					'callback'            => array( $this, 'update_settings' ),
+					'permission_callback' => array( Permissions::class, 'rest_is_authorized_admin' ),
+				),
+			)
+		);
+	}
+
+	/**
+	 * Get the settings
+	 *
+	 * @return \WP_REST_Response
+	 */
+	public function get_settings() {
+		return new \WP_REST_Response(
+			array(
+				'settings' => get_option( 'cache_exlusion', '' ),
+			),
+			200
+		);
+	}
+
+	/**
+	 * Update the settings
+	 *
+	 * @param \WP_REST_Request $request the request.
+	 * @return \WP_REST_Response
+	 */
+	public function update_settings( \WP_REST_Request $request ) {
+		$cache_exlusion = $request->get_param( 'cache_exlusion' );
+		if ( update_option( 'cache_exlusion', $cache_exlusion ) ) {
+			return new \WP_REST_Response(
+				array(
+					'result' => true,
+				),
+				200
+			);
+		}
+
+		return new \WP_REST_Response(
+			array(
+				'result'  => false,
+			),
+			400
+		);
+	}
+}

From e3c3fb6b69a8403a7f5f77ddcfaee55cd2614f9d Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessio.torrisi@yithemes.com>
Date: Wed, 6 Nov 2024 16:20:20 +0100
Subject: [PATCH 03/42] New: Cache Exclusion option

---
 components/cacheExclusion/index.js    | 63 +++++++++++++++++++++++++++
 components/performance/defaultText.js |  5 +++
 components/performance/index.js       |  7 +++
 3 files changed, 75 insertions(+)
 create mode 100644 components/cacheExclusion/index.js

diff --git a/components/cacheExclusion/index.js b/components/cacheExclusion/index.js
new file mode 100644
index 0000000..71eaf05
--- /dev/null
+++ b/components/cacheExclusion/index.js
@@ -0,0 +1,63 @@
+import { Button, Container, TextareaField } from "@newfold/ui-component-library";
+
+const CacheExclusion = ({ methods, constants }) => {
+
+    const [ currentValue, setCurrentValue ] = methods.useState(constants.store.cacheExclusion);
+    const [ isEdited, setIsEdited ] = methods.useState(false);
+    const [ cacheExclusion, setCacheExclusion ] = methods.useState(constants.store.cacheExclusion);
+
+
+    const handleCacheExclusionChange = (e) => {
+        if( e.target.value !== cacheExclusion  ) {
+            setIsEdited(true);            
+        }else{
+            setIsEdited(false);
+        }
+        setCurrentValue( e.target.value );
+    }
+    
+
+    const handlingSaveButton = () => {
+        methods.newfoldSettingsApiFetch(
+            { cacheExclusion: currentValue }, 
+            methods.setError, (response) => {
+                setCacheExclusion( currentValue )
+                methods.makeNotice(
+                    "disable-old-posts-comments-notice", 
+                    constants.text.cacheExclusionSaved,
+                    null,
+                    "success",
+                    5000
+                );
+                setIsEdited(false);
+            }
+        );
+        
+    };
+
+    return (
+        <Container.SettingsField
+            title={constants.text.cacheExclusionTitle}
+            description={constants.text.cacheExclusionDescription}
+        >
+            <TextareaField
+                id="cache-exclusion"
+                name="cache-xxclusion"
+                onChange={ handleCacheExclusionChange }
+                value={currentValue}
+            />
+            <Button
+                variant="secondary"
+                className="save-cache-exclusion-button"
+                disabled={isEdited ? false : true}
+                onClick={handlingSaveButton}
+            >
+                {constants.text.cacheExclusionSaveButton}
+            </Button>
+            
+        </Container.SettingsField>
+            
+    );
+;}
+
+export default CacheExclusion;
\ No newline at end of file
diff --git a/components/performance/defaultText.js b/components/performance/defaultText.js
index 2603b96..0f61643 100644
--- a/components/performance/defaultText.js
+++ b/components/performance/defaultText.js
@@ -22,6 +22,11 @@ const defaultText = {
     clearCacheDescription: __('We automatically clear your cache as you work (creating content, changing settings, installing plugins and more). But you can manually clear it here to be confident it is fresh.', 'wp-module-performance'),
     clearCacheNoticeTitle: __('Cache cleared', 'wp-module-performance'),
     clearCacheTitle: __('Clear Cache', 'wp-module-performance'),
+    clearCacheTitle: __('Clear Cache', 'wp-module-performance'),
+    cacheExclusionTitle: __( 'Exclude from cache', 'wp-module-performance' ),
+    cacheExclusionDescription: __( 'This setting controls what pages pass a “no-cache” header so that page caching and browser caching is not used.', 'wp-module-performance' ),
+    cacheExclusionSaved: __( 'Cache Exclusion saved', 'wp-module-performance' ),
+    cacheExclusionSaveButton: __( 'Save', 'wp-module-performance' ),
 };
 
 export default defaultText;
\ No newline at end of file
diff --git a/components/performance/index.js b/components/performance/index.js
index e6d7483..ed480e2 100644
--- a/components/performance/index.js
+++ b/components/performance/index.js
@@ -1,6 +1,7 @@
 import { Container } from '@newfold/ui-component-library';
 import { default as CacheSettings } from '../cacheSettings/';
 import { default as ClearCache } from '../clearCache/';
+import { default as CacheExclusion } from '../cacheExclusion/';
 import { default as defaultText } from './defaultText';
 
 /**
@@ -45,6 +46,12 @@ const Performance = ({methods, constants, Components, ...props}) => {
                     Components={Components}
                 />
             </Container.Block>
+            <Container.Block separator={true} className={'newfold-cache-exclusion'}>
+                <CacheExclusion
+                    methods={methods}
+                    constants={constants}
+                />
+            </Container.Block>
             <Container.Block className={'newfold-clear-cache'}>
                 <ClearCache
                     methods={methods}

From 04b837a1309be1a2e16db247e9fd9ce1eed23c24 Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Thu, 7 Nov 2024 11:43:18 +0000
Subject: [PATCH 04/42] register the api and add the value to runtime

---
 includes/CacheManager.php                     | 50 ++++++++++++++++++-
 ...tings.php => CacheExclusionController.php} | 14 +++---
 2 files changed, 56 insertions(+), 8 deletions(-)
 rename includes/RestApi/{CacheSettings.php => CacheExclusionController.php} (85%)

diff --git a/includes/CacheManager.php b/includes/CacheManager.php
index 38da5eb..3503f55 100644
--- a/includes/CacheManager.php
+++ b/includes/CacheManager.php
@@ -3,6 +3,7 @@
 namespace NewfoldLabs\WP\Module\Performance;
 
 use NewfoldLabs\WP\Module\Performance\CacheTypes\CacheBase;
+use NewfoldLabs\WP\Module\Performance\RestApi\CacheExclusionController;
 use NewfoldLabs\WP\ModuleLoader\Container;
 use WP_Forge\Collection\Collection;
 
@@ -15,13 +16,60 @@ class CacheManager {
 	 */
 	protected $container;
 
+	/**
+	 * Array map of API controllers.
+	 *
+	 * @var array
+	 */
+	protected $controllers = array(
+		'NewfoldLabs\\WP\\Module\\Performance\\RestApi\\CacheExclusionController',
+	);
+
 	/**
 	 * Constructor.
 	 *
-	 * @param  string[]  $supportedCacheTypes  Cache types supported by the plugin
+	 * @param string[] $supportedCacheTypes Cache types supported by the plugin
 	 */
 	public function __construct( Container $container ) {
 		$this->container = $container;
+
+		add_action( 'rest_api_init', array( $this, 'register_routes' ) );
+		add_filter( 'newfold-runtime', array( $this, 'add_to_runtime' ) );
+	}
+
+	/**
+	 * Register API routes.
+	 */
+	public function register_routes() {
+		foreach ( $this->controllers as $Controller ) {
+			/**
+			 * Get an instance of the WP_REST_Controller.
+			 *
+			 * @var $instance \WP_REST_Controller
+			 */
+			$instance = new $Controller( $this->container );
+			$instance->register_routes();
+		}
+	}
+	
+	/**
+	 * Add values to the runtime object.
+	 *
+	 * @param array $sdk The runtime object.
+	 *
+	 * @return array
+	 */
+	public function add_to_runtime( $sdk ) {
+		return array_merge( $sdk, array( 'cacheExclusion' => get_option( 'cache_exclusion', $this->defaultCacheExclusions() ) ) );
+	}
+
+	/**
+	 * Return defaul exclusions.
+	 *
+	 * @return array
+	 */
+	public function defaultCacheExclusions() {
+		return join( ',', [ 'cart', 'checkout', 'wp-admin', rest_get_url_prefix() ] );
 	}
 
 	/**
diff --git a/includes/RestApi/CacheSettings.php b/includes/RestApi/CacheExclusionController.php
similarity index 85%
rename from includes/RestApi/CacheSettings.php
rename to includes/RestApi/CacheExclusionController.php
index 894de2a..a128bca 100644
--- a/includes/RestApi/CacheSettings.php
+++ b/includes/RestApi/CacheExclusionController.php
@@ -6,9 +6,9 @@
 use NewfoldLabs\WP\ModuleLoader\Container;
 
 /**
- * Class CacheSettings
+ * Class CacheExclusionController
  */
-class CacheSettings {
+class CacheExclusionController {
 
 
 	/**
@@ -23,7 +23,7 @@ class CacheSettings {
 	 *
 	 * @var string
 	 */
-	protected $rest_base = '/cachesettings';
+	protected $rest_base = '/cacheexclusion';
 
 	/**
 	 * Container loaded from the brand plugin.
@@ -79,7 +79,7 @@ public function register_routes() {
 	public function get_settings() {
 		return new \WP_REST_Response(
 			array(
-				'settings' => get_option( 'cache_exlusion', '' ),
+				'settings' => get_option( 'cache_exclusion', '' ),
 			),
 			200
 		);
@@ -92,8 +92,8 @@ public function get_settings() {
 	 * @return \WP_REST_Response
 	 */
 	public function update_settings( \WP_REST_Request $request ) {
-		$cache_exlusion = $request->get_param( 'cache_exlusion' );
-		if ( update_option( 'cache_exlusion', $cache_exlusion ) ) {
+		$cache_exclusion = $request->get_param( 'cache_exclusion' );
+		if ( update_option( 'cache_exclusion', $cache_exclusion ) ) {
 			return new \WP_REST_Response(
 				array(
 					'result' => true,
@@ -104,7 +104,7 @@ public function update_settings( \WP_REST_Request $request ) {
 
 		return new \WP_REST_Response(
 			array(
-				'result'  => false,
+				'result' => false,
 			),
 			400
 		);

From 449116b1f1d963d43c416567b6546dd7e5d5df7d Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Thu, 7 Nov 2024 11:50:44 +0000
Subject: [PATCH 05/42] fixed string

---
 includes/RestApi/CacheExclusionController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/RestApi/CacheExclusionController.php b/includes/RestApi/CacheExclusionController.php
index a128bca..6527c45 100644
--- a/includes/RestApi/CacheExclusionController.php
+++ b/includes/RestApi/CacheExclusionController.php
@@ -79,7 +79,7 @@ public function register_routes() {
 	public function get_settings() {
 		return new \WP_REST_Response(
 			array(
-				'settings' => get_option( 'cache_exclusion', '' ),
+				'cacheExclusion' => get_option( 'cache_exclusion', '' ),
 			),
 			200
 		);
@@ -92,7 +92,7 @@ public function get_settings() {
 	 * @return \WP_REST_Response
 	 */
 	public function update_settings( \WP_REST_Request $request ) {
-		$cache_exclusion = $request->get_param( 'cache_exclusion' );
+		$cache_exclusion = $request->get_param( 'cacheExclusion' );
 		if ( update_option( 'cache_exclusion', $cache_exclusion ) ) {
 			return new \WP_REST_Response(
 				array(

From 9a7cd89fa06b153de1e3d8dfae8a6fb95b7d3013 Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Thu, 7 Nov 2024 11:55:59 +0000
Subject: [PATCH 06/42] moved getDefaultCacheExclusions function to functions
 file

---
 includes/CacheManager.php                     | 13 +++----------
 includes/RestApi/CacheExclusionController.php |  4 +++-
 includes/functions.php                        |  9 +++++++++
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/includes/CacheManager.php b/includes/CacheManager.php
index 3503f55..8ed4ac8 100644
--- a/includes/CacheManager.php
+++ b/includes/CacheManager.php
@@ -7,6 +7,8 @@
 use NewfoldLabs\WP\ModuleLoader\Container;
 use WP_Forge\Collection\Collection;
 
+use function NewfoldLabs\WP\Module\Performance\getDefaultCacheExclusions;
+
 class CacheManager {
 
 	/**
@@ -60,16 +62,7 @@ public function register_routes() {
 	 * @return array
 	 */
 	public function add_to_runtime( $sdk ) {
-		return array_merge( $sdk, array( 'cacheExclusion' => get_option( 'cache_exclusion', $this->defaultCacheExclusions() ) ) );
-	}
-
-	/**
-	 * Return defaul exclusions.
-	 *
-	 * @return array
-	 */
-	public function defaultCacheExclusions() {
-		return join( ',', [ 'cart', 'checkout', 'wp-admin', rest_get_url_prefix() ] );
+		return array_merge( $sdk, array( 'cacheExclusion' => get_option( 'cache_exclusion', getDefaultCacheExclusions() ) ) );
 	}
 
 	/**
diff --git a/includes/RestApi/CacheExclusionController.php b/includes/RestApi/CacheExclusionController.php
index 6527c45..f352afa 100644
--- a/includes/RestApi/CacheExclusionController.php
+++ b/includes/RestApi/CacheExclusionController.php
@@ -5,6 +5,8 @@
 use NewfoldLabs\WP\Module\ECommerce\Permissions;
 use NewfoldLabs\WP\ModuleLoader\Container;
 
+use function NewfoldLabs\WP\Module\Performance\getDefaultCacheExclusions;
+
 /**
  * Class CacheExclusionController
  */
@@ -79,7 +81,7 @@ public function register_routes() {
 	public function get_settings() {
 		return new \WP_REST_Response(
 			array(
-				'cacheExclusion' => get_option( 'cache_exclusion', '' ),
+				'cacheExclusion' => get_option( 'cache_exclusion', getDefaultCacheExclusions() ),
 			),
 			200
 		);
diff --git a/includes/functions.php b/includes/functions.php
index 4133e84..49a8310 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -2,6 +2,15 @@
 
 namespace NewfoldLabs\WP\Module\Performance;
 
+/**
+ * Return defaul exclusions.
+ *
+ * @return array
+ */
+function getDefaultCacheExclusions() {
+	return join( ',', [ 'cart', 'checkout', 'wp-admin', rest_get_url_prefix() ] );
+}
+
 /**
  * Get the current cache level.
  *

From ddb7674910eda6c0f5f57fbe85152544492598be Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Thu, 7 Nov 2024 14:41:50 +0000
Subject: [PATCH 07/42] updated js component

---
 components/cacheExclusion/index.js | 70 +++++++++++++++++-------------
 includes/CacheManager.php          |  1 -
 2 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/components/cacheExclusion/index.js b/components/cacheExclusion/index.js
index 71eaf05..ee50b1b 100644
--- a/components/cacheExclusion/index.js
+++ b/components/cacheExclusion/index.js
@@ -1,11 +1,11 @@
 import { Button, Container, TextareaField } from "@newfold/ui-component-library";
 
 const CacheExclusion = ({ methods, constants }) => {
-
-    const [ currentValue, setCurrentValue ] = methods.useState(constants.store.cacheExclusion);
     const [ isEdited, setIsEdited ] = methods.useState(false);
-    const [ cacheExclusion, setCacheExclusion ] = methods.useState(constants.store.cacheExclusion);
-
+	const [ isError, setIsError ] = methods.useState(false);
+	const [ isSaved, setIsSaved ] = methods.useState(false);
+    const [ cacheExclusion, setCacheExclusion ] = methods.useState(methods.NewfoldRuntime.sdk.cacheExclusion);
+	const apiUrl = methods.NewfoldRuntime.createApiUrl("/newfold-ecommerce/v1/cacheexclusion/update");
 
     const handleCacheExclusionChange = (e) => {
         if( e.target.value !== cacheExclusion  ) {
@@ -13,28 +13,36 @@ const CacheExclusion = ({ methods, constants }) => {
         }else{
             setIsEdited(false);
         }
-        setCurrentValue( e.target.value );
+        setCacheExclusion( e.target.value );
     }
-    
 
     const handlingSaveButton = () => {
-        methods.newfoldSettingsApiFetch(
-            { cacheExclusion: currentValue }, 
-            methods.setError, (response) => {
-                setCacheExclusion( currentValue )
-                methods.makeNotice(
-                    "disable-old-posts-comments-notice", 
-                    constants.text.cacheExclusionSaved,
-                    null,
-                    "success",
-                    5000
-                );
-                setIsEdited(false);
-            }
-        );
-        
+		methods.apiFetch({
+			url: apiUrl,
+			method: "POST",
+			data: {cacheExclusion: cacheExclusion}
+		}).then((result)=>{
+			  setIsSaved(true);
+		}).catch((error) => {     
+			setIsError(error.message);
+		});
     };
 
+	methods.useUpdateEffect(() => {
+        methods.setStore({
+            ...constants.store,
+            CacheExclusion: cacheExclusion,
+        });
+
+        methods.makeNotice(
+            "cache-exlusion-notice", 
+            constants.text.cacheExclusionTitle,
+            !isError ? constants.text.cacheExclusionSaved : isError,
+            !isError ? "success" : "error",
+            5000
+        );
+    }, [ isSaved, isError]);
+
     return (
         <Container.SettingsField
             title={constants.text.cacheExclusionTitle}
@@ -44,16 +52,18 @@ const CacheExclusion = ({ methods, constants }) => {
                 id="cache-exclusion"
                 name="cache-xxclusion"
                 onChange={ handleCacheExclusionChange }
-                value={currentValue}
+                value={cacheExclusion}
             />
-            <Button
-                variant="secondary"
-                className="save-cache-exclusion-button"
-                disabled={isEdited ? false : true}
-                onClick={handlingSaveButton}
-            >
-                {constants.text.cacheExclusionSaveButton}
-            </Button>
+			{isEdited && 
+				<Button
+					variant="secondary"
+					className="save-cache-exclusion-button"
+					disabled={isEdited ? false : true}
+					onClick={handlingSaveButton}
+				>
+					{constants.text.cacheExclusionSaveButton}
+				</Button>
+			}
             
         </Container.SettingsField>
             
diff --git a/includes/CacheManager.php b/includes/CacheManager.php
index 8ed4ac8..a32b2af 100644
--- a/includes/CacheManager.php
+++ b/includes/CacheManager.php
@@ -3,7 +3,6 @@
 namespace NewfoldLabs\WP\Module\Performance;
 
 use NewfoldLabs\WP\Module\Performance\CacheTypes\CacheBase;
-use NewfoldLabs\WP\Module\Performance\RestApi\CacheExclusionController;
 use NewfoldLabs\WP\ModuleLoader\Container;
 use WP_Forge\Collection\Collection;
 

From 6b56ef18703ccc0198d13e4c7cda661fe581039c Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessio.torrisi@yithemes.com>
Date: Fri, 8 Nov 2024 15:11:44 +0100
Subject: [PATCH 08/42] Tweak: show "save" button only if the current value has
 been edited

---
 components/cacheExclusion/index.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/cacheExclusion/index.js b/components/cacheExclusion/index.js
index ee50b1b..31bded6 100644
--- a/components/cacheExclusion/index.js
+++ b/components/cacheExclusion/index.js
@@ -4,6 +4,7 @@ const CacheExclusion = ({ methods, constants }) => {
     const [ isEdited, setIsEdited ] = methods.useState(false);
 	const [ isError, setIsError ] = methods.useState(false);
 	const [ isSaved, setIsSaved ] = methods.useState(false);
+    const [ currentValue, setCurrentValue ] = methods.useState(methods.NewfoldRuntime.sdk.cacheExclusion);
     const [ cacheExclusion, setCacheExclusion ] = methods.useState(methods.NewfoldRuntime.sdk.cacheExclusion);
 	const apiUrl = methods.NewfoldRuntime.createApiUrl("/newfold-ecommerce/v1/cacheexclusion/update");
 
@@ -13,16 +14,17 @@ const CacheExclusion = ({ methods, constants }) => {
         }else{
             setIsEdited(false);
         }
-        setCacheExclusion( e.target.value );
+        setCurrentValue( e.target.value );
     }
 
     const handlingSaveButton = () => {
 		methods.apiFetch({
 			url: apiUrl,
 			method: "POST",
-			data: {cacheExclusion: cacheExclusion}
+			data: {cacheExclusion: currentValue}
 		}).then((result)=>{
 			  setIsSaved(true);
+              setCacheExclusion(currentValue);
 		}).catch((error) => {     
 			setIsError(error.message);
 		});
@@ -52,7 +54,7 @@ const CacheExclusion = ({ methods, constants }) => {
                 id="cache-exclusion"
                 name="cache-xxclusion"
                 onChange={ handleCacheExclusionChange }
-                value={cacheExclusion}
+                value={currentValue}
             />
 			{isEdited && 
 				<Button

From 3586b38b21029905d4a05784037824ec205e8914 Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessio.torrisi@yithemes.com>
Date: Fri, 8 Nov 2024 15:34:40 +0100
Subject: [PATCH 09/42] Tweak: renamed option in "newfold_cache_exclusion"
 Tweak: use constant OPTION_CACHE_EXCLUSION

---
 includes/CacheManager.php                     |  15 +-
 includes/CacheTypes/File.php                  | 152 ++++++++++--------
 includes/Performance.php                      | 123 +++++++-------
 includes/RestApi/CacheExclusionController.php |  12 +-
 4 files changed, 169 insertions(+), 133 deletions(-)

diff --git a/includes/CacheManager.php b/includes/CacheManager.php
index a32b2af..1acc296 100644
--- a/includes/CacheManager.php
+++ b/includes/CacheManager.php
@@ -5,11 +5,13 @@
 use NewfoldLabs\WP\Module\Performance\CacheTypes\CacheBase;
 use NewfoldLabs\WP\ModuleLoader\Container;
 use WP_Forge\Collection\Collection;
+use NewfoldLabs\WP\Module\Performance\RestApi\CacheExclusionController;
 
 use function NewfoldLabs\WP\Module\Performance\getDefaultCacheExclusions;
 
 class CacheManager {
 
+
 	/**
 	 * Dependency injection container.
 	 *
@@ -52,7 +54,7 @@ public function register_routes() {
 			$instance->register_routes();
 		}
 	}
-	
+
 	/**
 	 * Add values to the runtime object.
 	 *
@@ -61,7 +63,7 @@ public function register_routes() {
 	 * @return array
 	 */
 	public function add_to_runtime( $sdk ) {
-		return array_merge( $sdk, array( 'cacheExclusion' => get_option( 'cache_exclusion', getDefaultCacheExclusions() ) ) );
+		return array_merge( $sdk, array( 'cacheExclusion' => get_option( CacheExclusionController::OPTION_CACHE_EXCLUSION, getDefaultCacheExclusions() ) ) );
 	}
 
 	/**
@@ -70,14 +72,14 @@ public function add_to_runtime( $sdk ) {
 	 * @return string[]
 	 */
 	protected function classMap() {
-		return [
+		return array(
 			'browser'    => __NAMESPACE__ . '\\CacheTypes\\Browser',
 			'cloudflare' => __NAMESPACE__ . '\\CacheTypes\\Cloudflare',
 			'file'       => __NAMESPACE__ . '\\CacheTypes\\File',
 			'nginx'      => __NAMESPACE__ . '\\CacheTypes\\Nginx',
 			'sitelock'   => __NAMESPACE__ . '\\CacheTypes\\Sitelock',
 			'skip404'    => __NAMESPACE__ . '\\CacheTypes\\Skip404',
-		];
+		);
 	}
 
 	/**
@@ -95,7 +97,7 @@ public function registeredCacheTypes() {
 	 * @return array
 	 */
 	public function enabledCacheTypes() {
-		$cacheTypes = [];
+		$cacheTypes = array();
 		if ( $this->container->has( 'cache_types' ) ) {
 			$providedTypes = $this->container->get( 'cache_types' );
 			if ( is_array( $providedTypes ) ) {
@@ -115,7 +117,7 @@ public function enabledCacheTypes() {
 	 * @return CacheBase[]
 	 */
 	public function getInstances() {
-		$instances  = [];
+		$instances  = array();
 		$collection = new Collection( $this->classMap() );
 		$map        = $collection->only( $this->enabledCacheTypes() );
 		foreach ( $map as $type => $class ) {
@@ -130,5 +132,4 @@ public function getInstances() {
 
 		return $instances;
 	}
-
 }
diff --git a/includes/CacheTypes/File.php b/includes/CacheTypes/File.php
index 6c955e0..5d1ad6d 100644
--- a/includes/CacheTypes/File.php
+++ b/includes/CacheTypes/File.php
@@ -14,7 +14,8 @@
 use function NewfoldLabs\WP\Module\Performance\shouldCachePages;
 use function WP_Forge\WP_Htaccess_Manager\removeMarkers;
 
-class File extends CacheBase implements Purgeable {
+class File extends CacheBase implements Purgeable
+{
 
 	/**
 	 * The directory where cached files live.
@@ -37,26 +38,29 @@ class File extends CacheBase implements Purgeable {
 	 *
 	 * @return bool
 	 */
-	public static function shouldEnable( Container $container ) {
-		return (bool) $container->has( 'isApache' ) && $container->get( 'isApache' );
+	public static function shouldEnable(Container $container)
+	{
+		return (bool) $container->has('isApache') && $container->get('isApache');
 	}
 
 	/**
 	 * Constructor.
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 
-		new OptionListener( Performance::OPTION_CACHE_LEVEL, [ __CLASS__, 'maybeAddRules' ] );
+		new OptionListener(Performance::OPTION_CACHE_LEVEL, [__CLASS__, 'maybeAddRules']);
 
-		add_action( 'init', [ $this, 'maybeGeneratePageCache' ] );
-		add_action( 'newfold_update_htaccess', [ $this, 'onRewrite' ] );
+		add_action('init', [$this, 'maybeGeneratePageCache']);
+		add_action('newfold_update_htaccess', [$this, 'onRewrite']);
 	}
 
 	/**
 	 * When updating mod rewrite rules, also update our rewrites as appropriate.
 	 */
-	public function onRewrite() {
-		self::maybeAddRules( getCacheLevel() );
+	public function onRewrite()
+	{
+		self::maybeAddRules(getCacheLevel());
 	}
 
 	/**
@@ -64,8 +68,9 @@ public function onRewrite() {
 	 *
 	 * @param  int  $cacheLevel  The caching level.
 	 */
-	public static function maybeAddRules( $cacheLevel ) {
-		absint( $cacheLevel ) > 1 ? self::addRules() : self::removeRules();
+	public static function maybeAddRules($cacheLevel)
+	{
+		absint($cacheLevel) > 1 ? self::addRules() : self::removeRules();
 	}
 
 	/**
@@ -73,10 +78,11 @@ public static function maybeAddRules( $cacheLevel ) {
 	 *
 	 * @return bool
 	 */
-	public static function addRules() {
+	public static function addRules()
+	{
 
-		$base = wp_parse_url( home_url( '/' ), PHP_URL_PATH );
-		$path = str_replace( get_home_path(), '/', self::CACHE_DIR );
+		$base = wp_parse_url(home_url('/'), PHP_URL_PATH);
+		$path = str_replace(get_home_path(), '/', self::CACHE_DIR);
 
 		$content = <<<HTACCESS
 <IfModule mod_rewrite.c>
@@ -92,25 +98,27 @@ public static function addRules() {
 </IfModule>
 HTACCESS;
 
-		$htaccess = new htaccess( self::MARKER );
+		$htaccess = new htaccess(self::MARKER);
 
-		return $htaccess->addContent( $content );
+		return $htaccess->addContent($content);
 	}
 
 	/**
 	 * Remove our content from the .htaccess file.
 	 */
-	public static function removeRules() {
-		removeMarkers( self::MARKER );
+	public static function removeRules()
+	{
+		removeMarkers(self::MARKER);
 	}
 
 	/**
 	 * Initiate the generation of a page cache for a given request, if necessary.
 	 */
-	public function maybeGeneratePageCache() {
-		if ( $this->isCacheable() ) {
-			if ( $this->shouldCache() ) {
-				ob_start( [ $this, 'write' ] );
+	public function maybeGeneratePageCache()
+	{
+		if ($this->isCacheable()) {
+			if ($this->shouldCache()) {
+				ob_start([$this, 'write']);
 			}
 		} else {
 			nocache_headers();
@@ -124,20 +132,21 @@ public function maybeGeneratePageCache() {
 	 *
 	 * @return string
 	 */
-	public function write( $content ) {
-		if ( ! empty( $content ) ) {
+	public function write($content)
+	{
+		if (! empty($content)) {
 
 			$path = $this->getStoragePathForRequest();
 			$file = $this->getStorageFileForRequest();
 
-			if ( false !== strpos( $content, '</html>' ) ) {
+			if (false !== strpos($content, '</html>')) {
 				$content .= "\n<!--Generated by Newfold Page Cache-->";
 			}
 
-			if ( ! is_dir( $path ) ) {
-				mkdir( $path, 0755, true );
+			if (! is_dir($path)) {
+				mkdir($path, 0755, true);
 			}
-			file_put_contents( $file, $content, LOCK_EX ); // phpcs:ignore WordPress.WP.AlternativeFunctions
+			file_put_contents($file, $content, LOCK_EX); // phpcs:ignore WordPress.WP.AlternativeFunctions
 
 		}
 
@@ -149,60 +158,60 @@ public function write( $content ) {
 	 *
 	 * @return bool
 	 */
-	public function isCacheable() {
+	public function isCacheable()
+	{
 
 		// The request URI should never be empty – even for the homepage it should be '/'
-		if ( empty( $_SERVER['REQUEST_URI'] ) ) {
+		if (empty($_SERVER['REQUEST_URI'])) {
 			return false;
 		}
 
 		// Don't cache if pretty permalinks are disabled
-		if ( false === get_option( 'permalink_structure' ) ) {
+		if (false === get_option('permalink_structure')) {
 			return false;
 		}
 
 		// Only cache front-end pages
-		if ( is_admin() || wp_doing_ajax() || wp_doing_cron() ) {
+		if (is_admin() || wp_doing_ajax() || wp_doing_cron()) {
 			return false;
 		}
 
 		// Don't cache REST API requests
-		if ( defined( 'REST_REQUEST' ) && REST_REQUEST ) {
+		if (defined('REST_REQUEST') && REST_REQUEST) {
 			return false;
 		}
 
 		// Never cache requests made via WP-CLI
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
+		if (defined('WP_CLI') && WP_CLI) {
 			return false;
 		}
 
 		// Don't cache if there are URL parameters present
-		if ( isset( $_GET ) && ! empty( $_GET ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+		if (isset($_GET) && ! empty($_GET)) { // phpcs:ignore WordPress.Security.NonceVerification
 			return false;
 		}
 
 		// Don't cache if handling a form submission
-		if ( isset( $_POST ) && ! empty( $_POST ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+		if (isset($_POST) && ! empty($_POST)) { // phpcs:ignore WordPress.Security.NonceVerification
 			return false;
 		}
 
 		// Don't cache if a user is logged in.
-		if ( function_exists( 'is_user_logged_in' ) && is_user_logged_in() ) {
+		if (function_exists('is_user_logged_in') && is_user_logged_in()) {
 			return false;
 		}
 
 		global $wp_query;
-		if ( isset( $wp_query ) ) {
+		if (isset($wp_query)) {
 
 			// Don't cache 404 pages or RSS feeds
-			if ( is_404() || is_feed() ) {
+			if (is_404() || is_feed()) {
 				return false;
 			}
-
 		}
 
 		// Don't cache private pages
-		if ( 'private' === get_post_status() ) {
+		if ('private' === get_post_status()) {
 			return false;
 		}
 
@@ -214,24 +223,25 @@ public function isCacheable() {
 	 *
 	 * @return bool
 	 */
-	public function shouldCache() {
+	public function shouldCache()
+	{
 
 		// If page caching is disabled, then don't cache
-		if ( ! shouldCachePages() ) {
+		if (! shouldCachePages()) {
 			return false;
 		}
 
 		// Don't cache if any string exclusions are present in the URL
 		$exclusions = $this->exclusions();
-		foreach ( $exclusions as $exclude ) {
-			if ( false !== strpos( $_SERVER['REQUEST_URI'], $exclude ) ) {
+		foreach ($exclusions as $exclude) {
+			if (false !== strpos($_SERVER['REQUEST_URI'], $exclude)) {
 				return false;
 			}
 		}
 
 		// Don't cache if a file exists and hasn't expired
 		$file = $this->getStorageFileForRequest();
-		if ( file_exists( $file ) && filemtime( $file ) + $this->getExpirationTimeframe() > time() ) {
+		if (file_exists($file) && filemtime($file) + $this->getExpirationTimeframe() > time()) {
 			return false;
 		}
 
@@ -243,8 +253,9 @@ public function shouldCache() {
 	 *
 	 * @return array
 	 */
-	protected function exclusions() {
-		return [ 'cart', 'checkout', 'wp-admin', '@', '%', ':', ';', '&', '=', '.', rest_get_url_prefix() ];
+	protected function exclusions()
+	{
+		return ['cart', 'checkout', 'wp-admin', '@', '%', ':', ';', '&', '=', '.', rest_get_url_prefix()];
 	}
 
 	/**
@@ -252,8 +263,9 @@ protected function exclusions() {
 	 *
 	 * @return int
 	 */
-	protected function getExpirationTimeframe() {
-		switch ( getCacheLevel() ) {
+	protected function getExpirationTimeframe()
+	{
+		switch (getCacheLevel()) {
 			case 2:
 				return 2 * HOUR_IN_SECONDS;
 			case 3:
@@ -266,8 +278,9 @@ protected function getExpirationTimeframe() {
 	/**
 	 * Purge everything from the cache.
 	 */
-	public function purgeAll() {
-		removeDirectory( self::CACHE_DIR );
+	public function purgeAll()
+	{
+		removeDirectory(self::CACHE_DIR);
 	}
 
 	/**
@@ -275,18 +288,19 @@ public function purgeAll() {
 	 *
 	 * @param  string  $url
 	 */
-	public function purgeUrl( $url ) {
+	public function purgeUrl($url)
+	{
 		$path = $this->getStoragePathForRequest();
 
-		if ( trailingslashit( self::CACHE_DIR ) === $path ) {
-			if ( file_exists( self::CACHE_DIR . '/_index.html' ) ) {
-				unlink( self::CACHE_DIR . '/_index.html' );
+		if (trailingslashit(self::CACHE_DIR) === $path) {
+			if (file_exists(self::CACHE_DIR . '/_index.html')) {
+				unlink(self::CACHE_DIR . '/_index.html');
 			}
 
 			return;
 		}
 
-		removeDirectory( $this->getStoragePathForRequest() );
+		removeDirectory($this->getStoragePathForRequest());
 	}
 
 	/**
@@ -294,13 +308,14 @@ public function purgeUrl( $url ) {
 	 *
 	 * @return string
 	 */
-	protected function getStoragePathForRequest() {
+	protected function getStoragePathForRequest()
+	{
 		static $path;
 
-		if ( ! isset( $path ) ) {
+		if (! isset($path)) {
 			$url      = new Url();
-			$basePath = wp_parse_url( home_url('/'), PHP_URL_PATH );
-			$path     = trailingslashit( self::CACHE_DIR . str_replace( $basePath, '', esc_url( $url->path ) ) );
+			$basePath = wp_parse_url(home_url('/'), PHP_URL_PATH);
+			$path     = trailingslashit(self::CACHE_DIR . str_replace($basePath, '', esc_url($url->path)));
 		}
 
 		return $path;
@@ -311,28 +326,29 @@ protected function getStoragePathForRequest() {
 	 *
 	 * @return string
 	 */
-	protected function getStorageFileForRequest() {
+	protected function getStorageFileForRequest()
+	{
 		return $this->getStoragePathForRequest() . '_index.html';
 	}
 
 	/**
 	 * Handle activation logic.
 	 */
-	public static function onActivation() {
-		self::maybeAddRules( getCacheLevel() );
+	public static function onActivation()
+	{
+		self::maybeAddRules(getCacheLevel());
 	}
 
 	/**
 	 * Handle deactivation logic.
 	 */
-	public static function onDeactivation() {
+	public static function onDeactivation()
+	{
 
 		// Remove file cache rules from .htaccess
 		self::removeRules();
 
 		// Remove all statically cached files
-		removeDirectory( self::CACHE_DIR );
-
+		removeDirectory(self::CACHE_DIR);
 	}
-
 }
diff --git a/includes/Performance.php b/includes/Performance.php
index 4fa5d13..3fcdca8 100644
--- a/includes/Performance.php
+++ b/includes/Performance.php
@@ -10,7 +10,8 @@
 /**
  * Performance Class
  */
-class Performance {
+class Performance
+{
 
 	/**
 	 * The option name where the cache level is stored.
@@ -19,6 +20,7 @@ class Performance {
 	 */
 	const OPTION_CACHE_LEVEL = 'newfold_cache_level';
 
+
 	/**
 	 * The option name where the "Skip WordPress 404 Handling for Static Files" option is stored.
 	 *
@@ -62,24 +64,25 @@ class Performance {
 	 *
 	 * @param Container $container the container
 	 */
-	public function __construct( Container $container ) {
+	public function __construct(Container $container)
+	{
 
 		$this->container = $container;
-		$this->configureContainer( $container );
+		$this->configureContainer($container);
 
-		$this->hooks( $container );
+		$this->hooks($container);
 
-		$cacheManager = new CacheManager( $container );
-		$cachePurger  = new CachePurgingService( $cacheManager->getInstances() );
+		$cacheManager = new CacheManager($container);
+		$cachePurger  = new CachePurgingService($cacheManager->getInstances());
 
 		// Ensure that purgeable cache types are enabled before showing the UI.
-		if ( $cachePurger->canPurge() ) {
-			add_action( 'admin_bar_menu', array( $this, 'adminBarMenu' ), 100 );
+		if ($cachePurger->canPurge()) {
+			add_action('admin_bar_menu', array($this, 'adminBarMenu'), 100);
 		}
 
-		$container->set( 'cachePurger', $cachePurger );
+		$container->set('cachePurger', $cachePurger);
 
-		$container->set( 'hasMustUsePlugin', file_exists( WPMU_PLUGIN_DIR . '/endurance-page-cache.php' ) );
+		$container->set('hasMustUsePlugin', file_exists(WPMU_PLUGIN_DIR . '/endurance-page-cache.php'));
 	}
 
 	/**
@@ -87,11 +90,12 @@ public function __construct( Container $container ) {
 	 *
 	 * @param Container $container the container
 	 */
-	public function configureContainer( Container $container ) {
+	public function configureContainer(Container $container)
+	{
 
 		global $is_apache;
 
-		$container->set( 'isApache', $is_apache );
+		$container->set('isApache', $is_apache);
 
 		$container->set(
 			'responseHeaderManager',
@@ -108,28 +112,29 @@ function () {
 	 *
 	 * @param Container $container the container
 	 */
-	public function hooks( Container $container ) {
+	public function hooks(Container $container)
+	{
 
-		add_action( 'admin_init', array( $this, 'registerSettings' ), 11 );
+		add_action('admin_init', array($this, 'registerSettings'), 11);
 
-		new OptionListener( self::OPTION_CACHE_LEVEL, array( $this, 'onCacheLevelChange' ) );
+		new OptionListener(self::OPTION_CACHE_LEVEL, array($this, 'onCacheLevelChange'));
 
 		/**
 		 * On CLI requests, mod_rewrite is unavailable, so it fails to update
 		 * the .htaccess file when save_mod_rewrite_rules() is called. This
 		 * forces that to be true so updates from WP CLI work.
 		 */
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			add_filter( 'got_rewrite', '__return_true' );
+		if (defined('WP_CLI') && WP_CLI) {
+			add_filter('got_rewrite', '__return_true');
 		}
 
 		add_filter(
 			'mod_rewrite_rules',
-			function ( $content ) {
+			function ($content) {
 				add_action(
 					'shutdown',
 					function () {
-						do_action( 'newfold_update_htaccess' );
+						do_action('newfold_update_htaccess');
 					}
 				);
 
@@ -137,9 +142,9 @@ function () {
 			}
 		);
 
-		add_action( 'after_mod_rewrite_rules', array( $this, 'onRewrite' ) );
-		add_filter( 'action_scheduler_retention_period', array( $this, 'nfd_asr_default' ) );
-		add_filter( 'action_scheduler_cleanup_batch_size', array( $this, 'nfd_as_cleanup_batch_size' ) );
+		add_action('after_mod_rewrite_rules', array($this, 'onRewrite'));
+		add_filter('action_scheduler_retention_period', array($this, 'nfd_asr_default'));
+		add_filter('action_scheduler_cleanup_batch_size', array($this, 'nfd_as_cleanup_batch_size'));
 	}
 
 	/**
@@ -153,8 +158,9 @@ function () {
 	 *
 	 * @return int New retention period in seconds.
 	 */
-	public function nfd_asr_default( $retention_period ) {
-		return 5 * constant( 'DAY_IN_SECONDS' );
+	public function nfd_asr_default($retention_period)
+	{
+		return 5 * constant('DAY_IN_SECONDS');
 	}
 
 	/**
@@ -167,13 +173,14 @@ public function nfd_asr_default( $retention_period ) {
 	 *
 	 * @return int 1000 when running the cleanup process, otherwise the existing batch size.
 	 */
-	public function nfd_as_cleanup_batch_size( $batch_size ) {
+	public function nfd_as_cleanup_batch_size($batch_size)
+	{
 		/**
 		 * Apply only to {@see ActionScheduler_QueueCleaner::delete_old_actions()} and not to
 		 * {@see ActionScheduler_QueueCleaner::reset_timeouts()} or
 		 * {@see ActionScheduler_QueueCleaner::mark_failures()} batch sizes.
 		 */
-		if ( ! did_filter( 'action_scheduler_retention_period' ) ) {
+		if (! did_filter('action_scheduler_retention_period')) {
 			return $batch_size;
 		}
 
@@ -183,8 +190,9 @@ public function nfd_as_cleanup_batch_size( $batch_size ) {
 	/**
 	 * When updating mod rewrite rules, also update our rewrites as appropriate.
 	 */
-	public function onRewrite() {
-		$this->onCacheLevelChange( getCacheLevel() );
+	public function onRewrite()
+	{
+		$this->onCacheLevelChange(getCacheLevel());
 	}
 
 	/**
@@ -192,30 +200,32 @@ public function onRewrite() {
 	 *
 	 * @param int|null $cacheLevel The cache level.
 	 */
-	public function onCacheLevelChange( $cacheLevel ) {
+	public function onCacheLevelChange($cacheLevel)
+	{
 		/**
 		 * Respone Header Manager from container
 		 *
 		 * @var ResponseHeaderManager $responseHeaderManager
 		 */
-		$responseHeaderManager = $this->container->get( 'responseHeaderManager' );
-		$responseHeaderManager->addHeader( 'X-Newfold-Cache-Level', absint( $cacheLevel ) );
+		$responseHeaderManager = $this->container->get('responseHeaderManager');
+		$responseHeaderManager->addHeader('X-Newfold-Cache-Level', absint($cacheLevel));
 
-		Browser::maybeAddRules( $cacheLevel );
-		File::maybeAddRules( $cacheLevel );
-		Skip404::maybeAddRules( $cacheLevel );
+		Browser::maybeAddRules($cacheLevel);
+		File::maybeAddRules($cacheLevel);
+		Skip404::maybeAddRules($cacheLevel);
 
 		// Remove the old option from EPC, if it exists
-		if ( $this->container->get( 'hasMustUsePlugin' ) && absint( get_option( 'endurance_cache_level', 0 ) ) ) {
-			update_option( 'endurance_cache_level', 0 );
-			delete_option( 'endurance_cache_level' );
+		if ($this->container->get('hasMustUsePlugin') && absint(get_option('endurance_cache_level', 0))) {
+			update_option('endurance_cache_level', 0);
+			delete_option('endurance_cache_level');
 		}
 	}
 
 	/**
 	 * Register settings
 	 */
-	public function registerSettings() {
+	public function registerSettings()
+	{
 
 		global $wp_settings_fields;
 
@@ -223,25 +233,25 @@ public function registerSettings() {
 
 		add_settings_section(
 			$section_name,
-			'<span id="' . self::SETTINGS_ID . '">' . esc_html__( 'Caching', 'newfold-performance-module' ) . '</span>',
+			'<span id="' . self::SETTINGS_ID . '">' . esc_html__('Caching', 'newfold-performance-module') . '</span>',
 			'__return_false',
 			'general'
 		);
 
 		add_settings_field(
 			self::OPTION_CACHE_LEVEL,
-			__( 'Cache Level', 'newfold-performance-module' ),
+			__('Cache Level', 'newfold-performance-module'),
 			__NAMESPACE__ . '\\getCacheLevelDropdown',
 			'general',
 			$section_name
 		);
 
-		register_setting( 'general', self::OPTION_CACHE_LEVEL );
+		register_setting('general', self::OPTION_CACHE_LEVEL);
 
 		// Remove the setting from EPC if it exists - TODO: Remove when no longer using EPC
-		if ( $this->container->get( 'hasMustUsePlugin' ) ) {
-			unset( $wp_settings_fields['general']['epc_settings_section'] );
-			unregister_setting( 'general', 'endurance_cache_level' );
+		if ($this->container->get('hasMustUsePlugin')) {
+			unset($wp_settings_fields['general']['epc_settings_section']);
+			unregister_setting('general', 'endurance_cache_level');
 		}
 	}
 
@@ -250,38 +260,39 @@ public function registerSettings() {
 	 *
 	 * @param \WP_Admin_Bar $wp_admin_bar the admin bar
 	 */
-	public function adminBarMenu( \WP_Admin_Bar $wp_admin_bar ) {
+	public function adminBarMenu(\WP_Admin_Bar $wp_admin_bar)
+	{
 
 		// If the EPC MU plugin exists, remove its cache clearing options.
-		if ( $this->container->get( 'hasMustUsePlugin' ) ) {
-			$wp_admin_bar->remove_node( 'epc_purge_menu' );
+		if ($this->container->get('hasMustUsePlugin')) {
+			$wp_admin_bar->remove_node('epc_purge_menu');
 		}
 
-		if ( current_user_can( 'manage_options' ) ) {
+		if (current_user_can('manage_options')) {
 
 			$wp_admin_bar->add_node(
 				array(
 					'id'    => 'nfd_purge_menu',
-					'title' => __( 'Caching', 'newfold-module-performance' ),
+					'title' => __('Caching', 'newfold-module-performance'),
 				)
 			);
 
 			$wp_admin_bar->add_node(
 				array(
 					'id'     => 'nfd_purge_menu-purge_all',
-					'title'  => __( 'Purge All', 'newfold-module-performance' ),
+					'title'  => __('Purge All', 'newfold-module-performance'),
 					'parent' => 'nfd_purge_menu',
-					'href'   => add_query_arg( array( self::PURGE_ALL => true ) ),
+					'href'   => add_query_arg(array(self::PURGE_ALL => true)),
 				)
 			);
 
-			if ( ! is_admin() ) {
+			if (! is_admin()) {
 				$wp_admin_bar->add_node(
 					array(
 						'id'     => 'nfd_purge_menu-purge_single',
-						'title'  => __( 'Purge This Page', 'newfold-module-performance' ),
+						'title'  => __('Purge This Page', 'newfold-module-performance'),
 						'parent' => 'nfd_purge_menu',
-						'href'   => add_query_arg( array( self::PURGE_URL => true ) ),
+						'href'   => add_query_arg(array(self::PURGE_URL => true)),
 					)
 				);
 			}
@@ -289,9 +300,9 @@ public function adminBarMenu( \WP_Admin_Bar $wp_admin_bar ) {
 			$wp_admin_bar->add_node(
 				array(
 					'id'     => 'nfd_purge_menu-cache_settings',
-					'title'  => __( 'Cache Settings', 'newfold-module-performance' ),
+					'title'  => __('Cache Settings', 'newfold-module-performance'),
 					'parent' => 'nfd_purge_menu',
-					'href'   => admin_url( 'options-general.php#' . Performance::SETTINGS_ID ),
+					'href'   => admin_url('options-general.php#' . Performance::SETTINGS_ID),
 				)
 			);
 		}
diff --git a/includes/RestApi/CacheExclusionController.php b/includes/RestApi/CacheExclusionController.php
index f352afa..267fdbc 100644
--- a/includes/RestApi/CacheExclusionController.php
+++ b/includes/RestApi/CacheExclusionController.php
@@ -13,6 +13,7 @@
 class CacheExclusionController {
 
 
+
 	/**
 	 * REST namespace
 	 *
@@ -34,6 +35,13 @@ class CacheExclusionController {
 	 */
 	protected $container;
 
+	/**
+	 * Option used to store all pages should be excluded from cache.
+	 *
+	 * @var string
+	 */
+	const OPTION_CACHE_EXCLUSION = 'newfold_cache_exclusion';
+
 	/**
 	 * Constructor
 	 *
@@ -81,7 +89,7 @@ public function register_routes() {
 	public function get_settings() {
 		return new \WP_REST_Response(
 			array(
-				'cacheExclusion' => get_option( 'cache_exclusion', getDefaultCacheExclusions() ),
+				'cacheExclusion' => get_option( self::OPTION_CACHE_EXCLUSION, getDefaultCacheExclusions() ),
 			),
 			200
 		);
@@ -95,7 +103,7 @@ public function get_settings() {
 	 */
 	public function update_settings( \WP_REST_Request $request ) {
 		$cache_exclusion = $request->get_param( 'cacheExclusion' );
-		if ( update_option( 'cache_exclusion', $cache_exclusion ) ) {
+		if ( update_option( self::OPTION_CACHE_EXCLUSION, $cache_exclusion ) ) {
 			return new \WP_REST_Response(
 				array(
 					'result' => true,

From 54061e4e85ff25b0c26c1fa7aab461617630b4c8 Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessio.torrisi@yithemes.com>
Date: Mon, 11 Nov 2024 10:05:06 +0100
Subject: [PATCH 10/42] Exclude cache (file and browser)

---
 includes/CacheTypes/Browser.php | 106 +++++++++++++++++---
 includes/CacheTypes/File.php    | 170 +++++++++++++++-----------------
 2 files changed, 176 insertions(+), 100 deletions(-)

diff --git a/includes/CacheTypes/Browser.php b/includes/CacheTypes/Browser.php
index 23fd2fb..5798cfd 100644
--- a/includes/CacheTypes/Browser.php
+++ b/includes/CacheTypes/Browser.php
@@ -6,12 +6,19 @@
 use NewfoldLabs\WP\Module\Performance\Performance;
 use NewfoldLabs\WP\ModuleLoader\Container;
 use WP_Forge\WP_Htaccess_Manager\htaccess;
+use NewfoldLabs\WP\Module\Performance\RestApi\CacheExclusionController;
 
 use function NewfoldLabs\WP\Module\Performance\getCacheLevel;
 use function WP_Forge\WP_Htaccess_Manager\removeMarkers;
 
 class Browser extends CacheBase {
 
+
+
+
+
+
+
 	/**
 	 * The file marker name.
 	 *
@@ -35,9 +42,11 @@ public static function shouldEnable( Container $container ) {
 	 */
 	public function __construct() {
 
-		new OptionListener( Performance::OPTION_CACHE_LEVEL, [ __CLASS__, 'maybeAddRules' ] );
+		new OptionListener( Performance::OPTION_CACHE_LEVEL, array( __CLASS__, 'maybeAddRules' ) );
+
+		new OptionListener( CacheExclusionController::OPTION_CACHE_EXCLUSION, array( __CLASS__, 'excludeFromCache' ) );
 
-		add_filter( 'newfold_update_htaccess', [ $this, 'onRewrite' ] );
+		add_filter( 'newfold_update_htaccess', array( $this, 'onRewrite' ) );
 	}
 
 	/**
@@ -87,12 +96,11 @@ public static function addRules( $cacheLevel ) {
 			}
 		}
 
-		$rules [] = '</IfModule>';
+		$rules[] = '</IfModule>';
 
 		$htaccess = new htaccess( self::MARKER );
 
 		return $htaccess->addContent( $rules );
-
 	}
 
 	/**
@@ -106,7 +114,7 @@ protected static function getFileTypeExpirations( int $cacheLevel ) {
 
 		switch ( $cacheLevel ) {
 			case 3:
-				return [
+				return array(
 					'default'         => '1 week',
 					'text/html'       => '8 hours',
 					'image/jpg'       => '1 week',
@@ -117,10 +125,10 @@ protected static function getFileTypeExpirations( int $cacheLevel ) {
 					'text/javascript' => '1 week',
 					'application/pdf' => '1 month',
 					'image/x-icon'    => '1 year',
-				];
+				);
 
 			case 2:
-				return [
+				return array(
 					'default'         => '24 hours',
 					'text/html'       => '2 hours',
 					'image/jpg'       => '24 hours',
@@ -131,10 +139,10 @@ protected static function getFileTypeExpirations( int $cacheLevel ) {
 					'text/javascript' => '24 hours',
 					'application/pdf' => '1 week',
 					'image/x-icon'    => '1 year',
-				];
+				);
 
 			case 1:
-				return [
+				return array(
 					'default'         => '5 minutes',
 					'text/html'       => '0 seconds',
 					'image/jpg'       => '1 hour',
@@ -145,10 +153,10 @@ protected static function getFileTypeExpirations( int $cacheLevel ) {
 					'text/javascript' => '1 hour',
 					'application/pdf' => '6 hours',
 					'image/x-icon'    => '1 year',
-				];
+				);
 
 			default:
-				return [];
+				return array();
 		}
 	}
 
@@ -166,4 +174,80 @@ public static function onDeactivation() {
 		self::removeRules();
 	}
 
+
+	/**
+	 * Write .htaccess file in order to xxclude page from cache.
+	 *
+	 * @return void
+	 */
+	/*
+	public function excludeFromCache() {
+
+		$cache_exclusion_parameters = array_map( 'trim', explode( ',', get_option( CacheExclusionController::OPTION_CACHE_EXCLUSION ) ) );
+
+		$tab = "\t";
+
+		$rules[] = '<IfModule mod_expires.c>';
+		$rules[] = "{$tab}RewriteEngine On";
+
+		foreach ( $cache_exclusion_parameters as $param ) {
+			if ( ! empty( $param ) ) {
+				// Exclude from cache urls that containt one of following parameters.
+				$rules[] = "RewriteCond %{REQUEST_URI} !{$param} [NC]\n";
+			}
+		}
+		$rules[] = 'RewriteRule .* - [E=Cache-Control:no-cache]';
+
+		$rules[] = '</IfModule>';
+
+		// END Custom Cache Exclusions.
+
+		$htaccess = new htaccess( self::MARKER );
+
+		return $htaccess->addContent( $rules );
+	}/*
+
+	/**
+	 * Write .htaccess file in order to xxclude page from cache.
+	 *
+	 * @return void
+	 */
+	public function excludeFromCache() {
+
+		$htaccess_path = ABSPATH . '.htaccess';
+
+		$cache_exclusion_parameters = array_map( 'trim', explode( ',', get_option( CacheExclusionController::OPTION_CACHE_EXCLUSION ) ) );
+
+		$rewrite_conds = '';
+		foreach ( $cache_exclusion_parameters as $param ) {
+			if ( ! empty( $param ) ) {
+				$rewrite_conds .= "RewriteCond %{REQUEST_URI} !{$param} [NC]\n";
+			}
+		}
+		$htaccess_content = "
+		# BEGIN Custom Cache Exclusions
+		<IfModule mod_rewrite.c>
+		RewriteEngine On
+		# Exclude from cache urls that containt one of following parameters.
+		{$rewrite_conds}
+		RewriteRule .* - [E=Cache-Control:no-cache]
+		</IfModule>
+		# END Custom Cache Exclusions
+		";
+
+		if ( file_exists( $htaccess_path ) ) {
+			$existing_content = file_get_contents( $htaccess_path );
+		} else {
+			$existing_content = '';
+		}
+
+		// Remove any existing block created by this method previously.
+		$new_content = preg_replace( '/# BEGIN Custom Cache Exclusions.*# END Custom Cache Exclusions/s', '', $existing_content );
+
+		// Add new block to .htaccess file.
+		$new_content .= "\n" . $htaccess_content;
+
+		// Write the new content in .htaccess file.
+		file_put_contents( $htaccess_path, $new_content );
+	}
 }
diff --git a/includes/CacheTypes/File.php b/includes/CacheTypes/File.php
index 5d1ad6d..c1ea746 100644
--- a/includes/CacheTypes/File.php
+++ b/includes/CacheTypes/File.php
@@ -14,8 +14,8 @@
 use function NewfoldLabs\WP\Module\Performance\shouldCachePages;
 use function WP_Forge\WP_Htaccess_Manager\removeMarkers;
 
-class File extends CacheBase implements Purgeable
-{
+class File extends CacheBase implements Purgeable {
+
 
 	/**
 	 * The directory where cached files live.
@@ -34,43 +34,39 @@ class File extends CacheBase implements Purgeable
 	/**
 	 * Whether or not the code for this cache type should be loaded.
 	 *
-	 * @param  Container  $container
+	 * @param  Container $container
 	 *
 	 * @return bool
 	 */
-	public static function shouldEnable(Container $container)
-	{
-		return (bool) $container->has('isApache') && $container->get('isApache');
+	public static function shouldEnable( Container $container ) {
+		return (bool) $container->has( 'isApache' ) && $container->get( 'isApache' );
 	}
 
 	/**
 	 * Constructor.
 	 */
-	public function __construct()
-	{
+	public function __construct() {
 
-		new OptionListener(Performance::OPTION_CACHE_LEVEL, [__CLASS__, 'maybeAddRules']);
+		new OptionListener( Performance::OPTION_CACHE_LEVEL, array( __CLASS__, 'maybeAddRules' ) );
 
-		add_action('init', [$this, 'maybeGeneratePageCache']);
-		add_action('newfold_update_htaccess', [$this, 'onRewrite']);
+		add_action( 'init', array( $this, 'maybeGeneratePageCache' ) );
+		add_action( 'newfold_update_htaccess', array( $this, 'onRewrite' ) );
 	}
 
 	/**
 	 * When updating mod rewrite rules, also update our rewrites as appropriate.
 	 */
-	public function onRewrite()
-	{
-		self::maybeAddRules(getCacheLevel());
+	public function onRewrite() {
+		self::maybeAddRules( getCacheLevel() );
 	}
 
 	/**
 	 * Determine whether to add or remove rules based on caching level.
 	 *
-	 * @param  int  $cacheLevel  The caching level.
+	 * @param  int $cacheLevel  The caching level.
 	 */
-	public static function maybeAddRules($cacheLevel)
-	{
-		absint($cacheLevel) > 1 ? self::addRules() : self::removeRules();
+	public static function maybeAddRules( $cacheLevel ) {
+		absint( $cacheLevel ) > 1 ? self::addRules() : self::removeRules();
 	}
 
 	/**
@@ -78,11 +74,10 @@ public static function maybeAddRules($cacheLevel)
 	 *
 	 * @return bool
 	 */
-	public static function addRules()
-	{
+	public static function addRules() {
 
-		$base = wp_parse_url(home_url('/'), PHP_URL_PATH);
-		$path = str_replace(get_home_path(), '/', self::CACHE_DIR);
+		$base = wp_parse_url( home_url( '/' ), PHP_URL_PATH );
+		$path = str_replace( get_home_path(), '/', self::CACHE_DIR );
 
 		$content = <<<HTACCESS
 <IfModule mod_rewrite.c>
@@ -98,27 +93,25 @@ public static function addRules()
 </IfModule>
 HTACCESS;
 
-		$htaccess = new htaccess(self::MARKER);
+		$htaccess = new htaccess( self::MARKER );
 
-		return $htaccess->addContent($content);
+		return $htaccess->addContent( $content );
 	}
 
 	/**
 	 * Remove our content from the .htaccess file.
 	 */
-	public static function removeRules()
-	{
-		removeMarkers(self::MARKER);
+	public static function removeRules() {
+		removeMarkers( self::MARKER );
 	}
 
 	/**
 	 * Initiate the generation of a page cache for a given request, if necessary.
 	 */
-	public function maybeGeneratePageCache()
-	{
-		if ($this->isCacheable()) {
-			if ($this->shouldCache()) {
-				ob_start([$this, 'write']);
+	public function maybeGeneratePageCache() {
+		if ( $this->isCacheable() ) {
+			if ( $this->shouldCache() ) {
+				ob_start( array( $this, 'write' ) );
 			}
 		} else {
 			nocache_headers();
@@ -128,25 +121,24 @@ public function maybeGeneratePageCache()
 	/**
 	 * Write page content to cache.
 	 *
-	 * @param  string  $content  Page content to be cached.
+	 * @param  string $content  Page content to be cached.
 	 *
 	 * @return string
 	 */
-	public function write($content)
-	{
-		if (! empty($content)) {
+	public function write( $content ) {
+		if ( ! empty( $content ) ) {
 
 			$path = $this->getStoragePathForRequest();
 			$file = $this->getStorageFileForRequest();
 
-			if (false !== strpos($content, '</html>')) {
+			if ( false !== strpos( $content, '</html>' ) ) {
 				$content .= "\n<!--Generated by Newfold Page Cache-->";
 			}
 
-			if (! is_dir($path)) {
-				mkdir($path, 0755, true);
+			if ( ! is_dir( $path ) ) {
+				mkdir( $path, 0755, true );
 			}
-			file_put_contents($file, $content, LOCK_EX); // phpcs:ignore WordPress.WP.AlternativeFunctions
+			file_put_contents( $file, $content, LOCK_EX ); // phpcs:ignore WordPress.WP.AlternativeFunctions
 
 		}
 
@@ -158,60 +150,69 @@ public function write($content)
 	 *
 	 * @return bool
 	 */
-	public function isCacheable()
-	{
-
+	public function isCacheable() {
 		// The request URI should never be empty – even for the homepage it should be '/'
-		if (empty($_SERVER['REQUEST_URI'])) {
+		if ( empty( $_SERVER['REQUEST_URI'] ) ) {
 			return false;
 		}
 
+		// Check cache exclusion.
+		$cache_exclusion_parameters = array_map( 'trim', explode( ',', get_option( CacheExclusionController::OPTION_CACHE_EXCLUSION ) ) );
+
+		if ( ! empty( $cache_exclusion_parameters ) ) {
+			foreach ( $cache_exclusion_parameters as $param ) {
+				if ( stripos( $_SERVER['REQUEST_URI'], $param ) !== false ) {
+					return false;
+				}
+			}
+		}
+
 		// Don't cache if pretty permalinks are disabled
-		if (false === get_option('permalink_structure')) {
+		if ( false === get_option( 'permalink_structure' ) ) {
 			return false;
 		}
 
 		// Only cache front-end pages
-		if (is_admin() || wp_doing_ajax() || wp_doing_cron()) {
+		if ( is_admin() || wp_doing_ajax() || wp_doing_cron() ) {
 			return false;
 		}
 
 		// Don't cache REST API requests
-		if (defined('REST_REQUEST') && REST_REQUEST) {
+		if ( defined( 'REST_REQUEST' ) && REST_REQUEST ) {
 			return false;
 		}
 
 		// Never cache requests made via WP-CLI
-		if (defined('WP_CLI') && WP_CLI) {
+		if ( defined( 'WP_CLI' ) && WP_CLI ) {
 			return false;
 		}
 
 		// Don't cache if there are URL parameters present
-		if (isset($_GET) && ! empty($_GET)) { // phpcs:ignore WordPress.Security.NonceVerification
+		if ( isset( $_GET ) && ! empty( $_GET ) ) { // phpcs:ignore WordPress.Security.NonceVerification
 			return false;
 		}
 
 		// Don't cache if handling a form submission
-		if (isset($_POST) && ! empty($_POST)) { // phpcs:ignore WordPress.Security.NonceVerification
+		if ( isset( $_POST ) && ! empty( $_POST ) ) { // phpcs:ignore WordPress.Security.NonceVerification
 			return false;
 		}
 
 		// Don't cache if a user is logged in.
-		if (function_exists('is_user_logged_in') && is_user_logged_in()) {
+		if ( function_exists( 'is_user_logged_in' ) && is_user_logged_in() ) {
 			return false;
 		}
 
 		global $wp_query;
-		if (isset($wp_query)) {
+		if ( isset( $wp_query ) ) {
 
 			// Don't cache 404 pages or RSS feeds
-			if (is_404() || is_feed()) {
+			if ( is_404() || is_feed() ) {
 				return false;
 			}
 		}
 
 		// Don't cache private pages
-		if ('private' === get_post_status()) {
+		if ( 'private' === get_post_status() ) {
 			return false;
 		}
 
@@ -223,25 +224,24 @@ public function isCacheable()
 	 *
 	 * @return bool
 	 */
-	public function shouldCache()
-	{
+	public function shouldCache() {
 
 		// If page caching is disabled, then don't cache
-		if (! shouldCachePages()) {
+		if ( ! shouldCachePages() ) {
 			return false;
 		}
 
 		// Don't cache if any string exclusions are present in the URL
 		$exclusions = $this->exclusions();
-		foreach ($exclusions as $exclude) {
-			if (false !== strpos($_SERVER['REQUEST_URI'], $exclude)) {
+		foreach ( $exclusions as $exclude ) {
+			if ( false !== strpos( $_SERVER['REQUEST_URI'], $exclude ) ) {
 				return false;
 			}
 		}
 
 		// Don't cache if a file exists and hasn't expired
 		$file = $this->getStorageFileForRequest();
-		if (file_exists($file) && filemtime($file) + $this->getExpirationTimeframe() > time()) {
+		if ( file_exists( $file ) && filemtime( $file ) + $this->getExpirationTimeframe() > time() ) {
 			return false;
 		}
 
@@ -253,9 +253,8 @@ public function shouldCache()
 	 *
 	 * @return array
 	 */
-	protected function exclusions()
-	{
-		return ['cart', 'checkout', 'wp-admin', '@', '%', ':', ';', '&', '=', '.', rest_get_url_prefix()];
+	protected function exclusions() {
+		return array( 'cart', 'checkout', 'wp-admin', '@', '%', ':', ';', '&', '=', '.', rest_get_url_prefix() );
 	}
 
 	/**
@@ -263,9 +262,8 @@ protected function exclusions()
 	 *
 	 * @return int
 	 */
-	protected function getExpirationTimeframe()
-	{
-		switch (getCacheLevel()) {
+	protected function getExpirationTimeframe() {
+		switch ( getCacheLevel() ) {
 			case 2:
 				return 2 * HOUR_IN_SECONDS;
 			case 3:
@@ -278,29 +276,27 @@ protected function getExpirationTimeframe()
 	/**
 	 * Purge everything from the cache.
 	 */
-	public function purgeAll()
-	{
-		removeDirectory(self::CACHE_DIR);
+	public function purgeAll() {
+		removeDirectory( self::CACHE_DIR );
 	}
 
 	/**
 	 * Purge a specific URL from the cache.
 	 *
-	 * @param  string  $url
+	 * @param  string $url
 	 */
-	public function purgeUrl($url)
-	{
+	public function purgeUrl( $url ) {
 		$path = $this->getStoragePathForRequest();
 
-		if (trailingslashit(self::CACHE_DIR) === $path) {
-			if (file_exists(self::CACHE_DIR . '/_index.html')) {
-				unlink(self::CACHE_DIR . '/_index.html');
+		if ( trailingslashit( self::CACHE_DIR ) === $path ) {
+			if ( file_exists( self::CACHE_DIR . '/_index.html' ) ) {
+				unlink( self::CACHE_DIR . '/_index.html' );
 			}
 
 			return;
 		}
 
-		removeDirectory($this->getStoragePathForRequest());
+		removeDirectory( $this->getStoragePathForRequest() );
 	}
 
 	/**
@@ -308,14 +304,13 @@ public function purgeUrl($url)
 	 *
 	 * @return string
 	 */
-	protected function getStoragePathForRequest()
-	{
+	protected function getStoragePathForRequest() {
 		static $path;
 
-		if (! isset($path)) {
+		if ( ! isset( $path ) ) {
 			$url      = new Url();
-			$basePath = wp_parse_url(home_url('/'), PHP_URL_PATH);
-			$path     = trailingslashit(self::CACHE_DIR . str_replace($basePath, '', esc_url($url->path)));
+			$basePath = wp_parse_url( home_url( '/' ), PHP_URL_PATH );
+			$path     = trailingslashit( self::CACHE_DIR . str_replace( $basePath, '', esc_url( $url->path ) ) );
 		}
 
 		return $path;
@@ -326,29 +321,26 @@ protected function getStoragePathForRequest()
 	 *
 	 * @return string
 	 */
-	protected function getStorageFileForRequest()
-	{
+	protected function getStorageFileForRequest() {
 		return $this->getStoragePathForRequest() . '_index.html';
 	}
 
 	/**
 	 * Handle activation logic.
 	 */
-	public static function onActivation()
-	{
-		self::maybeAddRules(getCacheLevel());
+	public static function onActivation() {
+		self::maybeAddRules( getCacheLevel() );
 	}
 
 	/**
 	 * Handle deactivation logic.
 	 */
-	public static function onDeactivation()
-	{
+	public static function onDeactivation() {
 
 		// Remove file cache rules from .htaccess
 		self::removeRules();
 
 		// Remove all statically cached files
-		removeDirectory(self::CACHE_DIR);
+		removeDirectory( self::CACHE_DIR );
 	}
 }

From f7257a921b2ac90305cfcb640d563065bc379d35 Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessio.torrisi@yithemes.com>
Date: Mon, 11 Nov 2024 16:07:03 +0100
Subject: [PATCH 11/42] Tweak: manage cache exclusion using existing method
 "addRules"

---
 includes/CacheTypes/Browser.php | 97 +++++----------------------------
 1 file changed, 14 insertions(+), 83 deletions(-)

diff --git a/includes/CacheTypes/Browser.php b/includes/CacheTypes/Browser.php
index 5798cfd..8303c98 100644
--- a/includes/CacheTypes/Browser.php
+++ b/includes/CacheTypes/Browser.php
@@ -14,11 +14,6 @@
 class Browser extends CacheBase {
 
 
-
-
-
-
-
 	/**
 	 * The file marker name.
 	 *
@@ -44,7 +39,7 @@ public function __construct() {
 
 		new OptionListener( Performance::OPTION_CACHE_LEVEL, array( __CLASS__, 'maybeAddRules' ) );
 
-		new OptionListener( CacheExclusionController::OPTION_CACHE_EXCLUSION, array( __CLASS__, 'excludeFromCache' ) );
+		new OptionListener( CacheExclusionController::OPTION_CACHE_EXCLUSION, array( __CLASS__, 'maybeAddRules' ) );
 
 		add_filter( 'newfold_update_htaccess', array( $this, 'onRewrite' ) );
 	}
@@ -96,6 +91,19 @@ public static function addRules( $cacheLevel ) {
 			}
 		}
 
+		$cache_exclusion_parameters = array_map( 'trim', explode( ',', get_option( CacheExclusionController::OPTION_CACHE_EXCLUSION ) ) );
+
+		// Add the cache exclusion rules.
+		$rules[] = 'RewriteEngine On';
+		foreach ( $cache_exclusion_parameters as $param ) {
+			if ( ! empty( $param ) ) {
+				$rules[] = "RewriteCond %{REQUEST_URI} !{$param} [NC]";
+			}
+		}
+		$rules[] = 'RewriteRule .* - [E=Cache-Control:no-cache]';
+
+		// Add the end of the rules about cache exclusion.
+
 		$rules[] = '</IfModule>';
 
 		$htaccess = new htaccess( self::MARKER );
@@ -173,81 +181,4 @@ public static function onActivation() {
 	public static function onDeactivation() {
 		self::removeRules();
 	}
-
-
-	/**
-	 * Write .htaccess file in order to xxclude page from cache.
-	 *
-	 * @return void
-	 */
-	/*
-	public function excludeFromCache() {
-
-		$cache_exclusion_parameters = array_map( 'trim', explode( ',', get_option( CacheExclusionController::OPTION_CACHE_EXCLUSION ) ) );
-
-		$tab = "\t";
-
-		$rules[] = '<IfModule mod_expires.c>';
-		$rules[] = "{$tab}RewriteEngine On";
-
-		foreach ( $cache_exclusion_parameters as $param ) {
-			if ( ! empty( $param ) ) {
-				// Exclude from cache urls that containt one of following parameters.
-				$rules[] = "RewriteCond %{REQUEST_URI} !{$param} [NC]\n";
-			}
-		}
-		$rules[] = 'RewriteRule .* - [E=Cache-Control:no-cache]';
-
-		$rules[] = '</IfModule>';
-
-		// END Custom Cache Exclusions.
-
-		$htaccess = new htaccess( self::MARKER );
-
-		return $htaccess->addContent( $rules );
-	}/*
-
-	/**
-	 * Write .htaccess file in order to xxclude page from cache.
-	 *
-	 * @return void
-	 */
-	public function excludeFromCache() {
-
-		$htaccess_path = ABSPATH . '.htaccess';
-
-		$cache_exclusion_parameters = array_map( 'trim', explode( ',', get_option( CacheExclusionController::OPTION_CACHE_EXCLUSION ) ) );
-
-		$rewrite_conds = '';
-		foreach ( $cache_exclusion_parameters as $param ) {
-			if ( ! empty( $param ) ) {
-				$rewrite_conds .= "RewriteCond %{REQUEST_URI} !{$param} [NC]\n";
-			}
-		}
-		$htaccess_content = "
-		# BEGIN Custom Cache Exclusions
-		<IfModule mod_rewrite.c>
-		RewriteEngine On
-		# Exclude from cache urls that containt one of following parameters.
-		{$rewrite_conds}
-		RewriteRule .* - [E=Cache-Control:no-cache]
-		</IfModule>
-		# END Custom Cache Exclusions
-		";
-
-		if ( file_exists( $htaccess_path ) ) {
-			$existing_content = file_get_contents( $htaccess_path );
-		} else {
-			$existing_content = '';
-		}
-
-		// Remove any existing block created by this method previously.
-		$new_content = preg_replace( '/# BEGIN Custom Cache Exclusions.*# END Custom Cache Exclusions/s', '', $existing_content );
-
-		// Add new block to .htaccess file.
-		$new_content .= "\n" . $htaccess_content;
-
-		// Write the new content in .htaccess file.
-		file_put_contents( $htaccess_path, $new_content );
-	}
 }

From a9c77dae0cc8f3f0efc021d6a925babe543cc364 Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Mon, 11 Nov 2024 15:17:42 +0000
Subject: [PATCH 12/42] added porting function to manage exclusion option
 update

---
 includes/CacheTypes/Browser.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/includes/CacheTypes/Browser.php b/includes/CacheTypes/Browser.php
index 8303c98..eb3ecc5 100644
--- a/includes/CacheTypes/Browser.php
+++ b/includes/CacheTypes/Browser.php
@@ -39,7 +39,7 @@ public function __construct() {
 
 		new OptionListener( Performance::OPTION_CACHE_LEVEL, array( __CLASS__, 'maybeAddRules' ) );
 
-		new OptionListener( CacheExclusionController::OPTION_CACHE_EXCLUSION, array( __CLASS__, 'maybeAddRules' ) );
+		new OptionListener( CacheExclusionController::OPTION_CACHE_EXCLUSION, array( __CLASS__, 'exclusionChange' ) );
 
 		add_filter( 'newfold_update_htaccess', array( $this, 'onRewrite' ) );
 	}
@@ -51,6 +51,13 @@ public function onRewrite() {
 		self::maybeAddRules( getCacheLevel() );
 	}
 
+	/**
+	 * Manage on exlcusion option change.
+	 */
+	public static function exclusionChange() {
+		self::maybeAddRules( getCacheLevel() );
+	}
+
 	/**
 	 * Determine whether to add or remove rules based on caching level.
 	 *

From a811cbc64ae25356e84ee358bd03b1302d0de61f Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessio.torrisi@yithemes.com>
Date: Mon, 11 Nov 2024 16:42:26 +0100
Subject: [PATCH 13/42] Tweak: write htaccess file according to page exclusion

---
 includes/CacheTypes/File.php | 45 +++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/includes/CacheTypes/File.php b/includes/CacheTypes/File.php
index c1ea746..59029a1 100644
--- a/includes/CacheTypes/File.php
+++ b/includes/CacheTypes/File.php
@@ -6,6 +6,7 @@
 use NewfoldLabs\WP\Module\Performance\OptionListener;
 use NewfoldLabs\WP\Module\Performance\Performance;
 use NewfoldLabs\WP\ModuleLoader\Container;
+use NewfoldLabs\WP\Module\Performance\RestApi\CacheExclusionController;
 use WP_Forge\WP_Htaccess_Manager\htaccess;
 use wpscholar\Url;
 
@@ -17,6 +18,7 @@
 class File extends CacheBase implements Purgeable {
 
 
+
 	/**
 	 * The directory where cached files live.
 	 *
@@ -48,11 +50,19 @@ public static function shouldEnable( Container $container ) {
 	public function __construct() {
 
 		new OptionListener( Performance::OPTION_CACHE_LEVEL, array( __CLASS__, 'maybeAddRules' ) );
+		new OptionListener( CacheExclusionController::OPTION_CACHE_EXCLUSION, array( __CLASS__, 'exclusionChange' ) );
 
 		add_action( 'init', array( $this, 'maybeGeneratePageCache' ) );
 		add_action( 'newfold_update_htaccess', array( $this, 'onRewrite' ) );
 	}
 
+	/**
+	 * Manage on exlcusion option change.
+	 */
+	public static function exclusionChange() {
+		self::maybeAddRules( getCacheLevel() );
+	}
+
 	/**
 	 * When updating mod rewrite rules, also update our rewrites as appropriate.
 	 */
@@ -79,6 +89,11 @@ public static function addRules() {
 		$base = wp_parse_url( home_url( '/' ), PHP_URL_PATH );
 		$path = str_replace( get_home_path(), '/', self::CACHE_DIR );
 
+		$exclude_conditions = '';
+		foreach ( $this->exclusions() as $exclude ) {
+			$exclude_conditions .= "RewriteCond %{REQUEST_URI} !^/{$exclude} [NC]\n";
+		}
+
 		$content = <<<HTACCESS
 <IfModule mod_rewrite.c>
 	RewriteEngine On
@@ -88,7 +103,7 @@ public static function addRules() {
 	RewriteCond %{QUERY_STRING} !.*=.*
 	RewriteCond %{HTTP_COOKIE} !(wordpress_test_cookie|comment_author|wp\-postpass|wordpress_logged_in|wptouch_switch_toggle|wp_woocommerce_session_) [NC]
 	RewriteCond %{HTTP:Cache-Control} ^((?!no-cache).)*$
-	RewriteCond %{DOCUMENT_ROOT}{$path}/$1/_index.html -f
+	{$exclude_conditions}RewriteCond %{DOCUMENT_ROOT}{$path}/$1/_index.html -f
 	RewriteRule ^(.*)\$ {$path}/$1/_index.html [L]
 </IfModule>
 HTACCESS;
@@ -156,17 +171,6 @@ public function isCacheable() {
 			return false;
 		}
 
-		// Check cache exclusion.
-		$cache_exclusion_parameters = array_map( 'trim', explode( ',', get_option( CacheExclusionController::OPTION_CACHE_EXCLUSION ) ) );
-
-		if ( ! empty( $cache_exclusion_parameters ) ) {
-			foreach ( $cache_exclusion_parameters as $param ) {
-				if ( stripos( $_SERVER['REQUEST_URI'], $param ) !== false ) {
-					return false;
-				}
-			}
-		}
-
 		// Don't cache if pretty permalinks are disabled
 		if ( false === get_option( 'permalink_structure' ) ) {
 			return false;
@@ -231,11 +235,14 @@ public function shouldCache() {
 			return false;
 		}
 
-		// Don't cache if any string exclusions are present in the URL
-		$exclusions = $this->exclusions();
-		foreach ( $exclusions as $exclude ) {
-			if ( false !== strpos( $_SERVER['REQUEST_URI'], $exclude ) ) {
-				return false;
+		// Check cache exclusion.
+		$cache_exclusion_parameters = $this->exclusions();
+
+		if ( ! empty( $cache_exclusion_parameters ) ) {
+			foreach ( $cache_exclusion_parameters as $param ) {
+				if ( stripos( $_SERVER['REQUEST_URI'], $param ) !== false ) {
+					return false;
+				}
 			}
 		}
 
@@ -254,7 +261,9 @@ public function shouldCache() {
 	 * @return array
 	 */
 	protected function exclusions() {
-		return array( 'cart', 'checkout', 'wp-admin', '@', '%', ':', ';', '&', '=', '.', rest_get_url_prefix() );
+		$default                = array( 'cart', 'checkout', 'wp-admin', '@', '%', ':', ';', '&', '=', '.', rest_get_url_prefix();
+		$cache_exclusion_option = array_map( 'trim', explode( ',', get_option( CacheExclusionController::OPTION_CACHE_EXCLUSION ) ) );
+		return array_merge( $default, $cache_exclusion_option );
 	}
 
 	/**

From d9bd0dfb3743f9690540a2d8b3047376c560e187 Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Tue, 12 Nov 2024 15:12:36 +0000
Subject: [PATCH 14/42] some fixies and phpcs

---
 includes/CacheTypes/Browser.php | 13 +++++++------
 includes/CacheTypes/File.php    | 19 +++++++------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/includes/CacheTypes/Browser.php b/includes/CacheTypes/Browser.php
index eb3ecc5..b6780e1 100644
--- a/includes/CacheTypes/Browser.php
+++ b/includes/CacheTypes/Browser.php
@@ -11,9 +11,10 @@
 use function NewfoldLabs\WP\Module\Performance\getCacheLevel;
 use function WP_Forge\WP_Htaccess_Manager\removeMarkers;
 
+/**
+ * Browser cache class
+ */
 class Browser extends CacheBase {
-
-
 	/**
 	 * The file marker name.
 	 *
@@ -24,7 +25,7 @@ class Browser extends CacheBase {
 	/**
 	 * Whether or not the code for this cache type should be loaded.
 	 *
-	 * @param Container $container
+	 * @param Container $container the container.
 	 *
 	 * @return bool
 	 */
@@ -97,10 +98,12 @@ public static function addRules( $cacheLevel ) {
 				$rules[] = "{$tab}ExpiresByType {$fileType} \"access plus {$expiration}\"";
 			}
 		}
+		$rules[] = '</IfModule>';
 
 		$cache_exclusion_parameters = array_map( 'trim', explode( ',', get_option( CacheExclusionController::OPTION_CACHE_EXCLUSION ) ) );
 
 		// Add the cache exclusion rules.
+		$rules[] = '<IfModule mod_rewrite.c>';
 		$rules[] = 'RewriteEngine On';
 		foreach ( $cache_exclusion_parameters as $param ) {
 			if ( ! empty( $param ) ) {
@@ -108,10 +111,8 @@ public static function addRules( $cacheLevel ) {
 			}
 		}
 		$rules[] = 'RewriteRule .* - [E=Cache-Control:no-cache]';
-
-		// Add the end of the rules about cache exclusion.
-
 		$rules[] = '</IfModule>';
+		// Add the end of the rules about cache exclusion.
 
 		$htaccess = new htaccess( self::MARKER );
 
diff --git a/includes/CacheTypes/File.php b/includes/CacheTypes/File.php
index 59029a1..a7b6cb0 100644
--- a/includes/CacheTypes/File.php
+++ b/includes/CacheTypes/File.php
@@ -15,10 +15,10 @@
 use function NewfoldLabs\WP\Module\Performance\shouldCachePages;
 use function WP_Forge\WP_Htaccess_Manager\removeMarkers;
 
+/**
+ * Page cache class
+ */
 class File extends CacheBase implements Purgeable {
-
-
-
 	/**
 	 * The directory where cached files live.
 	 *
@@ -36,7 +36,7 @@ class File extends CacheBase implements Purgeable {
 	/**
 	 * Whether or not the code for this cache type should be loaded.
 	 *
-	 * @param  Container $container
+	 * @param  Container $container the container.
 	 *
 	 * @return bool
 	 */
@@ -89,11 +89,6 @@ public static function addRules() {
 		$base = wp_parse_url( home_url( '/' ), PHP_URL_PATH );
 		$path = str_replace( get_home_path(), '/', self::CACHE_DIR );
 
-		$exclude_conditions = '';
-		foreach ( $this->exclusions() as $exclude ) {
-			$exclude_conditions .= "RewriteCond %{REQUEST_URI} !^/{$exclude} [NC]\n";
-		}
-
 		$content = <<<HTACCESS
 <IfModule mod_rewrite.c>
 	RewriteEngine On
@@ -103,7 +98,7 @@ public static function addRules() {
 	RewriteCond %{QUERY_STRING} !.*=.*
 	RewriteCond %{HTTP_COOKIE} !(wordpress_test_cookie|comment_author|wp\-postpass|wordpress_logged_in|wptouch_switch_toggle|wp_woocommerce_session_) [NC]
 	RewriteCond %{HTTP:Cache-Control} ^((?!no-cache).)*$
-	{$exclude_conditions}RewriteCond %{DOCUMENT_ROOT}{$path}/$1/_index.html -f
+	RewriteCond %{DOCUMENT_ROOT}{$path}/$1/_index.html -f
 	RewriteRule ^(.*)\$ {$path}/$1/_index.html [L]
 </IfModule>
 HTACCESS;
@@ -261,7 +256,7 @@ public function shouldCache() {
 	 * @return array
 	 */
 	protected function exclusions() {
-		$default                = array( 'cart', 'checkout', 'wp-admin', '@', '%', ':', ';', '&', '=', '.', rest_get_url_prefix();
+		$default                = array( 'cart', 'checkout', 'wp-admin', '@', '%', ':', ';', '&', '=', '.', rest_get_url_prefix() );
 		$cache_exclusion_option = array_map( 'trim', explode( ',', get_option( CacheExclusionController::OPTION_CACHE_EXCLUSION ) ) );
 		return array_merge( $default, $cache_exclusion_option );
 	}
@@ -292,7 +287,7 @@ public function purgeAll() {
 	/**
 	 * Purge a specific URL from the cache.
 	 *
-	 * @param  string $url
+	 * @param string $url the url to purge.
 	 */
 	public function purgeUrl( $url ) {
 		$path = $this->getStoragePathForRequest();

From 0cd4452251d55358c5807794906f3c03313c3c04 Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Tue, 12 Nov 2024 15:28:50 +0000
Subject: [PATCH 15/42] smaller textarea field

---
 components/cacheExclusion/index.js | 1 +
 includes/CacheTypes/Browser.php    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/cacheExclusion/index.js b/components/cacheExclusion/index.js
index 31bded6..8526d6b 100644
--- a/components/cacheExclusion/index.js
+++ b/components/cacheExclusion/index.js
@@ -55,6 +55,7 @@ const CacheExclusion = ({ methods, constants }) => {
                 name="cache-xxclusion"
                 onChange={ handleCacheExclusionChange }
                 value={currentValue}
+				rows="1"
             />
 			{isEdited && 
 				<Button
diff --git a/includes/CacheTypes/Browser.php b/includes/CacheTypes/Browser.php
index b6780e1..26e2b64 100644
--- a/includes/CacheTypes/Browser.php
+++ b/includes/CacheTypes/Browser.php
@@ -91,11 +91,11 @@ public static function addRules( $cacheLevel ) {
 		$rules[] = '<IfModule mod_expires.c>';
 		$rules[] = "{$tab}ExpiresActive On";
 
-		foreach ( $fileTypeExpirations as $fileType => $expiration ) {
-			if ( 'default' === $fileType ) {
+		foreach ( $fileTypeExpirations as $file_type => $expiration ) {
+			if ( 'default' === $file_type ) {
 				$rules[] = "{$tab}ExpiresDefault \"access plus {$expiration}\"";
 			} else {
-				$rules[] = "{$tab}ExpiresByType {$fileType} \"access plus {$expiration}\"";
+				$rules[] = "{$tab}ExpiresByType {$file_type} \"access plus {$expiration}\"";
 			}
 		}
 		$rules[] = '</IfModule>';

From 278168a49a00383d9b252df887f03609359030ff Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Thu, 14 Nov 2024 12:36:33 +0000
Subject: [PATCH 16/42] phpcs fixes

---
 includes/Performance.php | 124 +++++++++++++++++----------------------
 1 file changed, 53 insertions(+), 71 deletions(-)

diff --git a/includes/Performance.php b/includes/Performance.php
index 3fcdca8..e9cbabc 100644
--- a/includes/Performance.php
+++ b/includes/Performance.php
@@ -10,8 +10,7 @@
 /**
  * Performance Class
  */
-class Performance
-{
+class Performance {
 
 	/**
 	 * The option name where the cache level is stored.
@@ -64,25 +63,24 @@ class Performance
 	 *
 	 * @param Container $container the container
 	 */
-	public function __construct(Container $container)
-	{
+	public function __construct( Container $container ) {
 
 		$this->container = $container;
-		$this->configureContainer($container);
+		$this->configureContainer( $container );
 
-		$this->hooks($container);
+		$this->hooks( $container );
 
-		$cacheManager = new CacheManager($container);
-		$cachePurger  = new CachePurgingService($cacheManager->getInstances());
+		$cacheManager = new CacheManager( $container );
+		$cachePurger  = new CachePurgingService( $cacheManager->getInstances() );
 
 		// Ensure that purgeable cache types are enabled before showing the UI.
-		if ($cachePurger->canPurge()) {
-			add_action('admin_bar_menu', array($this, 'adminBarMenu'), 100);
+		if ( $cachePurger->canPurge() ) {
+			add_action( 'admin_bar_menu', array( $this, 'adminBarMenu' ), 100 );
 		}
 
-		$container->set('cachePurger', $cachePurger);
+		$container->set( 'cachePurger', $cachePurger );
 
-		$container->set('hasMustUsePlugin', file_exists(WPMU_PLUGIN_DIR . '/endurance-page-cache.php'));
+		$container->set( 'hasMustUsePlugin', file_exists( WPMU_PLUGIN_DIR . '/endurance-page-cache.php' ) );
 	}
 
 	/**
@@ -90,12 +88,11 @@ public function __construct(Container $container)
 	 *
 	 * @param Container $container the container
 	 */
-	public function configureContainer(Container $container)
-	{
+	public function configureContainer( Container $container ) {
 
 		global $is_apache;
 
-		$container->set('isApache', $is_apache);
+		$container->set( 'isApache', $is_apache );
 
 		$container->set(
 			'responseHeaderManager',
@@ -109,32 +106,29 @@ function () {
 
 	/**
 	 * Add hooks.
-	 *
-	 * @param Container $container the container
 	 */
-	public function hooks(Container $container)
-	{
+	public function hooks() {
 
-		add_action('admin_init', array($this, 'registerSettings'), 11);
+		add_action( 'admin_init', array( $this, 'registerSettings' ), 11 );
 
-		new OptionListener(self::OPTION_CACHE_LEVEL, array($this, 'onCacheLevelChange'));
+		new OptionListener( self::OPTION_CACHE_LEVEL, array( $this, 'onCacheLevelChange' ) );
 
 		/**
 		 * On CLI requests, mod_rewrite is unavailable, so it fails to update
 		 * the .htaccess file when save_mod_rewrite_rules() is called. This
 		 * forces that to be true so updates from WP CLI work.
 		 */
-		if (defined('WP_CLI') && WP_CLI) {
-			add_filter('got_rewrite', '__return_true');
+		if ( defined( 'WP_CLI' ) && WP_CLI ) {
+			add_filter( 'got_rewrite', '__return_true' );
 		}
 
 		add_filter(
 			'mod_rewrite_rules',
-			function ($content) {
+			function ( $content ) {
 				add_action(
 					'shutdown',
 					function () {
-						do_action('newfold_update_htaccess');
+						do_action( 'newfold_update_htaccess' );
 					}
 				);
 
@@ -142,9 +136,9 @@ function () {
 			}
 		);
 
-		add_action('after_mod_rewrite_rules', array($this, 'onRewrite'));
-		add_filter('action_scheduler_retention_period', array($this, 'nfd_asr_default'));
-		add_filter('action_scheduler_cleanup_batch_size', array($this, 'nfd_as_cleanup_batch_size'));
+		add_action( 'after_mod_rewrite_rules', array( $this, 'onRewrite' ) );
+		add_filter( 'action_scheduler_retention_period', array( $this, 'nfd_asr_default' ) );
+		add_filter( 'action_scheduler_cleanup_batch_size', array( $this, 'nfd_as_cleanup_batch_size' ) );
 	}
 
 	/**
@@ -154,13 +148,10 @@ function () {
 	 * @hooked action_scheduler_retention_period
 	 * @see ActionScheduler_QueueCleaner::delete_old_actions()
 	 *
-	 * @param int $retention_period Minimum scheduled age in seconds of the actions to be deleted.
-	 *
 	 * @return int New retention period in seconds.
 	 */
-	public function nfd_asr_default($retention_period)
-	{
-		return 5 * constant('DAY_IN_SECONDS');
+	public function nfd_asr_default() {
+		return 5 * constant( 'DAY_IN_SECONDS' );
 	}
 
 	/**
@@ -173,14 +164,13 @@ public function nfd_asr_default($retention_period)
 	 *
 	 * @return int 1000 when running the cleanup process, otherwise the existing batch size.
 	 */
-	public function nfd_as_cleanup_batch_size($batch_size)
-	{
+	public function nfd_as_cleanup_batch_size( $batch_size ) {
 		/**
 		 * Apply only to {@see ActionScheduler_QueueCleaner::delete_old_actions()} and not to
 		 * {@see ActionScheduler_QueueCleaner::reset_timeouts()} or
 		 * {@see ActionScheduler_QueueCleaner::mark_failures()} batch sizes.
 		 */
-		if (! did_filter('action_scheduler_retention_period')) {
+		if ( ! did_filter( 'action_scheduler_retention_period' ) ) {
 			return $batch_size;
 		}
 
@@ -190,9 +180,8 @@ public function nfd_as_cleanup_batch_size($batch_size)
 	/**
 	 * When updating mod rewrite rules, also update our rewrites as appropriate.
 	 */
-	public function onRewrite()
-	{
-		$this->onCacheLevelChange(getCacheLevel());
+	public function onRewrite() {
+		$this->onCacheLevelChange( getCacheLevel() );
 	}
 
 	/**
@@ -200,32 +189,26 @@ public function onRewrite()
 	 *
 	 * @param int|null $cacheLevel The cache level.
 	 */
-	public function onCacheLevelChange($cacheLevel)
-	{
+	public function onCacheLevelChange( $cacheLevel ) {
 		/**
 		 * Respone Header Manager from container
 		 *
 		 * @var ResponseHeaderManager $responseHeaderManager
 		 */
-		$responseHeaderManager = $this->container->get('responseHeaderManager');
-		$responseHeaderManager->addHeader('X-Newfold-Cache-Level', absint($cacheLevel));
-
-		Browser::maybeAddRules($cacheLevel);
-		File::maybeAddRules($cacheLevel);
-		Skip404::maybeAddRules($cacheLevel);
+		$responseHeaderManager = $this->container->get( 'responseHeaderManager' );
+		$responseHeaderManager->addHeader( 'X-Newfold-Cache-Level', absint( $cacheLevel ) );
 
 		// Remove the old option from EPC, if it exists
-		if ($this->container->get('hasMustUsePlugin') && absint(get_option('endurance_cache_level', 0))) {
-			update_option('endurance_cache_level', 0);
-			delete_option('endurance_cache_level');
+		if ( $this->container->get( 'hasMustUsePlugin' ) && absint( get_option( 'endurance_cache_level', 0 ) ) ) {
+			update_option( 'endurance_cache_level', 0 );
+			delete_option( 'endurance_cache_level' );
 		}
 	}
 
 	/**
 	 * Register settings
 	 */
-	public function registerSettings()
-	{
+	public function registerSettings() {
 
 		global $wp_settings_fields;
 
@@ -233,25 +216,25 @@ public function registerSettings()
 
 		add_settings_section(
 			$section_name,
-			'<span id="' . self::SETTINGS_ID . '">' . esc_html__('Caching', 'newfold-performance-module') . '</span>',
+			'<span id="' . self::SETTINGS_ID . '">' . esc_html__( 'Caching', 'newfold-performance-module' ) . '</span>',
 			'__return_false',
 			'general'
 		);
 
 		add_settings_field(
 			self::OPTION_CACHE_LEVEL,
-			__('Cache Level', 'newfold-performance-module'),
+			__( 'Cache Level', 'newfold-performance-module' ),
 			__NAMESPACE__ . '\\getCacheLevelDropdown',
 			'general',
 			$section_name
 		);
 
-		register_setting('general', self::OPTION_CACHE_LEVEL);
+		register_setting( 'general', self::OPTION_CACHE_LEVEL );
 
 		// Remove the setting from EPC if it exists - TODO: Remove when no longer using EPC
-		if ($this->container->get('hasMustUsePlugin')) {
-			unset($wp_settings_fields['general']['epc_settings_section']);
-			unregister_setting('general', 'endurance_cache_level');
+		if ( $this->container->get( 'hasMustUsePlugin' ) ) {
+			unset( $wp_settings_fields['general']['epc_settings_section'] );
+			unregister_setting( 'general', 'endurance_cache_level' );
 		}
 	}
 
@@ -260,39 +243,38 @@ public function registerSettings()
 	 *
 	 * @param \WP_Admin_Bar $wp_admin_bar the admin bar
 	 */
-	public function adminBarMenu(\WP_Admin_Bar $wp_admin_bar)
-	{
+	public function adminBarMenu( \WP_Admin_Bar $wp_admin_bar ) {
 
 		// If the EPC MU plugin exists, remove its cache clearing options.
-		if ($this->container->get('hasMustUsePlugin')) {
-			$wp_admin_bar->remove_node('epc_purge_menu');
+		if ( $this->container->get( 'hasMustUsePlugin' ) ) {
+			$wp_admin_bar->remove_node( 'epc_purge_menu' );
 		}
 
-		if (current_user_can('manage_options')) {
+		if ( current_user_can( 'manage_options' ) ) {
 
 			$wp_admin_bar->add_node(
 				array(
 					'id'    => 'nfd_purge_menu',
-					'title' => __('Caching', 'newfold-module-performance'),
+					'title' => __( 'Caching', 'newfold-module-performance' ),
 				)
 			);
 
 			$wp_admin_bar->add_node(
 				array(
 					'id'     => 'nfd_purge_menu-purge_all',
-					'title'  => __('Purge All', 'newfold-module-performance'),
+					'title'  => __( 'Purge All', 'newfold-module-performance' ),
 					'parent' => 'nfd_purge_menu',
-					'href'   => add_query_arg(array(self::PURGE_ALL => true)),
+					'href'   => add_query_arg( array( self::PURGE_ALL => true ) ),
 				)
 			);
 
-			if (! is_admin()) {
+			if ( ! is_admin() ) {
 				$wp_admin_bar->add_node(
 					array(
 						'id'     => 'nfd_purge_menu-purge_single',
-						'title'  => __('Purge This Page', 'newfold-module-performance'),
+						'title'  => __( 'Purge This Page', 'newfold-module-performance' ),
 						'parent' => 'nfd_purge_menu',
-						'href'   => add_query_arg(array(self::PURGE_URL => true)),
+						'href'   => add_query_arg( array( self::PURGE_URL => true ) ),
 					)
 				);
 			}
@@ -300,9 +282,9 @@ public function adminBarMenu(\WP_Admin_Bar $wp_admin_bar)
 			$wp_admin_bar->add_node(
 				array(
 					'id'     => 'nfd_purge_menu-cache_settings',
-					'title'  => __('Cache Settings', 'newfold-module-performance'),
+					'title'  => __( 'Cache Settings', 'newfold-module-performance' ),
 					'parent' => 'nfd_purge_menu',
-					'href'   => admin_url('options-general.php#' . Performance::SETTINGS_ID),
+					'href'   => admin_url( 'options-general.php#' . Performance::SETTINGS_ID ),
 				)
 			);
 		}

From a58907c71b6aac19af33306c27d3feea4cdad1d8 Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Thu, 14 Nov 2024 12:46:58 +0000
Subject: [PATCH 17/42] minor js fix

---
 components/cacheExclusion/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/cacheExclusion/index.js b/components/cacheExclusion/index.js
index 8526d6b..43868a3 100644
--- a/components/cacheExclusion/index.js
+++ b/components/cacheExclusion/index.js
@@ -9,7 +9,7 @@ const CacheExclusion = ({ methods, constants }) => {
 	const apiUrl = methods.NewfoldRuntime.createApiUrl("/newfold-ecommerce/v1/cacheexclusion/update");
 
     const handleCacheExclusionChange = (e) => {
-        if( e.target.value !== cacheExclusion  ) {
+        if( e.target.value !== currentValue  ) {
             setIsEdited(true);            
         }else{
             setIsEdited(false);
@@ -25,6 +25,7 @@ const CacheExclusion = ({ methods, constants }) => {
 		}).then((result)=>{
 			  setIsSaved(true);
               setCacheExclusion(currentValue);
+			  setIsEdited(false)
 		}).catch((error) => {     
 			setIsError(error.message);
 		});

From 1321adf31facebb056bb8e6f6671e7136f3902fa Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessiotorrisidev@gmail.com>
Date: Fri, 15 Nov 2024 15:26:42 +0100
Subject: [PATCH 18/42] New: option Skip 404 in Performance section

---
 components/cacheSettings/index.js     | 106 ++++++++++++++++++--------
 components/performance/defaultText.js |   4 +
 2 files changed, 80 insertions(+), 30 deletions(-)

diff --git a/components/cacheSettings/index.js b/components/cacheSettings/index.js
index 05a0553..2be0778 100644
--- a/components/cacheSettings/index.js
+++ b/components/cacheSettings/index.js
@@ -1,7 +1,8 @@
-import { Container, RadioGroup } from "@newfold/ui-component-library";
+import { Checkbox, Container, RadioGroup } from "@newfold/ui-component-library";
 
 const CacheSettings = ({ methods, constants, Components }) => {
     const [ cacheLevel, setCacheLevel ] = methods.useState(constants.store.cacheLevel);
+    const [ skip404, setSkip404 ] = methods.useState(constants.store.skip404);
 
     const cacheOptions = [
         {
@@ -38,6 +39,11 @@ const CacheSettings = ({ methods, constants, Components }) => {
         return cacheOptions[cacheLevel].notice;
     };
 
+
+    const getSkip404NoticeTitle = () => {
+        return constants.text.skip404NoticeTitle;
+    };
+
     const handleCacheLevelChange = (e) => {
         methods.newfoldSettingsApiFetch(
             { cacheLevel: parseInt(e.target.value) }, 
@@ -47,6 +53,15 @@ const CacheSettings = ({ methods, constants, Components }) => {
         );
     };
 
+    const handleSkip404Change = (e) => {
+        methods.newfoldSettingsApiFetch(
+            { skip404: ! skip404 }, 
+            methods.setError, (response) => {
+                setSkip404( ! skip404 );
+            }
+        );
+    };
+
     methods.useUpdateEffect(() => {
         methods.setStore({
             ...constants.store,
@@ -62,36 +77,67 @@ const CacheSettings = ({ methods, constants, Components }) => {
         );
     }, [cacheLevel]);
 
+
+    methods.useUpdateEffect(() => {
+        methods.setStore({
+            ...constants.store,
+            skip404,
+        });
+
+        methods.makeNotice(
+            "skip-404-change-notice", 
+            getSkip404NoticeTitle(),
+            '',
+            "success",
+            5000
+        );
+    }, [skip404]);
+
     return (
-        <Container.SettingsField
-            title={constants.text.cacheLevelTitle}
-            description={constants.text.cacheLevelDescription}
-        >
-        <RadioGroup
-            className="cache-options"
-            id="cache-type"
-            name="cache-level"
-            value=""
-        >
-            {cacheOptions.map((option) => {
-                return (
-                    <Components.Fragment key={option.value}>
-                        <RadioGroup.Radio
-                            defaultChecked={option.value === constants.store.cacheLevel}
-                            id={'cache-level-' + option.value}
-                            label={option.label}
-                            value={option.value}
-                            name="cache-level"
-                            onChange={handleCacheLevelChange}
-                        />
-                        <div className="nfd-radio__description">
-                            {option.description}
-                        </div>
-                    </Components.Fragment>
-                );
-            })}
-        </RadioGroup>
-        </Container.SettingsField>
+        <>
+            <Container.SettingsField
+                title={constants.text.cacheLevelTitle}
+                description={constants.text.cacheLevelDescription}
+            >
+                <RadioGroup
+                    className="cache-options"
+                    id="cache-type"
+                    name="cache-level"
+                    value=""
+                >
+                    {cacheOptions.map((option) => {
+                        return (
+                            <Components.Fragment key={option.value}>
+                                <RadioGroup.Radio
+                                    defaultChecked={option.value === constants.store.cacheLevel}
+                                    id={'cache-level-' + option.value}
+                                    label={option.label}
+                                    value={option.value}
+                                    name="cache-level"
+                                    onChange={handleCacheLevelChange}
+                                />
+                                <div className="nfd-radio__description">
+                                    {option.description}
+                                </div>
+                            </Components.Fragment>
+                        );
+                    })}
+                </RadioGroup>
+            </Container.SettingsField>
+            <Container.SettingsField
+                title={constants.text.skip404Title}
+            >
+                <Checkbox
+                    id="skip-404"
+                    name="skip-404"
+                    onChange={handleSkip404Change}
+                    value={skip404}
+                    checked={skip404}
+                    label={__("Skip 404 Handling For Static Files", "wp-module-performance")}
+                />
+            </Container.SettingsField>
+        </>
+        
     );
 }
 
diff --git a/components/performance/defaultText.js b/components/performance/defaultText.js
index 2603b96..443b0a2 100644
--- a/components/performance/defaultText.js
+++ b/components/performance/defaultText.js
@@ -22,6 +22,10 @@ const defaultText = {
     clearCacheDescription: __('We automatically clear your cache as you work (creating content, changing settings, installing plugins and more). But you can manually clear it here to be confident it is fresh.', 'wp-module-performance'),
     clearCacheNoticeTitle: __('Cache cleared', 'wp-module-performance'),
     clearCacheTitle: __('Clear Cache', 'wp-module-performance'),
+    skip404Title: __( 'Skip 404', 'wp-module-performance' ),
+    skip404Description: __( 'Skip WordPress 404 Handling For Static Files', 'wp-module-performance' ),
+    skip404NoticeTitle: __('Skip 404 saved', 'wp-module-performance'),
+    skip404Notice: __('Skip 404 saved', 'wp-module-performance'),
 };
 
 export default defaultText;
\ No newline at end of file

From 9baa46beaf1cccbec986b5434b453c14dddd624a Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessiotorrisidev@gmail.com>
Date: Wed, 20 Nov 2024 13:10:28 +0100
Subject: [PATCH 19/42] Added API to handle change option

---
 components/cacheSettings/index.js       | 290 +++++++++++++-----------
 components/performance/index.js         |  83 +++----
 includes/Performance.php                |  24 +-
 includes/Permissions.php                |  52 +++++
 includes/RestApi/RestApi.php            |  39 ++++
 includes/RestApi/SettingsController.php | 117 ++++++++++
 package.json                            |   3 +-
 7 files changed, 435 insertions(+), 173 deletions(-)
 create mode 100644 includes/Permissions.php
 create mode 100644 includes/RestApi/RestApi.php
 create mode 100644 includes/RestApi/SettingsController.php

diff --git a/components/cacheSettings/index.js b/components/cacheSettings/index.js
index 2be0778..f77812d 100644
--- a/components/cacheSettings/index.js
+++ b/components/cacheSettings/index.js
@@ -1,144 +1,174 @@
-import { Checkbox, Container, RadioGroup } from "@newfold/ui-component-library";
+// WordPress
+import apiFetch from '@wordpress/api-fetch';
 
-const CacheSettings = ({ methods, constants, Components }) => {
-    const [ cacheLevel, setCacheLevel ] = methods.useState(constants.store.cacheLevel);
-    const [ skip404, setSkip404 ] = methods.useState(constants.store.skip404);
+// Newfold
+import { Checkbox, Container, RadioGroup } from '@newfold/ui-component-library';
+import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime';
 
-    const cacheOptions = [
-        {
-            label: constants.text.cacheLevel0Label,
-            description: constants.text.cacheLevel0Description + constants.text.cacheLevel0Recommendation,
-            value: 0,
-            notice: constants.text.cacheLevel0NoticeText,
-        },
-        {
-            label: constants.text.cacheLevel1Label,
-            description: constants.text.cacheLevel1Description + constants.text.cacheLevel1Recommendation,
-            value: 1,
-            notice: constants.text.cacheLevel1NoticeText,
-        },
-        {
-            label: constants.text.cacheLevel2Label,
-            description: constants.text.cacheLevel2Description + constants.text.cacheLevel2Recommendation,
-            value: 2,
-            notice: constants.text.cacheLevel2NoticeText,
-        },
-        {
-            label: constants.text.cacheLevel3Label,
-            description: constants.text.cacheLevel3Description + constants.text.cacheLevel3Recommendation,
-            value: 3,
-            notice: constants.text.cacheLevel3NoticeText,
-        },
-    ];
+const CacheSettings = ( { methods, constants, Components } ) => {
+	const [ cacheLevel, setCacheLevel ] = methods.useState(
+		constants.store.cacheLevel
+	);
+	const [ skip404, setSkip404 ] = methods.useState(
+		NewfoldRuntime.sdk.skip404
+	);
 
-    const getCacheLevelNoticeTitle = () => {
-        return constants.text.cacheLevelNoticeTitle;
-    };
+	const cacheOptions = [
+		{
+			label: constants.text.cacheLevel0Label,
+			description:
+				constants.text.cacheLevel0Description +
+				constants.text.cacheLevel0Recommendation,
+			value: 0,
+			notice: constants.text.cacheLevel0NoticeText,
+		},
+		{
+			label: constants.text.cacheLevel1Label,
+			description:
+				constants.text.cacheLevel1Description +
+				constants.text.cacheLevel1Recommendation,
+			value: 1,
+			notice: constants.text.cacheLevel1NoticeText,
+		},
+		{
+			label: constants.text.cacheLevel2Label,
+			description:
+				constants.text.cacheLevel2Description +
+				constants.text.cacheLevel2Recommendation,
+			value: 2,
+			notice: constants.text.cacheLevel2NoticeText,
+		},
+		{
+			label: constants.text.cacheLevel3Label,
+			description:
+				constants.text.cacheLevel3Description +
+				constants.text.cacheLevel3Recommendation,
+			value: 3,
+			notice: constants.text.cacheLevel3NoticeText,
+		},
+	];
 
-    const getCacheLevelNoticeText = () => {
-        return cacheOptions[cacheLevel].notice;
-    };
+	const getCacheLevelNoticeTitle = () => {
+		return constants.text.cacheLevelNoticeTitle;
+	};
 
+	const getCacheLevelNoticeText = () => {
+		return cacheOptions[ cacheLevel ].notice;
+	};
 
-    const getSkip404NoticeTitle = () => {
-        return constants.text.skip404NoticeTitle;
-    };
+	const getSkip404NoticeTitle = () => {
+		return constants.text.skip404NoticeTitle;
+	};
 
-    const handleCacheLevelChange = (e) => {
-        methods.newfoldSettingsApiFetch(
-            { cacheLevel: parseInt(e.target.value) }, 
-            methods.setError, (response) => {
-                setCacheLevel(parseInt(e.target.value));
-            }
-        );
-    };
+	const handleCacheLevelChange = ( e ) => {
+		methods.newfoldSettingsApiFetch(
+			{ cacheLevel: parseInt( e.target.value ) },
+			methods.setError,
+			() => {
+				setCacheLevel( parseInt( e.target.value ) );
+			}
+		);
+	};
 
-    const handleSkip404Change = (e) => {
-        methods.newfoldSettingsApiFetch(
-            { skip404: ! skip404 }, 
-            methods.setError, (response) => {
-                setSkip404( ! skip404 );
-            }
-        );
-    };
+	const handleSkip404Change = () => {
+		const value = ! skip404;
 
-    methods.useUpdateEffect(() => {
-        methods.setStore({
-            ...constants.store,
-            cacheLevel,
-        });
+		apiFetch( {
+			path: 'newfold-performance/v1/settings',
+			method: 'POST',
+			data: {
+				field: {
+					id: 'skip404',
+					value,
+				},
+			},
+		} )
+			.then( () => {
+				setSkip404( value );
 
-        methods.makeNotice(
-            "cache-level-change-notice", 
-            getCacheLevelNoticeTitle(),
-            getCacheLevelNoticeText(),
-            "success",
-            5000
-        );
-    }, [cacheLevel]);
+				methods.makeNotice(
+					'skip-404-change-notice',
+					getSkip404NoticeTitle(),
+					'',
+					'success',
+					5000
+				);
+			} )
+			.catch( () => {
+				methods.makeNotice(
+					'skip-404-change-notice',
+					constants.text.optionNotSet,
+					'',
+					'error',
+					5000
+				);
+			} );
+	};
 
+	methods.useUpdateEffect( () => {
+		methods.setStore( {
+			...constants.store,
+			cacheLevel,
+		} );
 
-    methods.useUpdateEffect(() => {
-        methods.setStore({
-            ...constants.store,
-            skip404,
-        });
+		methods.makeNotice(
+			'cache-level-change-notice',
+			getCacheLevelNoticeTitle(),
+			getCacheLevelNoticeText(),
+			'success',
+			5000
+		);
+	}, [ cacheLevel ] );
 
-        methods.makeNotice(
-            "skip-404-change-notice", 
-            getSkip404NoticeTitle(),
-            '',
-            "success",
-            5000
-        );
-    }, [skip404]);
+	return (
+		<>
+			<Container.SettingsField
+				title={ constants.text.cacheLevelTitle }
+				description={ constants.text.cacheLevelDescription }
+			>
+				<RadioGroup
+					className="cache-options"
+					id="cache-type"
+					name="cache-level"
+					value=""
+				>
+					{ cacheOptions.map( ( option ) => {
+						return (
+							<Components.Fragment key={ option.value }>
+								<RadioGroup.Radio
+									defaultChecked={
+										option.value ===
+										constants.store.cacheLevel
+									}
+									id={ 'cache-level-' + option.value }
+									label={ option.label }
+									value={ option.value }
+									name="cache-level"
+									onChange={ handleCacheLevelChange }
+								/>
+								<div className="nfd-radio__description">
+									{ option.description }
+								</div>
+							</Components.Fragment>
+						);
+					} ) }
+				</RadioGroup>
+			</Container.SettingsField>
+			<Container.SettingsField title={ constants.text.skip404Title }>
+				<Checkbox
+					id="skip-404"
+					name="skip-404"
+					onChange={ handleSkip404Change }
+					value={ skip404 }
+					checked={ skip404 }
+					label={ __(
+						'Skip 404 Handling For Static Files',
+						'wp-module-performance'
+					) }
+				/>
+			</Container.SettingsField>
+		</>
+	);
+};
 
-    return (
-        <>
-            <Container.SettingsField
-                title={constants.text.cacheLevelTitle}
-                description={constants.text.cacheLevelDescription}
-            >
-                <RadioGroup
-                    className="cache-options"
-                    id="cache-type"
-                    name="cache-level"
-                    value=""
-                >
-                    {cacheOptions.map((option) => {
-                        return (
-                            <Components.Fragment key={option.value}>
-                                <RadioGroup.Radio
-                                    defaultChecked={option.value === constants.store.cacheLevel}
-                                    id={'cache-level-' + option.value}
-                                    label={option.label}
-                                    value={option.value}
-                                    name="cache-level"
-                                    onChange={handleCacheLevelChange}
-                                />
-                                <div className="nfd-radio__description">
-                                    {option.description}
-                                </div>
-                            </Components.Fragment>
-                        );
-                    })}
-                </RadioGroup>
-            </Container.SettingsField>
-            <Container.SettingsField
-                title={constants.text.skip404Title}
-            >
-                <Checkbox
-                    id="skip-404"
-                    name="skip-404"
-                    onChange={handleSkip404Change}
-                    value={skip404}
-                    checked={skip404}
-                    label={__("Skip 404 Handling For Static Files", "wp-module-performance")}
-                />
-            </Container.SettingsField>
-        </>
-        
-    );
-}
-
-export default CacheSettings;
\ No newline at end of file
+export default CacheSettings;
diff --git a/components/performance/index.js b/components/performance/index.js
index e6d7483..0070001 100644
--- a/components/performance/index.js
+++ b/components/performance/index.js
@@ -6,54 +6,55 @@ import { default as defaultText } from './defaultText';
 /**
  * Performance Module
  * For use in brand plugin apps to display performance page and settings
- * 
- * @param {*} props 
- * @returns 
+ *
+ * @param {*} props
+ * @return
  */
-const Performance = ({methods, constants, Components, ...props}) => {
-    const { store, setStore } = methods.useContext(methods.AppStore);
-    const [ isError, setError ] = methods.useState(false);
+const Performance = ( { methods, constants, Components, ...props } ) => {
+	const { store, setStore } = methods.useContext( methods.AppStore );
+	const [ isError, setError ] = methods.useState( false );
 
-	let notify = methods.useNotification();
+	const notify = methods.useNotification();
 
 	// set default text if not provided
-	constants.text = Object.assign(defaultText, constants.text);
+	constants.text = Object.assign( defaultText, constants.text );
 
-    const makeNotice = (id, title, description, variant="success", duration=false) => {
-        notify.push(`performance-notice-${id}`, {
-            title,
-            description: (
-                <span>
-                    {description}
-                </span>
-            ),
-            variant,
-            autoDismiss: duration,
-        });
-    };
-    constants.store = store;
-    methods.makeNotice = makeNotice;
-    methods.setStore = setStore;
-    methods.setError = setError;
+	const makeNotice = (
+		id,
+		title,
+		description,
+		variant = 'success',
+		duration = false
+	) => {
+		notify.push( `performance-notice-${ id }`, {
+			title,
+			description: <span>{ description }</span>,
+			variant,
+			autoDismiss: duration,
+		} );
+	};
+	constants.store = store;
+	methods.makeNotice = makeNotice;
+	methods.setStore = setStore;
+	methods.setError = setError;
 
 	return (
-        <>
-            <Container.Block separator={true} className={'newfold-cache-settings'}>
-                <CacheSettings
-                    methods={methods}
-                    constants={constants}
-                    Components={Components}
-                />
-            </Container.Block>
-            <Container.Block className={'newfold-clear-cache'}>
-                <ClearCache
-                    methods={methods}
-                    constants={constants}
-                />
-            </Container.Block>
-        </>
+		<>
+			<Container.Block
+				separator={ true }
+				className={ 'newfold-cache-settings' }
+			>
+				<CacheSettings
+					methods={ methods }
+					constants={ constants }
+					Components={ Components }
+				/>
+			</Container.Block>
+			<Container.Block className={ 'newfold-clear-cache' }>
+				<ClearCache methods={ methods } constants={ constants } />
+			</Container.Block>
+		</>
 	);
-
 };
 
-export default Performance;
\ No newline at end of file
+export default Performance;
diff --git a/includes/Performance.php b/includes/Performance.php
index ac50c2f..5492c1f 100644
--- a/includes/Performance.php
+++ b/includes/Performance.php
@@ -2,9 +2,11 @@
 
 namespace NewfoldLabs\WP\Module\Performance;
 
+use NewfoldLabs\WP\Module\Performance\RestApi\RestApi;
 use NewfoldLabs\WP\Module\Performance\CacheTypes\Browser;
 use NewfoldLabs\WP\Module\Performance\CacheTypes\File;
 use NewfoldLabs\WP\Module\Performance\CacheTypes\Skip404;
+use NewfoldLabs\WP\Module\Performance\Permissions;
 use NewfoldLabs\WP\ModuleLoader\Container;
 
 /**
@@ -80,6 +82,12 @@ public function __construct( Container $container ) {
 		$container->set( 'cachePurger', $cachePurger );
 
 		$container->set( 'hasMustUsePlugin', file_exists( WPMU_PLUGIN_DIR . '/endurance-page-cache.php' ) );
+
+		if ( Permissions::is_authorized_admin() || Permissions::rest_is_authorized_admin() ) {
+			new RestAPI();
+		}
+
+		add_filter( 'newfold-runtime', array( $this, 'add_to_runtime' ), 10 );
 	}
 
 	/**
@@ -287,9 +295,23 @@ public function adminBarMenu( \WP_Admin_Bar $wp_admin_bar ) {
 					'id'     => 'nfd_purge_menu-cache_settings',
 					'title'  => __( 'Cache Settings', 'newfold-module-performance' ),
 					'parent' => 'nfd_purge_menu',
-					'href'   => admin_url( 'options-general.php#' . Performance::SETTINGS_ID ),
+					'href'   => admin_url( 'options-general.php#' . self::SETTINGS_ID ),
 				)
 			);
 		}
 	}
+
+
+	/**
+	 * Add to Newfold SDK runtime.
+	 *
+	 * @param array $sdk SDK data.
+	 * @return array SDK data.
+	 */
+	public function add_to_runtime( $sdk ) {
+		$values = array(
+			'skip404' => (bool) get_option( 'newfold_skip_404_handling', false ),
+		);
+		return array_merge( $sdk, array( 'performance' => $values ) );
+	}
 }
diff --git a/includes/Permissions.php b/includes/Permissions.php
new file mode 100644
index 0000000..1b5bf86
--- /dev/null
+++ b/includes/Permissions.php
@@ -0,0 +1,52 @@
+<?php
+namespace NewfoldLabs\WP\Module\Performance;
+
+/**
+ * Permissions and Authorization constants and utilities.
+ */
+final class Permissions {
+	/**
+	 * WordPress Admin capability string
+	 */
+	const ADMIN          = 'manage_options';
+	const INSTALL_THEMES = 'install_themes';
+	const EDIT_THEMES    = 'edit_themes';
+
+	/**
+	 * Confirm REST API caller has ADMIN user capabilities.
+	 *
+	 * @return boolean
+	 */
+	public static function rest_is_authorized_admin() {
+		return \is_user_logged_in() && \current_user_can( self::ADMIN );
+	}
+
+	/**
+	 * Confirm logged-in user is in wp-admin and has ADMIN user capabilities.
+	 *
+	 * @return boolean
+	 */
+	public static function is_authorized_admin() {
+		return \is_admin() && self::rest_is_authorized_admin();
+	}
+
+	/**
+	 * Confirm logged-in user can manage themes.
+	 *
+	 * @return boolean
+	 */
+	public static function rest_can_manage_themes() {
+		return \is_user_logged_in() &&
+			\current_user_can( self::INSTALL_THEMES ) &&
+			\current_user_can( self::EDIT_THEMES );
+	}
+
+	/**
+	 * Confirm whether user has ADMIN user and edit_post capabilities for creating pages.
+	 *
+	 * @return boolean
+	 */
+	public static function custom_post_authorized_admin() {
+		return \current_user_can( 'edit_posts' ) && \current_user_can( self::ADMIN );
+	}
+}
diff --git a/includes/RestApi/RestApi.php b/includes/RestApi/RestApi.php
new file mode 100644
index 0000000..b9ca6f4
--- /dev/null
+++ b/includes/RestApi/RestApi.php
@@ -0,0 +1,39 @@
+<?php
+namespace NewfoldLabs\WP\Module\Performance\RestApi;
+
+/**
+ * Instantiate controllers and register routes.
+ */
+final class RestApi {
+
+	/**
+	 * List of custom REST API controllers
+	 *
+	 * @var array
+	 */
+	protected $controllers = array(
+		'NewfoldLabs\\WP\\Module\\Performance\\RestApi\\SettingsController',
+	);
+
+	/**
+	 * Setup the custom REST API
+	 */
+	public function __construct() {
+		add_action( 'rest_api_init', array( $this, 'register_routes' ) );
+	}
+
+	/**
+	 * Register the custom REST API routes
+	 */
+	public function register_routes() {
+		foreach ( $this->controllers as $controller ) {
+			/**
+			 * Get an instance of the WP_REST_Controller.
+			 *
+			 * @var $instance WP_REST_Controller
+			 */
+			$instance = new $controller();
+			$instance->register_routes();
+		}
+	}
+}
diff --git a/includes/RestApi/SettingsController.php b/includes/RestApi/SettingsController.php
new file mode 100644
index 0000000..8d25082
--- /dev/null
+++ b/includes/RestApi/SettingsController.php
@@ -0,0 +1,117 @@
+<?php
+namespace NewfoldLabs\WP\Module\Performance\RestApi;
+
+/**
+ * Class Settings
+ *
+ * @package NewfoldLabs\WP\Module\Performance
+ */
+class SettingsController {
+
+	/**
+	 * The REST route namespace.
+	 *
+	 * @var string
+	 */
+	protected $namespace = 'newfold-performance/v1';
+
+	/**
+	 * The REST route base.
+	 *
+	 * @var string
+	 */
+	protected $rest_base = '/settings';
+
+	/**
+	 * Register API routes.
+	 *
+	 * @return void
+	 */
+	public function register_routes() {
+		register_rest_route(
+			$this->namespace,
+			$this->rest_base,
+			array(
+				array(
+					'methods'             => \WP_REST_Server::CREATABLE,
+					'callback'            => array( $this, 'set_options' ),
+					'permission_callback' => function () {
+						return current_user_can( 'manage_options' );
+					},
+				),
+			)
+		);
+	}
+
+	/**
+	 * Set Jetpack options.
+	 *
+	 * @param WP_REST_Request $request The request object.
+	 * @return WP_REST_Response
+	 */
+	public function set_options( $request ) {
+		try {
+			$params = $request->get_params();
+
+			if ( ! isset( $params['field'] ) || ! is_array( $params['field'] ) ) {
+				return new \WP_REST_Response(
+					array(
+						'success' => false,
+						'error'   => __( "The parameter 'field' is missing or invalid.", 'newfold-performance-module' ),
+					),
+					400
+				);
+			}
+
+			$field = $params['field'];
+
+			if ( ! isset( $field['id'], $field['value'] ) ) {
+				return new \WP_REST_Response(
+					array(
+						'success' => false,
+						'error'   => __( "The fields 'id' and 'value' are required.", 'newfold-performance-module' ),
+					),
+					400
+				);
+			}
+
+			switch ( $field['id'] ) {
+				case 'skip404':
+					$result = update_option( 'newfold_skip_404_handling', $field['value'] );
+					break;
+
+				default:
+					break;
+			}
+
+			if ( false === $result ) {
+				return new \WP_REST_Response(
+					array(
+						'success' => false,
+						'error'   => __( 'An error occurred while updating the option.', 'newfold-performance-module' ),
+					),
+					500
+				);
+			}
+
+			// Success response.
+			return new \WP_REST_Response(
+				array(
+					'success'        => true,
+					'updated_option' => $field['id'],
+					'updated_value'  => $field['value'],
+				),
+				200
+			);
+		} catch ( \Exception $e ) {
+			// Exceptions handling.
+			return new \WP_REST_Response(
+				array(
+					'success' => false,
+					'error'   => __( 'An error occurred while updating the option.', 'newfold-performance-module' ) . $e->getMessage(),
+				),
+				500
+			);
+		}
+	}
+}
diff --git a/package.json b/package.json
index 6388cb6..e57c793 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,8 @@
   ],
   "dependencies": {
     "@heroicons/react": "^2.0.18",
-    "@newfold/ui-component-library": "^1.0.1"
+    "@newfold/ui-component-library": "^1.0.1",
+    "@newfold-labs/wp-module-runtime": "^1.0.12"
   },
   "devDependencies": {
     "@testing-library/cypress": "^9.0.0",

From 1ccc6e9923d703b7e2840f5f8564b5f80ef3a8aa Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessiotorrisidev@gmail.com>
Date: Wed, 20 Nov 2024 15:29:45 +0100
Subject: [PATCH 20/42] Tweak: show "skip404" option in a separated section

---
 components/cacheSettings/index.js       |  61 +-------------
 components/performance/defaultText.js   | 101 +++++++++++++++++-------
 components/performance/index.js         |   8 ++
 components/skip404/index.js             |  71 +++++++++++++++++
 includes/RestApi/SettingsController.php |   2 +-
 5 files changed, 154 insertions(+), 89 deletions(-)
 create mode 100644 components/skip404/index.js

diff --git a/components/cacheSettings/index.js b/components/cacheSettings/index.js
index f77812d..fdc35a0 100644
--- a/components/cacheSettings/index.js
+++ b/components/cacheSettings/index.js
@@ -1,17 +1,10 @@
-// WordPress
-import apiFetch from '@wordpress/api-fetch';
-
 // Newfold
-import { Checkbox, Container, RadioGroup } from '@newfold/ui-component-library';
-import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime';
+import { Container, RadioGroup } from '@newfold/ui-component-library';
 
 const CacheSettings = ( { methods, constants, Components } ) => {
 	const [ cacheLevel, setCacheLevel ] = methods.useState(
 		constants.store.cacheLevel
 	);
-	const [ skip404, setSkip404 ] = methods.useState(
-		NewfoldRuntime.sdk.skip404
-	);
 
 	const cacheOptions = [
 		{
@@ -56,10 +49,6 @@ const CacheSettings = ( { methods, constants, Components } ) => {
 		return cacheOptions[ cacheLevel ].notice;
 	};
 
-	const getSkip404NoticeTitle = () => {
-		return constants.text.skip404NoticeTitle;
-	};
-
 	const handleCacheLevelChange = ( e ) => {
 		methods.newfoldSettingsApiFetch(
 			{ cacheLevel: parseInt( e.target.value ) },
@@ -70,41 +59,6 @@ const CacheSettings = ( { methods, constants, Components } ) => {
 		);
 	};
 
-	const handleSkip404Change = () => {
-		const value = ! skip404;
-
-		apiFetch( {
-			path: 'newfold-performance/v1/settings',
-			method: 'POST',
-			data: {
-				field: {
-					id: 'skip404',
-					value,
-				},
-			},
-		} )
-			.then( () => {
-				setSkip404( value );
-
-				methods.makeNotice(
-					'skip-404-change-notice',
-					getSkip404NoticeTitle(),
-					'',
-					'success',
-					5000
-				);
-			} )
-			.catch( () => {
-				methods.makeNotice(
-					'skip-404-change-notice',
-					constants.text.optionNotSet,
-					'',
-					'error',
-					5000
-				);
-			} );
-	};
-
 	methods.useUpdateEffect( () => {
 		methods.setStore( {
 			...constants.store,
@@ -154,19 +108,6 @@ const CacheSettings = ( { methods, constants, Components } ) => {
 					} ) }
 				</RadioGroup>
 			</Container.SettingsField>
-			<Container.SettingsField title={ constants.text.skip404Title }>
-				<Checkbox
-					id="skip-404"
-					name="skip-404"
-					onChange={ handleSkip404Change }
-					value={ skip404 }
-					checked={ skip404 }
-					label={ __(
-						'Skip 404 Handling For Static Files',
-						'wp-module-performance'
-					) }
-				/>
-			</Container.SettingsField>
 		</>
 	);
 };
diff --git a/components/performance/defaultText.js b/components/performance/defaultText.js
index 443b0a2..6bf5f3d 100644
--- a/components/performance/defaultText.js
+++ b/components/performance/defaultText.js
@@ -1,31 +1,76 @@
 const defaultText = {
-    cacheLevel0Description: __('No cache enabled. Every page load is fresh. ', 'wp-module-performance'),
-    cacheLevel0Label: __('Disabled', 'wp-module-performance'),
-    cacheLevel0NoticeText: __('Caching disabled.', 'wp-module-performance'),
-    cacheLevel0Recommendation: __('Not recommended.', 'wp-module-performance'),
-    cacheLevel1Description: __('Cache static assets like images and the appearance of your site for 1 hour. ', 'wp-module-performance'),
-    cacheLevel1Label: __('Assets Only', 'wp-module-performance'),
-    cacheLevel1NoticeText: __('Cache enabled for assets only.', 'wp-module-performance'),
-    cacheLevel1Recommendation: __('Tuned for online stores and member sites that need to be fresh.', 'wp-module-performance'),
-    cacheLevel2Description: __('Cache static assets for 24 hours and web pages for 2 hours. ', 'wp-module-performance'),
-    cacheLevel2Label: __('Assets & Web Pages', 'wp-module-performance'),
-    cacheLevel2NoticeText: __('Cache enabled for assets and pages.', 'wp-module-performance'),
-    cacheLevel2Recommendation: __('Tuned for sites that change at least weekly.', 'wp-module-performance'),
-    cacheLevel3Description: __('Cache static assets for 1 week and web pages for 8 hours. ', 'wp-module-performance'),
-    cacheLevel3Label: __('Assets & Web Pages - Extended', 'wp-module-performance'),
-    cacheLevel3NoticeText: __('Cache enabled for assets and pages (extended).', 'wp-module-performance'),
-    cacheLevel3Recommendation: __('Tuned for sites that update a few times a month or less.', 'wp-module-performance'),
-    cacheLevelDescription: __('Boost speed and performance by storing a copy of your website content, files, and images online so the pages of your website load faster for your visitors.', 'wp-module-performance'),
-    cacheLevelNoticeTitle: __('Cache setting saved', 'wp-module-performance'),
-    cacheLevelTitle: __('Cache Level', 'wp-module-performance'),
-    clearCacheButton: __('Clear All Cache Now', 'wp-module-performance'),
-    clearCacheDescription: __('We automatically clear your cache as you work (creating content, changing settings, installing plugins and more). But you can manually clear it here to be confident it is fresh.', 'wp-module-performance'),
-    clearCacheNoticeTitle: __('Cache cleared', 'wp-module-performance'),
-    clearCacheTitle: __('Clear Cache', 'wp-module-performance'),
-    skip404Title: __( 'Skip 404', 'wp-module-performance' ),
-    skip404Description: __( 'Skip WordPress 404 Handling For Static Files', 'wp-module-performance' ),
-    skip404NoticeTitle: __('Skip 404 saved', 'wp-module-performance'),
-    skip404Notice: __('Skip 404 saved', 'wp-module-performance'),
+	cacheLevel0Description: __(
+		'No cache enabled. Every page load is fresh.',
+		'wp-module-performance'
+	),
+	cacheLevel0Label: __( 'Disabled', 'wp-module-performance' ),
+	cacheLevel0NoticeText: __( 'Caching disabled.', 'wp-module-performance' ),
+	cacheLevel0Recommendation: __(
+		'Not recommended.',
+		'wp-module-performance'
+	),
+	cacheLevel1Description: __(
+		'Cache static assets like images and the appearance of your site for 1 hour.',
+		'wp-module-performance'
+	),
+	cacheLevel1Label: __( 'Assets Only', 'wp-module-performance' ),
+	cacheLevel1NoticeText: __(
+		'Cache enabled for assets only.',
+		'wp-module-performance'
+	),
+	cacheLevel1Recommendation: __(
+		'Tuned for online stores and member sites that need to be fresh.',
+		'wp-module-performance'
+	),
+	cacheLevel2Description: __(
+		'Cache static assets for 24 hours and web pages for 2 hours.',
+		'wp-module-performance'
+	),
+	cacheLevel2Label: __( 'Assets & Web Pages', 'wp-module-performance' ),
+	cacheLevel2NoticeText: __(
+		'Cache enabled for assets and pages.',
+		'wp-module-performance'
+	),
+	cacheLevel2Recommendation: __(
+		'Tuned for sites that change at least weekly.',
+		'wp-module-performance'
+	),
+	cacheLevel3Description: __(
+		'Cache static assets for 1 week and web pages for 8 hours.',
+		'wp-module-performance'
+	),
+	cacheLevel3Label: __(
+		'Assets & Web Pages - Extended',
+		'wp-module-performance'
+	),
+	cacheLevel3NoticeText: __(
+		'Cache enabled for assets and pages (extended).',
+		'wp-module-performance'
+	),
+	cacheLevel3Recommendation: __(
+		'Tuned for sites that update a few times a month or less.',
+		'wp-module-performance'
+	),
+	cacheLevelDescription: __(
+		'Boost speed and performance by storing a copy of your website content, files, and images online so the pages of your website load faster for your visitors.',
+		'wp-module-performance'
+	),
+	cacheLevelNoticeTitle: __( 'Cache setting saved', 'wp-module-performance' ),
+	cacheLevelTitle: __( 'Cache Level', 'wp-module-performance' ),
+	clearCacheButton: __( 'Clear All Cache Now', 'wp-module-performance' ),
+	clearCacheDescription: __(
+		'We automatically clear your cache as you work (creating content, changing settings, installing plugins and more). But you can manually clear it here to be confident it is fresh.',
+		'wp-module-performance'
+	),
+	clearCacheNoticeTitle: __( 'Cache cleared', 'wp-module-performance' ),
+	clearCacheTitle: __( 'Clear Cache', 'wp-module-performance' ),
+	skip404Title: __( 'Skip 404', 'wp-module-performance' ),
+	skip404Description: __(
+		'When enabled, static resources like images and fonts will use a default server 404 page and not WordPress 404 pages. Pages and posts will continue using WordPress for 404 pages. This can considerably speed up your website if a static resource like an image or font is missing.',
+		'wp-module-performance'
+	),
+	skip404NoticeTitle: __( 'Skip 404 saved', 'wp-module-performance' ),
+	skip404Notice: __( 'Skip 404 saved', 'wp-module-performance' ),
 };
 
-export default defaultText;
\ No newline at end of file
+export default defaultText;
diff --git a/components/performance/index.js b/components/performance/index.js
index 0070001..8460dcf 100644
--- a/components/performance/index.js
+++ b/components/performance/index.js
@@ -1,6 +1,7 @@
 import { Container } from '@newfold/ui-component-library';
 import { default as CacheSettings } from '../cacheSettings/';
 import { default as ClearCache } from '../clearCache/';
+import { default as Skip404 } from '../skip404/';
 import { default as defaultText } from './defaultText';
 
 /**
@@ -50,6 +51,13 @@ const Performance = ( { methods, constants, Components, ...props } ) => {
 					Components={ Components }
 				/>
 			</Container.Block>
+			<Container.Block separator={ true } className={ 'newfold-skip404' }>
+				<Skip404
+					className={ 'newfold-skip404' }
+					methods={ methods }
+					constants={ constants }
+				/>
+			</Container.Block>
 			<Container.Block className={ 'newfold-clear-cache' }>
 				<ClearCache methods={ methods } constants={ constants } />
 			</Container.Block>
diff --git a/components/skip404/index.js b/components/skip404/index.js
new file mode 100644
index 0000000..cefb179
--- /dev/null
+++ b/components/skip404/index.js
@@ -0,0 +1,71 @@
+// WordPress
+import apiFetch from '@wordpress/api-fetch';
+
+// Newfold
+import { Checkbox, Container } from '@newfold/ui-component-library';
+import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime';
+
+const Skip404 = ( { methods, constants } ) => {
+	const [ skip404, setSkip404 ] = methods.useState(
+		NewfoldRuntime.sdk.performance.skip404
+	);
+
+	const getSkip404NoticeTitle = () => {
+		return constants.text.skip404NoticeTitle;
+	};
+
+	const handleSkip404Change = () => {
+		const value = ! skip404;
+		apiFetch( {
+			path: 'newfold-performance/v1/settings',
+			method: 'POST',
+			data: {
+				field: {
+					id: 'skip404',
+					value,
+				},
+			},
+		} )
+			.then( () => {
+				methods.makeNotice(
+					'skip404-change-notice',
+					getSkip404NoticeTitle(),
+					'',
+					'success',
+					5000
+				);
+			} )
+			.catch( () => {
+				methods.makeNotice(
+					'skip404-change-notice',
+					constants.text.optionNotSet,
+					'',
+					'error',
+					5000
+				);
+			} );
+
+		setSkip404( value );
+	};
+
+	return (
+		<Container.SettingsField
+			title={ constants.text.skip404Title }
+			description={ constants.text.skip404Description }
+		>
+			<Checkbox
+				id="skip-404"
+				name="skip-404"
+				onChange={ handleSkip404Change }
+				value={ skip404 }
+				checked={ skip404 }
+				label={ __(
+					'Skip 404 Handling For Static Files',
+					'wp-module-performance'
+				) }
+			/>
+		</Container.SettingsField>
+	);
+};
+
+export default Skip404;
diff --git a/includes/RestApi/SettingsController.php b/includes/RestApi/SettingsController.php
index 8d25082..0b043d6 100644
--- a/includes/RestApi/SettingsController.php
+++ b/includes/RestApi/SettingsController.php
@@ -74,7 +74,7 @@ public function set_options( $request ) {
 					400
 				);
 			}
-
+error_log($field['value']);
 			switch ( $field['id'] ) {
 				case 'skip404':
 					$result = update_option( 'newfold_skip_404_handling', $field['value'] );

From 835ab32239c65635f2c692f4cda918978505da32 Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessiotorrisidev@gmail.com>
Date: Wed, 20 Nov 2024 15:33:07 +0100
Subject: [PATCH 21/42] Removed error_log

---
 includes/RestApi/SettingsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/RestApi/SettingsController.php b/includes/RestApi/SettingsController.php
index 0b043d6..8d25082 100644
--- a/includes/RestApi/SettingsController.php
+++ b/includes/RestApi/SettingsController.php
@@ -74,7 +74,7 @@ public function set_options( $request ) {
 					400
 				);
 			}
-error_log($field['value']);
+
 			switch ( $field['id'] ) {
 				case 'skip404':
 					$result = update_option( 'newfold_skip_404_handling', $field['value'] );

From 1a63d432ff01b29099c2a915421f9f1e6d3329f5 Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Thu, 28 Nov 2024 13:43:20 +0000
Subject: [PATCH 22/42] cypress performance.js test change

---
 phpcs.xml                                   | 2 +-
 tests/cypress/integration/performance.cy.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpcs.xml b/phpcs.xml
index 3541898..b21082c 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ruleset name="Performance-Module">
-    <rule ref="Newfold"/>
+   <rule ref="Newfold"/>
     <config name="testVersion" value="7.3-"/>
     <config name="minimum_supported_wp_version" value="6.3"/>
     <rule ref="WordPress-Core">
diff --git a/tests/cypress/integration/performance.cy.js b/tests/cypress/integration/performance.cy.js
index eab3f11..e12fc15 100644
--- a/tests/cypress/integration/performance.cy.js
+++ b/tests/cypress/integration/performance.cy.js
@@ -13,7 +13,7 @@ describe( 'Performance Page', function () {
 	} );
 
 	it( 'Is Accessible', () => {
-		cy.wait( 500 );
+		cy.wait( 1000 );
 		cy.checkA11y( appClass + '-app-body' );
 	} );
 

From ae3e375f2a3b0e17cd5a637b15b836d6fb45332e Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Thu, 28 Nov 2024 14:51:04 +0000
Subject: [PATCH 23/42] added label to textarea component that is probably
 causing the cypress test fail

---
 components/cacheExclusion/index.js |  1 +
 includes/Performance.php           | 13 ++++++++++---
 includes/functions.php             |  9 +++++++++
 styles/styles.css                  |  1 +
 4 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 styles/styles.css

diff --git a/components/cacheExclusion/index.js b/components/cacheExclusion/index.js
index 43868a3..49fdacc 100644
--- a/components/cacheExclusion/index.js
+++ b/components/cacheExclusion/index.js
@@ -57,6 +57,7 @@ const CacheExclusion = ({ methods, constants }) => {
                 onChange={ handleCacheExclusionChange }
                 value={currentValue}
 				rows="1"
+				label={constants.text.cacheExclusionTitle}
             />
 			{isEdited && 
 				<Button
diff --git a/includes/Performance.php b/includes/Performance.php
index e9cbabc..bb03188 100644
--- a/includes/Performance.php
+++ b/includes/Performance.php
@@ -2,9 +2,6 @@
 
 namespace NewfoldLabs\WP\Module\Performance;
 
-use NewfoldLabs\WP\Module\Performance\CacheTypes\Browser;
-use NewfoldLabs\WP\Module\Performance\CacheTypes\File;
-use NewfoldLabs\WP\Module\Performance\CacheTypes\Skip404;
 use NewfoldLabs\WP\ModuleLoader\Container;
 
 /**
@@ -81,6 +78,8 @@ public function __construct( Container $container ) {
 		$container->set( 'cachePurger', $cachePurger );
 
 		$container->set( 'hasMustUsePlugin', file_exists( WPMU_PLUGIN_DIR . '/endurance-page-cache.php' ) );
+
+		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
 	}
 
 	/**
@@ -289,4 +288,12 @@ public function adminBarMenu( \WP_Admin_Bar $wp_admin_bar ) {
 			);
 		}
 	}
+	/**
+	 * Enqueue scripts and styles in admin
+	 */
+	public function enqueue_scripts() {
+		$plugin_url = $this->container->plugin()->url . get_styles_path();
+		wp_register_style( 'wp-module-performance-styles', $plugin_url, array(), $this->container->plugin()->version );
+		wp_enqueue_style( 'wp-module-performance-styles' );
+	}
 }
diff --git a/includes/functions.php b/includes/functions.php
index 49a8310..eaa409f 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -143,3 +143,12 @@ function toSnakeCase( string $value, string $delimiter = '_' ) {
 function toStudlyCase( $value ) {
 	return str_replace( ' ', '', ucwords( str_replace( array( '-', '_' ), ' ', $value ) ) );
 }
+
+/**
+ * Get styles path.
+ *
+ * return string
+ */
+function get_styles_path() {
+	return 'vendor/newfold-labs/wp-module-performance/styles/styles.css';
+}
\ No newline at end of file
diff --git a/styles/styles.css b/styles/styles.css
new file mode 100644
index 0000000..d278595
--- /dev/null
+++ b/styles/styles.css
@@ -0,0 +1 @@
+.newfold-cache-exclusion .nfd-textarea-field label { display: none;}
\ No newline at end of file

From a8c225e7ae84d8f59024e97e753ed035d6d0dc35 Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Thu, 28 Nov 2024 15:05:53 +0000
Subject: [PATCH 24/42] removed css

---
 styles/styles.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/styles/styles.css b/styles/styles.css
index d278595..e69de29 100644
--- a/styles/styles.css
+++ b/styles/styles.css
@@ -1 +0,0 @@
-.newfold-cache-exclusion .nfd-textarea-field label { display: none;}
\ No newline at end of file

From 7366b50802f7bf12257f51682b7db2492c2eedf0 Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessiotorrisidev@gmail.com>
Date: Tue, 17 Dec 2024 14:20:47 +0100
Subject: [PATCH 25/42] Fix: string not localized

---
 components/advancedSettings/JetpackBoost/SingleOption.js | 2 +-
 components/performance/defaultText.js                    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/advancedSettings/JetpackBoost/SingleOption.js b/components/advancedSettings/JetpackBoost/SingleOption.js
index 70c96e8..9da7949 100644
--- a/components/advancedSettings/JetpackBoost/SingleOption.js
+++ b/components/advancedSettings/JetpackBoost/SingleOption.js
@@ -83,7 +83,7 @@ const SingleOption = ( { params, isChild, methods, constants } ) => {
 							! NewfoldRuntime.sdk.performance
 								.jetpack_boost_premium_is_active && (
 								<FeatureUpsell
-									cardText="Upgrade to Unlock"
+									cardText={constants.text.upgradeModule}
 									cardLink={ option.premiumUrl }
 								>
 									<ToggleField
diff --git a/components/performance/defaultText.js b/components/performance/defaultText.js
index c004f16..e7c4929 100644
--- a/components/performance/defaultText.js
+++ b/components/performance/defaultText.js
@@ -225,6 +225,7 @@ const defaultText = {
 	),
 	optionSet: __( 'Option saved correctly', 'wp-module-performance' ),
 	optionNotSet: __( 'Error saving option', 'wp-module-performance' ),
+	upgradeModule: __( 'Upgrade to unlock', 'wp-module-performance' ),
 };
 
 export default defaultText;

From fc14784998a752e10b881423b9af4700e4944eda Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessiotorrisidev@gmail.com>
Date: Wed, 18 Dec 2024 15:39:33 +0100
Subject: [PATCH 26/42] Handle htaccess file according to burst safety mode

---
 bootstrap.php                                 |   2 +
 includes/BurstSafetyMode/Browser.php          |  59 +++++++++
 .../BurstSafetyMode/ResponseHeaderManager.php | 116 ++++++++++++++++++
 includes/BurstSafetyMode/Skip404.php          |  45 +++++++
 includes/BurstSafetyMode/init.php             |  61 +++++++++
 includes/burstSafetyModeFunctions.php         |  44 +++++++
 tests/cypress/integration/performance.cy.js   |   2 +-
 7 files changed, 328 insertions(+), 1 deletion(-)
 create mode 100644 includes/BurstSafetyMode/Browser.php
 create mode 100644 includes/BurstSafetyMode/ResponseHeaderManager.php
 create mode 100644 includes/BurstSafetyMode/Skip404.php
 create mode 100644 includes/BurstSafetyMode/init.php
 create mode 100644 includes/burstSafetyModeFunctions.php

diff --git a/bootstrap.php b/bootstrap.php
index c4d16d8..f5bfb9c 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -12,3 +12,5 @@ function ( $features ) {
 }
 
 new PerformanceFeatureHooks();
+
+require_once __DIR__ . '/includes/BurstSafetyMode/init.php';
diff --git a/includes/BurstSafetyMode/Browser.php b/includes/BurstSafetyMode/Browser.php
new file mode 100644
index 0000000..9bbba02
--- /dev/null
+++ b/includes/BurstSafetyMode/Browser.php
@@ -0,0 +1,59 @@
+<?php
+namespace NewfoldLabs\WP\Module\Performance\BurstSafetyMode;
+use NewfoldLabs\WP\Module\Performance\BurstSafetyMode\ResponseHeaderManager;
+use WP_Forge\WP_Htaccess_Manager\htaccess;
+
+class Browser {
+		/**
+	 * The file marker name.
+	 *
+	 * @var string
+	 */
+	const MARKER = 'Newfold Browser Cache';
+
+	public function __construct() {
+		$responseHeaderManager = new ResponseHeaderManager();
+		$responseHeaderManager->addHeader( 'X-Newfold-Cache-Level', BURST_SAFETY_CACHE_LEVEL );
+		$this->addRules();
+	}
+
+	/**
+	 * Add htaccess rules.
+	 *
+	 * @return void
+	 */
+	public static function addRules() {
+
+		$file_typ_expirations = array(
+			'default'         => '1 week',
+			'text/html'       => '8 hours',
+			'image/jpg'       => '1 week',
+			'image/jpeg'      => '1 week',
+			'image/gif'       => '1 week',
+			'image/png'       => '1 week',
+			'text/css'        => '1 week',
+			'text/javascript' => '1 week',
+			'application/pdf' => '1 month',
+			'image/x-icon'    => '1 year',
+		);
+
+		$tab = "\t";
+
+		$rules[] = '<IfModule mod_expires.c>';
+		$rules[] = "{$tab}ExpiresActive On";
+
+		foreach ( $file_typ_expirations as $file_type => $expiration ) {
+			if ( 'default' === $file_type ) {
+				$rules[] = "{$tab}ExpiresDefault \"access plus {$expiration}\"";
+			} else {
+				$rules[] = "{$tab}ExpiresByType {$file_type} \"access plus {$expiration}\"";
+			}
+		}
+
+		$rules [] = '</IfModule>';
+
+		$htaccess = new htaccess( self::MARKER );
+
+		return $htaccess->addContent( $rules );
+	}
+}
diff --git a/includes/BurstSafetyMode/ResponseHeaderManager.php b/includes/BurstSafetyMode/ResponseHeaderManager.php
new file mode 100644
index 0000000..3a3365c
--- /dev/null
+++ b/includes/BurstSafetyMode/ResponseHeaderManager.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace NewfoldLabs\WP\Module\Performance\BurstSafetyMode;
+
+use WP_Forge\WP_Htaccess_Manager\htaccess;
+use function WP_Forge\WP_Htaccess_Manager\convertContentToLines;
+
+class ResponseHeaderManager {
+
+	/**
+	 * The file marker name.
+	 *
+	 * @var string
+	 */
+	const MARKER = 'Newfold Headers';
+
+	public $htaccess;
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		$this->htaccess = new htaccess( self::MARKER );
+	}
+
+	/**
+	 * Parse existing headers.
+	 *
+	 * @return array
+	 */
+	public function parseHeaders() {
+
+		$headers = array();
+
+		$content = $this->htaccess->readContent();
+		$lines   = array_map( 'trim', convertContentToLines( $content ) );
+
+		array_shift( $lines ); // Remove opening IfModule
+		array_pop( $lines ); // Remove closing IfModule
+
+		$pattern = '/^Header set (.*) "(.*)"$/';
+
+		foreach ( $lines as $line ) {
+			if ( preg_match( $pattern, trim( $line ), $matches ) && isset( $matches[1], $matches[2] ) ) {
+				$headers[ $matches[1] ] = $matches[2];
+			}
+		}
+
+		return $headers;
+	}
+
+	/**
+	 * Add a header.
+	 *
+	 * @param string $name  Header name
+	 * @param string $value Header value
+	 */
+	public function addHeader( string $name, string $value ) {
+		$this->setHeaders(
+			array_merge(
+				$this->parseHeaders(),
+				array( $name => $value )
+			)
+		);
+	}
+
+	/**
+	 * Add multiple headers at once.
+	 *
+	 * @param string[] $headers
+	 */
+	public function addHeaders( array $headers ) {
+		$headers = array_merge( $this->parseHeaders(), $headers );
+		$this->setHeaders( $headers );
+	}
+
+	/**
+	 * Remove a header.
+	 *
+	 * @param string $name Header name
+	 */
+	public function removeHeader( $name ) {
+		$headers = $this->parseHeaders();
+		unset( $headers[ $name ] );
+		$this->setHeaders( $headers );
+	}
+
+	/**
+	 * Remove all headers.
+	 */
+	public function removeAllHeaders() {
+		$this->setHeaders( array() );
+	}
+
+	/**
+	 * Set headers.
+	 *
+	 * @param array $headers
+	 */
+	public function setHeaders( array $headers ) {
+
+		if ( empty( $headers ) ) {
+			$this->htaccess->removeContent();
+
+			return;
+		}
+
+		$content = '<IfModule mod_headers.c>' . PHP_EOL;
+		foreach ( $headers as $key => $value ) {
+			$content .= "\t" . "Header set {$key} \"{$value}\"" . PHP_EOL;
+		}
+		$content .= '</IfModule>';
+
+		$this->htaccess->addContent( $content );
+	}
+}
diff --git a/includes/BurstSafetyMode/Skip404.php b/includes/BurstSafetyMode/Skip404.php
new file mode 100644
index 0000000..a7e061e
--- /dev/null
+++ b/includes/BurstSafetyMode/Skip404.php
@@ -0,0 +1,45 @@
+<?php
+namespace NewfoldLabs\WP\Module\Performance\BurstSafetyMode;
+use function WP_Forge\WP_Htaccess_Manager\addContent;
+use function WP_Forge\WP_Htaccess_Manager\removeMarkers;
+
+class Skip404 {
+		/**
+	 * The file marker name.
+	 */
+	const MARKER = 'Newfold Skip 404 Handling for Static Files';
+
+		/**
+	 * Constructor.
+	 */
+	public function __construct() {
+
+		$this->addRules();
+	}
+
+
+		/**
+	 * Add our rules to the .htacces file.
+	 */
+	public static function addRules() {
+		$content = <<<HTACCESS
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteCond %{REQUEST_URI} !(robots\.txt|ads\.txt|[a-z0-9_\-]*sitemap[a-z0-9_\.\-]*\.(xml|xsl|html)(\.gz)?)
+	RewriteCond %{REQUEST_URI} \.(css|htc|less|js|js2|js3|js4|html|htm|rtf|rtx|txt|xsd|xsl|xml|asf|asx|wax|wmv|wmx|avi|avif|avifs|bmp|class|divx|doc|docx|eot|exe|gif|gz|gzip|ico|jpg|jpeg|jpe|webp|json|mdb|mid|midi|mov|qt|mp3|m4a|mp4|m4v|mpeg|mpg|mpe|webm|mpp|otf|_otf|odb|odc|odf|odg|odp|ods|odt|ogg|ogv|pdf|png|pot|pps|ppt|pptx|ra|ram|svg|svgz|swf|tar|tif|tiff|ttf|ttc|_ttf|wav|wma|wri|woff|woff2|xla|xls|xlsx|xlt|xlw|zip)$ [NC]
+	RewriteRule .* - [L]
+</IfModule>
+HTACCESS;
+
+		addContent( self::MARKER, $content );
+	}
+
+	/**
+	 * Remove our rules from the .htaccess file.
+	 */
+	public static function removeRules() {
+		removeMarkers( self::MARKER );
+	}
+}
diff --git a/includes/BurstSafetyMode/init.php b/includes/BurstSafetyMode/init.php
new file mode 100644
index 0000000..66a3c8e
--- /dev/null
+++ b/includes/BurstSafetyMode/init.php
@@ -0,0 +1,61 @@
+<?php
+
+use NewfoldLabs\WP\Module\Performance\BurstSafetyMode\Skip404 as BurstSkip404;
+use NewfoldLabs\WP\Module\Performance\BurstSafetyMode\Browser as BurstBrowser;
+use NewfoldLabs\WP\Module\Performance\CacheTypes\Browser as CacheBrowser;
+use NewfoldLabs\WP\Module\Performance\CacheTypes\Skip404 as CacheSkip404;
+use NewfoldLabs\WP\Module\Performance\ResponseHeaderManager;
+
+
+$newfold_burst_safety_mode = (bool) get_option( 'newfold_burst_safety_mode', false );
+$newfold_cache_level       = (int) get_option( 'newfold_cache_level', 0 );
+
+// Check if Performance feature is enabled and it's necessary reset the cache options
+if ( class_exists( 'NewfoldLabs\WP\Module\Performance\PerformanceFeatureHooks' ) ) {
+	if ( $newfold_burst_safety_mode ) {
+		$browser = new CacheBrowser();
+		$browser::maybeAddRules( $newfold_cache_level );
+
+		$skip_404_handling = (bool) get_option( 'newfold_skip_404_handling', true );
+
+		if ( ! $skip_404_handling ) {
+			$skip404 = new CacheSkip404();
+			$skip404::maybeAddRules( false );
+		}
+
+		$responseHeaderManager = new ResponseHeaderManager();
+		$responseHeaderManager->addHeader( 'X-Newfold-Cache-Level', $newfold_cache_level );
+
+		delete_option( 'newfold_burst_safety_mode' );
+	}
+} else {
+	if ( ! $newfold_burst_safety_mode ) {
+		$files_to_include = array(
+			'htaccess'                => BLUEHOST_PLUGIN_DIR . 'vendor/wp-forge/wp-htaccess-manager/includes/htaccess.php',
+			'htaccess_functions'      => BLUEHOST_PLUGIN_DIR . 'vendor/wp-forge/wp-htaccess-manager/includes/functions.php',
+			'skip404'                 => BLUEHOST_PLUGIN_DIR . 'vendor/newfold-labs/wp-module-performance/includes/BurstSafetyMode/Skip404.php',
+			'browser'                 => BLUEHOST_PLUGIN_DIR . 'vendor/newfold-labs/wp-module-performance/includes/BurstSafetyMode/browser.php',
+			'response_header_manager' => BLUEHOST_PLUGIN_DIR . 'vendor/newfold-labs/wp-module-performance/includes/BurstSafetyMode/ResponseHeaderManager.php',
+		);
+
+		foreach ( $files_to_include as $path ) {
+			if ( file_exists( $path ) ) {
+				require_once $path;
+			}
+		}
+
+		define( 'BURST_SAFETY_CACHE_LEVEL', 3 );
+
+		$skip_404_handling = (bool) get_option( 'newfold_skip_404_handling', true );
+
+		if ( ! $skip_404_handling && class_exists( BurstSkip404::class ) ) {
+			$skip404 = new BurstSkip404();
+		}
+
+		if ( BURST_SAFETY_CACHE_LEVEL !== $newfold_cache_level && class_exists( BurstBrowser::class ) ) {
+			$browser = new BurstBrowser();
+		}
+
+		update_option( 'newfold_burst_safety_mode', true );
+	}
+}
diff --git a/includes/burstSafetyModeFunctions.php b/includes/burstSafetyModeFunctions.php
new file mode 100644
index 0000000..8de058d
--- /dev/null
+++ b/includes/burstSafetyModeFunctions.php
@@ -0,0 +1,44 @@
+<?php 
+namespace NewfoldLabs\WP\Module\Performance;
+use NewfoldLabs\WP\Module\Performance\CacheTypes\Browser;
+use NewfoldLabs\WP\Module\Performance\CacheTypes\Skip404;
+use NewfoldLabs\WP\Module\Performance\ResponseHeaderManager;
+
+$newfold_burst_safety_mode = (bool) get_option( 'newfold_burst_safety_mode' );
+
+$site_cache_level = get_option( 'newfold_cache_level', 3 );
+$site_skip404 = (bool) get_option( 'newfold_skip_404_handling', true );
+
+if ( $newfold_burst_safety_mode === false ) {
+
+}else{
+	
+}
+
+if ( defined( 'BURST_SAFETY_MODE' ) && BURST_SAFETY_MODE ) {
+	if ( $newfold_burst_safety_mode === false ) {
+		$current_level = get_option( Performance::OPTION_CACHE_LEVEL );
+		update_option( 'newfold_burst_safety_mode', true );
+		update_option( 'newfold_burst_safety_mode_site_cache_level', $current_level );
+		$browser = new Browser();
+		$browser::maybeAddRules( 3 );
+        if( function_exists( 'getSkip404Option' ) && ! getSkip404Option() ) {
+            $skip404 = new Skip404();
+            $skip404::maybeAddRules( true );
+        }
+        $responseHeaderManager = new ResponseHeaderManager();
+		$responseHeaderManager->addHeader( 'X-Newfold-Cache-Level', 3 );
+	}
+} elseif ( $newfold_burst_safety_mode ) {
+	$cache_level = get_option( 'newfold_burst_safety_mode_site_cache_level' );
+	$browser     = new Browser();
+	$browser::maybeAddRules( $cache_level );
+    if( function_exists( 'getSkip404Option' ) && ! getSkip404Option() ) {
+        $skip404 = new Skip404();
+        $skip404::maybeAddRules( false );
+    }
+    $responseHeaderManager = new ResponseHeaderManager();
+    $responseHeaderManager->addHeader( 'X-Newfold-Cache-Level', $cache_level );
+	delete_option( 'newfold_burst_safety_mode' );
+	delete_option( 'newfold_burst_safety_mode_site_cache_level' );
+}
diff --git a/tests/cypress/integration/performance.cy.js b/tests/cypress/integration/performance.cy.js
index e12fc15..111f9f2 100644
--- a/tests/cypress/integration/performance.cy.js
+++ b/tests/cypress/integration/performance.cy.js
@@ -13,7 +13,7 @@ describe( 'Performance Page', function () {
 	} );
 
 	it( 'Is Accessible', () => {
-		cy.wait( 1000 );
+		cy.wait( 2000 );
 		cy.checkA11y( appClass + '-app-body' );
 	} );
 

From 1d32f507fece6d04e3d56d348a5476dc7d25ad46 Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessiotorrisidev@gmail.com>
Date: Fri, 20 Dec 2024 13:05:22 +0100
Subject: [PATCH 27/42] Fix: restore Skip 404 htaccess code once BURST SATEFY
 MODE is disabled

---
 includes/BurstSafetyMode/init.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/includes/BurstSafetyMode/init.php b/includes/BurstSafetyMode/init.php
index 66a3c8e..7118599 100644
--- a/includes/BurstSafetyMode/init.php
+++ b/includes/BurstSafetyMode/init.php
@@ -46,11 +46,7 @@
 
 		define( 'BURST_SAFETY_CACHE_LEVEL', 3 );
 
-		$skip_404_handling = (bool) get_option( 'newfold_skip_404_handling', true );
-
-		if ( ! $skip_404_handling && class_exists( BurstSkip404::class ) ) {
-			$skip404 = new BurstSkip404();
-		}
+		$skip404 = new BurstSkip404();
 
 		if ( BURST_SAFETY_CACHE_LEVEL !== $newfold_cache_level && class_exists( BurstBrowser::class ) ) {
 			$browser = new BurstBrowser();

From a010ca4c219fd96a1ba95025256f836459619bf7 Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessiotorrisidev@gmail.com>
Date: Mon, 30 Dec 2024 14:31:01 +0100
Subject: [PATCH 28/42] Fix: lint JS files

---
 .../JetpackBoost/SingleOption.js              |   2 +-
 components/cacheSettings/index.js             | 196 ++++++++++--------
 components/clearCache/index.js                |  70 +++----
 includes/burstSafetyModeFunctions.php         |  32 ++-
 4 files changed, 153 insertions(+), 147 deletions(-)

diff --git a/components/advancedSettings/JetpackBoost/SingleOption.js b/components/advancedSettings/JetpackBoost/SingleOption.js
index 9da7949..1aa09e8 100644
--- a/components/advancedSettings/JetpackBoost/SingleOption.js
+++ b/components/advancedSettings/JetpackBoost/SingleOption.js
@@ -83,7 +83,7 @@ const SingleOption = ( { params, isChild, methods, constants } ) => {
 							! NewfoldRuntime.sdk.performance
 								.jetpack_boost_premium_is_active && (
 								<FeatureUpsell
-									cardText={constants.text.upgradeModule}
+									cardText={ constants.text.upgradeModule }
 									cardLink={ option.premiumUrl }
 								>
 									<ToggleField
diff --git a/components/cacheSettings/index.js b/components/cacheSettings/index.js
index f42a328..f1d4e28 100644
--- a/components/cacheSettings/index.js
+++ b/components/cacheSettings/index.js
@@ -1,100 +1,114 @@
-import { Container, RadioGroup } from "@newfold/ui-component-library";
+import { Container, RadioGroup } from '@newfold/ui-component-library';
 
-const CacheSettings = ({ methods, constants, Components }) => {
-    const [ cacheLevel, setCacheLevel ] = methods.useState(constants.store.cacheLevel);
+const CacheSettings = ( { methods, constants, Components } ) => {
+	const [ cacheLevel, setCacheLevel ] = methods.useState(
+		constants.store.cacheLevel
+	);
 
-    const cacheOptions = [
-        {
-            label: constants.text.cacheLevel0Label,
-            description: constants.text.cacheLevel0Description + constants.text.cacheLevel0Recommendation,
-            value: 0,
-            notice: constants.text.cacheLevel0NoticeText,
-        },
-        {
-            label: constants.text.cacheLevel1Label,
-            description: constants.text.cacheLevel1Description + constants.text.cacheLevel1Recommendation,
-            value: 1,
-            notice: constants.text.cacheLevel1NoticeText,
-        },
-        {
-            label: constants.text.cacheLevel2Label,
-            description: constants.text.cacheLevel2Description + constants.text.cacheLevel2Recommendation,
-            value: 2,
-            notice: constants.text.cacheLevel2NoticeText,
-        },
-        {
-            label: constants.text.cacheLevel3Label,
-            description: constants.text.cacheLevel3Description + constants.text.cacheLevel3Recommendation,
-            value: 3,
-            notice: constants.text.cacheLevel3NoticeText,
-        },
-    ];
+	const cacheOptions = [
+		{
+			label: constants.text.cacheLevel0Label,
+			description:
+				constants.text.cacheLevel0Description +
+				constants.text.cacheLevel0Recommendation,
+			value: 0,
+			notice: constants.text.cacheLevel0NoticeText,
+		},
+		{
+			label: constants.text.cacheLevel1Label,
+			description:
+				constants.text.cacheLevel1Description +
+				constants.text.cacheLevel1Recommendation,
+			value: 1,
+			notice: constants.text.cacheLevel1NoticeText,
+		},
+		{
+			label: constants.text.cacheLevel2Label,
+			description:
+				constants.text.cacheLevel2Description +
+				constants.text.cacheLevel2Recommendation,
+			value: 2,
+			notice: constants.text.cacheLevel2NoticeText,
+		},
+		{
+			label: constants.text.cacheLevel3Label,
+			description:
+				constants.text.cacheLevel3Description +
+				constants.text.cacheLevel3Recommendation,
+			value: 3,
+			notice: constants.text.cacheLevel3NoticeText,
+		},
+	];
 
-    const getCacheLevelNoticeTitle = () => {
-        return constants.text.cacheLevelNoticeTitle;
-    };
+	const getCacheLevelNoticeTitle = () => {
+		return constants.text.cacheLevelNoticeTitle;
+	};
 
-    const getCacheLevelNoticeText = () => {
-        return cacheOptions[cacheLevel].notice;
-    };
+	const getCacheLevelNoticeText = () => {
+		return cacheOptions[ cacheLevel ].notice;
+	};
 
-    const handleCacheLevelChange = (e) => {
-        methods.newfoldSettingsApiFetch(
-            { cacheLevel: parseInt(e.target.value) }, 
-            methods.setError, (response) => {
-                setCacheLevel(parseInt(e.target.value));
-            }
-        );
-    };
+	const handleCacheLevelChange = ( e ) => {
+		methods.newfoldSettingsApiFetch(
+			{ cacheLevel: parseInt( e.target.value ) },
+			methods.setError,
+			( response ) => {
+				setCacheLevel( parseInt( e.target.value ) );
+			}
+		);
+	};
 
-    methods.useUpdateEffect(() => {
-        methods.setStore({
-            ...constants.store,
-            cacheLevel,
-        });
+	methods.useUpdateEffect( () => {
+		methods.setStore( {
+			...constants.store,
+			cacheLevel,
+		} );
 
-        methods.makeNotice(
-            "cache-level-change-notice", 
-            getCacheLevelNoticeTitle(),
-            getCacheLevelNoticeText(),
-            "success",
-            5000
-        );
-    }, [cacheLevel]);
+		methods.makeNotice(
+			'cache-level-change-notice',
+			getCacheLevelNoticeTitle(),
+			getCacheLevelNoticeText(),
+			'success',
+			5000
+		);
+	}, [ cacheLevel ] );
 
-    return (
-      <>
-        <Container.SettingsField
-            title={constants.text.cacheLevelTitle}
-            description={constants.text.cacheLevelDescription}
-        >
-        <RadioGroup
-            className="cache-options"
-            id="cache-type"
-            name="cache-level"
-            value=""
-        >
-            {cacheOptions.map((option) => {
-                return (
-                    <Components.Fragment key={option.value}>
-                        <RadioGroup.Radio
-                            defaultChecked={option.value === constants.store.cacheLevel}
-                            id={'cache-level-' + option.value}
-                            label={option.label}
-                            value={option.value}
-                            name="cache-level"
-                            onChange={handleCacheLevelChange}
-                        />
-                        <div className="nfd-radio__description">
-                            {option.description}
-                        </div>
-                    </Components.Fragment>
-                );
-            })}
-        </RadioGroup>
-        </Container.SettingsField>
-      </>
-    );
-}
+	return (
+		<>
+			<Container.SettingsField
+				title={ constants.text.cacheLevelTitle }
+				description={ constants.text.cacheLevelDescription }
+			>
+				<RadioGroup
+					className="cache-options"
+					id="cache-type"
+					name="cache-level"
+					value=""
+				>
+					{ cacheOptions.map( ( option ) => {
+						return (
+							<Components.Fragment key={ option.value }>
+								<RadioGroup.Radio
+									defaultChecked={
+										option.value ===
+										constants.store.cacheLevel
+									}
+									id={ 'cache-level-' + option.value }
+									label={ option.label }
+									value={ option.value }
+									name="cache-level"
+									onChange={ handleCacheLevelChange }
+								/>
+								<div className="nfd-radio__description">
+									{ option.description }
+								</div>
+							</Components.Fragment>
+						);
+					} ) }
+				</RadioGroup>
+			</Container.SettingsField>
+		</>
+	);
+};
 
-export default CacheSettings;
\ No newline at end of file
+export default CacheSettings;
diff --git a/components/clearCache/index.js b/components/clearCache/index.js
index 793ddab..494a3fc 100644
--- a/components/clearCache/index.js
+++ b/components/clearCache/index.js
@@ -1,39 +1,37 @@
-import { Button, Container } from "@newfold/ui-component-library";
+import { Button, Container } from '@newfold/ui-component-library';
 
-const ClearCache = ({ methods, constants }) => {
+const ClearCache = ( { methods, constants } ) => {
+	const clearCache = () => {
+		methods.newfoldPurgeCacheApiFetch(
+			{},
+			methods.setError,
+			( response ) => {
+				methods.makeNotice(
+					'disable-old-posts-comments-notice',
+					constants.text.clearCacheNoticeTitle,
+					null,
+					'success',
+					5000
+				);
+			}
+		);
+	};
 
-    const clearCache = () => {
-        methods.newfoldPurgeCacheApiFetch(
-            {}, 
-            methods.setError, 
-            (response) => {
-                methods.makeNotice(
-                    "disable-old-posts-comments-notice", 
-                    constants.text.clearCacheNoticeTitle,
-                    null,
-                    "success",
-                    5000
-                );
-            }
-        );
-    };
+	return (
+		<Container.SettingsField
+			title={ constants.text.clearCacheTitle }
+			description={ constants.text.clearCacheDescription }
+		>
+			<Button
+				variant="secondary"
+				className="clear-cache-button"
+				disabled={ constants.store.cacheLevel > 0 ? false : true }
+				onClick={ clearCache }
+			>
+				{ constants.text.clearCacheButton }
+			</Button>
+		</Container.SettingsField>
+	);
+};
 
-    return (
-        <Container.SettingsField
-            title={constants.text.clearCacheTitle}
-            description={constants.text.clearCacheDescription}
-        >
-            <Button
-                variant="secondary"
-                className="clear-cache-button"
-                disabled={constants.store.cacheLevel > 0 ? false : true}
-                onClick={clearCache}
-                >
-                {constants.text.clearCacheButton}
-            </Button>
-        </Container.SettingsField>
-            
-    );
-;}
-
-export default ClearCache;
\ No newline at end of file
+export default ClearCache;
diff --git a/includes/burstSafetyModeFunctions.php b/includes/burstSafetyModeFunctions.php
index 8de058d..6cc03cc 100644
--- a/includes/burstSafetyModeFunctions.php
+++ b/includes/burstSafetyModeFunctions.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 namespace NewfoldLabs\WP\Module\Performance;
 use NewfoldLabs\WP\Module\Performance\CacheTypes\Browser;
 use NewfoldLabs\WP\Module\Performance\CacheTypes\Skip404;
@@ -7,13 +7,7 @@
 $newfold_burst_safety_mode = (bool) get_option( 'newfold_burst_safety_mode' );
 
 $site_cache_level = get_option( 'newfold_cache_level', 3 );
-$site_skip404 = (bool) get_option( 'newfold_skip_404_handling', true );
-
-if ( $newfold_burst_safety_mode === false ) {
-
-}else{
-	
-}
+$site_skip404     = (bool) get_option( 'newfold_skip_404_handling', true );
 
 if ( defined( 'BURST_SAFETY_MODE' ) && BURST_SAFETY_MODE ) {
 	if ( $newfold_burst_safety_mode === false ) {
@@ -22,23 +16,23 @@
 		update_option( 'newfold_burst_safety_mode_site_cache_level', $current_level );
 		$browser = new Browser();
 		$browser::maybeAddRules( 3 );
-        if( function_exists( 'getSkip404Option' ) && ! getSkip404Option() ) {
-            $skip404 = new Skip404();
-            $skip404::maybeAddRules( true );
-        }
-        $responseHeaderManager = new ResponseHeaderManager();
+		if ( function_exists( 'getSkip404Option' ) && ! getSkip404Option() ) {
+			$skip404 = new Skip404();
+			$skip404::maybeAddRules( true );
+		}
+		$responseHeaderManager = new ResponseHeaderManager();
 		$responseHeaderManager->addHeader( 'X-Newfold-Cache-Level', 3 );
 	}
 } elseif ( $newfold_burst_safety_mode ) {
 	$cache_level = get_option( 'newfold_burst_safety_mode_site_cache_level' );
 	$browser     = new Browser();
 	$browser::maybeAddRules( $cache_level );
-    if( function_exists( 'getSkip404Option' ) && ! getSkip404Option() ) {
-        $skip404 = new Skip404();
-        $skip404::maybeAddRules( false );
-    }
-    $responseHeaderManager = new ResponseHeaderManager();
-    $responseHeaderManager->addHeader( 'X-Newfold-Cache-Level', $cache_level );
+	if ( function_exists( 'getSkip404Option' ) && ! getSkip404Option() ) {
+		$skip404 = new Skip404();
+		$skip404::maybeAddRules( false );
+	}
+	$responseHeaderManager = new ResponseHeaderManager();
+	$responseHeaderManager->addHeader( 'X-Newfold-Cache-Level', $cache_level );
 	delete_option( 'newfold_burst_safety_mode' );
 	delete_option( 'newfold_burst_safety_mode_site_cache_level' );
 }

From 8e3902db86ca30330ca1931e377088da3cf929d5 Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessiotorrisidev@gmail.com>
Date: Tue, 7 Jan 2025 09:05:25 +0100
Subject: [PATCH 29/42] Fix: phpcs issue

---
 includes/Performance.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/Performance.php b/includes/Performance.php
index 2d168bc..d2debd7 100644
--- a/includes/Performance.php
+++ b/includes/Performance.php
@@ -93,7 +93,7 @@ public function __construct( Container $container ) {
 
 		$container->set( 'hasMustUsePlugin', file_exists( WPMU_PLUGIN_DIR . '/endurance-page-cache.php' ) );
 
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );	
+		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
 
 		if ( Permissions::is_authorized_admin() || Permissions::rest_is_authorized_admin() ) {
 			new RestAPI();
@@ -334,7 +334,7 @@ public function add_to_runtime( $sdk ) {
 			'jetpack_boost_minify_css'          => get_option( 'jetpack_boost_status_minify-css', array() ),
 			'jetpack_boost_minify_css_excludes' => implode( ',', get_option( 'jetpack_boost_ds_minify_css_excludes', array( 'admin-bar', 'dashicons', 'elementor-app' ) ) ),
 			'install_token'                     => PluginInstaller::rest_get_plugin_install_hash(),
-			'skip404' => (bool) get_option( 'newfold_skip_404_handling', false ),
+			'skip404'                           => (bool) get_option( 'newfold_skip_404_handling', false ),
 		);
 
 		return array_merge( $sdk, array( 'performance' => $values ) );

From 4348cf66759bc39115837cc6e95f79ac0c41fb54 Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessiotorrisidev@gmail.com>
Date: Tue, 7 Jan 2025 09:31:50 +0100
Subject: [PATCH 30/42] Fix: phpcs issue on undefined WordPress function

---
 includes/BurstSafetyMode/init.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/BurstSafetyMode/init.php b/includes/BurstSafetyMode/init.php
index 7118599..e78bded 100644
--- a/includes/BurstSafetyMode/init.php
+++ b/includes/BurstSafetyMode/init.php
@@ -7,8 +7,8 @@
 use NewfoldLabs\WP\Module\Performance\ResponseHeaderManager;
 
 
-$newfold_burst_safety_mode = (bool) get_option( 'newfold_burst_safety_mode', false );
-$newfold_cache_level       = (int) get_option( 'newfold_cache_level', 0 );
+$newfold_burst_safety_mode = function_exists( 'get_option' ) ? (bool) get_option( 'newfold_burst_safety_mode', false ) : false;
+$newfold_cache_level       = function_exists( 'newfold_cache_level' ) ? (int) get_option( 'newfold_cache_level', 0 ) : 0;
 
 // Check if Performance feature is enabled and it's necessary reset the cache options
 if ( class_exists( 'NewfoldLabs\WP\Module\Performance\PerformanceFeatureHooks' ) ) {

From 64a02550a581112eedaef75414b8f51740153f58 Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessiotorrisidev@gmail.com>
Date: Tue, 7 Jan 2025 09:34:07 +0100
Subject: [PATCH 31/42] Fix: phpcs issue yoda condition

---
 includes/burstSafetyModeFunctions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/burstSafetyModeFunctions.php b/includes/burstSafetyModeFunctions.php
index 6cc03cc..53cb68c 100644
--- a/includes/burstSafetyModeFunctions.php
+++ b/includes/burstSafetyModeFunctions.php
@@ -10,7 +10,7 @@
 $site_skip404     = (bool) get_option( 'newfold_skip_404_handling', true );
 
 if ( defined( 'BURST_SAFETY_MODE' ) && BURST_SAFETY_MODE ) {
-	if ( $newfold_burst_safety_mode === false ) {
+	if ( false === $newfold_burst_safety_mode ) {
 		$current_level = get_option( Performance::OPTION_CACHE_LEVEL );
 		update_option( 'newfold_burst_safety_mode', true );
 		update_option( 'newfold_burst_safety_mode_site_cache_level', $current_level );

From 0375f6350d21c631a3c731aec4931d21ff3db63a Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Tue, 7 Jan 2025 11:19:26 +0000
Subject: [PATCH 32/42] fixed 500 error

---
 includes/Performance.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/Performance.php b/includes/Performance.php
index 4aa21da..db2680e 100644
--- a/includes/Performance.php
+++ b/includes/Performance.php
@@ -123,7 +123,6 @@ function () {
 	 */
 	public function hooks() {
 
-		add_action( 'admin_init', array( $this, 'registerSettings' ), 11 );
 		add_action( 'admin_init', array( $this, 'remove_epc_settings' ), 99 );
 
 		new OptionListener( self::OPTION_CACHE_LEVEL, array( $this, 'onCacheLevelChange' ) );
@@ -156,6 +155,8 @@ function () {
 		add_filter( 'action_scheduler_cleanup_batch_size', array( $this, 'nfd_as_cleanup_batch_size' ) );
 	}
 
+	
+
 	/**
 	 * Remove EPC Settings if needed
 	 *

From 3056fb6e528210f0529d9c0abddbef6c039b783c Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Tue, 7 Jan 2025 11:30:53 +0000
Subject: [PATCH 33/42] fix input name

---
 components/cacheExclusion/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/cacheExclusion/index.js b/components/cacheExclusion/index.js
index 49fdacc..85b1929 100644
--- a/components/cacheExclusion/index.js
+++ b/components/cacheExclusion/index.js
@@ -53,7 +53,7 @@ const CacheExclusion = ({ methods, constants }) => {
         >
             <TextareaField
                 id="cache-exclusion"
-                name="cache-xxclusion"
+                name="cache-exclusion"
                 onChange={ handleCacheExclusionChange }
                 value={currentValue}
 				rows="1"

From 617362fab331494f05c6502b4ef18630e831ff74 Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Tue, 7 Jan 2025 14:13:01 +0000
Subject: [PATCH 34/42] js lint

---
 components/cacheExclusion/index.js | 141 ++++++++++++++++-------------
 1 file changed, 76 insertions(+), 65 deletions(-)

diff --git a/components/cacheExclusion/index.js b/components/cacheExclusion/index.js
index 85b1929..36abf48 100644
--- a/components/cacheExclusion/index.js
+++ b/components/cacheExclusion/index.js
@@ -1,78 +1,89 @@
-import { Button, Container, TextareaField } from "@newfold/ui-component-library";
+import {
+	Button,
+	Container,
+	TextareaField,
+} from '@newfold/ui-component-library';
 
-const CacheExclusion = ({ methods, constants }) => {
-    const [ isEdited, setIsEdited ] = methods.useState(false);
-	const [ isError, setIsError ] = methods.useState(false);
-	const [ isSaved, setIsSaved ] = methods.useState(false);
-    const [ currentValue, setCurrentValue ] = methods.useState(methods.NewfoldRuntime.sdk.cacheExclusion);
-    const [ cacheExclusion, setCacheExclusion ] = methods.useState(methods.NewfoldRuntime.sdk.cacheExclusion);
-	const apiUrl = methods.NewfoldRuntime.createApiUrl("/newfold-ecommerce/v1/cacheexclusion/update");
+const CacheExclusion = ( { methods, constants } ) => {
+	const [ isEdited, setIsEdited ] = methods.useState( false );
+	const [ isError, setIsError ] = methods.useState( false );
+	const [ isSaved, setIsSaved ] = methods.useState( false );
+	const [ currentValue, setCurrentValue ] = methods.useState(
+		methods.NewfoldRuntime.sdk.cacheExclusion
+	);
+	const [ cacheExclusion, setCacheExclusion ] = methods.useState(
+		methods.NewfoldRuntime.sdk.cacheExclusion
+	);
+	const apiUrl = methods.NewfoldRuntime.createApiUrl(
+		'/newfold-ecommerce/v1/cacheexclusion/update'
+	);
 
-    const handleCacheExclusionChange = (e) => {
-        if( e.target.value !== currentValue  ) {
-            setIsEdited(true);            
-        }else{
-            setIsEdited(false);
-        }
-        setCurrentValue( e.target.value );
-    }
+	const handleCacheExclusionChange = ( e ) => {
+		if ( e.target.value !== currentValue ) {
+			setIsEdited( true );
+		} else {
+			setIsEdited( false );
+		}
+		setCurrentValue( e.target.value );
+	};
 
-    const handlingSaveButton = () => {
-		methods.apiFetch({
-			url: apiUrl,
-			method: "POST",
-			data: {cacheExclusion: currentValue}
-		}).then((result)=>{
-			  setIsSaved(true);
-              setCacheExclusion(currentValue);
-			  setIsEdited(false)
-		}).catch((error) => {     
-			setIsError(error.message);
-		});
-    };
+	const handlingSaveButton = () => {
+		methods
+			.apiFetch( {
+				url: apiUrl,
+				method: 'POST',
+				data: { cacheExclusion: currentValue },
+			} )
+			.then( () => {
+				setIsSaved( true );
+				setCacheExclusion( currentValue );
+				setIsEdited( false );
+			} )
+			.catch( ( error ) => {
+				setIsError( error.message );
+			} );
+	};
 
-	methods.useUpdateEffect(() => {
-        methods.setStore({
-            ...constants.store,
-            CacheExclusion: cacheExclusion,
-        });
+	methods.useUpdateEffect( () => {
+		methods.setStore( {
+			...constants.store,
+			CacheExclusion: cacheExclusion,
+		} );
 
-        methods.makeNotice(
-            "cache-exlusion-notice", 
-            constants.text.cacheExclusionTitle,
-            !isError ? constants.text.cacheExclusionSaved : isError,
-            !isError ? "success" : "error",
-            5000
-        );
-    }, [ isSaved, isError]);
+		methods.makeNotice(
+			'cache-exlusion-notice',
+			constants.text.cacheExclusionTitle,
+			! isError ? constants.text.cacheExclusionSaved : isError,
+			! isError ? 'success' : 'error',
+			5000
+		);
+	}, [ isSaved, isError ] );
 
-    return (
-        <Container.SettingsField
-            title={constants.text.cacheExclusionTitle}
-            description={constants.text.cacheExclusionDescription}
-        >
-            <TextareaField
-                id="cache-exclusion"
-                name="cache-exclusion"
-                onChange={ handleCacheExclusionChange }
-                value={currentValue}
+	return (
+		<Container.SettingsField
+			title={ constants.text.cacheExclusionTitle }
+			description={ constants.text.cacheExclusionDescription }
+		>
+			<TextareaField
+				id="cache-exclusion"
+				name="cache-exclusion"
+				onChange={ handleCacheExclusionChange }
+				value={ currentValue }
 				rows="1"
-				label={constants.text.cacheExclusionTitle}
-            />
-			{isEdited && 
+				label={ constants.text.cacheExclusionTitle }
+			/>
+			{ isEdited && (
 				<Button
 					variant="secondary"
 					className="save-cache-exclusion-button"
-					disabled={isEdited ? false : true}
-					onClick={handlingSaveButton}
+					disabled={ isEdited ? false : true }
+					onClick={ handlingSaveButton }
 				>
-					{constants.text.cacheExclusionSaveButton}
+					{ constants.text.cacheExclusionSaveButton }
 				</Button>
-			}
-            
-        </Container.SettingsField>
-            
-    );
-;}
+			) }
+		</Container.SettingsField>
+	);
+};
 
-export default CacheExclusion;
\ No newline at end of file
+export default CacheExclusion;

From ccfdb13f7a1a4bb84c37b25d96a3819a7bbc2ef8 Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Tue, 7 Jan 2025 14:23:56 +0000
Subject: [PATCH 35/42] lint performance folder js files

---
 components/performance/defaultText.js | 11 +++++++----
 components/performance/index.js       | 12 ++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/components/performance/defaultText.js b/components/performance/defaultText.js
index c7ba654..365cc40 100644
--- a/components/performance/defaultText.js
+++ b/components/performance/defaultText.js
@@ -66,10 +66,13 @@ const defaultText = {
 	),
 	clearCacheNoticeTitle: __( 'Cache cleared', 'wp-module-performance' ),
 	clearCacheTitle: __( 'Clear Cache', 'wp-module-performance' ),
-    cacheExclusionTitle: __( 'Exclude from cache', 'wp-module-performance' ),
-    cacheExclusionDescription: __( 'This setting controls what pages pass a “no-cache” header so that page caching and browser caching is not used.', 'wp-module-performance' ),
-    cacheExclusionSaved: __( 'Cache Exclusion saved', 'wp-module-performance' ),
-    cacheExclusionSaveButton: __( 'Save', 'wp-module-performance' ),
+	cacheExclusionTitle: __( 'Exclude from cache', 'wp-module-performance' ),
+	cacheExclusionDescription: __(
+		'This setting controls what pages pass a “no-cache” header so that page caching and browser caching is not used.',
+		'wp-module-performance'
+	),
+	cacheExclusionSaved: __( 'Cache Exclusion saved', 'wp-module-performance' ),
+	cacheExclusionSaveButton: __( 'Save', 'wp-module-performance' ),
 	// Image Optimization
 	imageOptimizationSettingsTitle: __(
 		'Image Optimization',
diff --git a/components/performance/index.js b/components/performance/index.js
index 79a833a..bb74e93 100644
--- a/components/performance/index.js
+++ b/components/performance/index.js
@@ -57,12 +57,12 @@ const Performance = ( { methods, constants, Components, ...props } ) => {
 					Components={ Components }
 				/>
 			</Container.Block>
-			<Container.Block separator={true} className={'newfold-cache-exclusion'}>
-                <CacheExclusion
-                    methods={methods}
-                    constants={constants}
-                />
-            </Container.Block>
+			<Container.Block
+				separator={ true }
+				className={ 'newfold-cache-exclusion' }
+			>
+				<CacheExclusion methods={ methods } constants={ constants } />
+			</Container.Block>
 			<Container.Block
 				separator={ true }
 				className={ 'newfold-clear-cache' }

From 3a2b61d7096b9b33b727d7ac7a15f8132b6f3de1 Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessiotorrisidev@gmail.com>
Date: Tue, 7 Jan 2025 15:36:40 +0100
Subject: [PATCH 36/42] Tweak: removed unused packages

---
 package-lock.json | 2 +-
 package.json      | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 13360f7..57c29d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,7 +7,7 @@
       "name": "@newfold-labs/wp-module-performance",
       "license": "GPL-2.0-or-later",
       "dependencies": {
-        "@newfold-labs/wp-module-runtime": "^1.0.0",
+        "@newfold-labs/wp-module-runtime": "^1.0.12",
         "@newfold/ui-component-library": "^1.1.0",
         "html-react-parser": "^5.1.18"
       },
diff --git a/package.json b/package.json
index f6dac48..e900646 100644
--- a/package.json
+++ b/package.json
@@ -11,10 +11,8 @@
     "William Earnhardt (https://wearnhardt.com)"
   ],
   "dependencies": {
-    "@heroicons/react": "^2.0.18",
     "@newfold/ui-component-library": "^1.1.0",
     "@newfold-labs/wp-module-runtime": "^1.0.12",
-	  "@tailwindcss/forms": "^0.5.8",
     "html-react-parser": "^5.1.18"
   },
   "devDependencies": {

From 4a188658e6832a47fe5e94667a1b4936a6f334a8 Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Wed, 8 Jan 2025 08:20:50 +0000
Subject: [PATCH 37/42] refactoring of codes

---
 components/cacheExclusion/index.js            |  2 +-
 includes/CacheManager.php                     | 43 -------------------
 includes/CacheTypes/Browser.php               |  6 +--
 includes/CacheTypes/File.php                  |  4 +-
 includes/Performance.php                      |  4 +-
 includes/RestApi/CacheExclusionController.php | 36 +++-------------
 includes/RestApi/RestApi.php                  |  1 +
 7 files changed, 14 insertions(+), 82 deletions(-)

diff --git a/components/cacheExclusion/index.js b/components/cacheExclusion/index.js
index 36abf48..74697b0 100644
--- a/components/cacheExclusion/index.js
+++ b/components/cacheExclusion/index.js
@@ -15,7 +15,7 @@ const CacheExclusion = ( { methods, constants } ) => {
 		methods.NewfoldRuntime.sdk.cacheExclusion
 	);
 	const apiUrl = methods.NewfoldRuntime.createApiUrl(
-		'/newfold-ecommerce/v1/cacheexclusion/update'
+		'/newfold-performance/v1/cache-exclusion/update'
 	);
 
 	const handleCacheExclusionChange = ( e ) => {
diff --git a/includes/CacheManager.php b/includes/CacheManager.php
index 1acc296..cb74238 100644
--- a/includes/CacheManager.php
+++ b/includes/CacheManager.php
@@ -5,13 +5,8 @@
 use NewfoldLabs\WP\Module\Performance\CacheTypes\CacheBase;
 use NewfoldLabs\WP\ModuleLoader\Container;
 use WP_Forge\Collection\Collection;
-use NewfoldLabs\WP\Module\Performance\RestApi\CacheExclusionController;
-
-use function NewfoldLabs\WP\Module\Performance\getDefaultCacheExclusions;
 
 class CacheManager {
-
-
 	/**
 	 * Dependency injection container.
 	 *
@@ -19,15 +14,6 @@ class CacheManager {
 	 */
 	protected $container;
 
-	/**
-	 * Array map of API controllers.
-	 *
-	 * @var array
-	 */
-	protected $controllers = array(
-		'NewfoldLabs\\WP\\Module\\Performance\\RestApi\\CacheExclusionController',
-	);
-
 	/**
 	 * Constructor.
 	 *
@@ -35,35 +21,6 @@ class CacheManager {
 	 */
 	public function __construct( Container $container ) {
 		$this->container = $container;
-
-		add_action( 'rest_api_init', array( $this, 'register_routes' ) );
-		add_filter( 'newfold-runtime', array( $this, 'add_to_runtime' ) );
-	}
-
-	/**
-	 * Register API routes.
-	 */
-	public function register_routes() {
-		foreach ( $this->controllers as $Controller ) {
-			/**
-			 * Get an instance of the WP_REST_Controller.
-			 *
-			 * @var $instance \WP_REST_Controller
-			 */
-			$instance = new $Controller( $this->container );
-			$instance->register_routes();
-		}
-	}
-
-	/**
-	 * Add values to the runtime object.
-	 *
-	 * @param array $sdk The runtime object.
-	 *
-	 * @return array
-	 */
-	public function add_to_runtime( $sdk ) {
-		return array_merge( $sdk, array( 'cacheExclusion' => get_option( CacheExclusionController::OPTION_CACHE_EXCLUSION, getDefaultCacheExclusions() ) ) );
 	}
 
 	/**
diff --git a/includes/CacheTypes/Browser.php b/includes/CacheTypes/Browser.php
index 26e2b64..bfd31e9 100644
--- a/includes/CacheTypes/Browser.php
+++ b/includes/CacheTypes/Browser.php
@@ -6,7 +6,7 @@
 use NewfoldLabs\WP\Module\Performance\Performance;
 use NewfoldLabs\WP\ModuleLoader\Container;
 use WP_Forge\WP_Htaccess_Manager\htaccess;
-use NewfoldLabs\WP\Module\Performance\RestApi\CacheExclusionController;
+use NewfoldLabs\WP\Module\Performance\CacheExclusion;
 
 use function NewfoldLabs\WP\Module\Performance\getCacheLevel;
 use function WP_Forge\WP_Htaccess_Manager\removeMarkers;
@@ -40,7 +40,7 @@ public function __construct() {
 
 		new OptionListener( Performance::OPTION_CACHE_LEVEL, array( __CLASS__, 'maybeAddRules' ) );
 
-		new OptionListener( CacheExclusionController::OPTION_CACHE_EXCLUSION, array( __CLASS__, 'exclusionChange' ) );
+		new OptionListener( CacheExclusion::OPTION_CACHE_EXCLUSION, array( __CLASS__, 'exclusionChange' ) );
 
 		add_filter( 'newfold_update_htaccess', array( $this, 'onRewrite' ) );
 	}
@@ -100,7 +100,7 @@ public static function addRules( $cacheLevel ) {
 		}
 		$rules[] = '</IfModule>';
 
-		$cache_exclusion_parameters = array_map( 'trim', explode( ',', get_option( CacheExclusionController::OPTION_CACHE_EXCLUSION ) ) );
+		$cache_exclusion_parameters = array_map( 'trim', explode( ',', get_option( CacheExclusion::OPTION_CACHE_EXCLUSION ) ) );
 
 		// Add the cache exclusion rules.
 		$rules[] = '<IfModule mod_rewrite.c>';
diff --git a/includes/CacheTypes/File.php b/includes/CacheTypes/File.php
index a7b6cb0..d1048c5 100644
--- a/includes/CacheTypes/File.php
+++ b/includes/CacheTypes/File.php
@@ -6,7 +6,7 @@
 use NewfoldLabs\WP\Module\Performance\OptionListener;
 use NewfoldLabs\WP\Module\Performance\Performance;
 use NewfoldLabs\WP\ModuleLoader\Container;
-use NewfoldLabs\WP\Module\Performance\RestApi\CacheExclusionController;
+use NewfoldLabs\WP\Module\Performance\CacheExclusion;
 use WP_Forge\WP_Htaccess_Manager\htaccess;
 use wpscholar\Url;
 
@@ -257,7 +257,7 @@ public function shouldCache() {
 	 */
 	protected function exclusions() {
 		$default                = array( 'cart', 'checkout', 'wp-admin', '@', '%', ':', ';', '&', '=', '.', rest_get_url_prefix() );
-		$cache_exclusion_option = array_map( 'trim', explode( ',', get_option( CacheExclusionController::OPTION_CACHE_EXCLUSION ) ) );
+		$cache_exclusion_option = array_map( 'trim', explode( ',', get_option( CacheExclusion::OPTION_CACHE_EXCLUSION ) ) );
 		return array_merge( $default, $cache_exclusion_option );
 	}
 
diff --git a/includes/Performance.php b/includes/Performance.php
index db2680e..43c4bba 100644
--- a/includes/Performance.php
+++ b/includes/Performance.php
@@ -9,6 +9,7 @@
 use NewfoldLabs\WP\Module\Performance\RestApi\RestApi;
 
 use Automattic\Jetpack\Current_Plan;
+use Automattic\Jetpack\Status\Cache;
 use NewfoldLabs\WP\Module\Performance\Data\Constants;
 
 /**
@@ -83,6 +84,7 @@ public function __construct( Container $container ) {
 		add_action( 'admin_menu', array( $this, 'add_sub_menu_page' ) );
 
 		new LinkPrefetch( $container );
+		new CacheExclusion( $container );
 
 		$container->set( 'cachePurger', $cachePurger );
 
@@ -155,8 +157,6 @@ function () {
 		add_filter( 'action_scheduler_cleanup_batch_size', array( $this, 'nfd_as_cleanup_batch_size' ) );
 	}
 
-	
-
 	/**
 	 * Remove EPC Settings if needed
 	 *
diff --git a/includes/RestApi/CacheExclusionController.php b/includes/RestApi/CacheExclusionController.php
index 267fdbc..b84da03 100644
--- a/includes/RestApi/CacheExclusionController.php
+++ b/includes/RestApi/CacheExclusionController.php
@@ -3,7 +3,7 @@
 namespace NewfoldLabs\WP\Module\Performance\RestApi;
 
 use NewfoldLabs\WP\Module\ECommerce\Permissions;
-use NewfoldLabs\WP\ModuleLoader\Container;
+use NewfoldLabs\WP\Module\Performance\CacheExclusion;
 
 use function NewfoldLabs\WP\Module\Performance\getDefaultCacheExclusions;
 
@@ -11,45 +11,19 @@
  * Class CacheExclusionController
  */
 class CacheExclusionController {
-
-
-
 	/**
 	 * REST namespace
 	 *
 	 * @var string
 	 */
-	protected $namespace = 'newfold-ecommerce/v1';
+	protected $namespace = 'newfold-performance/v1';
 
 	/**
 	 * REST base
 	 *
 	 * @var string
 	 */
-	protected $rest_base = '/cacheexclusion';
-
-	/**
-	 * Container loaded from the brand plugin.
-	 *
-	 * @var Container
-	 */
-	protected $container;
-
-	/**
-	 * Option used to store all pages should be excluded from cache.
-	 *
-	 * @var string
-	 */
-	const OPTION_CACHE_EXCLUSION = 'newfold_cache_exclusion';
-
-	/**
-	 * Constructor
-	 *
-	 * @param Container $container the container.
-	 */
-	public function __construct( Container $container ) {
-		$this->container = $container;
-	}
+	protected $rest_base = '/cache-exclusion';
 
 	/**
 	 * Registers rest routes for PluginsController class.
@@ -89,7 +63,7 @@ public function register_routes() {
 	public function get_settings() {
 		return new \WP_REST_Response(
 			array(
-				'cacheExclusion' => get_option( self::OPTION_CACHE_EXCLUSION, getDefaultCacheExclusions() ),
+				'cacheExclusion' => get_option( CacheExclusion::OPTION_CACHE_EXCLUSION, getDefaultCacheExclusions() ),
 			),
 			200
 		);
@@ -103,7 +77,7 @@ public function get_settings() {
 	 */
 	public function update_settings( \WP_REST_Request $request ) {
 		$cache_exclusion = $request->get_param( 'cacheExclusion' );
-		if ( update_option( self::OPTION_CACHE_EXCLUSION, $cache_exclusion ) ) {
+		if ( update_option( CacheExclusion::OPTION_CACHE_EXCLUSION, $cache_exclusion ) ) {
 			return new \WP_REST_Response(
 				array(
 					'result' => true,
diff --git a/includes/RestApi/RestApi.php b/includes/RestApi/RestApi.php
index 5351667..6380712 100644
--- a/includes/RestApi/RestApi.php
+++ b/includes/RestApi/RestApi.php
@@ -15,6 +15,7 @@ final class RestApi {
 	protected $controllers = array(
 		'NewfoldLabs\\WP\\Module\\Performance\\RestApi\\LinkPrefetchController',
 		'NewfoldLabs\\WP\\Module\\Performance\\RestApi\\JetpackController',
+		'NewfoldLabs\\WP\\Module\\Performance\\RestApi\\CacheExclusionController',
 	);
 
 	/**

From 0a1d3826ba097bdec5900186b938da269676e008 Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Wed, 8 Jan 2025 08:28:22 +0000
Subject: [PATCH 38/42] adding CacheExclusion Class

---
 includes/CacheExclusion.php | 48 +++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 includes/CacheExclusion.php

diff --git a/includes/CacheExclusion.php b/includes/CacheExclusion.php
new file mode 100644
index 0000000..3dde4ea
--- /dev/null
+++ b/includes/CacheExclusion.php
@@ -0,0 +1,48 @@
+<?php
+namespace NewfoldLabs\WP\Module\Performance;
+
+use NewfoldLabs\WP\ModuleLoader\Container;
+
+use NewfoldLabs\WP\Module\Performance\RestApi\CacheExclusionController;
+
+use function NewfoldLabs\WP\Module\Performance\getDefaultCacheExclusions;
+
+/**
+ * Cache Exclusion Class
+ */
+class CacheExclusion {
+	/**
+	 * Dependency injection container.
+	 *
+	 * @var Container
+	 */
+	protected $container;
+
+	/**
+	 * Option used to store all pages should be excluded from cache.
+	 *
+	 * @var string
+	 */
+	const OPTION_CACHE_EXCLUSION = 'nfd_performance_cache_exclusion';
+
+	/**
+	 * Constructor.
+	 *
+	 * @param Container $container the container
+	 */
+	public function __construct( Container $container ) {
+		$this->container = $container;
+
+		add_filter( 'newfold-runtime', array( $this, 'add_to_runtime' ) );
+	}
+	/**
+	 * Add values to the runtime object.
+	 *
+	 * @param array $sdk The runtime object.
+	 *
+	 * @return array
+	 */
+	public function add_to_runtime( $sdk ) {
+		return array_merge( $sdk, array( 'cacheExclusion' => get_option( self::OPTION_CACHE_EXCLUSION, getDefaultCacheExclusions() ) ) );
+	}
+}
\ No newline at end of file

From f5ae0a2b219e4a473205f4e18b731653a3cfe16b Mon Sep 17 00:00:00 2001
From: Armando Liccardo <li.armando82@gmail.com>
Date: Wed, 8 Jan 2025 08:53:49 +0000
Subject: [PATCH 39/42] change function name to snake case and minor changes
 for phpcs

---
 includes/CacheExclusion.php                   | 8 +++-----
 includes/CacheManager.php                     | 8 ++++++--
 includes/CacheTypes/File.php                  | 2 +-
 includes/Performance.php                      | 5 ++---
 includes/RestApi/CacheExclusionController.php | 4 ++--
 includes/functions.php                        | 4 ++--
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/includes/CacheExclusion.php b/includes/CacheExclusion.php
index 3dde4ea..39d8977 100644
--- a/includes/CacheExclusion.php
+++ b/includes/CacheExclusion.php
@@ -3,9 +3,7 @@
 
 use NewfoldLabs\WP\ModuleLoader\Container;
 
-use NewfoldLabs\WP\Module\Performance\RestApi\CacheExclusionController;
-
-use function NewfoldLabs\WP\Module\Performance\getDefaultCacheExclusions;
+use function NewfoldLabs\WP\Module\Performance\get_default_cache_exclusions;
 
 /**
  * Cache Exclusion Class
@@ -43,6 +41,6 @@ public function __construct( Container $container ) {
 	 * @return array
 	 */
 	public function add_to_runtime( $sdk ) {
-		return array_merge( $sdk, array( 'cacheExclusion' => get_option( self::OPTION_CACHE_EXCLUSION, getDefaultCacheExclusions() ) ) );
+		return array_merge( $sdk, array( 'cacheExclusion' => get_option( self::OPTION_CACHE_EXCLUSION, get_default_cache_exclusions() ) ) );
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/CacheManager.php b/includes/CacheManager.php
index cb74238..28cf7cf 100644
--- a/includes/CacheManager.php
+++ b/includes/CacheManager.php
@@ -5,7 +5,9 @@
 use NewfoldLabs\WP\Module\Performance\CacheTypes\CacheBase;
 use NewfoldLabs\WP\ModuleLoader\Container;
 use WP_Forge\Collection\Collection;
-
+/**
+ * Cache Manager Class
+ */
 class CacheManager {
 	/**
 	 * Dependency injection container.
@@ -17,7 +19,7 @@ class CacheManager {
 	/**
 	 * Constructor.
 	 *
-	 * @param string[] $supportedCacheTypes Cache types supported by the plugin
+	 * @param Container $container the container
 	 */
 	public function __construct( Container $container ) {
 		$this->container = $container;
@@ -79,6 +81,8 @@ public function getInstances() {
 		$map        = $collection->only( $this->enabledCacheTypes() );
 		foreach ( $map as $type => $class ) {
 			/**
+			 * CacheBase instance.
+			 *
 			 * @var CacheBase $class
 			 */
 			if ( $class::shouldEnable( $this->container ) ) {
diff --git a/includes/CacheTypes/File.php b/includes/CacheTypes/File.php
index d1048c5..60d9ef9 100644
--- a/includes/CacheTypes/File.php
+++ b/includes/CacheTypes/File.php
@@ -50,7 +50,7 @@ public static function shouldEnable( Container $container ) {
 	public function __construct() {
 
 		new OptionListener( Performance::OPTION_CACHE_LEVEL, array( __CLASS__, 'maybeAddRules' ) );
-		new OptionListener( CacheExclusionController::OPTION_CACHE_EXCLUSION, array( __CLASS__, 'exclusionChange' ) );
+		new OptionListener( CacheExclusion::OPTION_CACHE_EXCLUSION, array( __CLASS__, 'exclusionChange' ) );
 
 		add_action( 'init', array( $this, 'maybeGeneratePageCache' ) );
 		add_action( 'newfold_update_htaccess', array( $this, 'onRewrite' ) );
diff --git a/includes/Performance.php b/includes/Performance.php
index 1ed2ffc..d395ae5 100644
--- a/includes/Performance.php
+++ b/includes/Performance.php
@@ -308,7 +308,7 @@ public function add_sub_menu_page() {
 		);
 	}
 
-	/*
+	/**
 	 * Enqueue scripts and styles in admin
 	 */
 	public function enqueue_scripts() {
@@ -317,8 +317,7 @@ public function enqueue_scripts() {
 		wp_enqueue_style( 'wp-module-performance-styles' );
 	}
 
-	/*
-
+	/**
 	 * Add to Newfold SDK runtime.
 	 *
 	 * @param array $sdk SDK data.
diff --git a/includes/RestApi/CacheExclusionController.php b/includes/RestApi/CacheExclusionController.php
index b84da03..ce056f4 100644
--- a/includes/RestApi/CacheExclusionController.php
+++ b/includes/RestApi/CacheExclusionController.php
@@ -5,7 +5,7 @@
 use NewfoldLabs\WP\Module\ECommerce\Permissions;
 use NewfoldLabs\WP\Module\Performance\CacheExclusion;
 
-use function NewfoldLabs\WP\Module\Performance\getDefaultCacheExclusions;
+use function NewfoldLabs\WP\Module\Performance\get_default_cache_exclusions;
 
 /**
  * Class CacheExclusionController
@@ -63,7 +63,7 @@ public function register_routes() {
 	public function get_settings() {
 		return new \WP_REST_Response(
 			array(
-				'cacheExclusion' => get_option( CacheExclusion::OPTION_CACHE_EXCLUSION, getDefaultCacheExclusions() ),
+				'cacheExclusion' => get_option( CacheExclusion::OPTION_CACHE_EXCLUSION, get_default_cache_exclusions() ),
 			),
 			200
 		);
diff --git a/includes/functions.php b/includes/functions.php
index 770a54a..7b76a38 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -7,8 +7,8 @@
  *
  * @return array
  */
-function getDefaultCacheExclusions() {
-	return join( ',', [ 'cart', 'checkout', 'wp-admin', rest_get_url_prefix() ] );
+function get_default_cache_exclusions() {
+	return join( ',', array( 'cart', 'checkout', 'wp-admin', rest_get_url_prefix() ) );
 }
 
 /**

From ece783421d7ae8d7a18180987ad6e6900d5db659 Mon Sep 17 00:00:00 2001
From: Alessio Torrisi <alessiotorrisidev@gmail.com>
Date: Wed, 8 Jan 2025 12:27:48 +0100
Subject: [PATCH 40/42] Fix: wrong name used for Browser.php file

---
 includes/BurstSafetyMode/init.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/BurstSafetyMode/init.php b/includes/BurstSafetyMode/init.php
index e78bded..41fbe35 100644
--- a/includes/BurstSafetyMode/init.php
+++ b/includes/BurstSafetyMode/init.php
@@ -34,7 +34,7 @@
 			'htaccess'                => BLUEHOST_PLUGIN_DIR . 'vendor/wp-forge/wp-htaccess-manager/includes/htaccess.php',
 			'htaccess_functions'      => BLUEHOST_PLUGIN_DIR . 'vendor/wp-forge/wp-htaccess-manager/includes/functions.php',
 			'skip404'                 => BLUEHOST_PLUGIN_DIR . 'vendor/newfold-labs/wp-module-performance/includes/BurstSafetyMode/Skip404.php',
-			'browser'                 => BLUEHOST_PLUGIN_DIR . 'vendor/newfold-labs/wp-module-performance/includes/BurstSafetyMode/browser.php',
+			'browser'                 => BLUEHOST_PLUGIN_DIR . 'vendor/newfold-labs/wp-module-performance/includes/BurstSafetyMode/Browser.php',
 			'response_header_manager' => BLUEHOST_PLUGIN_DIR . 'vendor/newfold-labs/wp-module-performance/includes/BurstSafetyMode/ResponseHeaderManager.php',
 		);
 

From 037d17c4766058286b291f83971dd32e0d9b0030 Mon Sep 17 00:00:00 2001
From: arunshenoy99 <devarunshenoy99@gmail.com>
Date: Wed, 8 Jan 2025 20:24:39 +0530
Subject: [PATCH 41/42] Some formatting related fixes

---
 includes/BurstSafetyMode/Browser.php  | 1 +
 includes/BurstSafetyMode/Skip404.php  | 9 +++++----
 includes/BurstSafetyMode/init.php     | 7 ++++---
 includes/burstSafetyModeFunctions.php | 1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/includes/BurstSafetyMode/Browser.php b/includes/BurstSafetyMode/Browser.php
index 9bbba02..6f97d3b 100644
--- a/includes/BurstSafetyMode/Browser.php
+++ b/includes/BurstSafetyMode/Browser.php
@@ -1,5 +1,6 @@
 <?php
 namespace NewfoldLabs\WP\Module\Performance\BurstSafetyMode;
+
 use NewfoldLabs\WP\Module\Performance\BurstSafetyMode\ResponseHeaderManager;
 use WP_Forge\WP_Htaccess_Manager\htaccess;
 
diff --git a/includes/BurstSafetyMode/Skip404.php b/includes/BurstSafetyMode/Skip404.php
index a7e061e..18afd04 100644
--- a/includes/BurstSafetyMode/Skip404.php
+++ b/includes/BurstSafetyMode/Skip404.php
@@ -1,5 +1,6 @@
 <?php
 namespace NewfoldLabs\WP\Module\Performance\BurstSafetyMode;
+
 use function WP_Forge\WP_Htaccess_Manager\addContent;
 use function WP_Forge\WP_Htaccess_Manager\removeMarkers;
 
@@ -10,8 +11,8 @@ class Skip404 {
 	const MARKER = 'Newfold Skip 404 Handling for Static Files';
 
 		/**
-	 * Constructor.
-	 */
+		 * Constructor.
+		 */
 	public function __construct() {
 
 		$this->addRules();
@@ -19,8 +20,8 @@ public function __construct() {
 
 
 		/**
-	 * Add our rules to the .htacces file.
-	 */
+		 * Add our rules to the .htacces file.
+		 */
 	public static function addRules() {
 		$content = <<<HTACCESS
 <IfModule mod_rewrite.c>
diff --git a/includes/BurstSafetyMode/init.php b/includes/BurstSafetyMode/init.php
index 41fbe35..df5572e 100644
--- a/includes/BurstSafetyMode/init.php
+++ b/includes/BurstSafetyMode/init.php
@@ -28,8 +28,7 @@
 
 		delete_option( 'newfold_burst_safety_mode' );
 	}
-} else {
-	if ( ! $newfold_burst_safety_mode ) {
+} elseif ( ! $newfold_burst_safety_mode ) {
 		$files_to_include = array(
 			'htaccess'                => BLUEHOST_PLUGIN_DIR . 'vendor/wp-forge/wp-htaccess-manager/includes/htaccess.php',
 			'htaccess_functions'      => BLUEHOST_PLUGIN_DIR . 'vendor/wp-forge/wp-htaccess-manager/includes/functions.php',
@@ -53,5 +52,7 @@
 		}
 
 		update_option( 'newfold_burst_safety_mode', true );
-	}
 }
+
+
+vendor / bin / phpcbf --standard = phpcs . xml - s 'bootstrap.php' 'includes/BurstSafetyMode/Browser.php' 'includes/BurstSafetyMode/ResponseHeaderManager.php' 'includes/BurstSafetyMode/Skip404.php' 'includes/BurstSafetyMode/init.php' 'includes/CacheExclusion.php' 'includes/CacheManager.php' 'includes/CacheTypes/Browser.php' 'includes/CacheTypes/File.php' 'includes/Performance.php' 'includes/RestApi/CacheExclusionController.php' 'includes/RestApi/RestApi.php' 'includes/RestApi/SettingsController.php' 'includes/burstSafetyModeFunctions.php' 'includes/functions.php'
diff --git a/includes/burstSafetyModeFunctions.php b/includes/burstSafetyModeFunctions.php
index 53cb68c..62ef02c 100644
--- a/includes/burstSafetyModeFunctions.php
+++ b/includes/burstSafetyModeFunctions.php
@@ -1,5 +1,6 @@
 <?php
 namespace NewfoldLabs\WP\Module\Performance;
+
 use NewfoldLabs\WP\Module\Performance\CacheTypes\Browser;
 use NewfoldLabs\WP\Module\Performance\CacheTypes\Skip404;
 use NewfoldLabs\WP\Module\Performance\ResponseHeaderManager;

From 682d95114a410330fe35d915f171a2f371e48870 Mon Sep 17 00:00:00 2001
From: arunshenoy99 <devarunshenoy99@gmail.com>
Date: Wed, 8 Jan 2025 20:52:16 +0530
Subject: [PATCH 42/42] Fix error

---
 includes/BurstSafetyMode/init.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/includes/BurstSafetyMode/init.php b/includes/BurstSafetyMode/init.php
index df5572e..2447e2e 100644
--- a/includes/BurstSafetyMode/init.php
+++ b/includes/BurstSafetyMode/init.php
@@ -23,8 +23,8 @@
 			$skip404::maybeAddRules( false );
 		}
 
-		$responseHeaderManager = new ResponseHeaderManager();
-		$responseHeaderManager->addHeader( 'X-Newfold-Cache-Level', $newfold_cache_level );
+		$response_header_manager = new ResponseHeaderManager();
+		$response_header_manager->addHeader( 'X-Newfold-Cache-Level', $newfold_cache_level );
 
 		delete_option( 'newfold_burst_safety_mode' );
 	}
@@ -37,9 +37,9 @@
 			'response_header_manager' => BLUEHOST_PLUGIN_DIR . 'vendor/newfold-labs/wp-module-performance/includes/BurstSafetyMode/ResponseHeaderManager.php',
 		);
 
-		foreach ( $files_to_include as $path ) {
-			if ( file_exists( $path ) ) {
-				require_once $path;
+		foreach ( $files_to_include as $file_path ) {
+			if ( file_exists( $file_path ) ) {
+				require_once $file_path;
 			}
 		}
 
@@ -53,6 +53,3 @@
 
 		update_option( 'newfold_burst_safety_mode', true );
 }
-
-
-vendor / bin / phpcbf --standard = phpcs . xml - s 'bootstrap.php' 'includes/BurstSafetyMode/Browser.php' 'includes/BurstSafetyMode/ResponseHeaderManager.php' 'includes/BurstSafetyMode/Skip404.php' 'includes/BurstSafetyMode/init.php' 'includes/CacheExclusion.php' 'includes/CacheManager.php' 'includes/CacheTypes/Browser.php' 'includes/CacheTypes/File.php' 'includes/Performance.php' 'includes/RestApi/CacheExclusionController.php' 'includes/RestApi/RestApi.php' 'includes/RestApi/SettingsController.php' 'includes/burstSafetyModeFunctions.php' 'includes/functions.php'