Changeset 3145

Timestamp:

05/14/2016 01:27:51 PM (8 years ago)

Author:

ocean90

Message:

WordPress.org SSO: Remove trailing spaces.

File:

• sites/trunk/common/includes/wporg-sso/class-wporg-sso.php (modified) (14 diffs)

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

@@ -3 +3 @@
     /**
      * Single Sign-On (SSO) handling for WordPress/bbPress/GlotPress instances under *.wordpress.org.
-     * 
+     *
      * @author stephdau
      */
     class WPOrg_SSO {
         const SSO_HOST = 'login.wordpress.org';
-        
+
         public $sso_host_url;
         public $sso_login_url;
         public $sso_signup_url;
-        
+
         public $host;
         public $script;
-        
+
         /**
          * Constructor, instantiate common properties
@@ -23 +23 @@
             $this->sso_login_url  = $this->sso_host_url . '/';
             $this->sso_signup_url = 'https://wordpress.org/support/register.php'; // For now
-            
+
             if ( ! empty( $_SERVER['HTTP_HOST'] ) ) {
                 $this->host   = $_SERVER['HTTP_HOST'];
@@ -29 +29 @@
             }
         }
-        
+
         /**
          * Checks if the requested redirect_to URL is part of the wordpress.org empire, adds it as an redirect host if so.
@@ -35 +35 @@
          * @param array $hosts Currently allowed hosts
          * @return array $hosts Edited lists of allowed hosts
-         * 
+         *
          * @example add_filter( 'allowed_redirect_hosts', array( &$this, 'add_allowed_redirect_host' ) );
         */
@@ -47 +47 @@
                 $host = self::SSO_HOST;
             }
-        
+
             // If we got a host by now, it's a safe wordpress.org-based one, add it to the list of allowed redirects
             if ( ! empty( $host ) && ! in_array( $host, $hosts ) ){
                 $hosts[] = $host;
             }
-        
+
             // Return list of allowed hosts
             return $hosts;
         }
-        
+
         /**
          * Returns the SSO login URL, with redirect_to as requested, if deemed valid.
-         * 
+         *
          * @param string $redirect_to
          * @param string $filter_redirect_to When used with the WP login_url filter, the redirect_to is passed as a 2nd arg instead.
          * @return string
-         * 
+         *
          * @example Use directly, or through add_action( 'login_url', array( &$wporg_sso, 'login_url' ), 10, 2 );
          */
@@ -77 +77 @@
             }
             return $login_url;
-            
+
         }
-        
-        
+
+
         /**
          * Tests if the current process has $_SERVER['HTTP_HOST'] or not (EG: cron'd processes do not).
-         * 
+         *
          * @return boolean
          */
@@ -89 +89 @@
             return ( ! empty( $this->host ) );
         }
-        
+
         /**
          * Get a safe redirect URL (ie: a wordpress.org-based one) from $_REQUEST['redirect_to'] or a safe alternative.
-         * 
+         *
          * @return string Safe redirect URL from $_REQUEST['redirect_to']
          */
@@ -98 +98 @@
             // Setup a default redirect to URL, with a safe version to only change if validation succeeds below.
             $redirect_to = ! empty( $_GET['action'] ) && in_array( $_GET['action'], array( 'logout', 'loggedout' ) ) ? '/loggedout/' : 'https://wordpress.org/';
-            
+
             if ( ! empty( $_REQUEST['redirect_to'] ) ) {
                 // User is requesting a further redirect afterward, let's make sure it's a legit target.
-                $redirect_to_requested = function_exists( 'wp_sanitize_redirect' ) ? wp_sanitize_redirect( $_REQUEST['redirect_to'] ) : $_REQUEST['redirect_to'];
+                $redirect_to_requested = function_exists( 'wp_sanitize_redirect' ) ? wp_sanitize_redirect( $redirect_to ) : $redirect_to;
                 if ( $this->_is_valid_targeted_domain( $redirect_to_requested ) ) {
                     $redirect_to = $redirect_to_requested;
@@ -118 +118 @@
                 }
             }
-            
+
             return $redirect_to;
         }
-        
+
         /**
          * Tests if the passed host/domain, or URL, is part of the WordPress.org domain.
-         * 
+         *
          * @param unknown $string A domain, hostname, or URL
          * @return boolean True is ok, false if not
@@ -132 +132 @@
                 $string = '';
             }
-            
+
             if ( strstr( $string , '/' ) ) {
                 $url = parse_url( $string );
@@ -139 +139 @@
                 $host = $string;
             }
-            
+
             if ( ! empty( $host ) && strstr( $host , '.' ) ) {
                 return ( preg_match( '/^(.+\.)?wordpress\.org$/', $host ) ) ? true : false;
             }
-            
+
             return false;
         }
@@ -149 +149 @@
         /**
          * Validates if target URL is within our bounds, then redirects to it if so, or to WP.org homepage (returns if headers already sent).
-         * 
+         *
          * @param string $to Destination URL
          * @param number $status HTTP redirect status, defaults to 302
-         * 
+         *
          * @note: using our own over wp_safe_redirect(), etc, because not all targeted platforms (WP/BB/GP/etc) implement an equivalent, we run early, etc.
          */
@@ -159 +159 @@
                 return;
             }
-            
+
             if ( ! $this->_is_valid_targeted_domain( $to ) ) {
                 $to = $this->_get_safer_redirect_to();
             }
-            
+
             header(
                 'Location: ' . $to,
@@ -169 +169 @@
                 preg_match( '/^30(1|2)$/', $status ) ? $status : 302
             );
-            
+
             die();
         }