Set cookie via header

Author: arunshenoy99

includes/Cloudflare/CloudflareFeaturesManager.php

@@ -2,6 +2,7 @@
 
 namespace NewfoldLabs\WP\Module\Performance\Cloudflare;
 
+use NewfoldLabs\WP\Module\Performance\Fonts\FontSettings;
 use NewfoldLabs\WP\Module\Performance\Images\ImageSettings;
 use WP_Forge\WP_Htaccess_Manager\htaccess;
 
@@ -50,6 +51,7 @@ public function on_fonts_optimization_change( $old_value, $new_value ) {
 	public function on_site_capabilities_change( $old_value, $new_value ) {
 		if ( is_array( $new_value ) ) {
 			ImageSettings::maybe_refresh_with_capabilities( $new_value );
+			FontSettings::maybe_refresh_with_capabilities( $new_value );
 		}
 	}
 
@@ -76,12 +78,19 @@ private function update_htaccess_header( $image_settings, $fonts_enabled ) {
 
 		if ( $mirage_enabled || $polish_enabled || $fonts_enabled_flag ) {
 			$rules = array(
+				'# BEGIN Newfold CF Optimization Header',
 				'<IfModule mod_headers.c>',
-				"\tHeader set X-NFD-CF-Optimization \"{$header_value}\" env=nfd_cf_opt",
+				"\tHeader set Set-Cookie \"nfd-enable-google-font-replace=true; path=/; Max-Age=86400; HttpOnly\" env=nfd_cf_opt",
 				'</IfModule>',
-				'# Match static asset requests',
-				'SetEnvIf Request_URI "\\.(jpe?g|png|gif|webp|woff2?|ttf|otf|eot|css)$" nfd_cf_opt',
-				'SetEnvIf Request_URI "fonts.googleapis.com" nfd_cf_opt',
+				'# Exclude admin and API paths',
+				'SetEnvIf Request_URI "^/wp-admin/" no_nfd_cf',
+				'SetEnvIf Request_URI "^/wp-json/" no_nfd_cf',
+				'SetEnvIf Request_URI "^/xmlrpc.php" no_nfd_cf',
+				'SetEnvIf Request_URI "^/wp-login.php" no_nfd_cf',
+				'SetEnvIf Request_URI "^/admin-ajax.php" no_nfd_cf',
+				'# Apply CF header on all non-admin, non-API requests',
+				'SetEnvIf Request_URI ".*" nfd_cf_opt=!no_nfd_cf',
+				'# END Newfold CF Optimization Header',
 			);
 		}
 

includes/Fonts/FontSettings.php

@@ -111,6 +111,33 @@ public function sanitize_settings( $settings ) {
 		);
 	}
 
+	/**
+	 * Refreshes legacy font settings based on Cloudflare capabilities.
+	 *
+	 * @param object|null $capabilities Optional capabilities object.
+	 */
+	public static function maybe_refresh_with_capabilities( $capabilities ) {
+		$settings = get_option( self::SETTING_KEY, array() );
+
+		// If settings are missing or invalid, fall back to defaults.
+		if ( empty( $settings ) || ! is_array( $settings ) ) {
+			$settings = array(
+				'cloudflare' => array(
+					'fonts'        => false,
+					'last_updated' => time(),
+				),
+			);
+		}
+
+		// Only update if fonts key is not set (i.e. legacy/no-toggle sites).
+		if ( ! isset( $settings['cloudflare']['fonts'] ) && is_object( $capabilities ) ) {
+			$settings['cloudflare']['fonts']        = (bool) $capabilities->get( 'hasCloudflareFonts' );
+			$settings['cloudflare']['last_updated'] = time();
+
+			update_option( self::SETTING_KEY, $settings );
+		}
+	}
+
 	/**
 	 * Checks if Cloudflare font optimization is enabled.
 	 *

includes/Images/ImageSettings.php

@@ -230,6 +230,7 @@ public function sanitize_settings( $settings ) {
 			),
 		);
 	}
+
 	/**
 	 * Refreshes legacy settings with Cloudflare feature flags based on capabilities.
 	 *