Changeset 2336

Timestamp:

01/20/2016 03:19:31 PM (9 years ago)

Author:

stephdau

Message:

WordPress.org SSO: Improvement: Try to send people back to a better destination that just ​https://login.wordpress.org/loggedout/ (kept as fallback) when logging out, such as the page they instigated the logout from.

If said page is public, they will be sent bacck,loged out. If said page is private, they will once again be promted to login, as if they had accessed it directly.

See #1524

Location:

sites/trunk/common/includes/wporg-sso

Files:

• class-wporg-sso.php (modified) (1 diff)
• wp-plugin.php (modified) (2 diffs)

sites/trunk/common/includes/wporg-sso/class-wporg-sso.php

@@ -96 +96 @@
          */
         protected function _get_safer_redirect_to() {
-            // Setup a default redirect to URL, with a safe version toonly change if validation succeeds below.
-            $redirect_to  = 'https://wordpress.org/';
+            // Setup a default redirect to URL, with a safe version to only change if validation succeeds below.
+            $redirect_to = in_array( $_GET['action'], array( 'logout', 'loggedout' ) ) ? '/loggedout/' : 'https://wordpress.org/';
             
             if ( ! empty( $_REQUEST['redirect_to'] ) ) {

sites/trunk/common/includes/wporg-sso/wp-plugin.php

@@ -98 +98 @@
                                 if ( in_array( $get['action'], array( 'logout', 'loggedout' ) ) ) {
                                     // But make sure to show our custom screen when needed
-                                    $get['redirect_to'] = '/loggedout/';
+                                    $get['redirect_to'] = $this->_get_safer_redirect_to();
                                 }
                                 $this->_safe_redirect( add_query_arg( $get, $this->sso_login_url . '/wp-login.php' ) );
@@ -175 +175 @@
 
             if ( ! empty( $_GET['redirect_to'] ) ) {
-                $this->_safe_redirect( wp_unslash( $_GET['redirect_to'] ) );
+                $this->_safe_redirect( $this->_get_safer_redirect_to() );
             } else {
                 $this->_safe_redirect( 'https://wordpress.org/support/profile/' . wp_get_current_user()->user_nicename );