ntwb / wordpress

src/wp-admin/profile.php

Spacing +1 added lines, -1 removed lines

@@ -15,4 +15,4 @@
 define('IS_PROFILE_PAGE', true);
 
 /** Load User Editing Page */
-require_once( dirname( __FILE__ ) . '/user-edit.php' );
+require_once(dirname(__FILE__).'/user-edit.php');

src/wp-admin/install-helper.php

Spacing +10 added lines, -10 removed lines

@@ -37,7 +37,7 @@ 
 /** Load WordPress Bootstrap */
 require_once(dirname(dirname(__FILE__)).'/wp-load.php');
 
-if ( ! function_exists('maybe_create_table') ) :
+if ( ! function_exists('maybe_create_table')) :
 /**
  * Create database table, if it doesn't already exist.
  *
@@ -51,7 +51,7 @@ 
  */
 function maybe_create_table($table_name, $create_ddl) {
 	global $wpdb;
-	foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
+	foreach ($wpdb->get_col("SHOW TABLES", 0) as $table) {
 		if ($table == $table_name) {
 			return true;
 		}
@@ -60,7 +60,7 @@ 
 	$wpdb->query($create_ddl);
 
 	// We cannot directly tell that whether this succeeded!
-	foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
+	foreach ($wpdb->get_col("SHOW TABLES", 0) as $table) {
 		if ($table == $table_name) {
 			return true;
 		}
@@ -69,7 +69,7 @@ 
 }
 endif;
 
-if ( ! function_exists('maybe_add_column') ) :
+if ( ! function_exists('maybe_add_column')) :
 /**
  * Add column to database table, if column doesn't already exist in table.
  *
@@ -84,7 +84,7 @@ 
  */
 function maybe_add_column($table_name, $column_name, $create_ddl) {
 	global $wpdb;
-	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+	foreach ($wpdb->get_col("DESC $table_name", 0) as $column) {
 
 		if ($column == $column_name) {
 			return true;
@@ -95,7 +95,7 @@ 
 	$wpdb->query($create_ddl);
 
 	// We cannot directly tell that whether this succeeded!
-	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+	foreach ($wpdb->get_col("DESC $table_name", 0) as $column) {
 		if ($column == $column_name) {
 			return true;
 		}
@@ -118,14 +118,14 @@ 
  */
 function maybe_drop_column($table_name, $column_name, $drop_ddl) {
 	global $wpdb;
-	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+	foreach ($wpdb->get_col("DESC $table_name", 0) as $column) {
 		if ($column == $column_name) {
 
 			// Found it, so try to drop it.
 			$wpdb->query($drop_ddl);
 
 			// We cannot directly tell that whether this succeeded!
-			foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+			foreach ($wpdb->get_col("DESC $table_name", 0) as $column) {
 				if ($column == $column_name) {
 					return false;
 				}
@@ -170,7 +170,7 @@ 
 	$diffs = 0;
 	$results = $wpdb->get_results("DESC $table_name");
 
-	foreach ($results as $row ) {
+	foreach ($results as $row) {
 
 		if ($row->Field == $col_name) {
 
@@ -181,7 +181,7 @@ 
 			if (($is_null != null) && ($row->Null != $is_null)) {
 				++$diffs;
 			}
-			if (($key != null) && ($row->Key  != $key)) {
+			if (($key != null) && ($row->Key != $key)) {
 				++$diffs;
 			}
 			if (($default != null) && ($row->Default != $default)) {

src/wp-admin/ms-users.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@
  * @since 3.0.0
  */
 
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_redirect( network_admin_url('users.php') );
+wp_redirect(network_admin_url('users.php'));
 exit;

src/wp-includes/vars.php

Braces +22 added lines, -16 removed lines

@@ -22,12 +22,13 @@ 
 // On which page are we ?
 if ( is_admin() ) {
 	// wp-admin pages are checked more carefully
-	if ( is_network_admin() )
-		preg_match('#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
-	elseif ( is_user_admin() )
-		preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
-	else
-		preg_match('#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
+	if ( is_network_admin() ) {
+			preg_match('#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
+	} elseif ( is_user_admin() ) {
+			preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
+	} else {
+			preg_match('#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
+	}
 	$pagenow = $self_matches[1];
 	$pagenow = trim($pagenow, '/');
 	$pagenow = preg_replace('#\?.*?$#', '', $pagenow);
@@ -36,15 +37,18 @@ 
 	} else {
 		preg_match('#(.*?)(/|$)#', $pagenow, $self_matches);
 		$pagenow = strtolower($self_matches[1]);
-		if ( '.php' !== substr($pagenow, -4, 4) )
-			$pagenow .= '.php'; // for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
+		if ( '.php' !== substr($pagenow, -4, 4) ) {
+					$pagenow .= '.php';
+		}
+		// for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
 	}
 } else {
-	if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches) )
-		$pagenow = strtolower($self_matches[1]);
-	else
-		$pagenow = 'index.php';
-}
+	if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches) ) {
+			$pagenow = strtolower($self_matches[1]);
+	} else {
+			$pagenow = 'index.php';
+	}
+	}
 unset($self_matches);
 
 // Simple browser detection
@@ -63,8 +67,9 @@ 
 			 *
 			 * @param bool $is_admin Whether to use the Google Chrome Frame. Default is the value of is_admin().
 			 */
-			if ( $is_chrome = apply_filters( 'use_google_chrome_frame', $is_admin ) )
-				header( 'X-UA-Compatible: chrome=1' );
+			if ( $is_chrome = apply_filters( 'use_google_chrome_frame', $is_admin ) ) {
+							header( 'X-UA-Compatible: chrome=1' );
+			}
 			$is_winIE = ! $is_chrome;
 		} else {
 			$is_chrome = true;
@@ -84,8 +89,9 @@ 
 	}
 }
 
-if ( $is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false )
+if ( $is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false ) {
 	$is_iphone = true;
+}
 
 $is_IE = ( $is_macIE || $is_winIE );
 

Spacing +27 added lines, -27 removed lines

@@ -20,27 +20,27 @@ 
 	$is_apache, $is_IIS, $is_iis7, $is_nginx;
 
 // On which page are we ?
-if ( is_admin() ) {
+if (is_admin()) {
 	// wp-admin pages are checked more carefully
-	if ( is_network_admin() )
+	if (is_network_admin())
 		preg_match('#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
-	elseif ( is_user_admin() )
+	elseif (is_user_admin())
 		preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
 	else
 		preg_match('#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
 	$pagenow = $self_matches[1];
 	$pagenow = trim($pagenow, '/');
 	$pagenow = preg_replace('#\?.*?$#', '', $pagenow);
-	if ( '' === $pagenow || 'index' === $pagenow || 'index.php' === $pagenow ) {
+	if ('' === $pagenow || 'index' === $pagenow || 'index.php' === $pagenow) {
 		$pagenow = 'index.php';
 	} else {
 		preg_match('#(.*?)(/|$)#', $pagenow, $self_matches);
 		$pagenow = strtolower($self_matches[1]);
-		if ( '.php' !== substr($pagenow, -4, 4) )
+		if ('.php' !== substr($pagenow, -4, 4))
 			$pagenow .= '.php'; // for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
 	}
 } else {
-	if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches) )
+	if (preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches))
 		$pagenow = strtolower($self_matches[1]);
 	else
 		$pagenow = 'index.php';
@@ -50,13 +50,13 @@ 
 // Simple browser detection
 $is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = $is_safari = $is_chrome = $is_iphone = $is_edge = false;
 
-if ( isset($_SERVER['HTTP_USER_AGENT']) ) {
-	if ( strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false ) {
+if (isset($_SERVER['HTTP_USER_AGENT'])) {
+	if (strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false) {
 		$is_lynx = true;
-	} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Edge' ) !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') !== false) {
 		$is_edge = true;
-	} elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'chrome') !== false ) {
-		if ( stripos( $_SERVER['HTTP_USER_AGENT'], 'chromeframe' ) !== false ) {
+	} elseif (stripos($_SERVER['HTTP_USER_AGENT'], 'chrome') !== false) {
+		if (stripos($_SERVER['HTTP_USER_AGENT'], 'chromeframe') !== false) {
 			$is_admin = is_admin();
 			/**
 			 * Filters whether Google Chrome Frame should be used, if available.
@@ -65,31 +65,31 @@ 
 			 *
 			 * @param bool $is_admin Whether to use the Google Chrome Frame. Default is the value of is_admin().
 			 */
-			if ( $is_chrome = apply_filters( 'use_google_chrome_frame', $is_admin ) )
-				header( 'X-UA-Compatible: chrome=1' );
+			if ($is_chrome = apply_filters('use_google_chrome_frame', $is_admin))
+				header('X-UA-Compatible: chrome=1');
 			$is_winIE = ! $is_chrome;
 		} else {
 			$is_chrome = true;
 		}
-	} elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false ) {
+	} elseif (stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false) {
 		$is_safari = true;
-	} elseif ( ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false ) && strpos($_SERVER['HTTP_USER_AGENT'], 'Win') !== false ) {
+	} elseif ((strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false) && strpos($_SERVER['HTTP_USER_AGENT'], 'Win') !== false) {
 		$is_winIE = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false) {
 		$is_macIE = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false) {
 		$is_gecko = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false) {
 		$is_opera = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Nav') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.') !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Nav') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.') !== false) {
 		$is_NS4 = true;
 	}
 }
 
-if ( $is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false )
+if ($is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false)
 	$is_iphone = true;
 
-$is_IE = ( $is_macIE || $is_winIE );
+$is_IE = ($is_macIE || $is_winIE);
 
 // Server detection
 
@@ -109,13 +109,13 @@ 
  * Whether the server software is IIS or something else
  * @global bool $is_IIS
  */
-$is_IIS = !$is_apache && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer') !== false);
+$is_IIS = ! $is_apache && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer') !== false);
 
 /**
  * Whether the server software is IIS 7.X or greater
  * @global bool $is_iis7
  */
-$is_iis7 = $is_IIS && intval( substr( $_SERVER['SERVER_SOFTWARE'], strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/' ) + 14 ) ) >= 7;
+$is_iis7 = $is_IIS && intval(substr($_SERVER['SERVER_SOFTWARE'], strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/') + 14)) >= 7;
 
 /**
  * Test if the current browser runs on a mobile device (smart phone, tablet, etc.)
@@ -125,15 +125,15 @@ 
  * @return bool
  */
 function wp_is_mobile() {
-	if ( empty($_SERVER['HTTP_USER_AGENT']) ) {
+	if (empty($_SERVER['HTTP_USER_AGENT'])) {
 		$is_mobile = false;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Mobile') !== false // many mobile devices (all iPhone, iPad, etc.)
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Mobile') !== false // many mobile devices (all iPhone, iPad, etc.)
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Android') !== false
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Silk/') !== false
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Kindle') !== false
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'BlackBerry') !== false
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mini') !== false
-		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mobi') !== false ) {
+		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mobi') !== false) {
 			$is_mobile = true;
 	} else {
 		$is_mobile = false;
@@ -146,5 +146,5 @@ 
 	 *
 	 * @param bool $is_mobile Whether the request is from a mobile device or not.
 	 */
-	return apply_filters( 'wp_is_mobile', $is_mobile );
+	return apply_filters('wp_is_mobile', $is_mobile);
 }

src/wp-includes/js/tinymce/wp-tinymce.php

Spacing +7 added lines, -7 removed lines

@@ -10,10 +10,10 @@ 
 
 function get_file($path) {
 
-	if ( function_exists('realpath') )
+	if (function_exists('realpath'))
 		$path = realpath($path);
 
-	if ( ! $path || ! @is_file($path) )
+	if ( ! $path || ! @is_file($path))
 		return false;
 
 	return @file_get_contents($path);
@@ -23,17 +23,17 @@ 
 
 header('Content-Type: application/javascript; charset=UTF-8');
 header('Vary: Accept-Encoding'); // Handle proxies
-header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
+header('Expires: '.gmdate("D, d M Y H:i:s", time() + $expires_offset).' GMT');
 header("Cache-Control: public, max-age=$expires_offset");
 
-if ( isset($_GET['c']) && 1 == $_GET['c'] && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
-	&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && ( $file = get_file($basepath . '/wp-tinymce.js.gz') ) ) {
+if (isset($_GET['c']) && 1 == $_GET['c'] && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
+	&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && ($file = get_file($basepath.'/wp-tinymce.js.gz'))) {
 
 	header('Content-Encoding: gzip');
 	echo $file;
 } else {
 	// Back compat. This file shouldn't be used if this condition can occur (as in, if gzip isn't accepted).
-	echo get_file( $basepath . '/tinymce.min.js' );
-	echo get_file( $basepath . '/plugins/compat3x/plugin.min.js' );
+	echo get_file($basepath.'/tinymce.min.js');
+	echo get_file($basepath.'/plugins/compat3x/plugin.min.js');
 }
 exit;

Braces +6 added lines, -4 removed lines

@@ -10,11 +10,13 @@
 
 function get_file($path) {
 
-	if ( function_exists('realpath') )
-		$path = realpath($path);
+	if ( function_exists('realpath') ) {
+			$path = realpath($path);
+	}
 
-	if ( ! $path || ! @is_file($path) )
-		return false;
+	if ( ! $path || ! @is_file($path) ) {
+			return false;
+	}
 
 	return @file_get_contents($path);
 }

src/wp-includes/class-wp-error.php

Braces +38 added lines, -26 removed lines

@@ -53,13 +53,15 @@ 
 	 * @param mixed $data Optional. Error data.
 	 */
 	public function __construct( $code = '', $message = '', $data = '' ) {
-		if ( empty($code) )
-			return;
+		if ( empty($code) ) {
+					return;
+		}
 
 		$this->errors[$code][] = $message;
 
-		if ( ! empty($data) )
-			$this->error_data[$code] = $data;
+		if ( ! empty($data) ) {
+					$this->error_data[$code] = $data;
+		}
 	}
 
 	/**
@@ -71,8 +73,9 @@ 
 	 * @return array List of error codes, if available.
 	 */
 	public function get_error_codes() {
-		if ( empty($this->errors) )
-			return array();
+		if ( empty($this->errors) ) {
+					return array();
+		}
 
 		return array_keys($this->errors);
 	}
@@ -88,8 +91,9 @@ 
 	public function get_error_code() {
 		$codes = $this->get_error_codes();
 
-		if ( empty($codes) )
-			return '';
+		if ( empty($codes) ) {
+					return '';
+		}
 
 		return $codes[0];
 	}
@@ -106,16 +110,18 @@ 
 		// Return all messages if no code specified.
 		if ( empty($code) ) {
 			$all_messages = array();
-			foreach ( (array) $this->errors as $code => $messages )
-				$all_messages = array_merge($all_messages, $messages);
+			foreach ( (array) $this->errors as $code => $messages ) {
+							$all_messages = array_merge($all_messages, $messages);
+			}
 
 			return $all_messages;
 		}
 
-		if ( isset($this->errors[$code]) )
-			return $this->errors[$code];
-		else
-			return array();
+		if ( isset($this->errors[$code]) ) {
+					return $this->errors[$code];
+		} else {
+					return array();
+		}
 	}
 
 	/**
@@ -130,11 +136,13 @@ 
 	 * @return string
 	 */
 	public function get_error_message($code = '') {
-		if ( empty($code) )
-			$code = $this->get_error_code();
+		if ( empty($code) ) {
+					$code = $this->get_error_code();
+		}
 		$messages = $this->get_error_messages($code);
-		if ( empty($messages) )
-			return '';
+		if ( empty($messages) ) {
+					return '';
+		}
 		return $messages[0];
 	}
 
@@ -147,11 +155,13 @@ 
 	 * @return mixed Error data, if it exists.
 	 */
 	public function get_error_data($code = '') {
-		if ( empty($code) )
-			$code = $this->get_error_code();
+		if ( empty($code) ) {
+					$code = $this->get_error_code();
+		}
 
-		if ( isset($this->error_data[$code]) )
-			return $this->error_data[$code];
+		if ( isset($this->error_data[$code]) ) {
+					return $this->error_data[$code];
+		}
 	}
 
 	/**
@@ -166,8 +176,9 @@ 
 	 */
 	public function add($code, $message, $data = '') {
 		$this->errors[$code][] = $message;
-		if ( ! empty($data) )
-			$this->error_data[$code] = $data;
+		if ( ! empty($data) ) {
+					$this->error_data[$code] = $data;
+		}
 	}
 
 	/**
@@ -181,8 +192,9 @@ 
 	 * @param string|int $code Error code.
 	 */
 	public function add_data($data, $code = '') {
-		if ( empty($code) )
-			$code = $this->get_error_code();
+		if ( empty($code) ) {
+					$code = $this->get_error_code();
+		}
 
 		$this->error_data[$code] = $data;
 	}

Spacing +17 added lines, -17 removed lines

@@ -52,13 +52,13 @@ 
 	 * @param string $message Error message
 	 * @param mixed $data Optional. Error data.
 	 */
-	public function __construct( $code = '', $message = '', $data = '' ) {
-		if ( empty($code) )
+	public function __construct($code = '', $message = '', $data = '') {
+		if (empty($code))
 			return;
 
 		$this->errors[$code][] = $message;
 
-		if ( ! empty($data) )
+		if ( ! empty($data))
 			$this->error_data[$code] = $data;
 	}
 
@@ -71,7 +71,7 @@ 
 	 * @return array List of error codes, if available.
 	 */
 	public function get_error_codes() {
-		if ( empty($this->errors) )
+		if (empty($this->errors))
 			return array();
 
 		return array_keys($this->errors);
@@ -88,7 +88,7 @@ 
 	public function get_error_code() {
 		$codes = $this->get_error_codes();
 
-		if ( empty($codes) )
+		if (empty($codes))
 			return '';
 
 		return $codes[0];
@@ -104,15 +104,15 @@ 
 	 */
 	public function get_error_messages($code = '') {
 		// Return all messages if no code specified.
-		if ( empty($code) ) {
+		if (empty($code)) {
 			$all_messages = array();
-			foreach ( (array) $this->errors as $code => $messages )
+			foreach ((array) $this->errors as $code => $messages)
 				$all_messages = array_merge($all_messages, $messages);
 
 			return $all_messages;
 		}
 
-		if ( isset($this->errors[$code]) )
+		if (isset($this->errors[$code]))
 			return $this->errors[$code];
 		else
 			return array();
@@ -130,10 +130,10 @@ 
 	 * @return string
 	 */
 	public function get_error_message($code = '') {
-		if ( empty($code) )
+		if (empty($code))
 			$code = $this->get_error_code();
 		$messages = $this->get_error_messages($code);
-		if ( empty($messages) )
+		if (empty($messages))
 			return '';
 		return $messages[0];
 	}
@@ -147,10 +147,10 @@ 
 	 * @return mixed Error data, if it exists.
 	 */
 	public function get_error_data($code = '') {
-		if ( empty($code) )
+		if (empty($code))
 			$code = $this->get_error_code();
 
-		if ( isset($this->error_data[$code]) )
+		if (isset($this->error_data[$code]))
 			return $this->error_data[$code];
 	}
 
@@ -166,7 +166,7 @@ 
 	 */
 	public function add($code, $message, $data = '') {
 		$this->errors[$code][] = $message;
-		if ( ! empty($data) )
+		if ( ! empty($data))
 			$this->error_data[$code] = $data;
 	}
 
@@ -181,7 +181,7 @@ 
 	 * @param string|int $code Error code.
 	 */
 	public function add_data($data, $code = '') {
-		if ( empty($code) )
+		if (empty($code))
 			$code = $this->get_error_code();
 
 		$this->error_data[$code] = $data;
@@ -197,8 +197,8 @@ 
 	 *
 	 * @param string|int $code Error code.
 	 */
-	public function remove( $code ) {
-		unset( $this->errors[ $code ] );
-		unset( $this->error_data[ $code ] );
+	public function remove($code) {
+		unset($this->errors[$code]);
+		unset($this->error_data[$code]);
 	}
 }

src/wp-includes/bookmark.php

Braces +29 added lines, -20 removed lines

@@ -22,10 +22,11 @@ 
 	global $wpdb;
 
 	if ( empty($bookmark) ) {
-		if ( isset($GLOBALS['link']) )
-			$_bookmark = & $GLOBALS['link'];
-		else
-			$_bookmark = null;
+		if ( isset($GLOBALS['link']) ) {
+					$_bookmark = & $GLOBALS['link'];
+		} else {
+					$_bookmark = null;
+		}
 	} elseif ( is_object($bookmark) ) {
 		wp_cache_add($bookmark->link_id, $bookmark, 'bookmark');
 		$_bookmark = $bookmark;
@@ -41,8 +42,9 @@ 
 		}
 	}
 
-	if ( ! $_bookmark )
-		return $_bookmark;
+	if ( ! $_bookmark ) {
+			return $_bookmark;
+	}
 
 	$_bookmark = sanitize_bookmark($_bookmark, $filter);
 
@@ -71,14 +73,17 @@ 
 	$bookmark = (int) $bookmark;
 	$bookmark = get_bookmark( $bookmark );
 
-	if ( is_wp_error($bookmark) )
-		return $bookmark;
+	if ( is_wp_error($bookmark) ) {
+			return $bookmark;
+	}
 
-	if ( !is_object($bookmark) )
-		return '';
+	if ( !is_object($bookmark) ) {
+			return '';
+	}
 
-	if ( !isset($bookmark->$field) )
-		return '';
+	if ( !isset($bookmark->$field) ) {
+			return '';
+	}
 
 	return sanitize_bookmark_field($field, $bookmark->$field, $bookmark->link_id, $context);
 }
@@ -317,11 +322,13 @@ 
 
 	foreach ( $fields as $field ) {
 		if ( $do_object ) {
-			if ( isset($bookmark->$field) )
-				$bookmark->$field = sanitize_bookmark_field($field, $bookmark->$field, $link_id, $context);
+			if ( isset($bookmark->$field) ) {
+							$bookmark->$field = sanitize_bookmark_field($field, $bookmark->$field, $link_id, $context);
+			}
 		} else {
-			if ( isset($bookmark[$field]) )
-				$bookmark[$field] = sanitize_bookmark_field($field, $bookmark[$field], $link_id, $context);
+			if ( isset($bookmark[$field]) ) {
+							$bookmark[$field] = sanitize_bookmark_field($field, $bookmark[$field], $link_id, $context);
+			}
 		}
 	}
 
@@ -369,13 +376,15 @@ 
 		break;
 	case 'link_target' : // "enum"
 		$targets = array('_top', '_blank');
-		if ( ! in_array($value, $targets) )
-			$value = '';
+		if ( ! in_array($value, $targets) ) {
+					$value = '';
+		}
 		break;
 	}
 
-	if ( 'raw' == $context )
-		return $value;
+	if ( 'raw' == $context ) {
+			return $value;
+	}
 
 	if ( 'edit' == $context ) {
 		/** This filter is documented in wp-includes/post.php */

Spacing +105 added lines, -105 removed lines

@@ -22,36 +22,36 @@ 
 function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') {
 	global $wpdb;
 
-	if ( empty($bookmark) ) {
-		if ( isset($GLOBALS['link']) )
+	if (empty($bookmark)) {
+		if (isset($GLOBALS['link']))
 			$_bookmark = & $GLOBALS['link'];
 		else
 			$_bookmark = null;
-	} elseif ( is_object($bookmark) ) {
+	} elseif (is_object($bookmark)) {
 		wp_cache_add($bookmark->link_id, $bookmark, 'bookmark');
 		$_bookmark = $bookmark;
 	} else {
-		if ( isset($GLOBALS['link']) && ($GLOBALS['link']->link_id == $bookmark) ) {
+		if (isset($GLOBALS['link']) && ($GLOBALS['link']->link_id == $bookmark)) {
 			$_bookmark = & $GLOBALS['link'];
-		} elseif ( ! $_bookmark = wp_cache_get($bookmark, 'bookmark') ) {
+		} elseif ( ! $_bookmark = wp_cache_get($bookmark, 'bookmark')) {
 			$_bookmark = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->links WHERE link_id = %d LIMIT 1", $bookmark));
-			if ( $_bookmark ) {
-				$_bookmark->link_category = array_unique( wp_get_object_terms( $_bookmark->link_id, 'link_category', array( 'fields' => 'ids' ) ) );
-				wp_cache_add( $_bookmark->link_id, $_bookmark, 'bookmark' );
+			if ($_bookmark) {
+				$_bookmark->link_category = array_unique(wp_get_object_terms($_bookmark->link_id, 'link_category', array('fields' => 'ids')));
+				wp_cache_add($_bookmark->link_id, $_bookmark, 'bookmark');
 			}
 		}
 	}
 
-	if ( ! $_bookmark )
+	if ( ! $_bookmark)
 		return $_bookmark;
 
 	$_bookmark = sanitize_bookmark($_bookmark, $filter);
 
-	if ( $output == OBJECT ) {
+	if ($output == OBJECT) {
 		return $_bookmark;
-	} elseif ( $output == ARRAY_A ) {
+	} elseif ($output == ARRAY_A) {
 		return get_object_vars($_bookmark);
-	} elseif ( $output == ARRAY_N ) {
+	} elseif ($output == ARRAY_N) {
 		return array_values(get_object_vars($_bookmark));
 	} else {
 		return $_bookmark;
@@ -68,17 +68,17 @@ 
  * @param string $context Optional. The context of how the field will be used.
  * @return string|WP_Error
  */
-function get_bookmark_field( $field, $bookmark, $context = 'display' ) {
+function get_bookmark_field($field, $bookmark, $context = 'display') {
 	$bookmark = (int) $bookmark;
-	$bookmark = get_bookmark( $bookmark );
+	$bookmark = get_bookmark($bookmark);
 
-	if ( is_wp_error($bookmark) )
+	if (is_wp_error($bookmark))
 		return $bookmark;
 
-	if ( !is_object($bookmark) )
+	if ( ! is_object($bookmark))
 		return '';
 
-	if ( !isset($bookmark->$field) )
+	if ( ! isset($bookmark->$field))
 		return '';
 
 	return sanitize_bookmark_field($field, $bookmark->$field, $bookmark->link_id, $context);
@@ -115,7 +115,7 @@ 
  * }
  * @return array List of bookmark row objects.
  */
-function get_bookmarks( $args = '' ) {
+function get_bookmarks($args = '') {
 	global $wpdb;
 
 	$defaults = array(
@@ -126,13 +126,13 @@ 
 		'exclude' => '', 'search' => ''
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	$key = md5( serialize( $r ) );
+	$key = md5(serialize($r));
 	$cache = false;
-	if ( 'rand' !== $r['orderby'] && $cache = wp_cache_get( 'get_bookmarks', 'bookmark' ) ) {
-		if ( is_array( $cache ) && isset( $cache[ $key ] ) ) {
-			$bookmarks = $cache[ $key ];
+	if ('rand' !== $r['orderby'] && $cache = wp_cache_get('get_bookmarks', 'bookmark')) {
+		if (is_array($cache) && isset($cache[$key])) {
+			$bookmarks = $cache[$key];
 			/**
 			 * Filters the returned list of bookmarks.
 			 *
@@ -148,98 +148,98 @@ 
 			 * @param array $bookmarks List of the cached bookmarks.
 			 * @param array $r         An array of bookmark query arguments.
 			 */
-			return apply_filters( 'get_bookmarks', $bookmarks, $r );
+			return apply_filters('get_bookmarks', $bookmarks, $r);
 		}
 	}
 
-	if ( ! is_array( $cache ) ) {
+	if ( ! is_array($cache)) {
 		$cache = array();
 	}
 
 	$inclusions = '';
-	if ( ! empty( $r['include'] ) ) {
-		$r['exclude'] = '';  //ignore exclude, category, and category_name params if using include
+	if ( ! empty($r['include'])) {
+		$r['exclude'] = ''; //ignore exclude, category, and category_name params if using include
 		$r['category'] = '';
 		$r['category_name'] = '';
-		$inclinks = preg_split( '/[\s,]+/', $r['include'] );
-		if ( count( $inclinks ) ) {
-			foreach ( $inclinks as $inclink ) {
-				if ( empty( $inclusions ) ) {
-					$inclusions = ' AND ( link_id = ' . intval( $inclink ) . ' ';
+		$inclinks = preg_split('/[\s,]+/', $r['include']);
+		if (count($inclinks)) {
+			foreach ($inclinks as $inclink) {
+				if (empty($inclusions)) {
+					$inclusions = ' AND ( link_id = '.intval($inclink).' ';
 				} else {
-					$inclusions .= ' OR link_id = ' . intval( $inclink ) . ' ';
+					$inclusions .= ' OR link_id = '.intval($inclink).' ';
 				}
 			}
 		}
 	}
-	if (! empty( $inclusions ) ) {
+	if ( ! empty($inclusions)) {
 		$inclusions .= ')';
 	}
 
 	$exclusions = '';
-	if ( ! empty( $r['exclude'] ) ) {
-		$exlinks = preg_split( '/[\s,]+/', $r['exclude'] );
-		if ( count( $exlinks ) ) {
-			foreach ( $exlinks as $exlink ) {
-				if ( empty( $exclusions ) ) {
-					$exclusions = ' AND ( link_id <> ' . intval( $exlink ) . ' ';
+	if ( ! empty($r['exclude'])) {
+		$exlinks = preg_split('/[\s,]+/', $r['exclude']);
+		if (count($exlinks)) {
+			foreach ($exlinks as $exlink) {
+				if (empty($exclusions)) {
+					$exclusions = ' AND ( link_id <> '.intval($exlink).' ';
 				} else {
-					$exclusions .= ' AND link_id <> ' . intval( $exlink ) . ' ';
+					$exclusions .= ' AND link_id <> '.intval($exlink).' ';
 				}
 			}
 		}
 	}
-	if ( ! empty( $exclusions ) ) {
+	if ( ! empty($exclusions)) {
 		$exclusions .= ')';
 	}
 
-	if ( ! empty( $r['category_name'] ) ) {
-		if ( $r['category'] = get_term_by('name', $r['category_name'], 'link_category') ) {
+	if ( ! empty($r['category_name'])) {
+		if ($r['category'] = get_term_by('name', $r['category_name'], 'link_category')) {
 			$r['category'] = $r['category']->term_id;
 		} else {
-			$cache[ $key ] = array();
-			wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
+			$cache[$key] = array();
+			wp_cache_set('get_bookmarks', $cache, 'bookmark');
 			/** This filter is documented in wp-includes/bookmark.php */
-			return apply_filters( 'get_bookmarks', array(), $r );
+			return apply_filters('get_bookmarks', array(), $r);
 		}
 	}
 
 	$search = '';
-	if ( ! empty( $r['search'] ) ) {
-		$like = '%' . $wpdb->esc_like( $r['search'] ) . '%';
-		$search = $wpdb->prepare(" AND ( (link_url LIKE %s) OR (link_name LIKE %s) OR (link_description LIKE %s) ) ", $like, $like, $like );
+	if ( ! empty($r['search'])) {
+		$like = '%'.$wpdb->esc_like($r['search']).'%';
+		$search = $wpdb->prepare(" AND ( (link_url LIKE %s) OR (link_name LIKE %s) OR (link_description LIKE %s) ) ", $like, $like, $like);
 	}
 
 	$category_query = '';
 	$join = '';
-	if ( ! empty( $r['category'] ) ) {
-		$incategories = preg_split( '/[\s,]+/', $r['category'] );
-		if ( count($incategories) ) {
-			foreach ( $incategories as $incat ) {
-				if ( empty( $category_query ) ) {
-					$category_query = ' AND ( tt.term_id = ' . intval( $incat ) . ' ';
+	if ( ! empty($r['category'])) {
+		$incategories = preg_split('/[\s,]+/', $r['category']);
+		if (count($incategories)) {
+			foreach ($incategories as $incat) {
+				if (empty($category_query)) {
+					$category_query = ' AND ( tt.term_id = '.intval($incat).' ';
 				} else {
-					$category_query .= ' OR tt.term_id = ' . intval( $incat ) . ' ';
+					$category_query .= ' OR tt.term_id = '.intval($incat).' ';
 				}
 			}
 		}
 	}
-	if ( ! empty( $category_query ) ) {
+	if ( ! empty($category_query)) {
 		$category_query .= ") AND taxonomy = 'link_category'";
 		$join = " INNER JOIN $wpdb->term_relationships AS tr ON ($wpdb->links.link_id = tr.object_id) INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_taxonomy_id = tr.term_taxonomy_id";
 	}
 
-	if ( $r['show_updated'] ) {
+	if ($r['show_updated']) {
 		$recently_updated_test = ", IF (DATE_ADD(link_updated, INTERVAL 120 MINUTE) >= NOW(), 1,0) as recently_updated ";
 	} else {
 		$recently_updated_test = '';
 	}
 
-	$get_updated = ( $r['show_updated'] ) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : '';
+	$get_updated = ($r['show_updated']) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : '';
 
-	$orderby = strtolower( $r['orderby'] );
+	$orderby = strtolower($r['orderby']);
 	$length = '';
-	switch ( $orderby ) {
+	switch ($orderby) {
 		case 'length':
 			$length = ", CHAR_LENGTH(link_name) AS length";
 			break;
@@ -251,49 +251,49 @@ 
 			break;
 		default:
 			$orderparams = array();
-			$keys = array( 'link_id', 'link_name', 'link_url', 'link_visible', 'link_rating', 'link_owner', 'link_updated', 'link_notes', 'link_description' );
-			foreach ( explode( ',', $orderby ) as $ordparam ) {
-				$ordparam = trim( $ordparam );
+			$keys = array('link_id', 'link_name', 'link_url', 'link_visible', 'link_rating', 'link_owner', 'link_updated', 'link_notes', 'link_description');
+			foreach (explode(',', $orderby) as $ordparam) {
+				$ordparam = trim($ordparam);
 
-				if ( in_array( 'link_' . $ordparam, $keys ) ) {
-					$orderparams[] = 'link_' . $ordparam;
-				} elseif ( in_array( $ordparam, $keys ) ) {
+				if (in_array('link_'.$ordparam, $keys)) {
+					$orderparams[] = 'link_'.$ordparam;
+				} elseif (in_array($ordparam, $keys)) {
 					$orderparams[] = $ordparam;
 				}
 			}
-			$orderby = implode( ',', $orderparams );
+			$orderby = implode(',', $orderparams);
 	}
 
-	if ( empty( $orderby ) ) {
+	if (empty($orderby)) {
 		$orderby = 'link_name';
 	}
 
-	$order = strtoupper( $r['order'] );
-	if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) ) {
+	$order = strtoupper($r['order']);
+	if ('' !== $order && ! in_array($order, array('ASC', 'DESC'))) {
 		$order = 'ASC';
 	}
 
 	$visible = '';
-	if ( $r['hide_invisible'] ) {
+	if ($r['hide_invisible']) {
 		$visible = "AND link_visible = 'Y'";
 	}
 
 	$query = "SELECT * $length $recently_updated_test $get_updated FROM $wpdb->links $join WHERE 1=1 $visible $category_query";
 	$query .= " $exclusions $inclusions $search";
 	$query .= " ORDER BY $orderby $order";
-	if ( $r['limit'] != -1 ) {
-		$query .= ' LIMIT ' . $r['limit'];
+	if ($r['limit'] != -1) {
+		$query .= ' LIMIT '.$r['limit'];
 	}
 
-	$results = $wpdb->get_results( $query );
+	$results = $wpdb->get_results($query);
 
-	if ( 'rand()' !== $orderby ) {
-		$cache[ $key ] = $results;
-		wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
+	if ('rand()' !== $orderby) {
+		$cache[$key] = $results;
+		wp_cache_set('get_bookmarks', $cache, 'bookmark');
 	}
 
 	/** This filter is documented in wp-includes/bookmark.php */
-	return apply_filters( 'get_bookmarks', $results, $r );
+	return apply_filters('get_bookmarks', $results, $r);
 }
 
 /**
@@ -309,9 +309,9 @@ 
 function sanitize_bookmark($bookmark, $context = 'display') {
 	$fields = array('link_id', 'link_url', 'link_name', 'link_image', 'link_target', 'link_category',
 		'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_updated',
-		'link_rel', 'link_notes', 'link_rss', );
+		'link_rel', 'link_notes', 'link_rss',);
 
-	if ( is_object($bookmark) ) {
+	if (is_object($bookmark)) {
 		$do_object = true;
 		$link_id = $bookmark->link_id;
 	} else {
@@ -319,12 +319,12 @@ 
 		$link_id = $bookmark['link_id'];
 	}
 
-	foreach ( $fields as $field ) {
-		if ( $do_object ) {
-			if ( isset($bookmark->$field) )
+	foreach ($fields as $field) {
+		if ($do_object) {
+			if (isset($bookmark->$field))
 				$bookmark->$field = sanitize_bookmark_field($field, $bookmark->$field, $link_id, $context);
 		} else {
-			if ( isset($bookmark[$field]) )
+			if (isset($bookmark[$field]))
 				$bookmark[$field] = sanitize_bookmark_field($field, $bookmark[$field], $link_id, $context);
 		}
 	}
@@ -356,8 +356,8 @@ 
  *                            'js', 'db', or 'display'
  * @return mixed The filtered value.
  */
-function sanitize_bookmark_field( $field, $value, $bookmark_id, $context ) {
-	switch ( $field ) {
+function sanitize_bookmark_field($field, $value, $bookmark_id, $context) {
+	switch ($field) {
 	case 'link_id' : // ints
 	case 'link_rating' :
 		$value = (int) $value;
@@ -373,34 +373,34 @@ 
 		break;
 	case 'link_target' : // "enum"
 		$targets = array('_top', '_blank');
-		if ( ! in_array($value, $targets) )
+		if ( ! in_array($value, $targets))
 			$value = '';
 		break;
 	}
 
-	if ( 'raw' == $context )
+	if ('raw' == $context)
 		return $value;
 
-	if ( 'edit' == $context ) {
+	if ('edit' == $context) {
 		/** This filter is documented in wp-includes/post.php */
-		$value = apply_filters( "edit_{$field}", $value, $bookmark_id );
+		$value = apply_filters("edit_{$field}", $value, $bookmark_id);
 
-		if ( 'link_notes' == $field ) {
-			$value = esc_html( $value ); // textarea_escaped
+		if ('link_notes' == $field) {
+			$value = esc_html($value); // textarea_escaped
 		} else {
 			$value = esc_attr($value);
 		}
-	} elseif ( 'db' == $context ) {
+	} elseif ('db' == $context) {
 		/** This filter is documented in wp-includes/post.php */
-		$value = apply_filters( "pre_{$field}", $value );
+		$value = apply_filters("pre_{$field}", $value);
 	} else {
 		/** This filter is documented in wp-includes/post.php */
-		$value = apply_filters( "{$field}", $value, $bookmark_id, $context );
+		$value = apply_filters("{$field}", $value, $bookmark_id, $context);
 
-		if ( 'attribute' == $context ) {
-			$value = esc_attr( $value );
-		} elseif ( 'js' == $context ) {
-			$value = esc_js( $value );
+		if ('attribute' == $context) {
+			$value = esc_attr($value);
+		} elseif ('js' == $context) {
+			$value = esc_js($value);
 		}
 	}
 
@@ -414,8 +414,8 @@ 
  *
  * @param int $bookmark_id Bookmark ID.
  */
-function clean_bookmark_cache( $bookmark_id ) {
-	wp_cache_delete( $bookmark_id, 'bookmark' );
-	wp_cache_delete( 'get_bookmarks', 'bookmark' );
-	clean_object_term_cache( $bookmark_id, 'link');
+function clean_bookmark_cache($bookmark_id) {
+	wp_cache_delete($bookmark_id, 'bookmark');
+	wp_cache_delete('get_bookmarks', 'bookmark');
+	clean_object_term_cache($bookmark_id, 'link');
 }

Switch Indentation +18 added lines, -18 removed lines

@@ -358,24 +358,24 @@
  */
 function sanitize_bookmark_field( $field, $value, $bookmark_id, $context ) {
 	switch ( $field ) {
-	case 'link_id' : // ints
-	case 'link_rating' :
-		$value = (int) $value;
-		break;
-	case 'link_category' : // array( ints )
-		$value = array_map('absint', (array) $value);
-		// We return here so that the categories aren't filtered.
-		// The 'link_category' filter is for the name of a link category, not an array of a link's link categories
-		return $value;
-
-	case 'link_visible' : // bool stored as Y|N
-		$value = preg_replace('/[^YNyn]/', '', $value);
-		break;
-	case 'link_target' : // "enum"
-		$targets = array('_top', '_blank');
-		if ( ! in_array($value, $targets) )
-			$value = '';
-		break;
+		case 'link_id' : // ints
+		case 'link_rating' :
+			$value = (int) $value;
+			break;
+		case 'link_category' : // array( ints )
+			$value = array_map('absint', (array) $value);
+			// We return here so that the categories aren't filtered.
+			// The 'link_category' filter is for the name of a link category, not an array of a link's link categories
+			return $value;
+
+		case 'link_visible' : // bool stored as Y|N
+			$value = preg_replace('/[^YNyn]/', '', $value);
+			break;
+		case 'link_target' : // "enum"
+			$targets = array('_top', '_blank');
+			if ( ! in_array($value, $targets) )
+				$value = '';
+			break;
 	}
 
 	if ( 'raw' == $context )

src/wp-includes/theme-compat/header.php

Braces +4 added lines, -1 removed lines

@@ -35,7 +35,10 @@
 </style>
 <?php } ?>
 
-<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
+<?php if ( is_singular() ) {
+	wp_enqueue_script( 'comment-reply' );
+}
+?>
 
 <?php wp_head(); ?>
 </head>

Spacing +5 added lines, -5 removed lines

@@ -8,11 +8,11 @@ 
  */
 _deprecated_file(
 	/* translators: %s: template name */
-	sprintf( __( 'Theme without %s' ), basename( __FILE__ ) ),
+	sprintf(__('Theme without %s'), basename(__FILE__)),
 	'3.0.0',
 	null,
 	/* translators: %s: template name */
-	sprintf( __( 'Please include a %s template in your theme.' ), basename( __FILE__ ) )
+	sprintf(__('Please include a %s template in your theme.'), basename(__FILE__))
 );
 ?>
 <!DOCTYPE html>
@@ -26,12 +26,12 @@ 
 <link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" />
 <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
 
-<?php if ( file_exists( get_stylesheet_directory() . '/images/kubrickbgwide.jpg' ) ) { ?>
+<?php if (file_exists(get_stylesheet_directory().'/images/kubrickbgwide.jpg')) { ?>
 <style type="text/css" media="screen">
 
 <?php
 // Checks to see whether it needs a sidebar
-if ( empty($withcomments) && !is_single() ) {
+if (empty($withcomments) && ! is_single()) {
 ?>
 	#page { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickbg-<?php bloginfo('text_direction'); ?>.jpg") repeat-y top; border: none; }
 <?php } else { // No sidebar ?>
@@ -41,7 +41,7 @@ 
 </style>
 <?php } ?>
 
-<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
+<?php if (is_singular()) wp_enqueue_script('comment-reply'); ?>
 
 <?php wp_head(); ?>
 </head>

src/wp-includes/ID3/module.audio.flac.php

Indentation +4 added lines, -4 removed lines

@@ -167,7 +167,7 @@ 
 		if (isset($info['flac']['STREAMINFO']['audio_signature'])) {
 
 			if ($info['flac']['STREAMINFO']['audio_signature'] === str_repeat("\x00", 16)) {
-                $this->warning('FLAC STREAMINFO.audio_signature is null (known issue with libOggFLAC)');
+				$this->warning('FLAC STREAMINFO.audio_signature is null (known issue with libOggFLAC)');
 			}
 			else {
 				$info['md5_data_source'] = '';
@@ -346,9 +346,9 @@ 
 	}
 
 	/**
-	* Parse METADATA_BLOCK_PICTURE flac structure and extract attachment
-	* External usage: audio.ogg
-	*/
+	 * Parse METADATA_BLOCK_PICTURE flac structure and extract attachment
+	 * External usage: audio.ogg
+	 */
 	public function parsePICTURE() {
 		$info = &$this->getid3->info;
 

Spacing +49 added lines, -49 removed lines

@@ -48,7 +48,7 @@ 
 			$BlockHeader   = $this->fread(4);
 			$LBFBT         = getid3_lib::BigEndian2Int(substr($BlockHeader, 0, 1));
 			$LastBlockFlag = (bool) ($LBFBT & 0x80);
-			$BlockType     =        ($LBFBT & 0x7F);
+			$BlockType     = ($LBFBT & 0x7F);
 			$BlockLength   = getid3_lib::BigEndian2Int(substr($BlockHeader, 1, 3));
 			$BlockTypeText = self::metaBlockTypeLookup($BlockType);
 
@@ -70,12 +70,12 @@ 
 			$BlockTypeText_raw['block_type_text'] = $BlockTypeText;
 			$BlockTypeText_raw['block_length']    = $BlockLength;
 			if ($BlockTypeText_raw['block_type'] != 0x06) { // do not read attachment data automatically
-				$BlockTypeText_raw['block_data']  = $this->fread($BlockLength);
+				$BlockTypeText_raw['block_data'] = $this->fread($BlockLength);
 			}
 
 			switch ($BlockTypeText) {
 				case 'STREAMINFO':     // 0x00
-					if (!$this->parseSTREAMINFO($BlockTypeText_raw['block_data'])) {
+					if ( ! $this->parseSTREAMINFO($BlockTypeText_raw['block_data'])) {
 						return false;
 					}
 					break;
@@ -85,31 +85,31 @@ 
 					break;
 
 				case 'APPLICATION':    // 0x02
-					if (!$this->parseAPPLICATION($BlockTypeText_raw['block_data'])) {
+					if ( ! $this->parseAPPLICATION($BlockTypeText_raw['block_data'])) {
 						return false;
 					}
 					break;
 
 				case 'SEEKTABLE':      // 0x03
-					if (!$this->parseSEEKTABLE($BlockTypeText_raw['block_data'])) {
+					if ( ! $this->parseSEEKTABLE($BlockTypeText_raw['block_data'])) {
 						return false;
 					}
 					break;
 
 				case 'VORBIS_COMMENT': // 0x04
-					if (!$this->parseVORBIS_COMMENT($BlockTypeText_raw['block_data'])) {
+					if ( ! $this->parseVORBIS_COMMENT($BlockTypeText_raw['block_data'])) {
 						return false;
 					}
 					break;
 
 				case 'CUESHEET':       // 0x05
-					if (!$this->parseCUESHEET($BlockTypeText_raw['block_data'])) {
+					if ( ! $this->parseCUESHEET($BlockTypeText_raw['block_data'])) {
 						return false;
 					}
 					break;
 
 				case 'PICTURE':        // 0x06
-					if (!$this->parsePICTURE()) {
+					if ( ! $this->parsePICTURE()) {
 						return false;
 					}
 					break;
@@ -124,18 +124,18 @@ 
 		while ($LastBlockFlag === false);
 
 		// handle tags
-		if (!empty($info['flac']['VORBIS_COMMENT']['comments'])) {
+		if ( ! empty($info['flac']['VORBIS_COMMENT']['comments'])) {
 			$info['flac']['comments'] = $info['flac']['VORBIS_COMMENT']['comments'];
 		}
-		if (!empty($info['flac']['VORBIS_COMMENT']['vendor'])) {
+		if ( ! empty($info['flac']['VORBIS_COMMENT']['vendor'])) {
 			$info['audio']['encoder'] = str_replace('reference ', '', $info['flac']['VORBIS_COMMENT']['vendor']);
 		}
 
 		// copy attachments to 'comments' array if nesesary
 		if (isset($info['flac']['PICTURE']) && ($this->getid3->option_save_attachments !== getID3::ATTACHMENTS_NONE)) {
 			foreach ($info['flac']['PICTURE'] as $entry) {
-				if (!empty($entry['data'])) {
-					if (!isset($info['flac']['comments']['picture'])) {
+				if ( ! empty($entry['data'])) {
+					if ( ! isset($info['flac']['comments']['picture'])) {
 						$info['flac']['comments']['picture'] = array();
 					}
 					$comments_picture_data = array();
@@ -151,14 +151,14 @@ 
 		}
 
 		if (isset($info['flac']['STREAMINFO'])) {
-			if (!$this->isDependencyFor('matroska')) {
+			if ( ! $this->isDependencyFor('matroska')) {
 				$info['flac']['compressed_audio_bytes'] = $info['avdataend'] - $info['avdataoffset'];
 			}
 			$info['flac']['uncompressed_audio_bytes'] = $info['flac']['STREAMINFO']['samples_stream'] * $info['flac']['STREAMINFO']['channels'] * ($info['flac']['STREAMINFO']['bits_per_sample'] / 8);
 			if ($info['flac']['uncompressed_audio_bytes'] == 0) {
 				return $this->error('Corrupt FLAC file: uncompressed_audio_bytes == zero');
 			}
-			if (!empty($info['flac']['compressed_audio_bytes'])) {
+			if ( ! empty($info['flac']['compressed_audio_bytes'])) {
 				$info['flac']['compression_ratio'] = $info['flac']['compressed_audio_bytes'] / $info['flac']['uncompressed_audio_bytes'];
 			}
 		}
@@ -175,7 +175,7 @@ 
 				for ($i = 0; $i < strlen($md5); $i++) {
 					$info['md5_data_source'] .= str_pad(dechex(ord($md5[$i])), 2, '00', STR_PAD_LEFT);
 				}
-				if (!preg_match('/^[0-9a-f]{32}$/', $info['md5_data_source'])) {
+				if ( ! preg_match('/^[0-9a-f]{32}$/', $info['md5_data_source'])) {
 					unset($info['md5_data_source']);
 				}
 			}
@@ -206,14 +206,14 @@ 
 		$streaminfo['max_frame_size']  = getid3_lib::BigEndian2Int(substr($BlockData, 7, 3));
 
 		$SRCSBSS                       = getid3_lib::BigEndian2Bin(substr($BlockData, 10, 8));
-		$streaminfo['sample_rate']     = getid3_lib::Bin2Dec(substr($SRCSBSS,  0, 20));
-		$streaminfo['channels']        = getid3_lib::Bin2Dec(substr($SRCSBSS, 20,  3)) + 1;
-		$streaminfo['bits_per_sample'] = getid3_lib::Bin2Dec(substr($SRCSBSS, 23,  5)) + 1;
+		$streaminfo['sample_rate']     = getid3_lib::Bin2Dec(substr($SRCSBSS, 0, 20));
+		$streaminfo['channels']        = getid3_lib::Bin2Dec(substr($SRCSBSS, 20, 3)) + 1;
+		$streaminfo['bits_per_sample'] = getid3_lib::Bin2Dec(substr($SRCSBSS, 23, 5)) + 1;
 		$streaminfo['samples_stream']  = getid3_lib::Bin2Dec(substr($SRCSBSS, 28, 36));
 
 		$streaminfo['audio_signature'] = substr($BlockData, 18, 16);
 
-		if (!empty($streaminfo['sample_rate'])) {
+		if ( ! empty($streaminfo['sample_rate'])) {
 
 			$info['audio']['bitrate_mode']    = 'vbr';
 			$info['audio']['sample_rate']     = $streaminfo['sample_rate'];
@@ -221,7 +221,7 @@ 
 			$info['audio']['bits_per_sample'] = $streaminfo['bits_per_sample'];
 			$info['playtime_seconds']         = $streaminfo['samples_stream'] / $streaminfo['sample_rate'];
 			if ($info['playtime_seconds'] > 0) {
-				if (!$this->isDependencyFor('matroska')) {
+				if ( ! $this->isDependencyFor('matroska')) {
 					$info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
 				}
 				else {
@@ -297,16 +297,16 @@ 
 	private function parseCUESHEET($BlockData) {
 		$info = &$this->getid3->info;
 		$offset = 0;
-		$info['flac']['CUESHEET']['media_catalog_number'] =                              trim(substr($BlockData, $offset, 128), "\0");
+		$info['flac']['CUESHEET']['media_catalog_number'] = trim(substr($BlockData, $offset, 128), "\0");
 		$offset += 128;
-		$info['flac']['CUESHEET']['lead_in_samples']      =         getid3_lib::BigEndian2Int(substr($BlockData, $offset, 8));
+		$info['flac']['CUESHEET']['lead_in_samples']      = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 8));
 		$offset += 8;
 		$info['flac']['CUESHEET']['flags']['is_cd']       = (bool) (getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1)) & 0x80);
 		$offset += 1;
 
 		$offset += 258; // reserved
 
-		$info['flac']['CUESHEET']['number_tracks']        =         getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
+		$info['flac']['CUESHEET']['number_tracks'] = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
 		$offset += 1;
 
 		for ($track = 0; $track < $info['flac']['CUESHEET']['number_tracks']; $track++) {
@@ -317,7 +317,7 @@ 
 
 			$info['flac']['CUESHEET']['tracks'][$TrackNumber]['sample_offset']         = $TrackSampleOffset;
 
-			$info['flac']['CUESHEET']['tracks'][$TrackNumber]['isrc']                  =                           substr($BlockData, $offset, 12);
+			$info['flac']['CUESHEET']['tracks'][$TrackNumber]['isrc']                  = substr($BlockData, $offset, 12);
 			$offset += 12;
 
 			$TrackFlagsRaw                                                             = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
@@ -327,7 +327,7 @@ 
 
 			$offset += 13; // reserved
 
-			$info['flac']['CUESHEET']['tracks'][$TrackNumber]['index_points']          = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
+			$info['flac']['CUESHEET']['tracks'][$TrackNumber]['index_points'] = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
 			$offset += 1;
 
 			for ($index = 0; $index < $info['flac']['CUESHEET']['tracks'][$TrackNumber]['index_points']; $index++) {
@@ -396,35 +396,35 @@ 
 	public static function applicationIDLookup($applicationid) {
 		// http://flac.sourceforge.net/id.html
 		static $lookup = array(
-			0x41544348 => 'FlacFile',                                                                           // "ATCH"
-			0x42534F4C => 'beSolo',                                                                             // "BSOL"
-			0x42554753 => 'Bugs Player',                                                                        // "BUGS"
-			0x43756573 => 'GoldWave cue points (specification)',                                                // "Cues"
-			0x46696361 => 'CUE Splitter',                                                                       // "Fica"
-			0x46746F6C => 'flac-tools',                                                                         // "Ftol"
-			0x4D4F5442 => 'MOTB MetaCzar',                                                                      // "MOTB"
-			0x4D505345 => 'MP3 Stream Editor',                                                                  // "MPSE"
-			0x4D754D4C => 'MusicML: Music Metadata Language',                                                   // "MuML"
-			0x52494646 => 'Sound Devices RIFF chunk storage',                                                   // "RIFF"
-			0x5346464C => 'Sound Font FLAC',                                                                    // "SFFL"
-			0x534F4E59 => 'Sony Creative Software',                                                             // "SONY"
-			0x5351455A => 'flacsqueeze',                                                                        // "SQEZ"
-			0x54745776 => 'TwistedWave',                                                                        // "TtWv"
-			0x55495453 => 'UITS Embedding tools',                                                               // "UITS"
-			0x61696666 => 'FLAC AIFF chunk storage',                                                            // "aiff"
-			0x696D6167 => 'flac-image application for storing arbitrary files in APPLICATION metadata blocks',  // "imag"
-			0x7065656D => 'Parseable Embedded Extensible Metadata (specification)',                             // "peem"
-			0x71667374 => 'QFLAC Studio',                                                                       // "qfst"
-			0x72696666 => 'FLAC RIFF chunk storage',                                                            // "riff"
-			0x74756E65 => 'TagTuner',                                                                           // "tune"
-			0x78626174 => 'XBAT',                                                                               // "xbat"
-			0x786D6364 => 'xmcd',                                                                               // "xmcd"
+			0x41544348 => 'FlacFile', // "ATCH"
+			0x42534F4C => 'beSolo', // "BSOL"
+			0x42554753 => 'Bugs Player', // "BUGS"
+			0x43756573 => 'GoldWave cue points (specification)', // "Cues"
+			0x46696361 => 'CUE Splitter', // "Fica"
+			0x46746F6C => 'flac-tools', // "Ftol"
+			0x4D4F5442 => 'MOTB MetaCzar', // "MOTB"
+			0x4D505345 => 'MP3 Stream Editor', // "MPSE"
+			0x4D754D4C => 'MusicML: Music Metadata Language', // "MuML"
+			0x52494646 => 'Sound Devices RIFF chunk storage', // "RIFF"
+			0x5346464C => 'Sound Font FLAC', // "SFFL"
+			0x534F4E59 => 'Sony Creative Software', // "SONY"
+			0x5351455A => 'flacsqueeze', // "SQEZ"
+			0x54745776 => 'TwistedWave', // "TtWv"
+			0x55495453 => 'UITS Embedding tools', // "UITS"
+			0x61696666 => 'FLAC AIFF chunk storage', // "aiff"
+			0x696D6167 => 'flac-image application for storing arbitrary files in APPLICATION metadata blocks', // "imag"
+			0x7065656D => 'Parseable Embedded Extensible Metadata (specification)', // "peem"
+			0x71667374 => 'QFLAC Studio', // "qfst"
+			0x72696666 => 'FLAC RIFF chunk storage', // "riff"
+			0x74756E65 => 'TagTuner', // "tune"
+			0x78626174 => 'XBAT', // "xbat"
+			0x786D6364 => 'xmcd', // "xmcd"
 		);
 		return (isset($lookup[$applicationid]) ? $lookup[$applicationid] : 'reserved');
 	}
 
 	public static function pictureTypeLookup($type_id) {
-		static $lookup = array (
+		static $lookup = array(
 			 0 => 'Other',
 			 1 => '32x32 pixels \'file icon\' (PNG only)',
 			 2 => 'Other file icon',

Braces +2 added lines, -4 removed lines

@@ -168,8 +168,7 @@ 
 
 			if ($info['flac']['STREAMINFO']['audio_signature'] === str_repeat("\x00", 16)) {
                 $this->warning('FLAC STREAMINFO.audio_signature is null (known issue with libOggFLAC)');
-			}
-			else {
+			} else {
 				$info['md5_data_source'] = '';
 				$md5 = $info['flac']['STREAMINFO']['audio_signature'];
 				for ($i = 0; $i < strlen($md5); $i++) {
@@ -223,8 +222,7 @@ 
 			if ($info['playtime_seconds'] > 0) {
 				if (!$this->isDependencyFor('matroska')) {
 					$info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-				}
-				else {
+				} else {
 					$this->warning('Cannot determine audio bitrate because total stream size is unknown');
 				}
 			}