ntwb / wordpress

src/wp-includes/class-wp-ajax-response.php

Spacing +27 added lines, -27 removed lines

@@ -22,8 +22,8 @@ 
 	 *
 	 * @param string|array $args Optional. Will be passed to add() method.
 	 */
-	public function __construct( $args = '' ) {
-		if ( !empty($args) )
+	public function __construct($args = '') {
+		if ( ! empty($args))
 			$this->add($args);
 	}
 
@@ -62,7 +62,7 @@ 
 	 * }
 	 * @return string XML response.
 	 */
-	public function add( $args = '' ) {
+	public function add($args = '') {
 		$defaults = array(
 			'what' => 'object', 'action' => false,
 			'id' => '0', 'old_id' => false,
@@ -70,39 +70,39 @@ 
 			'data' => '', 'supplemental' => array()
 		);
 
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 
-		$position = preg_replace( '/[^a-z0-9:_-]/i', '', $r['position'] );
+		$position = preg_replace('/[^a-z0-9:_-]/i', '', $r['position']);
 		$id = $r['id'];
 		$what = $r['what'];
 		$action = $r['action'];
 		$old_id = $r['old_id'];
 		$data = $r['data'];
 
-		if ( is_wp_error( $id ) ) {
+		if (is_wp_error($id)) {
 			$data = $id;
 			$id = 0;
 		}
 
 		$response = '';
-		if ( is_wp_error( $data ) ) {
-			foreach ( (array) $data->get_error_codes() as $code ) {
-				$response .= "<wp_error code='$code'><![CDATA[" . $data->get_error_message( $code ) . "]]></wp_error>";
-				if ( ! $error_data = $data->get_error_data( $code ) ) {
+		if (is_wp_error($data)) {
+			foreach ((array) $data->get_error_codes() as $code) {
+				$response .= "<wp_error code='$code'><![CDATA[".$data->get_error_message($code)."]]></wp_error>";
+				if ( ! $error_data = $data->get_error_data($code)) {
 					continue;
 				}
 				$class = '';
-				if ( is_object( $error_data ) ) {
-					$class = ' class="' . get_class( $error_data ) . '"';
-					$error_data = get_object_vars( $error_data );
+				if (is_object($error_data)) {
+					$class = ' class="'.get_class($error_data).'"';
+					$error_data = get_object_vars($error_data);
 				}
 
 				$response .= "<wp_error_data code='$code'$class>";
 
-				if ( is_scalar( $error_data ) ) {
+				if (is_scalar($error_data)) {
 					$response .= "<![CDATA[$error_data]]>";
-				} elseif ( is_array( $error_data ) ) {
-					foreach ( $error_data as $k => $v ) {
+				} elseif (is_array($error_data)) {
+					foreach ($error_data as $k => $v) {
 						$response .= "<$k><![CDATA[$v]]></$k>";
 					}
 				}
@@ -114,22 +114,22 @@ 
 		}
 
 		$s = '';
-		if ( is_array( $r['supplemental'] ) ) {
-			foreach ( $r['supplemental'] as $k => $v ) {
+		if (is_array($r['supplemental'])) {
+			foreach ($r['supplemental'] as $k => $v) {
 				$s .= "<$k><![CDATA[$v]]></$k>";
 			}
 			$s = "<supplemental>$s</supplemental>";
 		}
 
-		if ( false === $action ) {
+		if (false === $action) {
 			$action = $_POST['action'];
 		}
 		$x = '';
 		$x .= "<response action='{$action}_$id'>"; // The action attribute in the xml output is formatted like a nonce action
-		$x .=	"<$what id='$id' " . ( false === $old_id ? '' : "old_id='$old_id' " ) . "position='$position'>";
-		$x .=		$response;
-		$x .=		$s;
-		$x .=	"</$what>";
+		$x .= "<$what id='$id' ".(false === $old_id ? '' : "old_id='$old_id' ")."position='$position'>";
+		$x .= $response;
+		$x .= $s;
+		$x .= "</$what>";
 		$x .= "</response>";
 
 		$this->responses[] = $x;
@@ -144,12 +144,12 @@ 
 	 * @since 2.1.0
 	 */
 	public function send() {
-		header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ) );
-		echo "<?xml version='1.0' encoding='" . get_option( 'blog_charset' ) . "' standalone='yes'?><wp_ajax>";
-		foreach ( (array) $this->responses as $response )
+		header('Content-Type: text/xml; charset='.get_option('blog_charset'));
+		echo "<?xml version='1.0' encoding='".get_option('blog_charset')."' standalone='yes'?><wp_ajax>";
+		foreach ((array) $this->responses as $response)
 			echo $response;
 		echo '</wp_ajax>';
-		if ( wp_doing_ajax() )
+		if (wp_doing_ajax())
 			wp_die();
 		else
 			die();

Braces +11 added lines, -8 removed lines

@@ -23,8 +23,9 @@ 
 	 * @param string|array $args Optional. Will be passed to add() method.
 	 */
 	public function __construct( $args = '' ) {
-		if ( !empty($args) )
-			$this->add($args);
+		if ( !empty($args) ) {
+					$this->add($args);
+		}
 	}
 
 	/**
@@ -146,12 +147,14 @@ 
 	public function send() {
 		header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ) );
 		echo "<?xml version='1.0' encoding='" . get_option( 'blog_charset' ) . "' standalone='yes'?><wp_ajax>";
-		foreach ( (array) $this->responses as $response )
-			echo $response;
+		foreach ( (array) $this->responses as $response ) {
+					echo $response;
+		}
 		echo '</wp_ajax>';
-		if ( wp_doing_ajax() )
-			wp_die();
-		else
-			die();
+		if ( wp_doing_ajax() ) {
+					wp_die();
+		} else {
+					die();
+		}
 	}
 }

src/wp-includes/ms-default-constants.php

Spacing +38 added lines, -38 removed lines

@@ -21,23 +21,23 @@ 
 	global $wpdb;
 
 	// This filter is attached in ms-default-filters.php but that file is not included during SHORTINIT.
-	add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
+	add_filter('default_site_option_ms_files_rewriting', '__return_true');
 
-	if ( ! get_site_option( 'ms_files_rewriting' ) )
+	if ( ! get_site_option('ms_files_rewriting'))
 		return;
 
 	// Base uploads dir relative to ABSPATH
-	if ( !defined( 'UPLOADBLOGSDIR' ) )
-		define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
+	if ( ! defined('UPLOADBLOGSDIR'))
+		define('UPLOADBLOGSDIR', 'wp-content/blogs.dir');
 
 	// Note, the main site in a post-MU network uses wp-content/uploads.
 	// This is handled in wp_upload_dir() by ignoring UPLOADS for this case.
-	if ( ! defined( 'UPLOADS' ) ) {
-		define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
+	if ( ! defined('UPLOADS')) {
+		define('UPLOADS', UPLOADBLOGSDIR."/{$wpdb->blogid}/files/");
 
 		// Uploads dir relative to ABSPATH
-		if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) )
-			define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
+		if ('wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined('BLOGUPLOADDIR'))
+			define('BLOGUPLOADDIR', WP_CONTENT_DIR."/blogs.dir/{$wpdb->blogid}/files/");
 	}
 }
 
@@ -52,34 +52,34 @@ 
 	/**
 	 * @since 1.2.0
 	 */
-	if ( !defined( 'COOKIEPATH' ) )
-		define( 'COOKIEPATH', $current_network->path );
+	if ( ! defined('COOKIEPATH'))
+		define('COOKIEPATH', $current_network->path);
 
 	/**
 	 * @since 1.5.0
 	 */
-	if ( !defined( 'SITECOOKIEPATH' ) )
-		define( 'SITECOOKIEPATH', $current_network->path );
+	if ( ! defined('SITECOOKIEPATH'))
+		define('SITECOOKIEPATH', $current_network->path);
 
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined( 'ADMIN_COOKIE_PATH' ) ) {
-		if ( ! is_subdomain_install() || trim( parse_url( get_option( 'siteurl' ), PHP_URL_PATH ), '/' ) ) {
-			define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH );
+	if ( ! defined('ADMIN_COOKIE_PATH')) {
+		if ( ! is_subdomain_install() || trim(parse_url(get_option('siteurl'), PHP_URL_PATH), '/')) {
+			define('ADMIN_COOKIE_PATH', SITECOOKIEPATH);
 		} else {
-			define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
+			define('ADMIN_COOKIE_PATH', SITECOOKIEPATH.'wp-admin');
 		}
 	}
 
 	/**
 	 * @since 2.0.0
 	 */
-	if ( !defined('COOKIE_DOMAIN') && is_subdomain_install() ) {
-		if ( !empty( $current_network->cookie_domain ) )
-			define('COOKIE_DOMAIN', '.' . $current_network->cookie_domain);
+	if ( ! defined('COOKIE_DOMAIN') && is_subdomain_install()) {
+		if ( ! empty($current_network->cookie_domain))
+			define('COOKIE_DOMAIN', '.'.$current_network->cookie_domain);
 		else
-			define('COOKIE_DOMAIN', '.' . $current_network->domain);
+			define('COOKIE_DOMAIN', '.'.$current_network->domain);
 	}
 }
 
@@ -96,15 +96,15 @@ 
 	 * Optional support for X-Sendfile header
 	 * @since 3.0.0
 	 */
-	if ( !defined( 'WPMU_SENDFILE' ) )
-		define( 'WPMU_SENDFILE', false );
+	if ( ! defined('WPMU_SENDFILE'))
+		define('WPMU_SENDFILE', false);
 
 	/**
 	 * Optional support for X-Accel-Redirect header
 	 * @since 3.0.0
 	 */
-	if ( !defined( 'WPMU_ACCEL_REDIRECT' ) )
-		define( 'WPMU_ACCEL_REDIRECT', false );
+	if ( ! defined('WPMU_ACCEL_REDIRECT'))
+		define('WPMU_ACCEL_REDIRECT', false);
 }
 
 /**
@@ -124,41 +124,41 @@ 
 	static $subdomain_error = null;
 	static $subdomain_error_warn = null;
 
-	if ( false === $subdomain_error ) {
+	if (false === $subdomain_error) {
 		return;
 	}
 
-	if ( $subdomain_error ) {
+	if ($subdomain_error) {
 		$vhost_deprecated = sprintf(
 			/* translators: 1: VHOST, 2: SUBDOMAIN_INSTALL, 3: wp-config.php, 4: is_subdomain_install() */
-			__( 'The constant %1$s <strong>is deprecated</strong>. Use the boolean constant %2$s in %3$s to enable a subdomain configuration. Use %4$s to check whether a subdomain configuration is enabled.' ),
+			__('The constant %1$s <strong>is deprecated</strong>. Use the boolean constant %2$s in %3$s to enable a subdomain configuration. Use %4$s to check whether a subdomain configuration is enabled.'),
 			'<code>VHOST</code>',
 			'<code>SUBDOMAIN_INSTALL</code>',
 			'<code>wp-config.php</code>',
 			'<code>is_subdomain_install()</code>'
 		);
-		if ( $subdomain_error_warn ) {
-			trigger_error( __( '<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.' ) . ' ' . $vhost_deprecated, E_USER_WARNING );
+		if ($subdomain_error_warn) {
+			trigger_error(__('<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.').' '.$vhost_deprecated, E_USER_WARNING);
 		} else {
-	 		_deprecated_argument( 'define()', '3.0.0', $vhost_deprecated );
+	 		_deprecated_argument('define()', '3.0.0', $vhost_deprecated);
 		}
 		return;
 	}
 
-	if ( defined( 'SUBDOMAIN_INSTALL' ) && defined( 'VHOST' ) ) {
+	if (defined('SUBDOMAIN_INSTALL') && defined('VHOST')) {
 		$subdomain_error = true;
-		if ( SUBDOMAIN_INSTALL !== ( 'yes' == VHOST ) ) {
+		if (SUBDOMAIN_INSTALL !== ('yes' == VHOST)) {
 			$subdomain_error_warn = true;
 		}
-	} elseif ( defined( 'SUBDOMAIN_INSTALL' ) ) {
+	} elseif (defined('SUBDOMAIN_INSTALL')) {
 		$subdomain_error = false;
-		define( 'VHOST', SUBDOMAIN_INSTALL ? 'yes' : 'no' );
-	} elseif ( defined( 'VHOST' ) ) {
+		define('VHOST', SUBDOMAIN_INSTALL ? 'yes' : 'no');
+	} elseif (defined('VHOST')) {
 		$subdomain_error = true;
-		define( 'SUBDOMAIN_INSTALL', 'yes' == VHOST );
+		define('SUBDOMAIN_INSTALL', 'yes' == VHOST);
 	} else {
 		$subdomain_error = false;
-		define( 'SUBDOMAIN_INSTALL', false );
-		define( 'VHOST', 'no' );
+		define('SUBDOMAIN_INSTALL', false);
+		define('VHOST', 'no');
 	}
 }

Braces +27 added lines, -19 removed lines

@@ -23,12 +23,14 @@ 
 	// This filter is attached in ms-default-filters.php but that file is not included during SHORTINIT.
 	add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
 
-	if ( ! get_site_option( 'ms_files_rewriting' ) )
-		return;
+	if ( ! get_site_option( 'ms_files_rewriting' ) ) {
+			return;
+	}
 
 	// Base uploads dir relative to ABSPATH
-	if ( !defined( 'UPLOADBLOGSDIR' ) )
-		define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
+	if ( !defined( 'UPLOADBLOGSDIR' ) ) {
+			define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
+	}
 
 	// Note, the main site in a post-MU network uses wp-content/uploads.
 	// This is handled in wp_upload_dir() by ignoring UPLOADS for this case.
@@ -36,8 +38,9 @@ 
 		define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
 
 		// Uploads dir relative to ABSPATH
-		if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) )
-			define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
+		if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) ) {
+					define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
+		}
 	}
 }
 
@@ -52,14 +55,16 @@ 
 	/**
 	 * @since 1.2.0
 	 */
-	if ( !defined( 'COOKIEPATH' ) )
-		define( 'COOKIEPATH', $current_network->path );
+	if ( !defined( 'COOKIEPATH' ) ) {
+			define( 'COOKIEPATH', $current_network->path );
+	}
 
 	/**
 	 * @since 1.5.0
 	 */
-	if ( !defined( 'SITECOOKIEPATH' ) )
-		define( 'SITECOOKIEPATH', $current_network->path );
+	if ( !defined( 'SITECOOKIEPATH' ) ) {
+			define( 'SITECOOKIEPATH', $current_network->path );
+	}
 
 	/**
 	 * @since 2.6.0
@@ -76,10 +81,11 @@ 
 	 * @since 2.0.0
 	 */
 	if ( !defined('COOKIE_DOMAIN') && is_subdomain_install() ) {
-		if ( !empty( $current_network->cookie_domain ) )
-			define('COOKIE_DOMAIN', '.' . $current_network->cookie_domain);
-		else
-			define('COOKIE_DOMAIN', '.' . $current_network->domain);
+		if ( !empty( $current_network->cookie_domain ) ) {
+					define('COOKIE_DOMAIN', '.' . $current_network->cookie_domain);
+		} else {
+					define('COOKIE_DOMAIN', '.' . $current_network->domain);
+		}
 	}
 }
 
@@ -96,16 +102,18 @@ 
 	 * Optional support for X-Sendfile header
 	 * @since 3.0.0
 	 */
-	if ( !defined( 'WPMU_SENDFILE' ) )
-		define( 'WPMU_SENDFILE', false );
+	if ( !defined( 'WPMU_SENDFILE' ) ) {
+			define( 'WPMU_SENDFILE', false );
+	}
 
 	/**
 	 * Optional support for X-Accel-Redirect header
 	 * @since 3.0.0
 	 */
-	if ( !defined( 'WPMU_ACCEL_REDIRECT' ) )
-		define( 'WPMU_ACCEL_REDIRECT', false );
-}
+	if ( !defined( 'WPMU_ACCEL_REDIRECT' ) ) {
+			define( 'WPMU_ACCEL_REDIRECT', false );
+	}
+	}
 
 /**
  * Defines Multisite subdomain constants and handles warnings and notices.

src/wp-includes/class-wp-session-tokens.php

Spacing +39 added lines, -39 removed lines

@@ -30,7 +30,7 @@ 
 	 *
 	 * @param int $user_id User whose session to manage.
 	 */
-	protected function __construct( $user_id ) {
+	protected function __construct($user_id) {
 		$this->user_id = $user_id;
 	}
 
@@ -46,7 +46,7 @@ 
 	 *
 	 * @param int $user_id User whose session to manage.
 	 */
-	final public static function get_instance( $user_id ) {
+	final public static function get_instance($user_id) {
 		/**
 		 * Filters the session token manager used.
 		 *
@@ -55,8 +55,8 @@ 
 		 * @param string $session Name of class to use as the manager.
 		 *                        Default 'WP_User_Meta_Session_Tokens'.
 		 */
-		$manager = apply_filters( 'session_token_manager', 'WP_User_Meta_Session_Tokens' );
-		return new $manager( $user_id );
+		$manager = apply_filters('session_token_manager', 'WP_User_Meta_Session_Tokens');
+		return new $manager($user_id);
 	}
 
 	/**
@@ -68,12 +68,12 @@ 
 	 * @param string $token Session token to hash.
 	 * @return string A hash of the session token (a verifier).
 	 */
-	final private function hash_token( $token ) {
+	final private function hash_token($token) {
 		// If ext/hash is not present, use sha1() instead.
-		if ( function_exists( 'hash' ) ) {
-			return hash( 'sha256', $token );
+		if (function_exists('hash')) {
+			return hash('sha256', $token);
 		} else {
-			return sha1( $token );
+			return sha1($token);
 		}
 	}
 
@@ -86,9 +86,9 @@ 
 	 * @param string $token Session token
 	 * @return array User session
 	 */
-	final public function get( $token ) {
-		$verifier = $this->hash_token( $token );
-		return $this->get_session( $verifier );
+	final public function get($token) {
+		$verifier = $this->hash_token($token);
+		return $this->get_session($verifier);
 	}
 
 	/**
@@ -102,9 +102,9 @@ 
 	 * @param string $token Token to verify.
 	 * @return bool Whether the token is valid for the user.
 	 */
-	final public function verify( $token ) {
-		$verifier = $this->hash_token( $token );
-		return (bool) $this->get_session( $verifier );
+	final public function verify($token) {
+		$verifier = $this->hash_token($token);
+		return (bool) $this->get_session($verifier);
 	}
 
 	/**
@@ -124,7 +124,7 @@ 
 	 * @param int $expiration Session expiration timestamp.
 	 * @return string Session token.
 	 */
-	final public function create( $expiration ) {
+	final public function create($expiration) {
 		/**
 		 * Filters the information attached to the newly created session.
 		 *
@@ -136,25 +136,25 @@ 
 		 * @param array $session Array of extra data.
 		 * @param int   $user_id User ID.
 		 */
-		$session = apply_filters( 'attach_session_information', array(), $this->user_id );
+		$session = apply_filters('attach_session_information', array(), $this->user_id);
 		$session['expiration'] = $expiration;
 
 		// IP address.
-		if ( !empty( $_SERVER['REMOTE_ADDR'] ) ) {
+		if ( ! empty($_SERVER['REMOTE_ADDR'])) {
 			$session['ip'] = $_SERVER['REMOTE_ADDR'];
 		}
 
 		// User-agent.
-		if ( ! empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
-			$session['ua'] = wp_unslash( $_SERVER['HTTP_USER_AGENT'] );
+		if ( ! empty($_SERVER['HTTP_USER_AGENT'])) {
+			$session['ua'] = wp_unslash($_SERVER['HTTP_USER_AGENT']);
 		}
 
 		// Timestamp
 		$session['login'] = time();
 
-		$token = wp_generate_password( 43, false, false );
+		$token = wp_generate_password(43, false, false);
 
-		$this->update( $token, $session );
+		$this->update($token, $session);
 
 		return $token;
 	}
@@ -168,9 +168,9 @@ 
 	 * @param string $token Session token to update.
 	 * @param array  $session Session information.
 	 */
-	final public function update( $token, $session ) {
-		$verifier = $this->hash_token( $token );
-		$this->update_session( $verifier, $session );
+	final public function update($token, $session) {
+		$verifier = $this->hash_token($token);
+		$this->update_session($verifier, $session);
 	}
 
 	/**
@@ -181,9 +181,9 @@ 
 	 *
 	 * @param string $token Session token to destroy.
 	 */
-	final public function destroy( $token ) {
-		$verifier = $this->hash_token( $token );
-		$this->update_session( $verifier, null );
+	final public function destroy($token) {
+		$verifier = $this->hash_token($token);
+		$this->update_session($verifier, null);
 	}
 
 	/**
@@ -195,11 +195,11 @@ 
 	 *
 	 * @param string $token_to_keep Session token to keep.
 	 */
-	final public function destroy_others( $token_to_keep ) {
-		$verifier = $this->hash_token( $token_to_keep );
-		$session = $this->get_session( $verifier );
-		if ( $session ) {
-			$this->destroy_other_sessions( $verifier );
+	final public function destroy_others($token_to_keep) {
+		$verifier = $this->hash_token($token_to_keep);
+		$session = $this->get_session($verifier);
+		if ($session) {
+			$this->destroy_other_sessions($verifier);
 		} else {
 			$this->destroy_all_sessions();
 		}
@@ -215,7 +215,7 @@ 
 	 * @param array $session Session to check.
 	 * @return bool Whether session is valid.
 	 */
-	final protected function is_still_valid( $session ) {
+	final protected function is_still_valid($session) {
 		return $session['expiration'] >= time();
 	}
 
@@ -238,8 +238,8 @@ 
 	 */
 	final public static function destroy_all_for_all_users() {
 		/** This filter is documented in wp-includes/class-wp-session-tokens.php */
-		$manager = apply_filters( 'session_token_manager', 'WP_User_Meta_Session_Tokens' );
-		call_user_func( array( $manager, 'drop_sessions' ) );
+		$manager = apply_filters('session_token_manager', 'WP_User_Meta_Session_Tokens');
+		call_user_func(array($manager, 'drop_sessions'));
 	}
 
 	/**
@@ -251,7 +251,7 @@ 
 	 * @return array Sessions of a user.
 	 */
 	final public function get_all() {
-		return array_values( $this->get_sessions() );
+		return array_values($this->get_sessions());
 	}
 
 	/**
@@ -273,7 +273,7 @@ 
 	 * @param string $verifier Verifier of the session to retrieve.
 	 * @return array|null The session, or null if it does not exist.
 	 */
-	abstract protected function get_session( $verifier );
+	abstract protected function get_session($verifier);
 
 	/**
 	 * This method should update a session by its verifier.
@@ -286,7 +286,7 @@ 
 	 * @param string $verifier Verifier of the session to update.
 	 * @param array  $session  Optional. Session. Omitting this argument destroys the session.
 	 */
-	abstract protected function update_session( $verifier, $session = null );
+	abstract protected function update_session($verifier, $session = null);
 
 	/**
 	 * This method should destroy all session tokens for this user,
@@ -297,7 +297,7 @@ 
 	 *
 	 * @param string $verifier Verifier of the session to keep.
 	 */
-	abstract protected function destroy_other_sessions( $verifier );
+	abstract protected function destroy_other_sessions($verifier);
 
 	/**
 	 * This method should destroy all sessions for a user.

src/wp-includes/class-wp-http-requests-hooks.php

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
 	 * @param string $url URL to request.
 	 * @param array $request Request data in WP_Http format.
 	 */
-	public function __construct( $url, $request ) {
+	public function __construct($url, $request) {
 		$this->url = $url;
 		$this->request = $request;
 	}
@@ -47,14 +47,14 @@ 
 	 * @param array $parameters Parameters to pass to callbacks.
 	 * @return boolean True if hooks were run, false if nothing was hooked.
 	 */
-	public function dispatch( $hook, $parameters = array() ) {
-		$result = parent::dispatch( $hook, $parameters );
+	public function dispatch($hook, $parameters = array()) {
+		$result = parent::dispatch($hook, $parameters);
 
 		// Handle back-compat actions
-		switch ( $hook ) {
+		switch ($hook) {
 			case 'curl.before_send':
 				/** This action is documented in wp-includes/class-wp-http-curl.php */
-				do_action_ref_array( 'http_api_curl', array( $parameters[0], $this->request, $this->url ) );
+				do_action_ref_array('http_api_curl', array($parameters[0], $this->request, $this->url));
 				break;
 		}
 
@@ -69,7 +69,7 @@ 
 		 * @param array $request Request data in WP_Http format.
 		 * @param string $url URL to request.
 		 */
-		do_action_ref_array( "requests-{$hook}", $parameters, $this->request, $this->url );
+		do_action_ref_array("requests-{$hook}", $parameters, $this->request, $this->url);
 
 		return $result;
 	}

src/wp-includes/class-wp-simplepie-file.php

Spacing +8 added lines, -8 removed lines

@@ -42,27 +42,27 @@
 
 		$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE;
 
-		if ( preg_match('/^http(s)?:\/\//i', $url) ) {
+		if (preg_match('/^http(s)?:\/\//i', $url)) {
 			$args = array(
 				'timeout' => $this->timeout,
 				'redirection' => $this->redirects,
 			);
 
-			if ( !empty($this->headers) )
+			if ( ! empty($this->headers))
 				$args['headers'] = $this->headers;
 
-			if ( SIMPLEPIE_USERAGENT != $this->useragent ) //Use default WP user agent unless custom has been specified
+			if (SIMPLEPIE_USERAGENT != $this->useragent) //Use default WP user agent unless custom has been specified
 				$args['user-agent'] = $this->useragent;
 
 			$res = wp_safe_remote_request($url, $args);
 
-			if ( is_wp_error($res) ) {
-				$this->error = 'WP HTTP Error: ' . $res->get_error_message();
+			if (is_wp_error($res)) {
+				$this->error = 'WP HTTP Error: '.$res->get_error_message();
 				$this->success = false;
 			} else {
-				$this->headers = wp_remote_retrieve_headers( $res );
-				$this->body = wp_remote_retrieve_body( $res );
-				$this->status_code = wp_remote_retrieve_response_code( $res );
+				$this->headers = wp_remote_retrieve_headers($res);
+				$this->body = wp_remote_retrieve_body($res);
+				$this->status_code = wp_remote_retrieve_response_code($res);
 			}
 		} else {
 			$this->error = '';

Braces +6 added lines, -3 removed lines

@@ -48,11 +48,14 @@
 				'redirection' => $this->redirects,
 			);
 
-			if ( !empty($this->headers) )
-				$args['headers'] = $this->headers;
+			if ( !empty($this->headers) ) {
+							$args['headers'] = $this->headers;
+			}
 
-			if ( SIMPLEPIE_USERAGENT != $this->useragent ) //Use default WP user agent unless custom has been specified
+			if ( SIMPLEPIE_USERAGENT != $this->useragent ) {
+				//Use default WP user agent unless custom has been specified
 				$args['user-agent'] = $this->useragent;
+			}
 
 			$res = wp_safe_remote_request($url, $args);
 

src/wp-includes/customize/class-wp-customize-color-control.php

Spacing +6 added lines, -6 removed lines

@@ -50,9 +50,9 @@ 
 	 * @param string               $id      Control ID.
 	 * @param array                $args    Optional. Arguments to override class property defaults.
 	 */
-	public function __construct( $manager, $id, $args = array() ) {
-		$this->statuses = array( '' => __('Default') );
-		parent::__construct( $manager, $id, $args );
+	public function __construct($manager, $id, $args = array()) {
+		$this->statuses = array('' => __('Default'));
+		parent::__construct($manager, $id, $args);
 	}
 
 	/**
@@ -61,8 +61,8 @@ 
 	 * @since 3.4.0
 	 */
 	public function enqueue() {
-		wp_enqueue_script( 'wp-color-picker' );
-		wp_enqueue_style( 'wp-color-picker' );
+		wp_enqueue_script('wp-color-picker');
+		wp_enqueue_style('wp-color-picker');
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 				<# if ( isHueSlider ) { #>
 					<input class="color-picker-hue" type="text" data-type="hue" />
 				<# } else { #>
-					<input class="color-picker-hex" type="text" maxlength="7" placeholder="<?php esc_attr_e( 'Hex Value' ); ?>" {{ defaultValue }} />
+					<input class="color-picker-hex" type="text" maxlength="7" placeholder="<?php esc_attr_e('Hex Value'); ?>" {{ defaultValue }} />
 				<# } #>
 			</div>
 		</label>

src/wp-includes/customize/class-wp-customize-background-position-control.php

Spacing +14 added lines, -14 removed lines

@@ -42,19 +42,19 @@ 
 	public function content_template() {
 		$options = array(
 			array(
-				'left top'   => array( 'label' => __( 'Top Left' ), 'icon' => 'dashicons dashicons-arrow-left-alt' ),
-				'center top' => array( 'label' => __( 'Top' ), 'icon' => 'dashicons dashicons-arrow-up-alt' ),
-				'right top'  => array( 'label' => __( 'Top Right' ), 'icon' => 'dashicons dashicons-arrow-right-alt' ),
+				'left top'   => array('label' => __('Top Left'), 'icon' => 'dashicons dashicons-arrow-left-alt'),
+				'center top' => array('label' => __('Top'), 'icon' => 'dashicons dashicons-arrow-up-alt'),
+				'right top'  => array('label' => __('Top Right'), 'icon' => 'dashicons dashicons-arrow-right-alt'),
 			),
 			array(
-				'left center'   => array( 'label' => __( 'Left' ), 'icon' => 'dashicons dashicons-arrow-left-alt' ),
-				'center center' => array( 'label' => __( 'Center' ), 'icon' => 'background-position-center-icon' ),
-				'right center'  => array( 'label' => __( 'Right' ), 'icon' => 'dashicons dashicons-arrow-right-alt' ),
+				'left center'   => array('label' => __('Left'), 'icon' => 'dashicons dashicons-arrow-left-alt'),
+				'center center' => array('label' => __('Center'), 'icon' => 'background-position-center-icon'),
+				'right center'  => array('label' => __('Right'), 'icon' => 'dashicons dashicons-arrow-right-alt'),
 			),
 			array(
-				'left bottom'   => array( 'label' => __( 'Bottom Left' ), 'icon' => 'dashicons dashicons-arrow-left-alt' ),
-				'center bottom' => array( 'label' => __( 'Bottom' ), 'icon' => 'dashicons dashicons-arrow-down-alt' ),
-				'right bottom'  => array( 'label' => __( 'Bottom Right' ), 'icon' => 'dashicons dashicons-arrow-right-alt' ),
+				'left bottom'   => array('label' => __('Bottom Left'), 'icon' => 'dashicons dashicons-arrow-left-alt'),
+				'center bottom' => array('label' => __('Bottom'), 'icon' => 'dashicons dashicons-arrow-down-alt'),
+				'right bottom'  => array('label' => __('Bottom Right'), 'icon' => 'dashicons dashicons-arrow-right-alt'),
 			),
 		);
 		?>
@@ -66,14 +66,14 @@ 
 		<# } #>
 		<div class="customize-control-content">
 			<fieldset>
-				<legend class="screen-reader-text"><span><?php _e( 'Image Position' ); ?></span></legend>
+				<legend class="screen-reader-text"><span><?php _e('Image Position'); ?></span></legend>
 				<div class="background-position-control">
-				<?php foreach ( $options as $group ) : ?>
+				<?php foreach ($options as $group) : ?>
 					<div class="button-group">
-					<?php foreach ( $group as $value => $input ) : ?>
+					<?php foreach ($group as $value => $input) : ?>
 						<label>
-							<input class="screen-reader-text" name="background-position" type="radio" value="<?php echo esc_attr( $value ); ?>">
-							<span class="button display-options position"><span class="<?php echo esc_attr( $input['icon'] ); ?>" aria-hidden="true"></span></span>
+							<input class="screen-reader-text" name="background-position" type="radio" value="<?php echo esc_attr($value); ?>">
+							<span class="button display-options position"><span class="<?php echo esc_attr($input['icon']); ?>" aria-hidden="true"></span></span>
 							<span class="screen-reader-text"><?php echo $input['label']; ?></span>
 						</label>
 					<?php endforeach; ?>

src/wp-includes/customize/class-wp-customize-theme-control.php

Spacing +11 added lines, -11 removed lines

@@ -62,15 +62,15 @@ 
 	 * @access public
 	 */
 	public function content_template() {
-		$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
-		$active_url  = esc_url( remove_query_arg( 'customize_theme', $current_url ) );
-		$preview_url = esc_url( add_query_arg( 'customize_theme', '__THEME__', $current_url ) ); // Token because esc_url() strips curly braces.
-		$preview_url = str_replace( '__THEME__', '{{ data.theme.id }}', $preview_url );
+		$current_url = set_url_scheme('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
+		$active_url  = esc_url(remove_query_arg('customize_theme', $current_url));
+		$preview_url = esc_url(add_query_arg('customize_theme', '__THEME__', $current_url)); // Token because esc_url() strips curly braces.
+		$preview_url = str_replace('__THEME__', '{{ data.theme.id }}', $preview_url);
 		?>
 		<# if ( data.theme.isActiveTheme ) { #>
-			<div class="theme active" tabindex="0" data-preview-url="<?php echo esc_attr( $active_url ); ?>" aria-describedby="{{ data.theme.id }}-action {{ data.theme.id }}-name">
+			<div class="theme active" tabindex="0" data-preview-url="<?php echo esc_attr($active_url); ?>" aria-describedby="{{ data.theme.id }}-action {{ data.theme.id }}-name">
 		<# } else { #>
-			<div class="theme" tabindex="0" data-preview-url="<?php echo esc_attr( $preview_url ); ?>" aria-describedby="{{ data.theme.id }}-action {{ data.theme.id }}-name">
+			<div class="theme" tabindex="0" data-preview-url="<?php echo esc_attr($preview_url); ?>" aria-describedby="{{ data.theme.id }}-action {{ data.theme.id }}-name">
 		<# } #>
 
 			<# if ( data.theme.screenshot[0] ) { #>
@@ -82,27 +82,27 @@ 
 			<# } #>
 
 			<# if ( data.theme.isActiveTheme ) { #>
-				<span class="more-details" id="{{ data.theme.id }}-action"><?php _e( 'Customize' ); ?></span>
+				<span class="more-details" id="{{ data.theme.id }}-action"><?php _e('Customize'); ?></span>
 			<# } else { #>
-				<span class="more-details" id="{{ data.theme.id }}-action"><?php _e( 'Live Preview' ); ?></span>
+				<span class="more-details" id="{{ data.theme.id }}-action"><?php _e('Live Preview'); ?></span>
 			<# } #>
 
 			<div class="theme-author"><?php
 				/* translators: Theme author name */
-				printf( _x( 'By %s', 'theme author' ), '{{ data.theme.author }}' );
+				printf(_x('By %s', 'theme author'), '{{ data.theme.author }}');
 			?></div>
 
 			<# if ( data.theme.isActiveTheme ) { #>
 				<h3 class="theme-name" id="{{ data.theme.id }}-name">
 					<?php
 					/* translators: %s: theme name */
-					printf( __( '<span>Active:</span> %s' ), '{{{ data.theme.name }}}' );
+					printf(__('<span>Active:</span> %s'), '{{{ data.theme.name }}}');
 					?>
 				</h3>
 			<# } else { #>
 				<h3 class="theme-name" id="{{ data.theme.id }}-name">{{{ data.theme.name }}}</h3>
 				<div class="theme-actions">
-					<button type="button" class="button theme-details"><?php _e( 'Theme Details' ); ?></button>
+					<button type="button" class="button theme-details"><?php _e('Theme Details'); ?></button>
 				</div>
 			<# } #>
 		</div>

src/wp-includes/customize/class-wp-customize-header-image-control.php

Spacing +43 added lines, -43 removed lines

@@ -26,9 +26,9 @@ 
 	 *
 	 * @param WP_Customize_Manager $manager Customizer bootstrap instance.
 	 */
-	public function __construct( $manager ) {
-		parent::__construct( $manager, 'header_image', array(
-			'label'    => __( 'Header Image' ),
+	public function __construct($manager) {
+		parent::__construct($manager, 'header_image', array(
+			'label'    => __('Header Image'),
 			'settings' => array(
 				'default' => 'header_image',
 				'data'    => 'header_image_data',
@@ -36,7 +36,7 @@ 
 			'section'  => 'header_image',
 			'removed'  => 'remove-header',
 			'get_url'  => 'get_header_image',
-		) );
+		));
 
 	}
 
@@ -45,25 +45,25 @@ 
 	 */
 	public function enqueue() {
 		wp_enqueue_media();
-		wp_enqueue_script( 'customize-views' );
+		wp_enqueue_script('customize-views');
 
 		$this->prepare_control();
 
-		wp_localize_script( 'customize-views', '_wpCustomizeHeader', array(
+		wp_localize_script('customize-views', '_wpCustomizeHeader', array(
 			'data' => array(
-				'width' => absint( get_theme_support( 'custom-header', 'width' ) ),
-				'height' => absint( get_theme_support( 'custom-header', 'height' ) ),
-				'flex-width' => absint( get_theme_support( 'custom-header', 'flex-width' ) ),
-				'flex-height' => absint( get_theme_support( 'custom-header', 'flex-height' ) ),
+				'width' => absint(get_theme_support('custom-header', 'width')),
+				'height' => absint(get_theme_support('custom-header', 'height')),
+				'flex-width' => absint(get_theme_support('custom-header', 'flex-width')),
+				'flex-height' => absint(get_theme_support('custom-header', 'flex-height')),
 				'currentImgSrc' => $this->get_current_image_src(),
 			),
 			'nonces' => array(
-				'add' => wp_create_nonce( 'header-add' ),
-				'remove' => wp_create_nonce( 'header-remove' ),
+				'add' => wp_create_nonce('header-add'),
+				'remove' => wp_create_nonce('header-remove'),
 			),
 			'uploads' => $this->uploaded_headers,
 			'defaults' => $this->default_headers
-		) );
+		));
 
 		parent::enqueue();
 	}
@@ -74,7 +74,7 @@ 
 	 */
 	public function prepare_control() {
 		global $custom_image_header;
-		if ( empty( $custom_image_header ) ) {
+		if (empty($custom_image_header)) {
 			return;
 		}
 
@@ -94,9 +94,9 @@ 
 			<button type="button" class="button display-options random">
 				<span class="dashicons dashicons-randomize dice"></span>
 				<# if ( data.type === 'uploaded' ) { #>
-					<?php _e( 'Randomize uploaded headers' ); ?>
+					<?php _e('Randomize uploaded headers'); ?>
 				<# } else if ( data.type === 'default' ) { #>
-					<?php _e( 'Randomize suggested headers' ); ?>
+					<?php _e('Randomize suggested headers'); ?>
 				<# } #>
 			</button>
 
@@ -105,12 +105,12 @@ 
 			<button type="button" class="choice thumbnail"
 				data-customize-image-value="{{{data.header.url}}}"
 				data-customize-header-image-data="{{JSON.stringify(data.header)}}">
-				<span class="screen-reader-text"><?php _e( 'Set image' ); ?></span>
+				<span class="screen-reader-text"><?php _e('Set image'); ?></span>
 				<img src="{{{data.header.thumbnail_url}}}" alt="{{{data.header.alt_text || data.header.description}}}">
 			</button>
 
 			<# if ( data.type === 'uploaded' ) { #>
-				<button type="button" class="dashicons dashicons-no close"><span class="screen-reader-text"><?php _e( 'Remove image' ); ?></span></button>
+				<button type="button" class="dashicons dashicons-no close"><span class="screen-reader-text"><?php _e('Remove image'); ?></span></button>
 			<# } #>
 
 			<# } #>
@@ -123,9 +123,9 @@ 
 			<div class="placeholder">
 				<span class="dashicons dashicons-randomize dice"></span>
 				<# if ( data.type === 'uploaded' ) { #>
-					<?php _e( 'Randomizing uploaded headers' ); ?>
+					<?php _e('Randomizing uploaded headers'); ?>
 				<# } else if ( data.type === 'default' ) { #>
-					<?php _e( 'Randomizing suggested headers' ); ?>
+					<?php _e('Randomizing suggested headers'); ?>
 				<# } #>
 			</div>
 
@@ -137,7 +137,7 @@ 
 			<# } else { #>
 
 			<div class="placeholder">
-				<?php _e( 'No image set' ); ?>
+				<?php _e('No image set'); ?>
 			</div>
 
 			<# } #>
@@ -150,8 +150,8 @@ 
 	 */
 	public function get_current_image_src() {
 		$src = $this->value();
-		if ( isset( $this->get_url ) ) {
-			$src = call_user_func( $this->get_url, $src );
+		if (isset($this->get_url)) {
+			$src = call_user_func($this->get_url, $src);
 			return $src;
 		}
 	}
@@ -162,32 +162,32 @@ 
 	public function render_content() {
 		$this->print_header_image_template();
 		$visibility = $this->get_current_image_src() ? '' : ' style="display:none" ';
-		$width = absint( get_theme_support( 'custom-header', 'width' ) );
-		$height = absint( get_theme_support( 'custom-header', 'height' ) );
+		$width = absint(get_theme_support('custom-header', 'width'));
+		$height = absint(get_theme_support('custom-header', 'height'));
 		?>
 		<div class="customize-control-content">
-			<?php if ( current_theme_supports( 'custom-header', 'video' ) ) {
-				echo '<span class="customize-control-title">' . $this->label . '</span>';
+			<?php if (current_theme_supports('custom-header', 'video')) {
+				echo '<span class="customize-control-title">'.$this->label.'</span>';
 			} ?>
 			<div class="customize-control-notifications-container"></div>
 			<p class="customizer-section-intro customize-control-description">
 				<?php
-				if ( current_theme_supports( 'custom-header', 'video' ) ) {
-					_e( 'While you can crop images to your liking after clicking <strong>Add new image</strong>, we recommend matching the size of your video.' );
-				} elseif ( $width && $height ) {
+				if (current_theme_supports('custom-header', 'video')) {
+					_e('While you can crop images to your liking after clicking <strong>Add new image</strong>, we recommend matching the size of your video.');
+				} elseif ($width && $height) {
 					/* translators: %s: header size in pixels */
-					printf( __( 'While you can crop images to your liking after clicking <strong>Add new image</strong>, your theme recommends a header size of %s pixels.' ),
-						sprintf( '<strong>%s &times; %s</strong>', $width, $height )
+					printf(__('While you can crop images to your liking after clicking <strong>Add new image</strong>, your theme recommends a header size of %s pixels.'),
+						sprintf('<strong>%s &times; %s</strong>', $width, $height)
 					);
-				} elseif ( $width ) {
+				} elseif ($width) {
 					/* translators: %s: header width in pixels */
-					printf( __( 'While you can crop images to your liking after clicking <strong>Add new image</strong>, your theme recommends a header width of %s pixels.' ),
-						sprintf( '<strong>%s</strong>', $width )
+					printf(__('While you can crop images to your liking after clicking <strong>Add new image</strong>, your theme recommends a header width of %s pixels.'),
+						sprintf('<strong>%s</strong>', $width)
 					);
 				} else {
 					/* translators: %s: header height in pixels */
-					printf( __( 'While you can crop images to your liking after clicking <strong>Add new image</strong>, your theme recommends a header height of %s pixels.' ),
-						sprintf( '<strong>%s</strong>', $height )
+					printf(__('While you can crop images to your liking after clicking <strong>Add new image</strong>, your theme recommends a header height of %s pixels.'),
+						sprintf('<strong>%s</strong>', $height)
 					);
 				}
 				?>
@@ -195,29 +195,29 @@ 
 			<div class="current">
 				<label for="header_image-button">
 					<span class="customize-control-title">
-						<?php _e( 'Current header' ); ?>
+						<?php _e('Current header'); ?>
 					</span>
 				</label>
 				<div class="container">
 				</div>
 			</div>
 			<div class="actions">
-				<?php if ( current_user_can( 'upload_files' ) ): ?>
-				<button type="button"<?php echo $visibility; ?> class="button remove" aria-label="<?php esc_attr_e( 'Hide header image' ); ?>"><?php _e( 'Hide image' ); ?></button>
-				<button type="button" class="button new" id="header_image-button"  aria-label="<?php esc_attr_e( 'Add new header image' ); ?>"><?php _e( 'Add new image' ); ?></button>
+				<?php if (current_user_can('upload_files')): ?>
+				<button type="button"<?php echo $visibility; ?> class="button remove" aria-label="<?php esc_attr_e('Hide header image'); ?>"><?php _e('Hide image'); ?></button>
+				<button type="button" class="button new" id="header_image-button"  aria-label="<?php esc_attr_e('Add new header image'); ?>"><?php _e('Add new image'); ?></button>
 				<div style="clear:both"></div>
 				<?php endif; ?>
 			</div>
 			<div class="choices">
 				<span class="customize-control-title header-previously-uploaded">
-					<?php _ex( 'Previously uploaded', 'custom headers' ); ?>
+					<?php _ex('Previously uploaded', 'custom headers'); ?>
 				</span>
 				<div class="uploaded">
 					<div class="list">
 					</div>
 				</div>
 				<span class="customize-control-title header-default">
-					<?php _ex( 'Suggested', 'custom headers' ); ?>
+					<?php _ex('Suggested', 'custom headers'); ?>
 				</span>
 				<div class="default">
 					<div class="list">