Merge pull request #15 from newfold-labs/fix/epc-conflicts

Fix EPC conflicts
newfold-labs · Oct 30, 2023 · f5cf592 · f5cf592
2 parents b341bb7 + d1958cd
commit f5cf592
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 8 deletions.
diff --git a/includes/CacheTypes/Skip404.php b/includes/CacheTypes/Skip404.php
@@ -36,14 +36,16 @@ public function __construct() {
 		new OptionListener( Performance::OPTION_SKIP_404, [ __CLASS__, 'maybeAddRules' ] );
 
 		add_filter( 'newfold_update_htaccess', [ $this, 'onUpdateHtaccess' ] );
-		add_action( 'admin_init', [ $this, 'registerSettings' ] );
+		add_action( 'admin_init', [ $this, 'registerSettings' ], 11 );
 	}
 
 	/**
 	 * Register our setting to the main performance settings section.
 	 */
 	public function registerSettings() {
 
+		global $wp_settings_fields;
+
 		add_settings_field(
 			Performance::OPTION_SKIP_404,
 			__( 'Skip WordPress 404 Handling For Static Files', 'newfold-performance-module' ),
@@ -54,13 +56,25 @@ public function registerSettings() {
 
 		register_setting( 'general', Performance::OPTION_SKIP_404 );
 
+		// 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', 'epc_skip_404_handling' );
+		}
+
 	}
 
 	/**
 	 * When updating .htaccess, also update our rules as appropriate.
 	 */
 	public function onUpdateHtaccess() {
 		self::maybeAddRules( getSkip404Option() );
+
+		// Remove the old option from EPC, if it exists
+		if ( $this->container->get( 'hasMustUsePlugin' ) && absint( get_option( 'epc_skip_404_handling', 0 ) ) ) {
+			update_option( 'epc_skip_404_handling', 0 );
+			delete_option( 'epc_skip_404_handling' );
+		}
 	}
 
 	/**

diff --git a/includes/Performance.php b/includes/Performance.php
@@ -57,7 +57,7 @@ class Performance {
 	/**
 	 * Constructor.
 	 *
-	 * @param  Container  $container
+	 * @param Container $container
 	 */
 	public function __construct( Container $container ) {
 
@@ -71,7 +71,7 @@ public function __construct( Container $container ) {
 
 		// Ensure that purgeable cache types are enabled before showing the UI.
 		if ( $cachePurger->canPurge() ) {
-			add_action( 'admin_bar_menu', [ $this, 'adminBarMenu' ], 999 );
+			add_action( 'admin_bar_menu', [ $this, 'adminBarMenu' ], 100 );
 		}
 
 		$container->set( 'cachePurger', $cachePurger );
@@ -102,7 +102,7 @@ function () {
 	 */
 	public function hooks( Container $container ) {
 
-		add_action( 'admin_init', [ $this, 'registerSettings' ] );
+		add_action( 'admin_init', [ $this, 'registerSettings' ], 11 );
 
 		new OptionListener( self::OPTION_CACHE_LEVEL, [ $this, 'onCacheLevelChange' ] );
 
@@ -143,18 +143,26 @@ public function onRewrite() {
 	/**
 	 * On cache level change, update the response headers.
 	 *
-	 * @param  int|null  $cacheLevel  The cache level.
+	 * @param int|null $cacheLevel The cache level.
 	 */
 	public function onCacheLevelChange( $cacheLevel ) {
 		/**
 		 * @var ResponseHeaderManager $responseHeaderManager
 		 */
 		$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' );
+		}
 	}
 
 	public function registerSettings() {
 
+		global $wp_settings_fields;
+
 		$section_name = self::SETTINGS_SECTION;
 
 		add_settings_section(
@@ -173,18 +181,24 @@ public function registerSettings() {
 		);
 
 		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' );
+		}
 	}
 
 	/**
 	 * Add options to the WordPress admin bar.
 	 *
-	 * @param  \WP_Admin_Bar  $wp_admin_bar
+	 * @param \WP_Admin_Bar $wp_admin_bar
 	 */
 	public function adminBarMenu( \WP_Admin_Bar $wp_admin_bar ) {
 
-		// If the EPC MU plugin exists, don't add an extra cache clearing option.
+		// If the EPC MU plugin exists, remove its cache clearing options.
 		if ( $this->container->get( 'hasMustUsePlugin' ) ) {
-			return;
+			$wp_admin_bar->remove_node( 'epc_purge_menu' );
 		}
 
 		if ( current_user_can( 'manage_options' ) ) {