Changeset 2317

Timestamp:

01/19/2016 01:51:49 AM (11 years ago)

Author:

dd32

Message:

WordPress.org SSO: Use a different regular expression delimiter to promote readable regexes.

File:

• sites/trunk/common/includes/wporg-sso/wp-plugin.php (modified) (5 diffs)

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

@@ -43 +43 @@
                         add_filter( 'allowed_redirect_hosts', array( &$this, 'add_allowed_redirect_host' ) );
                         
-                        if ( preg_match( '/\/wp-signup\.php$/', $this->script ) ) {
+                        if ( preg_match( '!/wp-signup\.php$!', $this->script ) ) {
                                 // If we're on any WP signup screen, redirect to the SSO host one,respecting the user's redirect_to request
                                 $this->_safe_redirect( add_query_arg( 'redirect_to', urlencode( $redirect_req ), $this->sso_signup_url ) );
                         
-                        } else if ( self::SSO_HOST !== $this->host ) {
+                        } elseif ( self::SSO_HOST !== $this->host ) {
                                 // If we're not on the SSO host
-                                if ( preg_match( '/\/wp-login\.php$/', $this->script ) ) {
+                                if ( preg_match( '!/wp-login\.php$!', $this->script ) ) {
                                         // If on a WP login screen...
                                         $redirect_to_sso_login = $this->sso_login_url;
@@ -71 +71 @@
                         } else if ( self::SSO_HOST === $this->host ) {
                                 // If on the SSO host
-                                if ( ! preg_match( '/\/wp-login\.php$/', $this->script ) ) {
+                                if ( ! preg_match( '!/wp-login\.php$!', $this->script ) ) {
                                         // ... but not on its login screen.
-                                        if ( preg_match( '/^\/(\?.*)?$/', $_SERVER['REQUEST_URI'] ) ) {
+                                        if ( preg_match( '!^/(\?.*)?$!', $_SERVER['REQUEST_URI'] ) ) {
                                                 // If at host root (/)
                                                 if ( ! empty( $_GET['action'] ) ) {
@@ -94 +94 @@
                                                         }
                                                         return;
-                                                } 
-                                        } else if ( preg_match( '/^\/oauth([\/\?]{1}.*)?$/', $_SERVER['REQUEST_URI'] ) ) {
+                                                }
+                                        } elseif ( preg_match( '!^/oauth([/?]{1}.*)?$!', $_SERVER['REQUEST_URI'] ) ) {
                                                 // Let the theme render for oauth paths (/oauth, /oauth/, /oauth/*, but
                                                 // not /notoauth or /oauthnot), or redirect if logged in
@@ -102 +102 @@
                                                 }
                                                 return;
-                                        } else  if ( is_user_logged_in() ) {
+                                        } elseif ( is_user_logged_in() ) {
                                                 // Logged in catch all, before last fallback
                                                 $this->_redirect_to_profile();
@@ -129 +129 @@
                  */
                 public function login_network_site_url( $url, $path, $scheme ) {
-                        if ( self::SSO_HOST === $this->host && preg_match( '/\/wp-login\.php$/', $this->script ) ) {
-                                $url = preg_replace( '/^(https?:\/\/)[^\/]+(\/.+)$/' , '\1'.self::SSO_HOST.'\2', $url );
+                        if ( self::SSO_HOST === $this->host && preg_match( '!/wp-login\.php$!', $this->script ) ) {
+                                $url = preg_replace( '!^(https?://)[^/]+(/.+)$!' , '\1'.self::SSO_HOST.'\2', $url );
                         }