ntwb / wordpress

tools/i18n/makepot.php

Doc Comments +10 added lines

@@ -156,6 +156,9 @@ 
 			unlink( $temp_file );
 	}
 
+	/**
+	 * @param string $file
+	 */
 	private function tempnam( $file ) {
 		$tempnam = tempnam( sys_get_temp_dir(), $file );
 		$this->temp_files[] = $tempnam;
@@ -235,6 +238,9 @@ 
 		return $res;
 	}
 
+	/**
+	 * @param string $output
+	 */
 	public function wp_frontend( $dir, $output ) {
 		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) {
 			return false;
@@ -255,6 +261,9 @@ 
 		) );
 	}
 
+	/**
+	 * @param string $output
+	 */
 	public function wp_admin($dir, $output) {
 		$frontend_pot = $this->tempnam( 'frontend.pot' );
 		if ( false === $frontend_pot ) {
@@ -416,6 +425,7 @@ 
 
 	/**
 	 * Removes any trailing closing comment / PHP tags from the header value
+	 * @param string $str
 	 */
 	private function _cleanup_header_comment( $str ) {
 		return trim( preg_replace( '/\s*(?:\*\/|\?>).*/', '', $str ) );

Spacing +176 added lines, -176 removed lines

@@ -1,10 +1,10 @@ 
 <?php
-require_once dirname( __FILE__ ) . '/not-gettexted.php';
-require_once dirname( __FILE__ ) . '/pot-ext-meta.php';
-require_once dirname( __FILE__ ) . '/extract.php';
+require_once dirname(__FILE__).'/not-gettexted.php';
+require_once dirname(__FILE__).'/pot-ext-meta.php';
+require_once dirname(__FILE__).'/extract.php';
 
-if ( !defined( 'STDERR' ) ) {
-	define( 'STDERR', fopen( 'php://stderr', 'w' ) );
+if ( ! defined('STDERR')) {
+	define('STDERR', fopen('php://stderr', 'w'));
 }
 
 /**
@@ -148,16 +148,16 @@ 
 	);
 
 	public function __construct($deprecated = true) {
-		$this->extractor = new StringExtractor( $this->rules );
+		$this->extractor = new StringExtractor($this->rules);
 	}
 
 	public function __destruct() {
-		foreach ( $this->temp_files as $temp_file )
-			unlink( $temp_file );
+		foreach ($this->temp_files as $temp_file)
+			unlink($temp_file);
 	}
 
-	private function tempnam( $file ) {
-		$tempnam = tempnam( sys_get_temp_dir(), $file );
+	private function tempnam($file) {
+		$tempnam = tempnam(sys_get_temp_dir(), $file);
 		$this->temp_files[] = $tempnam;
 		return $tempnam;
 	}
@@ -167,31 +167,31 @@ 
 	}
 
 	private function xgettext($project, $dir, $output_file, $placeholders = array(), $excludes = array(), $includes = array()) {
-		$meta = array_merge( $this->meta['default'], $this->meta[$project] );
-		$placeholders = array_merge( $meta, $placeholders );
-		$meta['output'] = $this->realpath_missing( $output_file );
-		$placeholders['year'] = date( 'Y' );
-		$placeholder_keys = array_map( create_function( '$x', 'return "{".$x."}";' ), array_keys( $placeholders ) );
-		$placeholder_values = array_values( $placeholders );
-		foreach($meta as $key => $value) {
+		$meta = array_merge($this->meta['default'], $this->meta[$project]);
+		$placeholders = array_merge($meta, $placeholders);
+		$meta['output'] = $this->realpath_missing($output_file);
+		$placeholders['year'] = date('Y');
+		$placeholder_keys = array_map(create_function('$x', 'return "{".$x."}";'), array_keys($placeholders));
+		$placeholder_values = array_values($placeholders);
+		foreach ($meta as $key => $value) {
 			$meta[$key] = str_replace($placeholder_keys, $placeholder_values, $value);
 		}
 
-		$originals = $this->extractor->extract_from_directory( $dir, $excludes, $includes );
+		$originals = $this->extractor->extract_from_directory($dir, $excludes, $includes);
 		$pot = new PO;
 		$pot->entries = $originals->entries;
 
-		$pot->set_header( 'Project-Id-Version', $meta['package-name'].' '.$meta['package-version'] );
-		$pot->set_header( 'Report-Msgid-Bugs-To', $meta['msgid-bugs-address'] );
-		$pot->set_header( 'POT-Creation-Date', gmdate( 'Y-m-d H:i:s+00:00' ) );
-		$pot->set_header( 'MIME-Version', '1.0' );
-		$pot->set_header( 'Content-Type', 'text/plain; charset=UTF-8' );
-		$pot->set_header( 'Content-Transfer-Encoding', '8bit' );
-		$pot->set_header( 'PO-Revision-Date', date( 'Y') . '-MO-DA HO:MI+ZONE' );
-		$pot->set_header( 'Last-Translator', 'FULL NAME <EMAIL@ADDRESS>' );
-		$pot->set_header( 'Language-Team', 'LANGUAGE <LL@li.org>' );
-		$pot->set_comment_before_headers( $meta['comments'] );
-		$pot->export_to_file( $output_file );
+		$pot->set_header('Project-Id-Version', $meta['package-name'].' '.$meta['package-version']);
+		$pot->set_header('Report-Msgid-Bugs-To', $meta['msgid-bugs-address']);
+		$pot->set_header('POT-Creation-Date', gmdate('Y-m-d H:i:s+00:00'));
+		$pot->set_header('MIME-Version', '1.0');
+		$pot->set_header('Content-Type', 'text/plain; charset=UTF-8');
+		$pot->set_header('Content-Transfer-Encoding', '8bit');
+		$pot->set_header('PO-Revision-Date', date('Y').'-MO-DA HO:MI+ZONE');
+		$pot->set_header('Last-Translator', 'FULL NAME <EMAIL@ADDRESS>');
+		$pot->set_header('Language-Team', 'LANGUAGE <LL@li.org>');
+		$pot->set_comment_before_headers($meta['comments']);
+		$pot->export_to_file($output_file);
 		return true;
 	}
 
@@ -202,185 +202,185 @@ 
 			'default_output' => 'wordpress.pot',
 			'includes' => array(),
 			'excludes' => array_merge(
-				array( 'wp-admin/includes/continents-cities\.php', 'wp-content/themes/twenty.*', ),
+				array('wp-admin/includes/continents-cities\.php', 'wp-content/themes/twenty.*',),
 				$this->ms_files
 			),
 			'extract_not_gettexted' => false,
 			'not_gettexted_files_filter' => false,
 		);
-		$args = array_merge( $defaults, $args );
-		extract( $args );
+		$args = array_merge($defaults, $args);
+		extract($args);
 		$placeholders = array();
-		if ( $wp_version = $this->wp_version( $dir ) )
+		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;
+		$output = is_null($output) ? $default_output : $output;
+		$res = $this->xgettext($project, $dir, $output, $placeholders, $excludes, $includes);
+		if ( ! $res) return false;
 
-		if ( $extract_not_gettexted ) {
+		if ($extract_not_gettexted) {
 			$old_dir = getcwd();
-			$output = realpath( $output );
-			chdir( $dir );
+			$output = realpath($output);
+			chdir($dir);
 			$php_files = NotGettexted::list_php_files('.');
-			$php_files = array_filter( $php_files, $not_gettexted_files_filter );
+			$php_files = array_filter($php_files, $not_gettexted_files_filter);
 			$not_gettexted = new NotGettexted;
-			$res = $not_gettexted->command_extract( $output, $php_files );
-			chdir( $old_dir );
+			$res = $not_gettexted->command_extract($output, $php_files);
+			chdir($old_dir);
 			/* Adding non-gettexted strings can repeat some phrases */
-			$output_shell = escapeshellarg( $output );
-			system( "msguniq --use-first $output_shell -o $output_shell" );
+			$output_shell = escapeshellarg($output);
+			system("msguniq --use-first $output_shell -o $output_shell");
 		}
 		return $res;
 	}
 
-	public function wp_frontend( $dir, $output ) {
-		if ( ! file_exists( "$dir/wp-admin/user/about.php" ) ) {
+	public function wp_frontend($dir, $output) {
+		if ( ! file_exists("$dir/wp-admin/user/about.php")) {
 			return false;
 		}
 
-		$excludes = array( 'wp-admin/.*', 'wp-content/themes/.*', 'wp-includes/class-pop3\.php' );
+		$excludes = array('wp-admin/.*', 'wp-content/themes/.*', 'wp-includes/class-pop3\.php');
 
 		// Exclude Akismet all together for 3.9+.
-		if ( file_exists( "$dir/wp-admin/css/about.css" ) ) {
+		if (file_exists("$dir/wp-admin/css/about.css")) {
 			$excludes[] = 'wp-content/plugins/akismet/.*';
 		}
 
-		return $this->wp_generic( $dir, array(
+		return $this->wp_generic($dir, array(
 			'project' => 'wp-frontend', 'output' => $output,
 			'includes' => array(),
 			'excludes' => $excludes,
 			'default_output' => 'wordpress.pot',
-		) );
+		));
 	}
 
 	public function wp_admin($dir, $output) {
-		$frontend_pot = $this->tempnam( 'frontend.pot' );
-		if ( false === $frontend_pot ) {
+		$frontend_pot = $this->tempnam('frontend.pot');
+		if (false === $frontend_pot) {
 			return false;
 		}
 
-		$frontend_result = $this->wp_frontend( $dir, $frontend_pot );
-		if ( ! $frontend_result ) {
+		$frontend_result = $this->wp_frontend($dir, $frontend_pot);
+		if ( ! $frontend_result) {
 			return false;
 		}
 
-		$network_admin_files = $this->get_wp_network_admin_files( $dir );
+		$network_admin_files = $this->get_wp_network_admin_files($dir);
 
-		$result = $this->wp_generic( $dir, array(
+		$result = $this->wp_generic($dir, array(
 			'project' => 'wp-admin', 'output' => $output,
-			'includes' => array( 'wp-admin/.*' ),
-			'excludes' => array_merge( array( 'wp-admin/includes/continents-cities\.php' ), $network_admin_files ),
+			'includes' => array('wp-admin/.*'),
+			'excludes' => array_merge(array('wp-admin/includes/continents-cities\.php'), $network_admin_files),
 			'default_output' => 'wordpress-admin.pot',
-		) );
-		if ( ! $result ) {
+		));
+		if ( ! $result) {
 			return false;
 		}
 
 		$potextmeta = new PotExtMeta;
 
-		if ( ! file_exists( "$dir/wp-admin/css/about.css" ) ) { // < 3.9
-			$result = $potextmeta->append( "$dir/wp-content/plugins/akismet/akismet.php", $output );
-			if ( ! $result ) {
+		if ( ! file_exists("$dir/wp-admin/css/about.css")) { // < 3.9
+			$result = $potextmeta->append("$dir/wp-content/plugins/akismet/akismet.php", $output);
+			if ( ! $result) {
 				return false;
 			}
 		}
 
-		$result = $potextmeta->append( "$dir/wp-content/plugins/hello.php", $output );
-		if ( ! $result ) {
+		$result = $potextmeta->append("$dir/wp-content/plugins/hello.php", $output);
+		if ( ! $result) {
 			return false;
 		}
 
 		/* Adding non-gettexted strings can repeat some phrases */
-		$output_shell = escapeshellarg( $output );
-		system( "msguniq $output_shell -o $output_shell" );
+		$output_shell = escapeshellarg($output);
+		system("msguniq $output_shell -o $output_shell");
 
-		$common_pot = $this->tempnam( 'common.pot' );
-		if ( ! $common_pot ) {
+		$common_pot = $this->tempnam('common.pot');
+		if ( ! $common_pot) {
 			return false;
 		}
-		$admin_pot = realpath( is_null( $output ) ? 'wordpress-admin.pot' : $output );
-		system( "msgcat --more-than=1 --use-first $frontend_pot $admin_pot > $common_pot" );
-		system( "msgcat -u --use-first $admin_pot $common_pot -o $admin_pot" );
+		$admin_pot = realpath(is_null($output) ? 'wordpress-admin.pot' : $output);
+		system("msgcat --more-than=1 --use-first $frontend_pot $admin_pot > $common_pot");
+		system("msgcat -u --use-first $admin_pot $common_pot -o $admin_pot");
 		return true;
 	}
 
 	public 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;
+		$frontend_pot = $this->tempnam('frontend.pot');
+		if (false === $frontend_pot) return false;
 
-		$frontend_result = $this->wp_frontend( $dir, $frontend_pot );
-		if ( ! $frontend_result )
+		$frontend_result = $this->wp_frontend($dir, $frontend_pot);
+		if ( ! $frontend_result)
 			return false;
 
-		$admin_pot = $this->tempnam( 'admin.pot' );
-		if ( false === $admin_pot ) return false;
+		$admin_pot = $this->tempnam('admin.pot');
+		if (false === $admin_pot) return false;
 
-		$admin_result = $this->wp_admin( $dir, $admin_pot );
-		if ( ! $admin_result )
+		$admin_result = $this->wp_admin($dir, $admin_pot);
+		if ( ! $admin_result)
 			return false;
 
-		$result = $this->wp_generic( $dir, array(
+		$result = $this->wp_generic($dir, array(
 			'project' => 'wp-network-admin', 'output' => $output,
-			'includes' => $this->get_wp_network_admin_files( $dir ),
+			'includes' => $this->get_wp_network_admin_files($dir),
 			'excludes' => array(),
 			'default_output' => 'wordpress-admin-network.pot',
-		) );
+		));
 
-		if ( ! $result ) {
+		if ( ! $result) {
 			return false;
 		}
 
-		$common_pot = $this->tempnam( 'common.pot' );
-		if ( ! $common_pot )
+		$common_pot = $this->tempnam('common.pot');
+		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" );
-		system( "msgcat -u --use-first $net_admin_pot $common_pot -o $net_admin_pot" );
+		$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");
+		system("msgcat -u --use-first $net_admin_pot $common_pot -o $net_admin_pot");
 		return true;
 	}
 
-	private function get_wp_network_admin_files( $dir ) {
-		$wp_version = $this->wp_version( $dir );
+	private function get_wp_network_admin_files($dir) {
+		$wp_version = $this->wp_version($dir);
 
 		// https://core.trac.wordpress.org/ticket/19852
-		$files = array( 'wp-admin/network/.*', 'wp-admin/network.php' );
+		$files = array('wp-admin/network/.*', 'wp-admin/network.php');
 
 		// https://core.trac.wordpress.org/ticket/34910
-		if ( version_compare( $wp_version, '4.5-beta', '>=' ) ) {
-			$files = array_merge( $files, array(
+		if (version_compare($wp_version, '4.5-beta', '>=')) {
+			$files = array_merge($files, array(
 				'wp-admin/includes/class-wp-ms.*',
 				'wp-admin/includes/network.php',
-			) );
+			));
 		}
 
 		return $files;
 	}
 
-	public function wp_tz( $dir, $output ) {
-		return $this->wp_generic( $dir, array(
+	public function wp_tz($dir, $output) {
+		return $this->wp_generic($dir, array(
 			'project' => 'wp-tz', 'output' => $output,
-			'includes' => array( 'wp-admin/includes/continents-cities\.php' ),
+			'includes' => array('wp-admin/includes/continents-cities\.php'),
 			'excludes' => array(),
 			'default_output' => 'wordpress-continents-cities.pot',
-		) );
+		));
 	}
 
-	private function wp_version( $dir ) {
+	private function wp_version($dir) {
 		$version_php = $dir.'/wp-includes/version.php';
-		if ( !is_readable( $version_php ) ) return false;
-		return preg_match( '/\$wp_version\s*=\s*\'(.*?)\';/', file_get_contents( $version_php ), $matches )? $matches[1] : false;
+		if ( ! is_readable($version_php)) return false;
+		return preg_match('/\$wp_version\s*=\s*\'(.*?)\';/', file_get_contents($version_php), $matches) ? $matches[1] : false;
 	}
 
 	public 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) {
+		foreach (range(1, $lines) as $x) {
 			$line = fgets($extf);
 			if (feof($extf)) break;
 			if (false === $line) {
@@ -390,10 +390,10 @@ 
 		}
 
 		// PHP will close file handle, but we are good citizens.
-		fclose( $extf );
+		fclose($extf);
 
 		// Make sure we catch CR-only line endings.
-		$first_lines = str_replace( "\r", "\n", $first_lines );
+		$first_lines = str_replace("\r", "\n", $first_lines);
 
 		return $first_lines;
 	}
@@ -407,8 +407,8 @@ 
 		 * - '<?php // Header: Value ?>'
 		 * - '<?php /* Header: Value * / $foo='bar'; ?>'
 		 */
-		if ( preg_match( '/^(?:[ \t]*<\?php)?[ \t\/*#@]*' . preg_quote( $header, '/' ) . ':(.*)$/mi', $source, $matches ) ) {
-			return $this->_cleanup_header_comment( $matches[1] );
+		if (preg_match('/^(?:[ \t]*<\?php)?[ \t\/*#@]*'.preg_quote($header, '/').':(.*)$/mi', $source, $matches)) {
+			return $this->_cleanup_header_comment($matches[1]);
 		} else {
 			return false;
 		}
@@ -417,12 +417,12 @@ 
 	/**
 	 * Removes any trailing closing comment / PHP tags from the header value
 	 */
-	private function _cleanup_header_comment( $str ) {
-		return trim( preg_replace( '/\s*(?:\*\/|\?>).*/', '', $str ) );
+	private function _cleanup_header_comment($str) {
+		return trim(preg_replace('/\s*(?:\*\/|\?>).*/', '', $str));
 	}
 
 	public function generic($dir, $output) {
-		$output = is_null($output)? "generic.pot" : $output;
+		$output = is_null($output) ? "generic.pot" : $output;
 		return $this->xgettext('generic', $dir, $output, array());
 	}
 
@@ -437,53 +437,53 @@ 
 		return $slug;
 	}
 
-	public function wp_plugin( $dir, $output, $slug = null, $args = array() ) {
+	public function wp_plugin($dir, $output, $slug = null, $args = array()) {
 		$defaults = array(
 			'excludes' => array(),
 			'includes' => array(),
 		);
-		$args = array_merge( $defaults, $args );
+		$args = array_merge($defaults, $args);
 		$placeholders = array();
 		// guess plugin slug
 		if (is_null($slug)) {
 			$slug = $this->guess_plugin_slug($dir);
 		}
 
-		$plugins_dir = @opendir( $dir );
+		$plugins_dir = @opendir($dir);
 		$plugin_files = array();
-		if ( $plugins_dir ) {
-			while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-				if ( '.' === substr( $file, 0, 1 ) ) {
+		if ($plugins_dir) {
+			while (($file = readdir($plugins_dir)) !== false) {
+				if ('.' === substr($file, 0, 1)) {
 					continue;
 				}
 
-				if ( '.php' === substr( $file, -4 ) ) {
+				if ('.php' === substr($file, -4)) {
 					$plugin_files[] = $file;
 				}
 			}
-			closedir( $plugins_dir );
+			closedir($plugins_dir);
 		}
 
-		if ( empty( $plugin_files ) ) {
+		if (empty($plugin_files)) {
 			return false;
 		}
 
 		$main_file = '';
-		foreach ( $plugin_files as $plugin_file ) {
-			if ( ! is_readable( "$dir/$plugin_file" ) ) {
+		foreach ($plugin_files as $plugin_file) {
+			if ( ! is_readable("$dir/$plugin_file")) {
 				continue;
 			}
 
-			$source = $this->get_first_lines( "$dir/$plugin_file", $this->max_header_lines );
+			$source = $this->get_first_lines("$dir/$plugin_file", $this->max_header_lines);
 
 			// Stop when we find a file with a plugin name header in it.
-			if ( $this->get_addon_header( 'Plugin Name', $source ) != false ) {
+			if ($this->get_addon_header('Plugin Name', $source) != false) {
 				$main_file = "$dir/$plugin_file";
 				break;
 			}
 		}
 
-		if ( empty( $main_file ) ) {
+		if (empty($main_file)) {
 			return false;
 		}
 
@@ -492,9 +492,9 @@ 
 		$placeholders['name'] = $this->get_addon_header('Plugin Name', $source);
 		$placeholders['slug'] = $slug;
 
-		$output = is_null($output)? "$slug.pot" : $output;
-		$res = $this->xgettext( 'wp-plugin', $dir, $output, $placeholders, $args['excludes'], $args['includes'] );
-		if (!$res) return false;
+		$output = is_null($output) ? "$slug.pot" : $output;
+		$res = $this->xgettext('wp-plugin', $dir, $output, $placeholders, $args['excludes'], $args['includes']);
+		if ( ! $res) return false;
 		$potextmeta = new PotExtMeta;
 		$res = $potextmeta->append($main_file, $output);
 		/* Adding non-gettexted strings can repeat some phrases */
@@ -517,37 +517,37 @@ 
 		$placeholders['name'] = $this->get_addon_header('Theme Name', $source);
 		$placeholders['slug'] = $slug;
 
-		$license = $this->get_addon_header( 'License', $source );
-		if ( $license )
+		$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.";
 
-		$output = is_null($output)? "$slug.pot" : $output;
+		$output = is_null($output) ? "$slug.pot" : $output;
 		$res = $this->xgettext('wp-theme', $dir, $output, $placeholders);
-		if (! $res )
+		if ( ! $res)
 			return false;
 		$potextmeta = new PotExtMeta;
-		$res = $potextmeta->append( $main_file, $output, array( 'Theme Name', 'Theme URI', 'Description', 'Author', 'Author URI' ) );
-		if ( ! $res )
+		$res = $potextmeta->append($main_file, $output, array('Theme Name', 'Theme URI', 'Description', 'Author', 'Author URI'));
+		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 ) {
-			$wp_dir = dirname( dirname( dirname( $dir ) ) );
-			$extract_templates = file_exists( "$wp_dir/wp-admin/user/about.php" ) || ! file_exists( "$wp_dir/wp-load.php" );
+		$extract_templates = ! in_array($slug, array('twentyten', 'twentyeleven', 'default', 'classic'));
+		if ( ! $extract_templates) {
+			$wp_dir = dirname(dirname(dirname($dir)));
+			$extract_templates = file_exists("$wp_dir/wp-admin/user/about.php") || ! file_exists("$wp_dir/wp-load.php");
 		}
-		if ( $extract_templates ) {
-			$res = $potextmeta->append( $dir, $output, array( 'Template Name' ) );
-			if ( ! $res )
+		if ($extract_templates) {
+			$res = $potextmeta->append($dir, $output, array('Template Name'));
+			if ( ! $res)
 				return false;
-			$files = scandir( $dir );
-			foreach ( $files as $file ) {
-				if ( '.' == $file[0] || 'CVS' == $file )
+			$files = scandir($dir);
+			foreach ($files as $file) {
+				if ('.' == $file[0] || 'CVS' == $file)
 					continue;
-				if ( is_dir( $dir . '/' . $file ) ) {
-					$res = $potextmeta->append( $dir . '/' . $file, $output, array( 'Template Name' ) );
-					if ( ! $res )
+				if (is_dir($dir.'/'.$file)) {
+					$res = $potextmeta->append($dir.'/'.$file, $output, array('Template Name'));
+					if ( ! $res)
 						return false;
 				}
 			}
@@ -558,54 +558,54 @@ 
 		return $res;
 	}
 
-	public function glotpress( $dir, $output ) {
-		$output = is_null( $output ) ? "glotpress.pot" : $output;
-		return $this->xgettext( 'glotpress', $dir, $output );
+	public function glotpress($dir, $output) {
+		$output = is_null($output) ? "glotpress.pot" : $output;
+		return $this->xgettext('glotpress', $dir, $output);
 	}
 
-	public function wporg_bb_forums( $dir, $output ) {
-		$output = is_null( $output ) ? 'wporg.pot' : $output;
-		return $this->xgettext( 'wporg-bb-forums', $dir, $output, array(), array(
+	public function wporg_bb_forums($dir, $output) {
+		$output = is_null($output) ? 'wporg.pot' : $output;
+		return $this->xgettext('wporg-bb-forums', $dir, $output, array(), array(
 			'bb-plugins/elfakismet/.*',
 			'bb-plugins/support-forum/.*',
 			'themes/.*',
-		) );
+		));
 	}
 
-	public function wporg_themes( $dir, $output ) {
-		$output = is_null( $output ) ? 'wporg-themes.pot' : $output;
-		return $this->xgettext( 'wporg', $dir, $output, array(), array(), array(
+	public function wporg_themes($dir, $output) {
+		$output = is_null($output) ? 'wporg-themes.pot' : $output;
+		return $this->xgettext('wporg', $dir, $output, array(), array(), array(
 			'plugins/theme-directory/.*',
 			'themes/pub/wporg-themes/.*'
-		) );
+		));
 	}
 
-	public function wporg_plugins( $dir, $output ) {
-		$output = is_null( $output ) ? 'wporg-plugins.pot' : $output;
-		return $this->xgettext( 'wporg', $dir, $output, array(), array(
+	public function wporg_plugins($dir, $output) {
+		$output = is_null($output) ? 'wporg-plugins.pot' : $output;
+		return $this->xgettext('wporg', $dir, $output, array(), array(
 			'plugins/svn-track/i18n-tools/.*'
 			), array(
 			'.*\.php',
-		) );
+		));
 	}
 
-	public function wporg_forums( $dir, $output ) {
-		$output = is_null( $output ) ? 'wporg-forums.pot' : $output;
-		return $this->xgettext( 'wporg', $dir, $output, array(), array(), array(
+	public function wporg_forums($dir, $output) {
+		$output = is_null($output) ? 'wporg-forums.pot' : $output;
+		return $this->xgettext('wporg', $dir, $output, array(), array(), array(
 			'.*\.php',
-		) );
+		));
 	}
 
-	public function wordcamporg( $dir, $output ) {
-		$output = is_null( $output ) ? 'wordcamporg.pot' : $output;
-		return $this->xgettext( 'wordcamporg', $dir, $output, array(), array(), array(
+	public function wordcamporg($dir, $output) {
+		$output = is_null($output) ? 'wordcamporg.pot' : $output;
+		return $this->xgettext('wordcamporg', $dir, $output, array(), array(), array(
 			'.*\.php',
-		) );
+		));
 	}
 
-	public function rosetta( $dir, $output ) {
-		$output = is_null( $output )? 'rosetta.pot' : $output;
-		return $this->xgettext( 'rosetta', $dir, $output, array(), array(
+	public function rosetta($dir, $output) {
+		$output = is_null($output) ? 'rosetta.pot' : $output;
+		return $this->xgettext('rosetta', $dir, $output, array(), array(
 			'mu-plugins/rosetta/i18n-tools/.*',
 			'mu-plugins/rosetta/locales/.*',
 			), array(
@@ -615,7 +615,7 @@ 
 			'mu-plugins/rosetta/[^/]+\.php',
 			'mu-plugins/rosetta/tmpl/.*\.php',
 			'themes/rosetta/.*\.php',
-		) );
+		));
 	}
 }
 
@@ -625,7 +625,7 @@ 
 if ($included_files[0] == __FILE__) {
 	$makepot = new MakePOT;
 	if ((3 == count($argv) || 4 == count($argv)) && in_array($method = str_replace('-', '_', $argv[1]), get_class_methods($makepot))) {
-		$res = call_user_func(array($makepot, $method), realpath($argv[2]), isset($argv[3])? $argv[3] : null);
+		$res = call_user_func(array($makepot, $method), realpath($argv[2]), isset($argv[3]) ? $argv[3] : null);
 		if (false === $res) {
 			fwrite(STDERR, "Couldn't generate POT file!\n");
 		}

Braces +61 added lines, -34 removed lines

@@ -152,8 +152,9 @@ 
 	}
 
 	public function __destruct() {
-		foreach ( $this->temp_files as $temp_file )
-			unlink( $temp_file );
+		foreach ( $this->temp_files as $temp_file ) {
+					unlink( $temp_file );
+		}
 	}
 
 	private function tempnam( $file ) {
@@ -211,13 +212,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();
@@ -307,21 +311,29 @@ 
 	}
 
 	public 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,
@@ -335,8 +347,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" );
@@ -372,17 +385,23 @@ 
 
 	private 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;
 	}
 
 	public 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;
 			}
@@ -494,7 +513,9 @@ 
 
 		$output = is_null($output)? "$slug.pot" : $output;
 		$res = $this->xgettext( 'wp-plugin', $dir, $output, $placeholders, $args['excludes'], $args['includes'] );
-		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 */
@@ -518,19 +539,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 ) {
@@ -539,16 +563,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;
+					}
 				}
 			}
 		}

tools/i18n/add-textdomain.php

Spacing +27 added lines, -27 removed lines

@@ -7,7 +7,7 @@ 
  */
 error_reporting(E_ALL);
 
-require_once dirname( __FILE__ ) . '/makepot.php';
+require_once dirname(__FILE__).'/makepot.php';
 
 class AddTextdomain {
 
@@ -19,7 +19,7 @@ 
 	 */
 	public function __construct() {
 		$makepot = new MakePOT;
-		$this->funcs = array_keys( $makepot->rules );
+		$this->funcs = array_keys($makepot->rules);
 		$this->funcs[] = 'translate_nooped_plural';
 	}
 
@@ -41,13 +41,13 @@ 
 	 * @param string $source_filename Filename with optional path.
 	 * @param bool   $inplace         True to modifies the PHP file in place. False to print to standard output.
 	 */
-	public function process_file( $domain, $source_filename, $inplace ) {
-		$new_source = $this->process_string( $domain, file_get_contents( $source_filename ) );
+	public function process_file($domain, $source_filename, $inplace) {
+		$new_source = $this->process_string($domain, file_get_contents($source_filename));
 
-		if ( $inplace ) {
-			$f = fopen( $source_filename, 'w' );
-			fwrite( $f, $new_source );
-			fclose( $f );
+		if ($inplace) {
+			$f = fopen($source_filename, 'w');
+			fwrite($f, $new_source);
+			fclose($f);
 		} else {
 			echo $new_source;
 		}
@@ -64,9 +64,9 @@ 
 	 * @param string $string PHP code to parse.
 	 * @return string Modified source.
 	 */
-	public function process_string( $domain, $string ) {
-		$tokens = token_get_all( $string );
-		return $this->process_tokens( $domain, $tokens );
+	public function process_string($domain, $string) {
+		$tokens = token_get_all($string);
+		return $this->process_tokens($domain, $tokens);
 	}
 
 	/**
@@ -79,16 +79,16 @@ 
 	 *                       number in element 2.
 	 * @return string Modified source.
 	 */
-	public function process_tokens( $domain, $tokens ) {
+	public function process_tokens($domain, $tokens) {
 		$this->modified_contents = '';
-		$domain = addslashes( $domain );
+		$domain = addslashes($domain);
 
 		$in_func = false;
 		$args_started = false;
 		$parens_balance = 0;
 		$found_domain = false;
 
-		foreach($tokens as $index => $token) {
+		foreach ($tokens as $index => $token) {
 			$string_success = false;
 			if (is_array($token)) {
 				list($id, $text) = $token;
@@ -103,18 +103,18 @@ 
 					}
 				}
 				$token = $text;
-			} elseif ('(' == $token){
+			} elseif ('(' == $token) {
 				$args_started = true;
 				++$parens_balance;
 			} elseif (')' == $token) {
 				--$parens_balance;
 				if ($in_func && 0 == $parens_balance) {
-					if ( ! $found_domain ) {
+					if ( ! $found_domain) {
 						$token = ", '$domain'";
-						if ( T_WHITESPACE == $tokens[ $index - 1 ][0] ) {
+						if (T_WHITESPACE == $tokens[$index - 1][0]) {
 							$token .= ' '; // Maintain code standards if previously present
 							// Remove previous whitespace token to account for it.
-							$this->modified_contents = trim( $this->modified_contents );
+							$this->modified_contents = trim($this->modified_contents);
 						}
 						$token .= ')';
 					}
@@ -135,26 +135,26 @@ 
 if ($included_files[0] == __FILE__) {
 	$adddomain = new AddTextdomain();
 
-	if (!isset($argv[1]) || !isset($argv[2])) {
+	if ( ! isset($argv[1]) || ! isset($argv[2])) {
 		$adddomain->usage();
 	}
 
 	$inplace = false;
 	if ('-i' == $argv[1]) {
 		$inplace = true;
-		if (!isset($argv[3])) $adddomain->usage();
+		if ( ! isset($argv[3])) $adddomain->usage();
 		array_shift($argv);
 	}
 
-	if ( is_dir( $argv[2] ) ) {
-		$directory = new RecursiveDirectoryIterator( $argv[2], RecursiveDirectoryIterator::SKIP_DOTS );
-		$files = new RecursiveIteratorIterator( $directory );
-		foreach ( $files as $file ) {
-			if ( 'php' === $file->getExtension() ) {
-				$adddomain->process_file( $argv[1], $file->getPathname(), $inplace );
+	if (is_dir($argv[2])) {
+		$directory = new RecursiveDirectoryIterator($argv[2], RecursiveDirectoryIterator::SKIP_DOTS);
+		$files = new RecursiveIteratorIterator($directory);
+		foreach ($files as $file) {
+			if ('php' === $file->getExtension()) {
+				$adddomain->process_file($argv[1], $file->getPathname(), $inplace);
 			}
 		}
 	} else {
-		$adddomain->process_file( $argv[1], $argv[2], $inplace );
+		$adddomain->process_file($argv[1], $argv[2], $inplace);
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -142,7 +142,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/t/AddTextdomainTest.php

Spacing +17 added lines, -17 removed lines

@@ -5,8 +5,8 @@ 
  * @package wordpress-i18n
  * @subpackage tools
  */
-error_reporting( E_ALL );
-require_once dirname( dirname( __FILE__ ) ) . '/add-textdomain.php';
+error_reporting(E_ALL);
+require_once dirname(dirname(__FILE__)).'/add-textdomain.php';
 
 class AddTextDomainTest extends PHPUnit_Framework_TestCase {
 
@@ -17,30 +17,30 @@ 
 
 	function test_add() {
 		// Copy to a new file, so that we don't corrupt the old one.
-		copy( 'data/add-textdomain-0.php', 'data/add-textdomain-0-work.php' );
-		$this->atd->process_file( 'test-domain', 'data/add-textdomain-0-work.php', true );
-		$this->assertEquals( file_get_contents( 'data/add-textdomain-0-result.php' ), file_get_contents( 'data/add-textdomain-0-work.php' ) );
-		unlink( 'data/add-textdomain-0-work.php' );
+		copy('data/add-textdomain-0.php', 'data/add-textdomain-0-work.php');
+		$this->atd->process_file('test-domain', 'data/add-textdomain-0-work.php', true);
+		$this->assertEquals(file_get_contents('data/add-textdomain-0-result.php'), file_get_contents('data/add-textdomain-0-work.php'));
+		unlink('data/add-textdomain-0-work.php');
 	}
 
 	/**
 	 * @dataProvider data_textdomain_sources
 	 */
-	function test_basic_add_textdomain( $source, $expected ) {
-		$tokens = token_get_all( $source );
-		$result = $this->atd->process_tokens( 'foo', $tokens );
-		$this->assertEquals( $expected, $result );
+	function test_basic_add_textdomain($source, $expected) {
+		$tokens = token_get_all($source);
+		$result = $this->atd->process_tokens('foo', $tokens);
+		$this->assertEquals($expected, $result);
 	}
 
 	function data_textdomain_sources() {
 		return array(
-			array( "<?php __('string'); ?>", "<?php __('string', 'foo'); ?>" ), // Simple single quotes
-			array( '<?php __("string"); ?>', "<?php __(\"string\", 'foo'); ?>" ), // Simple double quotes
-			array( "<?php __( 'string' ); ?>", "<?php __( 'string', 'foo' ); ?>" ), // Simple single quotes CS
-			array( '<?php __( "string" ); ?>', "<?php __( \"string\", 'foo' ); ?>" ), // Simple double quotes CS
-			array( "<?php __( 'string', 'string2' ); ?>", "<?php __( 'string', 'string2', 'foo' ); ?>" ), // Multiple string args
-			array( '<?php __( \'string\', $var ); ?>', '<?php __( \'string\', $var, \'foo\' ); ?>' ), // Multiple string / var args
-			array( "<?php __( 'string', 'foo' ); ?>", "<?php __( 'string', 'foo' ); ?>" ), // Existing textdomain
+			array("<?php __('string'); ?>", "<?php __('string', 'foo'); ?>"), // Simple single quotes
+			array('<?php __("string"); ?>', "<?php __(\"string\", 'foo'); ?>"), // Simple double quotes
+			array("<?php __( 'string' ); ?>", "<?php __( 'string', 'foo' ); ?>"), // Simple single quotes CS
+			array('<?php __( "string" ); ?>', "<?php __( \"string\", 'foo' ); ?>"), // Simple double quotes CS
+			array("<?php __( 'string', 'string2' ); ?>", "<?php __( 'string', 'string2', 'foo' ); ?>"), // Multiple string args
+			array('<?php __( \'string\', $var ); ?>', '<?php __( \'string\', $var, \'foo\' ); ?>'), // Multiple string / var args
+			array("<?php __( 'string', 'foo' ); ?>", "<?php __( 'string', 'foo' ); ?>"), // Existing textdomain
 		);
 	}
 }

tools/i18n/t/data/add-textdomain-0-result.php

Spacing +15 added lines, -15 removed lines

@@ -1,18 +1,18 @@
 <?php
 function call_some_i18n_methods() {
-	__( 'Hello World', 'test-domain' );
-	_e( 'Hello World', 'test-domain' );
-	_n( 'Single', 'Plural', 1, 'test-domain' );
-	_n_noop( 'Single Noop', 'Plural Noop', 1, 'test-domain' );
-	_x( 'Hello World', 'Testing', 'test-domain' );
-	_ex( 'Hello World', 'Testing', 'test-domain' );
-	_nx( 'Hello World', 'Testing', 'test-domain' );
-	_nx_noop( 'Hello World Noop', 'Testing', 'test-domain' );
-	esc_attr__( 'Attribute', 'test-domain' );
-	esc_html__( 'HTML', 'test-domain' );
-	esc_attr_e( 'Attribute', 'test-domain' );
-	esc_html_e( 'HTML', 'test-domain' );
-	esc_attr_x( 'Attribute', 'Testing', 'test-domain' );
-	esc_html_x( 'HTML', 'Testing', 'test-domain' );
-	translate_nooped_plural( 'Plural Noop', 2, 'test-domain' );
+	__('Hello World', 'test-domain');
+	_e('Hello World', 'test-domain');
+	_n('Single', 'Plural', 1, 'test-domain');
+	_n_noop('Single Noop', 'Plural Noop', 1, 'test-domain');
+	_x('Hello World', 'Testing', 'test-domain');
+	_ex('Hello World', 'Testing', 'test-domain');
+	_nx('Hello World', 'Testing', 'test-domain');
+	_nx_noop('Hello World Noop', 'Testing', 'test-domain');
+	esc_attr__('Attribute', 'test-domain');
+	esc_html__('HTML', 'test-domain');
+	esc_attr_e('Attribute', 'test-domain');
+	esc_html_e('HTML', 'test-domain');
+	esc_attr_x('Attribute', 'Testing', 'test-domain');
+	esc_html_x('HTML', 'Testing', 'test-domain');
+	translate_nooped_plural('Plural Noop', 2, 'test-domain');
 }

tools/i18n/t/data/add-textdomain-0.php

Spacing +15 added lines, -15 removed lines

@@ -1,18 +1,18 @@
 <?php
 function call_some_i18n_methods() {
-	__( 'Hello World' );
-	_e( 'Hello World' );
-	_n( 'Single', 'Plural', 1 );
-	_n_noop( 'Single Noop', 'Plural Noop', 1 );
-	_x( 'Hello World', 'Testing' );
-	_ex( 'Hello World', 'Testing' );
-	_nx( 'Hello World', 'Testing' );
-	_nx_noop( 'Hello World Noop', 'Testing' );
-	esc_attr__( 'Attribute' );
-	esc_html__( 'HTML' );
-	esc_attr_e( 'Attribute' );
-	esc_html_e( 'HTML' );
-	esc_attr_x( 'Attribute', 'Testing' );
-	esc_html_x( 'HTML', 'Testing' );
-	translate_nooped_plural( 'Plural Noop', 2 );
+	__('Hello World');
+	_e('Hello World');
+	_n('Single', 'Plural', 1);
+	_n_noop('Single Noop', 'Plural Noop', 1);
+	_x('Hello World', 'Testing');
+	_ex('Hello World', 'Testing');
+	_nx('Hello World', 'Testing');
+	_nx_noop('Hello World Noop', 'Testing');
+	esc_attr__('Attribute');
+	esc_html__('HTML');
+	esc_attr_e('Attribute');
+	esc_html_e('HTML');
+	esc_attr_x('Attribute', 'Testing');
+	esc_html_x('HTML', 'Testing');
+	translate_nooped_plural('Plural Noop', 2);
 }

src/wp-content/themes/twentythirteen/footer.php

Spacing +3 added lines, -3 removed lines

@@ -12,11 +12,11 @@
 
 		</div><!-- #main -->
 		<footer id="colophon" class="site-footer" role="contentinfo">
-			<?php get_sidebar( 'main' ); ?>
+			<?php get_sidebar('main'); ?>
 
 			<div class="site-info">
-				<?php do_action( 'twentythirteen_credits' ); ?>
-				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentythirteen' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentythirteen' ), 'WordPress' ); ?></a>
+				<?php do_action('twentythirteen_credits'); ?>
+				<a href="<?php echo esc_url(__('https://wordpress.org/', 'twentythirteen')); ?>"><?php printf(__('Proudly powered by %s', 'twentythirteen'), 'WordPress'); ?></a>
 			</div><!-- .site-info -->
 		</footer><!-- #colophon -->
 	</div><!-- #page -->

src/wp-content/themes/twentyfifteen/inc/customizer.php

Spacing +71 added lines, -71 removed lines

@@ -14,73 +14,73 @@ 
  *
  * @param WP_Customize_Manager $wp_customize Customizer object.
  */
-function twentyfifteen_customize_register( $wp_customize ) {
+function twentyfifteen_customize_register($wp_customize) {
 	$color_scheme = twentyfifteen_get_color_scheme();
 
-	$wp_customize->get_setting( 'blogname' )->transport        = 'postMessage';
-	$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
+	$wp_customize->get_setting('blogname')->transport        = 'postMessage';
+	$wp_customize->get_setting('blogdescription')->transport = 'postMessage';
 
-	if ( isset( $wp_customize->selective_refresh ) ) {
-		$wp_customize->selective_refresh->add_partial( 'blogname', array(
+	if (isset($wp_customize->selective_refresh)) {
+		$wp_customize->selective_refresh->add_partial('blogname', array(
 			'selector' => '.site-title a',
 			'container_inclusive' => false,
 			'render_callback' => 'twentyfifteen_customize_partial_blogname',
-		) );
-		$wp_customize->selective_refresh->add_partial( 'blogdescription', array(
+		));
+		$wp_customize->selective_refresh->add_partial('blogdescription', array(
 			'selector' => '.site-description',
 			'container_inclusive' => false,
 			'render_callback' => 'twentyfifteen_customize_partial_blogdescription',
-		) );
+		));
 	}
 
 	// Add color scheme setting and control.
-	$wp_customize->add_setting( 'color_scheme', array(
+	$wp_customize->add_setting('color_scheme', array(
 		'default'           => 'default',
 		'sanitize_callback' => 'twentyfifteen_sanitize_color_scheme',
 		'transport'         => 'postMessage',
-	) );
+	));
 
-	$wp_customize->add_control( 'color_scheme', array(
-		'label'    => __( 'Base Color Scheme', 'twentyfifteen' ),
+	$wp_customize->add_control('color_scheme', array(
+		'label'    => __('Base Color Scheme', 'twentyfifteen'),
 		'section'  => 'colors',
 		'type'     => 'select',
 		'choices'  => twentyfifteen_get_color_scheme_choices(),
 		'priority' => 1,
-	) );
+	));
 
 	// Add custom header and sidebar text color setting and control.
-	$wp_customize->add_setting( 'sidebar_textcolor', array(
+	$wp_customize->add_setting('sidebar_textcolor', array(
 		'default'           => $color_scheme[4],
 		'sanitize_callback' => 'sanitize_hex_color',
 		'transport'         => 'postMessage',
-	) );
+	));
 
-	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'sidebar_textcolor', array(
-		'label'       => __( 'Header and Sidebar Text Color', 'twentyfifteen' ),
-		'description' => __( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
+	$wp_customize->add_control(new WP_Customize_Color_Control($wp_customize, 'sidebar_textcolor', array(
+		'label'       => __('Header and Sidebar Text Color', 'twentyfifteen'),
+		'description' => __('Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen'),
 		'section'     => 'colors',
-	) ) );
+	)));
 
 	// Remove the core header textcolor control, as it shares the sidebar text color.
-	$wp_customize->remove_control( 'header_textcolor' );
+	$wp_customize->remove_control('header_textcolor');
 
 	// Add custom header and sidebar background color setting and control.
-	$wp_customize->add_setting( 'header_background_color', array(
+	$wp_customize->add_setting('header_background_color', array(
 		'default'           => $color_scheme[1],
 		'sanitize_callback' => 'sanitize_hex_color',
 		'transport'         => 'postMessage',
-	) );
+	));
 
-	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'header_background_color', array(
-		'label'       => __( 'Header and Sidebar Background Color', 'twentyfifteen' ),
-		'description' => __( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
+	$wp_customize->add_control(new WP_Customize_Color_Control($wp_customize, 'header_background_color', array(
+		'label'       => __('Header and Sidebar Background Color', 'twentyfifteen'),
+		'description' => __('Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen'),
 		'section'     => 'colors',
-	) ) );
+	)));
 
 	// Add an additional description to the header image section.
-	$wp_customize->get_section( 'header_image' )->description = __( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' );
+	$wp_customize->get_section('header_image')->description = __('Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen');
 }
-add_action( 'customize_register', 'twentyfifteen_customize_register', 11 );
+add_action('customize_register', 'twentyfifteen_customize_register', 11);
 
 /**
  * Render the site title for the selective refresh partial.
@@ -91,7 +91,7 @@ 
  * @return void
  */
 function twentyfifteen_customize_partial_blogname() {
-	bloginfo( 'name' );
+	bloginfo('name');
 }
 
 /**
@@ -103,7 +103,7 @@ 
  * @return void
  */
 function twentyfifteen_customize_partial_blogdescription() {
-	bloginfo( 'description' );
+	bloginfo('description');
 }
 
 /**
@@ -145,9 +145,9 @@ 
 	 *     }
 	 * }
 	 */
-	return apply_filters( 'twentyfifteen_color_schemes', array(
+	return apply_filters('twentyfifteen_color_schemes', array(
 		'default' => array(
-			'label'  => __( 'Default', 'twentyfifteen' ),
+			'label'  => __('Default', 'twentyfifteen'),
 			'colors' => array(
 				'#f1f1f1',
 				'#ffffff',
@@ -158,7 +158,7 @@ 
 			),
 		),
 		'dark'    => array(
-			'label'  => __( 'Dark', 'twentyfifteen' ),
+			'label'  => __('Dark', 'twentyfifteen'),
 			'colors' => array(
 				'#111111',
 				'#202020',
@@ -169,7 +169,7 @@ 
 			),
 		),
 		'yellow'  => array(
-			'label'  => __( 'Yellow', 'twentyfifteen' ),
+			'label'  => __('Yellow', 'twentyfifteen'),
 			'colors' => array(
 				'#f4ca16',
 				'#ffdf00',
@@ -180,7 +180,7 @@ 
 			),
 		),
 		'pink'    => array(
-			'label'  => __( 'Pink', 'twentyfifteen' ),
+			'label'  => __('Pink', 'twentyfifteen'),
 			'colors' => array(
 				'#ffe5d1',
 				'#e53b51',
@@ -191,7 +191,7 @@ 
 			),
 		),
 		'purple'  => array(
-			'label'  => __( 'Purple', 'twentyfifteen' ),
+			'label'  => __('Purple', 'twentyfifteen'),
 			'colors' => array(
 				'#674970',
 				'#2e2256',
@@ -202,7 +202,7 @@ 
 			),
 		),
 		'blue'   => array(
-			'label'  => __( 'Blue', 'twentyfifteen' ),
+			'label'  => __('Blue', 'twentyfifteen'),
 			'colors' => array(
 				'#e9f2f9',
 				'#55c3dc',
@@ -212,10 +212,10 @@ 
 				'#f1f1f1',
 			),
 		),
-	) );
+	));
 }
 
-if ( ! function_exists( 'twentyfifteen_get_color_scheme' ) ) :
+if ( ! function_exists('twentyfifteen_get_color_scheme')) :
 /**
  * Get the current Twenty Fifteen color scheme.
  *
@@ -224,18 +224,18 @@ 
  * @return array An associative array of either the current or default color scheme hex values.
  */
 function twentyfifteen_get_color_scheme() {
-	$color_scheme_option = get_theme_mod( 'color_scheme', 'default' );
+	$color_scheme_option = get_theme_mod('color_scheme', 'default');
 	$color_schemes       = twentyfifteen_get_color_schemes();
 
-	if ( array_key_exists( $color_scheme_option, $color_schemes ) ) {
-		return $color_schemes[ $color_scheme_option ]['colors'];
+	if (array_key_exists($color_scheme_option, $color_schemes)) {
+		return $color_schemes[$color_scheme_option]['colors'];
 	}
 
 	return $color_schemes['default']['colors'];
 }
 endif; // twentyfifteen_get_color_scheme
 
-if ( ! function_exists( 'twentyfifteen_get_color_scheme_choices' ) ) :
+if ( ! function_exists('twentyfifteen_get_color_scheme_choices')) :
 /**
  * Returns an array of color scheme choices registered for Twenty Fifteen.
  *
@@ -247,15 +247,15 @@ 
 	$color_schemes                = twentyfifteen_get_color_schemes();
 	$color_scheme_control_options = array();
 
-	foreach ( $color_schemes as $color_scheme => $value ) {
-		$color_scheme_control_options[ $color_scheme ] = $value['label'];
+	foreach ($color_schemes as $color_scheme => $value) {
+		$color_scheme_control_options[$color_scheme] = $value['label'];
 	}
 
 	return $color_scheme_control_options;
 }
 endif; // twentyfifteen_get_color_scheme_choices
 
-if ( ! function_exists( 'twentyfifteen_sanitize_color_scheme' ) ) :
+if ( ! function_exists('twentyfifteen_sanitize_color_scheme')) :
 /**
  * Sanitization callback for color schemes.
  *
@@ -264,10 +264,10 @@ 
  * @param string $value Color scheme name value.
  * @return string Color scheme name.
  */
-function twentyfifteen_sanitize_color_scheme( $value ) {
+function twentyfifteen_sanitize_color_scheme($value) {
 	$color_schemes = twentyfifteen_get_color_scheme_choices();
 
-	if ( ! array_key_exists( $value, $color_schemes ) ) {
+	if ( ! array_key_exists($value, $color_schemes)) {
 		$value = 'default';
 	}
 
@@ -283,38 +283,38 @@ 
  * @see wp_add_inline_style()
  */
 function twentyfifteen_color_scheme_css() {
-	$color_scheme_option = get_theme_mod( 'color_scheme', 'default' );
+	$color_scheme_option = get_theme_mod('color_scheme', 'default');
 
 	// Don't do anything if the default color scheme is selected.
-	if ( 'default' === $color_scheme_option ) {
+	if ('default' === $color_scheme_option) {
 		return;
 	}
 
 	$color_scheme = twentyfifteen_get_color_scheme();
 
 	// Convert main and sidebar text hex color to rgba.
-	$color_textcolor_rgb         = twentyfifteen_hex2rgb( $color_scheme[3] );
-	$color_sidebar_textcolor_rgb = twentyfifteen_hex2rgb( $color_scheme[4] );
+	$color_textcolor_rgb         = twentyfifteen_hex2rgb($color_scheme[3]);
+	$color_sidebar_textcolor_rgb = twentyfifteen_hex2rgb($color_scheme[4]);
 	$colors = array(
 		'background_color'            => $color_scheme[0],
 		'header_background_color'     => $color_scheme[1],
 		'box_background_color'        => $color_scheme[2],
 		'textcolor'                   => $color_scheme[3],
-		'secondary_textcolor'         => vsprintf( 'rgba( %1$s, %2$s, %3$s, 0.7)', $color_textcolor_rgb ),
-		'border_color'                => vsprintf( 'rgba( %1$s, %2$s, %3$s, 0.1)', $color_textcolor_rgb ),
-		'border_focus_color'          => vsprintf( 'rgba( %1$s, %2$s, %3$s, 0.3)', $color_textcolor_rgb ),
+		'secondary_textcolor'         => vsprintf('rgba( %1$s, %2$s, %3$s, 0.7)', $color_textcolor_rgb),
+		'border_color'                => vsprintf('rgba( %1$s, %2$s, %3$s, 0.1)', $color_textcolor_rgb),
+		'border_focus_color'          => vsprintf('rgba( %1$s, %2$s, %3$s, 0.3)', $color_textcolor_rgb),
 		'sidebar_textcolor'           => $color_scheme[4],
-		'sidebar_border_color'        => vsprintf( 'rgba( %1$s, %2$s, %3$s, 0.1)', $color_sidebar_textcolor_rgb ),
-		'sidebar_border_focus_color'  => vsprintf( 'rgba( %1$s, %2$s, %3$s, 0.3)', $color_sidebar_textcolor_rgb ),
-		'secondary_sidebar_textcolor' => vsprintf( 'rgba( %1$s, %2$s, %3$s, 0.7)', $color_sidebar_textcolor_rgb ),
+		'sidebar_border_color'        => vsprintf('rgba( %1$s, %2$s, %3$s, 0.1)', $color_sidebar_textcolor_rgb),
+		'sidebar_border_focus_color'  => vsprintf('rgba( %1$s, %2$s, %3$s, 0.3)', $color_sidebar_textcolor_rgb),
+		'secondary_sidebar_textcolor' => vsprintf('rgba( %1$s, %2$s, %3$s, 0.7)', $color_sidebar_textcolor_rgb),
 		'meta_box_background_color'   => $color_scheme[5],
 	);
 
-	$color_scheme_css = twentyfifteen_get_color_scheme_css( $colors );
+	$color_scheme_css = twentyfifteen_get_color_scheme_css($colors);
 
-	wp_add_inline_style( 'twentyfifteen-style', $color_scheme_css );
+	wp_add_inline_style('twentyfifteen-style', $color_scheme_css);
 }
-add_action( 'wp_enqueue_scripts', 'twentyfifteen_color_scheme_css' );
+add_action('wp_enqueue_scripts', 'twentyfifteen_color_scheme_css');
 
 /**
  * Binds JS listener to make Customizer color_scheme control.
@@ -324,10 +324,10 @@ 
  * @since Twenty Fifteen 1.0
  */
 function twentyfifteen_customize_control_js() {
-	wp_enqueue_script( 'color-scheme-control', get_template_directory_uri() . '/js/color-scheme-control.js', array( 'customize-controls', 'iris', 'underscore', 'wp-util' ), '20141216', true );
-	wp_localize_script( 'color-scheme-control', 'colorScheme', twentyfifteen_get_color_schemes() );
+	wp_enqueue_script('color-scheme-control', get_template_directory_uri().'/js/color-scheme-control.js', array('customize-controls', 'iris', 'underscore', 'wp-util'), '20141216', true);
+	wp_localize_script('color-scheme-control', 'colorScheme', twentyfifteen_get_color_schemes());
 }
-add_action( 'customize_controls_enqueue_scripts', 'twentyfifteen_customize_control_js' );
+add_action('customize_controls_enqueue_scripts', 'twentyfifteen_customize_control_js');
 
 /**
  * Binds JS handlers to make the Customizer preview reload changes asynchronously.
@@ -335,9 +335,9 @@ 
  * @since Twenty Fifteen 1.0
  */
 function twentyfifteen_customize_preview_js() {
-	wp_enqueue_script( 'twentyfifteen-customize-preview', get_template_directory_uri() . '/js/customize-preview.js', array( 'customize-preview' ), '20141216', true );
+	wp_enqueue_script('twentyfifteen-customize-preview', get_template_directory_uri().'/js/customize-preview.js', array('customize-preview'), '20141216', true);
 }
-add_action( 'customize_preview_init', 'twentyfifteen_customize_preview_js' );
+add_action('customize_preview_init', 'twentyfifteen_customize_preview_js');
 
 /**
  * Returns CSS for the color schemes.
@@ -347,8 +347,8 @@ 
  * @param array $colors Color scheme colors.
  * @return string Color scheme CSS.
  */
-function twentyfifteen_get_color_scheme_css( $colors ) {
-	$colors = wp_parse_args( $colors, array(
+function twentyfifteen_get_color_scheme_css($colors) {
+	$colors = wp_parse_args($colors, array(
 		'background_color'            => '',
 		'header_background_color'     => '',
 		'box_background_color'        => '',
@@ -361,7 +361,7 @@ 
 		'sidebar_border_focus_color'  => '',
 		'secondary_sidebar_textcolor' => '',
 		'meta_box_background_color'   => '',
-	) );
+	));
 
 	$css = <<<CSS
 	/* Color Scheme */
@@ -766,8 +766,8 @@ 
 	);
 	?>
 	<script type="text/html" id="tmpl-twentyfifteen-color-scheme">
-		<?php echo twentyfifteen_get_color_scheme_css( $colors ); ?>
+		<?php echo twentyfifteen_get_color_scheme_css($colors); ?>
 	</script>
 	<?php
 }
-add_action( 'customize_controls_print_footer_scripts', 'twentyfifteen_color_scheme_css_template' );
+add_action('customize_controls_print_footer_scripts', 'twentyfifteen_color_scheme_css_template');

src/wp-admin/widgets.php

Braces +45 added lines, -30 removed lines

@@ -31,9 +31,10 @@ 
 } else {
 	wp_enqueue_script('admin-widgets');
 
-	if ( wp_is_mobile() )
-		wp_enqueue_script( 'jquery-touch-punch' );
-}
+	if ( wp_is_mobile() ) {
+			wp_enqueue_script( 'jquery-touch-punch' );
+	}
+	}
 
 /**
  * Fires early before the Widgets administration screen loads,
@@ -82,12 +83,14 @@ 
 // These are the widgets grouped by sidebar
 $sidebars_widgets = wp_get_sidebars_widgets();
 
-if ( empty( $sidebars_widgets ) )
+if ( empty( $sidebars_widgets ) ) {
 	$sidebars_widgets = wp_get_widget_defaults();
+}
 
 foreach ( $sidebars_widgets as $sidebar_id => $widgets ) {
-	if ( 'wp_inactive_widgets' == $sidebar_id )
-		continue;
+	if ( 'wp_inactive_widgets' == $sidebar_id ) {
+			continue;
+	}
 
 	if ( ! is_registered_sidebar( $sidebar_id ) ) {
 		if ( ! empty( $widgets ) ) { // register the inactive_widgets area as sidebar
@@ -168,8 +171,9 @@ 
 	$_POST['widget-id'] = $sidebar;
 
 	foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
-		if ( $name != $id_base || !is_callable($control['callback']) )
-			continue;
+		if ( $name != $id_base || !is_callable($control['callback']) ) {
+					continue;
+		}
 
 		ob_start();
 			call_user_func_array( $control['callback'], $control['params'] );
@@ -183,8 +187,9 @@ 
 	// Remove old position.
 	if ( !isset($_POST['delete_widget']) ) {
 		foreach ( $sidebars_widgets as $key => $sb ) {
-			if ( is_array($sb) )
-				$sidebars_widgets[$key] = array_diff( $sb, array($widget_id) );
+			if ( is_array($sb) ) {
+							$sidebars_widgets[$key] = array_diff( $sb, array($widget_id) );
+			}
 		}
 		array_splice( $sidebars_widgets[$sidebar_id], $position, 0, $widget_id );
 	}
@@ -247,14 +252,17 @@ 
 		$name = esc_html( strip_tags($wp_registered_widgets[$widget_id]['name']) );
 	}
 
-	if ( !isset($name) )
-		$name = esc_html( strip_tags($control['name']) );
+	if ( !isset($name) ) {
+			$name = esc_html( strip_tags($control['name']) );
+	}
 
-	if ( !isset($sidebar) )
-		$sidebar = isset($_GET['sidebar']) ? $_GET['sidebar'] : 'wp_inactive_widgets';
+	if ( !isset($sidebar) ) {
+			$sidebar = isset($_GET['sidebar']) ? $_GET['sidebar'] : 'wp_inactive_widgets';
+	}
 
-	if ( !isset($multi_number) )
-		$multi_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
+	if ( !isset($multi_number) ) {
+			$multi_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
+	}
 
 	$id_base = isset($control['id_base']) ? $control['id_base'] : $control['id'];
 
@@ -271,10 +279,12 @@ 
 	<form action="widgets.php" method="post">
 	<div class="widget-inside">
 <?php
-	if ( is_callable( $control_callback ) )
-		call_user_func_array( $control_callback, $control['params'] );
-	else
-		echo '<p>' . __('There are no options for this widget.') . "</p>\n"; ?>
+	if ( is_callable( $control_callback ) ) {
+			call_user_func_array( $control_callback, $control['params'] );
+	} else {
+			echo '<p>' . __('There are no options for this widget.') . "</p>\n";
+	}
+	?>
 	</div>
 
 	<p class="describe"><?php _e('Select both the sidebar for this widget and the position of the widget in that sidebar.'); ?></p>
@@ -291,15 +301,17 @@ 
 				$sidebars_widgets[$sbname] = array();
 			} else {
 				$j = count($sidebars_widgets[$sbname]);
-				if ( isset($_GET['addnew']) || !in_array($widget_id, $sidebars_widgets[$sbname], true) )
-					$j++;
+				if ( isset($_GET['addnew']) || !in_array($widget_id, $sidebars_widgets[$sbname], true) ) {
+									$j++;
+				}
 			}
 			$selected = '';
 			echo "\t\t<select name='{$sbname}_position'>\n";
 			echo "\t\t<option value=''>" . __('&mdash; Select &mdash;') . "</option>\n";
 			for ( $i = 1; $i <= $j; $i++ ) {
-				if ( in_array($widget_id, $sidebars_widgets[$sbname], true) )
-					$selected = selected( $i, $key + 1, false );
+				if ( in_array($widget_id, $sidebars_widgets[$sbname], true) ) {
+									$selected = selected( $i, $key + 1, false );
+				}
 				echo "\t\t<option value='$i'$selected> $i </option>\n";
 			}
 			echo "\t\t</select>\n";
@@ -403,8 +415,9 @@ 
 foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
 	if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
 		$wrap_class = 'widgets-holder-wrap';
-		if ( !empty( $registered_sidebar['class'] ) )
-			$wrap_class .= ' ' . $registered_sidebar['class'];
+		if ( !empty( $registered_sidebar['class'] ) ) {
+					$wrap_class .= ' ' . $registered_sidebar['class'];
+		}
 
 		$is_inactive_widgets = 'wp_inactive_widgets' == $registered_sidebar['id'];
 		?>
@@ -466,11 +479,13 @@ 
 
 foreach ( $theme_sidebars as $sidebar => $registered_sidebar ) {
 	$wrap_class = 'widgets-holder-wrap';
-	if ( !empty( $registered_sidebar['class'] ) )
-		$wrap_class .= ' sidebar-' . $registered_sidebar['class'];
+	if ( !empty( $registered_sidebar['class'] ) ) {
+			$wrap_class .= ' sidebar-' . $registered_sidebar['class'];
+	}
 
-	if ( $i > 0 )
-		$wrap_class .= ' closed';
+	if ( $i > 0 ) {
+			$wrap_class .= ' closed';
+	}
 
 	if ( $split && $i == $split ) {
 		?>

Spacing +153 added lines, -153 removed lines

@@ -7,34 +7,34 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 /** WordPress Administration Widgets API */
-require_once(ABSPATH . 'wp-admin/includes/widgets.php');
+require_once(ABSPATH.'wp-admin/includes/widgets.php');
 
-if ( ! current_user_can( 'edit_theme_options' ) ) {
+if ( ! current_user_can('edit_theme_options')) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to edit theme options on this site.').'</p>',
 		403
 	);
 }
 
-$widgets_access = get_user_setting( 'widgets_access' );
-if ( isset($_GET['widgets-access']) ) {
-	check_admin_referer( 'widgets-access' );
+$widgets_access = get_user_setting('widgets_access');
+if (isset($_GET['widgets-access'])) {
+	check_admin_referer('widgets-access');
 
 	$widgets_access = 'on' == $_GET['widgets-access'] ? 'on' : 'off';
-	set_user_setting( 'widgets_access', $widgets_access );
+	set_user_setting('widgets_access', $widgets_access);
 }
 
-if ( 'on' == $widgets_access ) {
-	add_filter( 'admin_body_class', 'wp_widgets_access_body_class' );
+if ('on' == $widgets_access) {
+	add_filter('admin_body_class', 'wp_widgets_access_body_class');
 } else {
 	wp_enqueue_script('admin-widgets');
 
-	if ( wp_is_mobile() )
-		wp_enqueue_script( 'jquery-touch-punch' );
+	if (wp_is_mobile())
+		wp_enqueue_script('jquery-touch-punch');
 }
 
 /**
@@ -43,68 +43,68 @@ 
  *
  * @since 2.2.0
  */
-do_action( 'sidebar_admin_setup' );
+do_action('sidebar_admin_setup');
 
-$title = __( 'Widgets' );
+$title = __('Widgets');
 $parent_file = 'themes.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . __('Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them.') . '</p>
-	<p>' . __('The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget.') . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them.').'</p>
+	<p>' . __('The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'removing-reusing',
 'title'		=> __('Removing and Reusing'),
 'content'	=>
-	'<p>' . __('If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas.') . '</p>
-	<p>' . __('Widgets may be used multiple times. You can give each widget a title, to display on your site, but it&#8217;s not required.') . '</p>
-	<p>' . __('Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.') . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas.').'</p>
+	<p>' . __('Widgets may be used multiple times. You can give each widget a title, to display on your site, but it&#8217;s not required.').'</p>
+	<p>' . __('Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'missing-widgets',
 'title'		=> __('Missing Widgets'),
 'content'	=>
-	'<p>' . __('Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area.') . '</p>' .
-		'<p>' . __('When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive Widgets area, where all of your widgets and their settings will have been saved.') . '</p>'
-) );
+	'<p>'.__('Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area.').'</p>'.
+		'<p>'.__('When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive Widgets area, where all of your widgets and their settings will have been saved.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Appearance_Widgets_Screen">Documentation on Widgets</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Appearance_Widgets_Screen">Documentation on Widgets</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
-if ( ! current_theme_supports( 'widgets' ) ) {
-	wp_die( __( 'The theme you are currently using isn&#8217;t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="https://codex.wordpress.org/Widgetizing_Themes">follow these instructions</a>.' ) );
+if ( ! current_theme_supports('widgets')) {
+	wp_die(__('The theme you are currently using isn&#8217;t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="https://codex.wordpress.org/Widgetizing_Themes">follow these instructions</a>.'));
 }
 
 // These are the widgets grouped by sidebar
 $sidebars_widgets = wp_get_sidebars_widgets();
 
-if ( empty( $sidebars_widgets ) )
+if (empty($sidebars_widgets))
 	$sidebars_widgets = wp_get_widget_defaults();
 
-foreach ( $sidebars_widgets as $sidebar_id => $widgets ) {
-	if ( 'wp_inactive_widgets' == $sidebar_id )
+foreach ($sidebars_widgets as $sidebar_id => $widgets) {
+	if ('wp_inactive_widgets' == $sidebar_id)
 		continue;
 
-	if ( ! is_registered_sidebar( $sidebar_id ) ) {
-		if ( ! empty( $widgets ) ) { // register the inactive_widgets area as sidebar
+	if ( ! is_registered_sidebar($sidebar_id)) {
+		if ( ! empty($widgets)) { // register the inactive_widgets area as sidebar
 			register_sidebar(array(
-				'name' => __( 'Inactive Sidebar (not used)' ),
+				'name' => __('Inactive Sidebar (not used)'),
 				'id' => $sidebar_id,
 				'class' => 'inactive-sidebar orphan-sidebar',
-				'description' => __( 'This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar.' ),
+				'description' => __('This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar.'),
 				'before_widget' => '',
 				'after_widget' => '',
 				'before_title' => '',
 				'after_title' => '',
 			));
 		} else {
-			unset( $sidebars_widgets[ $sidebar_id ] );
+			unset($sidebars_widgets[$sidebar_id]);
 		}
 	}
 }
@@ -114,7 +114,7 @@ 
 	'name' => __('Inactive Widgets'),
 	'id' => 'wp_inactive_widgets',
 	'class' => 'inactive-sidebar',
-	'description' => __( 'Drag widgets here to remove them from the sidebar but keep their settings.' ),
+	'description' => __('Drag widgets here to remove them from the sidebar but keep their settings.'),
 	'before_widget' => '',
 	'after_widget' => '',
 	'before_title' => '',
@@ -124,36 +124,36 @@ 
 retrieve_widgets();
 
 // We're saving a widget without js
-if ( isset($_POST['savewidget']) || isset($_POST['removewidget']) ) {
+if (isset($_POST['savewidget']) || isset($_POST['removewidget'])) {
 	$widget_id = $_POST['widget-id'];
 	check_admin_referer("save-delete-widget-$widget_id");
 
 	$number = isset($_POST['multi_number']) ? (int) $_POST['multi_number'] : '';
-	if ( $number ) {
-		foreach ( $_POST as $key => $val ) {
-			if ( is_array($val) && preg_match('/__i__|%i%/', key($val)) ) {
-				$_POST[$key] = array( $number => array_shift($val) );
+	if ($number) {
+		foreach ($_POST as $key => $val) {
+			if (is_array($val) && preg_match('/__i__|%i%/', key($val))) {
+				$_POST[$key] = array($number => array_shift($val));
 				break;
 			}
 		}
 	}
 
 	$sidebar_id = $_POST['sidebar'];
-	$position = isset($_POST[$sidebar_id . '_position']) ? (int) $_POST[$sidebar_id . '_position'] - 1 : 0;
+	$position = isset($_POST[$sidebar_id.'_position']) ? (int) $_POST[$sidebar_id.'_position'] - 1 : 0;
 
 	$id_base = $_POST['id_base'];
 	$sidebar = isset($sidebars_widgets[$sidebar_id]) ? $sidebars_widgets[$sidebar_id] : array();
 
 	// Delete.
-	if ( isset($_POST['removewidget']) && $_POST['removewidget'] ) {
+	if (isset($_POST['removewidget']) && $_POST['removewidget']) {
 
-		if ( !in_array($widget_id, $sidebar, true) ) {
-			wp_redirect( admin_url('widgets.php?error=0') );
+		if ( ! in_array($widget_id, $sidebar, true)) {
+			wp_redirect(admin_url('widgets.php?error=0'));
 			exit;
 		}
 
-		$sidebar = array_diff( $sidebar, array($widget_id) );
-		$_POST = array('sidebar' => $sidebar_id, 'widget-' . $id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
+		$sidebar = array_diff($sidebar, array($widget_id));
+		$_POST = array('sidebar' => $sidebar_id, 'widget-'.$id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
 
 		/**
 		 * Fires immediately after a widget has been marked for deletion.
@@ -164,17 +164,17 @@ 
 		 * @param string $sidebar_id ID of the sidebar the widget was deleted from.
 		 * @param string $id_base    ID base for the widget.
 		 */
-		do_action( 'delete_widget', $widget_id, $sidebar_id, $id_base );
+		do_action('delete_widget', $widget_id, $sidebar_id, $id_base);
 	}
 
 	$_POST['widget-id'] = $sidebar;
 
-	foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
-		if ( $name != $id_base || !is_callable($control['callback']) )
+	foreach ((array) $wp_registered_widget_updates as $name => $control) {
+		if ($name != $id_base || ! is_callable($control['callback']))
 			continue;
 
 		ob_start();
-			call_user_func_array( $control['callback'], $control['params'] );
+			call_user_func_array($control['callback'], $control['params']);
 		ob_end_clean();
 
 		break;
@@ -183,58 +183,58 @@ 
 	$sidebars_widgets[$sidebar_id] = $sidebar;
 
 	// Remove old position.
-	if ( !isset($_POST['delete_widget']) ) {
-		foreach ( $sidebars_widgets as $key => $sb ) {
-			if ( is_array($sb) )
-				$sidebars_widgets[$key] = array_diff( $sb, array($widget_id) );
+	if ( ! isset($_POST['delete_widget'])) {
+		foreach ($sidebars_widgets as $key => $sb) {
+			if (is_array($sb))
+				$sidebars_widgets[$key] = array_diff($sb, array($widget_id));
 		}
-		array_splice( $sidebars_widgets[$sidebar_id], $position, 0, $widget_id );
+		array_splice($sidebars_widgets[$sidebar_id], $position, 0, $widget_id);
 	}
 
 	wp_set_sidebars_widgets($sidebars_widgets);
-	wp_redirect( admin_url('widgets.php?message=0') );
+	wp_redirect(admin_url('widgets.php?message=0'));
 	exit;
 }
 
 // Remove inactive widgets without js
-if ( isset( $_POST['removeinactivewidgets'] ) ) {
-	check_admin_referer( 'remove-inactive-widgets', '_wpnonce_remove_inactive_widgets' );
-
-	if ( $_POST['removeinactivewidgets'] ) {
-		foreach ( $sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id ) {
-			$pieces = explode( '-', $widget_id );
-			$multi_number = array_pop( $pieces );
-			$id_base = implode( '-', $pieces );
-			$widget = get_option( 'widget_' . $id_base );
-			unset( $widget[$multi_number] );
-			update_option( 'widget_' . $id_base, $widget );
-			unset( $sidebars_widgets['wp_inactive_widgets'][$key] );
+if (isset($_POST['removeinactivewidgets'])) {
+	check_admin_referer('remove-inactive-widgets', '_wpnonce_remove_inactive_widgets');
+
+	if ($_POST['removeinactivewidgets']) {
+		foreach ($sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id) {
+			$pieces = explode('-', $widget_id);
+			$multi_number = array_pop($pieces);
+			$id_base = implode('-', $pieces);
+			$widget = get_option('widget_'.$id_base);
+			unset($widget[$multi_number]);
+			update_option('widget_'.$id_base, $widget);
+			unset($sidebars_widgets['wp_inactive_widgets'][$key]);
 		}
 
-		wp_set_sidebars_widgets( $sidebars_widgets );
+		wp_set_sidebars_widgets($sidebars_widgets);
 	}
 
-	wp_redirect( admin_url( 'widgets.php?message=0' ) );
+	wp_redirect(admin_url('widgets.php?message=0'));
 	exit;
 }
 
 // Output the widget form without js
-if ( isset($_GET['editwidget']) && $_GET['editwidget'] ) {
+if (isset($_GET['editwidget']) && $_GET['editwidget']) {
 	$widget_id = $_GET['editwidget'];
 
-	if ( isset($_GET['addnew']) ) {
+	if (isset($_GET['addnew'])) {
 		// Default to the first sidebar
-		$keys = array_keys( $wp_registered_sidebars );
-		$sidebar = reset( $keys );
+		$keys = array_keys($wp_registered_sidebars);
+		$sidebar = reset($keys);
 
-		if ( isset($_GET['base']) && isset($_GET['num']) ) { // multi-widget
+		if (isset($_GET['base']) && isset($_GET['num'])) { // multi-widget
 			// Copy minimal info from an existing instance of this widget to a new instance
-			foreach ( $wp_registered_widget_controls as $control ) {
-				if ( $_GET['base'] === $control['id_base'] ) {
+			foreach ($wp_registered_widget_controls as $control) {
+				if ($_GET['base'] === $control['id_base']) {
 					$control_callback = $control['callback'];
 					$multi_number = (int) $_GET['num'];
 					$control['params'][0]['number'] = -1;
-					$widget_id = $control['id'] = $control['id_base'] . '-' . $multi_number;
+					$widget_id = $control['id'] = $control['id_base'].'-'.$multi_number;
 					$wp_registered_widget_controls[$control['id']] = $control;
 					break;
 				}
@@ -242,66 +242,66 @@ 
 		}
 	}
 
-	if ( isset($wp_registered_widget_controls[$widget_id]) && !isset($control) ) {
+	if (isset($wp_registered_widget_controls[$widget_id]) && ! isset($control)) {
 		$control = $wp_registered_widget_controls[$widget_id];
 		$control_callback = $control['callback'];
-	} elseif ( !isset($wp_registered_widget_controls[$widget_id]) && isset($wp_registered_widgets[$widget_id]) ) {
-		$name = esc_html( strip_tags($wp_registered_widgets[$widget_id]['name']) );
+	} elseif ( ! isset($wp_registered_widget_controls[$widget_id]) && isset($wp_registered_widgets[$widget_id])) {
+		$name = esc_html(strip_tags($wp_registered_widgets[$widget_id]['name']));
 	}
 
-	if ( !isset($name) )
-		$name = esc_html( strip_tags($control['name']) );
+	if ( ! isset($name))
+		$name = esc_html(strip_tags($control['name']));
 
-	if ( !isset($sidebar) )
+	if ( ! isset($sidebar))
 		$sidebar = isset($_GET['sidebar']) ? $_GET['sidebar'] : 'wp_inactive_widgets';
 
-	if ( !isset($multi_number) )
+	if ( ! isset($multi_number))
 		$multi_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
 
 	$id_base = isset($control['id_base']) ? $control['id_base'] : $control['id'];
 
 	// Show the widget form.
-	$width = ' style="width:' . max($control['width'], 350) . 'px"';
+	$width = ' style="width:'.max($control['width'], 350).'px"';
 	$key = isset($_GET['key']) ? (int) $_GET['key'] : 0;
 
-	require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
+	require_once(ABSPATH.'wp-admin/admin-header.php'); ?>
 	<div class="wrap">
-	<h1><?php echo esc_html( $title ); ?></h1>
+	<h1><?php echo esc_html($title); ?></h1>
 	<div class="editwidget"<?php echo $width; ?>>
-	<h2><?php printf( __( 'Widget %s' ), $name ); ?></h2>
+	<h2><?php printf(__('Widget %s'), $name); ?></h2>
 
 	<form action="widgets.php" method="post">
 	<div class="widget-inside">
 <?php
-	if ( is_callable( $control_callback ) )
-		call_user_func_array( $control_callback, $control['params'] );
+	if (is_callable($control_callback))
+		call_user_func_array($control_callback, $control['params']);
 	else
-		echo '<p>' . __('There are no options for this widget.') . "</p>\n"; ?>
+		echo '<p>'.__('There are no options for this widget.')."</p>\n"; ?>
 	</div>
 
 	<p class="describe"><?php _e('Select both the sidebar for this widget and the position of the widget in that sidebar.'); ?></p>
 	<div class="widget-position">
 	<table class="widefat"><thead><tr><th><?php _e('Sidebar'); ?></th><th><?php _e('Position'); ?></th></tr></thead><tbody>
 <?php
-	foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
-		echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr($sbname) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
-		if ( 'wp_inactive_widgets' == $sbname || 'orphaned_widgets' == substr( $sbname, 0, 16 ) ) {
+	foreach ($wp_registered_sidebars as $sbname => $sbvalue) {
+		echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='".esc_attr($sbname)."'".checked($sbname, $sidebar, false)." /> $sbvalue[name]</label></td><td>";
+		if ('wp_inactive_widgets' == $sbname || 'orphaned_widgets' == substr($sbname, 0, 16)) {
 			echo '&nbsp;';
 		} else {
-			if ( !isset($sidebars_widgets[$sbname]) || !is_array($sidebars_widgets[$sbname]) ) {
+			if ( ! isset($sidebars_widgets[$sbname]) || ! is_array($sidebars_widgets[$sbname])) {
 				$j = 1;
 				$sidebars_widgets[$sbname] = array();
 			} else {
 				$j = count($sidebars_widgets[$sbname]);
-				if ( isset($_GET['addnew']) || !in_array($widget_id, $sidebars_widgets[$sbname], true) )
+				if (isset($_GET['addnew']) || ! in_array($widget_id, $sidebars_widgets[$sbname], true))
 					$j++;
 			}
 			$selected = '';
 			echo "\t\t<select name='{$sbname}_position'>\n";
-			echo "\t\t<option value=''>" . __('&mdash; Select &mdash;') . "</option>\n";
-			for ( $i = 1; $i <= $j; $i++ ) {
-				if ( in_array($widget_id, $sidebars_widgets[$sbname], true) )
-					$selected = selected( $i, $key + 1, false );
+			echo "\t\t<option value=''>".__('&mdash; Select &mdash;')."</option>\n";
+			for ($i = 1; $i <= $j; $i++) {
+				if (in_array($widget_id, $sidebars_widgets[$sbname], true))
+					$selected = selected($i, $key + 1, false);
 				echo "\t\t<option value='$i'$selected> $i </option>\n";
 			}
 			echo "\t\t</select>\n";
@@ -313,13 +313,13 @@ 
 
 	<div class="widget-control-actions">
 <?php
-	if ( isset($_GET['addnew']) ) { ?>
+	if (isset($_GET['addnew'])) { ?>
 	<a href="widgets.php" class="button alignleft"><?php _e('Cancel'); ?></a>
 <?php
 	} else {
-		submit_button( __( 'Delete' ), 'alignleft', 'removewidget', false );
+		submit_button(__('Delete'), 'alignleft', 'removewidget', false);
 	}
-	submit_button( __( 'Save Widget' ), 'primary alignright', 'savewidget', false ); ?>
+	submit_button(__('Save Widget'), 'primary alignright', 'savewidget', false); ?>
 	<input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($widget_id); ?>" />
 	<input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
 	<input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />
@@ -330,7 +330,7 @@ 
 	</div>
 	</div>
 <?php
-	require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+	require_once(ABSPATH.'wp-admin/admin-footer.php');
 	exit;
 }
 
@@ -343,35 +343,35 @@ 
 	__('Error in displaying the widget settings form.')
 );
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
+require_once(ABSPATH.'wp-admin/admin-header.php'); ?>
 
 <div class="wrap">
 <h1 class="wp-heading-inline"><?php
-echo esc_html( $title );
+echo esc_html($title);
 ?></h1>
 
 <?php
-if ( current_user_can( 'customize' ) ) {
+if (current_user_can('customize')) {
 	printf(
 		' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
-		esc_url( add_query_arg(
+		esc_url(add_query_arg(
 			array(
-				array( 'autofocus' => array( 'panel' => 'widgets' ) ),
-				'return' => urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) )
+				array('autofocus' => array('panel' => 'widgets')),
+				'return' => urlencode(remove_query_arg(wp_removable_query_args(), wp_unslash($_SERVER['REQUEST_URI'])))
 			),
-			admin_url( 'customize.php' )
-		) ),
-		__( 'Manage with Live Preview' )
+			admin_url('customize.php')
+		)),
+		__('Manage with Live Preview')
 	);
 }
 ?>
 
 <hr class="wp-header-end">
 
-<?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?>
+<?php if (isset($_GET['message']) && isset($messages[$_GET['message']])) { ?>
 <div id="message" class="updated notice is-dismissible"><p><?php echo $messages[$_GET['message']]; ?></p></div>
 <?php } ?>
-<?php if ( isset($_GET['error']) && isset($errors[$_GET['error']]) ) { ?>
+<?php if (isset($_GET['error']) && isset($errors[$_GET['error']])) { ?>
 <div id="message" class="error"><p><?php echo $errors[$_GET['error']]; ?></p></div>
 <?php } ?>
 
@@ -381,14 +381,14 @@ 
  *
  * @since 3.0.0
  */
-do_action( 'widgets_admin_page' ); ?>
+do_action('widgets_admin_page'); ?>
 
 <div class="widget-liquid-left">
 <div id="widgets-left">
 	<div id="available-widgets" class="widgets-holder-wrap">
 		<div class="sidebar-name">
 			<div class="sidebar-name-arrow"><br /></div>
-			<h2><?php _e( 'Available Widgets' ); ?> <span id="removing-widget"><?php _ex( 'Deactivate', 'removing-widget' ); ?> <span></span></span></h2>
+			<h2><?php _e('Available Widgets'); ?> <span id="removing-widget"><?php _ex('Deactivate', 'removing-widget'); ?> <span></span></span></h2>
 		</div>
 		<div class="widget-holder">
 			<div class="sidebar-description">
@@ -405,40 +405,40 @@ 
 <?php
 
 $theme_sidebars = array();
-foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
-	if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
+foreach ($wp_registered_sidebars as $sidebar => $registered_sidebar) {
+	if (false !== strpos($registered_sidebar['class'], 'inactive-sidebar') || 'orphaned_widgets' == substr($sidebar, 0, 16)) {
 		$wrap_class = 'widgets-holder-wrap';
-		if ( !empty( $registered_sidebar['class'] ) )
-			$wrap_class .= ' ' . $registered_sidebar['class'];
+		if ( ! empty($registered_sidebar['class']))
+			$wrap_class .= ' '.$registered_sidebar['class'];
 
 		$is_inactive_widgets = 'wp_inactive_widgets' == $registered_sidebar['id'];
 		?>
-		<div class="<?php echo esc_attr( $wrap_class ); ?>">
+		<div class="<?php echo esc_attr($wrap_class); ?>">
 			<div class="widget-holder inactive">
-				<?php wp_list_widget_controls( $registered_sidebar['id'], $registered_sidebar['name'] ); ?>
+				<?php wp_list_widget_controls($registered_sidebar['id'], $registered_sidebar['name']); ?>
 
-				<?php if ( $is_inactive_widgets ) { ?>
+				<?php if ($is_inactive_widgets) { ?>
 				<div class="remove-inactive-widgets">
 					<form action="" method="post">
 						<p>
 							<?php
-							$attributes = array( 'id' => 'inactive-widgets-control-remove' );
+							$attributes = array('id' => 'inactive-widgets-control-remove');
 
-							if ( empty($sidebars_widgets['wp_inactive_widgets']) ) {
+							if (empty($sidebars_widgets['wp_inactive_widgets'])) {
 								$attributes['disabled'] = '';
 							}
 
-							submit_button( __( 'Clear Inactive Widgets' ), 'delete', 'removeinactivewidgets', false, $attributes );
+							submit_button(__('Clear Inactive Widgets'), 'delete', 'removeinactivewidgets', false, $attributes);
 							?>
 							<span class="spinner"></span>
 						</p>
-						<?php wp_nonce_field( 'remove-inactive-widgets', '_wpnonce_remove_inactive_widgets' ); ?>
+						<?php wp_nonce_field('remove-inactive-widgets', '_wpnonce_remove_inactive_widgets'); ?>
 					</form>
 				</div>
 				<?php } ?>
 			</div>
-			<?php if ( $is_inactive_widgets ) { ?>
-			<p class="description"><?php _e( 'This will clear all items from the inactive widgets list. You will not be able to restore any customizations.' ); ?></p>
+			<?php if ($is_inactive_widgets) { ?>
+			<p class="description"><?php _e('This will clear all items from the inactive widgets list. You will not be able to restore any customizations.'); ?></p>
 			<?php } ?>
 		</div>
 		<?php
@@ -455,10 +455,10 @@ 
 
 $i = $split = 0;
 $single_sidebar_class = '';
-$sidebars_count = count( $theme_sidebars );
+$sidebars_count = count($theme_sidebars);
 
-if ( $sidebars_count > 1 ) {
-	$split = ceil( $sidebars_count / 2 );
+if ($sidebars_count > 1) {
+	$split = ceil($sidebars_count / 2);
 } else {
 	$single_sidebar_class = ' single-sidebar';
 }
@@ -469,23 +469,23 @@ 
 <div class="sidebars-column-1">
 <?php
 
-foreach ( $theme_sidebars as $sidebar => $registered_sidebar ) {
+foreach ($theme_sidebars as $sidebar => $registered_sidebar) {
 	$wrap_class = 'widgets-holder-wrap';
-	if ( !empty( $registered_sidebar['class'] ) )
-		$wrap_class .= ' sidebar-' . $registered_sidebar['class'];
+	if ( ! empty($registered_sidebar['class']))
+		$wrap_class .= ' sidebar-'.$registered_sidebar['class'];
 
-	if ( $i > 0 )
+	if ($i > 0)
 		$wrap_class .= ' closed';
 
-	if ( $split && $i == $split ) {
+	if ($split && $i == $split) {
 		?>
 		</div><div class="sidebars-column-2">
 		<?php
 	}
 
 	?>
-	<div class="<?php echo esc_attr( $wrap_class ); ?>">
-		<?php wp_list_widget_controls( $sidebar, $registered_sidebar['name'] ); // Show the control forms for each of the widgets in this sidebar ?>
+	<div class="<?php echo esc_attr($wrap_class); ?>">
+		<?php wp_list_widget_controls($sidebar, $registered_sidebar['name']); // Show the control forms for each of the widgets in this sidebar ?>
 	</div>
 	<?php
 
@@ -497,7 +497,7 @@ 
 </div>
 </div>
 <form method="post">
-<?php wp_nonce_field( 'save-sidebar-widgets', '_wpnonce_widgets', false ); ?>
+<?php wp_nonce_field('save-sidebar-widgets', '_wpnonce_widgets', false); ?>
 </form>
 <br class="clear" />
 </div>
@@ -505,8 +505,8 @@ 
 <div class="widgets-chooser">
 	<ul class="widgets-chooser-sidebars"></ul>
 	<div class="widgets-chooser-actions">
-		<button class="button widgets-chooser-cancel"><?php _e( 'Cancel' ); ?></button>
-		<button class="button button-primary widgets-chooser-add"><?php _e( 'Add Widget' ); ?></button>
+		<button class="button widgets-chooser-cancel"><?php _e('Cancel'); ?></button>
+		<button class="button button-primary widgets-chooser-add"><?php _e('Add Widget'); ?></button>
 	</div>
 </div>
 
@@ -517,5 +517,5 @@ 
  *
  * @since 2.2.0
  */
-do_action( 'sidebar_admin_page' );
-require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+do_action('sidebar_admin_page');
+require_once(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/load-styles.php

Braces +5 added lines, -3 removed lines

@@ -22,8 +22,9 @@ 
 $load = preg_replace( '/[^a-z0-9,_-]+/i', '', $load );
 $load = array_unique( explode( ',', $load ) );
 
-if ( empty($load) )
+if ( empty($load) ) {
 	exit;
+}
 
 $compress = ( isset($_GET['c']) && $_GET['c'] );
 $force_gzip = ( $compress && 'gzip' == $_GET['c'] );
@@ -44,8 +45,9 @@ 
 }
 
 foreach ( $load as $handle ) {
-	if ( !array_key_exists($handle, $wp_styles->registered) )
-		continue;
+	if ( !array_key_exists($handle, $wp_styles->registered) ) {
+			continue;
+	}
 
 	$style = $wp_styles->registered[$handle];
 

Spacing +35 added lines, -35 removed lines

@@ -8,86 +8,86 @@
 error_reporting(0);
 
 /** Set ABSPATH for execution */
-if ( ! defined( 'ABSPATH' ) ) {
-	define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );
+if ( ! defined('ABSPATH')) {
+	define('ABSPATH', dirname(dirname(__FILE__)).'/');
 }
 
-define( 'WPINC', 'wp-includes' );
+define('WPINC', 'wp-includes');
 
-require( ABSPATH . 'wp-admin/includes/noop.php' );
-require( ABSPATH . WPINC . '/script-loader.php' );
-require( ABSPATH . WPINC . '/version.php' );
+require(ABSPATH.'wp-admin/includes/noop.php');
+require(ABSPATH.WPINC.'/script-loader.php');
+require(ABSPATH.WPINC.'/version.php');
 
 $load = $_GET['load'];
-if ( is_array( $load ) ) {
-	$load = implode( '', $load );
+if (is_array($load)) {
+	$load = implode('', $load);
 }
-$load = preg_replace( '/[^a-z0-9,_-]+/i', '', $load );
-$load = array_unique( explode( ',', $load ) );
+$load = preg_replace('/[^a-z0-9,_-]+/i', '', $load);
+$load = array_unique(explode(',', $load));
 
-if ( empty($load) )
+if (empty($load))
 	exit;
 
-$compress = ( isset($_GET['c']) && $_GET['c'] );
-$force_gzip = ( $compress && 'gzip' == $_GET['c'] );
-$rtl = ( isset($_GET['dir']) && 'rtl' == $_GET['dir'] );
+$compress = (isset($_GET['c']) && $_GET['c']);
+$force_gzip = ($compress && 'gzip' == $_GET['c']);
+$rtl = (isset($_GET['dir']) && 'rtl' == $_GET['dir']);
 $expires_offset = 31536000; // 1 year
 $out = '';
 
 $wp_styles = new WP_Styles();
 wp_default_styles($wp_styles);
 
-if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) && stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) === $wp_version ) {
+if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) === $wp_version) {
 	$protocol = $_SERVER['SERVER_PROTOCOL'];
-	if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
+	if ( ! in_array($protocol, array('HTTP/1.1', 'HTTP/2', 'HTTP/2.0'))) {
 		$protocol = 'HTTP/1.0';
 	}
-	header( "$protocol 304 Not Modified" );
+	header("$protocol 304 Not Modified");
 	exit();
 }
 
-foreach ( $load as $handle ) {
-	if ( !array_key_exists($handle, $wp_styles->registered) )
+foreach ($load as $handle) {
+	if ( ! array_key_exists($handle, $wp_styles->registered))
 		continue;
 
 	$style = $wp_styles->registered[$handle];
 
-	if ( empty( $style->src ) ) {
+	if (empty($style->src)) {
 		continue;
 	}
 
-	$path = ABSPATH . $style->src;
+	$path = ABSPATH.$style->src;
 
-	if ( $rtl && ! empty( $style->extra['rtl'] ) ) {
+	if ($rtl && ! empty($style->extra['rtl'])) {
 		// All default styles have fully independent RTL files.
-		$path = str_replace( '.min.css', '-rtl.min.css', $path );
+		$path = str_replace('.min.css', '-rtl.min.css', $path);
 	}
 
-	$content = get_file( $path ) . "\n";
+	$content = get_file($path)."\n";
 
-	if ( strpos( $style->src, '/' . WPINC . '/css/' ) === 0 ) {
-		$content = str_replace( '../images/', '../' . WPINC . '/images/', $content );
-		$content = str_replace( '../js/tinymce/', '../' . WPINC . '/js/tinymce/', $content );
-		$content = str_replace( '../fonts/', '../' . WPINC . '/fonts/', $content );
+	if (strpos($style->src, '/'.WPINC.'/css/') === 0) {
+		$content = str_replace('../images/', '../'.WPINC.'/images/', $content);
+		$content = str_replace('../js/tinymce/', '../'.WPINC.'/js/tinymce/', $content);
+		$content = str_replace('../fonts/', '../'.WPINC.'/fonts/', $content);
 		$out .= $content;
 	} else {
-		$out .= str_replace( '../images/', 'images/', $content );
+		$out .= str_replace('../images/', 'images/', $content);
 	}
 }
 
 header("Etag: $wp_version");
 header('Content-Type: text/css; charset=UTF-8');
-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 ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
+if ($compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
 	header('Vary: Accept-Encoding'); // Handle proxies
-	if ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
+	if (false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip) {
 		header('Content-Encoding: deflate');
-		$out = gzdeflate( $out, 3 );
-	} elseif ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode') ) {
+		$out = gzdeflate($out, 3);
+	} elseif (false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode')) {
 		header('Content-Encoding: gzip');
-		$out = gzencode( $out, 3 );
+		$out = gzencode($out, 3);
 	}
 }