ntwb / wordpress

src/wp-admin/includes/class-wp-links-list-table.php

Braces +16 added lines, -11 removed lines

@@ -48,14 +48,18 @@ 
 
 		$args = array( 'hide_invisible' => 0, 'hide_empty' => 0 );
 
-		if ( 'all' != $cat_id )
-			$args['category'] = $cat_id;
-		if ( !empty( $s ) )
-			$args['search'] = $s;
-		if ( !empty( $orderby ) )
-			$args['orderby'] = $orderby;
-		if ( !empty( $order ) )
-			$args['order'] = $order;
+		if ( 'all' != $cat_id ) {
+					$args['category'] = $cat_id;
+		}
+		if ( !empty( $s ) ) {
+					$args['search'] = $s;
+		}
+		if ( !empty( $orderby ) ) {
+					$args['orderby'] = $orderby;
+		}
+		if ( !empty( $order ) ) {
+					$args['order'] = $order;
+		}
 
 		$this->items = get_bookmarks( $args );
 	}
@@ -86,9 +90,10 @@ 
 	protected function extra_tablenav( $which ) {
 		global $cat_id;
 
-		if ( 'top' != $which )
-			return;
-?>
+		if ( 'top' != $which ) {
+					return;
+		}
+		?>
 		<div class="alignleft actions">
 <?php
 			$dropdown_options = array(

Spacing +61 added lines, -61 removed lines

@@ -27,11 +27,11 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( array(
+	public function __construct($args = array()) {
+		parent::__construct(array(
 			'plural' => 'bookmarks',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 	}
 
 	/**
@@ -39,7 +39,7 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( 'manage_links' );
+		return current_user_can('manage_links');
 	}
 
 	/**
@@ -52,27 +52,27 @@ 
 	public function prepare_items() {
 		global $cat_id, $s, $orderby, $order;
 
-		wp_reset_vars( array( 'action', 'cat_id', 'link_id', 'orderby', 'order', 's' ) );
+		wp_reset_vars(array('action', 'cat_id', 'link_id', 'orderby', 'order', 's'));
 
-		$args = array( 'hide_invisible' => 0, 'hide_empty' => 0 );
+		$args = array('hide_invisible' => 0, 'hide_empty' => 0);
 
-		if ( 'all' != $cat_id )
+		if ('all' != $cat_id)
 			$args['category'] = $cat_id;
-		if ( !empty( $s ) )
+		if ( ! empty($s))
 			$args['search'] = $s;
-		if ( !empty( $orderby ) )
+		if ( ! empty($orderby))
 			$args['orderby'] = $orderby;
-		if ( !empty( $order ) )
+		if ( ! empty($order))
 			$args['order'] = $order;
 
-		$this->items = get_bookmarks( $args );
+		$this->items = get_bookmarks($args);
 	}
 
 	/**
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No links found.' );
+		_e('No links found.');
 	}
 
 	/**
@@ -81,7 +81,7 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		$actions['delete'] = __( 'Delete' );
+		$actions['delete'] = __('Delete');
 
 		return $actions;
 	}
@@ -91,10 +91,10 @@ 
 	 * @global int $cat_id
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 		global $cat_id;
 
-		if ( 'top' != $which )
+		if ('top' != $which)
 			return;
 ?>
 		<div class="alignleft actions">
@@ -103,16 +103,16 @@ 
 				'selected' => $cat_id,
 				'name' => 'cat_id',
 				'taxonomy' => 'link_category',
-				'show_option_all' => get_taxonomy( 'link_category' )->labels->all_items,
+				'show_option_all' => get_taxonomy('link_category')->labels->all_items,
 				'hide_empty' => true,
 				'hierarchical' => 1,
 				'show_count' => 0,
 				'orderby' => 'name',
 			);
 
-			echo '<label class="screen-reader-text" for="cat_id">' . __( 'Filter by category' ) . '</label>';
-			wp_dropdown_categories( $dropdown_options );
-			submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+			echo '<label class="screen-reader-text" for="cat_id">'.__('Filter by category').'</label>';
+			wp_dropdown_categories($dropdown_options);
+			submit_button(__('Filter'), '', 'filter_action', false, array('id' => 'post-query-submit'));
 ?>
 		</div>
 <?php
@@ -125,12 +125,12 @@ 
 	public function get_columns() {
 		return array(
 			'cb'         => '<input type="checkbox" />',
-			'name'       => _x( 'Name', 'link name' ),
-			'url'        => __( 'URL' ),
-			'categories' => __( 'Categories' ),
-			'rel'        => __( 'Relationship' ),
-			'visible'    => __( 'Visible' ),
-			'rating'     => __( 'Rating' )
+			'name'       => _x('Name', 'link name'),
+			'url'        => __('URL'),
+			'categories' => __('Categories'),
+			'rel'        => __('Relationship'),
+			'visible'    => __('Visible'),
+			'rating'     => __('Rating')
 		);
 	}
 
@@ -167,10 +167,10 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_cb( $link ) {
+	public function column_cb($link) {
 		?>
-		<label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>"><?php echo sprintf( __( 'Select %s' ), $link->link_name ); ?></label>
-		<input type="checkbox" name="linkcheck[]" id="cb-select-<?php echo $link->link_id; ?>" value="<?php echo esc_attr( $link->link_id ); ?>" />
+		<label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>"><?php echo sprintf(__('Select %s'), $link->link_name); ?></label>
+		<input type="checkbox" name="linkcheck[]" id="cb-select-<?php echo $link->link_id; ?>" value="<?php echo esc_attr($link->link_id); ?>" />
 		<?php
 	}
 
@@ -182,12 +182,12 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_name( $link ) {
-		$edit_link = get_edit_bookmark_link( $link );
-		printf( '<strong><a class="row-title" href="%s" aria-label="%s">%s</a></strong>',
+	public function column_name($link) {
+		$edit_link = get_edit_bookmark_link($link);
+		printf('<strong><a class="row-title" href="%s" aria-label="%s">%s</a></strong>',
 			$edit_link,
 			/* translators: %s: link name */
-			esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $link->link_name ) ),
+			esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $link->link_name)),
 			$link->link_name
 		);
 	}
@@ -200,8 +200,8 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_url( $link ) {
-		$short_url = url_shorten( $link->link_url );
+	public function column_url($link) {
+		$short_url = url_shorten($link->link_url);
 		echo "<a href='$link->link_url'>$short_url</a>";
 	}
 
@@ -215,22 +215,22 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_categories( $link ) {
+	public function column_categories($link) {
 		global $cat_id;
 
 		$cat_names = array();
-		foreach ( $link->link_category as $category ) {
-			$cat = get_term( $category, 'link_category', OBJECT, 'display' );
-			if ( is_wp_error( $cat ) ) {
+		foreach ($link->link_category as $category) {
+			$cat = get_term($category, 'link_category', OBJECT, 'display');
+			if (is_wp_error($cat)) {
 				echo $cat->get_error_message();
 			}
 			$cat_name = $cat->name;
-			if ( $cat_id != $category ) {
+			if ($cat_id != $category) {
 				$cat_name = "<a href='link-manager.php?cat_id=$category'>$cat_name</a>";
 			}
 			$cat_names[] = $cat_name;
 		}
-		echo implode( ', ', $cat_names );
+		echo implode(', ', $cat_names);
 	}
 
 	/**
@@ -241,8 +241,8 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_rel( $link ) {
-		echo empty( $link->link_rel ) ? '<br />' : $link->link_rel;
+	public function column_rel($link) {
+		echo empty($link->link_rel) ? '<br />' : $link->link_rel;
 	}
 
 	/**
@@ -253,11 +253,11 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_visible( $link ) {
-		if ( 'Y' === $link->link_visible ) {
-			_e( 'Yes' );
+	public function column_visible($link) {
+		if ('Y' === $link->link_visible) {
+			_e('Yes');
 		} else {
-			_e( 'No' );
+			_e('No');
 		}
 	}
 
@@ -269,7 +269,7 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_rating( $link ) {
+	public function column_rating($link) {
 		echo $link->link_rating;
 	}
 
@@ -282,7 +282,7 @@ 
 	 * @param object $link        Link object.
 	 * @param string $column_name Current column name.
 	 */
-	public function column_default( $link, $column_name ) {
+	public function column_default($link, $column_name) {
 		/**
 		 * Fires for each registered custom link column.
 		 *
@@ -291,17 +291,17 @@ 
 		 * @param string $column_name Name of the custom column.
 		 * @param int    $link_id     Link ID.
 		 */
-		do_action( 'manage_link_custom_column', $column_name, $link->link_id );
+		do_action('manage_link_custom_column', $column_name, $link->link_id);
 	}
 
 	public function display_rows() {
-		foreach ( $this->items as $link ) {
-			$link = sanitize_bookmark( $link );
-			$link->link_name = esc_attr( $link->link_name );
-			$link->link_category = wp_get_link_cats( $link->link_id );
+		foreach ($this->items as $link) {
+			$link = sanitize_bookmark($link);
+			$link->link_name = esc_attr($link->link_name);
+			$link->link_category = wp_get_link_cats($link->link_id);
 ?>
 		<tr id="link-<?php echo $link->link_id; ?>">
-			<?php $this->single_row_columns( $link ) ?>
+			<?php $this->single_row_columns($link) ?>
 		</tr>
 <?php
 		}
@@ -318,16 +318,16 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string Row action output for links.
 	 */
-	protected function handle_row_actions( $link, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($link, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return '';
 		}
 
-		$edit_link = get_edit_bookmark_link( $link );
+		$edit_link = get_edit_bookmark_link($link);
 
 		$actions = array();
-		$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-		$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id) . "' onclick=\"if ( confirm( '" . esc_js(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name)) . "' ) ) { return true;}return false;\">" . __('Delete') . "</a>";
-		return $this->row_actions( $actions );
+		$actions['edit'] = '<a href="'.$edit_link.'">'.__('Edit').'</a>';
+		$actions['delete'] = "<a class='submitdelete' href='".wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_'.$link->link_id)."' onclick=\"if ( confirm( '".esc_js(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name))."' ) ) { return true;}return false;\">".__('Delete')."</a>";
+		return $this->row_actions($actions);
 	}
 }

src/wp-admin/includes/class-ftp-sockets.php

Braces +47 added lines, -17 removed lines

@@ -59,7 +59,9 @@ 
 			$this->PushError('_connect','socket create failed',socket_strerror(socket_last_error($sock)));
 			return FALSE;
 		}
-		if(!$this->_settimeout($sock)) return FALSE;
+		if(!$this->_settimeout($sock)) {
+			return FALSE;
+		}
 		$this->SendMSG("Connecting to \"".$host.":".$port."\"");
 		if (!($res = @socket_connect($sock, $host, $port))) {
 			$this->PushError('_connect','socket connect failed',socket_strerror(socket_last_error($sock)));
@@ -89,7 +91,9 @@ 
 				$go = !preg_match("/^([0-9]{3})(-.+\\1)? [^".CRLF."]+".CRLF."$/Us", $this->_message, $regs);
 			}
 		} while($go);
-		if($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
+		if($this->LocalEcho) {
+			echo "GET < ".rtrim($this->_message, CRLF).CRLF;
+		}
 		$this->_code=(int)$regs[1];
 		return $result;
 	}
@@ -99,19 +103,25 @@ 
 			$this->PushError($fnction,'Connect first');
 			return FALSE;
 		}
-		if($this->LocalEcho) echo "PUT > ",$cmd,CRLF;
+		if($this->LocalEcho) {
+			echo "PUT > ",$cmd,CRLF;
+		}
 		$status=@socket_write($this->_ftp_control_sock, $cmd.CRLF);
 		if($status===false) {
 			$this->PushError($fnction,'socket write failed', socket_strerror(socket_last_error($this->stream)));
 			return FALSE;
 		}
 		$this->_lastaction=time();
-		if(!$this->_readmsg($fnction)) return FALSE;
+		if(!$this->_readmsg($fnction)) {
+			return FALSE;
+		}
 		return TRUE;
 	}
 
 	function _data_prepare($mode=FTP_ASCII) {
-		if(!$this->_settype($mode)) return FALSE;
+		if(!$this->_settype($mode)) {
+			return FALSE;
+		}
 		$this->SendMSG("Creating data socket");
 		$this->_ftp_data_sock = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 		if ($this->_ftp_data_sock < 0) {
@@ -139,8 +149,9 @@ 
 				$this->PushError("_data_prepare","socket_connect", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
 				return FALSE;
+			} else {
+				$this->_ftp_temp_sock=$this->_ftp_data_sock;
 			}
-			else $this->_ftp_temp_sock=$this->_ftp_data_sock;
 		} else {
 			if(!@socket_getsockname($this->_ftp_control_sock, $addr, $port)) {
 				$this->PushError("_data_prepare","can't get control socket information", socket_strerror(socket_last_error($this->_ftp_control_sock)));
@@ -176,8 +187,11 @@ 
 
 	function _data_read($mode=FTP_ASCII, $fp=NULL) {
 		$NewLine=$this->_eol_code[$this->OS_local];
-		if(is_resource($fp)) $out=0;
-		else $out="";
+		if(is_resource($fp)) {
+			$out=0;
+		} else {
+			$out="";
+		}
 		if(!$this->_passive) {
 			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
 			$this->_ftp_temp_sock=socket_accept($this->_ftp_data_sock);
@@ -189,18 +203,28 @@ 
 		}
 
 		while(($block=@socket_read($this->_ftp_temp_sock, $this->_ftp_buff_size, PHP_BINARY_READ))!==false) {
-			if($block==="") break;
-			if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
-			if(is_resource($fp)) $out+=fwrite($fp, $block, strlen($block));
-			else $out.=$block;
+			if($block==="") {
+				break;
+			}
+			if($mode!=FTP_BINARY) {
+				$block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
+			}
+			if(is_resource($fp)) {
+				$out+=fwrite($fp, $block, strlen($block));
+			} else {
+				$out.=$block;
+			}
 		}
 		return $out;
 	}
 
 	function _data_write($mode=FTP_ASCII, $fp=NULL) {
 		$NewLine=$this->_eol_code[$this->OS_local];
-		if(is_resource($fp)) $out=0;
-		else $out="";
+		if(is_resource($fp)) {
+			$out=0;
+		} else {
+			$out="";
+		}
 		if(!$this->_passive) {
 			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
 			$this->_ftp_temp_sock=socket_accept($this->_ftp_data_sock);
@@ -213,14 +237,20 @@ 
 		if(is_resource($fp)) {
 			while(!feof($fp)) {
 				$block=fread($fp, $this->_ftp_buff_size);
-				if(!$this->_data_write_block($mode, $block)) return false;
+				if(!$this->_data_write_block($mode, $block)) {
+					return false;
+				}
 			}
-		} elseif(!$this->_data_write_block($mode, $fp)) return false;
+		} elseif(!$this->_data_write_block($mode, $fp)) {
+			return false;
+		}
 		return true;
 	}
 
 	function _data_write_block($mode, $block) {
-		if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		if($mode!=FTP_BINARY) {
+			$block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		}
 		do {
 			if(($t=@socket_write($this->_ftp_temp_sock, $block))===FALSE) {
 				$this->PushError("_data_write","socket_write", socket_strerror(socket_last_error($this->_ftp_temp_sock)));

Spacing +91 added lines, -91 removed lines

@@ -27,7 +27,7 @@ 
  */
 class ftp_sockets extends ftp_base {
 
-	function __construct($verb=FALSE, $le=FALSE) {
+	function __construct($verb = FALSE, $le = FALSE) {
 		parent::__construct(true, $verb, $le);
 	}
 
@@ -36,13 +36,13 @@ 
 // <!-- --------------------------------------------------------------------------------------- -->
 
 	function _settimeout($sock) {
-		if(!@socket_set_option($sock, SOL_SOCKET, SO_RCVTIMEO, array("sec"=>$this->_timeout, "usec"=>0))) {
-			$this->PushError('_connect','socket set receive timeout',socket_strerror(socket_last_error($sock)));
+		if ( ! @socket_set_option($sock, SOL_SOCKET, SO_RCVTIMEO, array("sec"=>$this->_timeout, "usec"=>0))) {
+			$this->PushError('_connect', 'socket set receive timeout', socket_strerror(socket_last_error($sock)));
 			@socket_close($sock);
 			return FALSE;
 		}
-		if(!@socket_set_option($sock, SOL_SOCKET , SO_SNDTIMEO, array("sec"=>$this->_timeout, "usec"=>0))) {
-			$this->PushError('_connect','socket set send timeout',socket_strerror(socket_last_error($sock)));
+		if ( ! @socket_set_option($sock, SOL_SOCKET, SO_SNDTIMEO, array("sec"=>$this->_timeout, "usec"=>0))) {
+			$this->PushError('_connect', 'socket set send timeout', socket_strerror(socket_last_error($sock)));
 			@socket_close($sock);
 			return FALSE;
 		}
@@ -51,118 +51,118 @@ 
 
 	function _connect($host, $port) {
 		$this->SendMSG("Creating socket");
-		if(!($sock = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP))) {
-			$this->PushError('_connect','socket create failed',socket_strerror(socket_last_error($sock)));
+		if ( ! ($sock = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP))) {
+			$this->PushError('_connect', 'socket create failed', socket_strerror(socket_last_error($sock)));
 			return FALSE;
 		}
-		if(!$this->_settimeout($sock)) return FALSE;
+		if ( ! $this->_settimeout($sock)) return FALSE;
 		$this->SendMSG("Connecting to \"".$host.":".$port."\"");
-		if (!($res = @socket_connect($sock, $host, $port))) {
-			$this->PushError('_connect','socket connect failed',socket_strerror(socket_last_error($sock)));
+		if ( ! ($res = @socket_connect($sock, $host, $port))) {
+			$this->PushError('_connect', 'socket connect failed', socket_strerror(socket_last_error($sock)));
 			@socket_close($sock);
 			return FALSE;
 		}
-		$this->_connected=true;
+		$this->_connected = true;
 		return $sock;
 	}
 
-	function _readmsg($fnction="_readmsg"){
-		if(!$this->_connected) {
-			$this->PushError($fnction,'Connect first');
+	function _readmsg($fnction = "_readmsg") {
+		if ( ! $this->_connected) {
+			$this->PushError($fnction, 'Connect first');
 			return FALSE;
 		}
-		$result=true;
-		$this->_message="";
-		$this->_code=0;
-		$go=true;
+		$result = true;
+		$this->_message = "";
+		$this->_code = 0;
+		$go = true;
 		do {
-			$tmp=@socket_read($this->_ftp_control_sock, 4096, PHP_BINARY_READ);
-			if($tmp===false) {
-				$go=$result=false;
-				$this->PushError($fnction,'Read failed', socket_strerror(socket_last_error($this->_ftp_control_sock)));
+			$tmp = @socket_read($this->_ftp_control_sock, 4096, PHP_BINARY_READ);
+			if ($tmp === false) {
+				$go = $result = false;
+				$this->PushError($fnction, 'Read failed', socket_strerror(socket_last_error($this->_ftp_control_sock)));
 			} else {
-				$this->_message.=$tmp;
-				$go = !preg_match("/^([0-9]{3})(-.+\\1)? [^".CRLF."]+".CRLF."$/Us", $this->_message, $regs);
+				$this->_message .= $tmp;
+				$go = ! preg_match("/^([0-9]{3})(-.+\\1)? [^".CRLF."]+".CRLF."$/Us", $this->_message, $regs);
 			}
-		} while($go);
-		if($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
-		$this->_code=(int)$regs[1];
+		} while ($go);
+		if ($this->LocalEcho) echo "GET < ".rtrim($this->_message, CRLF).CRLF;
+		$this->_code = (int) $regs[1];
 		return $result;
 	}
 
-	function _exec($cmd, $fnction="_exec") {
-		if(!$this->_ready) {
-			$this->PushError($fnction,'Connect first');
+	function _exec($cmd, $fnction = "_exec") {
+		if ( ! $this->_ready) {
+			$this->PushError($fnction, 'Connect first');
 			return FALSE;
 		}
-		if($this->LocalEcho) echo "PUT > ",$cmd,CRLF;
-		$status=@socket_write($this->_ftp_control_sock, $cmd.CRLF);
-		if($status===false) {
-			$this->PushError($fnction,'socket write failed', socket_strerror(socket_last_error($this->stream)));
+		if ($this->LocalEcho) echo "PUT > ", $cmd, CRLF;
+		$status = @socket_write($this->_ftp_control_sock, $cmd.CRLF);
+		if ($status === false) {
+			$this->PushError($fnction, 'socket write failed', socket_strerror(socket_last_error($this->stream)));
 			return FALSE;
 		}
-		$this->_lastaction=time();
-		if(!$this->_readmsg($fnction)) return FALSE;
+		$this->_lastaction = time();
+		if ( ! $this->_readmsg($fnction)) return FALSE;
 		return TRUE;
 	}
 
-	function _data_prepare($mode=FTP_ASCII) {
-		if(!$this->_settype($mode)) return FALSE;
+	function _data_prepare($mode = FTP_ASCII) {
+		if ( ! $this->_settype($mode)) return FALSE;
 		$this->SendMSG("Creating data socket");
 		$this->_ftp_data_sock = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 		if ($this->_ftp_data_sock < 0) {
-			$this->PushError('_data_prepare','socket create failed',socket_strerror(socket_last_error($this->_ftp_data_sock)));
+			$this->PushError('_data_prepare', 'socket create failed', socket_strerror(socket_last_error($this->_ftp_data_sock)));
 			return FALSE;
 		}
-		if(!$this->_settimeout($this->_ftp_data_sock)) {
+		if ( ! $this->_settimeout($this->_ftp_data_sock)) {
 			$this->_data_close();
 			return FALSE;
 		}
-		if($this->_passive) {
-			if(!$this->_exec("PASV", "pasv")) {
+		if ($this->_passive) {
+			if ( ! $this->_exec("PASV", "pasv")) {
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!$this->_checkCode()) {
+			if ( ! $this->_checkCode()) {
 				$this->_data_close();
 				return FALSE;
 			}
 			$ip_port = explode(",", preg_replace("/^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*$/s", "\\1", $this->_message));
-			$this->_datahost=$ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
-			$this->_dataport=(((int)$ip_port[4])<<8) + ((int)$ip_port[5]);
+			$this->_datahost = $ip_port[0].".".$ip_port[1].".".$ip_port[2].".".$ip_port[3];
+			$this->_dataport = (((int) $ip_port[4]) << 8) + ((int) $ip_port[5]);
 			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
-			if(!@socket_connect($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) {
-				$this->PushError("_data_prepare","socket_connect", socket_strerror(socket_last_error($this->_ftp_data_sock)));
+			if ( ! @socket_connect($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) {
+				$this->PushError("_data_prepare", "socket_connect", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			else $this->_ftp_temp_sock=$this->_ftp_data_sock;
+			else $this->_ftp_temp_sock = $this->_ftp_data_sock;
 		} else {
-			if(!@socket_getsockname($this->_ftp_control_sock, $addr, $port)) {
-				$this->PushError("_data_prepare","can't get control socket information", socket_strerror(socket_last_error($this->_ftp_control_sock)));
+			if ( ! @socket_getsockname($this->_ftp_control_sock, $addr, $port)) {
+				$this->PushError("_data_prepare", "can't get control socket information", socket_strerror(socket_last_error($this->_ftp_control_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!@socket_bind($this->_ftp_data_sock,$addr)){
-				$this->PushError("_data_prepare","can't bind data socket", socket_strerror(socket_last_error($this->_ftp_data_sock)));
+			if ( ! @socket_bind($this->_ftp_data_sock, $addr)) {
+				$this->PushError("_data_prepare", "can't bind data socket", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!@socket_listen($this->_ftp_data_sock)) {
-				$this->PushError("_data_prepare","can't listen data socket", socket_strerror(socket_last_error($this->_ftp_data_sock)));
+			if ( ! @socket_listen($this->_ftp_data_sock)) {
+				$this->PushError("_data_prepare", "can't listen data socket", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!@socket_getsockname($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) {
-				$this->PushError("_data_prepare","can't get data socket information", socket_strerror(socket_last_error($this->_ftp_data_sock)));
+			if ( ! @socket_getsockname($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) {
+				$this->PushError("_data_prepare", "can't get data socket information", socket_strerror(socket_last_error($this->_ftp_data_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!$this->_exec('PORT '.str_replace('.',',',$this->_datahost.'.'.($this->_dataport>>8).'.'.($this->_dataport&0x00FF)), "_port")) {
+			if ( ! $this->_exec('PORT '.str_replace('.', ',', $this->_datahost.'.'.($this->_dataport >> 8).'.'.($this->_dataport & 0x00FF)), "_port")) {
 				$this->_data_close();
 				return FALSE;
 			}
-			if(!$this->_checkCode()) {
+			if ( ! $this->_checkCode()) {
 				$this->_data_close();
 				return FALSE;
 			}
@@ -170,61 +170,61 @@ 
 		return TRUE;
 	}
 
-	function _data_read($mode=FTP_ASCII, $fp=NULL) {
-		$NewLine=$this->_eol_code[$this->OS_local];
-		if(is_resource($fp)) $out=0;
-		else $out="";
-		if(!$this->_passive) {
+	function _data_read($mode = FTP_ASCII, $fp = NULL) {
+		$NewLine = $this->_eol_code[$this->OS_local];
+		if (is_resource($fp)) $out = 0;
+		else $out = "";
+		if ( ! $this->_passive) {
 			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
-			$this->_ftp_temp_sock=socket_accept($this->_ftp_data_sock);
-			if($this->_ftp_temp_sock===FALSE) {
-				$this->PushError("_data_read","socket_accept", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
+			$this->_ftp_temp_sock = socket_accept($this->_ftp_data_sock);
+			if ($this->_ftp_temp_sock === FALSE) {
+				$this->PushError("_data_read", "socket_accept", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
 		}
 
-		while(($block=@socket_read($this->_ftp_temp_sock, $this->_ftp_buff_size, PHP_BINARY_READ))!==false) {
-			if($block==="") break;
-			if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
-			if(is_resource($fp)) $out+=fwrite($fp, $block, strlen($block));
-			else $out.=$block;
+		while (($block = @socket_read($this->_ftp_temp_sock, $this->_ftp_buff_size, PHP_BINARY_READ)) !== false) {
+			if ($block === "") break;
+			if ($mode != FTP_BINARY) $block = preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_local], $block);
+			if (is_resource($fp)) $out += fwrite($fp, $block, strlen($block));
+			else $out .= $block;
 		}
 		return $out;
 	}
 
-	function _data_write($mode=FTP_ASCII, $fp=NULL) {
-		$NewLine=$this->_eol_code[$this->OS_local];
-		if(is_resource($fp)) $out=0;
-		else $out="";
-		if(!$this->_passive) {
+	function _data_write($mode = FTP_ASCII, $fp = NULL) {
+		$NewLine = $this->_eol_code[$this->OS_local];
+		if (is_resource($fp)) $out = 0;
+		else $out = "";
+		if ( ! $this->_passive) {
 			$this->SendMSG("Connecting to ".$this->_datahost.":".$this->_dataport);
-			$this->_ftp_temp_sock=socket_accept($this->_ftp_data_sock);
-			if($this->_ftp_temp_sock===FALSE) {
-				$this->PushError("_data_write","socket_accept", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
+			$this->_ftp_temp_sock = socket_accept($this->_ftp_data_sock);
+			if ($this->_ftp_temp_sock === FALSE) {
+				$this->PushError("_data_write", "socket_accept", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
 				$this->_data_close();
 				return false;
 			}
 		}
-		if(is_resource($fp)) {
-			while(!feof($fp)) {
-				$block=fread($fp, $this->_ftp_buff_size);
-				if(!$this->_data_write_block($mode, $block)) return false;
+		if (is_resource($fp)) {
+			while ( ! feof($fp)) {
+				$block = fread($fp, $this->_ftp_buff_size);
+				if ( ! $this->_data_write_block($mode, $block)) return false;
 			}
-		} elseif(!$this->_data_write_block($mode, $fp)) return false;
+		} elseif ( ! $this->_data_write_block($mode, $fp)) return false;
 		return true;
 	}
 
 	function _data_write_block($mode, $block) {
-		if($mode!=FTP_BINARY) $block=preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
+		if ($mode != FTP_BINARY) $block = preg_replace("/\r\n|\r|\n/", $this->_eol_code[$this->OS_remote], $block);
 		do {
-			if(($t=@socket_write($this->_ftp_temp_sock, $block))===FALSE) {
-				$this->PushError("_data_write","socket_write", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
+			if (($t = @socket_write($this->_ftp_temp_sock, $block)) === FALSE) {
+				$this->PushError("_data_write", "socket_write", socket_strerror(socket_last_error($this->_ftp_temp_sock)));
 				$this->_data_close();
 				return FALSE;
 			}
-			$block=substr($block, $t);
-		} while(!empty($block));
+			$block = substr($block, $t);
+		} while ( ! empty($block));
 		return true;
 	}
 
@@ -236,9 +236,9 @@ 
 	}
 
 	function _quit() {
-		if($this->_connected) {
+		if ($this->_connected) {
 			@socket_close($this->_ftp_control_sock);
-			$this->_connected=false;
+			$this->_connected = false;
 			$this->SendMSG("Socket closed");
 		}
 	}

Doc Comments +3 added lines

@@ -83,6 +83,9 @@
 		return $result;
 	}
 
+	/**
+	 * @param string $cmd
+	 */
 	function _exec($cmd, $fnction="_exec") {
 		if(!$this->_ready) {
 			$this->PushError($fnction,'Connect first');

src/wp-admin/ms-options.php

Spacing +2 added lines, -2 removed lines

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

src/wp-admin/upgrade.php

Braces +17 added lines, -12 removed lines

@@ -24,10 +24,11 @@ 
 
 delete_site_transient('update_core');
 
-if ( isset( $_GET['step'] ) )
+if ( isset( $_GET['step'] ) ) {
 	$step = $_GET['step'];
-else
+} else {
 	$step = 0;
+}
 
 // Do it. No output.
 if ( 'upgrade_db' === $step ) {
@@ -48,10 +49,11 @@ 
 $php_version    = phpversion();
 $mysql_version  = $wpdb->db_version();
 $php_compat     = version_compare( $php_version, $required_php_version, '>=' );
-if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {
 	$mysql_compat = true;
-else
+} else {
 	$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
+}
 
 @header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
 ?>
@@ -76,17 +78,20 @@ 
 <p class="step"><a class="button button-large" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p>
 
 <?php elseif ( !$php_compat || !$mysql_compat ) :
-	if ( !$mysql_compat && !$php_compat )
-		printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
-	elseif ( !$php_compat )
-		printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
-	elseif ( !$mysql_compat )
-		printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
-?>
-<?php else :
+	if ( !$mysql_compat && !$php_compat ) {
+			printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
+	} elseif ( !$php_compat ) {
+			printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
+	} elseif ( !$mysql_compat ) {
+			printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
+	}
+	?>
+<?php else {
+	:
 switch ( $step ) :
 	case 0:
 		$goback = wp_get_referer();
+}
 		if ( $goback ) {
 			$goback = esc_url_raw( $goback );
 			$goback = urlencode( $goback );

Spacing +42 added lines, -42 removed lines

@@ -12,27 +12,27 @@ 
  * @since 1.5.1
  * @var bool
  */
-define( 'WP_INSTALLING', true );
+define('WP_INSTALLING', true);
 
 /** Load WordPress Bootstrap */
-require( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+require(dirname(dirname(__FILE__)).'/wp-load.php');
 
 nocache_headers();
 
 timer_start();
-require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 delete_site_transient('update_core');
 
-if ( isset( $_GET['step'] ) )
+if (isset($_GET['step']))
 	$step = $_GET['step'];
 else
 	$step = 0;
 
 // Do it. No output.
-if ( 'upgrade_db' === $step ) {
+if ('upgrade_db' === $step) {
 	wp_upgrade();
-	die( '0' );
+	die('0');
 }
 
 /**
@@ -47,74 +47,74 @@ 
 
 $php_version    = phpversion();
 $mysql_version  = $wpdb->db_version();
-$php_compat     = version_compare( $php_version, $required_php_version, '>=' );
-if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+$php_compat     = version_compare($php_version, $required_php_version, '>=');
+if (file_exists(WP_CONTENT_DIR.'/db.php') && empty($wpdb->is_mysql))
 	$mysql_compat = true;
 else
-	$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
+	$mysql_compat = version_compare($mysql_version, $required_mysql_version, '>=');
 
-@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
+@header('Content-Type: '.get_option('html_type').'; charset='.get_option('blog_charset'));
 ?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
 <head>
 	<meta name="viewport" content="width=device-width" />
-	<meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php echo get_option( 'blog_charset' ); ?>" />
+	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
 	<meta name="robots" content="noindex,nofollow" />
-	<title><?php _e( 'WordPress &rsaquo; Update' ); ?></title>
+	<title><?php _e('WordPress &rsaquo; Update'); ?></title>
 	<?php
-	wp_admin_css( 'install', true );
-	wp_admin_css( 'ie', true );
+	wp_admin_css('install', true);
+	wp_admin_css('ie', true);
 	?>
 </head>
 <body class="wp-core-ui">
-<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
+<p id="logo"><a href="<?php echo esc_url(__('https://wordpress.org/')); ?>" tabindex="-1"><?php _e('WordPress'); ?></a></p>
 
-<?php if ( get_option( 'db_version' ) == $wp_db_version || !is_blog_installed() ) : ?>
+<?php if (get_option('db_version') == $wp_db_version || ! is_blog_installed()) : ?>
 
-<h1><?php _e( 'No Update Required' ); ?></h1>
-<p><?php _e( 'Your WordPress database is already up-to-date!' ); ?></p>
-<p class="step"><a class="button button-large" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p>
+<h1><?php _e('No Update Required'); ?></h1>
+<p><?php _e('Your WordPress database is already up-to-date!'); ?></p>
+<p class="step"><a class="button button-large" href="<?php echo get_option('home'); ?>/"><?php _e('Continue'); ?></a></p>
 
-<?php elseif ( !$php_compat || !$mysql_compat ) :
-	if ( !$mysql_compat && !$php_compat )
-		printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
-	elseif ( !$php_compat )
-		printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
-	elseif ( !$mysql_compat )
-		printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
+<?php elseif ( ! $php_compat || ! $mysql_compat) :
+	if ( ! $mysql_compat && ! $php_compat)
+		printf(__('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version);
+	elseif ( ! $php_compat)
+		printf(__('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version);
+	elseif ( ! $mysql_compat)
+		printf(__('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version);
 ?>
 <?php else :
-switch ( $step ) :
+switch ($step) :
 	case 0:
 		$goback = wp_get_referer();
-		if ( $goback ) {
-			$goback = esc_url_raw( $goback );
-			$goback = urlencode( $goback );
+		if ($goback) {
+			$goback = esc_url_raw($goback);
+			$goback = urlencode($goback);
 		}
 ?>
-<h1><?php _e( 'Database Update Required' ); ?></h1>
-<p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to update your database to the newest version.' ); ?></p>
-<p><?php _e( 'The database update process may take a little while, so please be patient.' ); ?></p>
-<p class="step"><a class="button button-large button-primary" href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e( 'Update WordPress Database' ); ?></a></p>
+<h1><?php _e('Database Update Required'); ?></h1>
+<p><?php _e('WordPress has been updated! Before we send you on your way, we have to update your database to the newest version.'); ?></p>
+<p><?php _e('The database update process may take a little while, so please be patient.'); ?></p>
+<p class="step"><a class="button button-large button-primary" href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e('Update WordPress Database'); ?></a></p>
 <?php
 		break;
 	case 1:
 		wp_upgrade();
 
-			$backto = !empty($_GET['backto']) ? wp_unslash( urldecode( $_GET['backto'] ) ) : __get_option( 'home' ) . '/';
-			$backto = esc_url( $backto );
-			$backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/');
+			$backto = ! empty($_GET['backto']) ? wp_unslash(urldecode($_GET['backto'])) : __get_option('home').'/';
+			$backto = esc_url($backto);
+			$backto = wp_validate_redirect($backto, __get_option('home').'/');
 ?>
-<h1><?php _e( 'Update Complete' ); ?></h1>
-	<p><?php _e( 'Your WordPress database has been successfully updated!' ); ?></p>
-	<p class="step"><a class="button button-large" href="<?php echo $backto; ?>"><?php _e( 'Continue' ); ?></a></p>
+<h1><?php _e('Update Complete'); ?></h1>
+	<p><?php _e('Your WordPress database has been successfully updated!'); ?></p>
+	<p class="step"><a class="button button-large" href="<?php echo $backto; ?>"><?php _e('Continue'); ?></a></p>
 
 <!--
 <pre>
-<?php printf( __( '%s queries' ), $wpdb->num_queries ); ?>
+<?php printf(__('%s queries'), $wpdb->num_queries); ?>
 
-<?php printf( __( '%s seconds' ), timer_stop( 0 ) ); ?>
+<?php printf(__('%s seconds'), timer_stop(0)); ?>
 </pre>
 -->
 

src/wp-admin/menu-header.php

Braces +29 added lines, -20 removed lines

@@ -81,12 +81,14 @@ 
 			$class[] = ! empty( $submenu_items ) ? 'wp-has-current-submenu wp-menu-open' : 'current';
 		} else {
 			$class[] = 'wp-not-current-submenu';
-			if ( ! empty( $submenu_items ) )
-				$aria_attributes .= 'aria-haspopup="true"';
+			if ( ! empty( $submenu_items ) ) {
+							$aria_attributes .= 'aria-haspopup="true"';
+			}
 		}
 
-		if ( ! empty( $item[4] ) )
-			$class[] = esc_attr( $item[4] );
+		if ( ! empty( $item[4] ) ) {
+					$class[] = esc_attr( $item[4] );
+		}
 
 		$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
 		$id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
@@ -134,8 +136,9 @@ 
 			$submenu_items = array_values( $submenu_items );  // Re-index.
 			$menu_hook = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
 			$menu_file = $submenu_items[0][2];
-			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
-				$menu_file = substr( $menu_file, 0, $pos );
+			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
+							$menu_file = substr( $menu_file, 0, $pos );
+			}
 			if ( ! empty( $menu_hook ) || ( ( 'index.php' != $submenu_items[0][2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
 				$admin_is_parent = true;
 				echo "<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
@@ -145,8 +148,9 @@ 
 		} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
 			$menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
 			$menu_file = $item[2];
-			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
-				$menu_file = substr( $menu_file, 0, $pos );
+			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
+							$menu_file = substr( $menu_file, 0, $pos );
+			}
 			if ( ! empty( $menu_hook ) || ( ( 'index.php' != $item[2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
 				$admin_is_parent = true;
 				echo "\n\t<a href='admin.php?page={$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
@@ -163,8 +167,9 @@ 
 
 			// 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes
 			foreach ( $submenu_items as $sub_key => $sub_item ) {
-				if ( ! current_user_can( $sub_item[1] ) )
-					continue;
+				if ( ! current_user_can( $sub_item[1] ) ) {
+									continue;
+				}
 
 				$class = array();
 				if ( $first ) {
@@ -174,15 +179,17 @@ 
 
 				$menu_file = $item[2];
 
-				if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
-					$menu_file = substr( $menu_file, 0, $pos );
+				if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
+									$menu_file = substr( $menu_file, 0, $pos );
+				}
 
 				// Handle current for post_type=post|page|foo pages, which won't match $self.
 				$self_type = ! empty( $typenow ) ? $self . '?post_type=' . $typenow : 'nothing';
 
 				if ( isset( $submenu_file ) ) {
-					if ( $submenu_file == $sub_item[2] )
-						$class[] = 'current';
+					if ( $submenu_file == $sub_item[2] ) {
+											$class[] = 'current';
+					}
 				// If plugin_page is set the parent must either match the current page or not physically exist.
 				// This allows plugin pages with the same hook to exist under different parents.
 				} elseif (
@@ -200,17 +207,19 @@ 
 
 				$menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
 				$sub_file = $sub_item[2];
-				if ( false !== ( $pos = strpos( $sub_file, '?' ) ) )
-					$sub_file = substr($sub_file, 0, $pos);
+				if ( false !== ( $pos = strpos( $sub_file, '?' ) ) ) {
+									$sub_file = substr($sub_file, 0, $pos);
+				}
 
 				$title = wptexturize($sub_item[0]);
 
 				if ( ! empty( $menu_hook ) || ( ( 'index.php' != $sub_item[2] ) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) && ! file_exists( ABSPATH . "/wp-admin/$sub_file" ) ) ) {
 					// If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
-					if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) )
-						$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), $item[2] );
-					else
-						$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), 'admin.php' );
+					if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) ) {
+											$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), $item[2] );
+					} else {
+											$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), 'admin.php' );
+					}
 
 					$sub_item_url = esc_url( $sub_item_url );
 					echo "<li$class><a href='$sub_item_url'$class>$title</a></li>";

Spacing +64 added lines, -64 removed lines

@@ -35,7 +35,7 @@ 
  *
  * @param string $parent_file The parent file.
  */
-$parent_file = apply_filters( 'parent_file', $parent_file );
+$parent_file = apply_filters('parent_file', $parent_file);
 
 /**
  * Filters the file of an admin menu sub-menu item.
@@ -45,7 +45,7 @@ 
  * @param string $submenu_file The submenu file.
  * @param string $parent_file  The submenu item's parent file.
  */
-$submenu_file = apply_filters( 'submenu_file', $submenu_file, $parent_file );
+$submenu_file = apply_filters('submenu_file', $submenu_file, $parent_file);
 
 get_admin_page_parent();
 
@@ -65,46 +65,46 @@ 
  * @param array $submenu
  * @param bool  $submenu_as_parent
  */
-function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
+function _wp_menu_output($menu, $submenu, $submenu_as_parent = true) {
 	global $self, $parent_file, $submenu_file, $plugin_page, $typenow;
 
 	$first = true;
 	// 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes, 5 = hookname, 6 = icon_url
-	foreach ( $menu as $key => $item ) {
+	foreach ($menu as $key => $item) {
 		$admin_is_parent = false;
 		$class = array();
 		$aria_attributes = '';
 		$aria_hidden = '';
 		$is_separator = false;
 
-		if ( $first ) {
+		if ($first) {
 			$class[] = 'wp-first-item';
 			$first = false;
 		}
 
 		$submenu_items = array();
-		if ( ! empty( $submenu[$item[2]] ) ) {
+		if ( ! empty($submenu[$item[2]])) {
 			$class[] = 'wp-has-submenu';
 			$submenu_items = $submenu[$item[2]];
 		}
 
-		if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {
-			$class[] = ! empty( $submenu_items ) ? 'wp-has-current-submenu wp-menu-open' : 'current';
+		if (($parent_file && $item[2] == $parent_file) || (empty($typenow) && $self == $item[2])) {
+			$class[] = ! empty($submenu_items) ? 'wp-has-current-submenu wp-menu-open' : 'current';
 		} else {
 			$class[] = 'wp-not-current-submenu';
-			if ( ! empty( $submenu_items ) )
+			if ( ! empty($submenu_items))
 				$aria_attributes .= 'aria-haspopup="true"';
 		}
 
-		if ( ! empty( $item[4] ) )
-			$class[] = esc_attr( $item[4] );
+		if ( ! empty($item[4]))
+			$class[] = esc_attr($item[4]);
 
-		$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
-		$id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
+		$class = $class ? ' class="'.join(' ', $class).'"' : '';
+		$id = ! empty($item[5]) ? ' id="'.preg_replace('|[^a-zA-Z0-9_:.]|', '-', $item[5]).'"' : '';
 		$img = $img_style = '';
 		$img_class = ' dashicons-before';
 
-		if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
+		if (false !== strpos($class, 'wp-menu-separator')) {
 			$is_separator = true;
 		}
 
@@ -114,51 +114,51 @@ 
 		 * with CSS. Dashicons and base64-encoded data:image/svg_xml URIs are also handled
 		 * as special cases.
 		 */
-		if ( ! empty( $item[6] ) ) {
-			$img = '<img src="' . $item[6] . '" alt="" />';
+		if ( ! empty($item[6])) {
+			$img = '<img src="'.$item[6].'" alt="" />';
 
-			if ( 'none' === $item[6] || 'div' === $item[6] ) {
+			if ('none' === $item[6] || 'div' === $item[6]) {
 				$img = '<br />';
-			} elseif ( 0 === strpos( $item[6], 'data:image/svg+xml;base64,' ) ) {
+			} elseif (0 === strpos($item[6], 'data:image/svg+xml;base64,')) {
 				$img = '<br />';
-				$img_style = ' style="background-image:url(\'' . esc_attr( $item[6] ) . '\')"';
+				$img_style = ' style="background-image:url(\''.esc_attr($item[6]).'\')"';
 				$img_class = ' svg';
-			} elseif ( 0 === strpos( $item[6], 'dashicons-' ) ) {
+			} elseif (0 === strpos($item[6], 'dashicons-')) {
 				$img = '<br />';
-				$img_class = ' dashicons-before ' . sanitize_html_class( $item[6] );
+				$img_class = ' dashicons-before '.sanitize_html_class($item[6]);
 			}
 		}
 		$arrow = '<div class="wp-menu-arrow"><div></div></div>';
 
-		$title = wptexturize( $item[0] );
+		$title = wptexturize($item[0]);
 
 		// hide separators from screen readers
-		if ( $is_separator ) {
+		if ($is_separator) {
 			$aria_hidden = ' aria-hidden="true"';
 		}
 
 		echo "\n\t<li$class$id$aria_hidden>";
 
-		if ( $is_separator ) {
+		if ($is_separator) {
 			echo '<div class="separator"></div>';
-		} elseif ( $submenu_as_parent && ! empty( $submenu_items ) ) {
-			$submenu_items = array_values( $submenu_items );  // Re-index.
-			$menu_hook = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
+		} elseif ($submenu_as_parent && ! empty($submenu_items)) {
+			$submenu_items = array_values($submenu_items); // Re-index.
+			$menu_hook = get_plugin_page_hook($submenu_items[0][2], $item[2]);
 			$menu_file = $submenu_items[0][2];
-			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
-				$menu_file = substr( $menu_file, 0, $pos );
-			if ( ! empty( $menu_hook ) || ( ( 'index.php' != $submenu_items[0][2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
+			if (false !== ($pos = strpos($menu_file, '?')))
+				$menu_file = substr($menu_file, 0, $pos);
+			if ( ! empty($menu_hook) || (('index.php' != $submenu_items[0][2]) && file_exists(WP_PLUGIN_DIR."/$menu_file") && ! file_exists(ABSPATH."/wp-admin/$menu_file"))) {
 				$admin_is_parent = true;
 				echo "<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
 			} else {
 				echo "\n\t<a href='{$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
 			}
-		} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
-			$menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
+		} elseif ( ! empty($item[2]) && current_user_can($item[1])) {
+			$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
 			$menu_file = $item[2];
-			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
-				$menu_file = substr( $menu_file, 0, $pos );
-			if ( ! empty( $menu_hook ) || ( ( 'index.php' != $item[2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
+			if (false !== ($pos = strpos($menu_file, '?')))
+				$menu_file = substr($menu_file, 0, $pos);
+			if ( ! empty($menu_hook) || (('index.php' != $item[2]) && file_exists(WP_PLUGIN_DIR."/$menu_file") && ! file_exists(ABSPATH."/wp-admin/$menu_file"))) {
 				$admin_is_parent = true;
 				echo "\n\t<a href='admin.php?page={$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
 			} else {
@@ -166,64 +166,64 @@ 
 			}
 		}
 
-		if ( ! empty( $submenu_items ) ) {
+		if ( ! empty($submenu_items)) {
 			echo "\n\t<ul class='wp-submenu wp-submenu-wrap'>";
 			echo "<li class='wp-submenu-head' aria-hidden='true'>{$item[0]}</li>";
 
 			$first = true;
 
 			// 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes
-			foreach ( $submenu_items as $sub_key => $sub_item ) {
-				if ( ! current_user_can( $sub_item[1] ) )
+			foreach ($submenu_items as $sub_key => $sub_item) {
+				if ( ! current_user_can($sub_item[1]))
 					continue;
 
 				$class = array();
-				if ( $first ) {
+				if ($first) {
 					$class[] = 'wp-first-item';
 					$first = false;
 				}
 
 				$menu_file = $item[2];
 
-				if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
-					$menu_file = substr( $menu_file, 0, $pos );
+				if (false !== ($pos = strpos($menu_file, '?')))
+					$menu_file = substr($menu_file, 0, $pos);
 
 				// Handle current for post_type=post|page|foo pages, which won't match $self.
-				$self_type = ! empty( $typenow ) ? $self . '?post_type=' . $typenow : 'nothing';
+				$self_type = ! empty($typenow) ? $self.'?post_type='.$typenow : 'nothing';
 
-				if ( isset( $submenu_file ) ) {
-					if ( $submenu_file == $sub_item[2] )
+				if (isset($submenu_file)) {
+					if ($submenu_file == $sub_item[2])
 						$class[] = 'current';
 				// If plugin_page is set the parent must either match the current page or not physically exist.
 				// This allows plugin pages with the same hook to exist under different parents.
 				} elseif (
-					( ! isset( $plugin_page ) && $self == $sub_item[2] ) ||
-					( isset( $plugin_page ) && $plugin_page == $sub_item[2] && ( $item[2] == $self_type || $item[2] == $self || file_exists($menu_file) === false ) )
+					( ! isset($plugin_page) && $self == $sub_item[2]) ||
+					(isset($plugin_page) && $plugin_page == $sub_item[2] && ($item[2] == $self_type || $item[2] == $self || file_exists($menu_file) === false))
 				) {
 					$class[] = 'current';
 				}
 
-				if ( ! empty( $sub_item[4] ) ) {
-					$class[] = esc_attr( $sub_item[4] );
+				if ( ! empty($sub_item[4])) {
+					$class[] = esc_attr($sub_item[4]);
 				}
 
-				$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
+				$class = $class ? ' class="'.join(' ', $class).'"' : '';
 
 				$menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
 				$sub_file = $sub_item[2];
-				if ( false !== ( $pos = strpos( $sub_file, '?' ) ) )
+				if (false !== ($pos = strpos($sub_file, '?')))
 					$sub_file = substr($sub_file, 0, $pos);
 
 				$title = wptexturize($sub_item[0]);
 
-				if ( ! empty( $menu_hook ) || ( ( 'index.php' != $sub_item[2] ) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) && ! file_exists( ABSPATH . "/wp-admin/$sub_file" ) ) ) {
+				if ( ! empty($menu_hook) || (('index.php' != $sub_item[2]) && file_exists(WP_PLUGIN_DIR."/$sub_file") && ! file_exists(ABSPATH."/wp-admin/$sub_file"))) {
 					// If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
-					if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) )
-						$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), $item[2] );
+					if (( ! $admin_is_parent && file_exists(WP_PLUGIN_DIR."/$menu_file") && ! is_dir(WP_PLUGIN_DIR."/{$item[2]}")) || file_exists($menu_file))
+						$sub_item_url = add_query_arg(array('page' => $sub_item[2]), $item[2]);
 					else
-						$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), 'admin.php' );
+						$sub_item_url = add_query_arg(array('page' => $sub_item[2]), 'admin.php');
 
-					$sub_item_url = esc_url( $sub_item_url );
+					$sub_item_url = esc_url($sub_item_url);
 					echo "<li$class><a href='$sub_item_url'$class>$title</a></li>";
 				} else {
 					echo "<li$class><a href='{$sub_item[2]}'$class>$title</a></li>";
@@ -234,31 +234,31 @@ 
 		echo "</li>";
 	}
 
-	echo '<li id="collapse-menu" class="hide-if-no-js">' .
-		'<button type="button" id="collapse-button" aria-label="' . esc_attr__( 'Collapse Main menu' ) . '" aria-expanded="true">' .
-		'<span class="collapse-button-icon" aria-hidden="true"></span>' .
-		'<span class="collapse-button-label">' . __( 'Collapse menu' ) . '</span>' .
+	echo '<li id="collapse-menu" class="hide-if-no-js">'.
+		'<button type="button" id="collapse-button" aria-label="'.esc_attr__('Collapse Main menu').'" aria-expanded="true">'.
+		'<span class="collapse-button-icon" aria-hidden="true"></span>'.
+		'<span class="collapse-button-label">'.__('Collapse menu').'</span>'.
 		'</button></li>';
 }
 
 ?>
 
-<div id="adminmenumain" role="navigation" aria-label="<?php esc_attr_e( 'Main menu' ); ?>">
-<a href="#wpbody-content" class="screen-reader-shortcut"><?php _e( 'Skip to main content' ); ?></a>
-<a href="#wp-toolbar" class="screen-reader-shortcut"><?php _e( 'Skip to toolbar' ); ?></a>
+<div id="adminmenumain" role="navigation" aria-label="<?php esc_attr_e('Main menu'); ?>">
+<a href="#wpbody-content" class="screen-reader-shortcut"><?php _e('Skip to main content'); ?></a>
+<a href="#wp-toolbar" class="screen-reader-shortcut"><?php _e('Skip to toolbar'); ?></a>
 <div id="adminmenuback"></div>
 <div id="adminmenuwrap">
 <ul id="adminmenu">
 
 <?php
 
-_wp_menu_output( $menu, $submenu );
+_wp_menu_output($menu, $submenu);
 /**
  * Fires after the admin menu has been output.
  *
  * @since 2.5.0
  */
-do_action( 'adminmenu' );
+do_action('adminmenu');
 
 ?>
 </ul>

src/wp-admin/edit-link-form.php

Braces +7 added lines, -3 removed lines

@@ -7,8 +7,9 @@ 
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( !defined('ABSPATH') ) {
 	die('-1');
+}
 
 if ( ! empty($link_id) ) {
 	$heading = sprintf( __( '<a href="%s">Links</a> / Edit Link' ), 'link-manager.php' );
@@ -139,9 +140,12 @@ 
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="link_id" value="<?php echo (int) $link_id; ?>" />
 <input type="hidden" name="cat_id" value="<?php echo (int) $cat_id ?>" />
-<?php else: ?>
+<?php else {
+	: ?>
 <input type="hidden" name="action" value="add" />
-<?php endif; ?>
+<?php endif;
+}
+?>
 
 </div>
 </div>

Spacing +35 added lines, -35 removed lines

@@ -7,22 +7,22 @@ 
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( ! defined('ABSPATH'))
 	die('-1');
 
-if ( ! empty($link_id) ) {
-	$heading = sprintf( __( '<a href="%s">Links</a> / Edit Link' ), 'link-manager.php' );
+if ( ! empty($link_id)) {
+	$heading = sprintf(__('<a href="%s">Links</a> / Edit Link'), 'link-manager.php');
 	$submit_text = __('Update Link');
 	$form_name = 'editlink';
-	$nonce_action = 'update-bookmark_' . $link_id;
+	$nonce_action = 'update-bookmark_'.$link_id;
 } else {
-	$heading = sprintf( __( '<a href="%s">Links</a> / Add New Link' ), 'link-manager.php' );
+	$heading = sprintf(__('<a href="%s">Links</a> / Add New Link'), 'link-manager.php');
 	$submit_text = __('Add Link');
 	$form_name = 'addlink';
 	$nonce_action = 'add-bookmark';
 }
 
-require_once( ABSPATH . 'wp-admin/includes/meta-boxes.php' );
+require_once(ABSPATH.'wp-admin/includes/meta-boxes.php');
 
 add_meta_box('linksubmitdiv', __('Save'), 'link_submit_meta_box', null, 'side', 'core');
 add_meta_box('linkcategorydiv', __('Categories'), 'link_categories_meta_box', null, 'normal', 'core');
@@ -31,7 +31,7 @@ 
 add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', null, 'normal', 'core');
 
 /** This action is documented in wp-admin/edit-form-advanced.php */
-do_action( 'add_meta_boxes', 'link', $link );
+do_action('add_meta_boxes', 'link', $link);
 
 /**
  * Fires when link-specific meta boxes are added.
@@ -40,64 +40,64 @@ 
  *
  * @param object $link Link object.
  */
-do_action( 'add_meta_boxes_link', $link );
+do_action('add_meta_boxes_link', $link);
 
 /** This action is documented in wp-admin/edit-form-advanced.php */
-do_action( 'do_meta_boxes', 'link', 'normal', $link );
+do_action('do_meta_boxes', 'link', 'normal', $link);
 /** This action is documented in wp-admin/edit-form-advanced.php */
-do_action( 'do_meta_boxes', 'link', 'advanced', $link );
+do_action('do_meta_boxes', 'link', 'advanced', $link);
 /** This action is documented in wp-admin/edit-form-advanced.php */
-do_action( 'do_meta_boxes', 'link', 'side', $link );
+do_action('do_meta_boxes', 'link', 'side', $link);
 
-add_screen_option('layout_columns', array('max' => 2, 'default' => 2) );
+add_screen_option('layout_columns', array('max' => 2, 'default' => 2));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-	'<p>' . __( 'You can add or edit links on this screen by entering information in each of the boxes. Only the link&#8217;s web address and name (the text you want to display on your site as the link) are required fields.' ) . '</p>' .
-	'<p>' . __( 'The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don&#8217;t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '</p>' .
-	'<p>' . __( 'XFN stands for <a href="http://gmpg.org/xfn/">XHTML Friends Network</a>, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking.' ) . '</p>'
-) );
+	'<p>'.__('You can add or edit links on this screen by entering information in each of the boxes. Only the link&#8217;s web address and name (the text you want to display on your site as the link) are required fields.').'</p>'.
+	'<p>'.__('The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don&#8217;t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.').'</p>'.
+	'<p>'.__('XFN stands for <a href="http://gmpg.org/xfn/">XHTML Friends Network</a>, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Links_Add_New_Screen">Documentation on Creating Links</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/Links_Add_New_Screen">Documentation on Creating Links</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
-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>
 
-<a href="link-add.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'link' ); ?></a>
+<a href="link-add.php" class="page-title-action"><?php echo esc_html_x('Add New', 'link'); ?></a>
 
 <hr class="wp-header-end">
 
-<?php if ( isset( $_GET['added'] ) ) : ?>
+<?php if (isset($_GET['added'])) : ?>
 <div id="message" class="updated notice is-dismissible"><p><?php _e('Link added.'); ?></p></div>
 <?php endif; ?>
 
-<form name="<?php echo esc_attr( $form_name ); ?>" id="<?php echo esc_attr( $form_name ); ?>" method="post" action="link.php">
+<form name="<?php echo esc_attr($form_name); ?>" id="<?php echo esc_attr($form_name); ?>" method="post" action="link.php">
 <?php
-if ( ! empty( $link_added ) ) {
+if ( ! empty($link_added)) {
 	echo $link_added;
 }
 
-wp_nonce_field( $nonce_action );
-wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
-wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
+wp_nonce_field($nonce_action);
+wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
+wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false); ?>
 
 <div id="poststuff">
 
 <div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
 <div id="post-body-content">
 <div id="namediv" class="stuffbox">
-<h2><label for="link_name"><?php _ex( 'Name', 'link name' ) ?></label></h2>
+<h2><label for="link_name"><?php _ex('Name', 'link name') ?></label></h2>
 <div class="inside">
 	<input type="text" name="link_name" size="30" maxlength="255" value="<?php echo esc_attr($link->link_name); ?>" id="link_name" />
 	<p><?php _e('Example: Nifty blogging software'); ?></p>
@@ -105,7 +105,7 @@ 
 </div>
 
 <div id="addressdiv" class="stuffbox">
-<h2><label for="link_url"><?php _e( 'Web Address' ) ?></label></h2>
+<h2><label for="link_url"><?php _e('Web Address') ?></label></h2>
 <div class="inside">
 	<input type="text" name="link_url" size="30" maxlength="255" class="code" value="<?php echo esc_attr($link->link_url); ?>" id="link_url" />
 	<p><?php _e('Example: <code>http://wordpress.org/</code> &#8212; don&#8217;t forget the <code>http://</code>'); ?></p>
@@ -113,7 +113,7 @@ 
 </div>
 
 <div id="descriptiondiv" class="stuffbox">
-<h2><label for="link_description"><?php _e( 'Description' ) ?></label></h2>
+<h2><label for="link_description"><?php _e('Description') ?></label></h2>
 <div class="inside">
 	<input type="text" name="link_description" size="30" maxlength="255" value="<?php echo isset($link->link_description) ? esc_attr($link->link_description) : ''; ?>" id="link_description" />
 	<p><?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?></p>
@@ -125,8 +125,8 @@ 
 <?php
 
 /** This action is documented in wp-admin/includes/meta-boxes.php */
-do_action( 'submitlink_box' );
-$side_meta_boxes = do_meta_boxes( 'link', 'side', $link );
+do_action('submitlink_box');
+$side_meta_boxes = do_meta_boxes('link', 'side', $link);
 
 ?>
 </div>
@@ -141,7 +141,7 @@ 
 </div>
 <?php
 
-if ( $link_id ) : ?>
+if ($link_id) : ?>
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="link_id" value="<?php echo (int) $link_id; ?>" />
 <input type="hidden" name="cat_id" value="<?php echo (int) $cat_id ?>" />

src/wp-admin/link-parse-opml.php

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @subpackage Administration
  */
 
-if ( ! defined('ABSPATH') )
+if ( ! defined('ABSPATH') ) {
 	die();
+}
 
 /**
  * @global string $opml

Spacing +16 added lines, -16 removed lines

@@ -6,7 +6,7 @@ 
  * @subpackage Administration
  */
 
-if ( ! defined('ABSPATH') )
+if ( ! defined('ABSPATH'))
 	die();
 
 /**
@@ -33,28 +33,28 @@ 
 function startElement($parser, $tagName, $attrs) {
 	global $names, $urls, $targets, $descriptions, $feeds;
 
-	if ( 'OUTLINE' === $tagName ) {
+	if ('OUTLINE' === $tagName) {
 		$name = '';
-		if ( isset( $attrs['TEXT'] ) ) {
+		if (isset($attrs['TEXT'])) {
 			$name = $attrs['TEXT'];
 		}
-		if ( isset( $attrs['TITLE'] ) ) {
+		if (isset($attrs['TITLE'])) {
 			$name = $attrs['TITLE'];
 		}
 		$url = '';
-		if ( isset( $attrs['URL'] ) ) {
+		if (isset($attrs['URL'])) {
 			$url = $attrs['URL'];
 		}
-		if ( isset( $attrs['HTMLURL'] ) ) {
+		if (isset($attrs['HTMLURL'])) {
 			$url = $attrs['HTMLURL'];
 		}
 
 		// Save the data away.
 		$names[] = $name;
 		$urls[] = $url;
-		$targets[] = isset( $attrs['TARGET'] ) ? $attrs['TARGET'] :  '';
-		$feeds[] = isset( $attrs['XMLURL'] ) ? $attrs['XMLURL'] :  '';
-		$descriptions[] = isset( $attrs['DESCRIPTION'] ) ? $attrs['DESCRIPTION'] :  '';
+		$targets[] = isset($attrs['TARGET']) ? $attrs['TARGET'] : '';
+		$feeds[] = isset($attrs['XMLURL']) ? $attrs['XMLURL'] : '';
+		$descriptions[] = isset($attrs['DESCRIPTION']) ? $attrs['DESCRIPTION'] : '';
 	} // End if outline.
 }
 
@@ -72,9 +72,9 @@ 
 }
 
 // Create an XML parser
-if ( ! function_exists( 'xml_parser_create' ) ) {
-	trigger_error( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );
-	wp_die( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );
+if ( ! function_exists('xml_parser_create')) {
+	trigger_error(__("PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension."));
+	wp_die(__("PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension."));
 }
 
 $xml_parser = xml_parser_create();
@@ -82,12 +82,12 @@ 
 // Set the functions to handle opening and closing tags
 xml_set_element_handler($xml_parser, "startElement", "endElement");
 
-if ( ! xml_parse( $xml_parser, $opml, true ) ) {
+if ( ! xml_parse($xml_parser, $opml, true)) {
 	printf(
 		/* translators: 1: error message, 2: line number */
-		__( 'XML Error: %1$s at line %2$s' ),
-		xml_error_string( xml_get_error_code( $xml_parser ) ),
-		xml_get_current_line_number( $xml_parser )
+		__('XML Error: %1$s at line %2$s'),
+		xml_error_string(xml_get_error_code($xml_parser)),
+		xml_get_current_line_number($xml_parser)
 	);
 }
 

src/wp-admin/link-manager.php

Indentation +3 added lines, -3 removed lines

@@ -45,14 +45,14 @@
 'title'		=> __('Overview'),
 'content'	=>
 	'<p>' . sprintf(__('You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in the WordPress community are included as examples.'), 'widgets.php') . '</p>' .
-    '<p>' . __('Links may be separated into Link Categories; these are different than the categories used on your posts.') . '</p>' .
-    '<p>' . __('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.') . '</p>'
+	'<p>' . __('Links may be separated into Link Categories; these are different than the categories used on your posts.') . '</p>' .
+	'<p>' . __('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.') . '</p>'
 ) );
 get_current_screen()->add_help_tab( array(
 'id'		=> 'deleting-links',
 'title'		=> __('Deleting Links'),
 'content'	=>
-    '<p>' . __('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.') . '</p>'
+	'<p>' . __('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.') . '</p>'
 ) );
 
 get_current_screen()->set_help_sidebar(

Spacing +37 added lines, -37 removed lines

@@ -7,37 +7,37 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
-if ( ! current_user_can( 'manage_links' ) )
-	wp_die( __( 'Sorry, you are not allowed to edit the links for this site.' ) );
+require_once(dirname(__FILE__).'/admin.php');
+if ( ! current_user_can('manage_links'))
+	wp_die(__('Sorry, you are not allowed to edit the links for this site.'));
 
 $wp_list_table = _get_list_table('WP_Links_List_Table');
 
 // Handle bulk deletes
 $doaction = $wp_list_table->current_action();
 
-if ( $doaction && isset( $_REQUEST['linkcheck'] ) ) {
-	check_admin_referer( 'bulk-bookmarks' );
+if ($doaction && isset($_REQUEST['linkcheck'])) {
+	check_admin_referer('bulk-bookmarks');
 
-	$redirect_to = admin_url( 'link-manager.php' );
+	$redirect_to = admin_url('link-manager.php');
 	$bulklinks = (array) $_REQUEST['linkcheck'];
 
-	if ( 'delete' == $doaction ) {
-		foreach ( $bulklinks as $link_id ) {
+	if ('delete' == $doaction) {
+		foreach ($bulklinks as $link_id) {
 			$link_id = (int) $link_id;
 
-			wp_delete_link( $link_id );
+			wp_delete_link($link_id);
 		}
 
-		$redirect_to = add_query_arg( 'deleted', count( $bulklinks ), $redirect_to );
+		$redirect_to = add_query_arg('deleted', count($bulklinks), $redirect_to);
 	} else {
 		/** This action is documented in wp-admin/edit-comments.php */
-		$redirect_to = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $redirect_to, $doaction, $bulklinks );
+		$redirect_to = apply_filters('handle_bulk_actions-'.get_current_screen()->id, $redirect_to, $doaction, $bulklinks);
 	}
-	wp_redirect( $redirect_to );
+	wp_redirect($redirect_to);
 	exit;
-} elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
-	 wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+} elseif ( ! empty($_GET['_wp_http_referer'])) {
+	 wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI'])));
 	 exit;
 }
 
@@ -46,56 +46,56 @@ 
 $title = __('Links');
 $this_file = $parent_file = 'link-manager.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . sprintf(__('You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in the WordPress community are included as examples.'), 'widgets.php') . '</p>' .
-    '<p>' . __('Links may be separated into Link Categories; these are different than the categories used on your posts.') . '</p>' .
-    '<p>' . __('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.') . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.sprintf(__('You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in the WordPress community are included as examples.'), 'widgets.php').'</p>'.
+    '<p>'.__('Links may be separated into Link Categories; these are different than the categories used on your posts.').'</p>'.
+    '<p>'.__('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'deleting-links',
 'title'		=> __('Deleting Links'),
 'content'	=>
-    '<p>' . __('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.') . '</p>'
-) );
+    '<p>'.__('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Links_Screen">Documentation on Managing Links</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/Links_Screen">Documentation on Managing Links</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_list' => __( 'Links list' ),
-) );
+get_current_screen()->set_screen_reader_content(array(
+	'heading_list' => __('Links list'),
+));
 
-include_once( ABSPATH . 'wp-admin/admin-header.php' );
+include_once(ABSPATH.'wp-admin/admin-header.php');
 
-if ( ! current_user_can('manage_links') )
+if ( ! current_user_can('manage_links'))
 	wp_die(__('Sorry, you are not allowed to edit the links for this site.'));
 
 ?>
 
 <div class="wrap nosubsub">
 <h1 class="wp-heading-inline"><?php
-echo esc_html( $title );
+echo esc_html($title);
 ?></h1>
 
-<a href="link-add.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'link' ); ?></a>
+<a href="link-add.php" class="page-title-action"><?php echo esc_html_x('Add New', 'link'); ?></a>
 
 <?php
-if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+if (isset($_REQUEST['s']) && strlen($_REQUEST['s'])) {
 	/* translators: %s: search keywords */
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( wp_unslash( $_REQUEST['s'] ) ) );
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', esc_html(wp_unslash($_REQUEST['s'])));
 }
 ?>
 
 <hr class="wp-header-end">
 
 <?php
-if ( isset($_REQUEST['deleted']) ) {
+if (isset($_REQUEST['deleted'])) {
 	echo '<div id="message" class="updated notice is-dismissible"><p>';
 	$deleted = (int) $_REQUEST['deleted'];
 	printf(_n('%s link deleted.', '%s links deleted', $deleted), $deleted);
@@ -106,7 +106,7 @@ 
 
 <form id="posts-filter" method="get">
 
-<?php $wp_list_table->search_box( __( 'Search Links' ), 'link' ); ?>
+<?php $wp_list_table->search_box(__('Search Links'), 'link'); ?>
 
 <?php $wp_list_table->display(); ?>
 
@@ -116,4 +116,4 @@ 
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +4 added lines, -2 removed lines

@@ -8,8 +8,9 @@ 
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
-if ( ! current_user_can( 'manage_links' ) )
+if ( ! current_user_can( 'manage_links' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to edit the links for this site.' ) );
+}
 
 $wp_list_table = _get_list_table('WP_Links_List_Table');
 
@@ -73,8 +74,9 @@ 
 
 include_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-if ( ! current_user_can('manage_links') )
+if ( ! current_user_can('manage_links') ) {
 	wp_die(__('Sorry, you are not allowed to edit the links for this site.'));
+}
 
 ?>
 

src/wp-admin/ms-themes.php

Spacing +2 added lines, -2 removed lines

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