iqltechnologies / brighty

wp/wp-admin/users.php

Braces +30 added lines, -12 removed lines

@@ -326,8 +326,11 @@ 
 
 		<?php if ( 1 === count( $all_userids ) ) : ?>
 	<p><?php _e( 'You have specified this user for deletion:' ); ?></p>
-		<?php else : ?>
-	<p><?php _e( 'You have specified these users for deletion:' ); ?></p>
+		<?php else {
+    : ?>
+	<p><?php _e( 'You have specified these users for deletion:' );
+}
+?></p>
 		<?php endif; ?>
 
 <ul>
@@ -352,11 +355,17 @@ 
 			if ( ! $users_have_content ) :
 				?>
 			<input type="hidden" name="delete_option" value="delete" />
-			<?php else : ?>
+			<?php else {
+    : ?>
 				<?php if ( 1 == $go_delete ) : ?>
-			<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
-		<?php else : ?>
-			<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
+			<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' );
+}
+?></legend></p>
+		<?php else {
+    : ?>
+			<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' );
+}
+?></legend></p>
 		<?php endif; ?>
 		<ul style="list-style:none;">
 			<li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
@@ -389,8 +398,11 @@ 
 			?>
 	<input type="hidden" name="action" value="dodelete" />
 			<?php submit_button( __( 'Confirm Deletion' ), 'primary' ); ?>
-	<?php else : ?>
-	<p><?php _e( 'There are no valid users selected for deletion.' ); ?></p>
+	<?php else {
+    : ?>
+	<p><?php _e( 'There are no valid users selected for deletion.' );
+}
+?></p>
 	<?php endif; ?>
 	</div>
 	</form>
@@ -463,8 +475,11 @@ 
 
 		<?php if ( 1 === count( $userids ) ) : ?>
 	<p><?php _e( 'You have specified this user for removal:' ); ?></p>
-		<?php else : ?>
-	<p><?php _e( 'You have specified these users for removal:' ); ?></p>
+		<?php else {
+    : ?>
+	<p><?php _e( 'You have specified these users for removal:' );
+}
+?></p>
 		<?php endif; ?>
 
 <ul>
@@ -487,8 +502,11 @@ 
 		<?php if ( $go_remove ) : ?>
 		<input type="hidden" name="action" value="doremove" />
 			<?php submit_button( __( 'Confirm Removal' ), 'primary' ); ?>
-	<?php else : ?>
-	<p><?php _e( 'There are no valid users selected for removal.' ); ?></p>
+	<?php else {
+    : ?>
+	<p><?php _e( 'There are no valid users selected for removal.' );
+}
+?></p>
 	<?php endif; ?>
 	</div>
 	</form>

wp/wp-admin/my-sites.php

Braces +3 added lines, -1 removed lines

@@ -77,7 +77,8 @@ 
 	echo '<p>';
 	_e( 'You must be a member of at least one site to use this page.' );
 	echo '</p>';
-else :
+else {
+    :
 	?>
 
 <hr class="wp-header-end">
@@ -85,6 +86,7 @@ 
 <form id="myblogs" method="post">
 	<?php
 	choose_primary_blog();
+}
 	/**
 	 * Fires before the sites list on the My Sites screen.
 	 *

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

Braces +47 added lines, -17 removed lines

@@ -55,7 +55,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)));
@@ -85,7 +87,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;
 	}
@@ -95,19 +99,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) {
@@ -135,8 +145,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","cannot get control socket information", socket_strerror(socket_last_error($this->_ftp_control_sock)));
@@ -172,8 +183,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);
@@ -185,18 +199,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);
@@ -209,14 +233,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)));

wp/wp-admin/includes/ms.php

Braces +10 added lines, -4 removed lines

@@ -872,8 +872,11 @@ 
 
 	<?php if ( 1 === count( $users ) ) : ?>
 		<p><?php _e( 'You have chosen to delete the user from all networks and sites.' ); ?></p>
-	<?php else : ?>
-		<p><?php _e( 'You have chosen to delete the following users from all networks and sites.' ); ?></p>
+	<?php else {
+    : ?>
+		<p><?php _e( 'You have chosen to delete the following users from all networks and sites.' );
+}
+?></p>
 	<?php endif; ?>
 
 	<form action="users.php?action=dodelete" method="post">
@@ -991,8 +994,11 @@ 
 	if ( 1 === count( $users ) ) :
 		?>
 		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, the user will be permanently removed.' ); ?></p>
-	<?php else : ?>
-		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.' ); ?></p>
+	<?php else {
+    : ?>
+		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.' );
+}
+?></p>
 		<?php
 	endif;
 

wp/wp-admin/includes/upgrade.php

Braces +3 added lines, -1 removed lines

@@ -900,8 +900,10 @@
 			$done_posts[] = $done_id->post_id;
 		endforeach;
 		$catwhere = ' AND ID NOT IN (' . implode( ',', $done_posts ) . ')';
-	else :
+	else {
+	    :
 		$catwhere = '';
+	}
 	endif;
 
 	$allposts = $wpdb->get_results( "SELECT ID, post_category FROM $wpdb->posts WHERE post_category != '0' $catwhere" );

wp/wp-admin/includes/class-custom-image-header.php

Braces +5 added lines, -2 removed lines

@@ -697,8 +697,11 @@
 <td>
 			<?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
 	<p><?php _e( 'If you don&lsquo;t want to upload your own image, you can use one of these cool headers, or show a random one.' ); ?></p>
-	<?php else : ?>
-	<p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ); ?></p>
+	<?php else {
+    : ?>
+	<p><?php _e( 'You can use one of these cool headers or show a random one on each page.' );
+}
+?></p>
 	<?php endif; ?>
 			<?php
 			$this->show_header_selector( 'default' );

wp/wp-admin/includes/deprecated.php

Braces +98 added lines, -67 removed lines

@@ -136,8 +136,9 @@ 
  */
 function wp_dropdown_cats( $current_cat = 0, $current_parent = 0, $category_parent = 0, $level = 0, $categories = 0 ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_dropdown_categories()' );
-	if (!$categories )
-		$categories = get_categories( array('hide_empty' => 0) );
+	if (!$categories ) {
+			$categories = get_categories( array('hide_empty' => 0) );
+	}
 
 	if ( $categories ) {
 		foreach ( $categories as $category ) {
@@ -145,8 +146,9 @@ 
 				$pad = str_repeat( '– ', $level );
 				$category->name = esc_html( $category->name );
 				echo "\n\t<option value='$category->term_id'";
-				if ( $current_parent == $category->term_id )
-					echo " selected='selected'";
+				if ( $current_parent == $category->term_id ) {
+									echo " selected='selected'";
+				}
 				echo ">$pad$category->name</option>";
 				wp_dropdown_cats( $current_cat, $current_parent, $category->term_id, $level +1, $categories );
 			}
@@ -235,10 +237,12 @@ 
 	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
 
 	global $wpdb;
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // WPMU site admins don't have user_levels.
+	if ( !is_multisite() ) {
+			$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	} else {
+			$level_key = $wpdb->get_blog_prefix() . 'capabilities';
+	}
+	// WPMU site admins don't have user_levels.
 
 	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key) );
 }
@@ -286,25 +290,30 @@ 
 
 	global $wpdb;
 
-	if ( ! $user = get_userdata( $user_id ) )
-		return array();
+	if ( ! $user = get_userdata( $user_id ) ) {
+			return array();
+	}
 	$post_type_obj = get_post_type_object($post_type);
 
 	if ( ! $user->has_cap($post_type_obj->cap->edit_others_posts) ) {
-		if ( $user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros )
-			return array($user->ID);
-		else
-			return array();
+		if ( $user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros ) {
+					return array($user->ID);
+		} else {
+					return array();
+		}
 	}
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // WPMU site admins don't have user_levels.
+	if ( !is_multisite() ) {
+			$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	} else {
+			$level_key = $wpdb->get_blog_prefix() . 'capabilities';
+	}
+	// WPMU site admins don't have user_levels.
 
 	$query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s", $level_key);
-	if ( $exclude_zeros )
-		$query .= " AND meta_value != '0'";
+	if ( $exclude_zeros ) {
+			$query .= " AND meta_value != '0'";
+	}
 
 	return $wpdb->get_col( $query );
 }
@@ -321,10 +330,12 @@ 
 
 	global $wpdb;
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // WPMU site admins don't have user_levels.
+	if ( !is_multisite() ) {
+			$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	} else {
+			$level_key = $wpdb->get_blog_prefix() . 'capabilities';
+	}
+	// WPMU site admins don't have user_levels.
 
 	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) );
 }
@@ -536,8 +547,9 @@ 
 		if ( $this->search_term ) {
 			$searches = array();
 			$search_sql = 'AND (';
-			foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col )
-				$searches[] = $wpdb->prepare( $col . ' LIKE %s', '%' . like_escape($this->search_term) . '%' );
+			foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col ) {
+							$searches[] = $wpdb->prepare( $col . ' LIKE %s', '%' . like_escape($this->search_term) . '%' );
+			}
 			$search_sql .= implode(' OR ', $searches);
 			$search_sql .= ')';
 		}
@@ -568,10 +580,13 @@ 
 
 		$this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
 
-		if ( $this->results )
-			$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where); // No limit.
-		else
-			$this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));
+		if ( $this->results ) {
+					$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where);
+		}
+		// No limit.
+		else {
+					$this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));
+		}
 	}
 
 	/**
@@ -591,10 +606,12 @@ 
 	public function do_paging() {
 		if ( $this->total_users_for_query > $this->users_per_page ) { // Have to page the results.
 			$args = array();
-			if ( ! empty($this->search_term) )
-				$args['usersearch'] = urlencode($this->search_term);
-			if ( ! empty($this->role) )
-				$args['role'] = urlencode($this->role);
+			if ( ! empty($this->search_term) ) {
+							$args['usersearch'] = urlencode($this->search_term);
+			}
+			if ( ! empty($this->role) ) {
+							$args['role'] = urlencode($this->role);
+			}
 
 			$this->paging_text = paginate_links( array(
 				'total' => ceil($this->total_users_for_query / $this->users_per_page),
@@ -651,8 +668,9 @@ 
 	 * @return bool
 	 */
 	function results_are_paged() {
-		if ( $this->paging_text )
-			return true;
+		if ( $this->paging_text ) {
+					return true;
+		}
 		return false;
 	}
 
@@ -665,8 +683,9 @@ 
 	 * @return bool
 	 */
 	function is_search() {
-		if ( $this->search_term )
-			return true;
+		if ( $this->search_term ) {
+					return true;
+		}
 		return false;
 	}
 }
@@ -693,10 +712,11 @@ 
 
 	$editable = get_editable_user_ids( $user_id );
 
-	if ( in_array($type, array('draft', 'pending')) )
-		$type_sql = " post_status = '$type' ";
-	else
-		$type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
+	if ( in_array($type, array('draft', 'pending')) ) {
+			$type_sql = " post_status = '$type' ";
+	} else {
+			$type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
+	}
 
 	$dir = ( 'pending' == $type ) ? 'ASC' : 'DESC';
 
@@ -764,8 +784,9 @@ 
 
 	static $num = 1;
 
-	if ( ! class_exists( '_WP_Editors', false ) )
-		require_once ABSPATH . WPINC . '/class-wp-editor.php';
+	if ( ! class_exists( '_WP_Editors', false ) ) {
+			require_once ABSPATH . WPINC . '/class-wp-editor.php';
+	}
 
 	$editor_id = 'content' . $num++;
 
@@ -821,8 +842,9 @@ 
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
-		return '';
+	if ( ! $current_screen ) {
+			return '';
+	}
 
 	ob_start();
 	$current_screen->render_screen_layout();
@@ -841,8 +863,9 @@ 
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
-		return '';
+	if ( ! $current_screen ) {
+			return '';
+	}
 
 	ob_start();
 	$current_screen->render_per_page_options();
@@ -992,8 +1015,9 @@ 
 function add_contextual_help( $screen, $help ) {
 	_deprecated_function( __FUNCTION__, '3.3.0', 'get_current_screen()->add_help_tab()' );
 
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	WP_Screen::add_old_compat_help( $screen, $help );
 }
@@ -1157,8 +1181,9 @@ 
 function wp_update_core($current, $feedback = '') {
 	_deprecated_function( __FUNCTION__, '3.7.0', 'new Core_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+	if ( !empty($feedback) ) {
+			add_filter('update_feedback', $feedback);
+	}
 
 	require ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 	$upgrader = new Core_Upgrader();
@@ -1180,8 +1205,9 @@ 
 function wp_update_plugin($plugin, $feedback = '') {
 	_deprecated_function( __FUNCTION__, '3.7.0', 'new Plugin_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+	if ( !empty($feedback) ) {
+			add_filter('update_feedback', $feedback);
+	}
 
 	require ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 	$upgrader = new Plugin_Upgrader();
@@ -1202,8 +1228,9 @@ 
 function wp_update_theme($theme, $feedback = '') {
 	_deprecated_function( __FUNCTION__, '3.7.0', 'new Theme_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+	if ( !empty($feedback) ) {
+			add_filter('update_feedback', $feedback);
+	}
 
 	require ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 	$upgrader = new Theme_Upgrader();
@@ -1334,16 +1361,18 @@ 
 	echo '<ul>';
 
 	foreach ( array( $popular ) as $feed ) {
-		if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() )
-			continue;
+		if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() ) {
+					continue;
+		}
 
 		$items = $feed->get_items(0, 5);
 
 		// Pick a random, non-installed plugin.
 		while ( true ) {
 			// Abort this foreach loop iteration if there's no plugins left of this type.
-			if ( 0 === count($items) )
-				continue 2;
+			if ( 0 === count($items) ) {
+							continue 2;
+			}
 
 			$item_key = array_rand($items);
 			$item = $items[$item_key];
@@ -1351,9 +1380,9 @@ 
 			list($link, $frag) = explode( '#', $item->get_link() );
 
 			$link = esc_url($link);
-			if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) )
-				$slug = $matches[1];
-			else {
+			if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) ) {
+							$slug = $matches[1];
+			} else {
 				unset( $items[$item_key] );
 				continue;
 			}
@@ -1372,11 +1401,13 @@ 
 		}
 
 		// Eliminate some common badly formed plugin descriptions.
-		while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) )
-			unset($items[$item_key]);
+		while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) ) {
+					unset($items[$item_key]);
+		}
 
-		if ( !isset($items[$item_key]) )
-			continue;
+		if ( !isset($items[$item_key]) ) {
+					continue;
+		}
 
 		$raw_title = $item->get_title();
 

wp/wp-admin/includes/class-pclzip.php

Braces +121 added lines, -170 removed lines

@@ -328,8 +328,7 @@ 
         // ----- Look for the optional second argument
         if ($v_size == 2) {
           $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
+        } else if ($v_size > 2) {
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
 		                       "Invalid number / type of arguments");
           return 0;
@@ -378,8 +377,7 @@ 
       foreach ($v_string_list as $v_string) {
         if ($v_string != '') {
           $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-        }
-        else {
+        } else {
         }
       }
     }
@@ -513,8 +511,7 @@ 
         // ----- Look for the optional second argument
         if ($v_size == 2) {
           $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
+        } else if ($v_size > 2) {
           // ----- Error log
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
 
@@ -790,8 +787,7 @@ 
         // ----- Look for the optional second argument
         if ($v_size == 2) {
           $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
+        } else if ($v_size > 2) {
           // ----- Error log
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
 
@@ -935,8 +931,7 @@ 
         }
         if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
           $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-        }
-        else {
+        } else {
         }
       }
 
@@ -951,8 +946,7 @@ 
         // ----- Look for the optional second argument
         if ($v_size == 2) {
           $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
+        } else if ($v_size > 2) {
           // ----- Error log
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
 
@@ -1188,8 +1182,7 @@ 
         // ----- Error log
         PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
         $v_result = PCLZIP_ERR_MISSING_FILE;
-      }
-      else {
+      } else {
         // ----- Duplicate the archive
         $v_result = $this->privDuplicate($p_archive);
       }
@@ -1277,8 +1270,7 @@ 
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       return(PclErrorCode());
-    }
-    else {
+    } else {
       return($this->error_code);
     }
   }
@@ -1316,15 +1308,13 @@ 
 
     if (isset($v_name[$this->error_code])) {
       $v_value = $v_name[$this->error_code];
-    }
-    else {
+    } else {
       $v_value = 'NoName';
     }
 
     if ($p_with_code) {
       return($v_value.' ('.$this->error_code.')');
-    }
-    else {
+    } else {
       return($v_value);
     }
   }
@@ -1339,12 +1329,10 @@ 
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       return(PclErrorString());
-    }
-    else {
+    } else {
       if ($p_full) {
         return($this->errorName(true)." : ".$this->error_string);
-      }
-      else {
+      } else {
         return($this->error_string." [code ".$this->error_code."]");
       }
     }
@@ -1529,8 +1517,7 @@ 
               && ($p_options_list[$i+1] != '')) {
             $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
             $i++;
-          }
-          else {
+          } else {
           }
         break;
 
@@ -1548,11 +1535,9 @@ 
           // ----- Get the value
           if (is_string($p_options_list[$i+1])) {
               $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
+          } else if (is_array($p_options_list[$i+1])) {
               $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
+          } else {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1581,8 +1566,7 @@ 
           // ----- Get the value
           if (is_string($p_options_list[$i+1])) {
               $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
+          } else {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1611,8 +1595,7 @@ 
           // ----- Get the value
           if (is_string($p_options_list[$i+1])) {
               $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
+          } else {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
 			                     "Wrong parameter value for option '"
@@ -1645,14 +1628,11 @@ 
 
               // ----- Parse items
               $v_work_list = explode(",", $p_options_list[$i+1]);
-          }
-          else if (is_integer($p_options_list[$i+1])) {
+          } else if (is_integer($p_options_list[$i+1])) {
               $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
+          } else if (is_array($p_options_list[$i+1])) {
               $v_work_list = $p_options_list[$i+1];
-          }
-          else {
+          } else {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1679,13 +1659,11 @@ 
                   // ----- Set the option value
                   $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
                   $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
-              }
-              elseif ($v_size_item_list == 2) {
+              } elseif ($v_size_item_list == 2) {
                   // ----- Set the option value
                   $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
                   $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
-              }
-              else {
+              } else {
                   // ----- Error log
                   PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1842,14 +1820,17 @@ 
     $v_memory_limit_int = (int) $v_memory_limit;
     $last = strtolower(substr($v_memory_limit, -1));
 
-    if($last == 'g')
-        //$v_memory_limit_int = $v_memory_limit_int*1024*1024*1024;
+    if($last == 'g') {
+            //$v_memory_limit_int = $v_memory_limit_int*1024*1024*1024;
         $v_memory_limit_int = $v_memory_limit_int*1073741824;
-    if($last == 'm')
-        //$v_memory_limit_int = $v_memory_limit_int*1024*1024;
+    }
+    if($last == 'm') {
+            //$v_memory_limit_int = $v_memory_limit_int*1024*1024;
         $v_memory_limit_int = $v_memory_limit_int*1048576;
-    if($last == 'k')
-        $v_memory_limit_int = $v_memory_limit_int*1024;
+    }
+    if($last == 'k') {
+            $v_memory_limit_int = $v_memory_limit_int*1024;
+    }
 
     $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit_int*PCLZIP_TEMPORARY_FILE_RATIO);
 
@@ -2022,15 +2003,12 @@ 
       if (file_exists($v_descr['filename'])) {
         if (@is_file($v_descr['filename'])) {
           $v_descr['type'] = 'file';
-        }
-        else if (@is_dir($v_descr['filename'])) {
+        } else if (@is_dir($v_descr['filename'])) {
           $v_descr['type'] = 'folder';
-        }
-        else if (@is_link($v_descr['filename'])) {
+        } else if (@is_link($v_descr['filename'])) {
           // skip
           continue;
-        }
-        else {
+        } else {
           // skip
           continue;
         }
@@ -2079,8 +2057,7 @@ 
                  && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
               if ($v_descr['stored_filename'] != '') {
                 $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
-              }
-              else {
+              } else {
                 $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
               }
             }
@@ -2089,8 +2066,7 @@ 
           }
 
           @closedir($v_folder_handler);
-        }
-        else {
+        } else {
           // TBC : unable to open folder in read mode
         }
 
@@ -2103,8 +2079,7 @@ 
 
           // ----- Concat the resulting list
           $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
-        }
-        else {
+        } else {
         }
 
         // ----- Free local array
@@ -2378,8 +2353,9 @@ 
   {
     $v_result=1;
 
-    if ($this->zip_fd != 0)
-      @fclose($this->zip_fd);
+    if ($this->zip_fd != 0) {
+          @fclose($this->zip_fd);
+    }
     $this->zip_fd = 0;
 
     // ----- Return
@@ -2596,11 +2572,9 @@ 
     // ----- Look for filetime
     if (isset($p_filedescr['mtime'])) {
       $p_header['mtime'] = $p_filedescr['mtime'];
-    }
-    else if ($p_filedescr['type'] == 'virtual_file') {
+    } else if ($p_filedescr['type'] == 'virtual_file') {
       $p_header['mtime'] = time();
-    }
-    else {
+    } else {
       $p_header['mtime'] = filemtime($p_filename);
     }
 
@@ -2608,8 +2582,7 @@ 
     if (isset($p_filedescr['comment'])) {
       $p_header['comment_len'] = strlen($p_filedescr['comment']);
       $p_header['comment'] = $p_filedescr['comment'];
-    }
-    else {
+    } else {
       $p_header['comment_len'] = 0;
       $p_header['comment'] = '';
     }
@@ -2676,8 +2649,7 @@ 
         // ----- Read the file content
         if ($p_header['size'] > 0) {
           $v_content = @fread($v_file, $p_header['size']);
-        }
-        else {
+        } else {
           $v_content = '';
         }
 
@@ -2923,20 +2895,17 @@ 
     $p_filename = $p_filedescr['filename'];
     if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
       $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
-    }
-    else {
+    } else {
       $p_add_dir = '';
     }
     if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
       $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
-    }
-    else {
+    } else {
       $p_remove_dir = '';
     }
     if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
       $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-    }
-    else {
+    } else {
       $p_remove_all_dir = 0;
     }
 
@@ -2959,8 +2928,7 @@ 
           $v_dir = $v_path_info['dirname'].'/';
         }
         $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
-      }
-      else {
+      } else {
         // ----- Calculate the stored filename
         $v_stored_filename = $p_filename;
       }
@@ -2971,8 +2939,9 @@ 
       }
       // ----- Look for partial path remove
       else if ($p_remove_dir != "") {
-        if (substr($p_remove_dir, -1) != '/')
-          $p_remove_dir .= "/";
+        if (substr($p_remove_dir, -1) != '/') {
+                  $p_remove_dir .= "/";
+        }
 
         if (   (substr($p_filename, 0, 2) == "./")
             || (substr($p_remove_dir, 0, 2) == "./")) {
@@ -2992,8 +2961,7 @@ 
         if ($v_compare > 0) {
           if ($v_compare == 2) {
             $v_stored_filename = "";
-          }
-          else {
+          } else {
             $v_stored_filename = substr($v_stored_filename,
                                         strlen($p_remove_dir));
           }
@@ -3005,10 +2973,11 @@ 
 
       // ----- Look for path to add
       if ($p_add_dir != "") {
-        if (substr($p_add_dir, -1) == "/")
-          $v_stored_filename = $p_add_dir.$v_stored_filename;
-        else
-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
+        if (substr($p_add_dir, -1) == "/") {
+                  $v_stored_filename = $p_add_dir.$v_stored_filename;
+        } else {
+                  $v_stored_filename = $p_add_dir."/".$v_stored_filename;
+        }
       }
     }
 
@@ -3291,8 +3260,9 @@ 
     if (   ($p_path == "")
 	    || (   (substr($p_path, 0, 1) != "/")
 		    && (substr($p_path, 0, 3) != "../")
-			&& (substr($p_path,1,2)!=":/")))
-      $p_path = "./".$p_path;
+			&& (substr($p_path,1,2)!=":/"))) {
+          $p_path = "./".$p_path;
+    }
 
     // ----- Reduce the path last (and duplicated) '/'
     if (($p_path != "./") && ($p_path != "/"))
@@ -3778,8 +3748,7 @@ 
         // ----- Change the file status
         if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
 		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
-	  	  }
-		    else {
+	  	  } else {
             $p_entry['status'] = "newer_exist";
 
             // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
@@ -3795,19 +3764,19 @@ 
                 return PclZip::errorCode();
 		      }
 		    }
-      }
-      else {
+      } else {
       }
     }
 
     // ----- Check the directory availability and create it if necessary
     else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
-        $v_dir_to_check = $p_entry['filename'];
-      else if (!strstr($p_entry['filename'], "/"))
-        $v_dir_to_check = "";
-      else
-        $v_dir_to_check = dirname($p_entry['filename']);
+      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/')) {
+              $v_dir_to_check = $p_entry['filename'];
+      } else if (!strstr($p_entry['filename'], "/")) {
+              $v_dir_to_check = "";
+      } else {
+              $v_dir_to_check = dirname($p_entry['filename']);
+      }
 
         if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
 
@@ -3863,8 +3832,7 @@ 
           touch($p_entry['filename'], $p_entry['mtime']);
 
 
-        }
-        else {
+        } else {
           // ----- TBC
           // Need to be finished
           if (($p_entry['flag'] & 1) == 1) {
@@ -3891,8 +3859,7 @@ 
             // ----- Read the compressed file in a buffer (one shot)
             if ($p_entry['compressed_size'] > 0) {
               $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-            }
-            else {
+            } else {
               $v_buffer = '';
             }
 
@@ -4108,22 +4075,19 @@ 
           // ----- Read the file in a buffer (one shot)
           if ($p_entry['compressed_size'] > 0) {
             $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-          }
-          else {
+          } else {
             $v_buffer = '';
           }
 
           // ----- Send the file to the output
           echo $v_buffer;
           unset($v_buffer);
-        }
-        else {
+        } else {
 
           // ----- Read the compressed file in a buffer (one shot)
           if ($p_entry['compressed_size'] > 0) {
             $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-          }
-          else {
+          } else {
             $v_buffer = '';
           }
 
@@ -4231,18 +4195,15 @@ 
           // ----- Reading the file
           if ($p_entry['compressed_size'] > 0) {
             $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
-          }
-          else {
+          } else {
             $p_string = '';
           }
-        }
-        else {
+        } else {
 
           // ----- Reading the file
           if ($p_entry['compressed_size'] > 0) {
             $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
-          }
-          else {
+          } else {
             $v_data = '';
           }
 
@@ -4253,8 +4214,7 @@ 
         }
 
         // ----- Trace
-      }
-      else {
+      } else {
           // TBC : error : can not extract a folder in a string
       }
 
@@ -4346,8 +4306,7 @@ 
     // ----- Get extra_fields
     if ($v_data['extra_len'] != 0) {
       $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
-    }
-    else {
+    } else {
       $p_header['extra'] = '';
     }
 
@@ -4378,8 +4337,7 @@ 
       // ----- Get UNIX date format
       $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
 
-    }
-    else
+    } else
     {
       $p_header['mtime'] = time();
     }
@@ -4444,22 +4402,25 @@ 
     $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
 
     // ----- Get filename
-    if ($p_header['filename_len'] != 0)
-      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
-    else
-      $p_header['filename'] = '';
+    if ($p_header['filename_len'] != 0) {
+          $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
+    } else {
+          $p_header['filename'] = '';
+    }
 
     // ----- Get extra
-    if ($p_header['extra_len'] != 0)
-      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
-    else
-      $p_header['extra'] = '';
+    if ($p_header['extra_len'] != 0) {
+          $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
+    } else {
+          $p_header['extra'] = '';
+    }
 
     // ----- Get comment
-    if ($p_header['comment_len'] != 0)
-      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
-    else
-      $p_header['comment'] = '';
+    if ($p_header['comment_len'] != 0) {
+          $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
+    } else {
+          $p_header['comment'] = '';
+    }
 
     // ----- Extract properties
 
@@ -4481,8 +4442,7 @@ 
       // ----- Get UNIX date format
       $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
 
-    }
-    else
+    } else
     {
       $p_header['mtime'] = time();
     }
@@ -4595,8 +4555,9 @@ 
     // ----- Go back to the maximum possible size of the Central Dir End Record
     if (!$v_found) {
       $v_maximum_size = 65557; // 0xFFFF + 22;
-      if ($v_maximum_size > $v_size)
-        $v_maximum_size = $v_size;
+      if ($v_maximum_size > $v_size) {
+              $v_maximum_size = $v_size;
+      }
       @fseek($this->zip_fd, $v_size-$v_maximum_size);
       if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
       {
@@ -4681,9 +4642,9 @@ 
     // ----- Get comment
     if ($v_data['comment_size'] != 0) {
       $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
+    } else {
+          $p_central_dir['comment'] = '';
     }
-    else
-      $p_central_dir['comment'] = '';
 
     $p_central_dir['entries'] = $v_data['entries'];
     $p_central_dir['disk_entries'] = $v_data['disk_entries'];
@@ -4783,8 +4744,7 @@ 
                   if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
                       && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                       $v_found = true;
-                  }
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
+                  } elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
                           && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                       $v_found = true;
                   }
@@ -4835,8 +4795,7 @@ 
                   break;
               }
           }
-      }
-      else {
+      } else {
       	$v_found = true;
       }
 
@@ -4844,8 +4803,7 @@ 
       if ($v_found)
       {
         unset($v_header_list[$v_nb_extracted]);
-      }
-      else
+      } else
       {
         $v_nb_extracted++;
       }
@@ -5321,8 +5279,7 @@ 
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       PclError($p_error_code, $p_error_string);
-    }
-    else {
+    } else {
       $this->error_code = $p_error_code;
       $this->error_string = $p_error_string;
     }
@@ -5338,8 +5295,7 @@ 
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       PclErrorReset();
-    }
-    else {
+    } else {
       $this->error_code = 0;
       $this->error_string = '';
     }
@@ -5447,11 +5403,9 @@ 
         if ($v_list[$i] == ".") {
           // ----- Ignore this directory
           // Should be the first $i=0, but no check is done
-        }
-        else if ($v_list[$i] == "..") {
+        } else if ($v_list[$i] == "..") {
 		  $v_skip++;
-        }
-        else if ($v_list[$i] == "") {
+        } else if ($v_list[$i] == "") {
 		  // ----- First '/' i.e. root slash
 		  if ($i == 0) {
             $v_result = "/".$v_result;
@@ -5471,13 +5425,11 @@ 
             // ----- Ignore only the double '//' in path,
             // but not the first and last '/'
 		  }
-        }
-        else {
+        } else {
 		  // ----- Look for item to skip
 		  if ($v_skip > 0) {
 		    $v_skip--;
-		  }
-		  else {
+		  } else {
             $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
 		  }
         }
@@ -5560,14 +5512,17 @@ 
     // ----- Look if everything seems to be the same
     if ($v_result) {
       // ----- Skip all the empty items
-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
-      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
+      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) {
+          $j++;
+      }
+      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) {
+          $i++;
+      }
 
       if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
         // ----- There are exactly the same
         $v_result = 2;
-      }
-      else if ($i < $v_list_dir_size) {
+      } else if ($i < $v_list_dir_size) {
         // ----- The path is shorter than the dir
         $v_result = 0;
       }
@@ -5602,8 +5557,7 @@ 
         @fwrite($p_dest, $v_buffer, $v_read_size);
         $p_size -= $v_read_size;
       }
-    }
-    else if ($p_mode==1)
+    } else if ($p_mode==1)
     {
       while ($p_size != 0)
       {
@@ -5612,8 +5566,7 @@ 
         @fwrite($p_dest, $v_buffer, $v_read_size);
         $p_size -= $v_read_size;
       }
-    }
-    else if ($p_mode==2)
+    } else if ($p_mode==2)
     {
       while ($p_size != 0)
       {
@@ -5622,8 +5575,7 @@ 
         @gzwrite($p_dest, $v_buffer, $v_read_size);
         $p_size -= $v_read_size;
       }
-    }
-    else if ($p_mode==3)
+    } else if ($p_mode==3)
     {
       while ($p_size != 0)
       {
@@ -5661,8 +5613,7 @@ 
       // ----- Try to copy & unlink the src
       if (!@copy($p_src, $p_dest)) {
         $v_result = 0;
-      }
-      else if (!@unlink($p_src)) {
+      } else if (!@unlink($p_src)) {
         $v_result = 0;
       }
     }

wp/wp-admin/includes/class-wp-posts-list-table.php

Braces +20 added lines, -8 removed lines

@@ -1624,10 +1624,13 @@ 
 							<div id="bulk-titles"></div>
 						</div>
 
-					<?php else : // $bulk ?>
+					<?php else {
+    : // $bulk ?>
 
 						<label>
-							<span class="title"><?php _e( 'Title' ); ?></span>
+							<span class="title"><?php _e( 'Title' );
+}
+?></span>
 							<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
 						</label>
 
@@ -1881,7 +1884,8 @@ 
 
 						</div>
 
-					<?php else : // $bulk ?>
+					<?php else {
+    : // $bulk ?>
 
 						<div class="inline-edit-group wp-clearfix">
 
@@ -1889,7 +1893,9 @@ 
 
 							<label class="alignleft">
 								<input type="checkbox" name="comment_status" value="open" />
-								<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
+								<span class="checkbox-title"><?php _e( 'Allow Comments' );
+}
+?></span>
 							</label>
 
 						<?php endif; ?>
@@ -1944,11 +1950,14 @@ 
 									</select>
 								</label>
 
-							<?php else : // $bulk ?>
+							<?php else {
+    : // $bulk ?>
 
 								<label class="alignleft">
 									<input type="checkbox" name="sticky" value="sticky" />
-									<span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
+									<span class="checkbox-title"><?php _e( 'Make this post sticky' );
+}
+?></span>
 								</label>
 
 							<?php endif; // $bulk ?>
@@ -2017,8 +2026,11 @@ 
 				<?php if ( ! $bulk ) : ?>
 					<?php wp_nonce_field( 'inlineeditnonce', '_inline_edit', false ); ?>
 					<button type="button" class="button button-primary save"><?php _e( 'Update' ); ?></button>
-				<?php else : ?>
-					<?php submit_button( __( 'Update' ), 'primary', 'bulk_edit', false ); ?>
+				<?php else {
+    : ?>
+					<?php submit_button( __( 'Update' ), 'primary', 'bulk_edit', false );
+}
+?>
 				<?php endif; ?>
 
 				<button type="button" class="button cancel"><?php _e( 'Cancel' ); ?></button>