From a732116951dd1e1bb82731309a096b421ce61e6f Mon Sep 17 00:00:00 2001 From: Simon Dowdles Date: Wed, 3 Jul 2024 15:21:47 +0200 Subject: [PATCH 1/4] Apply changes to obtain wp-consent-api plugin info even when in non-standard location. --- .../REST_Consent_Mode_Controller.php | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php b/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php index 95041214215..31ed7dc07cd 100644 --- a/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php +++ b/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php @@ -150,10 +150,11 @@ protected function get_rest_routes() { array( 'methods' => WP_REST_Server::READABLE, 'callback' => function () { - $is_active = function_exists( 'wp_set_consent' ); - $installed = $is_active; - $slug = 'wp-consent-api'; - $plugin = "$slug/$slug.php"; + $is_active = function_exists( 'wp_set_consent' ); + $installed = $is_active; + $plugin_uri = 'https://wordpress.org/plugins/wp-consent-api'; + $slug = ''; + $plugin = ''; $response = array( 'hasConsentAPI' => $is_active, @@ -163,13 +164,19 @@ protected function get_rest_routes() { if ( ! function_exists( 'get_plugins' ) ) { require_once ABSPATH . 'wp-admin/includes/plugin.php'; } - foreach ( array_keys( get_plugins() ) as $installed_plugin ) { - if ( $installed_plugin === $plugin ) { + foreach ( get_plugins() as $plugin_file => $installed_plugin ) { + if ( $installed_plugin['PluginURI'] === $plugin_uri ) { + $slug = $installed_plugin['TextDomain']; + $plugin = $plugin_file; $installed = true; break; } } + // If the plugin is not installed, set fallback slug and plugin objects. + $slug = ! empty( $slug ) ? $slug : 'wp-consent-api'; + $plugin = ! empty( $plugin ) ? $plugin : "$slug/$slug.php"; + // Alternate wp_nonce_url without esc_html breaking query parameters. $nonce_url = function ( $action_url, $action ) { return add_query_arg( '_wpnonce', wp_create_nonce( $action ), $action_url ); From 3c6a613ca1bc97f1654a717e9e7ac062b87a4a1e Mon Sep 17 00:00:00 2001 From: nfmohit Date: Sat, 13 Jul 2024 02:01:04 +0600 Subject: [PATCH 2/4] Statically define plugin slug. --- .../Core/Consent_Mode/REST_Consent_Mode_Controller.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php b/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php index 31ed7dc07cd..1e7805553a1 100644 --- a/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php +++ b/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php @@ -153,8 +153,8 @@ protected function get_rest_routes() { $is_active = function_exists( 'wp_set_consent' ); $installed = $is_active; $plugin_uri = 'https://wordpress.org/plugins/wp-consent-api'; - $slug = ''; - $plugin = ''; + $slug = 'wp-consent-api'; + $plugin = "$slug/$slug.php"; $response = array( 'hasConsentAPI' => $is_active, @@ -166,17 +166,12 @@ protected function get_rest_routes() { } foreach ( get_plugins() as $plugin_file => $installed_plugin ) { if ( $installed_plugin['PluginURI'] === $plugin_uri ) { - $slug = $installed_plugin['TextDomain']; $plugin = $plugin_file; $installed = true; break; } } - // If the plugin is not installed, set fallback slug and plugin objects. - $slug = ! empty( $slug ) ? $slug : 'wp-consent-api'; - $plugin = ! empty( $plugin ) ? $plugin : "$slug/$slug.php"; - // Alternate wp_nonce_url without esc_html breaking query parameters. $nonce_url = function ( $action_url, $action ) { return add_query_arg( '_wpnonce', wp_create_nonce( $action ), $action_url ); From 374cf8b50017d3a828f0f87b90f1ddce427ba9f3 Mon Sep 17 00:00:00 2001 From: nfmohit Date: Sat, 13 Jul 2024 02:22:12 +0600 Subject: [PATCH 3/4] Add slug inline. --- includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php b/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php index 1e7805553a1..f37f010035f 100644 --- a/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php +++ b/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php @@ -153,8 +153,7 @@ protected function get_rest_routes() { $is_active = function_exists( 'wp_set_consent' ); $installed = $is_active; $plugin_uri = 'https://wordpress.org/plugins/wp-consent-api'; - $slug = 'wp-consent-api'; - $plugin = "$slug/$slug.php"; + $plugin = 'wp-consent-api/wp-consent-api.php'; $response = array( 'hasConsentAPI' => $is_active, @@ -177,7 +176,7 @@ protected function get_rest_routes() { return add_query_arg( '_wpnonce', wp_create_nonce( $action ), $action_url ); }; $activate_url = $nonce_url( self_admin_url( 'plugins.php?action=activate&plugin=' . $plugin ), 'activate-plugin_' . $plugin ); - $install_url = $nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=' . $slug ), 'install-plugin_' . $slug ); + $install_url = $nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=wp-consent-api' ), 'install-plugin_wp-consent-api' ); $response['wpConsentPlugin'] = array( 'installed' => $installed, From 778c18c709da1c7fa8a93e3ae42711e942ebee6e Mon Sep 17 00:00:00 2001 From: nfmohit Date: Sat, 13 Jul 2024 02:56:57 +0600 Subject: [PATCH 4/4] Optimize plugin detection. --- .../REST_Consent_Mode_Controller.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php b/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php index f37f010035f..d83e3297aaa 100644 --- a/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php +++ b/includes/Core/Consent_Mode/REST_Consent_Mode_Controller.php @@ -163,11 +163,18 @@ protected function get_rest_routes() { if ( ! function_exists( 'get_plugins' ) ) { require_once ABSPATH . 'wp-admin/includes/plugin.php'; } - foreach ( get_plugins() as $plugin_file => $installed_plugin ) { - if ( $installed_plugin['PluginURI'] === $plugin_uri ) { - $plugin = $plugin_file; - $installed = true; - break; + + $plugins = get_plugins(); + + if ( array_key_exists( $plugin, $plugins ) ) { + $installed = true; + } else { + foreach ( $plugins as $plugin_file => $installed_plugin ) { + if ( $installed_plugin['PluginURI'] === $plugin_uri ) { + $plugin = $plugin_file; + $installed = true; + break; + } } }