fix: logical errors

Author: RaduCristianPopescu

inc/admin.php

@@ -2295,23 +2295,29 @@ public function should_show_exceed_quota_warning() {
 	 */
 	private function get_active_notices_count() {
 		$conflicting_plugins = $this->conflicting_plugins->get_conflicting_plugins();
+		$conflicts_count = 0;
 
 		foreach ( $conflicting_plugins as $key => $plugin ) {
+			$key = str_replace( 'wp-', '', $key );
 			$class_name = 'Optml_' . ucfirst( $key );
 
-			if ( class_exists( $class_name ) ) {
-				try {
-					$conflict_instance = new $class_name();
+			if ( ! class_exists( $class_name ) ) {
+				continue;
+			}
+			$conflict_instance = new $class_name();
 
-					if ( method_exists( $conflict_instance, 'is_conflict_valid' ) && ! $conflict_instance->is_conflict_valid() ) {
-						unset( $conflicting_plugins[ $key ] );
-					}
-				} catch ( Exception $e ) {
-					unset( $conflicting_plugins[ $key ] );
-				}
+
+			if ( ! is_a( $conflict_instance, 'Optml_Abstract_Conflict' ) ) {
+				continue;
+			}
+
+			if ( $conflict_instance->is_conflict_valid() ) {
+				++$conflicts_count;
 			}
 		}
 
-		return count( $conflicting_plugins );
+		$dismissed_notices = get_option( 'optml_dismissed_conflicts', [] );
+    
+		return $conflicts_count - count( $dismissed_notices );
 	}
 }

inc/conflicts/litespeed.php

@@ -8,7 +8,7 @@
 class Optml_Litespeed extends Optml_Abstract_Conflict {
 
 	/**
-	 * Optml_Litespeed_Cache constructor.
+	 * Optml_Litespeed constructor.
 	 */
 	public function __construct() {
 		$this->severity = self::SEVERITY_MEDIUM;
@@ -25,7 +25,7 @@ public function define_message() {
 		$this->message = sprintf(
 			/* translators: 1 is the settings path link */
 			__( 'LiteSpeed Cache has <strong>Lazy Loading</strong> enabled. Optimole already provides its own lazy loading mechanism, which may conflict with LiteSpeed Cache\'s. To continue using Optimole\'s lazy loading feature, please disable lazy loading in %1$s.', 'optimole-wp' ),
-			'<a href="' . admin_url( 'admin.php?page=litespeed-page_optm' ) . '">LiteSpeed Cache → Page Optimization → Media Settings</a>'
+			'<a href="' . admin_url( 'admin.php?page=litespeed-page_optm#settings_media' ) . '">LiteSpeed Cache → Page Optimization → Media Settings</a>'
 		);
 	}
 
@@ -45,34 +45,22 @@ public function is_conflict_valid() {
 			return false;
 		}
 
-		if ( ! class_exists( 'LiteSpeed\Base', false ) || ! class_exists( 'LiteSpeed\Conf', false ) ) {
+		if ( ! class_exists( 'LiteSpeed\Conf', false ) || ! class_exists( 'LiteSpeed\Base', false ) ) {
 			return false;
 		}
 
-		try {
-			$litespeed_lazy_enabled = false;
+		$conf_instance = \LiteSpeed\Conf::cls();
+		$lazy_setting = $conf_instance->conf( \LiteSpeed\Base::O_MEDIA_LAZY );
 
-			if ( class_exists( 'LiteSpeed\Conf', false ) && class_exists( 'LiteSpeed\Base', false ) ) {
-				$conf_instance = \LiteSpeed\Conf::cls();
-				$lazy_setting = $conf_instance->conf( \LiteSpeed\Base::O_MEDIA_LAZY );
-
-				if ( $lazy_setting ) {
-					if ( class_exists( 'LiteSpeed\Metabox', false ) ) {
-						$metabox = \LiteSpeed\Metabox::cls();
-						$no_lazy_setting = $metabox->setting( 'litespeed_no_image_lazy' );
+		if ( ! $lazy_setting ) {
+			return false;
+		}
 
-						$litespeed_lazy_enabled = ! $no_lazy_setting;
-					} else {
-						$litespeed_lazy_enabled = true;
-					}
-				}
-			}
+		if ( class_exists( 'LiteSpeed\Metabox', false ) ) {
+			$metabox = \LiteSpeed\Metabox::cls();
+			$no_lazy_setting = $metabox->setting( 'litespeed_no_image_lazy' );
 
-			if ( $litespeed_lazy_enabled ) {
-				return true;
-			}
-		} catch ( Exception $e ) {
-			error_log( 'Optml_Litespeed: Exception while checking LiteSpeed settings: ' . $e->getMessage() );
+			return ! $no_lazy_setting;
 		}
 
 		return false;