From a1016e96e9708045b4ed2a1a8aed9cf5626db475 Mon Sep 17 00:00:00 2001 From: Meet Makadia Date: Sat, 20 Apr 2024 15:22:17 +0530 Subject: [PATCH 1/4] WPCS improvement --- includes/admin/load.php | 2 +- includes/admin/plugins.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/admin/load.php b/includes/admin/load.php index d4a12608dc..a6d5d21fa0 100644 --- a/includes/admin/load.php +++ b/includes/admin/load.php @@ -248,7 +248,7 @@ function perflab_install_activate_plugin_callback() { wp_die( esc_html__( 'Invalid plugin.', 'performance-lab' ) ); } - $is_plugin_installed = isset( $_GET['file'] ) && $_GET['file']; + $is_plugin_installed = isset( $_GET['file'] ) && sanitize_text_field( wp_unslash( $_GET['file'] ) ); // Install the plugin if it is not installed yet. if ( ! $is_plugin_installed ) { diff --git a/includes/admin/plugins.php b/includes/admin/plugins.php index 1721cf4192..20fc40d97b 100644 --- a/includes/admin/plugins.php +++ b/includes/admin/plugins.php @@ -142,8 +142,8 @@ function perflab_render_plugin_card( array $plugin_data ) { $version = $plugin_data['version']; $name = wp_strip_all_tags( $title . ' ' . $version ); - $requires_php = isset( $plugin_data['requires_php'] ) ? $plugin_data['requires_php'] : null; - $requires_wp = isset( $plugin_data['requires'] ) ? $plugin_data['requires'] : null; + $requires_php = $plugin_data['requires_php'] ?? null; + $requires_wp = $plugin_data['requires'] ?? null; $compatible_php = is_php_version_compatible( $requires_php ); $compatible_wp = is_wp_version_compatible( $requires_wp ); From 8682da2896dc7f6715042fb6060193e4dcb4676e Mon Sep 17 00:00:00 2001 From: Meet Makadia Date: Tue, 23 Apr 2024 09:45:57 +0530 Subject: [PATCH 2/4] remove the sanitize --- includes/admin/load.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/admin/load.php b/includes/admin/load.php index a6d5d21fa0..d4a12608dc 100644 --- a/includes/admin/load.php +++ b/includes/admin/load.php @@ -248,7 +248,7 @@ function perflab_install_activate_plugin_callback() { wp_die( esc_html__( 'Invalid plugin.', 'performance-lab' ) ); } - $is_plugin_installed = isset( $_GET['file'] ) && sanitize_text_field( wp_unslash( $_GET['file'] ) ); + $is_plugin_installed = isset( $_GET['file'] ) && $_GET['file']; // Install the plugin if it is not installed yet. if ( ! $is_plugin_installed ) { From afbb65a81d6da43b64f5abcf497bf8a13a838a32 Mon Sep 17 00:00:00 2001 From: Meet Makadia Date: Wed, 24 Apr 2024 08:51:38 +0530 Subject: [PATCH 3/4] remove the requires check and use api response for checking --- includes/admin/plugins.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/includes/admin/plugins.php b/includes/admin/plugins.php index 20fc40d97b..60c1b67a74 100644 --- a/includes/admin/plugins.php +++ b/includes/admin/plugins.php @@ -142,11 +142,8 @@ function perflab_render_plugin_card( array $plugin_data ) { $version = $plugin_data['version']; $name = wp_strip_all_tags( $title . ' ' . $version ); - $requires_php = $plugin_data['requires_php'] ?? null; - $requires_wp = $plugin_data['requires'] ?? null; - - $compatible_php = is_php_version_compatible( $requires_php ); - $compatible_wp = is_wp_version_compatible( $requires_wp ); + $compatible_php = is_php_version_compatible( $plugin_data['requires_php'] ); + $compatible_wp = is_wp_version_compatible( $plugin_data['requires'] ); $action_links = array(); $status = install_plugin_install_status( $plugin_data ); From 31c56407613fe7d453b60130ea55279d27785199 Mon Sep 17 00:00:00 2001 From: Meet Makadia Date: Wed, 24 Apr 2024 10:26:09 +0530 Subject: [PATCH 4/4] checking or condition with variable --- includes/admin/plugins.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/admin/plugins.php b/includes/admin/plugins.php index 60c1b67a74..35ed08d5f3 100644 --- a/includes/admin/plugins.php +++ b/includes/admin/plugins.php @@ -142,8 +142,8 @@ function perflab_render_plugin_card( array $plugin_data ) { $version = $plugin_data['version']; $name = wp_strip_all_tags( $title . ' ' . $version ); - $compatible_php = is_php_version_compatible( $plugin_data['requires_php'] ); - $compatible_wp = is_wp_version_compatible( $plugin_data['requires'] ); + $compatible_php = ! $plugin_data['requires_php'] || is_php_version_compatible( $plugin_data['requires_php'] ); + $compatible_wp = ! $plugin_data['requires'] || is_wp_version_compatible( $plugin_data['requires'] ); $action_links = array(); $status = install_plugin_install_status( $plugin_data );