ntwb / wordpress

tools/i18n/pot-ext-meta.php

Braces +12 added lines, -5 removed lines

@@ -38,7 +38,9 @@ 
 		$po = new PO;
 		foreach($this->headers as $header) {
 			$string = $makepot->get_addon_header($header, $source);
-			if (!$string) continue;
+			if (!$string) {
+				continue;
+			}
 			$args = array(
 				'singular' => $string,
 				'extracted_comments' => $header.' of the plugin/theme',
@@ -50,17 +52,22 @@ 
 	}
 
 	function append( $ext_filename, $pot_filename, $headers = null ) {
-		if ( $headers )
-			$this->headers = (array) $headers;
+		if ( $headers ) {
+					$this->headers = (array) $headers;
+		}
 		if ( is_dir( $ext_filename ) ) {
 			$pot = implode('', array_map(array($this, 'load_from_file'), glob("$ext_filename/*.php")));
 		} else {
 			$pot = $this->load_from_file($ext_filename);
 		}
 		$potf = '-' == $pot_filename? STDOUT : fopen($pot_filename, 'a');
-		if (!$potf) return false;
+		if (!$potf) {
+			return false;
+		}
 		fwrite($potf, $pot);
-		if ('-' != $pot_filename) fclose($potf);
+		if ('-' != $pot_filename) {
+			fclose($potf);
+		}
 		return true;
 	}
 }

tools/i18n/not-gettexted.php

Braces +34 added lines, -20 removed lines

@@ -7,10 +7,11 @@ 
  * @subpackage tools
  */
 // see: http://php.net/tokenizer
-if ( ! defined( 'T_ML_COMMENT' ) )
+if ( ! defined( 'T_ML_COMMENT' ) ) {
 	    define( 'T_ML_COMMENT', T_COMMENT );
-else
+} else {
 	    define( 'T_DOC_COMMENT', T_ML_COMMENT );
+}
 
 $pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
 require_once "$pomo/po.php";
@@ -31,7 +32,9 @@ 
 
 	function logmsg() {
 		$args = func_get_args();
-		if ($this->enable_logging) error_log(implode(' ', $args));
+		if ($this->enable_logging) {
+			error_log(implode(' ', $args));
+		}
 	}
 
 	function stderr($msg, $nl=true) {
@@ -56,12 +59,15 @@ 
 		$items = scandir( $dir );
 		foreach ( (array) $items as $item ) {
 			$full_item = $dir . '/' . $item;
-			if ('.' == $item || '..' == $item)
-				continue;
-			if ('.php' == substr($item, -4))
-				$files[] = $full_item;
-			if (is_dir($full_item))
-				$files += array_merge($files, NotGettexted::list_php_files($full_item, $files));
+			if ('.' == $item || '..' == $item) {
+							continue;
+			}
+			if ('.php' == substr($item, -4)) {
+							$files[] = $full_item;
+			}
+			if (is_dir($full_item)) {
+							$files += array_merge($files, NotGettexted::list_php_files($full_item, $files));
+			}
 		}
 		return $files;
 	}
@@ -102,7 +108,9 @@ 
 						$stage = $this->STAGE_END_COMMENT;
 						$this->logmsg('end comment', $current_comment_id);
 						$result .= call_user_func($other_action, $token);
-						if (!is_null($register_action)) call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
+						if (!is_null($register_action)) {
+							call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
+						}
 						continue;
 					}
 				} else if (T_CONSTANT_ENCAPSED_STRING == $id) {
@@ -141,10 +149,11 @@ 
 	function command_extract() {
 		$args = func_get_args();
 		$pot_filename = $args[0];
-		if (isset($args[1]) && is_array($args[1]))
-			$filenames = $args[1];
-		else
-			$filenames = array_slice($args, 1);
+		if (isset($args[1]) && is_array($args[1])) {
+					$filenames = $args[1];
+		} else {
+					$filenames = array_slice($args, 1);
+		}
 
 		$global_name = '__entries_'.mt_rand(1, 1000);
 		$GLOBALS[$global_name] = array();
@@ -172,17 +181,20 @@ 
 			$entry = new Translation_Entry($args);
 			fwrite($potf, "\n".PO::export_entry($entry)."\n");
 		}
-		if ('-' != $pot_filename) fclose($potf);
+		if ('-' != $pot_filename) {
+			fclose($potf);
+		}
 		return true;
 	}
 
 	function command_replace() {
 		$args = func_get_args();
 		$mo_filename = $args[0];
-		if (isset($args[1]) && is_array($args[1]))
-			$filenames = $args[1];
-		else
-			$filenames = array_slice($args, 1);
+		if (isset($args[1]) && is_array($args[1])) {
+					$filenames = $args[1];
+		} else {
+					$filenames = array_slice($args, 1);
+		}
 
 		$global_name = '__mo_'.mt_rand(1, 1000);
 		$GLOBALS[$global_name] = new MO();
@@ -194,7 +206,9 @@ 
 		}
 		foreach($filenames as $filename) {
 			$source = file_get_contents($filename);
-			if ( strlen($source) > 150000 ) continue;
+			if ( strlen($source) > 150000 ) {
+				continue;
+			}
 			$tokens = token_get_all($source);
 			$new_file = $this->walk_tokens($tokens, $replacer, array($this, 'unchanged_token'));
 			$f = fopen($filename, 'w');

tools/i18n/t/data/not-gettexted-0-result.php

Braces +5 added lines, -2 removed lines

@@ -2,8 +2,11 @@
 
 if (! isset($wp_did_header)):
 if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
-	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
-	else $path = 'wp-admin/';
+	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) {
+		$path = '';
+	} else {
+		$path = 'wp-admin/';
+	}
 
 	require_once( dirname(__FILE__) . '/wp-includes/classes.php');
 	require_once( dirname(__FILE__) . '/wp-includes/functions.php');

tools/i18n/t/data/not-gettexted-0.php

Braces +5 added lines, -2 removed lines

@@ -2,8 +2,11 @@
 
 if (! isset($wp_did_header)):
 if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
-	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
-	else $path = 'wp-admin/';
+	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) {
+		$path = '';
+	} else {
+		$path = 'wp-admin/';
+	}
 
 	require_once( dirname(__FILE__) . '/wp-includes/classes.php');
 	require_once( dirname(__FILE__) . '/wp-includes/functions.php');

tools/i18n/add-textdomain.php

Braces +8 added lines, -5 removed lines

@@ -36,10 +36,11 @@ 
 	}
 
 	function process_token($token_text, $inplace) {
-		if ($inplace)
-			$this->modified_contents .= $token_text;
-		else
-			echo $token_text;
+		if ($inplace) {
+					$this->modified_contents .= $token_text;
+		} else {
+					echo $token_text;
+		}
 	}
 
 
@@ -108,7 +109,9 @@ 
 	$inplace = false;
 	if ('-i' == $argv[1]) {
 		$inplace = true;
-		if (!isset($argv[3])) $adddomain->usage();
+		if (!isset($argv[3])) {
+			$adddomain->usage();
+		}
 		array_shift($argv);	
 	}
 

tools/i18n/makepot.php

Braces +90 added lines, -49 removed lines

@@ -149,8 +149,9 @@ 
 	}
 
 	function __destruct() {
-		foreach ( $this->temp_files as $temp_file )
-			unlink( $temp_file );
+		foreach ( $this->temp_files as $temp_file ) {
+					unlink( $temp_file );
+		}
 	}
 
 	function tempnam( $file ) {
@@ -208,13 +209,16 @@ 
 		$args = array_merge( $defaults, $args );
 		extract( $args );
 		$placeholders = array();
-		if ( $wp_version = $this->wp_version( $dir ) )
-			$placeholders['version'] = $wp_version;
-		else
-			return false;
+		if ( $wp_version = $this->wp_version( $dir ) ) {
+					$placeholders['version'] = $wp_version;
+		} else {
+					return false;
+		}
 		$output = is_null( $output )? $default_output : $output;
 		$res = $this->xgettext( $project, $dir, $output, $placeholders, $excludes, $includes );
-		if ( !$res ) return false;
+		if ( !$res ) {
+			return false;
+		}
 
 		if ( $extract_not_gettexted ) {
 			$old_dir = getcwd();
@@ -233,7 +237,9 @@ 
 	}
 
 	function wp_core($dir, $output) {
-		if ( file_exists( "$dir/wp-admin/user/about.php" ) ) return false;
+		if ( file_exists( "$dir/wp-admin/user/about.php" ) ) {
+			return false;
+		}
 
 		return $this->wp_generic( $dir, array(
 			'project' => 'wp-core', 'output' => $output,
@@ -316,21 +322,29 @@ 
 	}
 
 	function wp_network_admin($dir, $output) {
-		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) return false;
+		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) {
+			return false;
+		}
 
 		$frontend_pot = $this->tempnam( 'frontend.pot' );
-		if ( false === $frontend_pot ) return false;
+		if ( false === $frontend_pot ) {
+			return false;
+		}
 
 		$frontend_result = $this->wp_frontend( $dir, $frontend_pot );
-		if ( ! $frontend_result )
-			return false;
+		if ( ! $frontend_result ) {
+					return false;
+		}
 
 		$admin_pot = $this->tempnam( 'admin.pot' );
-		if ( false === $admin_pot ) return false;
+		if ( false === $admin_pot ) {
+			return false;
+		}
 
 		$admin_result = $this->wp_admin( $dir, $admin_pot );
-		if ( ! $admin_result )
-			return false;
+		if ( ! $admin_result ) {
+					return false;
+		}
 
 		$result = $this->wp_generic( $dir, array(
 			'project' => 'wp-network-admin', 'output' => $output,
@@ -344,8 +358,9 @@ 
 		}
 
 		$common_pot = $this->tempnam( 'common.pot' );
-		if ( ! $common_pot )
-			return false;
+		if ( ! $common_pot ) {
+					return false;
+		}
 
 		$net_admin_pot = realpath( is_null( $output ) ? 'wordpress-network-admin.pot' : $output );
 		system( "msgcat --more-than=1 --use-first $frontend_pot $admin_pot $net_admin_pot > $common_pot" );
@@ -354,13 +369,20 @@ 
 	}
 
 	function wp_ms($dir, $output) {
-		if ( file_exists( "$dir/wp-admin/user/about.php" ) ) return false;
-		if ( !is_file("$dir/wp-admin/ms-users.php") ) return false;
+		if ( file_exists( "$dir/wp-admin/user/about.php" ) ) {
+			return false;
+		}
+		if ( !is_file("$dir/wp-admin/ms-users.php") ) {
+			return false;
+		}
 		$core_pot = $this->tempnam( 'wordpress.pot' );
-		if ( false === $core_pot ) return false;
-		$core_result = $this->wp_core( $dir, $core_pot );
-		if ( ! $core_result )
+		if ( false === $core_pot ) {
 			return false;
+		}
+		$core_result = $this->wp_core( $dir, $core_pot );
+		if ( ! $core_result ) {
+					return false;
+		}
 		$ms_result = $this->wp_generic( $dir, array(
 			'project' => 'wp-ms', 'output' => $output,
 			'includes' => $this->ms_files,
@@ -373,8 +395,9 @@ 
 			return false;
 		}
 		$common_pot = $this->tempnam( 'common.pot' );
-		if ( ! $common_pot )
-			return false;
+		if ( ! $common_pot ) {
+					return false;
+		}
 		$ms_pot = realpath( is_null( $output )? 'wordpress-ms.pot' : $output );
 		system( "msgcat --more-than=1 --use-first $core_pot $ms_pot > $common_pot" );
 		system( "msgcat -u --use-first $ms_pot $common_pot -o $ms_pot" );
@@ -383,7 +406,9 @@ 
 
 	function wp_tz($dir, $output) {
 		$continents_path = 'wp-admin/includes/continents-cities.php';
-		if ( !file_exists( "$dir/$continents_path" ) ) return false;
+		if ( !file_exists( "$dir/$continents_path" ) ) {
+			return false;
+		}
 		return $this->wp_generic( $dir, array(
 			'project' => 'wp-tz', 'output' => $output,
 			'includes' => array( $continents_path ),
@@ -394,7 +419,9 @@ 
 
 	function wp_version($dir) {
 		$version_php = $dir.'/wp-includes/version.php';
-		if ( !is_readable( $version_php ) ) return false;
+		if ( !is_readable( $version_php ) ) {
+			return false;
+		}
 		return preg_match( '/\$wp_version\s*=\s*\'(.*?)\';/', file_get_contents( $version_php ), $matches )? $matches[1] : false;
 	}
 
@@ -418,11 +445,15 @@ 
 
 	function get_first_lines($filename, $lines = 30) {
 		$extf = fopen($filename, 'r');
-		if (!$extf) return false;
+		if (!$extf) {
+			return false;
+		}
 		$first_lines = '';
 		foreach(range(1, $lines) as $x) {
 			$line = fgets($extf);
-			if (feof($extf)) break;
+			if (feof($extf)) {
+				break;
+			}
 			if (false === $line) {
 				return false;
 			}
@@ -433,10 +464,11 @@ 
 
 
 	function get_addon_header($header, &$source) {
-		if (preg_match('|'.$header.':(.*)$|mi', $source, $matches))
-			return trim($matches[1]);
-		else
-			return false;
+		if (preg_match('|'.$header.':(.*)$|mi', $source, $matches)) {
+					return trim($matches[1]);
+		} else {
+					return false;
+		}
 	}
 
 	function generic($dir, $output) {
@@ -507,7 +539,9 @@ 
 
 		$output = is_null($output)? "$slug.pot" : $output;
 		$res = $this->xgettext('wp-plugin', $dir, $output, $placeholders);
-		if (!$res) return false;
+		if (!$res) {
+			return false;
+		}
 		$potextmeta = new PotExtMeta;
 		$res = $potextmeta->append($main_file, $output);
 		/* Adding non-gettexted strings can repeat some phrases */
@@ -531,19 +565,22 @@ 
 		$placeholders['slug'] = $slug;
 
 		$license = $this->get_addon_header( 'License', $source );
-		if ( $license )
-			$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the {$license}.";
-		else
-			$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the same license as the {package-name} package.";
+		if ( $license ) {
+					$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the {$license}.";
+		} else {
+					$this->meta['wp-theme']['comments'] = "Copyright (C) {year} {author}\nThis file is distributed under the same license as the {package-name} package.";
+		}
 
 		$output = is_null($output)? "$slug.pot" : $output;
 		$res = $this->xgettext('wp-theme', $dir, $output, $placeholders);
-		if (! $res )
-			return false;
+		if (! $res ) {
+					return false;
+		}
 		$potextmeta = new PotExtMeta;
 		$res = $potextmeta->append( $main_file, $output, array( 'Theme Name', 'Theme URI', 'Description', 'Author', 'Author URI' ) );
-		if ( ! $res )
-			return false;
+		if ( ! $res ) {
+					return false;
+		}
 		// If we're dealing with a pre-3.4 default theme, don't extract page templates before 3.4.
 		$extract_templates = ! in_array( $slug, array( 'twentyten', 'twentyeleven', 'default', 'classic' ) );
 		if ( ! $extract_templates ) {
@@ -552,16 +589,19 @@ 
 		}
 		if ( $extract_templates ) {
 			$res = $potextmeta->append( $dir, $output, array( 'Template Name' ) );
-			if ( ! $res )
-				return false;
+			if ( ! $res ) {
+							return false;
+			}
 			$files = scandir( $dir );
 			foreach ( $files as $file ) {
-				if ( '.' == $file[0] || 'CVS' == $file )
-					continue;
+				if ( '.' == $file[0] || 'CVS' == $file ) {
+									continue;
+				}
 				if ( is_dir( $dir . '/' . $file ) ) {
 					$res = $potextmeta->append( $dir . '/' . $file, $output, array( 'Template Name' ) );
-					if ( ! $res )
-						return false;
+					if ( ! $res ) {
+											return false;
+					}
 				}
 			}
 		}
@@ -603,9 +643,10 @@ 
 	function is_ms_file( $file_name ) {
 		$is_ms_file = false;
 		$prefix = substr( $file_name, 0, 2 ) === './'? '\./' : '';
-		foreach( $this->ms_files as $ms_file )
-			if ( preg_match( '|^'.$prefix.$ms_file.'$|', $file_name ) ) {
+		foreach( $this->ms_files as $ms_file ) {
+					if ( preg_match( '|^'.$prefix.$ms_file.'$|', $file_name ) ) {
 				$is_ms_file = true;
+		}
 				break;
 			}
 		return $is_ms_file;

tools/i18n/extract.php

Braces +29 added lines, -12 removed lines

@@ -26,7 +26,9 @@ 
 		$translations = new Translations;
 		$file_names = (array) scandir( '.' );
 		foreach ( $file_names as $file_name ) {
-			if ( '.' == $file_name || '..' == $file_name ) continue;
+			if ( '.' == $file_name || '..' == $file_name ) {
+				continue;
+			}
 			if ( preg_match( '/\.php$/', $file_name ) && $this->does_file_name_match( $prefix . $file_name, $excludes, $includes ) ) {
 				$extracted = $this->extract_from_file( $file_name, $prefix );
 				$translations->merge_originals_with( $extracted );
@@ -54,7 +56,9 @@ 
 					break;
 				}
 			}
-			if ( !$matched_any_include ) return false;
+			if ( !$matched_any_include ) {
+				return false;
+			}
 		}
 		if ( $excludes ) {
 			foreach( $excludes as $exclude ) {
@@ -68,12 +72,16 @@ 
 
 	function entry_from_call( $call, $file_name ) {
 		$rule = isset( $this->rules[$call['name']] )? $this->rules[$call['name']] : null;
-		if ( !$rule ) return null;
+		if ( !$rule ) {
+			return null;
+		}
 		$entry = new Translation_Entry;
 		$multiple = array();
 		$complete = false;
 		for( $i = 0; $i < count( $rule ); ++$i ) {
-			if ( $rule[$i] && ( !isset( $call['args'][$i] ) || !is_string( $call['args'][$i] ) || '' == $call['args'][$i] ) ) return false;
+			if ( $rule[$i] && ( !isset( $call['args'][$i] ) || !is_string( $call['args'][$i] ) || '' == $call['args'][$i] ) ) {
+				return false;
+			}
 			switch( $rule[$i] ) {
 			case 'string':
 				if ( $complete ) {
@@ -133,11 +141,12 @@ 
 		$function_calls = $this->find_function_calls( array_keys( $this->rules ), $code );
 		foreach( $function_calls as $call ) {
 			$entry = $this->entry_from_call( $call, $file_name );
-			if ( is_array( $entry ) )
-				foreach( $entry as $single_entry )
+			if ( is_array( $entry ) ) {
+							foreach( $entry as $single_entry )
 					$translations->add_entry_or_merge( $single_entry );
-			elseif ( $entry)
-				$translations->add_entry_or_merge( $entry );
+			} elseif ( $entry) {
+							$translations->add_entry_or_merge( $entry );
+			}
 		}
 		return $translations;
 	}
@@ -155,8 +164,12 @@ 
 		$in_func = false;
 		foreach( $tokens as $token ) {
 			$id = $text = null;
-			if ( is_array( $token ) ) list( $id, $text, $line ) = $token;
-			if ( T_WHITESPACE == $id ) continue;
+			if ( is_array( $token ) ) {
+				list( $id, $text, $line ) = $token;
+			}
+			if ( T_WHITESPACE == $id ) {
+				continue;
+			}
 			if ( T_STRING == $id && in_array( $text, $function_names ) && !$in_func ) {
 				$in_func = true;
 				$paren_level = -1;
@@ -177,7 +190,9 @@ 
 					$latest_comment = $text;
 				}
 			}
-			if ( !$in_func ) continue;
+			if ( !$in_func ) {
+				continue;
+			}
 			if ( '(' == $token ) {
 				$paren_level++;
 				if ( 0 == $paren_level ) { // start of first argument
@@ -197,7 +212,9 @@ 
 					$in_func = false;
 					$args[] = $current_argument;
 					$call = array( 'name' => $func_name, 'args' => $args, 'line' => $func_line );
-					if ( $func_comment ) $call['comment'] = $func_comment;
+					if ( $func_comment ) {
+						$call['comment'] = $func_comment;
+					}
 					$function_calls[] = $call;
 				}
 				$paren_level--;

src/wp-login.php

Braces +103 added lines, -75 removed lines

@@ -36,11 +36,13 @@ 
 	// Don't index any of these forms
 	add_action( 'login_head', 'wp_no_robots' );
 
-	if ( wp_is_mobile() )
-		add_action( 'login_head', 'wp_login_viewport_meta' );
+	if ( wp_is_mobile() ) {
+			add_action( 'login_head', 'wp_login_viewport_meta' );
+	}
 
-	if ( empty($wp_error) )
-		$wp_error = new WP_Error();
+	if ( empty($wp_error) ) {
+			$wp_error = new WP_Error();
+	}
 
 	// Shake it!
 	$shake_error_codes = array( 'empty_password', 'empty_email', 'invalid_email', 'invalidcombo', 'empty_username', 'invalid_username', 'incorrect_password' );
@@ -53,8 +55,9 @@ 
 	 */
 	$shake_error_codes = apply_filters( 'shake_error_codes', $shake_error_codes );
 
-	if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) )
-		add_action( 'login_head', 'wp_shake_js', 12 );
+	if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) ) {
+			add_action( 'login_head', 'wp_shake_js', 12 );
+	}
 
 	?><!DOCTYPE html>
 	<!--[if IE 8]>
@@ -120,18 +123,21 @@ 
 	$login_header_title = apply_filters( 'login_headertitle', $login_header_title );
 
 	$classes = array( 'login-action-' . $action, 'wp-core-ui' );
-	if ( wp_is_mobile() )
-		$classes[] = 'mobile';
-	if ( is_rtl() )
-		$classes[] = 'rtl';
+	if ( wp_is_mobile() ) {
+			$classes[] = 'mobile';
+	}
+	if ( is_rtl() ) {
+			$classes[] = 'rtl';
+	}
 	if ( $interim_login ) {
 		$classes[] = 'interim-login';
 		?>
 		<style type="text/css">html{background-color: transparent;}</style>
 		<?php
 
-		if ( 'success' ===  $interim_login )
-			$classes[] = 'interim-login-success';
+		if ( 'success' ===  $interim_login ) {
+					$classes[] = 'interim-login-success';
+		}
 	}
 	$classes[] =' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
 
@@ -162,8 +168,9 @@ 
 	 * @param string $message Login message text.
 	 */
 	$message = apply_filters( 'login_message', $message );
-	if ( !empty( $message ) )
-		echo $message . "\n";
+	if ( !empty( $message ) ) {
+			echo $message . "\n";
+	}
 
 	// In case a plugin uses $error rather than the $wp_errors object
 	if ( !empty( $error ) ) {
@@ -177,10 +184,11 @@ 
 		foreach ( $wp_error->get_error_codes() as $code ) {
 			$severity = $wp_error->get_error_data( $code );
 			foreach ( $wp_error->get_error_messages( $code ) as $error_message ) {
-				if ( 'message' == $severity )
-					$messages .= '	' . $error_message . "<br />\n";
-				else
-					$errors .= '	' . $error_message . "<br />\n";
+				if ( 'message' == $severity ) {
+									$messages .= '	' . $error_message . "<br />\n";
+				} else {
+									$errors .= '	' . $error_message . "<br />\n";
+				}
 			}
 		}
 		if ( ! empty( $errors ) ) {
@@ -245,9 +253,10 @@ 
  * @since 3.0.0
  */
 function wp_shake_js() {
-	if ( wp_is_mobile() )
-		return;
-?>
+	if ( wp_is_mobile() ) {
+			return;
+	}
+	?>
 <script type="text/javascript">
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
 function s(id,pos){g(id).left=pos+'px';}
@@ -284,8 +293,9 @@ 
 		$errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.'));
 	} elseif ( strpos( $_POST['user_login'], '@' ) ) {
 		$user_data = get_user_by( 'email', trim( $_POST['user_login'] ) );
-		if ( empty( $user_data ) )
-			$errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.'));
+		if ( empty( $user_data ) ) {
+					$errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.'));
+		}
 	} else {
 		$login = trim($_POST['user_login']);
 		$user_data = get_user_by('login', $login);
@@ -298,8 +308,9 @@ 
 	 */
 	do_action( 'lostpassword_post' );
 
-	if ( $errors->get_error_code() )
-		return $errors;
+	if ( $errors->get_error_code() ) {
+			return $errors;
+	}
 
 	if ( !$user_data ) {
 		$errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.'));
@@ -373,14 +384,15 @@ 
 	$message .= __('To reset your password, visit the following address:') . "\r\n\r\n";
 	$message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . ">\r\n";
 
-	if ( is_multisite() )
-		$blogname = $GLOBALS['current_site']->site_name;
-	else
-		/*
+	if ( is_multisite() ) {
+			$blogname = $GLOBALS['current_site']->site_name;
+	} else {
+			/*
 		 * The blogname option is escaped with esc_html on the way into the database
 		 * in sanitize_option we want to reverse this for the plain text arena of emails.
 		 */
 		$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+	}
 
 	$title = sprintf( __('[%s] Password Reset'), $blogname );
 
@@ -406,8 +418,9 @@ 
 	 */
 	$message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data );
 
-	if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) )
-		wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );
+	if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) ) {
+			wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );
+	}
 
 	return true;
 }
@@ -419,31 +432,36 @@ 
 $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'login';
 $errors = new WP_Error();
 
-if ( isset($_GET['key']) )
+if ( isset($_GET['key']) ) {
 	$action = 'resetpass';
+}
 
 // validate action so as to default to the login screen
-if ( !in_array( $action, array( 'postpass', 'logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login' ), true ) && false === has_filter( 'login_form_' . $action ) )
+if ( !in_array( $action, array( 'postpass', 'logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login' ), true ) && false === has_filter( 'login_form_' . $action ) ) {
 	$action = 'login';
+}
 
 nocache_headers();
 
 header('Content-Type: '.get_bloginfo('html_type').'; charset='.get_bloginfo('charset'));
 
 if ( defined( 'RELOCATE' ) && RELOCATE ) { // Move flag is set
-	if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
-		$_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
+	if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) ) {
+			$_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
+	}
 
 	$url = dirname( set_url_scheme( 'http://' .  $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] ) );
-	if ( $url != get_option( 'siteurl' ) )
-		update_option( 'siteurl', $url );
-}
+	if ( $url != get_option( 'siteurl' ) ) {
+			update_option( 'siteurl', $url );
+	}
+	}
 
 //Set a cookie now to see if they are supported by the browser.
 $secure = ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) && 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
 setcookie( TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure );
-if ( SITECOOKIEPATH != COOKIEPATH )
+if ( SITECOOKIEPATH != COOKIEPATH ) {
 	setcookie( TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
+}
 
 /**
  * Fires when the login form is initialized.
@@ -613,17 +631,19 @@ 
 
 	if ( ! $user || is_wp_error( $user ) ) {
 		setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
-		if ( $user && $user->get_error_code() === 'expired_key' )
-			wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=expiredkey' ) );
-		else
-			wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=invalidkey' ) );
+		if ( $user && $user->get_error_code() === 'expired_key' ) {
+					wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=expiredkey' ) );
+		} else {
+					wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=invalidkey' ) );
+		}
 		exit;
 	}
 
 	$errors = new WP_Error();
 
-	if ( isset($_POST['pass1']) && $_POST['pass1'] != $_POST['pass2'] )
-		$errors->add( 'password_reset_mismatch', __( 'The passwords do not match.' ) );
+	if ( isset($_POST['pass1']) && $_POST['pass1'] != $_POST['pass2'] ) {
+			$errors->add( 'password_reset_mismatch', __( 'The passwords do not match.' ) );
+	}
 
 	/**
 	 * Fires before the password reset procedure is validated.
@@ -778,8 +798,9 @@ 
 default:
 	$secure_cookie = '';
 	$customize_login = isset( $_REQUEST['customize-login'] );
-	if ( $customize_login )
-		wp_enqueue_script( 'customize-base' );
+	if ( $customize_login ) {
+			wp_enqueue_script( 'customize-base' );
+	}
 
 	// If the user wants ssl but the session is not ssl, force a secure cookie.
 	if ( !empty($_POST['log']) && !force_ssl_admin() ) {
@@ -795,8 +816,9 @@ 
 	if ( isset( $_REQUEST['redirect_to'] ) ) {
 		$redirect_to = $_REQUEST['redirect_to'];
 		// Redirect to https if user wants ssl
-		if ( $secure_cookie && false !== strpos($redirect_to, 'wp-admin') )
-			$redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);
+		if ( $secure_cookie && false !== strpos($redirect_to, 'wp-admin') ) {
+					$redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);
+		}
 	} else {
 		$redirect_to = admin_url();
 	}
@@ -846,12 +868,13 @@ 
 
 		if ( ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) ) {
 			// If the user doesn't belong to a blog, send them to user admin. If the user can't edit posts, send them to their profile.
-			if ( is_multisite() && !get_active_blog_for_user($user->ID) && !is_super_admin( $user->ID ) )
-				$redirect_to = user_admin_url();
-			elseif ( is_multisite() && !$user->has_cap('read') )
-				$redirect_to = get_dashboard_url( $user->ID );
-			elseif ( !$user->has_cap('edit_posts') )
-				$redirect_to = admin_url('profile.php');
+			if ( is_multisite() && !get_active_blog_for_user($user->ID) && !is_super_admin( $user->ID ) ) {
+							$redirect_to = user_admin_url();
+			} elseif ( is_multisite() && !$user->has_cap('read') ) {
+							$redirect_to = get_dashboard_url( $user->ID );
+			} elseif ( !$user->has_cap('edit_posts') ) {
+							$redirect_to = admin_url('profile.php');
+			}
 		}
 		wp_safe_redirect($redirect_to);
 		exit();
@@ -859,26 +882,29 @@ 
 
 	$errors = $user;
 	// Clear errors if loggedout is set.
-	if ( !empty($_GET['loggedout']) || $reauth )
-		$errors = new WP_Error();
+	if ( !empty($_GET['loggedout']) || $reauth ) {
+			$errors = new WP_Error();
+	}
 
 	if ( $interim_login ) {
-		if ( ! $errors->get_error_code() )
-			$errors->add('expired', __('Session expired. Please log in again. You will not move away from this page.'), 'message');
+		if ( ! $errors->get_error_code() ) {
+					$errors->add('expired', __('Session expired. Please log in again. You will not move away from this page.'), 'message');
+		}
 	} else {
 		// Some parts of this script use the main login form to display a message
-		if		( isset($_GET['loggedout']) && true == $_GET['loggedout'] )
-			$errors->add('loggedout', __('You are now logged out.'), 'message');
-		elseif	( isset($_GET['registration']) && 'disabled' == $_GET['registration'] )
-			$errors->add('registerdisabled', __('User registration is currently not allowed.'));
-		elseif	( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] )
-			$errors->add('confirm', __('Check your e-mail for the confirmation link.'), 'message');
-		elseif	( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )
-			$errors->add('newpass', __('Check your e-mail for your new password.'), 'message');
-		elseif	( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )
-			$errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message');
-		elseif ( strpos( $redirect_to, 'about.php?updated' ) )
-			$errors->add('updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.' ), 'message' );
+		if		( isset($_GET['loggedout']) && true == $_GET['loggedout'] ) {
+					$errors->add('loggedout', __('You are now logged out.'), 'message');
+		} elseif	( isset($_GET['registration']) && 'disabled' == $_GET['registration'] ) {
+					$errors->add('registerdisabled', __('User registration is currently not allowed.'));
+		} elseif	( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] ) {
+					$errors->add('confirm', __('Check your e-mail for the confirmation link.'), 'message');
+		} elseif	( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] ) {
+					$errors->add('newpass', __('Check your e-mail for your new password.'), 'message');
+		} elseif	( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] ) {
+					$errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message');
+		} elseif ( strpos( $redirect_to, 'about.php?updated' ) ) {
+					$errors->add('updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.' ), 'message' );
+		}
 	}
 
 	/**
@@ -892,13 +918,15 @@ 
 	$errors = apply_filters( 'wp_login_errors', $errors, $redirect_to );
 
 	// Clear any stale cookies.
-	if ( $reauth )
-		wp_clear_auth_cookie();
+	if ( $reauth ) {
+			wp_clear_auth_cookie();
+	}
 
 	login_header(__('Log In'), '', $errors);
 
-	if ( isset($_POST['log']) )
-		$user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(wp_unslash($_POST['log'])) : '';
+	if ( isset($_POST['log']) ) {
+			$user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(wp_unslash($_POST['log'])) : '';
+	}
 	$rememberme = ! empty( $_POST['rememberme'] );
 
 	if ( ! empty( $errors->errors ) ) {

src/xmlrpc.php

Braces +6 added lines, -4 removed lines

@@ -22,8 +22,9 @@ 
 }
 
 // fix for mozBlog and other cases where '<?xml' isn't on the very first line
-if ( isset($HTTP_RAW_POST_DATA) )
+if ( isset($HTTP_RAW_POST_DATA) ) {
 	$HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA);
+}
 
 /** Include the bootstrap for setting up WordPress environment */
 include( dirname( __FILE__ ) . '/wp-load.php' );
@@ -96,6 +97,7 @@ 
  */
 function logIO( $io, $msg ) {
 	_deprecated_function( __FUNCTION__, '3.4', 'error_log()' );
-	if ( ! empty( $GLOBALS['xmlrpc_logging'] ) )
-		error_log( $io . ' - ' . $msg );
-}
\ No newline at end of file
+	if ( ! empty( $GLOBALS['xmlrpc_logging'] ) ) {
+			error_log( $io . ' - ' . $msg );
+	}
+	}
\ No newline at end of file