From 4532b11b001f364918290bb379ca0b5faac786dd Mon Sep 17 00:00:00 2001 From: Michael Sumner <75835774+michael-sumner@users.noreply.github.com> Date: Thu, 21 Dec 2023 14:01:28 +0000 Subject: [PATCH 1/2] fix(functions): replace undefined is_plugin_active function --- onelogin-saml-sso/php/functions.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/onelogin-saml-sso/php/functions.php b/onelogin-saml-sso/php/functions.php index 17def48..a5c3b30 100644 --- a/onelogin-saml-sso/php/functions.php +++ b/onelogin-saml-sso/php/functions.php @@ -105,8 +105,9 @@ function saml_custom_login_footer() { } $login_page = 'wp-login.php'; - if (is_plugin_active('wps-hide-login/wps-hide-login.php')) { - $login_page = str_replace( 'wp-login.php', get_site_option( 'whl_page', 'login' ), $login_page ) . '/'; + $active_plugins = get_option( 'active_plugins' ); + if ( is_array( $active_plugins ) && ! empty( $active_plugins ) && in_array( 'wps-hide-login/wps-hide-login.php', $active_plugins, true ) ) { + $login_page = str_replace( 'wp-login.php', esc_url( get_site_option( 'whl_page', 'login' ) ), $login_page ) . '/'; } $redirect_to = isset($_GET['redirect_to']) ? '&redirect_to='.$_GET['redirect_to'] : ''; From c5b678e224fc15ea8938c6b01a94558a2fa47f5f Mon Sep 17 00:00:00 2001 From: Michael Sumner Date: Wed, 3 Jan 2024 17:17:32 +0000 Subject: [PATCH 2/2] feat(onelogin_saml): add loggedout query --- onelogin-saml-sso/onelogin_saml.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onelogin-saml-sso/onelogin_saml.php b/onelogin-saml-sso/onelogin_saml.php index 67f9fa2..21782a6 100644 --- a/onelogin-saml-sso/onelogin_saml.php +++ b/onelogin-saml-sso/onelogin_saml.php @@ -123,7 +123,7 @@ function onelogin_enqueue_script() { wp_enqueue_script( 'onelogin-hide-login-form', plugins_url( 'assets/js/hide-login-form.js', __FILE__ ), array('jquery'), null, true ); } -if ((strpos($_SERVER['SCRIPT_NAME'], 'wp-login.php') !== FALSE) && $action == 'login' && !isset($_GET['normal'])) { +if ((strpos($_SERVER['SCRIPT_NAME'], 'wp-login.php') !== FALSE) && $action == 'login' && !isset($_GET['normal']) && !isset($_GET['loggedout'])) { if (!get_option('onelogin_saml_keep_local_login', false)) { add_action( 'login_enqueue_scripts', 'onelogin_enqueue_script', 10 ); }