Changeset 4613

Timestamp:

01/09/2017 05:43:43 PM (8 years ago)

Author:

Otto42

Message:

Support Forums: Fix login URL redirection to point to correct location in combination with existing SSO redirection code

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php

@@ -27 +27 @@
         // Add notice to reply forms for privileged users in closed forums.
         add_action( 'bbp_template_notices', array( $this, 'closed_forum_notice_for_moderators' ), 1 );
+
+        // Fix login url links
+        add_filter( 'login_url', array( $this, 'fix_login_url' ), 10, 3 );
     }
 
@@ -122 +125 @@
     }
 
+    /**
+     * Adjust the login URL to point back to whatever part of the support forums we're
+     * currently looking at. This allows the redirect to come back to the same place
+     * instead of the main /support URL by default.
+     */
+    public function fix_login_url( $login_url, $redirect, $force_reauth ) {
+        // modify the redirect_to for the support forums to point to the current page
+        if ( 0 === strpos($_SERVER['REQUEST_URI'], '/support' ) ) {
+            // Note that this is not normal because of the code in /mu-plugins/wporg-sso/class-wporg-sso.php.
+            // The login_url function there expects the redirect_to as the first parameter passed into it instead of the second
+            // Since we're changing this with a filter on login_url, then we have to change the login_url to the
+            // place we want to redirect instead, and then let the SSO plugin do the rest.
+            //
+            // If the SSO code gets fixed, this will need to be modified.
+            //
+            // parse_url is used here to remove any additional query args from the REQUEST_URI before redirection
+            // The SSO code handles the urlencoding of the redirect_to parameter
+            $url_parts = parse_url('https://wordpress.org'.$_SERVER['REQUEST_URI']);
+            $constructed_url = $url_parts['scheme'] . '://' . $url_parts['host'] . (isset($url_parts['path'])?$url_parts['path']:'');
+            $login_url = $constructed_url;
+        }
+        return $login_url;
+    }
+
 }