ntwb / wordpress

src/wp-admin/link-manager.php

Spacing +33 added lines, -33 removed lines

@@ -7,31 +7,31 @@ 
  */
 
 /** 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');
 
-	if ( 'delete' == $doaction ) {
+	if ('delete' == $doaction) {
 		$bulklinks = (array) $_REQUEST['linkcheck'];
-		foreach ( $bulklinks as $link_id ) {
+		foreach ($bulklinks as $link_id) {
 			$link_id = (int) $link_id;
 
-			wp_delete_link( $link_id );
+			wp_delete_link($link_id);
 		}
 
-		wp_redirect( add_query_arg('deleted', count( $bulklinks ), admin_url( 'link-manager.php' ) ) );
+		wp_redirect(add_query_arg('deleted', count($bulklinks), admin_url('link-manager.php')));
 		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;
 }
 
@@ -40,49 +40,49 @@ 
 $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" target="_blank">Documentation on Managing Links</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Links_Screen" target="_blank">Documentation on Managing Links</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">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><?php echo esc_html( $title ); ?> <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'] ) ) {
+<h1><?php echo esc_html($title); ?> <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'])) {
 	/* 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'])));
 }
 ?>
 </h1>
 
 <?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);
@@ -93,7 +93,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(); ?>
 
@@ -103,4 +103,4 @@ 
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/theme-install.php

Spacing +109 added lines, -109 removed lines

@@ -7,60 +7,60 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
-require( ABSPATH . 'wp-admin/includes/theme-install.php' );
+require_once(dirname(__FILE__).'/admin.php');
+require(ABSPATH.'wp-admin/includes/theme-install.php');
 
-wp_reset_vars( array( 'tab' ) );
+wp_reset_vars(array('tab'));
 
-if ( ! current_user_can('install_themes') )
-	wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
+if ( ! current_user_can('install_themes'))
+	wp_die(__('Sorry, you are not allowed to install themes on this site.'));
 
-if ( is_multisite() && ! is_network_admin() ) {
-	wp_redirect( network_admin_url( 'theme-install.php' ) );
+if (is_multisite() && ! is_network_admin()) {
+	wp_redirect(network_admin_url('theme-install.php'));
 	exit();
 }
 
-$title = __( 'Add Themes' );
+$title = __('Add Themes');
 $parent_file = 'themes.php';
 
-if ( ! is_network_admin() ) {
+if ( ! is_network_admin()) {
 	$submenu_file = 'themes.php';
 }
 
 $installed_themes = search_theme_directories();
-foreach ( $installed_themes as $k => $v ) {
-	if ( false !== strpos( $k, '/' ) ) {
-		unset( $installed_themes[ $k ] );
+foreach ($installed_themes as $k => $v) {
+	if (false !== strpos($k, '/')) {
+		unset($installed_themes[$k]);
 	}
 }
 
-wp_localize_script( 'theme', '_wpThemeSettings', array(
+wp_localize_script('theme', '_wpThemeSettings', array(
 	'themes'   => false,
 	'settings' => array(
 		'isInstall'     => true,
-		'canInstall'    => current_user_can( 'install_themes' ),
-		'installURI'    => current_user_can( 'install_themes' ) ? self_admin_url( 'theme-install.php' ) : null,
-		'adminUrl'      => parse_url( self_admin_url(), PHP_URL_PATH )
+		'canInstall'    => current_user_can('install_themes'),
+		'installURI'    => current_user_can('install_themes') ? self_admin_url('theme-install.php') : null,
+		'adminUrl'      => parse_url(self_admin_url(), PHP_URL_PATH)
 	),
 	'l10n' => array(
-		'addNew' => __( 'Add New Theme' ),
-		'search' => __( 'Search Themes' ),
-		'searchPlaceholder' => __( 'Search themes...' ), // placeholder (no ellipsis)
-		'upload' => __( 'Upload Theme' ),
-		'back'   => __( 'Back' ),
-		'error'  => __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ),
-		'themesFound'   => __( 'Number of Themes found: %d' ),
-		'noThemesFound' => __( 'No themes found. Try a different search.' ),
-		'collapseSidebar'    => __( 'Collapse Sidebar' ),
-		'expandSidebar'      => __( 'Expand Sidebar' ),
+		'addNew' => __('Add New Theme'),
+		'search' => __('Search Themes'),
+		'searchPlaceholder' => __('Search themes...'), // placeholder (no ellipsis)
+		'upload' => __('Upload Theme'),
+		'back'   => __('Back'),
+		'error'  => __('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.'),
+		'themesFound'   => __('Number of Themes found: %d'),
+		'noThemesFound' => __('No themes found. Try a different search.'),
+		'collapseSidebar'    => __('Collapse Sidebar'),
+		'expandSidebar'      => __('Expand Sidebar'),
 	),
-	'installedThemes' => array_keys( $installed_themes ),
-) );
+	'installedThemes' => array_keys($installed_themes),
+));
 
-wp_enqueue_script( 'theme' );
-wp_enqueue_script( 'updates' );
+wp_enqueue_script('theme');
+wp_enqueue_script('updates');
 
-if ( $tab ) {
+if ($tab) {
 	/**
 	 * Fires before each of the tabs are rendered on the Install Themes page.
 	 *
@@ -70,51 +70,51 @@ 
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( "install_themes_pre_{$tab}" );
+	do_action("install_themes_pre_{$tab}");
 }
 
 $help_overview =
-	'<p>' . sprintf(
+	'<p>'.sprintf(
 			/* translators: %s: Theme Directory URL */
-			__( 'You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s" target="_blank">WordPress Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.' ),
-			__( 'https://wordpress.org/themes/' )
-		) . '</p>' .
-	'<p>' . __( 'You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter.' ) . ' <span id="live-search-desc">' . __( 'The search results will be updated as you type.' ) . '</span></p>' .
-	'<p>' . __( 'Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it.' ) . '</p>' .
-	'<p>' . sprintf(
+			__('You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s" target="_blank">WordPress Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.'),
+			__('https://wordpress.org/themes/')
+		).'</p>'.
+	'<p>'.__('You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter.').' <span id="live-search-desc">'.__('The search results will be updated as you type.').'</span></p>'.
+	'<p>'.__('Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it.').'</p>'.
+	'<p>'.sprintf(
 			/* translators: %s: /wp-content/themes */
-			__( 'You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme&#8217;s folder via FTP into your %s directory.' ),
+			__('You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme&#8217;s folder via FTP into your %s directory.'),
 			'<code>/wp-content/themes</code>'
-		) . '</p>';
+		).'</p>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' => $help_overview
-) );
+));
 
 $help_installing =
-	'<p>' . __('Once you have generated a list of themes, you can preview and install any of them. Click on the thumbnail of the theme you&#8217;re interested in previewing. It will open up in a full-screen Preview page to give you a better idea of how that theme will look.') . '</p>' .
-	'<p>' . __('To install the theme so you can preview it with your site&#8217;s content and customize its theme options, click the "Install" button at the top of the left-hand pane. The theme files will be downloaded to your website automatically. When this is complete, the theme is now available for activation, which you can do by clicking the "Activate" link, or by navigating to your Manage Themes screen and clicking the "Live Preview" link under any installed theme&#8217;s thumbnail image.') . '</p>';
+	'<p>'.__('Once you have generated a list of themes, you can preview and install any of them. Click on the thumbnail of the theme you&#8217;re interested in previewing. It will open up in a full-screen Preview page to give you a better idea of how that theme will look.').'</p>'.
+	'<p>'.__('To install the theme so you can preview it with your site&#8217;s content and customize its theme options, click the "Install" button at the top of the left-hand pane. The theme files will be downloaded to your website automatically. When this is complete, the theme is now available for activation, which you can do by clicking the "Activate" link, or by navigating to your Manage Themes screen and clicking the "Live Preview" link under any installed theme&#8217;s thumbnail image.').'</p>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'installing',
 	'title'   => __('Previewing and Installing'),
 	'content' => $help_installing
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Using_Themes#Adding_New_Themes" target="_blank">Documentation on Adding New Themes</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Using_Themes#Adding_New_Themes" target="_blank">Documentation on Adding New Themes</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-include(ABSPATH . 'wp-admin/admin-header.php');
+include(ABSPATH.'wp-admin/admin-header.php');
 
 ?>
 <div class="wrap">
 	<h1><?php
-	echo esc_html( $title );
+	echo esc_html($title);
 
 	/**
 	 * Filters the tabs shown on the Add Themes screen.
@@ -125,20 +125,20 @@ 
 	 *
 	 * @param array $tabs The tabs shown on the Add Themes screen. Default is 'upload'.
 	 */
-	$tabs = apply_filters( 'install_themes_tabs', array( 'upload' => __( 'Upload Theme' ) ) );
-	if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) {
-		echo ' <button type="button" class="upload-view-toggle page-title-action hide-if-no-js" aria-expanded="false">' . __( 'Upload Theme' ) . '</button>';
+	$tabs = apply_filters('install_themes_tabs', array('upload' => __('Upload Theme')));
+	if ( ! empty($tabs['upload']) && current_user_can('upload_themes')) {
+		echo ' <button type="button" class="upload-view-toggle page-title-action hide-if-no-js" aria-expanded="false">'.__('Upload Theme').'</button>';
 	}
 	?></h1>
 	<div class="error hide-if-js">
-		<p><?php _e( 'The Theme Installer screen requires JavaScript.' ); ?></p>
+		<p><?php _e('The Theme Installer screen requires JavaScript.'); ?></p>
 	</div>
 
 	<div class="upload-theme">
 	<?php install_themes_upload(); ?>
 	</div>
 
-	<h2 class="screen-reader-text hide-if-no-js"><?php _e( 'Filter themes list' ); ?></h2>
+	<h2 class="screen-reader-text hide-if-no-js"><?php _e('Filter themes list'); ?></h2>
 
 	<div class="wp-filter hide-if-no-js">
 		<div class="filter-count">
@@ -146,73 +146,73 @@ 
 		</div>
 
 		<ul class="filter-links">
-			<li><a href="#" data-sort="featured"><?php _ex( 'Featured', 'themes' ); ?></a></li>
-			<li><a href="#" data-sort="popular"><?php _ex( 'Popular', 'themes' ); ?></a></li>
-			<li><a href="#" data-sort="new"><?php _ex( 'Latest', 'themes' ); ?></a></li>
-			<li><a href="#" data-sort="favorites"><?php _ex( 'Favorites', 'themes' ); ?></a></li>
+			<li><a href="#" data-sort="featured"><?php _ex('Featured', 'themes'); ?></a></li>
+			<li><a href="#" data-sort="popular"><?php _ex('Popular', 'themes'); ?></a></li>
+			<li><a href="#" data-sort="new"><?php _ex('Latest', 'themes'); ?></a></li>
+			<li><a href="#" data-sort="favorites"><?php _ex('Favorites', 'themes'); ?></a></li>
 		</ul>
 
-		<a class="drawer-toggle" href="#"><?php _e( 'Feature Filter' ); ?></a>
+		<a class="drawer-toggle" href="#"><?php _e('Feature Filter'); ?></a>
 
 		<div class="search-form"></div>
 
 		<div class="favorites-form">
 			<?php
-			$action = 'save_wporg_username_' . get_current_user_id();
-			if ( isset( $_GET['_wpnonce'] ) && wp_verify_nonce( wp_unslash( $_GET['_wpnonce'] ), $action ) ) {
-				$user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
-				update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
+			$action = 'save_wporg_username_'.get_current_user_id();
+			if (isset($_GET['_wpnonce']) && wp_verify_nonce(wp_unslash($_GET['_wpnonce']), $action)) {
+				$user = isset($_GET['user']) ? wp_unslash($_GET['user']) : get_user_option('wporg_favorites');
+				update_user_meta(get_current_user_id(), 'wporg_favorites', $user);
 			} else {
-				$user = get_user_option( 'wporg_favorites' );
+				$user = get_user_option('wporg_favorites');
 			}
 			?>
-			<p class="install-help"><?php _e( 'If you have marked themes as favorites on WordPress.org, you can browse them here.' ); ?></p>
+			<p class="install-help"><?php _e('If you have marked themes as favorites on WordPress.org, you can browse them here.'); ?></p>
 
 			<p>
-				<label for="wporg-username-input"><?php _e( 'Your WordPress.org username:' ); ?></label>
-				<input type="hidden" id="wporg-username-nonce" name="_wpnonce" value="<?php echo esc_attr( wp_create_nonce( $action ) ); ?>" />
-				<input type="search" id="wporg-username-input" value="<?php echo esc_attr( $user ); ?>" />
-				<input type="button" class="button button-secondary favorites-form-submit" value="<?php esc_attr_e( 'Get Favorites' ); ?>" />
+				<label for="wporg-username-input"><?php _e('Your WordPress.org username:'); ?></label>
+				<input type="hidden" id="wporg-username-nonce" name="_wpnonce" value="<?php echo esc_attr(wp_create_nonce($action)); ?>" />
+				<input type="search" id="wporg-username-input" value="<?php echo esc_attr($user); ?>" />
+				<input type="button" class="button button-secondary favorites-form-submit" value="<?php esc_attr_e('Get Favorites'); ?>" />
 			</p>
 		</div>
 
 		<div class="filter-drawer">
 			<div class="buttons">
-				<a class="apply-filters button button-secondary" href="#"><?php _e( 'Apply Filters' ); ?><span></span></a>
-				<a class="clear-filters button button-secondary" href="#"><?php _e( 'Clear' ); ?></a>
+				<a class="apply-filters button button-secondary" href="#"><?php _e('Apply Filters'); ?><span></span></a>
+				<a class="clear-filters button button-secondary" href="#"><?php _e('Clear'); ?></a>
 			</div>
 		<?php
 		$feature_list = get_theme_feature_list();
-		foreach ( $feature_list as $feature_name => $features ) {
+		foreach ($feature_list as $feature_name => $features) {
 			echo '<fieldset class="filter-group">';
-			$feature_name = esc_html( $feature_name );
-			echo '<legend>' . $feature_name . '</legend>';
+			$feature_name = esc_html($feature_name);
+			echo '<legend>'.$feature_name.'</legend>';
 			echo '<div class="filter-group-feature">';
-			foreach ( $features as $feature => $feature_name ) {
-				$feature = esc_attr( $feature );
-				echo '<input type="checkbox" id="filter-id-' . $feature . '" value="' . $feature . '" /> ';
-				echo '<label for="filter-id-' . $feature . '">' . $feature_name . '</label><br>';
+			foreach ($features as $feature => $feature_name) {
+				$feature = esc_attr($feature);
+				echo '<input type="checkbox" id="filter-id-'.$feature.'" value="'.$feature.'" /> ';
+				echo '<label for="filter-id-'.$feature.'">'.$feature_name.'</label><br>';
 			}
 			echo '</div>';
 			echo '</fieldset>';
 		}
 		?>
 			<div class="filtered-by">
-				<span><?php _e( 'Filtering by:' ); ?></span>
+				<span><?php _e('Filtering by:'); ?></span>
 				<div class="tags"></div>
-				<a href="#"><?php _e( 'Edit' ); ?></a>
+				<a href="#"><?php _e('Edit'); ?></a>
 			</div>
 		</div>
 	</div>
-	<h2 class="screen-reader-text hide-if-no-js"><?php _e( 'Themes list' ); ?></h2>
+	<h2 class="screen-reader-text hide-if-no-js"><?php _e('Themes list'); ?></h2>
 	<div class="theme-browser content-filterable"></div>
 	<div class="theme-install-overlay wp-full-overlay expanded"></div>
 
-	<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
+	<p class="no-themes"><?php _e('No themes found. Try a different search.'); ?></p>
 	<span class="spinner"></span>
 
 <?php
-if ( $tab ) {
+if ($tab) {
 	/**
 	 * Fires at the top of each of the tabs on the Install Themes page.
 	 *
@@ -224,7 +224,7 @@ 
 	 *
 	 * @param int $paged Number of the current page of results being viewed.
 	 */
-	do_action( "install_themes_{$tab}", $paged );
+	do_action("install_themes_{$tab}", $paged);
 }
 ?>
 </div>
@@ -237,11 +237,11 @@ 
 	<# } else { #>
 		<div class="theme-screenshot blank"></div>
 	<# } #>
-	<span class="more-details"><?php _ex( 'Details &amp; Preview', 'theme' ); ?></span>
+	<span class="more-details"><?php _ex('Details &amp; Preview', 'theme'); ?></span>
 	<div class="theme-author">
 		<?php
 		/* translators: %s: Theme author name */
-		printf( __( 'By %s' ), '{{ data.author }}' );
+		printf(__('By %s'), '{{ data.author }}');
 		?>
 	</div>
 	<h3 class="theme-name">{{ data.name }}</h3>
@@ -250,41 +250,41 @@ 
 		<# if ( data.installed ) { #>
 			<?php
 			/* translators: %s: Theme name */
-			$aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
+			$aria_label = sprintf(_x('Activate %s', 'theme'), '{{ data.name }}');
 			?>
 			<# if ( data.activate_url ) { #>
-				<a class="button button-primary activate" href="{{ data.activate_url }}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
+				<a class="button button-primary activate" href="{{ data.activate_url }}" aria-label="<?php echo esc_attr($aria_label); ?>"><?php _e('Activate'); ?></a>
 			<# } #>
 			<# if ( data.customize_url ) { #>
-				<a class="button button-secondary load-customize" href="{{ data.customize_url }}"><?php _e( 'Live Preview' ); ?></a>
+				<a class="button button-secondary load-customize" href="{{ data.customize_url }}"><?php _e('Live Preview'); ?></a>
 			<# } else { #>
-				<button class="button-secondary preview install-theme-preview"><?php _e( 'Preview' ); ?></button>
+				<button class="button-secondary preview install-theme-preview"><?php _e('Preview'); ?></button>
 			<# } #>
 		<# } else { #>
 			<?php
 			/* translators: %s: Theme name */
-			$aria_label = sprintf( __( 'Install %s' ), '{{ data.name }}' );
+			$aria_label = sprintf(__('Install %s'), '{{ data.name }}');
 			?>
-			<a class="button button-primary theme-install" data-name="{{ data.name }}" data-slug="{{ data.id }}" href="{{ data.install_url }}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Install' ); ?></a>
-			<button class="button-secondary preview install-theme-preview"><?php _e( 'Preview' ); ?></button>
+			<a class="button button-primary theme-install" data-name="{{ data.name }}" data-slug="{{ data.id }}" href="{{ data.install_url }}" aria-label="<?php echo esc_attr($aria_label); ?>"><?php _e('Install'); ?></a>
+			<button class="button-secondary preview install-theme-preview"><?php _e('Preview'); ?></button>
 		<# } #>
 	</div>
 
 	<# if ( data.installed ) { #>
-		<div class="notice notice-success notice-alt"><p><?php _ex( 'Installed', 'theme' ); ?></p></div>
+		<div class="notice notice-success notice-alt"><p><?php _ex('Installed', 'theme'); ?></p></div>
 	<# } #>
 </script>
 
 <script id="tmpl-theme-preview" type="text/template">
 	<div class="wp-full-overlay-sidebar">
 		<div class="wp-full-overlay-header">
-			<button class="close-full-overlay"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
-			<button class="previous-theme"><span class="screen-reader-text"><?php _ex( 'Previous', 'Button label for a theme' ); ?></span></button>
-			<button class="next-theme"><span class="screen-reader-text"><?php _ex( 'Next', 'Button label for a theme' ); ?></span></button>
+			<button class="close-full-overlay"><span class="screen-reader-text"><?php _e('Close'); ?></span></button>
+			<button class="previous-theme"><span class="screen-reader-text"><?php _ex('Previous', 'Button label for a theme'); ?></span></button>
+			<button class="next-theme"><span class="screen-reader-text"><?php _ex('Next', 'Button label for a theme'); ?></span></button>
 			<# if ( data.installed ) { #>
-				<a class="button button-primary activate" href="{{ data.activate_url }}"><?php _e( 'Activate' ); ?></a>
+				<a class="button button-primary activate" href="{{ data.activate_url }}"><?php _e('Activate'); ?></a>
 			<# } else { #>
-				<a href="{{ data.install_url }}" class="button button-primary theme-install" data-name="{{ data.name }}" data-slug="{{ data.id }}"><?php _e( 'Install' ); ?></a>
+				<a href="{{ data.install_url }}" class="button button-primary theme-install" data-name="{{ data.name }}" data-slug="{{ data.id }}"><?php _e('Install'); ?></a>
 			<# } #>
 		</div>
 		<div class="wp-full-overlay-sidebar-content">
@@ -293,7 +293,7 @@ 
 					<span class="theme-by">
 						<?php
 						/* translators: %s: Theme author name */
-						printf( __( 'By %s' ), '{{ data.author }}' );
+						printf(__('By %s'), '{{ data.author }}');
 						?>
 					</span>
 
@@ -306,12 +306,12 @@ 
 								<span class="num-ratings">({{ data.num_ratings }})</span>
 							</div>
 						<# } else { #>
-							<span class="no-rating"><?php _e( 'This theme has not been rated yet.' ); ?></span>
+							<span class="no-rating"><?php _e('This theme has not been rated yet.'); ?></span>
 						<# } #>
 						<div class="theme-version">
 							<?php
 							/* translators: %s: Theme version */
-							printf( __( 'Version: %s' ), '{{ data.version }}' );
+							printf(__('Version: %s'), '{{ data.version }}');
 							?>
 						</div>
 						<div class="theme-description">{{{ data.description }}}</div>
@@ -319,14 +319,14 @@ 
 				</div>
 			</div>
 			<div class="wp-full-overlay-footer">
-				<button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
+				<button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e('Collapse Sidebar'); ?>">
 					<span class="collapse-sidebar-arrow"></span>
-					<span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
+					<span class="collapse-sidebar-label"><?php _e('Collapse'); ?></span>
 				</button>
 			</div>
 		</div>
 		<div class="wp-full-overlay-main">
-		<iframe src="{{ data.preview_url }}" title="<?php esc_attr_e( 'Preview' ); ?>"></iframe>
+		<iframe src="{{ data.preview_url }}" title="<?php esc_attr_e('Preview'); ?>"></iframe>
 	</div>
 </script>
 
@@ -334,4 +334,4 @@ 
 wp_print_request_filesystem_credentials_modal();
 wp_print_admin_notice_templates();
 
-include(ABSPATH . 'wp-admin/admin-footer.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/options-writing.php

Spacing +40 added lines, -40 removed lines

@@ -7,56 +7,56 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'manage_options' ) )
-	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+if ( ! current_user_can('manage_options'))
+	wp_die(__('Sorry, you are not allowed to manage options for this site.'));
 
 $title = __('Writing Settings');
 $parent_file = 'options-general.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
-	'content' => '<p>' . __('You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within the dashboard, while the rest control external publishing methods. For more information on any of these methods, use the documentation links.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+	'content' => '<p>'.__('You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within the dashboard, while the rest control external publishing methods. For more information on any of these methods, use the documentation links.').'</p>'.
+		'<p>'.__('You must click the Save Changes button at the bottom of the screen for new settings to take effect.').'</p>',
+));
 
 /** This filter is documented in wp-admin/options.php */
-if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
-	get_current_screen()->add_help_tab( array(
+if (apply_filters('enable_post_by_email_configuration', true)) {
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'options-postemail',
-		'title'   => __( 'Post Via Email' ),
-		'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.' ) . '</p>',
-	) );
+		'title'   => __('Post Via Email'),
+		'content' => '<p>'.__('Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.').'</p>',
+	));
 }
 
 /** This filter is documented in wp-admin/options-writing.php */
-if ( apply_filters( 'enable_update_services_configuration', true ) ) {
-	get_current_screen()->add_help_tab( array(
+if (apply_filters('enable_update_services_configuration', true)) {
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'options-services',
-		'title'   => __( 'Update Services' ),
-		'content' => '<p>' . __( 'If desired, WordPress will automatically alert various services of your new posts.' ) . '</p>',
-	) );
+		'title'   => __('Update Services'),
+		'content' => '<p>'.__('If desired, WordPress will automatically alert various services of your new posts.').'</p>',
+	));
 }
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_Writing_Screen" target="_blank">Documentation on Writing Settings</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Settings_Writing_Screen" target="_blank">Documentation on Writing Settings</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <form method="post" action="options.php">
 <?php settings_fields('writing'); ?>
 
 <table class="form-table">
-<?php if ( get_site_option( 'initial_db_version' ) < 32453 ) : ?>
+<?php if (get_site_option('initial_db_version') < 32453) : ?>
 <tr>
 <th scope="row"><?php _e('Formatting') ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Formatting') ?></span></legend>
@@ -77,21 +77,21 @@ 
 </tr>
 <?php
 $post_formats = get_post_format_strings();
-unset( $post_formats['standard'] );
+unset($post_formats['standard']);
 ?>
 <tr>
 <th scope="row"><label for="default_post_format"><?php _e('Default Post Format') ?></label></th>
 <td>
 	<select name="default_post_format" id="default_post_format">
-		<option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>
-<?php foreach ( $post_formats as $format_slug => $format_name ): ?>
-		<option<?php selected( get_option( 'default_post_format' ), $format_slug ); ?> value="<?php echo esc_attr( $format_slug ); ?>"><?php echo esc_html( $format_name ); ?></option>
+		<option value="0"><?php echo get_post_format_string('standard'); ?></option>
+<?php foreach ($post_formats as $format_slug => $format_name): ?>
+		<option<?php selected(get_option('default_post_format'), $format_slug); ?> value="<?php echo esc_attr($format_slug); ?>"><?php echo esc_html($format_name); ?></option>
 <?php endforeach; ?>
 	</select>
 </td>
 </tr>
 <?php
-if ( get_option( 'link_manager_enabled' ) ) :
+if (get_option('link_manager_enabled')) :
 ?>
 <tr>
 <th scope="row"><label for="default_link_category"><?php _e('Default Link Category') ?></label></th>
@@ -111,16 +111,16 @@ 
 
 <?php
 /** This filter is documented in wp-admin/options.php */
-if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
+if (apply_filters('enable_post_by_email_configuration', true)) {
 ?>
-<h2 class="title"><?php _e( 'Post via email' ) ?></h2>
+<h2 class="title"><?php _e('Post via email') ?></h2>
 <p><?php
 printf(
 	/* translators: 1, 2, 3: examples of random email addresses */
-	__( 'To post to WordPress by email you must set up a secret email account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: %1$s, %2$s, %3$s.' ),
-	sprintf( '<kbd>%s</kbd>', wp_generate_password( 8, false ) ),
-	sprintf( '<kbd>%s</kbd>', wp_generate_password( 8, false ) ),
-	sprintf( '<kbd>%s</kbd>', wp_generate_password( 8, false ) )
+	__('To post to WordPress by email you must set up a secret email account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: %1$s, %2$s, %3$s.'),
+	sprintf('<kbd>%s</kbd>', wp_generate_password(8, false)),
+	sprintf('<kbd>%s</kbd>', wp_generate_password(8, false)),
+	sprintf('<kbd>%s</kbd>', wp_generate_password(8, false))
 );
 ?></p>
 
@@ -162,15 +162,15 @@ 
  *
  * @param bool $enable Whether to enable the Update Services settings area. Default true.
  */
-if ( apply_filters( 'enable_update_services_configuration', true ) ) {
+if (apply_filters('enable_update_services_configuration', true)) {
 ?>
-<h2 class="title"><?php _e( 'Update Services' ) ?></h2>
+<h2 class="title"><?php _e('Update Services') ?></h2>
 
-<?php if ( 1 == get_option('blog_public') ) : ?>
+<?php if (1 == get_option('blog_public')) : ?>
 
-<p><label for="ping_sites"><?php _e( 'When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="https://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service URLs with line breaks.' ) ?></label></p>
+<p><label for="ping_sites"><?php _e('When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="https://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service URLs with line breaks.') ?></label></p>
 
-<textarea name="ping_sites" id="ping_sites" class="large-text code" rows="3"><?php echo esc_textarea( get_option('ping_sites') ); ?></textarea>
+<textarea name="ping_sites" id="ping_sites" class="large-text code" rows="3"><?php echo esc_textarea(get_option('ping_sites')); ?></textarea>
 
 <?php else : ?>
 
@@ -185,4 +185,4 @@ 
 </form>
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

src/wp-admin/includes/file.php

Spacing +378 added lines, -378 removed lines

@@ -13,54 +13,54 @@ 
 
 /** The descriptions for theme files. */
 $wp_file_descriptions = array(
-	'functions.php'         => __( 'Theme Functions' ),
-	'header.php'            => __( 'Theme Header' ),
-	'footer.php'            => __( 'Theme Footer' ),
-	'sidebar.php'           => __( 'Sidebar' ),
-	'comments.php'          => __( 'Comments' ),
-	'searchform.php'        => __( 'Search Form' ),
-	'404.php'               => __( '404 Template' ),
-	'link.php'              => __( 'Links Template' ),
+	'functions.php'         => __('Theme Functions'),
+	'header.php'            => __('Theme Header'),
+	'footer.php'            => __('Theme Footer'),
+	'sidebar.php'           => __('Sidebar'),
+	'comments.php'          => __('Comments'),
+	'searchform.php'        => __('Search Form'),
+	'404.php'               => __('404 Template'),
+	'link.php'              => __('Links Template'),
 	// Archives
-	'index.php'             => __( 'Main Index Template' ),
-	'archive.php'           => __( 'Archives' ),
-	'author.php'            => __( 'Author Template' ),
-	'taxonomy.php'          => __( 'Taxonomy Template' ),
-	'category.php'          => __( 'Category Template' ),
-	'tag.php'               => __( 'Tag Template' ),
-	'home.php'              => __( 'Posts Page' ),
-	'search.php'            => __( 'Search Results' ),
-	'date.php'              => __( 'Date Template' ),
+	'index.php'             => __('Main Index Template'),
+	'archive.php'           => __('Archives'),
+	'author.php'            => __('Author Template'),
+	'taxonomy.php'          => __('Taxonomy Template'),
+	'category.php'          => __('Category Template'),
+	'tag.php'               => __('Tag Template'),
+	'home.php'              => __('Posts Page'),
+	'search.php'            => __('Search Results'),
+	'date.php'              => __('Date Template'),
 	// Content
-	'singular.php'          => __( 'Singular Template' ),
-	'single.php'            => __( 'Single Post' ),
-	'page.php'              => __( 'Single Page' ),
-	'front-page.php'        => __( 'Static Front Page' ),
+	'singular.php'          => __('Singular Template'),
+	'single.php'            => __('Single Post'),
+	'page.php'              => __('Single Page'),
+	'front-page.php'        => __('Static Front Page'),
 	// Attachments
-	'attachment.php'        => __( 'Attachment Template' ),
-	'image.php'             => __( 'Image Attachment Template' ),
-	'video.php'             => __( 'Video Attachment Template' ),
-	'audio.php'             => __( 'Audio Attachment Template' ),
-	'application.php'       => __( 'Application Attachment Template' ),
+	'attachment.php'        => __('Attachment Template'),
+	'image.php'             => __('Image Attachment Template'),
+	'video.php'             => __('Video Attachment Template'),
+	'audio.php'             => __('Audio Attachment Template'),
+	'application.php'       => __('Application Attachment Template'),
 	// Embeds
-	'embed.php'             => __( 'Embed Template' ),
-	'embed-404.php'         => __( 'Embed 404 Template' ),
-	'embed-content.php'     => __( 'Embed Content Template' ),
-	'header-embed.php'      => __( 'Embed Header Template' ),
-	'footer-embed.php'      => __( 'Embed Footer Template' ),
+	'embed.php'             => __('Embed Template'),
+	'embed-404.php'         => __('Embed 404 Template'),
+	'embed-content.php'     => __('Embed Content Template'),
+	'header-embed.php'      => __('Embed Header Template'),
+	'footer-embed.php'      => __('Embed Footer Template'),
 	// Stylesheets
-	'style.css'             => __( 'Stylesheet' ),
-	'editor-style.css'      => __( 'Visual Editor Stylesheet' ),
-	'editor-style-rtl.css'  => __( 'Visual Editor RTL Stylesheet' ),
-	'rtl.css'               => __( 'RTL Stylesheet' ),
+	'style.css'             => __('Stylesheet'),
+	'editor-style.css'      => __('Visual Editor Stylesheet'),
+	'editor-style-rtl.css'  => __('Visual Editor RTL Stylesheet'),
+	'rtl.css'               => __('RTL Stylesheet'),
 	// Other
-	'my-hacks.php'          => __( 'my-hacks.php (legacy hacks support)' ),
-	'.htaccess'             => __( '.htaccess (for rewrite rules )' ),
+	'my-hacks.php'          => __('my-hacks.php (legacy hacks support)'),
+	'.htaccess'             => __('.htaccess (for rewrite rules )'),
 	// Deprecated files
-	'wp-layout.css'         => __( 'Stylesheet' ),
-	'wp-comments.php'       => __( 'Comments Template' ),
-	'wp-comments-popup.php' => __( 'Popup Comments Template' ),
-	'comments-popup.php'    => __( 'Popup Comments' ),
+	'wp-layout.css'         => __('Stylesheet'),
+	'wp-comments.php'       => __('Comments Template'),
+	'wp-comments-popup.php' => __('Popup Comments Template'),
+	'comments-popup.php'    => __('Popup Comments'),
 );
 
 /**
@@ -74,21 +74,21 @@ 
  * @return string Description of file from $wp_file_descriptions or basename of $file if description doesn't exist.
  *                Appends 'Page Template' to basename of $file if the file is a page template
  */
-function get_file_description( $file ) {
+function get_file_description($file) {
 	global $wp_file_descriptions, $allowed_files;
 
-	$relative_pathinfo = pathinfo( $file );
-	$file_path = $allowed_files[ $file ];
-	if ( isset( $wp_file_descriptions[ basename( $file ) ] ) && '.' === $relative_pathinfo['dirname'] ) {
-		return $wp_file_descriptions[ basename( $file ) ];
-	} elseif ( file_exists( $file_path ) && is_file( $file_path ) ) {
-		$template_data = implode( '', file( $file_path ) );
-		if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ) ) {
-			return sprintf( __( '%s Page Template' ), _cleanup_header_comment( $name[1] ) );
+	$relative_pathinfo = pathinfo($file);
+	$file_path = $allowed_files[$file];
+	if (isset($wp_file_descriptions[basename($file)]) && '.' === $relative_pathinfo['dirname']) {
+		return $wp_file_descriptions[basename($file)];
+	} elseif (file_exists($file_path) && is_file($file_path)) {
+		$template_data = implode('', file($file_path));
+		if (preg_match('|Template Name:(.*)$|mi', $template_data, $name)) {
+			return sprintf(__('%s Page Template'), _cleanup_header_comment($name[1]));
 		}
 	}
 
-	return trim( basename( $file ) );
+	return trim(basename($file));
 }
 
 /**
@@ -99,18 +99,18 @@ 
  * @return string Full filesystem path to the root of the WordPress installation
  */
 function get_home_path() {
-	$home    = set_url_scheme( get_option( 'home' ), 'http' );
-	$siteurl = set_url_scheme( get_option( 'siteurl' ), 'http' );
-	if ( ! empty( $home ) && 0 !== strcasecmp( $home, $siteurl ) ) {
-		$wp_path_rel_to_home = str_ireplace( $home, '', $siteurl ); /* $siteurl - $home */
-		$pos = strripos( str_replace( '\\', '/', $_SERVER['SCRIPT_FILENAME'] ), trailingslashit( $wp_path_rel_to_home ) );
-		$home_path = substr( $_SERVER['SCRIPT_FILENAME'], 0, $pos );
-		$home_path = trailingslashit( $home_path );
+	$home    = set_url_scheme(get_option('home'), 'http');
+	$siteurl = set_url_scheme(get_option('siteurl'), 'http');
+	if ( ! empty($home) && 0 !== strcasecmp($home, $siteurl)) {
+		$wp_path_rel_to_home = str_ireplace($home, '', $siteurl); /* $siteurl - $home */
+		$pos = strripos(str_replace('\\', '/', $_SERVER['SCRIPT_FILENAME']), trailingslashit($wp_path_rel_to_home));
+		$home_path = substr($_SERVER['SCRIPT_FILENAME'], 0, $pos);
+		$home_path = trailingslashit($home_path);
 	} else {
 		$home_path = ABSPATH;
 	}
 
-	return str_replace( '\\', '/', $home_path );
+	return str_replace('\\', '/', $home_path);
 }
 
 /**
@@ -123,30 +123,30 @@ 
  * @param int    $levels Optional. Levels of folders to follow, Default 100 (PHP Loop limit).
  * @return bool|array False on failure, Else array of files
  */
-function list_files( $folder = '', $levels = 100 ) {
-	if ( empty($folder) )
+function list_files($folder = '', $levels = 100) {
+	if (empty($folder))
 		return false;
 
-	if ( ! $levels )
+	if ( ! $levels)
 		return false;
 
 	$files = array();
-	if ( $dir = @opendir( $folder ) ) {
-		while (($file = readdir( $dir ) ) !== false ) {
-			if ( in_array($file, array('.', '..') ) )
+	if ($dir = @opendir($folder)) {
+		while (($file = readdir($dir)) !== false) {
+			if (in_array($file, array('.', '..')))
 				continue;
-			if ( is_dir( $folder . '/' . $file ) ) {
-				$files2 = list_files( $folder . '/' . $file, $levels - 1);
-				if ( $files2 )
-					$files = array_merge($files, $files2 );
+			if (is_dir($folder.'/'.$file)) {
+				$files2 = list_files($folder.'/'.$file, $levels - 1);
+				if ($files2)
+					$files = array_merge($files, $files2);
 				else
-					$files[] = $folder . '/' . $file . '/';
+					$files[] = $folder.'/'.$file.'/';
 			} else {
-				$files[] = $folder . '/' . $file;
+				$files[] = $folder.'/'.$file;
 			}
 		}
 	}
-	@closedir( $dir );
+	@closedir($dir);
 	return $files;
 }
 
@@ -163,35 +163,35 @@ 
  * @param string $dir      Optional. Directory to store the file in. Default empty.
  * @return string a writable filename
  */
-function wp_tempnam( $filename = '', $dir = '' ) {
-	if ( empty( $dir ) ) {
+function wp_tempnam($filename = '', $dir = '') {
+	if (empty($dir)) {
 		$dir = get_temp_dir();
 	}
 
-	if ( empty( $filename ) || '.' == $filename || '/' == $filename || '\\' == $filename ) {
+	if (empty($filename) || '.' == $filename || '/' == $filename || '\\' == $filename) {
 		$filename = time();
 	}
 
 	// Use the basename of the given file without the extension as the name for the temporary directory
-	$temp_filename = basename( $filename );
-	$temp_filename = preg_replace( '|\.[^.]*$|', '', $temp_filename );
+	$temp_filename = basename($filename);
+	$temp_filename = preg_replace('|\.[^.]*$|', '', $temp_filename);
 
 	// If the folder is falsey, use its parent directory name instead.
-	if ( ! $temp_filename ) {
-		return wp_tempnam( dirname( $filename ), $dir );
+	if ( ! $temp_filename) {
+		return wp_tempnam(dirname($filename), $dir);
 	}
 
 	// Suffix some random data to avoid filename conflicts
-	$temp_filename .= '-' . wp_generate_password( 6, false );
+	$temp_filename .= '-'.wp_generate_password(6, false);
 	$temp_filename .= '.tmp';
-	$temp_filename = $dir . wp_unique_filename( $dir, $temp_filename );
+	$temp_filename = $dir.wp_unique_filename($dir, $temp_filename);
 
-	$fp = @fopen( $temp_filename, 'x' );
-	if ( ! $fp && is_writable( $dir ) && file_exists( $temp_filename ) ) {
-		return wp_tempnam( $filename, $dir );
+	$fp = @fopen($temp_filename, 'x');
+	if ( ! $fp && is_writable($dir) && file_exists($temp_filename)) {
+		return wp_tempnam($filename, $dir);
 	}
-	if ( $fp ) {
-		fclose( $fp );
+	if ($fp) {
+		fclose($fp);
 	}
 
 	return $temp_filename;
@@ -208,21 +208,21 @@ 
  * @param array $allowed_files Array of allowed files to edit, $file must match an entry exactly
  * @return string|null
  */
-function validate_file_to_edit( $file, $allowed_files = '' ) {
-	$code = validate_file( $file, $allowed_files );
+function validate_file_to_edit($file, $allowed_files = '') {
+	$code = validate_file($file, $allowed_files);
 
-	if (!$code )
+	if ( ! $code)
 		return $file;
 
-	switch ( $code ) {
+	switch ($code) {
 		case 1 :
-			wp_die( __( 'Sorry, that file cannot be edited.' ) );
+			wp_die(__('Sorry, that file cannot be edited.'));
 
 		// case 2 :
 		// wp_die( __('Sorry, can’t call files with their real path.' ));
 
 		case 3 :
-			wp_die( __( 'Sorry, that file cannot be edited.' ) );
+			wp_die(__('Sorry, that file cannot be edited.'));
 	}
 }
 
@@ -242,11 +242,11 @@ 
  * @return array On success, returns an associative array of file attributes. On failure, returns
  *               $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ).
  */
-function _wp_handle_upload( &$file, $overrides, $time, $action ) {
+function _wp_handle_upload(&$file, $overrides, $time, $action) {
 	// The default error handler.
-	if ( ! function_exists( 'wp_handle_upload_error' ) ) {
-		function wp_handle_upload_error( &$file, $message ) {
-			return array( 'error' => $message );
+	if ( ! function_exists('wp_handle_upload_error')) {
+		function wp_handle_upload_error(&$file, $message) {
+			return array('error' => $message);
 		}
 	}
 
@@ -260,24 +260,24 @@ 
 	 *
 	 * @param array $file An array of data for a single file.
 	 */
-	$file = apply_filters( "{$action}_prefilter", $file );
+	$file = apply_filters("{$action}_prefilter", $file);
 
 	// You may define your own function and pass the name in $overrides['upload_error_handler']
 	$upload_error_handler = 'wp_handle_upload_error';
-	if ( isset( $overrides['upload_error_handler'] ) ) {
+	if (isset($overrides['upload_error_handler'])) {
 		$upload_error_handler = $overrides['upload_error_handler'];
 	}
 
 	// You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully.
-	if ( isset( $file['error'] ) && ! is_numeric( $file['error'] ) && $file['error'] ) {
-		return call_user_func_array( $upload_error_handler, array( &$file, $file['error'] ) );
+	if (isset($file['error']) && ! is_numeric($file['error']) && $file['error']) {
+		return call_user_func_array($upload_error_handler, array(&$file, $file['error']));
 	}
 
 	// Install user overrides. Did we mention that this voids your warranty?
 
 	// You may define your own function and pass the name in $overrides['unique_filename_callback']
 	$unique_filename_callback = null;
-	if ( isset( $overrides['unique_filename_callback'] ) ) {
+	if (isset($overrides['unique_filename_callback'])) {
 		$unique_filename_callback = $overrides['unique_filename_callback'];
 	}
 
@@ -285,72 +285,72 @@ 
 	 * This may not have orignially been intended to be overrideable,
 	 * but historically has been.
 	 */
-	if ( isset( $overrides['upload_error_strings'] ) ) {
+	if (isset($overrides['upload_error_strings'])) {
 		$upload_error_strings = $overrides['upload_error_strings'];
 	} else {
 		// Courtesy of php.net, the strings that describe the error indicated in $_FILES[{form field}]['error'].
 		$upload_error_strings = array(
 			false,
-			__( 'The uploaded file exceeds the upload_max_filesize directive in php.ini.' ),
-			__( 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.' ),
-			__( 'The uploaded file was only partially uploaded.' ),
-			__( 'No file was uploaded.' ),
+			__('The uploaded file exceeds the upload_max_filesize directive in php.ini.'),
+			__('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'),
+			__('The uploaded file was only partially uploaded.'),
+			__('No file was uploaded.'),
 			'',
-			__( 'Missing a temporary folder.' ),
-			__( 'Failed to write file to disk.' ),
-			__( 'File upload stopped by extension.' )
+			__('Missing a temporary folder.'),
+			__('Failed to write file to disk.'),
+			__('File upload stopped by extension.')
 		);
 	}
 
 	// All tests are on by default. Most can be turned off by $overrides[{test_name}] = false;
-	$test_form = isset( $overrides['test_form'] ) ? $overrides['test_form'] : true;
-	$test_size = isset( $overrides['test_size'] ) ? $overrides['test_size'] : true;
+	$test_form = isset($overrides['test_form']) ? $overrides['test_form'] : true;
+	$test_size = isset($overrides['test_size']) ? $overrides['test_size'] : true;
 
 	// If you override this, you must provide $ext and $type!!
-	$test_type = isset( $overrides['test_type'] ) ? $overrides['test_type'] : true;
-	$mimes = isset( $overrides['mimes'] ) ? $overrides['mimes'] : false;
+	$test_type = isset($overrides['test_type']) ? $overrides['test_type'] : true;
+	$mimes = isset($overrides['mimes']) ? $overrides['mimes'] : false;
 
 	// A correct form post will pass this test.
-	if ( $test_form && ( ! isset( $_POST['action'] ) || ( $_POST['action'] != $action ) ) ) {
-		return call_user_func_array( $upload_error_handler, array( &$file, __( 'Invalid form submission.' ) ) );
+	if ($test_form && ( ! isset($_POST['action']) || ($_POST['action'] != $action))) {
+		return call_user_func_array($upload_error_handler, array(&$file, __('Invalid form submission.')));
 	}
 	// A successful upload will pass this test. It makes no sense to override this one.
-	if ( isset( $file['error'] ) && $file['error'] > 0 ) {
-		return call_user_func_array( $upload_error_handler, array( &$file, $upload_error_strings[ $file['error'] ] ) );
+	if (isset($file['error']) && $file['error'] > 0) {
+		return call_user_func_array($upload_error_handler, array(&$file, $upload_error_strings[$file['error']]));
 	}
 
-	$test_file_size = 'wp_handle_upload' === $action ? $file['size'] : filesize( $file['tmp_name'] );
+	$test_file_size = 'wp_handle_upload' === $action ? $file['size'] : filesize($file['tmp_name']);
 	// A non-empty file will pass this test.
-	if ( $test_size && ! ( $test_file_size > 0 ) ) {
-		if ( is_multisite() ) {
-			$error_msg = __( 'File is empty. Please upload something more substantial.' );
+	if ($test_size && ! ($test_file_size > 0)) {
+		if (is_multisite()) {
+			$error_msg = __('File is empty. Please upload something more substantial.');
 		} else {
-			$error_msg = __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' );
+			$error_msg = __('File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.');
 		}
-		return call_user_func_array( $upload_error_handler, array( &$file, $error_msg ) );
+		return call_user_func_array($upload_error_handler, array(&$file, $error_msg));
 	}
 
 	// A properly uploaded file will pass this test. There should be no reason to override this one.
-	$test_uploaded_file = 'wp_handle_upload' === $action ? @ is_uploaded_file( $file['tmp_name'] ) : @ is_file( $file['tmp_name'] );
-	if ( ! $test_uploaded_file ) {
-		return call_user_func_array( $upload_error_handler, array( &$file, __( 'Specified file failed upload test.' ) ) );
+	$test_uploaded_file = 'wp_handle_upload' === $action ? @ is_uploaded_file($file['tmp_name']) : @ is_file($file['tmp_name']);
+	if ( ! $test_uploaded_file) {
+		return call_user_func_array($upload_error_handler, array(&$file, __('Specified file failed upload test.')));
 	}
 
 	// A correct MIME type will pass this test. Override $mimes or use the upload_mimes filter.
-	if ( $test_type ) {
-		$wp_filetype = wp_check_filetype_and_ext( $file['tmp_name'], $file['name'], $mimes );
-		$ext = empty( $wp_filetype['ext'] ) ? '' : $wp_filetype['ext'];
-		$type = empty( $wp_filetype['type'] ) ? '' : $wp_filetype['type'];
-		$proper_filename = empty( $wp_filetype['proper_filename'] ) ? '' : $wp_filetype['proper_filename'];
+	if ($test_type) {
+		$wp_filetype = wp_check_filetype_and_ext($file['tmp_name'], $file['name'], $mimes);
+		$ext = empty($wp_filetype['ext']) ? '' : $wp_filetype['ext'];
+		$type = empty($wp_filetype['type']) ? '' : $wp_filetype['type'];
+		$proper_filename = empty($wp_filetype['proper_filename']) ? '' : $wp_filetype['proper_filename'];
 
 		// Check to see if wp_check_filetype_and_ext() determined the filename was incorrect
-		if ( $proper_filename ) {
+		if ($proper_filename) {
 			$file['name'] = $proper_filename;
 		}
-		if ( ( ! $type || !$ext ) && ! current_user_can( 'unfiltered_upload' ) ) {
-			return call_user_func_array( $upload_error_handler, array( &$file, __( 'Sorry, this file type is not permitted for security reasons.' ) ) );
+		if (( ! $type || ! $ext) && ! current_user_can('unfiltered_upload')) {
+			return call_user_func_array($upload_error_handler, array(&$file, __('Sorry, this file type is not permitted for security reasons.')));
 		}
-		if ( ! $type ) {
+		if ( ! $type) {
 			$type = $file['type'];
 		}
 	} else {
@@ -361,41 +361,41 @@ 
 	 * A writable uploads dir will pass this test. Again, there's no point
 	 * overriding this one.
 	 */
-	if ( ! ( ( $uploads = wp_upload_dir( $time ) ) && false === $uploads['error'] ) ) {
-		return call_user_func_array( $upload_error_handler, array( &$file, $uploads['error'] ) );
+	if ( ! (($uploads = wp_upload_dir($time)) && false === $uploads['error'])) {
+		return call_user_func_array($upload_error_handler, array(&$file, $uploads['error']));
 	}
 
-	$filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback );
+	$filename = wp_unique_filename($uploads['path'], $file['name'], $unique_filename_callback);
 
 	// Move the file to the uploads dir.
-	$new_file = $uploads['path'] . "/$filename";
-	if ( 'wp_handle_upload' === $action ) {
-		$move_new_file = @ move_uploaded_file( $file['tmp_name'], $new_file );
+	$new_file = $uploads['path']."/$filename";
+	if ('wp_handle_upload' === $action) {
+		$move_new_file = @ move_uploaded_file($file['tmp_name'], $new_file);
 	} else {
 		// use copy and unlink because rename breaks streams.
-		$move_new_file = @ copy( $file['tmp_name'], $new_file );
-		unlink( $file['tmp_name'] );
+		$move_new_file = @ copy($file['tmp_name'], $new_file);
+		unlink($file['tmp_name']);
 	}
 
-	if ( false === $move_new_file ) {
-		if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) {
-			$error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
+	if (false === $move_new_file) {
+		if (0 === strpos($uploads['basedir'], ABSPATH)) {
+			$error_path = str_replace(ABSPATH, '', $uploads['basedir']).$uploads['subdir'];
 		} else {
-			$error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
+			$error_path = basename($uploads['basedir']).$uploads['subdir'];
 		}
-		return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $error_path ) );
+		return $upload_error_handler($file, sprintf(__('The uploaded file could not be moved to %s.'), $error_path));
 	}
 
 	// Set correct file permissions.
-	$stat = stat( dirname( $new_file ));
+	$stat = stat(dirname($new_file));
 	$perms = $stat['mode'] & 0000666;
-	@ chmod( $new_file, $perms );
+	@ chmod($new_file, $perms);
 
 	// Compute the URL.
-	$url = $uploads['url'] . "/$filename";
+	$url = $uploads['url']."/$filename";
 
-	if ( is_multisite() ) {
-		delete_transient( 'dirsize_cache' );
+	if (is_multisite()) {
+		delete_transient('dirsize_cache');
 	}
 
 	/**
@@ -412,11 +412,11 @@ 
 	 * }
 	 * @param string $context The type of upload action. Values include 'upload' or 'sideload'.
 	 */
-	return apply_filters( 'wp_handle_upload', array(
+	return apply_filters('wp_handle_upload', array(
 		'file' => $new_file,
 		'url'  => $url,
 		'type' => $type
-	), 'wp_handle_sideload' === $action ? 'sideload' : 'upload' );
+	), 'wp_handle_sideload' === $action ? 'sideload' : 'upload');
 }
 
 /**
@@ -436,17 +436,17 @@ 
  * @return array On success, returns an associative array of file attributes. On failure, returns
  *               $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ).
  */
-function wp_handle_upload( &$file, $overrides = false, $time = null ) {
+function wp_handle_upload(&$file, $overrides = false, $time = null) {
 	/*
 	 *  $_POST['action'] must be set and its value must equal $overrides['action']
 	 *  or this:
 	 */
 	$action = 'wp_handle_upload';
-	if ( isset( $overrides['action'] ) ) {
+	if (isset($overrides['action'])) {
 		$action = $overrides['action'];
 	}
 
-	return _wp_handle_upload( $file, $overrides, $time, $action );
+	return _wp_handle_upload($file, $overrides, $time, $action);
 }
 
 /**
@@ -465,16 +465,16 @@ 
  * @return array On success, returns an associative array of file attributes. On failure, returns
  *               $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ).
  */
-function wp_handle_sideload( &$file, $overrides = false, $time = null ) {
+function wp_handle_sideload(&$file, $overrides = false, $time = null) {
 	/*
 	 *  $_POST['action'] must be set and its value must equal $overrides['action']
 	 *  or this:
 	 */
 	$action = 'wp_handle_sideload';
-	if ( isset( $overrides['action'] ) ) {
+	if (isset($overrides['action'])) {
 		$action = $overrides['action'];
 	}
-	return _wp_handle_upload( $file, $overrides, $time, $action );
+	return _wp_handle_upload($file, $overrides, $time, $action);
 }
 
 
@@ -488,34 +488,34 @@ 
  * @param int $timeout The timeout for the request to download the file default 300 seconds
  * @return mixed WP_Error on failure, string Filename on success.
  */
-function download_url( $url, $timeout = 300 ) {
+function download_url($url, $timeout = 300) {
 	//WARNING: The file is not automatically deleted, The script must unlink() the file.
-	if ( ! $url )
+	if ( ! $url)
 		return new WP_Error('http_no_url', __('Invalid URL Provided.'));
 
-	$url_filename = basename( parse_url( $url, PHP_URL_PATH ) );
+	$url_filename = basename(parse_url($url, PHP_URL_PATH));
 
-	$tmpfname = wp_tempnam( $url_filename );
-	if ( ! $tmpfname )
+	$tmpfname = wp_tempnam($url_filename);
+	if ( ! $tmpfname)
 		return new WP_Error('http_no_file', __('Could not create Temporary file.'));
 
-	$response = wp_safe_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
+	$response = wp_safe_remote_get($url, array('timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname));
 
-	if ( is_wp_error( $response ) ) {
-		unlink( $tmpfname );
+	if (is_wp_error($response)) {
+		unlink($tmpfname);
 		return $response;
 	}
 
-	if ( 200 != wp_remote_retrieve_response_code( $response ) ){
-		unlink( $tmpfname );
-		return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ) );
+	if (200 != wp_remote_retrieve_response_code($response)) {
+		unlink($tmpfname);
+		return new WP_Error('http_404', trim(wp_remote_retrieve_response_message($response)));
 	}
 
-	$content_md5 = wp_remote_retrieve_header( $response, 'content-md5' );
-	if ( $content_md5 ) {
-		$md5_check = verify_file_md5( $tmpfname, $content_md5 );
-		if ( is_wp_error( $md5_check ) ) {
-			unlink( $tmpfname );
+	$content_md5 = wp_remote_retrieve_header($response, 'content-md5');
+	if ($content_md5) {
+		$md5_check = verify_file_md5($tmpfname, $content_md5);
+		if (is_wp_error($md5_check)) {
+			unlink($tmpfname);
 			return $md5_check;
 		}
 	}
@@ -532,20 +532,20 @@ 
  * @param string $expected_md5 The expected MD5 of the file, either a base64 encoded raw md5, or a hex-encoded md5
  * @return bool|object WP_Error on failure, true on success, false when the MD5 format is unknown/unexpected
  */
-function verify_file_md5( $filename, $expected_md5 ) {
-	if ( 32 == strlen( $expected_md5 ) )
-		$expected_raw_md5 = pack( 'H*', $expected_md5 );
-	elseif ( 24 == strlen( $expected_md5 ) )
-		$expected_raw_md5 = base64_decode( $expected_md5 );
+function verify_file_md5($filename, $expected_md5) {
+	if (32 == strlen($expected_md5))
+		$expected_raw_md5 = pack('H*', $expected_md5);
+	elseif (24 == strlen($expected_md5))
+		$expected_raw_md5 = base64_decode($expected_md5);
 	else
 		return false; // unknown format
 
-	$file_md5 = md5_file( $filename, true );
+	$file_md5 = md5_file($filename, true);
 
-	if ( $file_md5 === $expected_raw_md5 )
+	if ($file_md5 === $expected_raw_md5)
 		return true;
 
-	return new WP_Error( 'md5_mismatch', sprintf( __( 'The checksum of the file (%1$s) does not match the expected checksum value (%2$s).' ), bin2hex( $file_md5 ), bin2hex( $expected_raw_md5 ) ) );
+	return new WP_Error('md5_mismatch', sprintf(__('The checksum of the file (%1$s) does not match the expected checksum value (%2$s).'), bin2hex($file_md5), bin2hex($expected_raw_md5)));
 }
 
 /**
@@ -566,27 +566,27 @@ 
 function unzip_file($file, $to) {
 	global $wp_filesystem;
 
-	if ( ! $wp_filesystem || !is_object($wp_filesystem) )
+	if ( ! $wp_filesystem || ! is_object($wp_filesystem))
 		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
 
 	// Unzip can use a lot of memory, but not this much hopefully.
-	wp_raise_memory_limit( 'admin' );
+	wp_raise_memory_limit('admin');
 
 	$needed_dirs = array();
 	$to = trailingslashit($to);
 
 	// Determine any parent dir's needed (of the upgrade directory)
-	if ( ! $wp_filesystem->is_dir($to) ) { //Only do parents if no children exist
+	if ( ! $wp_filesystem->is_dir($to)) { //Only do parents if no children exist
 		$path = preg_split('![/\\\]!', untrailingslashit($to));
-		for ( $i = count($path); $i >= 0; $i-- ) {
-			if ( empty($path[$i]) )
+		for ($i = count($path); $i >= 0; $i--) {
+			if (empty($path[$i]))
 				continue;
 
-			$dir = implode('/', array_slice($path, 0, $i+1) );
-			if ( preg_match('!^[a-z]:$!i', $dir) ) // Skip it if it looks like a Windows Drive letter.
+			$dir = implode('/', array_slice($path, 0, $i + 1));
+			if (preg_match('!^[a-z]:$!i', $dir)) // Skip it if it looks like a Windows Drive letter.
 				continue;
 
-			if ( ! $wp_filesystem->is_dir($dir) )
+			if ( ! $wp_filesystem->is_dir($dir))
 				$needed_dirs[] = $dir;
 			else
 				break; // A folder exists, therefor, we dont need the check the levels below this
@@ -600,12 +600,12 @@ 
 	 *
 	 * @param bool $ziparchive Whether to use ZipArchive. Default true.
 	 */
-	if ( class_exists( 'ZipArchive', false ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) {
+	if (class_exists('ZipArchive', false) && apply_filters('unzip_file_use_ziparchive', true)) {
 		$result = _unzip_file_ziparchive($file, $to, $needed_dirs);
-		if ( true === $result ) {
+		if (true === $result) {
 			return $result;
-		} elseif ( is_wp_error($result) ) {
-			if ( 'incompatible_archive' != $result->get_error_code() )
+		} elseif (is_wp_error($result)) {
+			if ('incompatible_archive' != $result->get_error_code())
 				return $result;
 		}
 	}
@@ -628,32 +628,32 @@ 
  * @param array $needed_dirs A partial list of required folders needed to be created.
  * @return mixed WP_Error on failure, True on success
  */
-function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) {
+function _unzip_file_ziparchive($file, $to, $needed_dirs = array()) {
 	global $wp_filesystem;
 
 	$z = new ZipArchive();
 
-	$zopen = $z->open( $file, ZIPARCHIVE::CHECKCONS );
-	if ( true !== $zopen )
-		return new WP_Error( 'incompatible_archive', __( 'Incompatible Archive.' ), array( 'ziparchive_error' => $zopen ) );
+	$zopen = $z->open($file, ZIPARCHIVE::CHECKCONS);
+	if (true !== $zopen)
+		return new WP_Error('incompatible_archive', __('Incompatible Archive.'), array('ziparchive_error' => $zopen));
 
 	$uncompressed_size = 0;
 
-	for ( $i = 0; $i < $z->numFiles; $i++ ) {
-		if ( ! $info = $z->statIndex($i) )
-			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+	for ($i = 0; $i < $z->numFiles; $i++) {
+		if ( ! $info = $z->statIndex($i))
+			return new WP_Error('stat_failed_ziparchive', __('Could not retrieve file from archive.'));
 
-		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Skip the OS X-created __MACOSX directory
+		if ('__MACOSX/' === substr($info['name'], 0, 9)) // Skip the OS X-created __MACOSX directory
 			continue;
 
 		$uncompressed_size += $info['size'];
 
-		if ( '/' === substr( $info['name'], -1 ) ) {
+		if ('/' === substr($info['name'], -1)) {
 			// Directory.
-			$needed_dirs[] = $to . untrailingslashit( $info['name'] );
-		} elseif ( '.' !== $dirname = dirname( $info['name'] ) ) {
+			$needed_dirs[] = $to.untrailingslashit($info['name']);
+		} elseif ('.' !== $dirname = dirname($info['name'])) {
 			// Path to a file.
-			$needed_dirs[] = $to . untrailingslashit( $dirname );
+			$needed_dirs[] = $to.untrailingslashit($dirname);
 		}
 	}
 
@@ -662,22 +662,22 @@ 
 	 * A disk that has zero free bytes has bigger problems.
 	 * Require we have enough space to unzip the file and copy its contents, with a 10% buffer.
 	 */
-	if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
-		$available_space = @disk_free_space( WP_CONTENT_DIR );
-		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
-			return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+	if (defined('DOING_CRON') && DOING_CRON) {
+		$available_space = @disk_free_space(WP_CONTENT_DIR);
+		if ($available_space && ($uncompressed_size * 2.1) > $available_space)
+			return new WP_Error('disk_full_unzip_file', __('Could not copy files. You may have run out of disk space.'), compact('uncompressed_size', 'available_space'));
 	}
 
 	$needed_dirs = array_unique($needed_dirs);
-	foreach ( $needed_dirs as $dir ) {
+	foreach ($needed_dirs as $dir) {
 		// Check the parent folders of the folders all exist within the creation array.
-		if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
+		if (untrailingslashit($to) == $dir) // Skip over the working directory, We know this exists (or will exist)
 			continue;
-		if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
+		if (strpos($dir, $to) === false) // If the directory is not within the working directory, Skip it
 			continue;
 
 		$parent_folder = dirname($dir);
-		while ( !empty($parent_folder) && untrailingslashit($to) != $parent_folder && !in_array($parent_folder, $needed_dirs) ) {
+		while ( ! empty($parent_folder) && untrailingslashit($to) != $parent_folder && ! in_array($parent_folder, $needed_dirs)) {
 			$needed_dirs[] = $parent_folder;
 			$parent_folder = dirname($parent_folder);
 		}
@@ -685,30 +685,30 @@ 
 	asort($needed_dirs);
 
 	// Create those directories if need be:
-	foreach ( $needed_dirs as $_dir ) {
+	foreach ($needed_dirs as $_dir) {
 		// Only check to see if the Dir exists upon creation failure. Less I/O this way.
-		if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) ) {
-			return new WP_Error( 'mkdir_failed_ziparchive', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
+		if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir)) {
+			return new WP_Error('mkdir_failed_ziparchive', __('Could not create directory.'), substr($_dir, strlen($to)));
 		}
 	}
 	unset($needed_dirs);
 
-	for ( $i = 0; $i < $z->numFiles; $i++ ) {
-		if ( ! $info = $z->statIndex($i) )
-			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+	for ($i = 0; $i < $z->numFiles; $i++) {
+		if ( ! $info = $z->statIndex($i))
+			return new WP_Error('stat_failed_ziparchive', __('Could not retrieve file from archive.'));
 
-		if ( '/' == substr($info['name'], -1) ) // directory
+		if ('/' == substr($info['name'], -1)) // directory
 			continue;
 
-		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
+		if ('__MACOSX/' === substr($info['name'], 0, 9)) // Don't extract the OS X-created __MACOSX directory files
 			continue;
 
 		$contents = $z->getFromIndex($i);
-		if ( false === $contents )
-			return new WP_Error( 'extract_failed_ziparchive', __( 'Could not extract file from archive.' ), $info['name'] );
+		if (false === $contents)
+			return new WP_Error('extract_failed_ziparchive', __('Could not extract file from archive.'), $info['name']);
 
-		if ( ! $wp_filesystem->put_contents( $to . $info['name'], $contents, FS_CHMOD_FILE) )
-			return new WP_Error( 'copy_failed_ziparchive', __( 'Could not copy file.' ), $info['name'] );
+		if ( ! $wp_filesystem->put_contents($to.$info['name'], $contents, FS_CHMOD_FILE))
+			return new WP_Error('copy_failed_ziparchive', __('Could not copy file.'), $info['name']);
 	}
 
 	$z->close();
@@ -736,7 +736,7 @@ 
 
 	mbstring_binary_safe_encoding();
 
-	require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
+	require_once(ABSPATH.'wp-admin/includes/class-pclzip.php');
 
 	$archive = new PclZip($file);
 
@@ -745,22 +745,22 @@ 
 	reset_mbstring_encoding();
 
 	// Is the archive valid?
-	if ( !is_array($archive_files) )
+	if ( ! is_array($archive_files))
 		return new WP_Error('incompatible_archive', __('Incompatible Archive.'), $archive->errorInfo(true));
 
-	if ( 0 == count($archive_files) )
-		return new WP_Error( 'empty_archive_pclzip', __( 'Empty archive.' ) );
+	if (0 == count($archive_files))
+		return new WP_Error('empty_archive_pclzip', __('Empty archive.'));
 
 	$uncompressed_size = 0;
 
 	// Determine any children directories needed (From within the archive)
-	foreach ( $archive_files as $file ) {
-		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Skip the OS X-created __MACOSX directory
+	foreach ($archive_files as $file) {
+		if ('__MACOSX/' === substr($file['filename'], 0, 9)) // Skip the OS X-created __MACOSX directory
 			continue;
 
 		$uncompressed_size += $file['size'];
 
-		$needed_dirs[] = $to . untrailingslashit( $file['folder'] ? $file['filename'] : dirname($file['filename']) );
+		$needed_dirs[] = $to.untrailingslashit($file['folder'] ? $file['filename'] : dirname($file['filename']));
 	}
 
 	/*
@@ -768,22 +768,22 @@ 
 	 * A disk that has zero free bytes has bigger problems.
 	 * Require we have enough space to unzip the file and copy its contents, with a 10% buffer.
 	 */
-	if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
-		$available_space = @disk_free_space( WP_CONTENT_DIR );
-		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
-			return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+	if (defined('DOING_CRON') && DOING_CRON) {
+		$available_space = @disk_free_space(WP_CONTENT_DIR);
+		if ($available_space && ($uncompressed_size * 2.1) > $available_space)
+			return new WP_Error('disk_full_unzip_file', __('Could not copy files. You may have run out of disk space.'), compact('uncompressed_size', 'available_space'));
 	}
 
 	$needed_dirs = array_unique($needed_dirs);
-	foreach ( $needed_dirs as $dir ) {
+	foreach ($needed_dirs as $dir) {
 		// Check the parent folders of the folders all exist within the creation array.
-		if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
+		if (untrailingslashit($to) == $dir) // Skip over the working directory, We know this exists (or will exist)
 			continue;
-		if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
+		if (strpos($dir, $to) === false) // If the directory is not within the working directory, Skip it
 			continue;
 
 		$parent_folder = dirname($dir);
-		while ( !empty($parent_folder) && untrailingslashit($to) != $parent_folder && !in_array($parent_folder, $needed_dirs) ) {
+		while ( ! empty($parent_folder) && untrailingslashit($to) != $parent_folder && ! in_array($parent_folder, $needed_dirs)) {
 			$needed_dirs[] = $parent_folder;
 			$parent_folder = dirname($parent_folder);
 		}
@@ -791,23 +791,23 @@ 
 	asort($needed_dirs);
 
 	// Create those directories if need be:
-	foreach ( $needed_dirs as $_dir ) {
+	foreach ($needed_dirs as $_dir) {
 		// Only check to see if the dir exists upon creation failure. Less I/O this way.
-		if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) )
-			return new WP_Error( 'mkdir_failed_pclzip', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
+		if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir))
+			return new WP_Error('mkdir_failed_pclzip', __('Could not create directory.'), substr($_dir, strlen($to)));
 	}
 	unset($needed_dirs);
 
 	// Extract the files from the zip
-	foreach ( $archive_files as $file ) {
-		if ( $file['folder'] )
+	foreach ($archive_files as $file) {
+		if ($file['folder'])
 			continue;
 
-		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
+		if ('__MACOSX/' === substr($file['filename'], 0, 9)) // Don't extract the OS X-created __MACOSX directory files
 			continue;
 
-		if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) )
-			return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $file['filename'] );
+		if ( ! $wp_filesystem->put_contents($to.$file['filename'], $file['content'], FS_CHMOD_FILE))
+			return new WP_Error('copy_failed_pclzip', __('Could not copy file.'), $file['filename']);
 	}
 	return true;
 }
@@ -825,7 +825,7 @@ 
  * @param array $skip_list a list of files/folders to skip copying
  * @return mixed WP_Error on failure, True on success.
  */
-function copy_dir($from, $to, $skip_list = array() ) {
+function copy_dir($from, $to, $skip_list = array()) {
 	global $wp_filesystem;
 
 	$dirlist = $wp_filesystem->dirlist($from);
@@ -833,32 +833,32 @@ 
 	$from = trailingslashit($from);
 	$to = trailingslashit($to);
 
-	foreach ( (array) $dirlist as $filename => $fileinfo ) {
-		if ( in_array( $filename, $skip_list ) )
+	foreach ((array) $dirlist as $filename => $fileinfo) {
+		if (in_array($filename, $skip_list))
 			continue;
 
-		if ( 'f' == $fileinfo['type'] ) {
-			if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
+		if ('f' == $fileinfo['type']) {
+			if ( ! $wp_filesystem->copy($from.$filename, $to.$filename, true, FS_CHMOD_FILE)) {
 				// If copy failed, chmod file to 0644 and try again.
-				$wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE );
-				if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) )
-					return new WP_Error( 'copy_failed_copy_dir', __( 'Could not copy file.' ), $to . $filename );
+				$wp_filesystem->chmod($to.$filename, FS_CHMOD_FILE);
+				if ( ! $wp_filesystem->copy($from.$filename, $to.$filename, true, FS_CHMOD_FILE))
+					return new WP_Error('copy_failed_copy_dir', __('Could not copy file.'), $to.$filename);
 			}
-		} elseif ( 'd' == $fileinfo['type'] ) {
-			if ( !$wp_filesystem->is_dir($to . $filename) ) {
-				if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
-					return new WP_Error( 'mkdir_failed_copy_dir', __( 'Could not create directory.' ), $to . $filename );
+		} elseif ('d' == $fileinfo['type']) {
+			if ( ! $wp_filesystem->is_dir($to.$filename)) {
+				if ( ! $wp_filesystem->mkdir($to.$filename, FS_CHMOD_DIR))
+					return new WP_Error('mkdir_failed_copy_dir', __('Could not create directory.'), $to.$filename);
 			}
 
 			// generate the $sub_skip_list for the subdirectory as a sub-set of the existing $skip_list
 			$sub_skip_list = array();
-			foreach ( $skip_list as $skip_item ) {
-				if ( 0 === strpos( $skip_item, $filename . '/' ) )
-					$sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
+			foreach ($skip_list as $skip_item) {
+				if (0 === strpos($skip_item, $filename.'/'))
+					$sub_skip_list[] = preg_replace('!^'.preg_quote($filename, '!').'/!i', '', $skip_item);
 			}
 
-			$result = copy_dir($from . $filename, $to . $filename, $sub_skip_list);
-			if ( is_wp_error($result) )
+			$result = copy_dir($from.$filename, $to.$filename, $sub_skip_list);
+			if (is_wp_error($result))
 				return $result;
 		}
 	}
@@ -882,17 +882,17 @@ 
  * @param bool         $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. Default false.
  * @return null|bool false on failure, true on success.
  */
-function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_ownership = false ) {
+function WP_Filesystem($args = false, $context = false, $allow_relaxed_file_ownership = false) {
 	global $wp_filesystem;
 
-	require_once(ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php');
+	require_once(ABSPATH.'wp-admin/includes/class-wp-filesystem-base.php');
 
-	$method = get_filesystem_method( $args, $context, $allow_relaxed_file_ownership );
+	$method = get_filesystem_method($args, $context, $allow_relaxed_file_ownership);
 
-	if ( ! $method )
+	if ( ! $method)
 		return false;
 
-	if ( ! class_exists( "WP_Filesystem_$method" ) ) {
+	if ( ! class_exists("WP_Filesystem_$method")) {
 
 		/**
 		 * Filters the path for a specific filesystem method class file.
@@ -904,9 +904,9 @@ 
 		 * @param string $path   Path to the specific filesystem method class file.
 		 * @param string $method The filesystem method to use.
 		 */
-		$abstraction_file = apply_filters( 'filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method );
+		$abstraction_file = apply_filters('filesystem_method_file', ABSPATH.'wp-admin/includes/class-wp-filesystem-'.$method.'.php', $method);
 
-		if ( ! file_exists($abstraction_file) )
+		if ( ! file_exists($abstraction_file))
 			return;
 
 		require_once($abstraction_file);
@@ -916,22 +916,22 @@ 
 	$wp_filesystem = new $method($args);
 
 	//Define the timeouts for the connections. Only available after the construct is called to allow for per-transport overriding of the default.
-	if ( ! defined('FS_CONNECT_TIMEOUT') )
+	if ( ! defined('FS_CONNECT_TIMEOUT'))
 		define('FS_CONNECT_TIMEOUT', 30);
-	if ( ! defined('FS_TIMEOUT') )
+	if ( ! defined('FS_TIMEOUT'))
 		define('FS_TIMEOUT', 30);
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
+	if (is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code())
 		return false;
 
-	if ( !$wp_filesystem->connect() )
+	if ( ! $wp_filesystem->connect())
 		return false; //There was an error connecting to the server.
 
 	// Set the permission constants if not already set.
-	if ( ! defined('FS_CHMOD_DIR') )
-		define('FS_CHMOD_DIR', ( fileperms( ABSPATH ) & 0777 | 0755 ) );
-	if ( ! defined('FS_CHMOD_FILE') )
-		define('FS_CHMOD_FILE', ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 ) );
+	if ( ! defined('FS_CHMOD_DIR'))
+		define('FS_CHMOD_DIR', (fileperms(ABSPATH) & 0777 | 0755));
+	if ( ! defined('FS_CHMOD_FILE'))
+		define('FS_CHMOD_FILE', (fileperms(ABSPATH.'index.php') & 0777 | 0644));
 
 	return true;
 }
@@ -962,39 +962,39 @@ 
  *                                             Default false.
  * @return string The transport to use, see description for valid return values.
  */
-function get_filesystem_method( $args = array(), $context = '', $allow_relaxed_file_ownership = false ) {
+function get_filesystem_method($args = array(), $context = '', $allow_relaxed_file_ownership = false) {
 	$method = defined('FS_METHOD') ? FS_METHOD : false; // Please ensure that this is either 'direct', 'ssh2', 'ftpext' or 'ftpsockets'
 
-	if ( ! $context ) {
+	if ( ! $context) {
 		$context = WP_CONTENT_DIR;
 	}
 
 	// If the directory doesn't exist (wp-content/languages) then use the parent directory as we'll create it.
-	if ( WP_LANG_DIR == $context && ! is_dir( $context ) ) {
-		$context = dirname( $context );
+	if (WP_LANG_DIR == $context && ! is_dir($context)) {
+		$context = dirname($context);
 	}
 
-	$context = trailingslashit( $context );
+	$context = trailingslashit($context);
 
-	if ( ! $method ) {
+	if ( ! $method) {
 
-		$temp_file_name = $context . 'temp-write-test-' . time();
+		$temp_file_name = $context.'temp-write-test-'.time();
 		$temp_handle = @fopen($temp_file_name, 'w');
-		if ( $temp_handle ) {
+		if ($temp_handle) {
 
 			// Attempt to determine the file owner of the WordPress files, and that of newly created files
 			$wp_file_owner = $temp_file_owner = false;
-			if ( function_exists('fileowner') ) {
-				$wp_file_owner = @fileowner( __FILE__ );
-				$temp_file_owner = @fileowner( $temp_file_name );
+			if (function_exists('fileowner')) {
+				$wp_file_owner = @fileowner(__FILE__);
+				$temp_file_owner = @fileowner($temp_file_name);
 			}
 
-			if ( $wp_file_owner !== false && $wp_file_owner === $temp_file_owner ) {
+			if ($wp_file_owner !== false && $wp_file_owner === $temp_file_owner) {
 				// WordPress is creating files as the same owner as the WordPress files,
 				// this means it's safe to modify & create new files via PHP.
 				$method = 'direct';
 				$GLOBALS['_wp_filesystem_direct_method'] = 'file_owner';
-			} elseif ( $allow_relaxed_file_ownership ) {
+			} elseif ($allow_relaxed_file_ownership) {
 				// The $context directory is writable, and $allow_relaxed_file_ownership is set, this means we can modify files
 				// safely in this directory. This mode doesn't create new files, only alter existing ones.
 				$method = 'direct';
@@ -1006,9 +1006,9 @@ 
 		}
  	}
 
-	if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && function_exists('stream_get_contents') ) $method = 'ssh2';
-	if ( ! $method && extension_loaded('ftp') ) $method = 'ftpext';
-	if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
+	if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && function_exists('stream_get_contents')) $method = 'ssh2';
+	if ( ! $method && extension_loaded('ftp')) $method = 'ftpext';
+	if ( ! $method && (extension_loaded('sockets') || function_exists('fsockopen'))) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
 
 	/**
 	 * Filters the filesystem method to use.
@@ -1020,7 +1020,7 @@ 
 	 * @param string $context Full path to the directory that is tested for being writable.
 	 * @param bool   $allow_relaxed_file_ownership Whether to allow Group/World writable.
 	 */
-	return apply_filters( 'filesystem_method', $method, $args, $context, $allow_relaxed_file_ownership );
+	return apply_filters('filesystem_method', $method, $args, $context, $allow_relaxed_file_ownership);
 }
 
 /**
@@ -1051,7 +1051,7 @@ 
  *
  * @return bool False on failure, true on success.
  */
-function request_filesystem_credentials( $form_post, $type = '', $error = false, $context = '', $extra_fields = null, $allow_relaxed_file_ownership = false ) {
+function request_filesystem_credentials($form_post, $type = '', $error = false, $context = '', $extra_fields = null, $allow_relaxed_file_ownership = false) {
 	global $pagenow;
 
 	/**
@@ -1074,87 +1074,87 @@ 
 	 *                                             Default false.
 	 * @param array  $extra_fields                 Extra POST fields.
 	 */
-	$req_cred = apply_filters( 'request_filesystem_credentials', '', $form_post, $type, $error, $context, $extra_fields, $allow_relaxed_file_ownership );
-	if ( '' !== $req_cred )
+	$req_cred = apply_filters('request_filesystem_credentials', '', $form_post, $type, $error, $context, $extra_fields, $allow_relaxed_file_ownership);
+	if ('' !== $req_cred)
 		return $req_cred;
 
-	if ( empty($type) ) {
-		$type = get_filesystem_method( array(), $context, $allow_relaxed_file_ownership );
+	if (empty($type)) {
+		$type = get_filesystem_method(array(), $context, $allow_relaxed_file_ownership);
 	}
 
-	if ( 'direct' == $type )
+	if ('direct' == $type)
 		return true;
 
-	if ( is_null( $extra_fields ) )
-		$extra_fields = array( 'version', 'locale' );
+	if (is_null($extra_fields))
+		$extra_fields = array('version', 'locale');
 
-	$credentials = get_option('ftp_credentials', array( 'hostname' => '', 'username' => ''));
+	$credentials = get_option('ftp_credentials', array('hostname' => '', 'username' => ''));
 
 	// If defined, set it to that, Else, If POST'd, set it to that, If not, Set it to whatever it previously was(saved details in option)
-	$credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($_POST['hostname']) ? wp_unslash( $_POST['hostname'] ) : $credentials['hostname']);
-	$credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? wp_unslash( $_POST['username'] ) : $credentials['username']);
-	$credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? wp_unslash( $_POST['password'] ) : '');
+	$credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : ( ! empty($_POST['hostname']) ? wp_unslash($_POST['hostname']) : $credentials['hostname']);
+	$credentials['username'] = defined('FTP_USER') ? FTP_USER : ( ! empty($_POST['username']) ? wp_unslash($_POST['username']) : $credentials['username']);
+	$credentials['password'] = defined('FTP_PASS') ? FTP_PASS : ( ! empty($_POST['password']) ? wp_unslash($_POST['password']) : '');
 
 	// Check to see if we are setting the public/private keys for ssh
-	$credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : (!empty($_POST['public_key']) ? wp_unslash( $_POST['public_key'] ) : '');
-	$credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : (!empty($_POST['private_key']) ? wp_unslash( $_POST['private_key'] ) : '');
+	$credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : ( ! empty($_POST['public_key']) ? wp_unslash($_POST['public_key']) : '');
+	$credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : ( ! empty($_POST['private_key']) ? wp_unslash($_POST['private_key']) : '');
 
 	// Sanitize the hostname, Some people might pass in odd-data:
 	$credentials['hostname'] = preg_replace('|\w+://|', '', $credentials['hostname']); //Strip any schemes off
 
-	if ( strpos($credentials['hostname'], ':') ) {
-		list( $credentials['hostname'], $credentials['port'] ) = explode(':', $credentials['hostname'], 2);
-		if ( ! is_numeric($credentials['port']) )
+	if (strpos($credentials['hostname'], ':')) {
+		list($credentials['hostname'], $credentials['port']) = explode(':', $credentials['hostname'], 2);
+		if ( ! is_numeric($credentials['port']))
 			unset($credentials['port']);
 	} else {
 		unset($credentials['port']);
 	}
 
-	if ( ( defined( 'FTP_SSH' ) && FTP_SSH ) || ( defined( 'FS_METHOD' ) && 'ssh2' == FS_METHOD ) ) {
+	if ((defined('FTP_SSH') && FTP_SSH) || (defined('FS_METHOD') && 'ssh2' == FS_METHOD)) {
 		$credentials['connection_type'] = 'ssh';
-	} elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' == $type ) { //Only the FTP Extension understands SSL
+	} elseif ((defined('FTP_SSL') && FTP_SSL) && 'ftpext' == $type) { //Only the FTP Extension understands SSL
 		$credentials['connection_type'] = 'ftps';
-	} elseif ( ! empty( $_POST['connection_type'] ) ) {
-		$credentials['connection_type'] = wp_unslash( $_POST['connection_type'] );
-	} elseif ( ! isset( $credentials['connection_type'] ) ) { //All else fails (And it's not defaulted to something else saved), Default to FTP
+	} elseif ( ! empty($_POST['connection_type'])) {
+		$credentials['connection_type'] = wp_unslash($_POST['connection_type']);
+	} elseif ( ! isset($credentials['connection_type'])) { //All else fails (And it's not defaulted to something else saved), Default to FTP
 		$credentials['connection_type'] = 'ftp';
 	}
 	if ( ! $error &&
 			(
-				( !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) ||
-				( 'ssh' == $credentials['connection_type'] && !empty($credentials['public_key']) && !empty($credentials['private_key']) )
-			) ) {
+				( ! empty($credentials['password']) && ! empty($credentials['username']) && ! empty($credentials['hostname'])) ||
+				('ssh' == $credentials['connection_type'] && ! empty($credentials['public_key']) && ! empty($credentials['private_key']))
+			)) {
 		$stored_credentials = $credentials;
-		if ( !empty($stored_credentials['port']) ) //save port as part of hostname to simplify above code.
-			$stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
+		if ( ! empty($stored_credentials['port'])) //save port as part of hostname to simplify above code.
+			$stored_credentials['hostname'] .= ':'.$stored_credentials['port'];
 
 		unset($stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key']);
-		if ( ! wp_installing() ) {
-			update_option( 'ftp_credentials', $stored_credentials );
+		if ( ! wp_installing()) {
+			update_option('ftp_credentials', $stored_credentials);
 		}
 		return $credentials;
 	}
-	$hostname = isset( $credentials['hostname'] ) ? $credentials['hostname'] : '';
-	$username = isset( $credentials['username'] ) ? $credentials['username'] : '';
-	$public_key = isset( $credentials['public_key'] ) ? $credentials['public_key'] : '';
-	$private_key = isset( $credentials['private_key'] ) ? $credentials['private_key'] : '';
-	$port = isset( $credentials['port'] ) ? $credentials['port'] : '';
-	$connection_type = isset( $credentials['connection_type'] ) ? $credentials['connection_type'] : '';
-
-	if ( $error ) {
+	$hostname = isset($credentials['hostname']) ? $credentials['hostname'] : '';
+	$username = isset($credentials['username']) ? $credentials['username'] : '';
+	$public_key = isset($credentials['public_key']) ? $credentials['public_key'] : '';
+	$private_key = isset($credentials['private_key']) ? $credentials['private_key'] : '';
+	$port = isset($credentials['port']) ? $credentials['port'] : '';
+	$connection_type = isset($credentials['connection_type']) ? $credentials['connection_type'] : '';
+
+	if ($error) {
 		$error_string = __('<strong>ERROR:</strong> There was an error connecting to the server, Please verify the settings are correct.');
-		if ( is_wp_error($error) )
-			$error_string = esc_html( $error->get_error_message() );
-		echo '<div id="message" class="error"><p>' . $error_string . '</p></div>';
+		if (is_wp_error($error))
+			$error_string = esc_html($error->get_error_message());
+		echo '<div id="message" class="error"><p>'.$error_string.'</p></div>';
 	}
 
 	$types = array();
-	if ( extension_loaded('ftp') || extension_loaded('sockets') || function_exists('fsockopen') )
-		$types[ 'ftp' ] = __('FTP');
-	if ( extension_loaded('ftp') ) //Only this supports FTPS
-		$types[ 'ftps' ] = __('FTPS (SSL)');
-	if ( extension_loaded('ssh2') && function_exists('stream_get_contents') )
-		$types[ 'ssh' ] = __('SSH2');
+	if (extension_loaded('ftp') || extension_loaded('sockets') || function_exists('fsockopen'))
+		$types['ftp'] = __('FTP');
+	if (extension_loaded('ftp')) //Only this supports FTPS
+		$types['ftps'] = __('FTPS (SSL)');
+	if (extension_loaded('ssh2') && function_exists('stream_get_contents'))
+		$types['ssh'] = __('SSH2');
 
 	/**
 	 * Filters the connection types to output to the filesystem credentials form.
@@ -1169,26 +1169,26 @@ 
 	 * @param string $context     Full path to the directory that is tested
 	 *                            for being writable.
 	 */
-	$types = apply_filters( 'fs_ftp_connection_types', $types, $credentials, $type, $error, $context );
+	$types = apply_filters('fs_ftp_connection_types', $types, $credentials, $type, $error, $context);
 
 ?>
-<form action="<?php echo esc_url( $form_post ) ?>" method="post">
+<form action="<?php echo esc_url($form_post) ?>" method="post">
 <div id="request-filesystem-credentials-form" class="request-filesystem-credentials-form">
 <?php
 // Print a H1 heading in the FTP credentials modal dialog, default is a H2.
 $heading_tag = 'h2';
-if ( 'plugins.php' === $pagenow || 'plugin-install.php' === $pagenow ) {
+if ('plugins.php' === $pagenow || 'plugin-install.php' === $pagenow) {
 	$heading_tag = 'h1';
 }
-echo "<$heading_tag id='request-filesystem-credentials-title'>" . __( 'Connection Information' ) . "</$heading_tag>";
+echo "<$heading_tag id='request-filesystem-credentials-title'>".__('Connection Information')."</$heading_tag>";
 ?>
 <p id="request-filesystem-credentials-desc"><?php
 	$label_user = __('Username');
 	$label_pass = __('Password');
 	_e('To perform the requested action, WordPress needs to access your web server.');
 	echo ' ';
-	if ( ( isset( $types['ftp'] ) || isset( $types['ftps'] ) ) ) {
-		if ( isset( $types['ssh'] ) ) {
+	if ((isset($types['ftp']) || isset($types['ftps']))) {
+		if (isset($types['ssh'])) {
 			_e('Please enter your FTP or SSH credentials to proceed.');
 			$label_user = __('FTP/SSH Username');
 			$label_pass = __('FTP/SSH Password');
@@ -1202,29 +1202,29 @@ 
 	_e('If you do not remember your credentials, you should contact your web host.');
 ?></p>
 <label for="hostname">
-	<span class="field-title"><?php _e( 'Hostname' ) ?></span>
-	<input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e( 'example: www.wordpress.org' ) ?>" value="<?php echo esc_attr($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php disabled( defined('FTP_HOST') ); ?> />
+	<span class="field-title"><?php _e('Hostname') ?></span>
+	<input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e('example: www.wordpress.org') ?>" value="<?php echo esc_attr($hostname); if ( ! empty($port)) echo ":$port"; ?>"<?php disabled(defined('FTP_HOST')); ?> />
 </label>
 <div class="ftp-username">
 	<label for="username">
 		<span class="field-title"><?php echo $label_user; ?></span>
-		<input name="username" type="text" id="username" value="<?php echo esc_attr($username) ?>"<?php disabled( defined('FTP_USER') ); ?> />
+		<input name="username" type="text" id="username" value="<?php echo esc_attr($username) ?>"<?php disabled(defined('FTP_USER')); ?> />
 	</label>
 </div>
 <div class="ftp-password">
 	<label for="password">
 		<span class="field-title"><?php echo $label_pass; ?></span>
-		<input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) echo '*****'; ?>"<?php disabled( defined('FTP_PASS') ); ?> />
-		<em><?php if ( ! defined('FTP_PASS') ) _e( 'This password will not be stored on the server.' ); ?></em>
+		<input name="password" type="password" id="password" value="<?php if (defined('FTP_PASS')) echo '*****'; ?>"<?php disabled(defined('FTP_PASS')); ?> />
+		<em><?php if ( ! defined('FTP_PASS')) _e('This password will not be stored on the server.'); ?></em>
 	</label>
 </div>
 <fieldset>
-<legend><?php _e( 'Connection Type' ); ?></legend>
+<legend><?php _e('Connection Type'); ?></legend>
 <?php
-	$disabled = disabled( ( defined( 'FTP_SSL' ) && FTP_SSL ) || ( defined( 'FTP_SSH' ) && FTP_SSH ), true, false );
-	foreach ( $types as $name => $text ) : ?>
-	<label for="<?php echo esc_attr( $name ) ?>">
-		<input type="radio" name="connection_type" id="<?php echo esc_attr( $name ) ?>" value="<?php echo esc_attr( $name ) ?>"<?php checked( $name, $connection_type ); echo $disabled; ?> />
+	$disabled = disabled((defined('FTP_SSL') && FTP_SSL) || (defined('FTP_SSH') && FTP_SSH), true, false);
+	foreach ($types as $name => $text) : ?>
+	<label for="<?php echo esc_attr($name) ?>">
+		<input type="radio" name="connection_type" id="<?php echo esc_attr($name) ?>" value="<?php echo esc_attr($name) ?>"<?php checked($name, $connection_type); echo $disabled; ?> />
 		<?php echo $text; ?>
 	</label>
 <?php
@@ -1232,35 +1232,35 @@ 
 ?>
 </fieldset>
 <?php
-if ( isset( $types['ssh'] ) ) {
+if (isset($types['ssh'])) {
 	$hidden_class = '';
-	if ( 'ssh' != $connection_type || empty( $connection_type ) ) {
+	if ('ssh' != $connection_type || empty($connection_type)) {
 		$hidden_class = ' class="hidden"';
 	}
 ?>
 <fieldset id="ssh-keys"<?php echo $hidden_class; ?>">
-<legend><?php _e( 'Authentication Keys' ); ?></legend>
+<legend><?php _e('Authentication Keys'); ?></legend>
 <label for="public_key">
 	<span class="field-title"><?php _e('Public Key:') ?></span>
-	<input name="public_key" type="text" id="public_key" aria-describedby="auth-keys-desc" value="<?php echo esc_attr($public_key) ?>"<?php disabled( defined('FTP_PUBKEY') ); ?> />
+	<input name="public_key" type="text" id="public_key" aria-describedby="auth-keys-desc" value="<?php echo esc_attr($public_key) ?>"<?php disabled(defined('FTP_PUBKEY')); ?> />
 </label>
 <label for="private_key">
 	<span class="field-title"><?php _e('Private Key:') ?></span>
-	<input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php disabled( defined('FTP_PRIKEY') ); ?> />
+	<input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php disabled(defined('FTP_PRIKEY')); ?> />
 </label>
-<p id="auth-keys-desc"><?php _e( 'Enter the location on the server where the public and private keys are located. If a passphrase is needed, enter that in the password field above.' ) ?></p>
+<p id="auth-keys-desc"><?php _e('Enter the location on the server where the public and private keys are located. If a passphrase is needed, enter that in the password field above.') ?></p>
 </fieldset>
 <?php
 }
 
-foreach ( (array) $extra_fields as $field ) {
-	if ( isset( $_POST[ $field ] ) )
-		echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( wp_unslash( $_POST[ $field ] ) ) . '" />';
+foreach ((array) $extra_fields as $field) {
+	if (isset($_POST[$field]))
+		echo '<input type="hidden" name="'.esc_attr($field).'" value="'.esc_attr(wp_unslash($_POST[$field])).'" />';
 }
 ?>
 	<p class="request-filesystem-credentials-action-buttons">
-		<button class="button cancel-button" data-js-action="close" type="button"><?php _e( 'Cancel' ); ?></button>
-		<?php submit_button( __( 'Proceed' ), 'button', 'upgrade', false ); ?>
+		<button class="button cancel-button" data-js-action="close" type="button"><?php _e('Cancel'); ?></button>
+		<?php submit_button(__('Proceed'), 'button', 'upgrade', false); ?>
 	</p>
 </div>
 </form>
@@ -1276,10 +1276,10 @@ 
 function wp_print_request_filesystem_credentials_modal() {
 	$filesystem_method = get_filesystem_method();
 	ob_start();
-	$filesystem_credentials_are_stored = request_filesystem_credentials( self_admin_url() );
+	$filesystem_credentials_are_stored = request_filesystem_credentials(self_admin_url());
 	ob_end_clean();
-	$request_filesystem_credentials = ( $filesystem_method != 'direct' && ! $filesystem_credentials_are_stored );
-	if ( ! $request_filesystem_credentials ) {
+	$request_filesystem_credentials = ($filesystem_method != 'direct' && ! $filesystem_credentials_are_stored);
+	if ( ! $request_filesystem_credentials) {
 		return;
 	}
 	?>
@@ -1287,7 +1287,7 @@ 
 		<div class="notification-dialog-background"></div>
 		<div class="notification-dialog" role="dialog" aria-labelledby="request-filesystem-credentials-title" tabindex="0">
 			<div class="request-filesystem-credentials-dialog-content">
-				<?php request_filesystem_credentials( site_url() ); ?>
+				<?php request_filesystem_credentials(site_url()); ?>
 			</div>
 		</div>
 	</div>

src/wp-admin/includes/update.php

Spacing +177 added lines, -177 removed lines

@@ -13,10 +13,10 @@ 
  */
 function get_preferred_from_update_core() {
 	$updates = get_core_updates();
-	if ( ! is_array( $updates ) )
+	if ( ! is_array($updates))
 		return false;
-	if ( empty( $updates ) )
-		return (object) array( 'response' => 'latest' );
+	if (empty($updates))
+		return (object) array('response' => 'latest');
 	return $updates[0];
 }
 
@@ -27,31 +27,31 @@ 
  * 	                     set $options['available'] to false to skip not-dismissed updates.
  * @return array|false Array of the update objects on success, false on failure.
  */
-function get_core_updates( $options = array() ) {
-	$options = array_merge( array( 'available' => true, 'dismissed' => false ), $options );
-	$dismissed = get_site_option( 'dismissed_update_core' );
+function get_core_updates($options = array()) {
+	$options = array_merge(array('available' => true, 'dismissed' => false), $options);
+	$dismissed = get_site_option('dismissed_update_core');
 
-	if ( ! is_array( $dismissed ) )
+	if ( ! is_array($dismissed))
 		$dismissed = array();
 
-	$from_api = get_site_transient( 'update_core' );
+	$from_api = get_site_transient('update_core');
 
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) )
+	if ( ! isset($from_api->updates) || ! is_array($from_api->updates))
 		return false;
 
 	$updates = $from_api->updates;
 	$result = array();
-	foreach ( $updates as $update ) {
-		if ( $update->response == 'autoupdate' )
+	foreach ($updates as $update) {
+		if ($update->response == 'autoupdate')
 			continue;
 
-		if ( array_key_exists( $update->current . '|' . $update->locale, $dismissed ) ) {
-			if ( $options['dismissed'] ) {
+		if (array_key_exists($update->current.'|'.$update->locale, $dismissed)) {
+			if ($options['dismissed']) {
 				$update->dismissed = true;
 				$result[] = $update;
 			}
 		} else {
-			if ( $options['available'] ) {
+			if ($options['available']) {
 				$update->dismissed = false;
 				$result[] = $update;
 			}
@@ -70,22 +70,22 @@ 
  * @return array|false False on failure, otherwise the core update offering.
  */
 function find_core_auto_update() {
-	$updates = get_site_transient( 'update_core' );
-	if ( ! $updates || empty( $updates->updates ) )
+	$updates = get_site_transient('update_core');
+	if ( ! $updates || empty($updates->updates))
 		return false;
 
-	include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+	include_once(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 
 	$auto_update = false;
 	$upgrader = new WP_Automatic_Updater;
-	foreach ( $updates->updates as $update ) {
-		if ( 'autoupdate' != $update->response )
+	foreach ($updates->updates as $update) {
+		if ('autoupdate' != $update->response)
 			continue;
 
-		if ( ! $upgrader->should_update( 'core', $update, ABSPATH ) )
+		if ( ! $upgrader->should_update('core', $update, ABSPATH))
 			continue;
 
-		if ( ! $auto_update || version_compare( $update->current, $auto_update->current, '>' ) )
+		if ( ! $auto_update || version_compare($update->current, $auto_update->current, '>'))
 			$auto_update = $update;
 	}
 	return $auto_update;
@@ -100,29 +100,29 @@ 
  * @param string $locale  Locale to query.
  * @return bool|array False on failure. An array of checksums on success.
  */
-function get_core_checksums( $version, $locale ) {
-	$url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
+function get_core_checksums($version, $locale) {
+	$url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?'.http_build_query(compact('version', 'locale'), null, '&');
 
-	if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-		$url = set_url_scheme( $url, 'https' );
+	if ($ssl = wp_http_supports(array('ssl')))
+		$url = set_url_scheme($url, 'https');
 
 	$options = array(
-		'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ),
+		'timeout' => ((defined('DOING_CRON') && DOING_CRON) ? 30 : 3),
 	);
 
-	$response = wp_remote_get( $url, $options );
-	if ( $ssl && is_wp_error( $response ) ) {
-		trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
-		$response = wp_remote_get( $http_url, $options );
+	$response = wp_remote_get($url, $options);
+	if ($ssl && is_wp_error($response)) {
+		trigger_error(__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.').' '.__('(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)'), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE);
+		$response = wp_remote_get($http_url, $options);
 	}
 
-	if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+	if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response))
 		return false;
 
-	$body = trim( wp_remote_retrieve_body( $response ) );
-	$body = json_decode( $body, true );
+	$body = trim(wp_remote_retrieve_body($response));
+	$body = json_decode($body, true);
 
-	if ( ! is_array( $body ) || ! isset( $body['checksums'] ) || ! is_array( $body['checksums'] ) )
+	if ( ! is_array($body) || ! isset($body['checksums']) || ! is_array($body['checksums']))
 		return false;
 
 	return $body['checksums'];
@@ -133,10 +133,10 @@ 
  * @param object $update
  * @return bool
  */
-function dismiss_core_update( $update ) {
-	$dismissed = get_site_option( 'dismissed_update_core' );
-	$dismissed[ $update->current . '|' . $update->locale ] = true;
-	return update_site_option( 'dismissed_update_core', $dismissed );
+function dismiss_core_update($update) {
+	$dismissed = get_site_option('dismissed_update_core');
+	$dismissed[$update->current.'|'.$update->locale] = true;
+	return update_site_option('dismissed_update_core', $dismissed);
 }
 
 /**
@@ -145,15 +145,15 @@ 
  * @param string $locale
  * @return bool
  */
-function undismiss_core_update( $version, $locale ) {
-	$dismissed = get_site_option( 'dismissed_update_core' );
-	$key = $version . '|' . $locale;
+function undismiss_core_update($version, $locale) {
+	$dismissed = get_site_option('dismissed_update_core');
+	$key = $version.'|'.$locale;
 
-	if ( ! isset( $dismissed[$key] ) )
+	if ( ! isset($dismissed[$key]))
 		return false;
 
-	unset( $dismissed[$key] );
-	return update_site_option( 'dismissed_update_core', $dismissed );
+	unset($dismissed[$key]);
+	return update_site_option('dismissed_update_core', $dismissed);
 }
 
 /**
@@ -162,15 +162,15 @@ 
  * @param string $locale
  * @return object|false
  */
-function find_core_update( $version, $locale ) {
-	$from_api = get_site_transient( 'update_core' );
+function find_core_update($version, $locale) {
+	$from_api = get_site_transient('update_core');
 
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) )
+	if ( ! isset($from_api->updates) || ! is_array($from_api->updates))
 		return false;
 
 	$updates = $from_api->updates;
-	foreach ( $updates as $update ) {
-		if ( $update->current == $version && $update->locale == $locale )
+	foreach ($updates as $update) {
+		if ($update->current == $version && $update->locale == $locale)
 			return $update;
 	}
 	return false;
@@ -181,33 +181,33 @@ 
  * @param string $msg
  * @return string
  */
-function core_update_footer( $msg = '' ) {
-	if ( !current_user_can('update_core') )
-		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+function core_update_footer($msg = '') {
+	if ( ! current_user_can('update_core'))
+		return sprintf(__('Version %s'), get_bloginfo('version', 'display'));
 
 	$cur = get_preferred_from_update_core();
-	if ( ! is_object( $cur ) )
+	if ( ! is_object($cur))
 		$cur = new stdClass;
 
-	if ( ! isset( $cur->current ) )
+	if ( ! isset($cur->current))
 		$cur->current = '';
 
-	if ( ! isset( $cur->url ) )
+	if ( ! isset($cur->url))
 		$cur->url = '';
 
-	if ( ! isset( $cur->response ) )
+	if ( ! isset($cur->response))
 		$cur->response = '';
 
-	switch ( $cur->response ) {
+	switch ($cur->response) {
 	case 'development' :
-		return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) );
+		return sprintf(__('You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.'), get_bloginfo('version', 'display'), network_admin_url('update-core.php'));
 
 	case 'upgrade' :
-		return '<strong><a href="' . network_admin_url( 'update-core.php' ) . '">' . sprintf( __( 'Get Version %s' ), $cur->current ) . '</a></strong>';
+		return '<strong><a href="'.network_admin_url('update-core.php').'">'.sprintf(__('Get Version %s'), $cur->current).'</a></strong>';
 
 	case 'latest' :
 	default :
-		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+		return sprintf(__('Version %s'), get_bloginfo('version', 'display'));
 	}
 }
 
@@ -217,39 +217,39 @@ 
  * @return false|void
  */
 function update_nag() {
-	if ( is_multisite() && !current_user_can('update_core') )
+	if (is_multisite() && ! current_user_can('update_core'))
 		return false;
 
 	global $pagenow;
 
-	if ( 'update-core.php' == $pagenow )
+	if ('update-core.php' == $pagenow)
 		return;
 
 	$cur = get_preferred_from_update_core();
 
-	if ( ! isset( $cur->response ) || $cur->response != 'upgrade' )
+	if ( ! isset($cur->response) || $cur->response != 'upgrade')
 		return false;
 
-	if ( current_user_can( 'update_core' ) ) {
+	if (current_user_can('update_core')) {
 		$msg = sprintf(
 			/* translators: 1: Codex URL to release notes, 2: new WordPress version, 3: URL to network admin, 4: accessibility text */
-			__( '<a href="%1$s">WordPress %2$s</a> is available! <a href="%3$s" aria-label="%4$s">Please update now</a>.' ),
+			__('<a href="%1$s">WordPress %2$s</a> is available! <a href="%3$s" aria-label="%4$s">Please update now</a>.'),
 			sprintf(
 				/* translators: %s: WordPress version */
-				esc_url( __( 'https://codex.wordpress.org/Version_%s' ) ),
+				esc_url(__('https://codex.wordpress.org/Version_%s')),
 				$cur->current
 			),
 			$cur->current,
-			network_admin_url( 'update-core.php' ),
-			esc_attr__( 'Please update WordPress now' )
+			network_admin_url('update-core.php'),
+			esc_attr__('Please update WordPress now')
 		);
 	} else {
 		$msg = sprintf(
 			/* translators: 1: Codex URL to release notes, 2: new WordPress version */
-			__( '<a href="%1$s">WordPress %2$s</a> is available! Please notify the site administrator.' ),
+			__('<a href="%1$s">WordPress %2$s</a> is available! Please notify the site administrator.'),
 			sprintf(
 				/* translators: %s: WordPress version */
-				esc_url( __( 'https://codex.wordpress.org/Version_%s' ) ),
+				esc_url(__('https://codex.wordpress.org/Version_%s')),
 				$cur->current
 			),
 			$cur->current
@@ -261,21 +261,21 @@ 
 // Called directly from dashboard
 function update_right_now_message() {
 	$theme_name = wp_get_theme();
-	if ( current_user_can( 'switch_themes' ) ) {
-		$theme_name = sprintf( '<a href="themes.php">%1$s</a>', $theme_name );
+	if (current_user_can('switch_themes')) {
+		$theme_name = sprintf('<a href="themes.php">%1$s</a>', $theme_name);
 	}
 
 	$msg = '';
 
-	if ( current_user_can('update_core') ) {
+	if (current_user_can('update_core')) {
 		$cur = get_preferred_from_update_core();
 
-		if ( isset( $cur->response ) && $cur->response == 'upgrade' )
-			$msg .= '<a href="' . network_admin_url( 'update-core.php' ) . '" class="button" aria-describedby="wp-version">' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a> ';
+		if (isset($cur->response) && $cur->response == 'upgrade')
+			$msg .= '<a href="'.network_admin_url('update-core.php').'" class="button" aria-describedby="wp-version">'.sprintf(__('Update to %s'), $cur->current ? $cur->current : __('Latest')).'</a> ';
 	}
 
 	/* translators: 1: version number, 2: theme name */
-	$content = __( 'WordPress %1$s running %2$s theme.' );
+	$content = __('WordPress %1$s running %2$s theme.');
 
 	/**
 	 * Filters the text displayed in the 'At a Glance' dashboard widget.
@@ -286,9 +286,9 @@ 
 	 *
 	 * @param string $content Default text.
 	 */
-	$content = apply_filters( 'update_right_now_text', $content );
+	$content = apply_filters('update_right_now_text', $content);
 
-	$msg .= sprintf( '<span id="wp-version">' . $content . '</span>', get_bloginfo( 'version', 'display' ), $theme_name );
+	$msg .= sprintf('<span id="wp-version">'.$content.'</span>', get_bloginfo('version', 'display'), $theme_name);
 
 	echo "<p id='wp-version-message'>$msg</p>";
 }
@@ -301,11 +301,11 @@ 
 function get_plugin_updates() {
 	$all_plugins = get_plugins();
 	$upgrade_plugins = array();
-	$current = get_site_transient( 'update_plugins' );
-	foreach ( (array)$all_plugins as $plugin_file => $plugin_data) {
-		if ( isset( $current->response[ $plugin_file ] ) ) {
-			$upgrade_plugins[ $plugin_file ] = (object) $plugin_data;
-			$upgrade_plugins[ $plugin_file ]->update = $current->response[ $plugin_file ];
+	$current = get_site_transient('update_plugins');
+	foreach ((array) $all_plugins as $plugin_file => $plugin_data) {
+		if (isset($current->response[$plugin_file])) {
+			$upgrade_plugins[$plugin_file] = (object) $plugin_data;
+			$upgrade_plugins[$plugin_file]->update = $current->response[$plugin_file];
 		}
 	}
 
@@ -316,14 +316,14 @@ 
  * @since 2.9.0
  */
 function wp_plugin_update_rows() {
-	if ( !current_user_can('update_plugins' ) )
+	if ( ! current_user_can('update_plugins'))
 		return;
 
-	$plugins = get_site_transient( 'update_plugins' );
-	if ( isset($plugins->response) && is_array($plugins->response) ) {
-		$plugins = array_keys( $plugins->response );
-		foreach ( $plugins as $plugin_file ) {
-			add_action( "after_plugin_row_$plugin_file", 'wp_plugin_update_row', 10, 2 );
+	$plugins = get_site_transient('update_plugins');
+	if (isset($plugins->response) && is_array($plugins->response)) {
+		$plugins = array_keys($plugins->response);
+		foreach ($plugins as $plugin_file) {
+			add_action("after_plugin_row_$plugin_file", 'wp_plugin_update_row', 10, 2);
 		}
 	}
 }
@@ -335,74 +335,74 @@ 
  * @param array  $plugin_data Plugin information.
  * @return false|void
  */
-function wp_plugin_update_row( $file, $plugin_data ) {
-	$current = get_site_transient( 'update_plugins' );
-	if ( ! isset( $current->response[ $file ] ) ) {
+function wp_plugin_update_row($file, $plugin_data) {
+	$current = get_site_transient('update_plugins');
+	if ( ! isset($current->response[$file])) {
 		return false;
 	}
 
-	$response = $current->response[ $file ];
+	$response = $current->response[$file];
 
 	$plugins_allowedtags = array(
-		'a'       => array( 'href' => array(), 'title' => array() ),
-		'abbr'    => array( 'title' => array() ),
-		'acronym' => array( 'title' => array() ),
+		'a'       => array('href' => array(), 'title' => array()),
+		'abbr'    => array('title' => array()),
+		'acronym' => array('title' => array()),
 		'code'    => array(),
 		'em'      => array(),
 		'strong'  => array(),
 	);
 
-	$plugin_name   = wp_kses( $plugin_data['Name'], $plugins_allowedtags );
-	$details_url   = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $response->slug . '&section=changelog&TB_iframe=true&width=600&height=800' );
+	$plugin_name   = wp_kses($plugin_data['Name'], $plugins_allowedtags);
+	$details_url   = self_admin_url('plugin-install.php?tab=plugin-information&plugin='.$response->slug.'&section=changelog&TB_iframe=true&width=600&height=800');
 
 	/** @var WP_Plugins_List_Table $wp_list_table */
-	$wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
+	$wp_list_table = _get_list_table('WP_Plugins_List_Table');
 
-	if ( is_network_admin() || ! is_multisite() ) {
-		if ( is_network_admin() ) {
-			$active_class = is_plugin_active_for_network( $file ) ? ' active' : '';
+	if (is_network_admin() || ! is_multisite()) {
+		if (is_network_admin()) {
+			$active_class = is_plugin_active_for_network($file) ? ' active' : '';
 		} else {
-			$active_class = is_plugin_active( $file ) ? ' active' : '';
+			$active_class = is_plugin_active($file) ? ' active' : '';
 		}
 
-		echo '<tr class="plugin-update-tr' . $active_class . '" id="' . esc_attr( $response->slug . '-update' ) . '" data-slug="' . esc_attr( $response->slug ) . '" data-plugin="' . esc_attr( $file ) . '"><td colspan="' . esc_attr( $wp_list_table->get_column_count() ) . '" class="plugin-update colspanchange"><div class="update-message notice inline notice-warning notice-alt"><p>';
+		echo '<tr class="plugin-update-tr'.$active_class.'" id="'.esc_attr($response->slug.'-update').'" data-slug="'.esc_attr($response->slug).'" data-plugin="'.esc_attr($file).'"><td colspan="'.esc_attr($wp_list_table->get_column_count()).'" class="plugin-update colspanchange"><div class="update-message notice inline notice-warning notice-alt"><p>';
 
-		if ( ! current_user_can( 'update_plugins' ) ) {
+		if ( ! current_user_can('update_plugins')) {
 			/* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number */
-			printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ),
+			printf(__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.'),
 				$plugin_name,
-				esc_url( $details_url ),
-				sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+				esc_url($details_url),
+				sprintf('class="thickbox open-plugin-details-modal" aria-label="%s"',
 					/* translators: 1: plugin name, 2: version number */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
+					esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_name, $response->new_version))
 				),
 				$response->new_version
 			);
-		} elseif ( empty( $response->package ) ) {
+		} elseif (empty($response->package)) {
 			/* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number */
-			printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>' ),
+			printf(__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>'),
 				$plugin_name,
-				esc_url( $details_url ),
-				sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+				esc_url($details_url),
+				sprintf('class="thickbox open-plugin-details-modal" aria-label="%s"',
 					/* translators: 1: plugin name, 2: version number */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
+					esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_name, $response->new_version))
 				),
 				$response->new_version
 			);
 		} else {
 			/* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
-			printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
+			printf(__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.'),
 				$plugin_name,
-				esc_url( $details_url ),
-				sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+				esc_url($details_url),
+				sprintf('class="thickbox open-plugin-details-modal" aria-label="%s"',
 					/* translators: 1: plugin name, 2: version number */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
+					esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_name, $response->new_version))
 				),
 				$response->new_version,
-				wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $file, 'upgrade-plugin_' . $file ),
-				sprintf( 'class="update-link" aria-label="%s"',
+				wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=').$file, 'upgrade-plugin_'.$file),
+				sprintf('class="update-link" aria-label="%s"',
 					/* translators: %s: plugin name */
-					esc_attr( sprintf( __( 'Update %s now' ), $plugin_name ) )
+					esc_attr(sprintf(__('Update %s now'), $plugin_name))
 				)
 			);
 		}
@@ -442,7 +442,7 @@ 
 		 *     @type string $package     Plugin update package URL.
 		 * }
 		 */
-		do_action( "in_plugin_update_message-{$file}", $plugin_data, $response );
+		do_action("in_plugin_update_message-{$file}", $plugin_data, $response);
 
 		echo '</p></div></td></tr>';
 	}
@@ -455,13 +455,13 @@ 
 function get_theme_updates() {
 	$current = get_site_transient('update_themes');
 
-	if ( ! isset( $current->response ) )
+	if ( ! isset($current->response))
 		return array();
 
 	$update_themes = array();
-	foreach ( $current->response as $stylesheet => $data ) {
-		$update_themes[ $stylesheet ] = wp_get_theme( $stylesheet );
-		$update_themes[ $stylesheet ]->update = $data;
+	foreach ($current->response as $stylesheet => $data) {
+		$update_themes[$stylesheet] = wp_get_theme($stylesheet);
+		$update_themes[$stylesheet]->update = $data;
 	}
 
 	return $update_themes;
@@ -471,15 +471,15 @@ 
  * @since 3.1.0
  */
 function wp_theme_update_rows() {
-	if ( !current_user_can('update_themes' ) )
+	if ( ! current_user_can('update_themes'))
 		return;
 
-	$themes = get_site_transient( 'update_themes' );
-	if ( isset($themes->response) && is_array($themes->response) ) {
-		$themes = array_keys( $themes->response );
+	$themes = get_site_transient('update_themes');
+	if (isset($themes->response) && is_array($themes->response)) {
+		$themes = array_keys($themes->response);
 
-		foreach ( $themes as $theme ) {
-			add_action( "after_theme_row_$theme", 'wp_theme_update_row', 10, 2 );
+		foreach ($themes as $theme) {
+			add_action("after_theme_row_$theme", 'wp_theme_update_row', 10, 2);
 		}
 	}
 }
@@ -491,63 +491,63 @@ 
  * @param WP_Theme $theme     Theme object.
  * @return false|void
  */
-function wp_theme_update_row( $theme_key, $theme ) {
-	$current = get_site_transient( 'update_themes' );
+function wp_theme_update_row($theme_key, $theme) {
+	$current = get_site_transient('update_themes');
 
-	if ( ! isset( $current->response[ $theme_key ] ) ) {
+	if ( ! isset($current->response[$theme_key])) {
 		return false;
 	}
 
-	$response = $current->response[ $theme_key ];
+	$response = $current->response[$theme_key];
 
-	$details_url = add_query_arg( array(
+	$details_url = add_query_arg(array(
 		'TB_iframe' => 'true',
 		'width'     => 1024,
 		'height'    => 800,
-	), $current->response[ $theme_key ]['url'] );
+	), $current->response[$theme_key]['url']);
 
 	/** @var WP_MS_Themes_List_Table $wp_list_table */
-	$wp_list_table = _get_list_table( 'WP_MS_Themes_List_Table' );
+	$wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
 
-	$active = $theme->is_allowed( 'network' ) ? ' active' : '';
+	$active = $theme->is_allowed('network') ? ' active' : '';
 
-	echo '<tr class="plugin-update-tr' . $active . '" id="' . esc_attr( $theme->get_stylesheet() . '-update' ) . '" data-slug="' . esc_attr( $theme->get_stylesheet() ) . '"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message notice inline notice-warning notice-alt"><p>';
-	if ( ! current_user_can( 'update_themes' ) ) {
+	echo '<tr class="plugin-update-tr'.$active.'" id="'.esc_attr($theme->get_stylesheet().'-update').'" data-slug="'.esc_attr($theme->get_stylesheet()).'"><td colspan="'.$wp_list_table->get_column_count().'" class="plugin-update colspanchange"><div class="update-message notice inline notice-warning notice-alt"><p>';
+	if ( ! current_user_can('update_themes')) {
 		/* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number */
-		printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.'),
+		printf(__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.'),
 			$theme['Name'],
-			esc_url( $details_url ),
-			sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+			esc_url($details_url),
+			sprintf('class="thickbox open-plugin-details-modal" aria-label="%s"',
 				/* translators: 1: theme name, 2: version number */
-				esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
+				esc_attr(sprintf(__('View %1$s version %2$s details'), $theme['Name'], $response['new_version']))
 			),
 			$response['new_version']
 		);
-	} elseif ( empty( $response['package'] ) ) {
+	} elseif (empty($response['package'])) {
 		/* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number */
-		printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ),
+		printf(__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>'),
 			$theme['Name'],
-			esc_url( $details_url ),
-			sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+			esc_url($details_url),
+			sprintf('class="thickbox open-plugin-details-modal" aria-label="%s"',
 				/* translators: 1: theme name, 2: version number */
-				esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
+				esc_attr(sprintf(__('View %1$s version %2$s details'), $theme['Name'], $response['new_version']))
 			),
 			$response['new_version']
 		);
 	} else {
 		/* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
-		printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
+		printf(__('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.'),
 			$theme['Name'],
-			esc_url( $details_url ),
-			sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+			esc_url($details_url),
+			sprintf('class="thickbox open-plugin-details-modal" aria-label="%s"',
 				/* translators: 1: theme name, 2: version number */
-				esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
+				esc_attr(sprintf(__('View %1$s version %2$s details'), $theme['Name'], $response['new_version']))
 			),
 			$response['new_version'],
-			wp_nonce_url( self_admin_url( 'update.php?action=upgrade-theme&theme=' ) . $theme_key, 'upgrade-theme_' . $theme_key ),
-			sprintf( 'class="update-link" aria-label="%s"',
+			wp_nonce_url(self_admin_url('update.php?action=upgrade-theme&theme=').$theme_key, 'upgrade-theme_'.$theme_key),
+			sprintf('class="update-link" aria-label="%s"',
 				/* translators: %s: theme name */
-				esc_attr( sprintf( __( 'Update %s now' ), $theme['Name'] ) )
+				esc_attr(sprintf(__('Update %s now'), $theme['Name']))
 			)
 		);
 	}
@@ -570,7 +570,7 @@ 
 	 *     @type string $package     Theme update package URL.
 	 * }
 	 */
-	do_action( "in_theme_update_message-{$theme_key}", $theme, $response );
+	do_action("in_theme_update_message-{$theme_key}", $theme, $response);
 
 	echo '</p></div></td></tr>';
 }
@@ -581,11 +581,11 @@ 
  * @return false|void
  */
 function maintenance_nag() {
-	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
+	include(ABSPATH.WPINC.'/version.php'); // include an unmodified $wp_version
 	global $upgrading;
-	$nag = isset( $upgrading );
-	if ( ! $nag ) {
-		$failed = get_site_option( 'auto_core_update_failed' );
+	$nag = isset($upgrading);
+	if ( ! $nag) {
+		$failed = get_site_option('auto_core_update_failed');
 		/*
 		 * If an update failed critically, we may have copied over version.php but not other files.
 		 * In that case, if the install claims we're running the version we attempted, nag.
@@ -596,16 +596,16 @@ 
 		 *
 		 * This flag is cleared whenever a successful update occurs using Core_Upgrader.
 		 */
-		$comparison = ! empty( $failed['critical'] ) ? '>=' : '>';
-		if ( version_compare( $failed['attempted'], $wp_version, $comparison ) )
+		$comparison = ! empty($failed['critical']) ? '>=' : '>';
+		if (version_compare($failed['attempted'], $wp_version, $comparison))
 			$nag = true;
 	}
 
-	if ( ! $nag )
+	if ( ! $nag)
 		return false;
 
-	if ( current_user_can('update_core') )
-		$msg = sprintf( __('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php' );
+	if (current_user_can('update_core'))
+		$msg = sprintf(__('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php');
 	else
 		$msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.');
 
@@ -641,24 +641,24 @@ 
 						<# if ( 'plugin' === data.type ) { #>
 							<?php
 							/* translators: %s: Number of plugins */
-							printf( __( '%s plugin successfully updated.' ), '{{ data.successes }}' );
+							printf(__('%s plugin successfully updated.'), '{{ data.successes }}');
 							?>
 						<# } else { #>
 							<?php
 							/* translators: %s: Number of themes */
-							printf( __( '%s theme successfully updated.' ), '{{ data.successes }}' );
+							printf(__('%s theme successfully updated.'), '{{ data.successes }}');
 							?>
 						<# } #>
 					<# } else { #>
 						<# if ( 'plugin' === data.type ) { #>
 							<?php
 							/* translators: %s: Number of plugins */
-							printf( __( '%s plugins successfully updated.' ), '{{ data.successes }}' );
+							printf(__('%s plugins successfully updated.'), '{{ data.successes }}');
 							?>
 						<# } else { #>
 							<?php
 							/* translators: %s: Number of themes */
-							printf( __( '%s themes successfully updated.' ), '{{ data.successes }}' );
+							printf(__('%s themes successfully updated.'), '{{ data.successes }}');
 							?>
 						<# } #>
 					<# } #>
@@ -668,15 +668,15 @@ 
 						<# if ( 1 === data.errors ) { #>
 							<?php
 							/* translators: %s: Number of failed updates */
-							printf( __( '%s update failed.' ), '{{ data.errors }}' );
+							printf(__('%s update failed.'), '{{ data.errors }}');
 							?>
 						<# } else { #>
 							<?php
 							/* translators: %s: Number of failed updates */
-							printf( __( '%s updates failed.' ), '{{ data.errors }}' );
+							printf(__('%s updates failed.'), '{{ data.errors }}');
 							?>
 						<# } #>
-						<span class="screen-reader-text"><?php _e( 'Show more details' ); ?></span>
+						<span class="screen-reader-text"><?php _e('Show more details'); ?></span>
 						<span class="toggle-indicator" aria-hidden="true"></span>
 					</button>
 				<# } #>
@@ -736,7 +736,7 @@ 
 					<?php
 					printf(
 						/* translators: %s: Plugin name */
-						_x( '%s was successfully deleted.', 'plugin' ),
+						_x('%s was successfully deleted.', 'plugin'),
 						'<strong>{{{ data.name }}}</strong>'
 					);
 					?>
@@ -744,7 +744,7 @@ 
 					<?php
 					printf(
 						/* translators: %s: Theme name */
-						_x( '%s was successfully deleted.', 'theme' ),
+						_x('%s was successfully deleted.', 'theme'),
 						'<strong>{{{ data.name }}}</strong>'
 					);
 					?>

src/wp-admin/includes/class-wp-upgrader-skin.php

Spacing +28 added lines, -28 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param array $args
 	 */
 	public function __construct($args = array()) {
-		$defaults = array( 'url' => '', 'nonce' => '', 'title' => '', 'context' => false );
+		$defaults = array('url' => '', 'nonce' => '', 'title' => '', 'context' => false);
 		$this->options = wp_parse_args($args, $defaults);
 	}
 
@@ -42,8 +42,8 @@ 
 	 * @param WP_Upgrader $upgrader
 	 */
 	public function set_upgrader(&$upgrader) {
-		if ( is_object($upgrader) )
-			$this->upgrader =& $upgrader;
+		if (is_object($upgrader))
+			$this->upgrader = & $upgrader;
 		$this->add_strings();
 	}
 
@@ -61,7 +61,7 @@ 
 	 *
 	 * @param string|bool|WP_Error $result The result of an upgrade.
 	 */
-	public function set_result( $result ) {
+	public function set_result($result) {
 		$this->result = $result;
 	}
 
@@ -81,37 +81,37 @@ 
 	 * @param bool   $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. Default false.
 	 * @return bool False on failure, true on success.
 	 */
-	public function request_filesystem_credentials( $error = false, $context = '', $allow_relaxed_file_ownership = false ) {
+	public function request_filesystem_credentials($error = false, $context = '', $allow_relaxed_file_ownership = false) {
 		$url = $this->options['url'];
-		if ( ! $context ) {
+		if ( ! $context) {
 			$context = $this->options['context'];
 		}
-		if ( !empty($this->options['nonce']) ) {
+		if ( ! empty($this->options['nonce'])) {
 			$url = wp_nonce_url($url, $this->options['nonce']);
 		}
 
 		$extra_fields = array();
 
-		return request_filesystem_credentials( $url, '', $error, $context, $extra_fields, $allow_relaxed_file_ownership );
+		return request_filesystem_credentials($url, '', $error, $context, $extra_fields, $allow_relaxed_file_ownership);
 	}
 
 	/**
 	 * @access public
 	 */
 	public function header() {
-		if ( $this->done_header ) {
+		if ($this->done_header) {
 			return;
 		}
 		$this->done_header = true;
 		echo '<div class="wrap">';
-		echo '<h1>' . $this->options['title'] . '</h1>';
+		echo '<h1>'.$this->options['title'].'</h1>';
 	}
 
 	/**
 	 * @access public
 	 */
 	public function footer() {
-		if ( $this->done_footer ) {
+		if ($this->done_footer) {
 			return;
 		}
 		$this->done_footer = true;
@@ -123,14 +123,14 @@ 
 	 * @param string|WP_Error $errors
 	 */
 	public function error($errors) {
-		if ( ! $this->done_header )
+		if ( ! $this->done_header)
 			$this->header();
-		if ( is_string($errors) ) {
+		if (is_string($errors)) {
 			$this->feedback($errors);
-		} elseif ( is_wp_error($errors) && $errors->get_error_code() ) {
-			foreach ( $errors->get_error_messages() as $message ) {
-				if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) )
-					$this->feedback($message . ' ' . esc_html( strip_tags( $errors->get_error_data() ) ) );
+		} elseif (is_wp_error($errors) && $errors->get_error_code()) {
+			foreach ($errors->get_error_messages() as $message) {
+				if ($errors->get_error_data() && is_string($errors->get_error_data()))
+					$this->feedback($message.' '.esc_html(strip_tags($errors->get_error_data())));
 				else
 					$this->feedback($message);
 			}
@@ -142,19 +142,19 @@ 
 	 * @param string $string
 	 */
 	public function feedback($string) {
-		if ( isset( $this->upgrader->strings[$string] ) )
+		if (isset($this->upgrader->strings[$string]))
 			$string = $this->upgrader->strings[$string];
 
-		if ( strpos($string, '%') !== false ) {
+		if (strpos($string, '%') !== false) {
 			$args = func_get_args();
 			$args = array_splice($args, 1);
-			if ( $args ) {
-				$args = array_map( 'strip_tags', $args );
-				$args = array_map( 'esc_html', $args );
+			if ($args) {
+				$args = array_map('strip_tags', $args);
+				$args = array_map('esc_html', $args);
 				$string = vsprintf($string, $args);
 			}
 		}
-		if ( empty($string) )
+		if (empty($string))
 			return;
 		show_message($string);
 	}
@@ -177,22 +177,22 @@ 
 	 * @param string $type Type of update count to decrement. Likely values include 'plugin',
 	 *                     'theme', 'translation', etc.
 	 */
-	protected function decrement_update_count( $type ) {
-		if ( ! $this->result || is_wp_error( $this->result ) || 'up_to_date' === $this->result ) {
+	protected function decrement_update_count($type) {
+		if ( ! $this->result || is_wp_error($this->result) || 'up_to_date' === $this->result) {
 			return;
 		}
 
-		if ( defined( 'IFRAME_REQUEST' ) ) {
+		if (defined('IFRAME_REQUEST')) {
 			echo '<script type="text/javascript">
 					if ( window.postMessage && JSON ) {
-						window.parent.postMessage( JSON.stringify( { action: "decrementUpdateCount", upgradeType: "' . $type . '" } ), window.location.protocol + "//" + window.location.hostname );
+						window.parent.postMessage( JSON.stringify( { action: "decrementUpdateCount", upgradeType: "' . $type.'" } ), window.location.protocol + "//" + window.location.hostname );
 					}
 				</script>';
 		} else {
 			echo '<script type="text/javascript">
 					(function( wp ) {
 						if ( wp && wp.updates.decrementCount ) {
-							wp.updates.decrementCount( "' . $type . '" );
+							wp.updates.decrementCount( "' . $type.'" );
 						}
 					})( window.wp );
 				</script>';

src/wp-admin/includes/upgrade.php

Spacing +608 added lines, -608 removed lines

@@ -9,16 +9,16 @@ 
  */
 
 /** Include user install customize script. */
-if ( file_exists(WP_CONTENT_DIR . '/install.php') )
-	require (WP_CONTENT_DIR . '/install.php');
+if (file_exists(WP_CONTENT_DIR.'/install.php'))
+	require (WP_CONTENT_DIR.'/install.php');
 
 /** WordPress Administration API */
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once(ABSPATH.'wp-admin/includes/admin.php');
 
 /** WordPress Schema API */
-require_once(ABSPATH . 'wp-admin/includes/schema.php');
+require_once(ABSPATH.'wp-admin/includes/schema.php');
 
-if ( !function_exists('wp_install') ) :
+if ( ! function_exists('wp_install')) :
 /**
  * Installs the site.
  *
@@ -36,9 +36,9 @@ 
  * @param string $language      Optional. Language chosen. Default empty.
  * @return array Array keys 'url', 'user_id', 'password', and 'password_message'.
  */
-function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.6.0' );
+function wp_install($blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '') {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.6.0');
 
 	wp_check_mysql_version();
 	wp_cache_flush();
@@ -50,8 +50,8 @@ 
 	update_option('admin_email', $user_email);
 	update_option('blog_public', $public);
 
-	if ( $language ) {
-		update_option( 'WPLANG', $language );
+	if ($language) {
+		update_option('WPLANG', $language);
 	}
 
 	$guessurl = wp_guess_url();
@@ -59,7 +59,7 @@ 
 	update_option('siteurl', $guessurl);
 
 	// If not a public blog, don't ping.
-	if ( ! $public )
+	if ( ! $public)
 		update_option('default_pingback_flag', 0);
 
 	/*
@@ -69,13 +69,13 @@ 
 	$user_id = username_exists($user_name);
 	$user_password = trim($user_password);
 	$email_password = false;
-	if ( !$user_id && empty($user_password) ) {
-		$user_password = wp_generate_password( 12, false );
+	if ( ! $user_id && empty($user_password)) {
+		$user_password = wp_generate_password(12, false);
 		$message = __('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.');
 		$user_id = wp_create_user($user_name, $user_password, $user_email);
 		update_user_option($user_id, 'default_password_nag', true, true);
 		$email_password = true;
-	} elseif ( ! $user_id ) {
+	} elseif ( ! $user_id) {
 		// Password has been provided
 		$message = '<em>'.__('Your chosen password.').'</em>';
 		$user_id = wp_create_user($user_name, $user_password, $user_email);
@@ -92,7 +92,7 @@ 
 
 	flush_rewrite_rules();
 
-	wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.') ) );
+	wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.')));
 
 	wp_cache_flush();
 
@@ -103,13 +103,13 @@ 
 	 *
 	 * @param WP_User $user The site owner.
 	 */
-	do_action( 'wp_install', $user );
+	do_action('wp_install', $user);
 
 	return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $user_password, 'password_message' => $message);
 }
 endif;
 
-if ( !function_exists('wp_install_defaults') ) :
+if ( ! function_exists('wp_install_defaults')) :
 /**
  * Creates the initial content for a newly-installed site.
  *
@@ -124,7 +124,7 @@ 
  *
  * @param int $user_id User ID.
  */
-function wp_install_defaults( $user_id ) {
+function wp_install_defaults($user_id) {
 	global $wpdb, $wp_rewrite, $table_prefix;
 
 	// Default category
@@ -132,10 +132,10 @@ 
 	/* translators: Default category slug */
 	$cat_slug = sanitize_title(_x('Uncategorized', 'Default category slug'));
 
-	if ( global_terms_enabled() ) {
-		$cat_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
-		if ( $cat_id == null ) {
-			$wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
+	if (global_terms_enabled()) {
+		$cat_id = $wpdb->get_var($wpdb->prepare("SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug));
+		if ($cat_id == null) {
+			$wpdb->insert($wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)));
 			$cat_id = $wpdb->insert_id;
 		}
 		update_option('default_category', $cat_id);
@@ -143,35 +143,35 @@ 
 		$cat_id = 1;
 	}
 
-	$wpdb->insert( $wpdb->terms, array('term_id' => $cat_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
-	$wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $cat_id, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
+	$wpdb->insert($wpdb->terms, array('term_id' => $cat_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0));
+	$wpdb->insert($wpdb->term_taxonomy, array('term_id' => $cat_id, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
 	$cat_tt_id = $wpdb->insert_id;
 
 	// First post
-	$now = current_time( 'mysql' );
-	$now_gmt = current_time( 'mysql', 1 );
-	$first_post_guid = get_option( 'home' ) . '/?p=1';
+	$now = current_time('mysql');
+	$now_gmt = current_time('mysql', 1);
+	$first_post_guid = get_option('home').'/?p=1';
 
-	if ( is_multisite() ) {
-		$first_post = get_site_option( 'first_post' );
+	if (is_multisite()) {
+		$first_post = get_site_option('first_post');
 
-		if ( ! $first_post ) {
+		if ( ! $first_post) {
 			/* translators: %s: site link */
-			$first_post = __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' );
+			$first_post = __('Welcome to %s. This is your first post. Edit or delete it, then start blogging!');
 		}
 
-		$first_post = sprintf( $first_post,
-			sprintf( '<a href="%s">%s</a>', esc_url( network_home_url() ), get_current_site()->site_name )
+		$first_post = sprintf($first_post,
+			sprintf('<a href="%s">%s</a>', esc_url(network_home_url()), get_current_site()->site_name)
 		);
 
 		// Back-compat for pre-4.4
-		$first_post = str_replace( 'SITE_URL', esc_url( network_home_url() ), $first_post );
-		$first_post = str_replace( 'SITE_NAME', get_current_site()->site_name, $first_post );
+		$first_post = str_replace('SITE_URL', esc_url(network_home_url()), $first_post);
+		$first_post = str_replace('SITE_NAME', get_current_site()->site_name, $first_post);
 	} else {
-		$first_post = __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' );
+		$first_post = __('Welcome to WordPress. This is your first post. Edit or delete it, then start writing!');
 	}
 
-	$wpdb->insert( $wpdb->posts, array(
+	$wpdb->insert($wpdb->posts, array(
 		'post_author' => $user_id,
 		'post_date' => $now,
 		'post_date_gmt' => $now_gmt,
@@ -179,7 +179,7 @@ 
 		'post_excerpt' => '',
 		'post_title' => __('Hello world!'),
 		/* translators: Default post slug */
-		'post_name' => sanitize_title( _x('hello-world', 'Default post slug') ),
+		'post_name' => sanitize_title(_x('hello-world', 'Default post slug')),
 		'post_modified' => $now,
 		'post_modified_gmt' => $now_gmt,
 		'guid' => $first_post_guid,
@@ -188,22 +188,22 @@ 
 		'pinged' => '',
 		'post_content_filtered' => ''
 	));
-	$wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1) );
+	$wpdb->insert($wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1));
 
 	// Default comment
-	$first_comment_author = __( 'A WordPress Commenter' );
+	$first_comment_author = __('A WordPress Commenter');
 	$first_comment_email = 'wapuu@wordpress.example';
 	$first_comment_url = 'https://wordpress.org/';
-	$first_comment = __( 'Hi, this is a comment.
+	$first_comment = __('Hi, this is a comment.
 To get started with moderating, editing, and deleting comments, please visit the Comments screen in the dashboard.
 Commenter avatars come from <a href="https://gravatar.com">Gravatar</a>.' );
-	if ( is_multisite() ) {
-		$first_comment_author = get_site_option( 'first_comment_author', $first_comment_author );
-		$first_comment_email = get_site_option( 'first_comment_email', $first_comment_email );
-		$first_comment_url = get_site_option( 'first_comment_url', network_home_url() );
-		$first_comment = get_site_option( 'first_comment', $first_comment );
+	if (is_multisite()) {
+		$first_comment_author = get_site_option('first_comment_author', $first_comment_author);
+		$first_comment_email = get_site_option('first_comment_email', $first_comment_email);
+		$first_comment_url = get_site_option('first_comment_url', network_home_url());
+		$first_comment = get_site_option('first_comment', $first_comment);
 	}
-	$wpdb->insert( $wpdb->comments, array(
+	$wpdb->insert($wpdb->comments, array(
 		'comment_post_ID' => 1,
 		'comment_author' => $first_comment_author,
 		'comment_author_email' => $first_comment_email,
@@ -214,7 +214,7 @@ 
 	));
 
 	// First Page
-	$first_page = sprintf( __( "This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:
+	$first_page = sprintf(__("This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:
 
 <blockquote>Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like pi&#241;a coladas. (And gettin' caught in the rain.)</blockquote>
 
@@ -222,20 +222,20 @@ 
 
 <blockquote>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</blockquote>
 
-As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url() );
-	if ( is_multisite() )
-		$first_page = get_site_option( 'first_page', $first_page );
-	$first_post_guid = get_option('home') . '/?page_id=2';
-	$wpdb->insert( $wpdb->posts, array(
+As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url());
+	if (is_multisite())
+		$first_page = get_site_option('first_page', $first_page);
+	$first_post_guid = get_option('home').'/?page_id=2';
+	$wpdb->insert($wpdb->posts, array(
 		'post_author' => $user_id,
 		'post_date' => $now,
 		'post_date_gmt' => $now_gmt,
 		'post_content' => $first_page,
 		'post_excerpt' => '',
 		'comment_status' => 'closed',
-		'post_title' => __( 'Sample Page' ),
+		'post_title' => __('Sample Page'),
 		/* translators: Default page slug */
-		'post_name' => __( 'sample-page' ),
+		'post_name' => __('sample-page'),
 		'post_modified' => $now,
 		'post_modified_gmt' => $now_gmt,
 		'guid' => $first_post_guid,
@@ -244,37 +244,37 @@ 
 		'pinged' => '',
 		'post_content_filtered' => ''
 	));
-	$wpdb->insert( $wpdb->postmeta, array( 'post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default' ) );
+	$wpdb->insert($wpdb->postmeta, array('post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default'));
 
 	// Set up default widgets for default theme.
-	update_option( 'widget_search', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
-	update_option( 'widget_recent-posts', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_recent-comments', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_archives', array ( 2 => array ( 'title' => '', 'count' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_categories', array ( 2 => array ( 'title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
-	update_option( 'sidebars_widgets', array ( 'wp_inactive_widgets' => array (), 'sidebar-1' => array ( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2', ), 'array_version' => 3 ) );
-
-	if ( ! is_multisite() )
-		update_user_meta( $user_id, 'show_welcome_panel', 1 );
-	elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) )
-		update_user_meta( $user_id, 'show_welcome_panel', 2 );
-
-	if ( is_multisite() ) {
+	update_option('widget_search', array(2 => array('title' => ''), '_multiwidget' => 1));
+	update_option('widget_recent-posts', array(2 => array('title' => '', 'number' => 5), '_multiwidget' => 1));
+	update_option('widget_recent-comments', array(2 => array('title' => '', 'number' => 5), '_multiwidget' => 1));
+	update_option('widget_archives', array(2 => array('title' => '', 'count' => 0, 'dropdown' => 0), '_multiwidget' => 1));
+	update_option('widget_categories', array(2 => array('title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0), '_multiwidget' => 1));
+	update_option('widget_meta', array(2 => array('title' => ''), '_multiwidget' => 1));
+	update_option('sidebars_widgets', array('wp_inactive_widgets' => array(), 'sidebar-1' => array(0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2',), 'array_version' => 3));
+
+	if ( ! is_multisite())
+		update_user_meta($user_id, 'show_welcome_panel', 1);
+	elseif ( ! is_super_admin($user_id) && ! metadata_exists('user', $user_id, 'show_welcome_panel'))
+		update_user_meta($user_id, 'show_welcome_panel', 2);
+
+	if (is_multisite()) {
 		// Flush rules to pick up the new page.
 		$wp_rewrite->init();
 		$wp_rewrite->flush_rules();
 
 		$user = new WP_User($user_id);
-		$wpdb->update( $wpdb->options, array('option_value' => $user->user_email), array('option_name' => 'admin_email') );
+		$wpdb->update($wpdb->options, array('option_value' => $user->user_email), array('option_name' => 'admin_email'));
 
 		// Remove all perms except for the login user.
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'user_level') );
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'capabilities') );
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'user_level'));
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'capabilities'));
 
 		// Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.) TODO: Get previous_blog_id.
-		if ( !is_super_admin( $user_id ) && $user_id != 1 )
-			$wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
+		if ( ! is_super_admin($user_id) && $user_id != 1)
+			$wpdb->delete($wpdb->usermeta, array('user_id' => $user_id, 'meta_key' => $wpdb->base_prefix.'1_capabilities'));
 	}
 }
 endif;
@@ -294,7 +294,7 @@ 
 	global $wp_rewrite;
 
 	// Bail if a permalink structure is already enabled.
-	if ( get_option( 'permalink_structure' ) ) {
+	if (get_option('permalink_structure')) {
 		return true;
 	}
 
@@ -311,21 +311,21 @@ 
 		'/index.php/%year%/%monthnum%/%day%/%postname%/'
 	);
 
-	foreach ( (array) $permalink_structures as $permalink_structure ) {
-		$wp_rewrite->set_permalink_structure( $permalink_structure );
+	foreach ((array) $permalink_structures as $permalink_structure) {
+		$wp_rewrite->set_permalink_structure($permalink_structure);
 
 		/*
 	 	 * Flush rules with the hard option to force refresh of the web-server's
 	 	 * rewrite config file (e.g. .htaccess or web.config).
 	 	 */
-		$wp_rewrite->flush_rules( true );
+		$wp_rewrite->flush_rules(true);
 
 		$test_url = '';
 
 		// Test against a real WordPress Post
-		$first_post = get_page_by_path( sanitize_title( _x( 'hello-world', 'Default post slug' ) ), OBJECT, 'post' );
-		if ( $first_post ) {
-			$test_url = get_permalink( $first_post->ID );
+		$first_post = get_page_by_path(sanitize_title(_x('hello-world', 'Default post slug')), OBJECT, 'post');
+		if ($first_post) {
+			$test_url = get_permalink($first_post->ID);
 		}
 
 		/*
@@ -335,11 +335,11 @@ 
 	 	 * Uses wp_remote_get() instead of wp_remote_head() because web servers
 	 	 * can block head requests.
 	 	 */
-		$response          = wp_remote_get( $test_url, array( 'timeout' => 5 ) );
-		$x_pingback_header = wp_remote_retrieve_header( $response, 'x-pingback' );
-		$pretty_permalinks = $x_pingback_header && $x_pingback_header === get_bloginfo( 'pingback_url' );
+		$response          = wp_remote_get($test_url, array('timeout' => 5));
+		$x_pingback_header = wp_remote_retrieve_header($response, 'x-pingback');
+		$pretty_permalinks = $x_pingback_header && $x_pingback_header === get_bloginfo('pingback_url');
 
-		if ( $pretty_permalinks ) {
+		if ($pretty_permalinks) {
 			return true;
 		}
 	}
@@ -348,13 +348,13 @@ 
 	 * If it makes it this far, pretty permalinks failed.
 	 * Fallback to query-string permalinks.
 	 */
-	$wp_rewrite->set_permalink_structure( '' );
-	$wp_rewrite->flush_rules( true );
+	$wp_rewrite->set_permalink_structure('');
+	$wp_rewrite->flush_rules(true);
 
 	return false;
 }
 
-if ( !function_exists('wp_new_blog_notification') ) :
+if ( ! function_exists('wp_new_blog_notification')) :
 /**
  * Notifies the site admin that the setup is complete.
  *
@@ -369,11 +369,11 @@ 
  * @param string $password   User's Password.
  */
 function wp_new_blog_notification($blog_title, $blog_url, $user_id, $password) {
-	$user = new WP_User( $user_id );
+	$user = new WP_User($user_id);
 	$email = $user->user_email;
 	$name = $user->user_login;
 	$login_url = wp_login_url();
-	$message = sprintf( __( "Your new WordPress site has been successfully set up at:
+	$message = sprintf(__("Your new WordPress site has been successfully set up at:
 
 %1\$s
 
@@ -387,13 +387,13 @@ 
 
 --The WordPress Team
 https://wordpress.org/
-"), $blog_url, $name, $password, $login_url );
+"), $blog_url, $name, $password, $login_url);
 
 	@wp_mail($email, __('New WordPress Site'), $message);
 }
 endif;
 
-if ( !function_exists('wp_upgrade') ) :
+if ( ! function_exists('wp_upgrade')) :
 /**
  * Runs WordPress Upgrade functions.
  *
@@ -411,10 +411,10 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
+	if ($wp_db_version == $wp_current_db_version)
 		return;
 
-	if ( ! is_blog_installed() )
+	if ( ! is_blog_installed())
 		return;
 
 	wp_check_mysql_version();
@@ -422,15 +422,15 @@ 
 	pre_schema_upgrade();
 	make_db_current_silent();
 	upgrade_all();
-	if ( is_multisite() && is_main_site() )
+	if (is_multisite() && is_main_site())
 		upgrade_network();
 	wp_cache_flush();
 
-	if ( is_multisite() ) {
-		if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) )
-			$wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
+	if (is_multisite()) {
+		if ($wpdb->get_row("SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'"))
+			$wpdb->query("UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'");
 		else
-			$wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+			$wpdb->query("INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());");
 	}
 
 	/**
@@ -441,7 +441,7 @@ 
 	 * @param int $wp_db_version         The new $wp_db_version.
 	 * @param int $wp_current_db_version The old (current) $wp_db_version.
 	 */
-	do_action( 'wp_upgrade', $wp_db_version, $wp_current_db_version );
+	do_action('wp_upgrade', $wp_db_version, $wp_current_db_version);
 }
 endif;
 
@@ -462,109 +462,109 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
+	if ($wp_db_version == $wp_current_db_version)
 		return;
 
 	// If the version is not set in the DB, try to guess the version.
-	if ( empty($wp_current_db_version) ) {
+	if (empty($wp_current_db_version)) {
 		$wp_current_db_version = 0;
 
 		// If the template option exists, we have 1.5.
 		$template = __get_option('template');
-		if ( !empty($template) )
+		if ( ! empty($template))
 			$wp_current_db_version = 2541;
 	}
 
-	if ( $wp_current_db_version < 6039 )
+	if ($wp_current_db_version < 6039)
 		upgrade_230_options_table();
 
 	populate_options();
 
-	if ( $wp_current_db_version < 2541 ) {
+	if ($wp_current_db_version < 2541) {
 		upgrade_100();
 		upgrade_101();
 		upgrade_110();
 		upgrade_130();
 	}
 
-	if ( $wp_current_db_version < 3308 )
+	if ($wp_current_db_version < 3308)
 		upgrade_160();
 
-	if ( $wp_current_db_version < 4772 )
+	if ($wp_current_db_version < 4772)
 		upgrade_210();
 
-	if ( $wp_current_db_version < 4351 )
+	if ($wp_current_db_version < 4351)
 		upgrade_old_slugs();
 
-	if ( $wp_current_db_version < 5539 )
+	if ($wp_current_db_version < 5539)
 		upgrade_230();
 
-	if ( $wp_current_db_version < 6124 )
+	if ($wp_current_db_version < 6124)
 		upgrade_230_old_tables();
 
-	if ( $wp_current_db_version < 7499 )
+	if ($wp_current_db_version < 7499)
 		upgrade_250();
 
-	if ( $wp_current_db_version < 7935 )
+	if ($wp_current_db_version < 7935)
 		upgrade_252();
 
-	if ( $wp_current_db_version < 8201 )
+	if ($wp_current_db_version < 8201)
 		upgrade_260();
 
-	if ( $wp_current_db_version < 8989 )
+	if ($wp_current_db_version < 8989)
 		upgrade_270();
 
-	if ( $wp_current_db_version < 10360 )
+	if ($wp_current_db_version < 10360)
 		upgrade_280();
 
-	if ( $wp_current_db_version < 11958 )
+	if ($wp_current_db_version < 11958)
 		upgrade_290();
 
-	if ( $wp_current_db_version < 15260 )
+	if ($wp_current_db_version < 15260)
 		upgrade_300();
 
-	if ( $wp_current_db_version < 19389 )
+	if ($wp_current_db_version < 19389)
 		upgrade_330();
 
-	if ( $wp_current_db_version < 20080 )
+	if ($wp_current_db_version < 20080)
 		upgrade_340();
 
-	if ( $wp_current_db_version < 22422 )
+	if ($wp_current_db_version < 22422)
 		upgrade_350();
 
-	if ( $wp_current_db_version < 25824 )
+	if ($wp_current_db_version < 25824)
 		upgrade_370();
 
-	if ( $wp_current_db_version < 26148 )
+	if ($wp_current_db_version < 26148)
 		upgrade_372();
 
-	if ( $wp_current_db_version < 26691 )
+	if ($wp_current_db_version < 26691)
 		upgrade_380();
 
-	if ( $wp_current_db_version < 29630 )
+	if ($wp_current_db_version < 29630)
 		upgrade_400();
 
-	if ( $wp_current_db_version < 33055 )
+	if ($wp_current_db_version < 33055)
 		upgrade_430();
 
-	if ( $wp_current_db_version < 33056 )
+	if ($wp_current_db_version < 33056)
 		upgrade_431();
 
-	if ( $wp_current_db_version < 35700 )
+	if ($wp_current_db_version < 35700)
 		upgrade_440();
 
-	if ( $wp_current_db_version < 36686 )
+	if ($wp_current_db_version < 36686)
 		upgrade_450();
 
-	if ( $wp_current_db_version < 37965 )
+	if ($wp_current_db_version < 37965)
 		upgrade_460();
 
 	maybe_disable_link_manager();
 
 	maybe_disable_automattic_widgets();
 
-	update_option( 'db_version', $wp_db_version );
-	update_option( 'db_upgraded', true );
+	update_option('db_version', $wp_db_version);
+	update_option('db_upgraded', true);
 }
 
 /**
@@ -584,7 +584,7 @@ 
 		foreach ($posts as $post) {
 			if ('' == $post->post_name) {
 				$newtitle = sanitize_title($post->post_title);
-				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_name = %s WHERE ID = %d", $newtitle, $post->ID) );
+				$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET post_name = %s WHERE ID = %d", $newtitle, $post->ID));
 			}
 		}
 	}
@@ -593,7 +593,7 @@ 
 	foreach ($categories as $category) {
 		if ('' == $category->category_nicename) {
 			$newtitle = sanitize_title($category->cat_name);
-			$wpdb->update( $wpdb->categories, array('category_nicename' => $newtitle), array('cat_ID' => $category->cat_ID) );
+			$wpdb->update($wpdb->categories, array('category_nicename' => $newtitle), array('cat_ID' => $category->cat_ID));
 		}
 	}
 
@@ -601,7 +601,7 @@ 
 		SET option_value = REPLACE(option_value, 'wp-links/links-images/', 'wp-images/links/')
 		WHERE option_name LIKE %s
 		AND option_value LIKE %s";
-	$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( 'links_rating_image' ) . '%', $wpdb->esc_like( 'wp-links/links-images/' ) . '%' ) );
+	$wpdb->query($wpdb->prepare($sql, $wpdb->esc_like('links_rating_image').'%', $wpdb->esc_like('wp-links/links-images/').'%'));
 
 	$done_ids = $wpdb->get_results("SELECT DISTINCT post_id FROM $wpdb->post2cat");
 	if ($done_ids) :
@@ -609,7 +609,7 @@ 
 		foreach ($done_ids as $done_id) :
 			$done_posts[] = $done_id->post_id;
 		endforeach;
-		$catwhere = ' AND ID NOT IN (' . implode(',', $done_posts) . ')';
+		$catwhere = ' AND ID NOT IN ('.implode(',', $done_posts).')';
 	else:
 		$catwhere = '';
 	endif;
@@ -618,9 +618,9 @@ 
 	if ($allposts) :
 		foreach ($allposts as $post) {
 			// Check to see if it's already been imported
-			$cat = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->post2cat WHERE post_id = %d AND category_id = %d", $post->ID, $post->post_category) );
-			if (!$cat && 0 != $post->post_category) { // If there's no result
-				$wpdb->insert( $wpdb->post2cat, array('post_id' => $post->ID, 'category_id' => $post->post_category) );
+			$cat = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->post2cat WHERE post_id = %d AND category_id = %d", $post->ID, $post->post_category));
+			if ( ! $cat && 0 != $post->post_category) { // If there's no result
+				$wpdb->insert($wpdb->post2cat, array('post_id' => $post->ID, 'category_id' => $post->post_category));
 			}
 		}
 	endif;
@@ -643,8 +643,8 @@ 
 	add_clean_index($wpdb->categories, 'category_nicename');
 	add_clean_index($wpdb->comments, 'comment_approved');
 	add_clean_index($wpdb->comments, 'comment_post_ID');
-	add_clean_index($wpdb->links , 'link_category');
-	add_clean_index($wpdb->links , 'link_visible');
+	add_clean_index($wpdb->links, 'link_category');
+	add_clean_index($wpdb->links, 'link_visible');
 }
 
 /**
@@ -663,14 +663,14 @@ 
 	foreach ($users as $user) {
 		if ('' == $user->user_nicename) {
 			$newname = sanitize_title($user->user_nickname);
-			$wpdb->update( $wpdb->users, array('user_nicename' => $newname), array('ID' => $user->ID) );
+			$wpdb->update($wpdb->users, array('user_nicename' => $newname), array('ID' => $user->ID));
 		}
 	}
 
 	$users = $wpdb->get_results("SELECT ID, user_pass from $wpdb->users");
 	foreach ($users as $row) {
-		if (!preg_match('/^[A-Fa-f0-9]{32}$/', $row->user_pass)) {
-			$wpdb->update( $wpdb->users, array('user_pass' => md5($row->user_pass)), array('ID' => $row->ID) );
+		if ( ! preg_match('/^[A-Fa-f0-9]{32}$/', $row->user_pass)) {
+			$wpdb->update($wpdb->users, array('user_pass' => md5($row->user_pass)), array('ID' => $row->ID));
 		}
 	}
 
@@ -679,7 +679,7 @@ 
 
 	$time_difference = $all_options->time_difference;
 
-		$server_time = time()+date('Z');
+		$server_time = time() + date('Z');
 	$weblogger_time = $server_time + $time_difference * HOUR_IN_SECONDS;
 	$gmt_time = time();
 
@@ -696,7 +696,7 @@ 
 	// <michel_v> I just slapped myself silly for not thinking about it earlier
 	$got_gmt_fields = ! ($wpdb->get_var("SELECT MAX(post_date_gmt) FROM $wpdb->posts") == '0000-00-00 00:00:00');
 
-	if (!$got_gmt_fields) {
+	if ( ! $got_gmt_fields) {
 
 		// Add or subtract time to all dates, to get GMT dates
 		$add_hours = intval($diff_gmt_weblogger);
@@ -728,12 +728,12 @@ 
 			$post_content = addslashes(deslash($post->post_content));
 			$post_title = addslashes(deslash($post->post_title));
 			$post_excerpt = addslashes(deslash($post->post_excerpt));
-			if ( empty($post->guid) )
+			if (empty($post->guid))
 				$guid = get_permalink($post->ID);
 			else
 				$guid = $post->guid;
 
-			$wpdb->update( $wpdb->posts, compact('post_title', 'post_content', 'post_excerpt', 'guid'), array('ID' => $post->ID) );
+			$wpdb->update($wpdb->posts, compact('post_title', 'post_content', 'post_excerpt', 'guid'), array('ID' => $post->ID));
 
 		}
 	}
@@ -745,7 +745,7 @@ 
 			$comment_content = deslash($comment->comment_content);
 			$comment_author = deslash($comment->comment_author);
 
-			$wpdb->update($wpdb->comments, compact('comment_content', 'comment_author'), array('comment_ID' => $comment->comment_ID) );
+			$wpdb->update($wpdb->comments, compact('comment_content', 'comment_author'), array('comment_ID' => $comment->comment_ID));
 		}
 	}
 
@@ -756,7 +756,7 @@ 
 			$link_name = deslash($link->link_name);
 			$link_description = deslash($link->link_description);
 
-			$wpdb->update( $wpdb->links, compact('link_name', 'link_description'), array('link_id' => $link->link_id) );
+			$wpdb->update($wpdb->links, compact('link_name', 'link_description'), array('link_id' => $link->link_id));
 		}
 	}
 
@@ -766,16 +766,16 @@ 
 	 * If plugins are not stored in an array, they're stored in the old
 	 * newline separated format. Convert to new format.
 	 */
-	if ( !is_array( $active_plugins ) ) {
+	if ( ! is_array($active_plugins)) {
 		$active_plugins = explode("\n", trim($active_plugins));
 		update_option('active_plugins', $active_plugins);
 	}
 
 	// Obsolete tables
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optionvalues');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiontypes');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroups');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroup_options');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'optionvalues');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'optiontypes');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'optiongroups');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'optiongroup_options');
 
 	// Update comments table to use comment_type
 	$wpdb->query("UPDATE $wpdb->comments SET comment_type='trackback', comment_content = REPLACE(comment_content, '<trackback />', '') WHERE comment_content LIKE '<trackback />%'");
@@ -783,11 +783,11 @@ 
 
 	// Some versions have multiple duplicate option_name rows with the same values
 	$options = $wpdb->get_results("SELECT option_name, COUNT(option_name) AS dupes FROM `$wpdb->options` GROUP BY option_name");
-	foreach ( $options as $option ) {
-		if ( 1 != $option->dupes ) { // Could this be done in the query?
+	foreach ($options as $option) {
+		if (1 != $option->dupes) { // Could this be done in the query?
 			$limit = $option->dupes - 1;
-			$dupe_ids = $wpdb->get_col( $wpdb->prepare("SELECT option_id FROM $wpdb->options WHERE option_name = %s LIMIT %d", $option->option_name, $limit) );
-			if ( $dupe_ids ) {
+			$dupe_ids = $wpdb->get_col($wpdb->prepare("SELECT option_id FROM $wpdb->options WHERE option_name = %s LIMIT %d", $option->option_name, $limit));
+			if ($dupe_ids) {
 				$dupe_ids = join($dupe_ids, ',');
 				$wpdb->query("DELETE FROM $wpdb->options WHERE option_id IN ($dupe_ids)");
 			}
@@ -812,27 +812,27 @@ 
 	populate_roles_160();
 
 	$users = $wpdb->get_results("SELECT * FROM $wpdb->users");
-	foreach ( $users as $user ) :
-		if ( !empty( $user->user_firstname ) )
-			update_user_meta( $user->ID, 'first_name', wp_slash($user->user_firstname) );
-		if ( !empty( $user->user_lastname ) )
-			update_user_meta( $user->ID, 'last_name', wp_slash($user->user_lastname) );
-		if ( !empty( $user->user_nickname ) )
-			update_user_meta( $user->ID, 'nickname', wp_slash($user->user_nickname) );
-		if ( !empty( $user->user_level ) )
-			update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
-		if ( !empty( $user->user_icq ) )
-			update_user_meta( $user->ID, 'icq', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_aim ) )
-			update_user_meta( $user->ID, 'aim', wp_slash($user->user_aim) );
-		if ( !empty( $user->user_msn ) )
-			update_user_meta( $user->ID, 'msn', wp_slash($user->user_msn) );
-		if ( !empty( $user->user_yim ) )
-			update_user_meta( $user->ID, 'yim', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_description ) )
-			update_user_meta( $user->ID, 'description', wp_slash($user->user_description) );
-
-		if ( isset( $user->user_idmode ) ):
+	foreach ($users as $user) :
+		if ( ! empty($user->user_firstname))
+			update_user_meta($user->ID, 'first_name', wp_slash($user->user_firstname));
+		if ( ! empty($user->user_lastname))
+			update_user_meta($user->ID, 'last_name', wp_slash($user->user_lastname));
+		if ( ! empty($user->user_nickname))
+			update_user_meta($user->ID, 'nickname', wp_slash($user->user_nickname));
+		if ( ! empty($user->user_level))
+			update_user_meta($user->ID, $wpdb->prefix.'user_level', $user->user_level);
+		if ( ! empty($user->user_icq))
+			update_user_meta($user->ID, 'icq', wp_slash($user->user_icq));
+		if ( ! empty($user->user_aim))
+			update_user_meta($user->ID, 'aim', wp_slash($user->user_aim));
+		if ( ! empty($user->user_msn))
+			update_user_meta($user->ID, 'msn', wp_slash($user->user_msn));
+		if ( ! empty($user->user_yim))
+			update_user_meta($user->ID, 'yim', wp_slash($user->user_icq));
+		if ( ! empty($user->user_description))
+			update_user_meta($user->ID, 'description', wp_slash($user->user_description));
+
+		if (isset($user->user_idmode)):
 			$idmode = $user->user_idmode;
 			if ($idmode == 'nickname') $id = $user->user_nickname;
 			if ($idmode == 'login') $id = $user->user_login;
@@ -840,46 +840,46 @@ 
 			if ($idmode == 'lastname') $id = $user->user_lastname;
 			if ($idmode == 'namefl') $id = $user->user_firstname.' '.$user->user_lastname;
 			if ($idmode == 'namelf') $id = $user->user_lastname.' '.$user->user_firstname;
-			if (!$idmode) $id = $user->user_nickname;
-			$wpdb->update( $wpdb->users, array('display_name' => $id), array('ID' => $user->ID) );
+			if ( ! $idmode) $id = $user->user_nickname;
+			$wpdb->update($wpdb->users, array('display_name' => $id), array('ID' => $user->ID));
 		endif;
 
 		// FIXME: RESET_CAPS is temporary code to reset roles and caps if flag is set.
-		$caps = get_user_meta( $user->ID, $wpdb->prefix . 'capabilities');
-		if ( empty($caps) || defined('RESET_CAPS') ) {
-			$level = get_user_meta($user->ID, $wpdb->prefix . 'user_level', true);
+		$caps = get_user_meta($user->ID, $wpdb->prefix.'capabilities');
+		if (empty($caps) || defined('RESET_CAPS')) {
+			$level = get_user_meta($user->ID, $wpdb->prefix.'user_level', true);
 			$role = translate_level_to_role($level);
-			update_user_meta( $user->ID, $wpdb->prefix . 'capabilities', array($role => true) );
+			update_user_meta($user->ID, $wpdb->prefix.'capabilities', array($role => true));
 		}
 
 	endforeach;
-	$old_user_fields = array( 'user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level' );
+	$old_user_fields = array('user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level');
 	$wpdb->hide_errors();
-	foreach ( $old_user_fields as $old )
+	foreach ($old_user_fields as $old)
 		$wpdb->query("ALTER TABLE $wpdb->users DROP $old");
 	$wpdb->show_errors();
 
 	// Populate comment_count field of posts table.
-	$comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
-	if ( is_array( $comments ) )
+	$comments = $wpdb->get_results("SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID");
+	if (is_array($comments))
 		foreach ($comments as $comment)
-			$wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) );
+			$wpdb->update($wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID));
 
 	/*
 	 * Some alpha versions used a post status of object instead of attachment
 	 * and put the mime type in post_type instead of post_mime_type.
 	 */
-	if ( $wp_current_db_version > 2541 && $wp_current_db_version <= 3091 ) {
+	if ($wp_current_db_version > 2541 && $wp_current_db_version <= 3091) {
 		$objects = $wpdb->get_results("SELECT ID, post_type FROM $wpdb->posts WHERE post_status = 'object'");
 		foreach ($objects as $object) {
-			$wpdb->update( $wpdb->posts, array(	'post_status' => 'attachment',
+			$wpdb->update($wpdb->posts, array('post_status' => 'attachment',
 												'post_mime_type' => $object->post_type,
 												'post_type' => ''),
-										 array( 'ID' => $object->ID ) );
+										 array('ID' => $object->ID));
 
 			$meta = get_post_meta($object->ID, 'imagedata', true);
-			if ( ! empty($meta['file']) )
-				update_attached_file( $object->ID, $meta['file'] );
+			if ( ! empty($meta['file']))
+				update_attached_file($object->ID, $meta['file']);
 		}
 	}
 }
@@ -896,38 +896,38 @@ 
 function upgrade_210() {
 	global $wpdb, $wp_current_db_version;
 
-	if ( $wp_current_db_version < 3506 ) {
+	if ($wp_current_db_version < 3506) {
 		// Update status and type.
 		$posts = $wpdb->get_results("SELECT ID, post_status FROM $wpdb->posts");
 
-		if ( ! empty($posts) ) foreach ($posts as $post) {
+		if ( ! empty($posts)) foreach ($posts as $post) {
 			$status = $post->post_status;
 			$type = 'post';
 
-			if ( 'static' == $status ) {
+			if ('static' == $status) {
 				$status = 'publish';
 				$type = 'page';
-			} elseif ( 'attachment' == $status ) {
+			} elseif ('attachment' == $status) {
 				$status = 'inherit';
 				$type = 'attachment';
 			}
 
-			$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_status = %s, post_type = %s WHERE ID = %d", $status, $type, $post->ID) );
+			$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET post_status = %s, post_type = %s WHERE ID = %d", $status, $type, $post->ID));
 		}
 	}
 
-	if ( $wp_current_db_version < 3845 ) {
+	if ($wp_current_db_version < 3845) {
 		populate_roles_210();
 	}
 
-	if ( $wp_current_db_version < 3531 ) {
+	if ($wp_current_db_version < 3531) {
 		// Give future posts a post_status of future.
 		$now = gmdate('Y-m-d H:i:59');
-		$wpdb->query ("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
+		$wpdb->query("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
 
 		$posts = $wpdb->get_results("SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'");
-		if ( !empty($posts) )
-			foreach ( $posts as $post )
+		if ( ! empty($posts))
+			foreach ($posts as $post)
 				wp_schedule_single_event(mysql2date('U', $post->post_date, false), 'publish_future_post', array($post->ID));
 	}
 }
@@ -944,7 +944,7 @@ 
 function upgrade_230() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 5200 ) {
+	if ($wp_current_db_version < 5200) {
 		populate_roles_230();
 	}
 
@@ -961,78 +961,78 @@ 
 		$term_group = 0;
 
 		// Associate terms with the same slug in a term group and make slugs unique.
-		if ( $exists = $wpdb->get_results( $wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug) ) ) {
+		if ($exists = $wpdb->get_results($wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug))) {
 			$term_group = $exists[0]->term_group;
 			$id = $exists[0]->term_id;
 			$num = 2;
 			do {
-				$alt_slug = $slug . "-$num";
+				$alt_slug = $slug."-$num";
 				$num++;
-				$slug_check = $wpdb->get_var( $wpdb->prepare("SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug) );
-			} while ( $slug_check );
+				$slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug));
+			} while ($slug_check);
 
 			$slug = $alt_slug;
 
-			if ( empty( $term_group ) ) {
+			if (empty($term_group)) {
 				$term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms GROUP BY term_group") + 1;
-				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->terms SET term_group = %d WHERE term_id = %d", $term_group, $id) );
+				$wpdb->query($wpdb->prepare("UPDATE $wpdb->terms SET term_group = %d WHERE term_id = %d", $term_group, $id));
 			}
 		}
 
-		$wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES
-		(%d, %s, %s, %d)", $term_id, $name, $slug, $term_group) );
+		$wpdb->query($wpdb->prepare("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES
+		(%d, %s, %s, %d)", $term_id, $name, $slug, $term_group));
 
 		$count = 0;
-		if ( !empty($category->category_count) ) {
+		if ( ! empty($category->category_count)) {
 			$count = (int) $category->category_count;
 			$taxonomy = 'category';
-			$wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count) );
+			$wpdb->query($wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count));
 			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
 		}
 
-		if ( !empty($category->link_count) ) {
+		if ( ! empty($category->link_count)) {
 			$count = (int) $category->link_count;
 			$taxonomy = 'link_category';
-			$wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count) );
+			$wpdb->query($wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count));
 			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
 		}
 
-		if ( !empty($category->tag_count) ) {
+		if ( ! empty($category->tag_count)) {
 			$have_tags = true;
 			$count = (int) $category->tag_count;
 			$taxonomy = 'post_tag';
-			$wpdb->insert( $wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count') );
+			$wpdb->insert($wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count'));
 			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
 		}
 
-		if ( empty($count) ) {
+		if (empty($count)) {
 			$count = 0;
 			$taxonomy = 'category';
-			$wpdb->insert( $wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count') );
+			$wpdb->insert($wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count'));
 			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
 		}
 	}
 
 	$select = 'post_id, category_id';
-	if ( $have_tags )
+	if ($have_tags)
 		$select .= ', rel_type';
 
 	$posts = $wpdb->get_results("SELECT $select FROM $wpdb->post2cat GROUP BY post_id, category_id");
-	foreach ( $posts as $post ) {
+	foreach ($posts as $post) {
 		$post_id = (int) $post->post_id;
 		$term_id = (int) $post->category_id;
 		$taxonomy = 'category';
-		if ( !empty($post->rel_type) && 'tag' == $post->rel_type)
+		if ( ! empty($post->rel_type) && 'tag' == $post->rel_type)
 			$taxonomy = 'tag';
 		$tt_id = $tt_ids[$term_id][$taxonomy];
-		if ( empty($tt_id) )
+		if (empty($tt_id))
 			continue;
 
-		$wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) );
+		$wpdb->insert($wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id));
 	}
 
 	// < 3570 we used linkcategories. >= 3570 we used categories and link2cat.
-	if ( $wp_current_db_version < 3570 ) {
+	if ($wp_current_db_version < 3570) {
 		/*
 		 * Create link_category terms for link categories. Create a map of link
 		 * cat IDs to link_category terms.
@@ -1040,8 +1040,8 @@ 
 		$link_cat_id_map = array();
 		$default_link_cat = 0;
 		$tt_ids = array();
-		$link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM " . $wpdb->prefix . 'linkcategories');
-		foreach ( $link_cats as $category) {
+		$link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM ".$wpdb->prefix.'linkcategories');
+		foreach ($link_cats as $category) {
 			$cat_id = (int) $category->cat_id;
 			$term_id = 0;
 			$name = wp_slash($category->cat_name);
@@ -1049,66 +1049,66 @@ 
 			$term_group = 0;
 
 			// Associate terms with the same slug in a term group and make slugs unique.
-			if ( $exists = $wpdb->get_results( $wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug) ) ) {
+			if ($exists = $wpdb->get_results($wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug))) {
 				$term_group = $exists[0]->term_group;
 				$term_id = $exists[0]->term_id;
 			}
 
-			if ( empty($term_id) ) {
-				$wpdb->insert( $wpdb->terms, compact('name', 'slug', 'term_group') );
+			if (empty($term_id)) {
+				$wpdb->insert($wpdb->terms, compact('name', 'slug', 'term_group'));
 				$term_id = (int) $wpdb->insert_id;
 			}
 
 			$link_cat_id_map[$cat_id] = $term_id;
 			$default_link_cat = $term_id;
 
-			$wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $term_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 0) );
+			$wpdb->insert($wpdb->term_taxonomy, array('term_id' => $term_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 0));
 			$tt_ids[$term_id] = (int) $wpdb->insert_id;
 		}
 
 		// Associate links to cats.
 		$links = $wpdb->get_results("SELECT link_id, link_category FROM $wpdb->links");
-		if ( !empty($links) ) foreach ( $links as $link ) {
-			if ( 0 == $link->link_category )
+		if ( ! empty($links)) foreach ($links as $link) {
+			if (0 == $link->link_category)
 				continue;
-			if ( ! isset($link_cat_id_map[$link->link_category]) )
+			if ( ! isset($link_cat_id_map[$link->link_category]))
 				continue;
 			$term_id = $link_cat_id_map[$link->link_category];
 			$tt_id = $tt_ids[$term_id];
-			if ( empty($tt_id) )
+			if (empty($tt_id))
 				continue;
 
-			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link->link_id, 'term_taxonomy_id' => $tt_id) );
+			$wpdb->insert($wpdb->term_relationships, array('object_id' => $link->link_id, 'term_taxonomy_id' => $tt_id));
 		}
 
 		// Set default to the last category we grabbed during the upgrade loop.
 		update_option('default_link_category', $default_link_cat);
 	} else {
 		$links = $wpdb->get_results("SELECT link_id, category_id FROM $wpdb->link2cat GROUP BY link_id, category_id");
-		foreach ( $links as $link ) {
+		foreach ($links as $link) {
 			$link_id = (int) $link->link_id;
 			$term_id = (int) $link->category_id;
 			$taxonomy = 'link_category';
 			$tt_id = $tt_ids[$term_id][$taxonomy];
-			if ( empty($tt_id) )
+			if (empty($tt_id))
 				continue;
-			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link_id, 'term_taxonomy_id' => $tt_id) );
+			$wpdb->insert($wpdb->term_relationships, array('object_id' => $link_id, 'term_taxonomy_id' => $tt_id));
 		}
 	}
 
-	if ( $wp_current_db_version < 4772 ) {
+	if ($wp_current_db_version < 4772) {
 		// Obsolete linkcategories table
-		$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'linkcategories');
+		$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'linkcategories');
 	}
 
 	// Recalculate all counts
 	$terms = $wpdb->get_results("SELECT term_taxonomy_id, taxonomy FROM $wpdb->term_taxonomy");
-	foreach ( (array) $terms as $term ) {
-		if ( ('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy) )
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id) );
+	foreach ((array) $terms as $term) {
+		if (('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy))
+			$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id));
 		else
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id) );
-		$wpdb->update( $wpdb->term_taxonomy, array('count' => $count), array('term_taxonomy_id' => $term->term_taxonomy_id) );
+			$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id));
+		$wpdb->update($wpdb->term_taxonomy, array('count' => $count), array('term_taxonomy_id' => $term->term_taxonomy_id));
 	}
 }
 
@@ -1122,9 +1122,9 @@ 
  */
 function upgrade_230_options_table() {
 	global $wpdb;
-	$old_options_fields = array( 'option_can_override', 'option_type', 'option_width', 'option_height', 'option_description', 'option_admin_level' );
+	$old_options_fields = array('option_can_override', 'option_type', 'option_width', 'option_height', 'option_description', 'option_admin_level');
 	$wpdb->hide_errors();
-	foreach ( $old_options_fields as $old )
+	foreach ($old_options_fields as $old)
 		$wpdb->query("ALTER TABLE $wpdb->options DROP $old");
 	$wpdb->show_errors();
 }
@@ -1139,9 +1139,9 @@ 
  */
 function upgrade_230_old_tables() {
 	global $wpdb;
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'categories');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'link2cat');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'post2cat');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'categories');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'link2cat');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'post2cat');
 }
 
 /**
@@ -1169,7 +1169,7 @@ 
 function upgrade_250() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 6689 ) {
+	if ($wp_current_db_version < 6689) {
 		populate_roles_250();
 	}
 
@@ -1200,7 +1200,7 @@ 
 function upgrade_260() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8000 )
+	if ($wp_current_db_version < 8000)
 		populate_roles_260();
 }
 
@@ -1216,12 +1216,12 @@ 
 function upgrade_270() {
 	global $wpdb, $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8980 )
+	if ($wp_current_db_version < 8980)
 		populate_roles_270();
 
 	// Update post_date for unpublished posts with empty timestamp
-	if ( $wp_current_db_version < 8921 )
-		$wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" );
+	if ($wp_current_db_version < 8921)
+		$wpdb->query("UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'");
 }
 
 /**
@@ -1236,22 +1236,22 @@ 
 function upgrade_280() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 10360 )
+	if ($wp_current_db_version < 10360)
 		populate_roles_280();
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		$start = 0;
-		while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
-			foreach ( $rows as $row ) {
+		while ($rows = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20")) {
+			foreach ($rows as $row) {
 				$value = $row->option_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
-				if ( $value !== $row->option_value ) {
-					update_option( $row->option_name, $value );
+				if ( ! @unserialize($value))
+					$value = stripslashes($value);
+				if ($value !== $row->option_value) {
+					update_option($row->option_name, $value);
 				}
 			}
 			$start += 20;
 		}
-		refresh_blog_details( $wpdb->blogid );
+		refresh_blog_details($wpdb->blogid);
 	}
 }
 
@@ -1266,11 +1266,11 @@ 
 function upgrade_290() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 11958 ) {
+	if ($wp_current_db_version < 11958) {
 		// Previously, setting depth to 1 would redundantly disable threading, but now 2 is the minimum depth to avoid confusion
-		if ( get_option( 'thread_comments_depth' ) == '1' ) {
-			update_option( 'thread_comments_depth', 2 );
-			update_option( 'thread_comments', 0 );
+		if (get_option('thread_comments_depth') == '1') {
+			update_option('thread_comments_depth', 2);
+			update_option('thread_comments', 0);
 		}
 	}
 }
@@ -1287,14 +1287,14 @@ 
 function upgrade_300() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 15093 )
+	if ($wp_current_db_version < 15093)
 		populate_roles_300();
 
-	if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
-		add_site_option( 'siteurl', '' );
+	if ($wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined('MULTISITE') && get_site_option('siteurl') === false)
+		add_site_option('siteurl', '');
 
 	// 3.0 screen options key name changes.
-	if ( wp_should_upgrade_global_tables() ) {
+	if (wp_should_upgrade_global_tables()) {
 		$sql = "DELETE FROM $wpdb->usermeta
 			WHERE meta_key LIKE %s
 			OR meta_key LIKE %s
@@ -1308,15 +1308,15 @@ 
 			OR meta_key = 'manageeditcolumnshidden'
 			OR meta_key = 'categories_per_page'
 			OR meta_key = 'edit_tags_per_page'";
-		$prefix = $wpdb->esc_like( $wpdb->base_prefix );
-		$wpdb->query( $wpdb->prepare( $sql,
-			$prefix . '%' . $wpdb->esc_like( 'meta-box-hidden' ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'closedpostboxes' ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'manage-'	   ) . '%' . $wpdb->esc_like( '-columns-hidden' ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'meta-box-order'  ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'metaboxorder'    ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'screen_layout'   ) . '%'
-		) );
+		$prefix = $wpdb->esc_like($wpdb->base_prefix);
+		$wpdb->query($wpdb->prepare($sql,
+			$prefix.'%'.$wpdb->esc_like('meta-box-hidden').'%',
+			$prefix.'%'.$wpdb->esc_like('closedpostboxes').'%',
+			$prefix.'%'.$wpdb->esc_like('manage-').'%'.$wpdb->esc_like('-columns-hidden').'%',
+			$prefix.'%'.$wpdb->esc_like('meta-box-order').'%',
+			$prefix.'%'.$wpdb->esc_like('metaboxorder').'%',
+			$prefix.'%'.$wpdb->esc_like('screen_layout').'%'
+		));
 	}
 
 }
@@ -1335,52 +1335,52 @@ 
 function upgrade_330() {
 	global $wp_current_db_version, $wpdb, $wp_registered_widgets, $sidebars_widgets;
 
-	if ( $wp_current_db_version < 19061 && wp_should_upgrade_global_tables() ) {
-		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" );
+	if ($wp_current_db_version < 19061 && wp_should_upgrade_global_tables()) {
+		$wpdb->query("DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')");
 	}
 
-	if ( $wp_current_db_version >= 11548 )
+	if ($wp_current_db_version >= 11548)
 		return;
 
-	$sidebars_widgets = get_option( 'sidebars_widgets', array() );
+	$sidebars_widgets = get_option('sidebars_widgets', array());
 	$_sidebars_widgets = array();
 
-	if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) )
+	if (isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets))
 		$sidebars_widgets['array_version'] = 3;
-	elseif ( !isset($sidebars_widgets['array_version']) )
+	elseif ( ! isset($sidebars_widgets['array_version']))
 		$sidebars_widgets['array_version'] = 1;
 
-	switch ( $sidebars_widgets['array_version'] ) {
+	switch ($sidebars_widgets['array_version']) {
 		case 1 :
-			foreach ( (array) $sidebars_widgets as $index => $sidebar )
-			if ( is_array($sidebar) )
-			foreach ( (array) $sidebar as $i => $name ) {
+			foreach ((array) $sidebars_widgets as $index => $sidebar)
+			if (is_array($sidebar))
+			foreach ((array) $sidebar as $i => $name) {
 				$id = strtolower($name);
-				if ( isset($wp_registered_widgets[$id]) ) {
+				if (isset($wp_registered_widgets[$id])) {
 					$_sidebars_widgets[$index][$i] = $id;
 					continue;
 				}
 				$id = sanitize_title($name);
-				if ( isset($wp_registered_widgets[$id]) ) {
+				if (isset($wp_registered_widgets[$id])) {
 					$_sidebars_widgets[$index][$i] = $id;
 					continue;
 				}
 
 				$found = false;
 
-				foreach ( $wp_registered_widgets as $widget_id => $widget ) {
-					if ( strtolower($widget['name']) == strtolower($name) ) {
+				foreach ($wp_registered_widgets as $widget_id => $widget) {
+					if (strtolower($widget['name']) == strtolower($name)) {
 						$_sidebars_widgets[$index][$i] = $widget['id'];
 						$found = true;
 						break;
-					} elseif ( sanitize_title($widget['name']) == sanitize_title($name) ) {
+					} elseif (sanitize_title($widget['name']) == sanitize_title($name)) {
 						$_sidebars_widgets[$index][$i] = $widget['id'];
 						$found = true;
 						break;
 					}
 				}
 
-				if ( $found )
+				if ($found)
 					continue;
 
 				unset($_sidebars_widgets[$index][$i]);
@@ -1392,7 +1392,7 @@ 
 		case 2 :
 			$sidebars_widgets = retrieve_widgets();
 			$sidebars_widgets['array_version'] = 3;
-			update_option( 'sidebars_widgets', $sidebars_widgets );
+			update_option('sidebars_widgets', $sidebars_widgets);
 	}
 }
 
@@ -1408,27 +1408,27 @@ 
 function upgrade_340() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 19798 ) {
+	if ($wp_current_db_version < 19798) {
 		$wpdb->hide_errors();
-		$wpdb->query( "ALTER TABLE $wpdb->options DROP COLUMN blog_id" );
+		$wpdb->query("ALTER TABLE $wpdb->options DROP COLUMN blog_id");
 		$wpdb->show_errors();
 	}
 
-	if ( $wp_current_db_version < 19799 ) {
+	if ($wp_current_db_version < 19799) {
 		$wpdb->hide_errors();
 		$wpdb->query("ALTER TABLE $wpdb->comments DROP INDEX comment_approved");
 		$wpdb->show_errors();
 	}
 
-	if ( $wp_current_db_version < 20022 && wp_should_upgrade_global_tables() ) {
-		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key = 'themes_last_view'" );
+	if ($wp_current_db_version < 20022 && wp_should_upgrade_global_tables()) {
+		$wpdb->query("DELETE FROM $wpdb->usermeta WHERE meta_key = 'themes_last_view'");
 	}
 
-	if ( $wp_current_db_version < 20080 ) {
-		if ( 'yes' == $wpdb->get_var( "SELECT autoload FROM $wpdb->options WHERE option_name = 'uninstall_plugins'" ) ) {
-			$uninstall_plugins = get_option( 'uninstall_plugins' );
-			delete_option( 'uninstall_plugins' );
-			add_option( 'uninstall_plugins', $uninstall_plugins, null, 'no' );
+	if ($wp_current_db_version < 20080) {
+		if ('yes' == $wpdb->get_var("SELECT autoload FROM $wpdb->options WHERE option_name = 'uninstall_plugins'")) {
+			$uninstall_plugins = get_option('uninstall_plugins');
+			delete_option('uninstall_plugins');
+			add_option('uninstall_plugins', $uninstall_plugins, null, 'no');
 		}
 	}
 }
@@ -1445,23 +1445,23 @@ 
 function upgrade_350() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options()
+	if ($wp_current_db_version < 22006 && $wpdb->get_var("SELECT link_id FROM $wpdb->links LIMIT 1"))
+		update_option('link_manager_enabled', 1); // Previously set to 0 by populate_options()
 
-	if ( $wp_current_db_version < 21811 && wp_should_upgrade_global_tables() ) {
+	if ($wp_current_db_version < 21811 && wp_should_upgrade_global_tables()) {
 		$meta_keys = array();
-		foreach ( array_merge( get_post_types(), get_taxonomies() ) as $name ) {
-			if ( false !== strpos( $name, '-' ) )
-			$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+		foreach (array_merge(get_post_types(), get_taxonomies()) as $name) {
+			if (false !== strpos($name, '-'))
+			$meta_keys[] = 'edit_'.str_replace('-', '_', $name).'_per_page';
 		}
-		if ( $meta_keys ) {
-			$meta_keys = implode( "', '", $meta_keys );
-			$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('$meta_keys')" );
+		if ($meta_keys) {
+			$meta_keys = implode("', '", $meta_keys);
+			$wpdb->query("DELETE FROM $wpdb->usermeta WHERE meta_key IN ('$meta_keys')");
 		}
 	}
 
-	if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) )
-		wp_delete_term( $term->term_id, 'post_format' );
+	if ($wp_current_db_version < 22422 && $term = get_term_by('slug', 'post-format-standard', 'post_format'))
+		wp_delete_term($term->term_id, 'post_format');
 }
 
 /**
@@ -1474,8 +1474,8 @@ 
  */
 function upgrade_370() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 25824 )
-		wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' );
+	if ($wp_current_db_version < 25824)
+		wp_clear_scheduled_hook('wp_auto_updates_maybe_update');
 }
 
 /**
@@ -1489,8 +1489,8 @@ 
  */
 function upgrade_372() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 26148 )
-		wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+	if ($wp_current_db_version < 26148)
+		wp_clear_scheduled_hook('wp_maybe_auto_update');
 }
 
 /**
@@ -1503,8 +1503,8 @@ 
  */
 function upgrade_380() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 26691 ) {
-		deactivate_plugins( array( 'mp6/mp6.php' ), true );
+	if ($wp_current_db_version < 26691) {
+		deactivate_plugins(array('mp6/mp6.php'), true);
 	}
 }
 
@@ -1518,12 +1518,12 @@ 
  */
 function upgrade_400() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 29630 ) {
-		if ( ! is_multisite() && false === get_option( 'WPLANG' ) ) {
-			if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && in_array( WPLANG, get_available_languages() ) ) {
-				update_option( 'WPLANG', WPLANG );
+	if ($wp_current_db_version < 29630) {
+		if ( ! is_multisite() && false === get_option('WPLANG')) {
+			if (defined('WPLANG') && ('' !== WPLANG) && in_array(WPLANG, get_available_languages())) {
+				update_option('WPLANG', WPLANG);
 			} else {
-				update_option( 'WPLANG', '' );
+				update_option('WPLANG', '');
 			}
 		}
 	}
@@ -1552,29 +1552,29 @@ 
 function upgrade_430() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 32364 ) {
+	if ($wp_current_db_version < 32364) {
 		upgrade_430_fix_comments();
 	}
 
 	// Shared terms are split in a separate process.
-	if ( $wp_current_db_version < 32814 ) {
-		update_option( 'finished_splitting_shared_terms', 0 );
-		wp_schedule_single_event( time() + ( 1 * MINUTE_IN_SECONDS ), 'wp_split_shared_term_batch' );
+	if ($wp_current_db_version < 32814) {
+		update_option('finished_splitting_shared_terms', 0);
+		wp_schedule_single_event(time() + (1 * MINUTE_IN_SECONDS), 'wp_split_shared_term_batch');
 	}
 
-	if ( $wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset ) {
-		if ( is_multisite() ) {
-			$tables = $wpdb->tables( 'blog' );
+	if ($wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset) {
+		if (is_multisite()) {
+			$tables = $wpdb->tables('blog');
 		} else {
-			$tables = $wpdb->tables( 'all' );
-			if ( ! wp_should_upgrade_global_tables() ) {
-				$global_tables = $wpdb->tables( 'global' );
-				$tables = array_diff_assoc( $tables, $global_tables );
+			$tables = $wpdb->tables('all');
+			if ( ! wp_should_upgrade_global_tables()) {
+				$global_tables = $wpdb->tables('global');
+				$tables = array_diff_assoc($tables, $global_tables);
 			}
 		}
 
-		foreach ( $tables as $table ) {
-			maybe_convert_table_to_utf8mb4( $table );
+		foreach ($tables as $table) {
+			maybe_convert_table_to_utf8mb4($table);
 		}
 	}
 }
@@ -1591,18 +1591,18 @@ 
 function upgrade_430_fix_comments() {
 	global $wp_current_db_version, $wpdb;
 
-	$content_length = $wpdb->get_col_length( $wpdb->comments, 'comment_content' );
+	$content_length = $wpdb->get_col_length($wpdb->comments, 'comment_content');
 
-	if ( is_wp_error( $content_length ) ) {
+	if (is_wp_error($content_length)) {
 		return;
 	}
 
-	if ( false === $content_length ) {
+	if (false === $content_length) {
 		$content_length = array(
 			'type'   => 'byte',
 			'length' => 65535,
 		);
-	} elseif ( ! is_array( $content_length ) ) {
+	} elseif ( ! is_array($content_length)) {
 		$length = (int) $content_length > 0 ? (int) $content_length : 65535;
 		$content_length = array(
 			'type'	 => 'byte',
@@ -1610,12 +1610,12 @@ 
 		);
 	}
 
-	if ( 'byte' !== $content_length['type'] || 0 === $content_length['length'] ) {
+	if ('byte' !== $content_length['type'] || 0 === $content_length['length']) {
 		// Sites with malformed DB schemas are on their own.
 		return;
 	}
 
-	$allowed_length = intval( $content_length['length'] ) - 10;
+	$allowed_length = intval($content_length['length']) - 10;
 
 	$comments = $wpdb->get_results(
 		"SELECT `comment_ID` FROM `{$wpdb->comments}`
@@ -1624,8 +1624,8 @@ 
 			AND ( `comment_content` LIKE '%<%' OR `comment_content` LIKE '%>%' )"
 	);
 
-	foreach ( $comments as $comment ) {
-		wp_delete_comment( $comment->comment_ID, true );
+	foreach ($comments as $comment) {
+		wp_delete_comment($comment->comment_ID, true);
 	}
 }
 
@@ -1638,9 +1638,9 @@ 
 function upgrade_431() {
 	// Fix incorrect cron entries for term splitting
 	$cron_array = _get_cron_array();
-	if ( isset( $cron_array['wp_batch_split_terms'] ) ) {
-		unset( $cron_array['wp_batch_split_terms'] );
-		_set_cron_array( $cron_array );
+	if (isset($cron_array['wp_batch_split_terms'])) {
+		unset($cron_array['wp_batch_split_terms']);
+		_set_cron_array($cron_array);
 	}
 }
 
@@ -1656,15 +1656,15 @@ 
 function upgrade_440() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 34030 ) {
-		$wpdb->query( "ALTER TABLE {$wpdb->options} MODIFY option_name VARCHAR(191)" );
+	if ($wp_current_db_version < 34030) {
+		$wpdb->query("ALTER TABLE {$wpdb->options} MODIFY option_name VARCHAR(191)");
 	}
 
 	// Remove the unused 'add_users' role.
 	$roles = wp_roles();
-	foreach ( $roles->role_objects as $role ) {
-		if ( $role->has_cap( 'add_users' ) ) {
-			$role->remove_cap( 'add_users' );
+	foreach ($roles->role_objects as $role) {
+		if ($role->has_cap('add_users')) {
+			$role->remove_cap('add_users');
 		}
 	}
 }
@@ -1681,17 +1681,17 @@ 
 function upgrade_450() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 36180 ) {
-		wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+	if ($wp_current_db_version < 36180) {
+		wp_clear_scheduled_hook('wp_maybe_auto_update');
 	}
 
 	// Remove unused email confirmation options, moved to usermeta.
-	if ( $wp_current_db_version < 36679 && is_multisite() ) {
-		$wpdb->query( "DELETE FROM $wpdb->options WHERE option_name REGEXP '^[0-9]+_new_email$'" );
+	if ($wp_current_db_version < 36679 && is_multisite()) {
+		$wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^[0-9]+_new_email$'");
 	}
 
 	// Remove unused user setting for wpLink.
-	delete_user_setting( 'wplink' );
+	delete_user_setting('wplink');
 }
 
 /**
@@ -1706,22 +1706,22 @@ 
 	global $wp_current_db_version;
 
 	// Remove unused post meta.
-	if ( $wp_current_db_version < 37854 ) {
-		delete_post_meta_by_key( '_post_restored_from' );
+	if ($wp_current_db_version < 37854) {
+		delete_post_meta_by_key('_post_restored_from');
 	}
 
 	// Remove plugins with callback as an array object/method as the uninstall hook, see #13786.
-	if ( $wp_current_db_version < 37965 ) {
-		$uninstall_plugins = get_option( 'uninstall_plugins', array() );
+	if ($wp_current_db_version < 37965) {
+		$uninstall_plugins = get_option('uninstall_plugins', array());
 
-		if ( ! empty( $uninstall_plugins ) ) {
-			foreach ( $uninstall_plugins as $basename => $callback ) {
-				if ( is_array( $callback ) && is_object( $callback[0] ) ) {
-					unset( $uninstall_plugins[ $basename ] );
+		if ( ! empty($uninstall_plugins)) {
+			foreach ($uninstall_plugins as $basename => $callback) {
+				if (is_array($callback) && is_object($callback[0])) {
+					unset($uninstall_plugins[$basename]);
 				}
 			}
 
-			update_option( 'uninstall_plugins', $uninstall_plugins );
+			update_option('uninstall_plugins', $uninstall_plugins);
 		}
 	}
 }
@@ -1738,7 +1738,7 @@ 
 	global $wp_current_db_version, $wpdb;
 
 	// Always.
-	if ( is_main_network() ) {
+	if (is_main_network()) {
 		/*
 		 * Deletes all expired transients. The multi-table delete syntax is used
 		 * to delete the transient record from table a, and the corresponding
@@ -1750,32 +1750,32 @@ 
 			AND a.meta_key NOT LIKE %s
 			AND b.meta_key = CONCAT( '_site_transient_timeout_', SUBSTRING( a.meta_key, 17 ) )
 			AND b.meta_value < %d";
-		$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like ( '_site_transient_timeout_' ) . '%', $time ) );
+		$wpdb->query($wpdb->prepare($sql, $wpdb->esc_like('_site_transient_').'%', $wpdb->esc_like('_site_transient_timeout_').'%', $time));
 	}
 
 	// 2.8.
-	if ( $wp_current_db_version < 11549 ) {
-		$wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
-		$active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
-		if ( $wpmu_sitewide_plugins ) {
-			if ( !$active_sitewide_plugins )
+	if ($wp_current_db_version < 11549) {
+		$wpmu_sitewide_plugins = get_site_option('wpmu_sitewide_plugins');
+		$active_sitewide_plugins = get_site_option('active_sitewide_plugins');
+		if ($wpmu_sitewide_plugins) {
+			if ( ! $active_sitewide_plugins)
 				$sitewide_plugins = (array) $wpmu_sitewide_plugins;
 			else
-				$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
+				$sitewide_plugins = array_merge((array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins);
 
-			update_site_option( 'active_sitewide_plugins', $sitewide_plugins );
+			update_site_option('active_sitewide_plugins', $sitewide_plugins);
 		}
-		delete_site_option( 'wpmu_sitewide_plugins' );
-		delete_site_option( 'deactivated_sitewide_plugins' );
+		delete_site_option('wpmu_sitewide_plugins');
+		delete_site_option('deactivated_sitewide_plugins');
 
 		$start = 0;
-		while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
-			foreach ( $rows as $row ) {
+		while ($rows = $wpdb->get_results("SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20")) {
+			foreach ($rows as $row) {
 				$value = $row->meta_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
-				if ( $value !== $row->meta_value ) {
-					update_site_option( $row->meta_key, $value );
+				if ( ! @unserialize($value))
+					$value = stripslashes($value);
+				if ($value !== $row->meta_value) {
+					update_site_option($row->meta_key, $value);
 				}
 			}
 			$start += 20;
@@ -1783,95 +1783,95 @@ 
 	}
 
 	// 3.0
-	if ( $wp_current_db_version < 13576 )
-		update_site_option( 'global_terms_enabled', '1' );
+	if ($wp_current_db_version < 13576)
+		update_site_option('global_terms_enabled', '1');
 
 	// 3.3
-	if ( $wp_current_db_version < 19390 )
-		update_site_option( 'initial_db_version', $wp_current_db_version );
+	if ($wp_current_db_version < 19390)
+		update_site_option('initial_db_version', $wp_current_db_version);
 
-	if ( $wp_current_db_version < 19470 ) {
-		if ( false === get_site_option( 'active_sitewide_plugins' ) )
-			update_site_option( 'active_sitewide_plugins', array() );
+	if ($wp_current_db_version < 19470) {
+		if (false === get_site_option('active_sitewide_plugins'))
+			update_site_option('active_sitewide_plugins', array());
 	}
 
 	// 3.4
-	if ( $wp_current_db_version < 20148 ) {
+	if ($wp_current_db_version < 20148) {
 		// 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
-		$allowedthemes  = get_site_option( 'allowedthemes'  );
-		$allowed_themes = get_site_option( 'allowed_themes' );
-		if ( false === $allowedthemes && is_array( $allowed_themes ) && $allowed_themes ) {
+		$allowedthemes  = get_site_option('allowedthemes');
+		$allowed_themes = get_site_option('allowed_themes');
+		if (false === $allowedthemes && is_array($allowed_themes) && $allowed_themes) {
 			$converted = array();
 			$themes = wp_get_themes();
-			foreach ( $themes as $stylesheet => $theme_data ) {
-				if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) )
-					$converted[ $stylesheet ] = true;
+			foreach ($themes as $stylesheet => $theme_data) {
+				if (isset($allowed_themes[$theme_data->get('Name')]))
+					$converted[$stylesheet] = true;
 			}
-			update_site_option( 'allowedthemes', $converted );
-			delete_site_option( 'allowed_themes' );
+			update_site_option('allowedthemes', $converted);
+			delete_site_option('allowed_themes');
 		}
 	}
 
 	// 3.5
-	if ( $wp_current_db_version < 21823 )
-		update_site_option( 'ms_files_rewriting', '1' );
+	if ($wp_current_db_version < 21823)
+		update_site_option('ms_files_rewriting', '1');
 
 	// 3.5.2
-	if ( $wp_current_db_version < 24448 ) {
-		$illegal_names = get_site_option( 'illegal_names' );
-		if ( is_array( $illegal_names ) && count( $illegal_names ) === 1 ) {
-			$illegal_name = reset( $illegal_names );
-			$illegal_names = explode( ' ', $illegal_name );
-			update_site_option( 'illegal_names', $illegal_names );
+	if ($wp_current_db_version < 24448) {
+		$illegal_names = get_site_option('illegal_names');
+		if (is_array($illegal_names) && count($illegal_names) === 1) {
+			$illegal_name = reset($illegal_names);
+			$illegal_names = explode(' ', $illegal_name);
+			update_site_option('illegal_names', $illegal_names);
 		}
 	}
 
 	// 4.2
-	if ( $wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4' ) {
-		if ( wp_should_upgrade_global_tables() ) {
-			$wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-			$wpdb->query( "ALTER TABLE $wpdb->site DROP INDEX domain, ADD INDEX domain(domain(140),path(51))" );
-			$wpdb->query( "ALTER TABLE $wpdb->sitemeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-			$wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" );
+	if ($wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4') {
+		if (wp_should_upgrade_global_tables()) {
+			$wpdb->query("ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+			$wpdb->query("ALTER TABLE $wpdb->site DROP INDEX domain, ADD INDEX domain(domain(140),path(51))");
+			$wpdb->query("ALTER TABLE $wpdb->sitemeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+			$wpdb->query("ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))");
 
-			$tables = $wpdb->tables( 'global' );
+			$tables = $wpdb->tables('global');
 
 			// sitecategories may not exist.
-			if ( ! $wpdb->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) {
-				unset( $tables['sitecategories'] );
+			if ( ! $wpdb->get_var("SHOW TABLES LIKE '{$tables['sitecategories']}'")) {
+				unset($tables['sitecategories']);
 			}
 
-			foreach ( $tables as $table ) {
-				maybe_convert_table_to_utf8mb4( $table );
+			foreach ($tables as $table) {
+				maybe_convert_table_to_utf8mb4($table);
 			}
 		}
 	}
 
 	// 4.3
-	if ( $wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset ) {
-		if ( wp_should_upgrade_global_tables() ) {
+	if ($wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset) {
+		if (wp_should_upgrade_global_tables()) {
 			$upgrade = false;
-			$indexes = $wpdb->get_results( "SHOW INDEXES FROM $wpdb->signups" );
-			foreach ( $indexes as $index ) {
-				if ( 'domain_path' == $index->Key_name && 'domain' == $index->Column_name && 140 != $index->Sub_part ) {
+			$indexes = $wpdb->get_results("SHOW INDEXES FROM $wpdb->signups");
+			foreach ($indexes as $index) {
+				if ('domain_path' == $index->Key_name && 'domain' == $index->Column_name && 140 != $index->Sub_part) {
 					$upgrade = true;
 					break;
 				}
 			}
 
-			if ( $upgrade ) {
-				$wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" );
+			if ($upgrade) {
+				$wpdb->query("ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))");
 			}
 
-			$tables = $wpdb->tables( 'global' );
+			$tables = $wpdb->tables('global');
 
 			// sitecategories may not exist.
-			if ( ! $wpdb->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) {
-				unset( $tables['sitecategories'] );
+			if ( ! $wpdb->get_var("SHOW TABLES LIKE '{$tables['sitecategories']}'")) {
+				unset($tables['sitecategories']);
 			}
 
-			foreach ( $tables as $table ) {
-				maybe_convert_table_to_utf8mb4( $table );
+			foreach ($tables as $table) {
+				maybe_convert_table_to_utf8mb4($table);
 			}
 		}
 	}
@@ -1899,9 +1899,9 @@ 
 function maybe_create_table($table_name, $create_ddl) {
 	global $wpdb;
 
-	$query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $table_name ) );
+	$query = $wpdb->prepare("SHOW TABLES LIKE %s", $wpdb->esc_like($table_name));
 
-	if ( $wpdb->get_var( $query ) == $table_name ) {
+	if ($wpdb->get_var($query) == $table_name) {
 		return true;
 	}
 
@@ -1909,7 +1909,7 @@ 
 	$wpdb->query($create_ddl);
 
 	// We cannot directly tell that whether this succeeded!
-	if ( $wpdb->get_var( $query ) == $table_name ) {
+	if ($wpdb->get_var($query) == $table_name) {
 		return true;
 	}
 	return false;
@@ -1970,7 +1970,7 @@ 
  */
 function maybe_add_column($table_name, $column_name, $create_ddl) {
 	global $wpdb;
-	foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
+	foreach ($wpdb->get_col("DESC $table_name", 0) as $column) {
 		if ($column == $column_name) {
 			return true;
 		}
@@ -1980,7 +1980,7 @@ 
 	$wpdb->query($create_ddl);
 
 	// We cannot directly tell that whether this succeeded!
-	foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
+	foreach ($wpdb->get_col("DESC $table_name", 0) as $column) {
 		if ($column == $column_name) {
 			return true;
 		}
@@ -1998,37 +1998,37 @@ 
  * @param string $table The table to convert.
  * @return bool true if the table was converted, false if it wasn't.
  */
-function maybe_convert_table_to_utf8mb4( $table ) {
+function maybe_convert_table_to_utf8mb4($table) {
 	global $wpdb;
 
-	$results = $wpdb->get_results( "SHOW FULL COLUMNS FROM `$table`" );
-	if ( ! $results ) {
+	$results = $wpdb->get_results("SHOW FULL COLUMNS FROM `$table`");
+	if ( ! $results) {
 		return false;
 	}
 
-	foreach ( $results as $column ) {
-		if ( $column->Collation ) {
-			list( $charset ) = explode( '_', $column->Collation );
-			$charset = strtolower( $charset );
-			if ( 'utf8' !== $charset && 'utf8mb4' !== $charset ) {
+	foreach ($results as $column) {
+		if ($column->Collation) {
+			list($charset) = explode('_', $column->Collation);
+			$charset = strtolower($charset);
+			if ('utf8' !== $charset && 'utf8mb4' !== $charset) {
 				// Don't upgrade tables that have non-utf8 columns.
 				return false;
 			}
 		}
 	}
 
-	$table_details = $wpdb->get_row( "SHOW TABLE STATUS LIKE '$table'" );
-	if ( ! $table_details ) {
+	$table_details = $wpdb->get_row("SHOW TABLE STATUS LIKE '$table'");
+	if ( ! $table_details) {
 		return false;
 	}
 
-	list( $table_charset ) = explode( '_', $table_details->Collation );
-	$table_charset = strtolower( $table_charset );
-	if ( 'utf8mb4' === $table_charset ) {
+	list($table_charset) = explode('_', $table_details->Collation);
+	$table_charset = strtolower($table_charset);
+	if ('utf8mb4' === $table_charset) {
 		return true;
 	}
 
-	return $wpdb->query( "ALTER TABLE $table CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci" );
+	return $wpdb->query("ALTER TABLE $table CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci");
 }
 
 /**
@@ -2043,11 +2043,11 @@ 
 function get_alloptions_110() {
 	global $wpdb;
 	$all_options = new stdClass;
-	if ( $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" ) ) {
-		foreach ( $options as $option ) {
-			if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name )
-				$option->option_value = untrailingslashit( $option->option_value );
-			$all_options->{$option->option_name} = stripslashes( $option->option_value );
+	if ($options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options")) {
+		foreach ($options as $option) {
+			if ('siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name)
+				$option->option_value = untrailingslashit($option->option_value);
+			$all_options->{$option->option_name} = stripslashes($option->option_value);
 		}
 	}
 	return $all_options;
@@ -2068,21 +2068,21 @@ 
 function __get_option($setting) {
 	global $wpdb;
 
-	if ( $setting == 'home' && defined( 'WP_HOME' ) )
-		return untrailingslashit( WP_HOME );
+	if ($setting == 'home' && defined('WP_HOME'))
+		return untrailingslashit(WP_HOME);
 
-	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) )
-		return untrailingslashit( WP_SITEURL );
+	if ($setting == 'siteurl' && defined('WP_SITEURL'))
+		return untrailingslashit(WP_SITEURL);
 
-	$option = $wpdb->get_var( $wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
+	$option = $wpdb->get_var($wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting));
 
-	if ( 'home' == $setting && '' == $option )
-		return __get_option( 'siteurl' );
+	if ('home' == $setting && '' == $option)
+		return __get_option('siteurl');
 
-	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting )
-		$option = untrailingslashit( $option );
+	if ('siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting)
+		$option = untrailingslashit($option);
 
-	return maybe_unserialize( $option );
+	return maybe_unserialize($option);
 }
 
 /**
@@ -2130,16 +2130,16 @@ 
  *                              Default true.
  * @return array Strings containing the results of the various update queries.
  */
-function dbDelta( $queries = '', $execute = true ) {
+function dbDelta($queries = '', $execute = true) {
 	global $wpdb;
 
-	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) )
-	    $queries = wp_get_db_schema( $queries );
+	if (in_array($queries, array('', 'all', 'blog', 'global', 'ms_global'), true))
+	    $queries = wp_get_db_schema($queries);
 
 	// Separate individual queries into an array
-	if ( !is_array($queries) ) {
-		$queries = explode( ';', $queries );
-		$queries = array_filter( $queries );
+	if ( ! is_array($queries)) {
+		$queries = explode(';', $queries);
+		$queries = array_filter($queries);
 	}
 
 	/**
@@ -2149,7 +2149,7 @@ 
 	 *
 	 * @param array $queries An array of dbDelta SQL queries.
 	 */
-	$queries = apply_filters( 'dbdelta_queries', $queries );
+	$queries = apply_filters('dbdelta_queries', $queries);
 
 	$cqueries = array(); // Creation Queries
 	$iqueries = array(); // Insertion Queries
@@ -2157,14 +2157,14 @@ 
 
 	// Create a tablename index for an array ($cqueries) of queries
 	foreach ($queries as $qry) {
-		if ( preg_match( "|CREATE TABLE ([^ ]*)|", $qry, $matches ) ) {
-			$cqueries[ trim( $matches[1], '`' ) ] = $qry;
+		if (preg_match("|CREATE TABLE ([^ ]*)|", $qry, $matches)) {
+			$cqueries[trim($matches[1], '`')] = $qry;
 			$for_update[$matches[1]] = 'Created table '.$matches[1];
-		} elseif ( preg_match( "|CREATE DATABASE ([^ ]*)|", $qry, $matches ) ) {
-			array_unshift( $cqueries, $qry );
-		} elseif ( preg_match( "|INSERT INTO ([^ ]*)|", $qry, $matches ) ) {
+		} elseif (preg_match("|CREATE DATABASE ([^ ]*)|", $qry, $matches)) {
+			array_unshift($cqueries, $qry);
+		} elseif (preg_match("|INSERT INTO ([^ ]*)|", $qry, $matches)) {
 			$iqueries[] = $qry;
-		} elseif ( preg_match( "|UPDATE ([^ ]*)|", $qry, $matches ) ) {
+		} elseif (preg_match("|UPDATE ([^ ]*)|", $qry, $matches)) {
 			$iqueries[] = $qry;
 		} else {
 			// Unrecognized query type
@@ -2180,7 +2180,7 @@ 
 	 *
 	 * @param array $cqueries An array of dbDelta create SQL queries.
 	 */
-	$cqueries = apply_filters( 'dbdelta_create_queries', $cqueries );
+	$cqueries = apply_filters('dbdelta_create_queries', $cqueries);
 
 	/**
 	 * Filters the dbDelta SQL queries for inserting or updating.
@@ -2191,25 +2191,25 @@ 
 	 *
 	 * @param array $iqueries An array of dbDelta insert or update SQL queries.
 	 */
-	$iqueries = apply_filters( 'dbdelta_insert_queries', $iqueries );
+	$iqueries = apply_filters('dbdelta_insert_queries', $iqueries);
 
-	$text_fields = array( 'tinytext', 'text', 'mediumtext', 'longtext' );
-	$blob_fields = array( 'tinyblob', 'blob', 'mediumblob', 'longblob' );
+	$text_fields = array('tinytext', 'text', 'mediumtext', 'longtext');
+	$blob_fields = array('tinyblob', 'blob', 'mediumblob', 'longblob');
 
-	$global_tables = $wpdb->tables( 'global' );
-	foreach ( $cqueries as $table => $qry ) {
+	$global_tables = $wpdb->tables('global');
+	foreach ($cqueries as $table => $qry) {
 		// Upgrade global tables only for the main site. Don't upgrade at all if conditions are not optimal.
-		if ( in_array( $table, $global_tables ) && ! wp_should_upgrade_global_tables() ) {
-			unset( $cqueries[ $table ], $for_update[ $table ] );
+		if (in_array($table, $global_tables) && ! wp_should_upgrade_global_tables()) {
+			unset($cqueries[$table], $for_update[$table]);
 			continue;
 		}
 
 		// Fetch the table column structure from the database
 		$suppress = $wpdb->suppress_errors();
 		$tablefields = $wpdb->get_results("DESCRIBE {$table};");
-		$wpdb->suppress_errors( $suppress );
+		$wpdb->suppress_errors($suppress);
 
-		if ( ! $tablefields )
+		if ( ! $tablefields)
 			continue;
 
 		// Clear the field and index arrays.
@@ -2223,17 +2223,17 @@ 
 		$flds = explode("\n", $qryline);
 
 		// For every field line specified in the query.
-		foreach ( $flds as $fld ) {
-			$fld = trim( $fld, " \t\n\r\0\x0B," ); // Default trim characters, plus ','.
+		foreach ($flds as $fld) {
+			$fld = trim($fld, " \t\n\r\0\x0B,"); // Default trim characters, plus ','.
 
 			// Extract the field name.
-			preg_match( '|^([^ ]*)|', $fld, $fvals );
-			$fieldname = trim( $fvals[1], '`' );
-			$fieldname_lowercased = strtolower( $fieldname );
+			preg_match('|^([^ ]*)|', $fld, $fvals);
+			$fieldname = trim($fvals[1], '`');
+			$fieldname_lowercased = strtolower($fieldname);
 
 			// Verify the found field name.
 			$validfield = true;
-			switch ( $fieldname_lowercased ) {
+			switch ($fieldname_lowercased) {
 				case '':
 				case 'primary':
 				case 'index':
@@ -2277,19 +2277,19 @@ 
 					);
 
 					// Uppercase the index type and normalize space characters.
-					$index_type = strtoupper( preg_replace( '/\s+/', ' ', trim( $index_matches['index_type'] ) ) );
+					$index_type = strtoupper(preg_replace('/\s+/', ' ', trim($index_matches['index_type'])));
 
 					// 'INDEX' is a synonym for 'KEY', standardize on 'KEY'.
-					$index_type = str_replace( 'INDEX', 'KEY', $index_type );
+					$index_type = str_replace('INDEX', 'KEY', $index_type);
 
 					// Escape the index name with backticks. An index for a primary key has no name.
-					$index_name = ( 'PRIMARY KEY' === $index_type ) ? '' : '`' . $index_matches['index_name'] . '`';
+					$index_name = ('PRIMARY KEY' === $index_type) ? '' : '`'.$index_matches['index_name'].'`';
 
 					// Parse the columns. Multiple columns are separated by a comma.
-					$index_columns = array_map( 'trim', explode( ',', $index_matches['index_columns'] ) );
+					$index_columns = array_map('trim', explode(',', $index_matches['index_columns']));
 
 					// Normalize columns.
-					foreach ( $index_columns as &$index_column ) {
+					foreach ($index_columns as &$index_column) {
 						// Extract column name and number of indexed characters (sub_part).
 						preg_match(
 							  '/'
@@ -2314,66 +2314,66 @@ 
 						);
 
 						// Escape the column name with backticks.
-						$index_column = '`' . $index_column_matches['column_name'] . '`';
+						$index_column = '`'.$index_column_matches['column_name'].'`';
 
 						// Append the optional sup part with the number of indexed characters.
-						if ( isset( $index_column_matches['sub_part'] ) ) {
-							$index_column .= '(' . $index_column_matches['sub_part'] . ')';
+						if (isset($index_column_matches['sub_part'])) {
+							$index_column .= '('.$index_column_matches['sub_part'].')';
 						}
 					}
 
 					// Build the normalized index definition and add it to the list of indices.
-					$indices[] = "{$index_type} {$index_name} (" . implode( ',', $index_columns ) . ")";
+					$indices[] = "{$index_type} {$index_name} (".implode(',', $index_columns).")";
 
 					// Destroy no longer needed variables.
-					unset( $index_column, $index_column_matches, $index_matches, $index_type, $index_name, $index_columns );
+					unset($index_column, $index_column_matches, $index_matches, $index_type, $index_name, $index_columns);
 
 					break;
 			}
 
 			// If it's a valid field, add it to the field array.
-			if ( $validfield ) {
-				$cfields[ $fieldname_lowercased ] = $fld;
+			if ($validfield) {
+				$cfields[$fieldname_lowercased] = $fld;
 			}
 		}
 
 		// For every field in the table.
-		foreach ( $tablefields as $tablefield ) {
-			$tablefield_field_lowercased = strtolower( $tablefield->Field );
-			$tablefield_type_lowercased = strtolower( $tablefield->Type );
+		foreach ($tablefields as $tablefield) {
+			$tablefield_field_lowercased = strtolower($tablefield->Field);
+			$tablefield_type_lowercased = strtolower($tablefield->Type);
 
 			// If the table field exists in the field array ...
-			if ( array_key_exists( $tablefield_field_lowercased, $cfields ) ) {
+			if (array_key_exists($tablefield_field_lowercased, $cfields)) {
 
 				// Get the field type from the query.
-				preg_match( '|`?' . $tablefield->Field . '`? ([^ ]*( unsigned)?)|i', $cfields[ $tablefield_field_lowercased ], $matches );
+				preg_match('|`?'.$tablefield->Field.'`? ([^ ]*( unsigned)?)|i', $cfields[$tablefield_field_lowercased], $matches);
 				$fieldtype = $matches[1];
-				$fieldtype_lowercased = strtolower( $fieldtype );
+				$fieldtype_lowercased = strtolower($fieldtype);
 
 				// Is actual field type different from the field type in query?
 				if ($tablefield->Type != $fieldtype) {
 					$do_change = true;
-					if ( in_array( $fieldtype_lowercased, $text_fields ) && in_array( $tablefield_type_lowercased, $text_fields ) ) {
-						if ( array_search( $fieldtype_lowercased, $text_fields ) < array_search( $tablefield_type_lowercased, $text_fields ) ) {
+					if (in_array($fieldtype_lowercased, $text_fields) && in_array($tablefield_type_lowercased, $text_fields)) {
+						if (array_search($fieldtype_lowercased, $text_fields) < array_search($tablefield_type_lowercased, $text_fields)) {
 							$do_change = false;
 						}
 					}
 
-					if ( in_array( $fieldtype_lowercased, $blob_fields ) && in_array( $tablefield_type_lowercased, $blob_fields ) ) {
-						if ( array_search( $fieldtype_lowercased, $blob_fields ) < array_search( $tablefield_type_lowercased, $blob_fields ) ) {
+					if (in_array($fieldtype_lowercased, $blob_fields) && in_array($tablefield_type_lowercased, $blob_fields)) {
+						if (array_search($fieldtype_lowercased, $blob_fields) < array_search($tablefield_type_lowercased, $blob_fields)) {
 							$do_change = false;
 						}
 					}
 
-					if ( $do_change ) {
+					if ($do_change) {
 						// Add a query to change the column type.
-						$cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN `{$tablefield->Field}` " . $cfields[ $tablefield_field_lowercased ];
+						$cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN `{$tablefield->Field}` ".$cfields[$tablefield_field_lowercased];
 						$for_update[$table.'.'.$tablefield->Field] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}";
 					}
 				}
 
 				// Get the default value from the array.
-				if ( preg_match( "| DEFAULT '(.*?)'|i", $cfields[ $tablefield_field_lowercased ], $matches ) ) {
+				if (preg_match("| DEFAULT '(.*?)'|i", $cfields[$tablefield_field_lowercased], $matches)) {
 					$default_value = $matches[1];
 					if ($tablefield->Default != $default_value) {
 						// Add a query to change the column's default value
@@ -2383,7 +2383,7 @@ 
 				}
 
 				// Remove the field from the array (so it's not added).
-				unset( $cfields[ $tablefield_field_lowercased ] );
+				unset($cfields[$tablefield_field_lowercased]);
 			} else {
 				// This field exists in the table, but not in the creation queries?
 			}
@@ -2409,7 +2409,7 @@ 
 				// Add the index to the index data array.
 				$keyname = $tableindex->Key_name;
 				$index_ary[$keyname]['columns'][] = array('fieldname' => $tableindex->Column_name, 'subpart' => $tableindex->Sub_part);
-				$index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0)?true:false;
+				$index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0) ? true : false;
 				$index_ary[$keyname]['index_type'] = $tableindex->Index_type;
 			}
 
@@ -2420,36 +2420,36 @@ 
 				$index_string = '';
 				if ($index_name == 'PRIMARY') {
 					$index_string .= 'PRIMARY ';
-				} elseif ( $index_data['unique'] ) {
+				} elseif ($index_data['unique']) {
 					$index_string .= 'UNIQUE ';
 				}
-				if ( 'FULLTEXT' === strtoupper( $index_data['index_type'] ) ) {
+				if ('FULLTEXT' === strtoupper($index_data['index_type'])) {
 					$index_string .= 'FULLTEXT ';
 				}
-				if ( 'SPATIAL' === strtoupper( $index_data['index_type'] ) ) {
+				if ('SPATIAL' === strtoupper($index_data['index_type'])) {
 					$index_string .= 'SPATIAL ';
 				}
 				$index_string .= 'KEY ';
-				if ( 'PRIMARY' !== $index_name  ) {
-					$index_string .= '`' . $index_name . '`';
+				if ('PRIMARY' !== $index_name) {
+					$index_string .= '`'.$index_name.'`';
 				}
 				$index_columns = '';
 
 				// For each column in the index.
 				foreach ($index_data['columns'] as $column_data) {
-					if ( $index_columns != '' ) {
+					if ($index_columns != '') {
 						$index_columns .= ',';
 					}
 
 					// Add the field to the column list string.
-					$index_columns .= '`' . $column_data['fieldname'] . '`';
+					$index_columns .= '`'.$column_data['fieldname'].'`';
 					if ($column_data['subpart'] != '') {
 						$index_columns .= '('.$column_data['subpart'].')';
 					}
 				}
 
 				// The alternative index string doesn't care about subparts
-				$alt_index_columns = preg_replace( '/\([^)]*\)/', '', $index_columns );
+				$alt_index_columns = preg_replace('/\([^)]*\)/', '', $index_columns);
 
 				// Add the column list to the index create string.
 				$index_strings = array(
@@ -2457,9 +2457,9 @@ 
 					"$index_string ($alt_index_columns)",
 				);
 
-				foreach ( $index_strings as $index_string ) {
-					if ( ! ( ( $aindex = array_search( $index_string, $indices ) ) === false ) ) {
-						unset( $indices[ $aindex ] );
+				foreach ($index_strings as $index_string) {
+					if ( ! (($aindex = array_search($index_string, $indices)) === false)) {
+						unset($indices[$aindex]);
 						break;
 					}
 				}
@@ -2467,14 +2467,14 @@ 
 		}
 
 		// For every remaining index specified for the table.
-		foreach ( (array) $indices as $index ) {
+		foreach ((array) $indices as $index) {
 			// Push a query line into $cqueries that adds the index to that table.
 			$cqueries[] = "ALTER TABLE {$table} ADD $index";
-			$for_update[] = 'Added index ' . $table . ' ' . $index;
+			$for_update[] = 'Added index '.$table.' '.$index;
 		}
 
 		// Remove the original table creation query from processing.
-		unset( $cqueries[ $table ], $for_update[ $table ] );
+		unset($cqueries[$table], $for_update[$table]);
 	}
 
 	$allqueries = array_merge($cqueries, $iqueries);
@@ -2499,8 +2499,8 @@ 
  *
  * @param string $tables Optional. Which set of tables to update. Default is 'all'.
  */
-function make_db_current( $tables = 'all' ) {
-	$alterations = dbDelta( $tables );
+function make_db_current($tables = 'all') {
+	$alterations = dbDelta($tables);
 	echo "<ol>\n";
 	foreach ($alterations as $alteration) echo "<li>$alteration</li>\n";
 	echo "</ol>\n";
@@ -2518,8 +2518,8 @@ 
  *
  * @param string $tables Optional. Which set of tables to update. Default is 'all'.
  */
-function make_db_current_silent( $tables = 'all' ) {
-	dbDelta( $tables );
+function make_db_current_silent($tables = 'all') {
+	dbDelta($tables);
 }
 
 /**
@@ -2535,9 +2535,9 @@ 
  */
 function make_site_theme_from_oldschool($theme_name, $template) {
 	$home_path = get_home_path();
-	$site_dir = WP_CONTENT_DIR . "/themes/$template";
+	$site_dir = WP_CONTENT_DIR."/themes/$template";
 
-	if (! file_exists("$home_path/index.php"))
+	if ( ! file_exists("$home_path/index.php"))
 		return false;
 
 	/*
@@ -2556,7 +2556,7 @@ 
 		if ($oldfile == 'index.php') {
 			$index = implode('', file("$oldpath/$oldfile"));
 			if (strpos($index, 'WP_USE_THEMES') !== false) {
-				if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile"))
+				if ( ! @copy(WP_CONTENT_DIR.'/themes/'.WP_DEFAULT_THEME.'/index.php', "$site_dir/$newfile"))
 					return false;
 
 				// Don't copy anything.
@@ -2564,7 +2564,7 @@ 
 			}
 		}
 
-		if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile"))
+		if ( ! @copy("$oldpath/$oldfile", "$site_dir/$newfile"))
 			return false;
 
 		chmod("$site_dir/$newfile", 0777);
@@ -2576,7 +2576,7 @@ 
 
 			foreach ($lines as $line) {
 				if (preg_match('/require.*wp-blog-header/', $line))
-					$line = '//' . $line;
+					$line = '//'.$line;
 
 				// Update stylesheet references.
 				$line = str_replace("<?php echo __get_option('siteurl'); ?>/wp-layout.css", "<?php bloginfo('stylesheet_url'); ?>", $line);
@@ -2591,7 +2591,7 @@ 
 	}
 
 	// Add a theme header.
-	$header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option('siteurl') . "\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n";
+	$header = "/*\nTheme Name: $theme_name\nTheme URI: ".__get_option('siteurl')."\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n";
 
 	$stylelines = file_get_contents("$site_dir/style.css");
 	if ($stylelines) {
@@ -2617,18 +2617,18 @@ 
  * @return false|void
  */
 function make_site_theme_from_default($theme_name, $template) {
-	$site_dir = WP_CONTENT_DIR . "/themes/$template";
-	$default_dir = WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME;
+	$site_dir = WP_CONTENT_DIR."/themes/$template";
+	$default_dir = WP_CONTENT_DIR.'/themes/'.WP_DEFAULT_THEME;
 
 	// Copy files from the default theme to the site theme.
 	//$files = array('index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css');
 
 	$theme_dir = @ opendir($default_dir);
 	if ($theme_dir) {
-		while(($theme_file = readdir( $theme_dir )) !== false) {
+		while (($theme_file = readdir($theme_dir)) !== false) {
 			if (is_dir("$default_dir/$theme_file"))
 				continue;
-			if (! @copy("$default_dir/$theme_file", "$site_dir/$theme_file"))
+			if ( ! @copy("$default_dir/$theme_file", "$site_dir/$theme_file"))
 				return;
 			chmod("$site_dir/$theme_file", 0777);
 		}
@@ -2641,28 +2641,28 @@ 
 		$f = fopen("$site_dir/style.css", 'w');
 
 		foreach ($stylelines as $line) {
-			if (strpos($line, 'Theme Name:') !== false) $line = 'Theme Name: ' . $theme_name;
-			elseif (strpos($line, 'Theme URI:') !== false) $line = 'Theme URI: ' . __get_option('url');
+			if (strpos($line, 'Theme Name:') !== false) $line = 'Theme Name: '.$theme_name;
+			elseif (strpos($line, 'Theme URI:') !== false) $line = 'Theme URI: '.__get_option('url');
 			elseif (strpos($line, 'Description:') !== false) $line = 'Description: Your theme.';
 			elseif (strpos($line, 'Version:') !== false) $line = 'Version: 1';
 			elseif (strpos($line, 'Author:') !== false) $line = 'Author: You';
-			fwrite($f, $line . "\n");
+			fwrite($f, $line."\n");
 		}
 		fclose($f);
 	}
 
 	// Copy the images.
 	umask(0);
-	if (! mkdir("$site_dir/images", 0777)) {
+	if ( ! mkdir("$site_dir/images", 0777)) {
 		return false;
 	}
 
 	$images_dir = @ opendir("$default_dir/images");
 	if ($images_dir) {
-		while(($image = readdir($images_dir)) !== false) {
+		while (($image = readdir($images_dir)) !== false) {
 			if (is_dir("$default_dir/images/$image"))
 				continue;
-			if (! @copy("$default_dir/images/$image", "$site_dir/images/$image"))
+			if ( ! @copy("$default_dir/images/$image", "$site_dir/images/$image"))
 				return;
 			chmod("$site_dir/images/$image", 0777);
 		}
@@ -2683,30 +2683,30 @@ 
 	// Name the theme after the blog.
 	$theme_name = __get_option('blogname');
 	$template = sanitize_title($theme_name);
-	$site_dir = WP_CONTENT_DIR . "/themes/$template";
+	$site_dir = WP_CONTENT_DIR."/themes/$template";
 
 	// If the theme already exists, nothing to do.
-	if ( is_dir($site_dir)) {
+	if (is_dir($site_dir)) {
 		return false;
 	}
 
 	// We must be able to write to the themes dir.
-	if (! is_writable(WP_CONTENT_DIR . "/themes")) {
+	if ( ! is_writable(WP_CONTENT_DIR."/themes")) {
 		return false;
 	}
 
 	umask(0);
-	if (! mkdir($site_dir, 0777)) {
+	if ( ! mkdir($site_dir, 0777)) {
 		return false;
 	}
 
-	if (file_exists(ABSPATH . 'wp-layout.css')) {
-		if (! make_site_theme_from_oldschool($theme_name, $template)) {
+	if (file_exists(ABSPATH.'wp-layout.css')) {
+		if ( ! make_site_theme_from_oldschool($theme_name, $template)) {
 			// TODO: rm -rf the site theme directory.
 			return false;
 		}
 	} else {
-		if (! make_site_theme_from_default($theme_name, $template))
+		if ( ! make_site_theme_from_default($theme_name, $template))
 			// TODO: rm -rf the site theme directory.
 			return false;
 	}
@@ -2759,8 +2759,8 @@ 
 function wp_check_mysql_version() {
 	global $wpdb;
 	$result = $wpdb->check_database_version();
-	if ( is_wp_error( $result ) )
-		die( $result->get_error_message() );
+	if (is_wp_error($result))
+		die($result->get_error_message());
 }
 
 /**
@@ -2769,12 +2769,12 @@ 
  * @since 2.2.0
  */
 function maybe_disable_automattic_widgets() {
-	$plugins = __get_option( 'active_plugins' );
+	$plugins = __get_option('active_plugins');
 
-	foreach ( (array) $plugins as $plugin ) {
-		if ( basename( $plugin ) == 'widgets.php' ) {
-			array_splice( $plugins, array_search( $plugin, $plugins ), 1 );
-			update_option( 'active_plugins', $plugins );
+	foreach ((array) $plugins as $plugin) {
+		if (basename($plugin) == 'widgets.php') {
+			array_splice($plugins, array_search($plugin, $plugins), 1);
+			update_option('active_plugins', $plugins);
 			break;
 		}
 	}
@@ -2791,8 +2791,8 @@ 
 function maybe_disable_link_manager() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 0 );
+	if ($wp_current_db_version >= 22006 && get_option('link_manager_enabled') && ! $wpdb->get_var("SELECT link_id FROM $wpdb->links LIMIT 1"))
+		update_option('link_manager_enabled', 0);
 }
 
 /**
@@ -2807,7 +2807,7 @@ 
 	global $wp_current_db_version, $wpdb;
 
 	// Upgrade versions prior to 2.9
-	if ( $wp_current_db_version < 11557 ) {
+	if ($wp_current_db_version < 11557) {
 		// Delete duplicate options. Keep the option with the highest option_id.
 		$wpdb->query("DELETE o1 FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 USING (`option_name`) WHERE o2.option_id > o1.option_id");
 
@@ -2819,40 +2819,40 @@ 
 	}
 
 	// Multisite schema upgrades.
-	if ( $wp_current_db_version < 25448 && is_multisite() && wp_should_upgrade_global_tables() ) {
+	if ($wp_current_db_version < 25448 && is_multisite() && wp_should_upgrade_global_tables()) {
 
 		// Upgrade verions prior to 3.7
-		if ( $wp_current_db_version < 25179 ) {
+		if ($wp_current_db_version < 25179) {
 			// New primary key for signups.
-			$wpdb->query( "ALTER TABLE $wpdb->signups ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST" );
-			$wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain" );
+			$wpdb->query("ALTER TABLE $wpdb->signups ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST");
+			$wpdb->query("ALTER TABLE $wpdb->signups DROP INDEX domain");
 		}
 
-		if ( $wp_current_db_version < 25448 ) {
+		if ($wp_current_db_version < 25448) {
 			// Convert archived from enum to tinyint.
-			$wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived varchar(1) NOT NULL default '0'" );
-			$wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived tinyint(2) NOT NULL default 0" );
+			$wpdb->query("ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived varchar(1) NOT NULL default '0'");
+			$wpdb->query("ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived tinyint(2) NOT NULL default 0");
 		}
 	}
 
 	// Upgrade versions prior to 4.2.
-	if ( $wp_current_db_version < 31351 ) {
-		if ( ! is_multisite() && wp_should_upgrade_global_tables() ) {
-			$wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
+	if ($wp_current_db_version < 31351) {
+		if ( ! is_multisite() && wp_should_upgrade_global_tables()) {
+			$wpdb->query("ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
 		}
-		$wpdb->query( "ALTER TABLE $wpdb->terms DROP INDEX slug, ADD INDEX slug(slug(191))" );
-		$wpdb->query( "ALTER TABLE $wpdb->terms DROP INDEX name, ADD INDEX name(name(191))" );
-		$wpdb->query( "ALTER TABLE $wpdb->commentmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-		$wpdb->query( "ALTER TABLE $wpdb->postmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-		$wpdb->query( "ALTER TABLE $wpdb->posts DROP INDEX post_name, ADD INDEX post_name(post_name(191))" );
+		$wpdb->query("ALTER TABLE $wpdb->terms DROP INDEX slug, ADD INDEX slug(slug(191))");
+		$wpdb->query("ALTER TABLE $wpdb->terms DROP INDEX name, ADD INDEX name(name(191))");
+		$wpdb->query("ALTER TABLE $wpdb->commentmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+		$wpdb->query("ALTER TABLE $wpdb->postmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+		$wpdb->query("ALTER TABLE $wpdb->posts DROP INDEX post_name, ADD INDEX post_name(post_name(191))");
 	}
 
 	// Upgrade versions prior to 4.4.
-	if ( $wp_current_db_version < 34978 ) {
+	if ($wp_current_db_version < 34978) {
 		// If compatible termmeta table is found, use it, but enforce a proper index and update collation.
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->termmeta}'" ) && $wpdb->get_results( "SHOW INDEX FROM {$wpdb->termmeta} WHERE Column_name = 'meta_key'" ) ) {
-			$wpdb->query( "ALTER TABLE $wpdb->termmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-			maybe_convert_table_to_utf8mb4( $wpdb->termmeta );
+		if ($wpdb->get_var("SHOW TABLES LIKE '{$wpdb->termmeta}'") && $wpdb->get_results("SHOW INDEX FROM {$wpdb->termmeta} WHERE Column_name = 'meta_key'")) {
+			$wpdb->query("ALTER TABLE $wpdb->termmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+			maybe_convert_table_to_utf8mb4($wpdb->termmeta);
 		}
 	}
 }
@@ -2865,7 +2865,7 @@ 
  * @global wpdb   $wpdb
  * @global string $charset_collate
  */
-if ( !function_exists( 'install_global_terms' ) ) :
+if ( ! function_exists('install_global_terms')) :
 function install_global_terms() {
 	global $wpdb, $charset_collate;
 	$ms_queries = "
@@ -2880,7 +2880,7 @@ 
 ) $charset_collate;
 ";
 // now create tables
-	dbDelta( $ms_queries );
+	dbDelta($ms_queries);
 }
 endif;
 
@@ -2905,7 +2905,7 @@ 
 function wp_should_upgrade_global_tables() {
 
 	// Return false early if explicitly not upgrading
-	if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
+	if (defined('DO_NOT_UPGRADE_GLOBAL_TABLES')) {
 		return false;
 	}
 
@@ -2913,12 +2913,12 @@ 
 	$should_upgrade = true;
 
 	// Set to false if not on main network (does not matter if not multi-network)
-	if ( ! is_main_network() ) {
+	if ( ! is_main_network()) {
 		$should_upgrade = false;
 	}
 
 	// Set to false if not on main site of current network (does not matter if not multi-site)
-	if ( ! is_main_site() ) {
+	if ( ! is_main_site()) {
 		$should_upgrade = false;
 	}
 
@@ -2927,5 +2927,5 @@ 
 	 *
 	 * @param bool $should_upgrade Whether to run the upgrade routines on global tables.
 	 */
-	return apply_filters( 'wp_should_upgrade_global_tables', $should_upgrade );
+	return apply_filters('wp_should_upgrade_global_tables', $should_upgrade);
 }

Braces +368 added lines, -238 removed lines

@@ -9,8 +9,9 @@ 
  */
 
 /** Include user install customize script. */
-if ( file_exists(WP_CONTENT_DIR . '/install.php') )
+if ( file_exists(WP_CONTENT_DIR . '/install.php') ) {
 	require (WP_CONTENT_DIR . '/install.php');
+}
 
 /** WordPress Administration API */
 require_once(ABSPATH . 'wp-admin/includes/admin.php');
@@ -37,8 +38,9 @@ 
  * @return array Array keys 'url', 'user_id', 'password', and 'password_message'.
  */
 function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.6.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.6.0' );
+	}
 
 	wp_check_mysql_version();
 	wp_cache_flush();
@@ -59,8 +61,9 @@ 
 	update_option('siteurl', $guessurl);
 
 	// If not a public blog, don't ping.
-	if ( ! $public )
-		update_option('default_pingback_flag', 0);
+	if ( ! $public ) {
+			update_option('default_pingback_flag', 0);
+	}
 
 	/*
 	 * Create default user. If the user already exists, the user tables are
@@ -223,8 +226,9 @@ 
 <blockquote>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</blockquote>
 
 As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url() );
-	if ( is_multisite() )
-		$first_page = get_site_option( 'first_page', $first_page );
+	if ( is_multisite() ) {
+			$first_page = get_site_option( 'first_page', $first_page );
+	}
 	$first_post_guid = get_option('home') . '/?page_id=2';
 	$wpdb->insert( $wpdb->posts, array(
 		'post_author' => $user_id,
@@ -255,10 +259,11 @@ 
 	update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
 	update_option( 'sidebars_widgets', array ( 'wp_inactive_widgets' => array (), 'sidebar-1' => array ( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2', ), 'array_version' => 3 ) );
 
-	if ( ! is_multisite() )
-		update_user_meta( $user_id, 'show_welcome_panel', 1 );
-	elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) )
-		update_user_meta( $user_id, 'show_welcome_panel', 2 );
+	if ( ! is_multisite() ) {
+			update_user_meta( $user_id, 'show_welcome_panel', 1 );
+	} elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) ) {
+			update_user_meta( $user_id, 'show_welcome_panel', 2 );
+	}
 
 	if ( is_multisite() ) {
 		// Flush rules to pick up the new page.
@@ -273,8 +278,9 @@ 
 		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'capabilities') );
 
 		// Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.) TODO: Get previous_blog_id.
-		if ( !is_super_admin( $user_id ) && $user_id != 1 )
-			$wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
+		if ( !is_super_admin( $user_id ) && $user_id != 1 ) {
+					$wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
+		}
 	}
 }
 endif;
@@ -411,26 +417,30 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
-		return;
+	if ( $wp_db_version == $wp_current_db_version ) {
+			return;
+	}
 
-	if ( ! is_blog_installed() )
-		return;
+	if ( ! is_blog_installed() ) {
+			return;
+	}
 
 	wp_check_mysql_version();
 	wp_cache_flush();
 	pre_schema_upgrade();
 	make_db_current_silent();
 	upgrade_all();
-	if ( is_multisite() && is_main_site() )
-		upgrade_network();
+	if ( is_multisite() && is_main_site() ) {
+			upgrade_network();
+	}
 	wp_cache_flush();
 
 	if ( is_multisite() ) {
-		if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) )
-			$wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
-		else
-			$wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+		if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) ) {
+					$wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
+		} else {
+					$wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+		}
 	}
 
 	/**
@@ -462,8 +472,9 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
-		return;
+	if ( $wp_db_version == $wp_current_db_version ) {
+			return;
+	}
 
 	// If the version is not set in the DB, try to guess the version.
 	if ( empty($wp_current_db_version) ) {
@@ -471,12 +482,14 @@ 
 
 		// If the template option exists, we have 1.5.
 		$template = __get_option('template');
-		if ( !empty($template) )
-			$wp_current_db_version = 2541;
+		if ( !empty($template) ) {
+					$wp_current_db_version = 2541;
+		}
 	}
 
-	if ( $wp_current_db_version < 6039 )
-		upgrade_230_options_table();
+	if ( $wp_current_db_version < 6039 ) {
+			upgrade_230_options_table();
+	}
 
 	populate_options();
 
@@ -487,77 +500,101 @@ 
 		upgrade_130();
 	}
 
-	if ( $wp_current_db_version < 3308 )
-		upgrade_160();
+	if ( $wp_current_db_version < 3308 ) {
+			upgrade_160();
+	}
 
-	if ( $wp_current_db_version < 4772 )
-		upgrade_210();
+	if ( $wp_current_db_version < 4772 ) {
+			upgrade_210();
+	}
 
-	if ( $wp_current_db_version < 4351 )
-		upgrade_old_slugs();
+	if ( $wp_current_db_version < 4351 ) {
+			upgrade_old_slugs();
+	}
 
-	if ( $wp_current_db_version < 5539 )
-		upgrade_230();
+	if ( $wp_current_db_version < 5539 ) {
+			upgrade_230();
+	}
 
-	if ( $wp_current_db_version < 6124 )
-		upgrade_230_old_tables();
+	if ( $wp_current_db_version < 6124 ) {
+			upgrade_230_old_tables();
+	}
 
-	if ( $wp_current_db_version < 7499 )
-		upgrade_250();
+	if ( $wp_current_db_version < 7499 ) {
+			upgrade_250();
+	}
 
-	if ( $wp_current_db_version < 7935 )
-		upgrade_252();
+	if ( $wp_current_db_version < 7935 ) {
+			upgrade_252();
+	}
 
-	if ( $wp_current_db_version < 8201 )
-		upgrade_260();
+	if ( $wp_current_db_version < 8201 ) {
+			upgrade_260();
+	}
 
-	if ( $wp_current_db_version < 8989 )
-		upgrade_270();
+	if ( $wp_current_db_version < 8989 ) {
+			upgrade_270();
+	}
 
-	if ( $wp_current_db_version < 10360 )
-		upgrade_280();
+	if ( $wp_current_db_version < 10360 ) {
+			upgrade_280();
+	}
 
-	if ( $wp_current_db_version < 11958 )
-		upgrade_290();
+	if ( $wp_current_db_version < 11958 ) {
+			upgrade_290();
+	}
 
-	if ( $wp_current_db_version < 15260 )
-		upgrade_300();
+	if ( $wp_current_db_version < 15260 ) {
+			upgrade_300();
+	}
 
-	if ( $wp_current_db_version < 19389 )
-		upgrade_330();
+	if ( $wp_current_db_version < 19389 ) {
+			upgrade_330();
+	}
 
-	if ( $wp_current_db_version < 20080 )
-		upgrade_340();
+	if ( $wp_current_db_version < 20080 ) {
+			upgrade_340();
+	}
 
-	if ( $wp_current_db_version < 22422 )
-		upgrade_350();
+	if ( $wp_current_db_version < 22422 ) {
+			upgrade_350();
+	}
 
-	if ( $wp_current_db_version < 25824 )
-		upgrade_370();
+	if ( $wp_current_db_version < 25824 ) {
+			upgrade_370();
+	}
 
-	if ( $wp_current_db_version < 26148 )
-		upgrade_372();
+	if ( $wp_current_db_version < 26148 ) {
+			upgrade_372();
+	}
 
-	if ( $wp_current_db_version < 26691 )
-		upgrade_380();
+	if ( $wp_current_db_version < 26691 ) {
+			upgrade_380();
+	}
 
-	if ( $wp_current_db_version < 29630 )
-		upgrade_400();
+	if ( $wp_current_db_version < 29630 ) {
+			upgrade_400();
+	}
 
-	if ( $wp_current_db_version < 33055 )
-		upgrade_430();
+	if ( $wp_current_db_version < 33055 ) {
+			upgrade_430();
+	}
 
-	if ( $wp_current_db_version < 33056 )
-		upgrade_431();
+	if ( $wp_current_db_version < 33056 ) {
+			upgrade_431();
+	}
 
-	if ( $wp_current_db_version < 35700 )
-		upgrade_440();
+	if ( $wp_current_db_version < 35700 ) {
+			upgrade_440();
+	}
 
-	if ( $wp_current_db_version < 36686 )
-		upgrade_450();
+	if ( $wp_current_db_version < 36686 ) {
+			upgrade_450();
+	}
 
-	if ( $wp_current_db_version < 37965 )
-		upgrade_460();
+	if ( $wp_current_db_version < 37965 ) {
+			upgrade_460();
+	}
 
 	maybe_disable_link_manager();
 
@@ -610,8 +647,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");
@@ -728,10 +767,11 @@ 
 			$post_content = addslashes(deslash($post->post_content));
 			$post_title = addslashes(deslash($post->post_title));
 			$post_excerpt = addslashes(deslash($post->post_excerpt));
-			if ( empty($post->guid) )
-				$guid = get_permalink($post->ID);
-			else
-				$guid = $post->guid;
+			if ( empty($post->guid) ) {
+							$guid = get_permalink($post->ID);
+			} else {
+							$guid = $post->guid;
+			}
 
 			$wpdb->update( $wpdb->posts, compact('post_title', 'post_content', 'post_excerpt', 'guid'), array('ID' => $post->ID) );
 
@@ -813,34 +853,57 @@ 
 
 	$users = $wpdb->get_results("SELECT * FROM $wpdb->users");
 	foreach ( $users as $user ) :
-		if ( !empty( $user->user_firstname ) )
-			update_user_meta( $user->ID, 'first_name', wp_slash($user->user_firstname) );
-		if ( !empty( $user->user_lastname ) )
-			update_user_meta( $user->ID, 'last_name', wp_slash($user->user_lastname) );
-		if ( !empty( $user->user_nickname ) )
-			update_user_meta( $user->ID, 'nickname', wp_slash($user->user_nickname) );
-		if ( !empty( $user->user_level ) )
-			update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
-		if ( !empty( $user->user_icq ) )
-			update_user_meta( $user->ID, 'icq', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_aim ) )
-			update_user_meta( $user->ID, 'aim', wp_slash($user->user_aim) );
-		if ( !empty( $user->user_msn ) )
-			update_user_meta( $user->ID, 'msn', wp_slash($user->user_msn) );
-		if ( !empty( $user->user_yim ) )
-			update_user_meta( $user->ID, 'yim', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_description ) )
-			update_user_meta( $user->ID, 'description', wp_slash($user->user_description) );
+		if ( !empty( $user->user_firstname ) ) {
+					update_user_meta( $user->ID, 'first_name', wp_slash($user->user_firstname) );
+		}
+		if ( !empty( $user->user_lastname ) ) {
+					update_user_meta( $user->ID, 'last_name', wp_slash($user->user_lastname) );
+		}
+		if ( !empty( $user->user_nickname ) ) {
+					update_user_meta( $user->ID, 'nickname', wp_slash($user->user_nickname) );
+		}
+		if ( !empty( $user->user_level ) ) {
+					update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
+		}
+		if ( !empty( $user->user_icq ) ) {
+					update_user_meta( $user->ID, 'icq', wp_slash($user->user_icq) );
+		}
+		if ( !empty( $user->user_aim ) ) {
+					update_user_meta( $user->ID, 'aim', wp_slash($user->user_aim) );
+		}
+		if ( !empty( $user->user_msn ) ) {
+					update_user_meta( $user->ID, 'msn', wp_slash($user->user_msn) );
+		}
+		if ( !empty( $user->user_yim ) ) {
+					update_user_meta( $user->ID, 'yim', wp_slash($user->user_icq) );
+		}
+		if ( !empty( $user->user_description ) ) {
+					update_user_meta( $user->ID, 'description', wp_slash($user->user_description) );
+		}
 
 		if ( isset( $user->user_idmode ) ):
 			$idmode = $user->user_idmode;
-			if ($idmode == 'nickname') $id = $user->user_nickname;
-			if ($idmode == 'login') $id = $user->user_login;
-			if ($idmode == 'firstname') $id = $user->user_firstname;
-			if ($idmode == 'lastname') $id = $user->user_lastname;
-			if ($idmode == 'namefl') $id = $user->user_firstname.' '.$user->user_lastname;
-			if ($idmode == 'namelf') $id = $user->user_lastname.' '.$user->user_firstname;
-			if (!$idmode) $id = $user->user_nickname;
+			if ($idmode == 'nickname') {
+				$id = $user->user_nickname;
+			}
+			if ($idmode == 'login') {
+				$id = $user->user_login;
+			}
+			if ($idmode == 'firstname') {
+				$id = $user->user_firstname;
+			}
+			if ($idmode == 'lastname') {
+				$id = $user->user_lastname;
+			}
+			if ($idmode == 'namefl') {
+				$id = $user->user_firstname.' '.$user->user_lastname;
+			}
+			if ($idmode == 'namelf') {
+				$id = $user->user_lastname.' '.$user->user_firstname;
+			}
+			if (!$idmode) {
+				$id = $user->user_nickname;
+			}
 			$wpdb->update( $wpdb->users, array('display_name' => $id), array('ID' => $user->ID) );
 		endif;
 
@@ -855,15 +918,17 @@ 
 	endforeach;
 	$old_user_fields = array( 'user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level' );
 	$wpdb->hide_errors();
-	foreach ( $old_user_fields as $old )
-		$wpdb->query("ALTER TABLE $wpdb->users DROP $old");
+	foreach ( $old_user_fields as $old ) {
+			$wpdb->query("ALTER TABLE $wpdb->users DROP $old");
+	}
 	$wpdb->show_errors();
 
 	// Populate comment_count field of posts table.
 	$comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
-	if ( is_array( $comments ) )
-		foreach ($comments as $comment)
+	if ( is_array( $comments ) ) {
+			foreach ($comments as $comment)
 			$wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) );
+	}
 
 	/*
 	 * Some alpha versions used a post status of object instead of attachment
@@ -878,8 +943,9 @@ 
 										 array( 'ID' => $object->ID ) );
 
 			$meta = get_post_meta($object->ID, 'imagedata', true);
-			if ( ! empty($meta['file']) )
-				update_attached_file( $object->ID, $meta['file'] );
+			if ( ! empty($meta['file']) ) {
+							update_attached_file( $object->ID, $meta['file'] );
+			}
 		}
 	}
 }
@@ -900,8 +966,10 @@ 
 		// Update status and type.
 		$posts = $wpdb->get_results("SELECT ID, post_status FROM $wpdb->posts");
 
-		if ( ! empty($posts) ) foreach ($posts as $post) {
+		if ( ! empty($posts) ) {
+			foreach ($posts as $post) {
 			$status = $post->post_status;
+		}
 			$type = 'post';
 
 			if ( 'static' == $status ) {
@@ -926,9 +994,10 @@ 
 		$wpdb->query ("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
 
 		$posts = $wpdb->get_results("SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'");
-		if ( !empty($posts) )
-			foreach ( $posts as $post )
+		if ( !empty($posts) ) {
+					foreach ( $posts as $post )
 				wp_schedule_single_event(mysql2date('U', $post->post_date, false), 'publish_future_post', array($post->ID));
+		}
 	}
 }
 
@@ -1014,19 +1083,22 @@ 
 	}
 
 	$select = 'post_id, category_id';
-	if ( $have_tags )
-		$select .= ', rel_type';
+	if ( $have_tags ) {
+			$select .= ', rel_type';
+	}
 
 	$posts = $wpdb->get_results("SELECT $select FROM $wpdb->post2cat GROUP BY post_id, category_id");
 	foreach ( $posts as $post ) {
 		$post_id = (int) $post->post_id;
 		$term_id = (int) $post->category_id;
 		$taxonomy = 'category';
-		if ( !empty($post->rel_type) && 'tag' == $post->rel_type)
-			$taxonomy = 'tag';
+		if ( !empty($post->rel_type) && 'tag' == $post->rel_type) {
+					$taxonomy = 'tag';
+		}
 		$tt_id = $tt_ids[$term_id][$taxonomy];
-		if ( empty($tt_id) )
-			continue;
+		if ( empty($tt_id) ) {
+					continue;
+		}
 
 		$wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) );
 	}
@@ -1068,15 +1140,19 @@ 
 
 		// Associate links to cats.
 		$links = $wpdb->get_results("SELECT link_id, link_category FROM $wpdb->links");
-		if ( !empty($links) ) foreach ( $links as $link ) {
+		if ( !empty($links) ) {
+			foreach ( $links as $link ) {
 			if ( 0 == $link->link_category )
 				continue;
-			if ( ! isset($link_cat_id_map[$link->link_category]) )
-				continue;
+		}
+			if ( ! isset($link_cat_id_map[$link->link_category]) ) {
+							continue;
+			}
 			$term_id = $link_cat_id_map[$link->link_category];
 			$tt_id = $tt_ids[$term_id];
-			if ( empty($tt_id) )
-				continue;
+			if ( empty($tt_id) ) {
+							continue;
+			}
 
 			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link->link_id, 'term_taxonomy_id' => $tt_id) );
 		}
@@ -1090,8 +1166,9 @@ 
 			$term_id = (int) $link->category_id;
 			$taxonomy = 'link_category';
 			$tt_id = $tt_ids[$term_id][$taxonomy];
-			if ( empty($tt_id) )
-				continue;
+			if ( empty($tt_id) ) {
+							continue;
+			}
 			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link_id, 'term_taxonomy_id' => $tt_id) );
 		}
 	}
@@ -1104,10 +1181,11 @@ 
 	// Recalculate all counts
 	$terms = $wpdb->get_results("SELECT term_taxonomy_id, taxonomy FROM $wpdb->term_taxonomy");
 	foreach ( (array) $terms as $term ) {
-		if ( ('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy) )
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id) );
-		else
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id) );
+		if ( ('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy) ) {
+					$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id) );
+		} else {
+					$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id) );
+		}
 		$wpdb->update( $wpdb->term_taxonomy, array('count' => $count), array('term_taxonomy_id' => $term->term_taxonomy_id) );
 	}
 }
@@ -1124,8 +1202,9 @@ 
 	global $wpdb;
 	$old_options_fields = array( 'option_can_override', 'option_type', 'option_width', 'option_height', 'option_description', 'option_admin_level' );
 	$wpdb->hide_errors();
-	foreach ( $old_options_fields as $old )
-		$wpdb->query("ALTER TABLE $wpdb->options DROP $old");
+	foreach ( $old_options_fields as $old ) {
+			$wpdb->query("ALTER TABLE $wpdb->options DROP $old");
+	}
 	$wpdb->show_errors();
 }
 
@@ -1200,9 +1279,10 @@ 
 function upgrade_260() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8000 )
-		populate_roles_260();
-}
+	if ( $wp_current_db_version < 8000 ) {
+			populate_roles_260();
+	}
+	}
 
 /**
  * Execute changes made in WordPress 2.7.
@@ -1216,13 +1296,15 @@ 
 function upgrade_270() {
 	global $wpdb, $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8980 )
-		populate_roles_270();
+	if ( $wp_current_db_version < 8980 ) {
+			populate_roles_270();
+	}
 
 	// Update post_date for unpublished posts with empty timestamp
-	if ( $wp_current_db_version < 8921 )
-		$wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" );
-}
+	if ( $wp_current_db_version < 8921 ) {
+			$wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 2.8.
@@ -1236,15 +1318,17 @@ 
 function upgrade_280() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 10360 )
-		populate_roles_280();
+	if ( $wp_current_db_version < 10360 ) {
+			populate_roles_280();
+	}
 	if ( is_multisite() ) {
 		$start = 0;
 		while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
 			foreach ( $rows as $row ) {
 				$value = $row->option_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
+				if ( !@unserialize( $value ) ) {
+									$value = stripslashes( $value );
+				}
 				if ( $value !== $row->option_value ) {
 					update_option( $row->option_name, $value );
 				}
@@ -1287,11 +1371,13 @@ 
 function upgrade_300() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 15093 )
-		populate_roles_300();
+	if ( $wp_current_db_version < 15093 ) {
+			populate_roles_300();
+	}
 
-	if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
-		add_site_option( 'siteurl', '' );
+	if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false ) {
+			add_site_option( 'siteurl', '' );
+	}
 
 	// 3.0 screen options key name changes.
 	if ( wp_should_upgrade_global_tables() ) {
@@ -1339,23 +1425,26 @@ 
 		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" );
 	}
 
-	if ( $wp_current_db_version >= 11548 )
-		return;
+	if ( $wp_current_db_version >= 11548 ) {
+			return;
+	}
 
 	$sidebars_widgets = get_option( 'sidebars_widgets', array() );
 	$_sidebars_widgets = array();
 
-	if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) )
-		$sidebars_widgets['array_version'] = 3;
-	elseif ( !isset($sidebars_widgets['array_version']) )
-		$sidebars_widgets['array_version'] = 1;
+	if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) ) {
+			$sidebars_widgets['array_version'] = 3;
+	} elseif ( !isset($sidebars_widgets['array_version']) ) {
+			$sidebars_widgets['array_version'] = 1;
+	}
 
 	switch ( $sidebars_widgets['array_version'] ) {
 		case 1 :
-			foreach ( (array) $sidebars_widgets as $index => $sidebar )
-			if ( is_array($sidebar) )
+			foreach ( (array) $sidebars_widgets as $index => $sidebar ) {
+						if ( is_array($sidebar) )
 			foreach ( (array) $sidebar as $i => $name ) {
 				$id = strtolower($name);
+			}
 				if ( isset($wp_registered_widgets[$id]) ) {
 					$_sidebars_widgets[$index][$i] = $id;
 					continue;
@@ -1380,8 +1469,9 @@ 
 					}
 				}
 
-				if ( $found )
-					continue;
+				if ( $found ) {
+									continue;
+				}
 
 				unset($_sidebars_widgets[$index][$i]);
 			}
@@ -1445,14 +1535,17 @@ 
 function upgrade_350() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options()
+	if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) {
+			update_option( 'link_manager_enabled', 1 );
+	}
+	// Previously set to 0 by populate_options()
 
 	if ( $wp_current_db_version < 21811 && wp_should_upgrade_global_tables() ) {
 		$meta_keys = array();
 		foreach ( array_merge( get_post_types(), get_taxonomies() ) as $name ) {
-			if ( false !== strpos( $name, '-' ) )
-			$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+			if ( false !== strpos( $name, '-' ) ) {
+						$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+			}
 		}
 		if ( $meta_keys ) {
 			$meta_keys = implode( "', '", $meta_keys );
@@ -1460,9 +1553,10 @@ 
 		}
 	}
 
-	if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) )
-		wp_delete_term( $term->term_id, 'post_format' );
-}
+	if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) ) {
+			wp_delete_term( $term->term_id, 'post_format' );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 3.7.
@@ -1474,9 +1568,10 @@ 
  */
 function upgrade_370() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 25824 )
-		wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' );
-}
+	if ( $wp_current_db_version < 25824 ) {
+			wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 3.7.2.
@@ -1489,9 +1584,10 @@ 
  */
 function upgrade_372() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 26148 )
-		wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
-}
+	if ( $wp_current_db_version < 26148 ) {
+			wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 3.8.0.
@@ -1758,10 +1854,11 @@ 
 		$wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
 		$active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
 		if ( $wpmu_sitewide_plugins ) {
-			if ( !$active_sitewide_plugins )
-				$sitewide_plugins = (array) $wpmu_sitewide_plugins;
-			else
-				$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
+			if ( !$active_sitewide_plugins ) {
+							$sitewide_plugins = (array) $wpmu_sitewide_plugins;
+			} else {
+							$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
+			}
 
 			update_site_option( 'active_sitewide_plugins', $sitewide_plugins );
 		}
@@ -1772,8 +1869,9 @@ 
 		while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
 			foreach ( $rows as $row ) {
 				$value = $row->meta_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
+				if ( !@unserialize( $value ) ) {
+									$value = stripslashes( $value );
+				}
 				if ( $value !== $row->meta_value ) {
 					update_site_option( $row->meta_key, $value );
 				}
@@ -1783,16 +1881,19 @@ 
 	}
 
 	// 3.0
-	if ( $wp_current_db_version < 13576 )
-		update_site_option( 'global_terms_enabled', '1' );
+	if ( $wp_current_db_version < 13576 ) {
+			update_site_option( 'global_terms_enabled', '1' );
+	}
 
 	// 3.3
-	if ( $wp_current_db_version < 19390 )
-		update_site_option( 'initial_db_version', $wp_current_db_version );
+	if ( $wp_current_db_version < 19390 ) {
+			update_site_option( 'initial_db_version', $wp_current_db_version );
+	}
 
 	if ( $wp_current_db_version < 19470 ) {
-		if ( false === get_site_option( 'active_sitewide_plugins' ) )
-			update_site_option( 'active_sitewide_plugins', array() );
+		if ( false === get_site_option( 'active_sitewide_plugins' ) ) {
+					update_site_option( 'active_sitewide_plugins', array() );
+		}
 	}
 
 	// 3.4
@@ -1804,8 +1905,9 @@ 
 			$converted = array();
 			$themes = wp_get_themes();
 			foreach ( $themes as $stylesheet => $theme_data ) {
-				if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) )
-					$converted[ $stylesheet ] = true;
+				if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) ) {
+									$converted[ $stylesheet ] = true;
+				}
 			}
 			update_site_option( 'allowedthemes', $converted );
 			delete_site_option( 'allowed_themes' );
@@ -1813,8 +1915,9 @@ 
 	}
 
 	// 3.5
-	if ( $wp_current_db_version < 21823 )
-		update_site_option( 'ms_files_rewriting', '1' );
+	if ( $wp_current_db_version < 21823 ) {
+			update_site_option( 'ms_files_rewriting', '1' );
+	}
 
 	// 3.5.2
 	if ( $wp_current_db_version < 24448 ) {
@@ -2045,8 +2148,9 @@ 
 	$all_options = new stdClass;
 	if ( $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" ) ) {
 		foreach ( $options as $option ) {
-			if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name )
-				$option->option_value = untrailingslashit( $option->option_value );
+			if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name ) {
+							$option->option_value = untrailingslashit( $option->option_value );
+			}
 			$all_options->{$option->option_name} = stripslashes( $option->option_value );
 		}
 	}
@@ -2068,19 +2172,23 @@ 
 function __get_option($setting) {
 	global $wpdb;
 
-	if ( $setting == 'home' && defined( 'WP_HOME' ) )
-		return untrailingslashit( WP_HOME );
+	if ( $setting == 'home' && defined( 'WP_HOME' ) ) {
+			return untrailingslashit( WP_HOME );
+	}
 
-	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) )
-		return untrailingslashit( WP_SITEURL );
+	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) ) {
+			return untrailingslashit( WP_SITEURL );
+	}
 
 	$option = $wpdb->get_var( $wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
 
-	if ( 'home' == $setting && '' == $option )
-		return __get_option( 'siteurl' );
+	if ( 'home' == $setting && '' == $option ) {
+			return __get_option( 'siteurl' );
+	}
 
-	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting )
-		$option = untrailingslashit( $option );
+	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting ) {
+			$option = untrailingslashit( $option );
+	}
 
 	return maybe_unserialize( $option );
 }
@@ -2133,8 +2241,9 @@ 
 function dbDelta( $queries = '', $execute = true ) {
 	global $wpdb;
 
-	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) )
-	    $queries = wp_get_db_schema( $queries );
+	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) ) {
+		    $queries = wp_get_db_schema( $queries );
+	}
 
 	// Separate individual queries into an array
 	if ( !is_array($queries) ) {
@@ -2209,8 +2318,9 @@ 
 		$tablefields = $wpdb->get_results("DESCRIBE {$table};");
 		$wpdb->suppress_errors( $suppress );
 
-		if ( ! $tablefields )
-			continue;
+		if ( ! $tablefields ) {
+					continue;
+		}
 
 		// Clear the field and index arrays.
 		$cfields = $indices = array();
@@ -2502,7 +2612,9 @@ 
 function make_db_current( $tables = 'all' ) {
 	$alterations = dbDelta( $tables );
 	echo "<ol>\n";
-	foreach ($alterations as $alteration) echo "<li>$alteration</li>\n";
+	foreach ($alterations as $alteration) {
+		echo "<li>$alteration</li>\n";
+	}
 	echo "</ol>\n";
 }
 
@@ -2537,8 +2649,9 @@ 
 	$home_path = get_home_path();
 	$site_dir = WP_CONTENT_DIR . "/themes/$template";
 
-	if (! file_exists("$home_path/index.php"))
-		return false;
+	if (! file_exists("$home_path/index.php")) {
+			return false;
+	}
 
 	/*
 	 * Copy files from the old locations to the site theme.
@@ -2547,25 +2660,28 @@ 
 	$files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php');
 
 	foreach ($files as $oldfile => $newfile) {
-		if ($oldfile == 'index.php')
-			$oldpath = $home_path;
-		else
-			$oldpath = ABSPATH;
+		if ($oldfile == 'index.php') {
+					$oldpath = $home_path;
+		} else {
+					$oldpath = ABSPATH;
+		}
 
 		// Check to make sure it's not a new index.
 		if ($oldfile == 'index.php') {
 			$index = implode('', file("$oldpath/$oldfile"));
 			if (strpos($index, 'WP_USE_THEMES') !== false) {
-				if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile"))
-					return false;
+				if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile")) {
+									return false;
+				}
 
 				// Don't copy anything.
 				continue;
 			}
 		}
 
-		if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile"))
-			return false;
+		if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile")) {
+					return false;
+		}
 
 		chmod("$site_dir/$newfile", 0777);
 
@@ -2575,8 +2691,9 @@ 
 			$f = fopen("$site_dir/$newfile", 'w');
 
 			foreach ($lines as $line) {
-				if (preg_match('/require.*wp-blog-header/', $line))
-					$line = '//' . $line;
+				if (preg_match('/require.*wp-blog-header/', $line)) {
+									$line = '//' . $line;
+				}
 
 				// Update stylesheet references.
 				$line = str_replace("<?php echo __get_option('siteurl'); ?>/wp-layout.css", "<?php bloginfo('stylesheet_url'); ?>", $line);
@@ -2626,10 +2743,12 @@ 
 	$theme_dir = @ opendir($default_dir);
 	if ($theme_dir) {
 		while(($theme_file = readdir( $theme_dir )) !== false) {
-			if (is_dir("$default_dir/$theme_file"))
-				continue;
-			if (! @copy("$default_dir/$theme_file", "$site_dir/$theme_file"))
-				return;
+			if (is_dir("$default_dir/$theme_file")) {
+							continue;
+			}
+			if (! @copy("$default_dir/$theme_file", "$site_dir/$theme_file")) {
+							return;
+			}
 			chmod("$site_dir/$theme_file", 0777);
 		}
 	}
@@ -2641,11 +2760,17 @@ 
 		$f = fopen("$site_dir/style.css", 'w');
 
 		foreach ($stylelines as $line) {
-			if (strpos($line, 'Theme Name:') !== false) $line = 'Theme Name: ' . $theme_name;
-			elseif (strpos($line, 'Theme URI:') !== false) $line = 'Theme URI: ' . __get_option('url');
-			elseif (strpos($line, 'Description:') !== false) $line = 'Description: Your theme.';
-			elseif (strpos($line, 'Version:') !== false) $line = 'Version: 1';
-			elseif (strpos($line, 'Author:') !== false) $line = 'Author: You';
+			if (strpos($line, 'Theme Name:') !== false) {
+				$line = 'Theme Name: ' . $theme_name;
+			} elseif (strpos($line, 'Theme URI:') !== false) {
+				$line = 'Theme URI: ' . __get_option('url');
+			} elseif (strpos($line, 'Description:') !== false) {
+				$line = 'Description: Your theme.';
+			} elseif (strpos($line, 'Version:') !== false) {
+				$line = 'Version: 1';
+			} elseif (strpos($line, 'Author:') !== false) {
+				$line = 'Author: You';
+			}
 			fwrite($f, $line . "\n");
 		}
 		fclose($f);
@@ -2660,10 +2785,12 @@ 
 	$images_dir = @ opendir("$default_dir/images");
 	if ($images_dir) {
 		while(($image = readdir($images_dir)) !== false) {
-			if (is_dir("$default_dir/images/$image"))
-				continue;
-			if (! @copy("$default_dir/images/$image", "$site_dir/images/$image"))
-				return;
+			if (is_dir("$default_dir/images/$image")) {
+							continue;
+			}
+			if (! @copy("$default_dir/images/$image", "$site_dir/images/$image")) {
+							return;
+			}
 			chmod("$site_dir/images/$image", 0777);
 		}
 	}
@@ -2706,9 +2833,10 @@ 
 			return false;
 		}
 	} else {
-		if (! make_site_theme_from_default($theme_name, $template))
-			// TODO: rm -rf the site theme directory.
+		if (! make_site_theme_from_default($theme_name, $template)) {
+					// TODO: rm -rf the site theme directory.
 			return false;
+		}
 	}
 
 	// Make the new site theme active.
@@ -2759,9 +2887,10 @@ 
 function wp_check_mysql_version() {
 	global $wpdb;
 	$result = $wpdb->check_database_version();
-	if ( is_wp_error( $result ) )
-		die( $result->get_error_message() );
-}
+	if ( is_wp_error( $result ) ) {
+			die( $result->get_error_message() );
+	}
+	}
 
 /**
  * Disables the Automattic widgets plugin, which was merged into core.
@@ -2791,9 +2920,10 @@ 
 function maybe_disable_link_manager() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 0 );
-}
+	if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) {
+			update_option( 'link_manager_enabled', 0 );
+	}
+	}
 
 /**
  * Runs before the schema is upgraded.

src/wp-admin/includes/import.php

Spacing +50 added lines, -50 removed lines

@@ -16,8 +16,8 @@ 
  */
 function get_importers() {
 	global $wp_importers;
-	if ( is_array( $wp_importers ) ) {
-		uasort( $wp_importers, '_usort_by_first_member' );
+	if (is_array($wp_importers)) {
+		uasort($wp_importers, '_usort_by_first_member');
 	}
 	return $wp_importers;
 }
@@ -34,8 +34,8 @@ 
  * @param array $b
  * @return int
  */
-function _usort_by_first_member( $a, $b ) {
-	return strnatcasecmp( $a[0], $b[0] );
+function _usort_by_first_member($a, $b) {
+	return strnatcasecmp($a[0], $b[0]);
 }
 
 /**
@@ -51,11 +51,11 @@ 
  * @param callable $callback    Callback to run.
  * @return WP_Error Returns WP_Error when $callback is WP_Error.
  */
-function register_importer( $id, $name, $description, $callback ) {
+function register_importer($id, $name, $description, $callback) {
 	global $wp_importers;
-	if ( is_wp_error( $callback ) )
+	if (is_wp_error($callback))
 		return $callback;
-	$wp_importers[$id] = array ( $name, $description, $callback );
+	$wp_importers[$id] = array($name, $description, $callback);
 }
 
 /**
@@ -67,8 +67,8 @@ 
  *
  * @param string $id Importer ID.
  */
-function wp_import_cleanup( $id ) {
-	wp_delete_attachment( $id );
+function wp_import_cleanup($id) {
+	wp_delete_attachment($id);
 }
 
 /**
@@ -79,23 +79,23 @@ 
  * @return array Uploaded file's details on success, error message on failure
  */
 function wp_import_handle_upload() {
-	if ( ! isset( $_FILES['import'] ) ) {
+	if ( ! isset($_FILES['import'])) {
 		return array(
-			'error' => __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' )
+			'error' => __('File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.')
 		);
 	}
 
-	$overrides = array( 'test_form' => false, 'test_type' => false );
+	$overrides = array('test_form' => false, 'test_type' => false);
 	$_FILES['import']['name'] .= '.txt';
-	$upload = wp_handle_upload( $_FILES['import'], $overrides );
+	$upload = wp_handle_upload($_FILES['import'], $overrides);
 
-	if ( isset( $upload['error'] ) ) {
+	if (isset($upload['error'])) {
 		return $upload;
 	}
 
 	// Construct the object array
 	$object = array(
-		'post_title' => basename( $upload['file'] ),
+		'post_title' => basename($upload['file']),
 		'post_content' => $upload['url'],
 		'post_mime_type' => $upload['type'],
 		'guid' => $upload['url'],
@@ -104,15 +104,15 @@ 
 	);
 
 	// Save the data
-	$id = wp_insert_attachment( $object, $upload['file'] );
+	$id = wp_insert_attachment($object, $upload['file']);
 
 	/*
 	 * Schedule a cleanup for one day from now in case of failed
 	 * import or missing wp_import_cleanup() call.
 	 */
-	wp_schedule_single_event( time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array( $id ) );
+	wp_schedule_single_event(time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array($id));
 
-	return array( 'file' => $upload['file'], 'id' => $id );
+	return array('file' => $upload['file'], 'id' => $id);
 }
 
 /**
@@ -123,37 +123,37 @@ 
  * @return array Importers with metadata for each.
  */
 function wp_get_popular_importers() {
-	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
+	include(ABSPATH.WPINC.'/version.php'); // include an unmodified $wp_version
 
 	$locale = get_locale();
-	$cache_key = 'popular_importers_' . md5( $locale . $wp_version );
-	$popular_importers = get_site_transient( $cache_key );
+	$cache_key = 'popular_importers_'.md5($locale.$wp_version);
+	$popular_importers = get_site_transient($cache_key);
 
-	if ( ! $popular_importers ) {
-		$url = add_query_arg( array(
+	if ( ! $popular_importers) {
+		$url = add_query_arg(array(
 			'locale'  => get_locale(),
 			'version' => $wp_version,
-		), 'http://api.wordpress.org/core/importers/1.1/' );
-		$options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url() );
-		$response = wp_remote_get( $url, $options );
-		$popular_importers = json_decode( wp_remote_retrieve_body( $response ), true );
+		), 'http://api.wordpress.org/core/importers/1.1/');
+		$options = array('user-agent' => 'WordPress/'.$wp_version.'; '.home_url());
+		$response = wp_remote_get($url, $options);
+		$popular_importers = json_decode(wp_remote_retrieve_body($response), true);
 
-		if ( is_array( $popular_importers ) ) {
-			set_site_transient( $cache_key, $popular_importers, 2 * DAY_IN_SECONDS );
+		if (is_array($popular_importers)) {
+			set_site_transient($cache_key, $popular_importers, 2 * DAY_IN_SECONDS);
 		} else {
 			$popular_importers = false;
 		}
 	}
 
-	if ( is_array( $popular_importers ) ) {
+	if (is_array($popular_importers)) {
 		// If the data was received as translated, return it as-is.
-		if ( $popular_importers['translated'] )
+		if ($popular_importers['translated'])
 			return $popular_importers['importers'];
 
-		foreach ( $popular_importers['importers'] as &$importer ) {
-			$importer['description'] = translate( $importer['description'] );
-			if ( $importer['name'] != 'WordPress' )
-				$importer['name'] = translate( $importer['name'] );
+		foreach ($popular_importers['importers'] as &$importer) {
+			$importer['description'] = translate($importer['description']);
+			if ($importer['name'] != 'WordPress')
+				$importer['name'] = translate($importer['name']);
 		}
 		return $popular_importers['importers'];
 	}
@@ -161,50 +161,50 @@ 
 	return array(
 		// slug => name, description, plugin slug, and register_importer() slug
 		'blogger' => array(
-			'name' => __( 'Blogger' ),
-			'description' => __( 'Import posts, comments, and users from a Blogger blog.' ),
+			'name' => __('Blogger'),
+			'description' => __('Import posts, comments, and users from a Blogger blog.'),
 			'plugin-slug' => 'blogger-importer',
 			'importer-id' => 'blogger',
 		),
 		'wpcat2tag' => array(
-			'name' => __( 'Categories and Tags Converter' ),
-			'description' => __( 'Convert existing categories to tags or tags to categories, selectively.' ),
+			'name' => __('Categories and Tags Converter'),
+			'description' => __('Convert existing categories to tags or tags to categories, selectively.'),
 			'plugin-slug' => 'wpcat2tag-importer',
 			'importer-id' => 'wp-cat2tag',
 		),
 		'livejournal' => array(
-			'name' => __( 'LiveJournal' ),
-			'description' => __( 'Import posts from LiveJournal using their API.' ),
+			'name' => __('LiveJournal'),
+			'description' => __('Import posts from LiveJournal using their API.'),
 			'plugin-slug' => 'livejournal-importer',
 			'importer-id' => 'livejournal',
 		),
 		'movabletype' => array(
-			'name' => __( 'Movable Type and TypePad' ),
-			'description' => __( 'Import posts and comments from a Movable Type or TypePad blog.' ),
+			'name' => __('Movable Type and TypePad'),
+			'description' => __('Import posts and comments from a Movable Type or TypePad blog.'),
 			'plugin-slug' => 'movabletype-importer',
 			'importer-id' => 'mt',
 		),
 		'opml' => array(
-			'name' => __( 'Blogroll' ),
-			'description' => __( 'Import links in OPML format.' ),
+			'name' => __('Blogroll'),
+			'description' => __('Import links in OPML format.'),
 			'plugin-slug' => 'opml-importer',
 			'importer-id' => 'opml',
 		),
 		'rss' => array(
-			'name' => __( 'RSS' ),
-			'description' => __( 'Import posts from an RSS feed.' ),
+			'name' => __('RSS'),
+			'description' => __('Import posts from an RSS feed.'),
 			'plugin-slug' => 'rss-importer',
 			'importer-id' => 'rss',
 		),
 		'tumblr' => array(
-			'name' => __( 'Tumblr' ),
-			'description' => __( 'Import posts & media from Tumblr using their API.' ),
+			'name' => __('Tumblr'),
+			'description' => __('Import posts & media from Tumblr using their API.'),
 			'plugin-slug' => 'tumblr-importer',
 			'importer-id' => 'tumblr',
 		),
 		'wordpress' => array(
 			'name' => 'WordPress',
-			'description' => __( 'Import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.' ),
+			'description' => __('Import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.'),
 			'plugin-slug' => 'wordpress-importer',
 			'importer-id' => 'wordpress',
 		),

Braces +9 added lines, -6 removed lines

@@ -53,8 +53,9 @@ 
  */
 function register_importer( $id, $name, $description, $callback ) {
 	global $wp_importers;
-	if ( is_wp_error( $callback ) )
-		return $callback;
+	if ( is_wp_error( $callback ) ) {
+			return $callback;
+	}
 	$wp_importers[$id] = array ( $name, $description, $callback );
 }
 
@@ -147,13 +148,15 @@ 
 
 	if ( is_array( $popular_importers ) ) {
 		// If the data was received as translated, return it as-is.
-		if ( $popular_importers['translated'] )
-			return $popular_importers['importers'];
+		if ( $popular_importers['translated'] ) {
+					return $popular_importers['importers'];
+		}
 
 		foreach ( $popular_importers['importers'] as &$importer ) {
 			$importer['description'] = translate( $importer['description'] );
-			if ( $importer['name'] != 'WordPress' )
-				$importer['name'] = translate( $importer['name'] );
+			if ( $importer['name'] != 'WordPress' ) {
+							$importer['name'] = translate( $importer['name'] );
+			}
 		}
 		return $popular_importers['importers'];
 	}

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

Indentation +3782 added lines, -3782 removed lines

@@ -27,7 +27,7 @@ 
 
   // ----- Constants
   if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
-    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
+	define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
   }
 
   // ----- File list separator
@@ -41,7 +41,7 @@ 
   //define( 'PCLZIP_SEPARATOR', ' ' );
   // Recommanded values for smart separation of filenames.
   if (!defined('PCLZIP_SEPARATOR')) {
-    define( 'PCLZIP_SEPARATOR', ',' );
+	define( 'PCLZIP_SEPARATOR', ',' );
   }
 
   // ----- Error configuration
@@ -50,7 +50,7 @@ 
   //     you must ensure that you have included PclError library.
   // [2,...] : reserved for futur use
   if (!defined('PCLZIP_ERROR_EXTERNAL')) {
-    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
+	define( 'PCLZIP_ERROR_EXTERNAL', 0 );
   }
 
   // ----- Optional static temporary directory
@@ -63,7 +63,7 @@ 
   // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
   // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
   if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    define( 'PCLZIP_TEMPORARY_DIR', '' );
+	define( 'PCLZIP_TEMPORARY_DIR', '' );
   }
 
   // ----- Optional threshold ratio for use of temporary files
@@ -75,7 +75,7 @@ 
   //       Samples :
   // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
   if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
-    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
+	define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
   }
 
 // --------------------------------------------------------------------------------
@@ -189,20 +189,20 @@ 
   // --------------------------------------------------------------------------------
   class PclZip
   {
-    // ----- Filename of the zip file
-    var $zipname = '';
+	// ----- Filename of the zip file
+	var $zipname = '';
 
-    // ----- File descriptor of the zip file
-    var $zip_fd = 0;
+	// ----- File descriptor of the zip file
+	var $zip_fd = 0;
 
-    // ----- Internal error handling
-    var $error_code = 1;
-    var $error_string = '';
+	// ----- Internal error handling
+	var $error_code = 1;
+	var $error_string = '';
 
-    // ----- Current status of the magic_quotes_runtime
-    // This value store the php configuration for magic_quotes
-    // The class can then disable the magic_quotes and reset it after
-    var $magic_quotes_status;
+	// ----- Current status of the magic_quotes_runtime
+	// This value store the php configuration for magic_quotes
+	// The class can then disable the magic_quotes and reset it after
+	var $magic_quotes_status;
 
   // --------------------------------------------------------------------------------
   // Function : PclZip()
@@ -215,23 +215,23 @@ 
   function __construct($p_zipname)
   {
 
-    // ----- Tests the zlib
-    if (!function_exists('gzopen'))
-    {
-      die('Abort '.basename(__FILE__).' : Missing zlib extensions');
-    }
+	// ----- Tests the zlib
+	if (!function_exists('gzopen'))
+	{
+	  die('Abort '.basename(__FILE__).' : Missing zlib extensions');
+	}
 
-    // ----- Set the attributes
-    $this->zipname = $p_zipname;
-    $this->zip_fd = 0;
-    $this->magic_quotes_status = -1;
+	// ----- Set the attributes
+	$this->zipname = $p_zipname;
+	$this->zip_fd = 0;
+	$this->magic_quotes_status = -1;
 
-    // ----- Return
-    return;
+	// ----- Return
+	return;
   }
 
   public function PclZip($p_zipname) {
-    self::__construct($p_zipname);
+	self::__construct($p_zipname);
   }
   // --------------------------------------------------------------------------------
 
@@ -274,149 +274,149 @@ 
   // --------------------------------------------------------------------------------
   function create($p_filelist)
   {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove from the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-                                             ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
+	$v_result=1;
+
+	// ----- Reset the error handler
+	$this->privErrorReset();
+
+	// ----- Set default values
+	$v_options = array();
+	$v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
+
+	// ----- Look for variable options arguments
+	$v_size = func_num_args();
+
+	// ----- Look for arguments
+	if ($v_size > 1) {
+	  // ----- Get the arguments
+	  $v_arg_list = func_get_args();
+
+	  // ----- Remove from the options list the first argument
+	  array_shift($v_arg_list);
+	  $v_size--;
+
+	  // ----- Look for first arg
+	  if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+		// ----- Parse the options
+		$v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+											array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+												   PCLZIP_OPT_ADD_PATH => 'optional',
+												   PCLZIP_CB_PRE_ADD => 'optional',
+												   PCLZIP_CB_POST_ADD => 'optional',
+												   PCLZIP_OPT_NO_COMPRESSION => 'optional',
+												   PCLZIP_OPT_COMMENT => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+												   //, PCLZIP_OPT_CRYPT => 'optional'
+											 ));
+		if ($v_result != 1) {
+		  return 0;
+		}
+	  }
 
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
-
-        // ----- 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) {
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Invalid number / type of arguments");
-          return 0;
-        }
-      }
-    }
+	  // ----- Look for 2 args
+	  // Here we need to support the first historic synopsis of the
+	  // method.
+	  else {
+
+		// ----- Get the first argument
+		$v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
+
+		// ----- 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) {
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
+							   "Invalid number / type of arguments");
+		  return 0;
+		}
+	  }
+	}
 
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
+	// ----- Look for default option values
+	$this->privOptionDefaultThreshold($v_options);
 
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
+	// ----- Init
+	$v_string_list = array();
+	$v_att_list = array();
+	$v_filedescr_list = array();
+	$p_result_list = array();
 
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
+	// ----- Look if the $p_filelist is really an array
+	if (is_array($p_filelist)) {
 
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
+	  // ----- Look if the first element is also an array
+	  //       This will mean that this is a file description entry
+	  if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+		$v_att_list = $p_filelist;
+	  }
 
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
+	  // ----- The list is a list of string names
+	  else {
+		$v_string_list = $p_filelist;
+	  }
+	}
 
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
+	// ----- Look if the $p_filelist is a string
+	else if (is_string($p_filelist)) {
+	  // ----- Create a list from the string
+	  $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+	}
 
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
-      return 0;
-    }
+	// ----- Invalid variable type for $p_filelist
+	else {
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
+	  return 0;
+	}
 
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        if ($v_string != '') {
-          $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-        }
-        else {
-        }
-      }
-    }
+	// ----- Reformat the string list
+	if (sizeof($v_string_list) != 0) {
+	  foreach ($v_string_list as $v_string) {
+		if ($v_string != '') {
+		  $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+		}
+		else {
+		}
+	  }
+	}
 
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
+	// ----- For each file in the list check the attributes
+	$v_supported_attributes
+	= array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+			 ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
+			 ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
+			 ,PCLZIP_ATT_FILE_MTIME => 'optional'
+			 ,PCLZIP_ATT_FILE_CONTENT => 'optional'
+			 ,PCLZIP_ATT_FILE_COMMENT => 'optional'
 						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
+	foreach ($v_att_list as $v_entry) {
+	  $v_result = $this->privFileDescrParseAtt($v_entry,
+											   $v_filedescr_list[],
+											   $v_options,
+											   $v_supported_attributes);
+	  if ($v_result != 1) {
+		return 0;
+	  }
+	}
 
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
+	// ----- Expand the filelist (expand directories)
+	$v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+	if ($v_result != 1) {
+	  return 0;
+	}
 
-    // ----- Call the create fct
-    $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
+	// ----- Call the create fct
+	$v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
+	if ($v_result != 1) {
+	  return 0;
+	}
 
-    // ----- Return
-    return $p_result_list;
+	// ----- Return
+	return $p_result_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -457,149 +457,149 @@ 
   // --------------------------------------------------------------------------------
   function add($p_filelist)
   {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_ADD_COMMENT => 'optional',
-                                                   PCLZIP_OPT_PREPEND_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
+	$v_result=1;
+
+	// ----- Reset the error handler
+	$this->privErrorReset();
+
+	// ----- Set default values
+	$v_options = array();
+	$v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
+
+	// ----- Look for variable options arguments
+	$v_size = func_num_args();
+
+	// ----- Look for arguments
+	if ($v_size > 1) {
+	  // ----- Get the arguments
+	  $v_arg_list = func_get_args();
+
+	  // ----- Remove form the options list the first argument
+	  array_shift($v_arg_list);
+	  $v_size--;
+
+	  // ----- Look for first arg
+	  if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+		// ----- Parse the options
+		$v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+											array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+												   PCLZIP_OPT_ADD_PATH => 'optional',
+												   PCLZIP_CB_PRE_ADD => 'optional',
+												   PCLZIP_CB_POST_ADD => 'optional',
+												   PCLZIP_OPT_NO_COMPRESSION => 'optional',
+												   PCLZIP_OPT_COMMENT => 'optional',
+												   PCLZIP_OPT_ADD_COMMENT => 'optional',
+												   PCLZIP_OPT_PREPEND_COMMENT => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+												   //, PCLZIP_OPT_CRYPT => 'optional'
 												   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
+		if ($v_result != 1) {
+		  return 0;
+		}
+	  }
 
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
-
-        // ----- 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) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
+	  // ----- Look for 2 args
+	  // Here we need to support the first historic synopsis of the
+	  // method.
+	  else {
+
+		// ----- Get the first argument
+		$v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
+
+		// ----- 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) {
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+		  // ----- Return
+		  return 0;
+		}
+	  }
+	}
 
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
+	// ----- Look for default option values
+	$this->privOptionDefaultThreshold($v_options);
 
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
+	// ----- Init
+	$v_string_list = array();
+	$v_att_list = array();
+	$v_filedescr_list = array();
+	$p_result_list = array();
 
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
+	// ----- Look if the $p_filelist is really an array
+	if (is_array($p_filelist)) {
 
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
+	  // ----- Look if the first element is also an array
+	  //       This will mean that this is a file description entry
+	  if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+		$v_att_list = $p_filelist;
+	  }
 
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
+	  // ----- The list is a list of string names
+	  else {
+		$v_string_list = $p_filelist;
+	  }
+	}
 
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
+	// ----- Look if the $p_filelist is a string
+	else if (is_string($p_filelist)) {
+	  // ----- Create a list from the string
+	  $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+	}
 
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
-      return 0;
-    }
+	// ----- Invalid variable type for $p_filelist
+	else {
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
+	  return 0;
+	}
 
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-      }
-    }
+	// ----- Reformat the string list
+	if (sizeof($v_string_list) != 0) {
+	  foreach ($v_string_list as $v_string) {
+		$v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+	  }
+	}
 
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
+	// ----- For each file in the list check the attributes
+	$v_supported_attributes
+	= array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+			 ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
+			 ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
+			 ,PCLZIP_ATT_FILE_MTIME => 'optional'
+			 ,PCLZIP_ATT_FILE_CONTENT => 'optional'
+			 ,PCLZIP_ATT_FILE_COMMENT => 'optional'
 						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
+	foreach ($v_att_list as $v_entry) {
+	  $v_result = $this->privFileDescrParseAtt($v_entry,
+											   $v_filedescr_list[],
+											   $v_options,
+											   $v_supported_attributes);
+	  if ($v_result != 1) {
+		return 0;
+	  }
+	}
 
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
+	// ----- Expand the filelist (expand directories)
+	$v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+	if ($v_result != 1) {
+	  return 0;
+	}
 
-    // ----- Call the create fct
-    $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
+	// ----- Call the create fct
+	$v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
+	if ($v_result != 1) {
+	  return 0;
+	}
 
-    // ----- Return
-    return $p_result_list;
+	// ----- Return
+	return $p_result_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -646,26 +646,26 @@ 
   // --------------------------------------------------------------------------------
   function listContent()
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  return(0);
+	}
 
-    // ----- Call the extracting fct
-    $p_list = array();
-    if (($v_result = $this->privList($p_list)) != 1)
-    {
-      unset($p_list);
-      return(0);
-    }
+	// ----- Call the extracting fct
+	$p_list = array();
+	if (($v_result = $this->privList($p_list)) != 1)
+	{
+	  unset($p_list);
+	  return(0);
+	}
 
-    // ----- Return
-    return $p_list;
+	// ----- Return
+	return $p_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -703,120 +703,120 @@ 
   // --------------------------------------------------------------------------------
   function extract()
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  return(0);
+	}
 
-    // ----- Set default values
-    $v_options = array();
+	// ----- Set default values
+	$v_options = array();
 //    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_BY_NAME => 'optional',
-                                                   PCLZIP_OPT_BY_EREG => 'optional',
-                                                   PCLZIP_OPT_BY_PREG => 'optional',
-                                                   PCLZIP_OPT_BY_INDEX => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-												    ));
-        if ($v_result != 1) {
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-      }
+	$v_path = '';
+	$v_remove_path = "";
+	$v_remove_all_path = false;
+
+	// ----- Look for variable options arguments
+	$v_size = func_num_args();
+
+	// ----- Default values for option
+	$v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+
+	// ----- Look for arguments
+	if ($v_size > 0) {
+	  // ----- Get the arguments
+	  $v_arg_list = func_get_args();
+
+	  // ----- Look for first arg
+	  if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+		// ----- Parse the options
+		$v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+											array (PCLZIP_OPT_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+												   PCLZIP_OPT_ADD_PATH => 'optional',
+												   PCLZIP_CB_PRE_EXTRACT => 'optional',
+												   PCLZIP_CB_POST_EXTRACT => 'optional',
+												   PCLZIP_OPT_SET_CHMOD => 'optional',
+												   PCLZIP_OPT_BY_NAME => 'optional',
+												   PCLZIP_OPT_BY_EREG => 'optional',
+												   PCLZIP_OPT_BY_PREG => 'optional',
+												   PCLZIP_OPT_BY_INDEX => 'optional',
+												   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+												   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
+												   PCLZIP_OPT_REPLACE_NEWER => 'optional'
+												   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
+												   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+													));
+		if ($v_result != 1) {
+		  return 0;
+		}
+
+		// ----- Set the arguments
+		if (isset($v_options[PCLZIP_OPT_PATH])) {
+		  $v_path = $v_options[PCLZIP_OPT_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+		  $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+		  $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+		  // ----- Check for '/' in last path char
+		  if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+			$v_path .= '/';
+		  }
+		  $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+		}
+	  }
 
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
+	  // ----- Look for 2 args
+	  // Here we need to support the first historic synopsis of the
+	  // method.
+	  else {
+
+		// ----- Get the first argument
+		$v_path = $v_arg_list[0];
+
+		// ----- Look for the optional second argument
+		if ($v_size == 2) {
+		  $v_remove_path = $v_arg_list[1];
+		}
+		else if ($v_size > 2) {
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+		  // ----- Return
+		  return 0;
+		}
+	  }
+	}
 
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
+	// ----- Look for default option values
+	$this->privOptionDefaultThreshold($v_options);
 
-    // ----- Trace
+	// ----- Trace
 
-    // ----- Call the extracting fct
-    $p_list = array();
-    $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
-	                                     $v_remove_all_path, $v_options);
-    if ($v_result < 1) {
-      unset($p_list);
-      return(0);
-    }
+	// ----- Call the extracting fct
+	$p_list = array();
+	$v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
+										 $v_remove_all_path, $v_options);
+	if ($v_result < 1) {
+	  unset($p_list);
+	  return(0);
+	}
 
-    // ----- Return
-    return $p_list;
+	// ----- Return
+	return $p_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -860,132 +860,132 @@ 
   //function extractByIndex($p_index, options...)
   function extractByIndex($p_index)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  return(0);
+	}
 
-    // ----- Set default values
-    $v_options = array();
+	// ----- Set default values
+	$v_options = array();
 //    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+	$v_path = '';
+	$v_remove_path = "";
+	$v_remove_all_path = false;
+
+	// ----- Look for variable options arguments
+	$v_size = func_num_args();
+
+	// ----- Default values for option
+	$v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+
+	// ----- Look for arguments
+	if ($v_size > 1) {
+	  // ----- Get the arguments
+	  $v_arg_list = func_get_args();
+
+	  // ----- Remove form the options list the first argument
+	  array_shift($v_arg_list);
+	  $v_size--;
+
+	  // ----- Look for first arg
+	  if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+		// ----- Parse the options
+		$v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+											array (PCLZIP_OPT_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_PATH => 'optional',
+												   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+												   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+												   PCLZIP_OPT_ADD_PATH => 'optional',
+												   PCLZIP_CB_PRE_EXTRACT => 'optional',
+												   PCLZIP_CB_POST_EXTRACT => 'optional',
+												   PCLZIP_OPT_SET_CHMOD => 'optional',
+												   PCLZIP_OPT_REPLACE_NEWER => 'optional'
+												   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
+												   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+												   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
 												   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-        if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
-          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-        }
-        else {
-        }
-      }
+		if ($v_result != 1) {
+		  return 0;
+		}
+
+		// ----- Set the arguments
+		if (isset($v_options[PCLZIP_OPT_PATH])) {
+		  $v_path = $v_options[PCLZIP_OPT_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+		  $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+		  $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+		}
+		if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+		  // ----- Check for '/' in last path char
+		  if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+			$v_path .= '/';
+		  }
+		  $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+		}
+		if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
+		  $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+		}
+		else {
+		}
+	  }
 
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
+	  // ----- Look for 2 args
+	  // Here we need to support the first historic synopsis of the
+	  // method.
+	  else {
+
+		// ----- Get the first argument
+		$v_path = $v_arg_list[0];
+
+		// ----- Look for the optional second argument
+		if ($v_size == 2) {
+		  $v_remove_path = $v_arg_list[1];
+		}
+		else if ($v_size > 2) {
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+		  // ----- Return
+		  return 0;
+		}
+	  }
+	}
 
-    // ----- Trace
-
-    // ----- Trick
-    // Here I want to reuse extractByRule(), so I need to parse the $p_index
-    // with privParseOptions()
-    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
-    $v_options_trick = array();
-    $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
-                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
-    if ($v_result != 1) {
-        return 0;
-    }
-    $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
+	// ----- Trace
+
+	// ----- Trick
+	// Here I want to reuse extractByRule(), so I need to parse the $p_index
+	// with privParseOptions()
+	$v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
+	$v_options_trick = array();
+	$v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
+										array (PCLZIP_OPT_BY_INDEX => 'optional' ));
+	if ($v_result != 1) {
+		return 0;
+	}
+	$v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
 
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
+	// ----- Look for default option values
+	$this->privOptionDefaultThreshold($v_options);
 
-    // ----- Call the extracting fct
-    if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
-        return(0);
-    }
+	// ----- Call the extracting fct
+	if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
+		return(0);
+	}
 
-    // ----- Return
-    return $p_list;
+	// ----- Return
+	return $p_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -1009,54 +1009,54 @@ 
   // --------------------------------------------------------------------------------
   function delete()
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  return(0);
+	}
 
-    // ----- Set default values
-    $v_options = array();
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Parse the options
-      $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                        array (PCLZIP_OPT_BY_NAME => 'optional',
-                                               PCLZIP_OPT_BY_EREG => 'optional',
-                                               PCLZIP_OPT_BY_PREG => 'optional',
-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
-      if ($v_result != 1) {
-          return 0;
-      }
-    }
+	// ----- Set default values
+	$v_options = array();
+
+	// ----- Look for variable options arguments
+	$v_size = func_num_args();
+
+	// ----- Look for arguments
+	if ($v_size > 0) {
+	  // ----- Get the arguments
+	  $v_arg_list = func_get_args();
+
+	  // ----- Parse the options
+	  $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+										array (PCLZIP_OPT_BY_NAME => 'optional',
+											   PCLZIP_OPT_BY_EREG => 'optional',
+											   PCLZIP_OPT_BY_PREG => 'optional',
+											   PCLZIP_OPT_BY_INDEX => 'optional' ));
+	  if ($v_result != 1) {
+		  return 0;
+	  }
+	}
 
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Call the delete fct
-    $v_list = array();
-    if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
-      $this->privSwapBackMagicQuotes();
-      unset($v_list);
-      return(0);
-    }
+	// ----- Call the delete fct
+	$v_list = array();
+	if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
+	  $this->privSwapBackMagicQuotes();
+	  unset($v_list);
+	  return(0);
+	}
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Return
-    return $v_list;
+	// ----- Return
+	return $v_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -1069,10 +1069,10 @@ 
   function deleteByIndex($p_index)
   {
 
-    $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
+	$p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
 
-    // ----- Return
-    return $p_list;
+	// ----- Return
+	return $p_list;
   }
   // --------------------------------------------------------------------------------
 
@@ -1093,61 +1093,61 @@ 
   function properties()
   {
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      $this->privSwapBackMagicQuotes();
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  $this->privSwapBackMagicQuotes();
+	  return(0);
+	}
 
-    // ----- Default properties
-    $v_prop = array();
-    $v_prop['comment'] = '';
-    $v_prop['nb'] = 0;
-    $v_prop['status'] = 'not_exist';
-
-    // ----- Look if file exists
-    if (@is_file($this->zipname))
-    {
-      // ----- Open the zip file
-      if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-      {
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
-
-        // ----- Return
-        return 0;
-      }
+	// ----- Default properties
+	$v_prop = array();
+	$v_prop['comment'] = '';
+	$v_prop['nb'] = 0;
+	$v_prop['status'] = 'not_exist';
+
+	// ----- Look if file exists
+	if (@is_file($this->zipname))
+	{
+	  // ----- Open the zip file
+	  if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
+	  {
+		$this->privSwapBackMagicQuotes();
+
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+
+		// ----- Return
+		return 0;
+	  }
 
-      // ----- Read the central directory informations
-      $v_central_dir = array();
-      if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return 0;
-      }
+	  // ----- Read the central directory informations
+	  $v_central_dir = array();
+	  if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	  {
+		$this->privSwapBackMagicQuotes();
+		return 0;
+	  }
 
-      // ----- Close the zip file
-      $this->privCloseFd();
+	  // ----- Close the zip file
+	  $this->privCloseFd();
 
-      // ----- Set the user attributes
-      $v_prop['comment'] = $v_central_dir['comment'];
-      $v_prop['nb'] = $v_central_dir['entries'];
-      $v_prop['status'] = 'ok';
-    }
+	  // ----- Set the user attributes
+	  $v_prop['comment'] = $v_central_dir['comment'];
+	  $v_prop['nb'] = $v_central_dir['entries'];
+	  $v_prop['status'] = 'ok';
+	}
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Return
-    return $v_prop;
+	// ----- Return
+	return $v_prop;
   }
   // --------------------------------------------------------------------------------
 
@@ -1165,46 +1165,46 @@ 
   // --------------------------------------------------------------------------------
   function duplicate($p_archive)
   {
-    $v_result = 1;
+	$v_result = 1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Look if the $p_archive is a PclZip object
-    if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
-    {
+	// ----- Look if the $p_archive is a PclZip object
+	if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
+	{
 
-      // ----- Duplicate the archive
-      $v_result = $this->privDuplicate($p_archive->zipname);
-    }
+	  // ----- Duplicate the archive
+	  $v_result = $this->privDuplicate($p_archive->zipname);
+	}
 
-    // ----- Look if the $p_archive is a string (so a filename)
-    else if (is_string($p_archive))
-    {
+	// ----- Look if the $p_archive is a string (so a filename)
+	else if (is_string($p_archive))
+	{
 
-      // ----- Check that $p_archive is a valid zip file
-      // TBC : Should also check the archive format
-      if (!is_file($p_archive)) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
-        $v_result = PCLZIP_ERR_MISSING_FILE;
-      }
-      else {
-        // ----- Duplicate the archive
-        $v_result = $this->privDuplicate($p_archive);
-      }
-    }
+	  // ----- Check that $p_archive is a valid zip file
+	  // TBC : Should also check the archive format
+	  if (!is_file($p_archive)) {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
+		$v_result = PCLZIP_ERR_MISSING_FILE;
+	  }
+	  else {
+		// ----- Duplicate the archive
+		$v_result = $this->privDuplicate($p_archive);
+	  }
+	}
 
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
+	// ----- Invalid variable
+	else
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+	  $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -1224,45 +1224,45 @@ 
   // --------------------------------------------------------------------------------
   function merge($p_archive_to_add)
   {
-    $v_result = 1;
+	$v_result = 1;
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
+	// ----- Check archive
+	if (!$this->privCheckFormat()) {
+	  return(0);
+	}
 
-    // ----- Look if the $p_archive_to_add is a PclZip object
-    if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))
-    {
+	// ----- Look if the $p_archive_to_add is a PclZip object
+	if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))
+	{
 
-      // ----- Merge the archive
-      $v_result = $this->privMerge($p_archive_to_add);
-    }
+	  // ----- Merge the archive
+	  $v_result = $this->privMerge($p_archive_to_add);
+	}
 
-    // ----- Look if the $p_archive_to_add is a string (so a filename)
-    else if (is_string($p_archive_to_add))
-    {
+	// ----- Look if the $p_archive_to_add is a string (so a filename)
+	else if (is_string($p_archive_to_add))
+	{
 
-      // ----- Create a temporary archive
-      $v_object_archive = new PclZip($p_archive_to_add);
+	  // ----- Create a temporary archive
+	  $v_object_archive = new PclZip($p_archive_to_add);
 
-      // ----- Merge the archive
-      $v_result = $this->privMerge($v_object_archive);
-    }
+	  // ----- Merge the archive
+	  $v_result = $this->privMerge($v_object_archive);
+	}
 
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
+	// ----- Invalid variable
+	else
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+	  $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -1275,12 +1275,12 @@ 
   // --------------------------------------------------------------------------------
   function errorCode()
   {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorCode());
-    }
-    else {
-      return($this->error_code);
-    }
+	if (PCLZIP_ERROR_EXTERNAL == 1) {
+	  return(PclErrorCode());
+	}
+	else {
+	  return($this->error_code);
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -1291,42 +1291,42 @@ 
   // --------------------------------------------------------------------------------
   function errorName($p_with_code=false)
   {
-    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
-                      PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
-                      PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
-                      PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
-                      PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
-                      PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
-                      PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
-                      PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
-                      PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
-                      PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
-                      PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
-                      PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
-                      PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
-                      PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
-                      PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
-                      PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
-                      PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
-                      PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
-                      PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
-                      ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
-                      ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
-                    );
-
-    if (isset($v_name[$this->error_code])) {
-      $v_value = $v_name[$this->error_code];
-    }
-    else {
-      $v_value = 'NoName';
-    }
+	$v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
+					  PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
+					  PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
+					  PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
+					  PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
+					  PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
+					  PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
+					  PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
+					  PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
+					  PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
+					  PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
+					  PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
+					  PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
+					  PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
+					  PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
+					  PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
+					  PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
+					  PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
+					  PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
+					  ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
+					  ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
+					);
+
+	if (isset($v_name[$this->error_code])) {
+	  $v_value = $v_name[$this->error_code];
+	}
+	else {
+	  $v_value = 'NoName';
+	}
 
-    if ($p_with_code) {
-      return($v_value.' ('.$this->error_code.')');
-    }
-    else {
-      return($v_value);
-    }
+	if ($p_with_code) {
+	  return($v_value.' ('.$this->error_code.')');
+	}
+	else {
+	  return($v_value);
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -1337,17 +1337,17 @@ 
   // --------------------------------------------------------------------------------
   function errorInfo($p_full=false)
   {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorString());
-    }
-    else {
-      if ($p_full) {
-        return($this->errorName(true)." : ".$this->error_string);
-      }
-      else {
-        return($this->error_string." [code ".$this->error_code."]");
-      }
-    }
+	if (PCLZIP_ERROR_EXTERNAL == 1) {
+	  return(PclErrorString());
+	}
+	else {
+	  if ($p_full) {
+		return($this->errorName(true)." : ".$this->error_string);
+	  }
+	  else {
+		return($this->error_string." [code ".$this->error_code."]");
+	  }
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -1376,39 +1376,39 @@ 
   // --------------------------------------------------------------------------------
   function privCheckFormat($p_level=0)
   {
-    $v_result = true;
+	$v_result = true;
 
 	// ----- Reset the file system cache
-    clearstatcache();
+	clearstatcache();
 
-    // ----- Reset the error handler
-    $this->privErrorReset();
+	// ----- Reset the error handler
+	$this->privErrorReset();
 
-    // ----- Look if the file exits
-    if (!is_file($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
-      return(false);
-    }
+	// ----- Look if the file exits
+	if (!is_file($this->zipname)) {
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
+	  return(false);
+	}
 
-    // ----- Check that the file is readeable
-    if (!is_readable($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
-      return(false);
-    }
+	// ----- Check that the file is readeable
+	if (!is_readable($this->zipname)) {
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
+	  return(false);
+	}
 
-    // ----- Check the magic code
-    // TBC
+	// ----- Check the magic code
+	// TBC
 
-    // ----- Check the central header
-    // TBC
+	// ----- Check the central header
+	// TBC
 
-    // ----- Check each file header
-    // TBC
+	// ----- Check each file header
+	// TBC
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -1429,395 +1429,395 @@ 
   // --------------------------------------------------------------------------------
   function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Read the options
-    $i=0;
-    while ($i<$p_size) {
+	// ----- Read the options
+	$i=0;
+	while ($i<$p_size) {
 
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$p_options_list[$i]])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
+	  // ----- Check if the option is supported
+	  if (!isset($v_requested_options[$p_options_list[$i]])) {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
 
-        // ----- Return
-        return PclZip::errorCode();
-      }
+		// ----- Return
+		return PclZip::errorCode();
+	  }
 
-      // ----- Look for next option
-      switch ($p_options_list[$i]) {
-        // ----- Look for options that request a path value
-        case PCLZIP_OPT_PATH :
-        case PCLZIP_OPT_REMOVE_PATH :
-        case PCLZIP_OPT_ADD_PATH :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
+	  // ----- Look for next option
+	  switch ($p_options_list[$i]) {
+		// ----- Look for options that request a path value
+		case PCLZIP_OPT_PATH :
+		case PCLZIP_OPT_REMOVE_PATH :
+		case PCLZIP_OPT_ADD_PATH :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-          $i++;
-        break;
+		  // ----- Get the value
+		  $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+		  $i++;
+		break;
 
-        case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
+		case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+			return PclZip::errorCode();
+		  }
 
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
+		  // ----- Check for incompatible options
+		  if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+			return PclZip::errorCode();
+		  }
 
-          // ----- Check the value
-          $v_value = $p_options_list[$i+1];
-          if ((!is_integer($v_value)) || ($v_value<0)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
+		  // ----- Check the value
+		  $v_value = $p_options_list[$i+1];
+		  if ((!is_integer($v_value)) || ($v_value<0)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value (and convert it in bytes)
-          $v_result_list[$p_options_list[$i]] = $v_value*1048576;
-          $i++;
-        break;
+		  // ----- Get the value (and convert it in bytes)
+		  $v_result_list[$p_options_list[$i]] = $v_value*1048576;
+		  $i++;
+		break;
 
-        case PCLZIP_OPT_TEMP_FILE_ON :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
+		case PCLZIP_OPT_TEMP_FILE_ON :
+		  // ----- Check for incompatible options
+		  if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+			return PclZip::errorCode();
+		  }
 
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
+		  $v_result_list[$p_options_list[$i]] = true;
+		break;
 
-        case PCLZIP_OPT_TEMP_FILE_OFF :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
-            return PclZip::errorCode();
-          }
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
-            return PclZip::errorCode();
-          }
+		case PCLZIP_OPT_TEMP_FILE_OFF :
+		  // ----- Check for incompatible options
+		  if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
+			return PclZip::errorCode();
+		  }
+		  // ----- Check for incompatible options
+		  if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
+			return PclZip::errorCode();
+		  }
 
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
+		  $v_result_list[$p_options_list[$i]] = true;
+		break;
 
-        case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          if (   is_string($p_options_list[$i+1])
-              && ($p_options_list[$i+1] != '')) {
-            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-            $i++;
-          }
-          else {
-          }
-        break;
+		  // ----- Get the value
+		  if (   is_string($p_options_list[$i+1])
+			  && ($p_options_list[$i+1] != '')) {
+			$v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+			$i++;
+		  }
+		  else {
+		  }
+		break;
 
-        // ----- Look for options that request an array of string for value
-        case PCLZIP_OPT_BY_NAME :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		// ----- Look for options that request an array of string for value
+		case PCLZIP_OPT_BY_NAME :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- 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])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		  // ----- 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])) {
+			  $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+		  }
+		  else {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an EREG or PREG expression
-        case PCLZIP_OPT_BY_EREG :
-          // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
-          // to PCLZIP_OPT_BY_PREG
-          $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
-        case PCLZIP_OPT_BY_PREG :
-        //case PCLZIP_OPT_CRYPT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
+		  $i++;
+		break;
+
+		// ----- Look for options that request an EREG or PREG expression
+		case PCLZIP_OPT_BY_EREG :
+		  // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
+		  // to PCLZIP_OPT_BY_PREG
+		  $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
+		case PCLZIP_OPT_BY_PREG :
+		//case PCLZIP_OPT_CRYPT :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		  // ----- Get the value
+		  if (is_string($p_options_list[$i+1])) {
+			  $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+		  }
+		  else {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_OPT_COMMENT :
-        case PCLZIP_OPT_ADD_COMMENT :
-        case PCLZIP_OPT_PREPEND_COMMENT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
-			                     "Missing parameter value for option '"
+			// ----- Return
+			return PclZip::errorCode();
+		  }
+		  $i++;
+		break;
+
+		// ----- Look for options that takes a string
+		case PCLZIP_OPT_COMMENT :
+		case PCLZIP_OPT_ADD_COMMENT :
+		case PCLZIP_OPT_PREPEND_COMMENT :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
+								 "Missing parameter value for option '"
 								 .PclZipUtilOptionText($p_options_list[$i])
 								 ."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
-			                     "Wrong parameter value for option '"
+		  // ----- Get the value
+		  if (is_string($p_options_list[$i+1])) {
+			  $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+		  }
+		  else {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
+								 "Wrong parameter value for option '"
 								 .PclZipUtilOptionText($p_options_list[$i])
 								 ."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an array of index
-        case PCLZIP_OPT_BY_INDEX :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
+		  $i++;
+		break;
+
+		// ----- Look for options that request an array of index
+		case PCLZIP_OPT_BY_INDEX :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          $v_work_list = array();
-          if (is_string($p_options_list[$i+1])) {
+		  // ----- Get the value
+		  $v_work_list = array();
+		  if (is_string($p_options_list[$i+1])) {
 
-              // ----- Remove spaces
-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
+			  // ----- Remove spaces
+			  $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
 
-              // ----- Parse items
-              $v_work_list = explode(",", $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])) {
-              $v_work_list = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+			  // ----- Parse items
+			  $v_work_list = explode(",", $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])) {
+			  $v_work_list = $p_options_list[$i+1];
+		  }
+		  else {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Reduce the index list
-          // each index item in the list must be a couple with a start and
-          // an end value : [0,3], [5-5], [8-10], ...
-          // ----- Check the format of each item
-          $v_sort_flag=false;
-          $v_sort_value=0;
-          for ($j=0; $j<sizeof($v_work_list); $j++) {
-              // ----- Explode the item
-              $v_item_list = explode("-", $v_work_list[$j]);
-              $v_size_item_list = sizeof($v_item_list);
-
-              // ----- TBC : Here we might check that each item is a
-              // real integer ...
-
-              // ----- Look for single value
-              if ($v_size_item_list == 1) {
-                  // ----- 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) {
-                  // ----- 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 {
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-
-
-              // ----- Look for list sort
-              if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                  $v_sort_flag=true;
-
-                  // ----- TBC : An automatic sort should be writen ...
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-              $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
-          }
+		  // ----- Reduce the index list
+		  // each index item in the list must be a couple with a start and
+		  // an end value : [0,3], [5-5], [8-10], ...
+		  // ----- Check the format of each item
+		  $v_sort_flag=false;
+		  $v_sort_value=0;
+		  for ($j=0; $j<sizeof($v_work_list); $j++) {
+			  // ----- Explode the item
+			  $v_item_list = explode("-", $v_work_list[$j]);
+			  $v_size_item_list = sizeof($v_item_list);
+
+			  // ----- TBC : Here we might check that each item is a
+			  // real integer ...
+
+			  // ----- Look for single value
+			  if ($v_size_item_list == 1) {
+				  // ----- 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) {
+				  // ----- 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 {
+				  // ----- Error log
+				  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+				  // ----- Return
+				  return PclZip::errorCode();
+			  }
+
+
+			  // ----- Look for list sort
+			  if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
+				  $v_sort_flag=true;
+
+				  // ----- TBC : An automatic sort should be writen ...
+				  // ----- Error log
+				  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+				  // ----- Return
+				  return PclZip::errorCode();
+			  }
+			  $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
+		  }
 
-          // ----- Sort the items
-          if ($v_sort_flag) {
-              // TBC : To Be Completed
-          }
+		  // ----- Sort the items
+		  if ($v_sort_flag) {
+			  // TBC : To Be Completed
+		  }
 
-          // ----- Next option
-          $i++;
-        break;
-
-        // ----- Look for options that request no value
-        case PCLZIP_OPT_REMOVE_ALL_PATH :
-        case PCLZIP_OPT_EXTRACT_AS_STRING :
-        case PCLZIP_OPT_NO_COMPRESSION :
-        case PCLZIP_OPT_EXTRACT_IN_OUTPUT :
-        case PCLZIP_OPT_REPLACE_NEWER :
-        case PCLZIP_OPT_STOP_ON_ERROR :
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        // ----- Look for options that request an octal value
-        case PCLZIP_OPT_SET_CHMOD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
+		  // ----- Next option
+		  $i++;
+		break;
+
+		// ----- Look for options that request no value
+		case PCLZIP_OPT_REMOVE_ALL_PATH :
+		case PCLZIP_OPT_EXTRACT_AS_STRING :
+		case PCLZIP_OPT_NO_COMPRESSION :
+		case PCLZIP_OPT_EXTRACT_IN_OUTPUT :
+		case PCLZIP_OPT_REPLACE_NEWER :
+		case PCLZIP_OPT_STOP_ON_ERROR :
+		  $v_result_list[$p_options_list[$i]] = true;
+		break;
+
+		// ----- Look for options that request an octal value
+		case PCLZIP_OPT_SET_CHMOD :
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          $i++;
-        break;
-
-        // ----- Look for options that request a call-back
-        case PCLZIP_CB_PRE_EXTRACT :
-        case PCLZIP_CB_POST_EXTRACT :
-        case PCLZIP_CB_PRE_ADD :
-        case PCLZIP_CB_POST_ADD :
-        /* for futur use
+		  // ----- Get the value
+		  $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+		  $i++;
+		break;
+
+		// ----- Look for options that request a call-back
+		case PCLZIP_CB_PRE_EXTRACT :
+		case PCLZIP_CB_POST_EXTRACT :
+		case PCLZIP_CB_PRE_ADD :
+		case PCLZIP_CB_POST_ADD :
+		/* for futur use
         case PCLZIP_CB_PRE_DELETE :
         case PCLZIP_CB_POST_DELETE :
         case PCLZIP_CB_PRE_LIST :
         case PCLZIP_CB_POST_LIST :
         */
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		  // ----- Check the number of parameters
+		  if (($i+1) >= $p_size) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Get the value
-          $v_function_name = $p_options_list[$i+1];
+		  // ----- Get the value
+		  $v_function_name = $p_options_list[$i+1];
 
-          // ----- Check that the value is a valid existing function
-          if (!function_exists($v_function_name)) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+		  // ----- Check that the value is a valid existing function
+		  if (!function_exists($v_function_name)) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
-            // ----- Return
-            return PclZip::errorCode();
-          }
+			// ----- Return
+			return PclZip::errorCode();
+		  }
 
-          // ----- Set the attribute
-          $v_result_list[$p_options_list[$i]] = $v_function_name;
-          $i++;
-        break;
+		  // ----- Set the attribute
+		  $v_result_list[$p_options_list[$i]] = $v_function_name;
+		  $i++;
+		break;
 
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Unknown parameter '"
+		default :
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
+							   "Unknown parameter '"
 							   .$p_options_list[$i]."'");
 
-          // ----- Return
-          return PclZip::errorCode();
-      }
+		  // ----- Return
+		  return PclZip::errorCode();
+	  }
 
-      // ----- Next options
-      $i++;
-    }
+	  // ----- Next options
+	  $i++;
+	}
 
-    // ----- Look for mandatory options
-    if ($v_requested_options !== false) {
-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-        // ----- Look for mandatory option
-        if ($v_requested_options[$key] == 'mandatory') {
-          // ----- Look if present
-          if (!isset($v_result_list[$key])) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-        }
-      }
-    }
+	// ----- Look for mandatory options
+	if ($v_requested_options !== false) {
+	  for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+		// ----- Look for mandatory option
+		if ($v_requested_options[$key] == 'mandatory') {
+		  // ----- Look if present
+		  if (!isset($v_result_list[$key])) {
+			// ----- Error log
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
+
+			// ----- Return
+			return PclZip::errorCode();
+		  }
+		}
+	  }
+	}
 
-    // ----- Look for default values
-    if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+	// ----- Look for default values
+	if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
 
-    }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -1829,38 +1829,38 @@ 
   // --------------------------------------------------------------------------------
   function privOptionDefaultThreshold(&$p_options)
   {
-    $v_result=1;
+	$v_result=1;
 
-    if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-        || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
-      return $v_result;
-    }
+	if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
+		|| isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
+	  return $v_result;
+	}
 
-    // ----- Get 'memory_limit' configuration value
-    $v_memory_limit = ini_get('memory_limit');
-    $v_memory_limit = trim($v_memory_limit);
-    $v_memory_limit_int = (int) $v_memory_limit;
-    $last = strtolower(substr($v_memory_limit, -1));
+	// ----- Get 'memory_limit' configuration value
+	$v_memory_limit = ini_get('memory_limit');
+	$v_memory_limit = trim($v_memory_limit);
+	$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;
-        $v_memory_limit_int = $v_memory_limit_int*1073741824;
-    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 == '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;
+		$v_memory_limit_int = $v_memory_limit_int*1048576;
+	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);
+	$p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit_int*PCLZIP_TEMPORARY_FILE_RATIO);
 
 
-    // ----- Sanity check : No threshold if value lower than 1M
-    if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
-      unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
-    }
+	// ----- Sanity check : No threshold if value lower than 1M
+	if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
+	  unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -1874,116 +1874,116 @@ 
   // --------------------------------------------------------------------------------
   function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- For each file in the list check the attributes
-    foreach ($p_file_list as $v_key => $v_value) {
+	// ----- For each file in the list check the attributes
+	foreach ($p_file_list as $v_key => $v_value) {
 
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$v_key])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
+	  // ----- Check if the option is supported
+	  if (!isset($v_requested_options[$v_key])) {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
 
-        // ----- Return
-        return PclZip::errorCode();
-      }
+		// ----- Return
+		return PclZip::errorCode();
+	  }
 
-      // ----- Look for attribute
-      switch ($v_key) {
-        case PCLZIP_ATT_FILE_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+	  // ----- Look for attribute
+	  switch ($v_key) {
+		case PCLZIP_ATT_FILE_NAME :
+		  if (!is_string($v_value)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-          $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
+		  $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
 
-          if ($p_filedescr['filename'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+		  if ($p_filedescr['filename'] == '') {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-        break;
+		break;
 
-        case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+		case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
+		  if (!is_string($v_value)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-          $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
+		  $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
 
-          if ($p_filedescr['new_short_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
+		  if ($p_filedescr['new_short_name'] == '') {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
+		break;
 
-        case PCLZIP_ATT_FILE_NEW_FULL_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+		case PCLZIP_ATT_FILE_NEW_FULL_NAME :
+		  if (!is_string($v_value)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-          $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
+		  $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
 
-          if ($p_filedescr['new_full_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
+		  if ($p_filedescr['new_full_name'] == '') {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
+		break;
 
-        // ----- Look for options that takes a string
-        case PCLZIP_ATT_FILE_COMMENT :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+		// ----- Look for options that takes a string
+		case PCLZIP_ATT_FILE_COMMENT :
+		  if (!is_string($v_value)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-          $p_filedescr['comment'] = $v_value;
-        break;
+		  $p_filedescr['comment'] = $v_value;
+		break;
 
-        case PCLZIP_ATT_FILE_MTIME :
-          if (!is_integer($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
+		case PCLZIP_ATT_FILE_MTIME :
+		  if (!is_integer($v_value)) {
+			PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
+			return PclZip::errorCode();
+		  }
 
-          $p_filedescr['mtime'] = $v_value;
-        break;
+		  $p_filedescr['mtime'] = $v_value;
+		break;
 
-        case PCLZIP_ATT_FILE_CONTENT :
-          $p_filedescr['content'] = $v_value;
-        break;
+		case PCLZIP_ATT_FILE_CONTENT :
+		  $p_filedescr['content'] = $v_value;
+		break;
 
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                           "Unknown parameter '".$v_key."'");
+		default :
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
+								   "Unknown parameter '".$v_key."'");
 
-          // ----- Return
-          return PclZip::errorCode();
-      }
+		  // ----- Return
+		  return PclZip::errorCode();
+	  }
 
-      // ----- Look for mandatory options
-      if ($v_requested_options !== false) {
-        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-          // ----- Look for mandatory option
-          if ($v_requested_options[$key] == 'mandatory') {
-            // ----- Look if present
-            if (!isset($p_file_list[$key])) {
-              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-              return PclZip::errorCode();
-            }
-          }
-        }
-      }
+	  // ----- Look for mandatory options
+	  if ($v_requested_options !== false) {
+		for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+		  // ----- Look for mandatory option
+		  if ($v_requested_options[$key] == 'mandatory') {
+			// ----- Look if present
+			if (!isset($p_file_list[$key])) {
+			  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
+			  return PclZip::errorCode();
+			}
+		  }
+		}
+	  }
 
-    // end foreach
-    }
+	// end foreach
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2003,120 +2003,120 @@ 
   // --------------------------------------------------------------------------------
   function privFileDescrExpand(&$p_filedescr_list, &$p_options)
   {
-    $v_result=1;
-
-    // ----- Create a result list
-    $v_result_list = array();
-
-    // ----- Look each entry
-    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
-
-      // ----- Get filedescr
-      $v_descr = $p_filedescr_list[$i];
-
-      // ----- Reduce the filename
-      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
-      $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
-
-      // ----- Look for real file or folder
-      if (file_exists($v_descr['filename'])) {
-        if (@is_file($v_descr['filename'])) {
-          $v_descr['type'] = 'file';
-        }
-        else if (@is_dir($v_descr['filename'])) {
-          $v_descr['type'] = 'folder';
-        }
-        else if (@is_link($v_descr['filename'])) {
-          // skip
-          continue;
-        }
-        else {
-          // skip
-          continue;
-        }
-      }
+	$v_result=1;
+
+	// ----- Create a result list
+	$v_result_list = array();
+
+	// ----- Look each entry
+	for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
+
+	  // ----- Get filedescr
+	  $v_descr = $p_filedescr_list[$i];
+
+	  // ----- Reduce the filename
+	  $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
+	  $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
+
+	  // ----- Look for real file or folder
+	  if (file_exists($v_descr['filename'])) {
+		if (@is_file($v_descr['filename'])) {
+		  $v_descr['type'] = 'file';
+		}
+		else if (@is_dir($v_descr['filename'])) {
+		  $v_descr['type'] = 'folder';
+		}
+		else if (@is_link($v_descr['filename'])) {
+		  // skip
+		  continue;
+		}
+		else {
+		  // skip
+		  continue;
+		}
+	  }
 
-      // ----- Look for string added as file
-      else if (isset($v_descr['content'])) {
-        $v_descr['type'] = 'virtual_file';
-      }
+	  // ----- Look for string added as file
+	  else if (isset($v_descr['content'])) {
+		$v_descr['type'] = 'virtual_file';
+	  }
 
-      // ----- Missing file
-      else {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
+	  // ----- Missing file
+	  else {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
 
-        // ----- Return
-        return PclZip::errorCode();
-      }
+		// ----- Return
+		return PclZip::errorCode();
+	  }
 
-      // ----- Calculate the stored filename
-      $this->privCalculateStoredFilename($v_descr, $p_options);
-
-      // ----- Add the descriptor in result list
-      $v_result_list[sizeof($v_result_list)] = $v_descr;
-
-      // ----- Look for folder
-      if ($v_descr['type'] == 'folder') {
-        // ----- List of items in folder
-        $v_dirlist_descr = array();
-        $v_dirlist_nb = 0;
-        if ($v_folder_handler = @opendir($v_descr['filename'])) {
-          while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
-
-            // ----- Skip '.' and '..'
-            if (($v_item_handler == '.') || ($v_item_handler == '..')) {
-                continue;
-            }
-
-            // ----- Compose the full filename
-            $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
-
-            // ----- Look for different stored filename
-            // Because the name of the folder was changed, the name of the
-            // files/sub-folders also change
-            if (($v_descr['stored_filename'] != $v_descr['filename'])
-                 && (!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 {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
-              }
-            }
-
-            $v_dirlist_nb++;
-          }
+	  // ----- Calculate the stored filename
+	  $this->privCalculateStoredFilename($v_descr, $p_options);
+
+	  // ----- Add the descriptor in result list
+	  $v_result_list[sizeof($v_result_list)] = $v_descr;
+
+	  // ----- Look for folder
+	  if ($v_descr['type'] == 'folder') {
+		// ----- List of items in folder
+		$v_dirlist_descr = array();
+		$v_dirlist_nb = 0;
+		if ($v_folder_handler = @opendir($v_descr['filename'])) {
+		  while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
+
+			// ----- Skip '.' and '..'
+			if (($v_item_handler == '.') || ($v_item_handler == '..')) {
+				continue;
+			}
+
+			// ----- Compose the full filename
+			$v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
+
+			// ----- Look for different stored filename
+			// Because the name of the folder was changed, the name of the
+			// files/sub-folders also change
+			if (($v_descr['stored_filename'] != $v_descr['filename'])
+				 && (!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 {
+				$v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
+			  }
+			}
+
+			$v_dirlist_nb++;
+		  }
 
-          @closedir($v_folder_handler);
-        }
-        else {
-          // TBC : unable to open folder in read mode
-        }
-
-        // ----- Expand each element of the list
-        if ($v_dirlist_nb != 0) {
-          // ----- Expand
-          if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
-            return $v_result;
-          }
+		  @closedir($v_folder_handler);
+		}
+		else {
+		  // TBC : unable to open folder in read mode
+		}
+
+		// ----- Expand each element of the list
+		if ($v_dirlist_nb != 0) {
+		  // ----- Expand
+		  if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
+			return $v_result;
+		  }
 
-          // ----- Concat the resulting list
-          $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
-        }
-        else {
-        }
+		  // ----- Concat the resulting list
+		  $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
+		}
+		else {
+		}
 
-        // ----- Free local array
-        unset($v_dirlist_descr);
-      }
-    }
+		// ----- Free local array
+		unset($v_dirlist_descr);
+	  }
+	}
 
-    // ----- Get the result list
-    $p_filedescr_list = $v_result_list;
+	// ----- Get the result list
+	$p_filedescr_list = $v_result_list;
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2128,30 +2128,30 @@ 
   // --------------------------------------------------------------------------------
   function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
-    $v_list_detail = array();
+	$v_result=1;
+	$v_list_detail = array();
 
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Open the file in write mode
-    if (($v_result = $this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	// ----- Open the file in write mode
+	if (($v_result = $this->privOpenFd('wb')) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Add the list of files
-    $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
+	// ----- Add the list of files
+	$v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
 
-    // ----- Close
-    $this->privCloseFd();
+	// ----- Close
+	$this->privCloseFd();
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2163,175 +2163,175 @@ 
   // --------------------------------------------------------------------------------
   function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
-    $v_list_detail = array();
+	$v_result=1;
+	$v_list_detail = array();
 
-    // ----- Look if the archive exists or is empty
-    if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
-    {
+	// ----- Look if the archive exists or is empty
+	if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
+	{
 
-      // ----- Do a create
-      $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
+	  // ----- Do a create
+	  $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
 
-      // ----- Return
-      return $v_result;
-    }
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
+	  // ----- Return
+	  return $v_result;
+	}
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
+	// ----- Open the zip file
+	if (($v_result=$this->privOpenFd('rb')) != 1)
+	{
+	  // ----- Magic quotes trick
+	  $this->privSwapBackMagicQuotes();
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
+	// ----- Read the central directory informations
+	$v_central_dir = array();
+	if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	{
+	  $this->privCloseFd();
+	  $this->privSwapBackMagicQuotes();
+	  return $v_result;
+	}
 
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
+	// ----- Go to beginning of File
+	@rewind($this->zip_fd);
 
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+	// ----- Creates a temporay file
+	$v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
 
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
+	// ----- Open the temporary file in write mode
+	if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
+	{
+	  $this->privCloseFd();
+	  $this->privSwapBackMagicQuotes();
 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Copy the files from the archive to the temporary file
+	// TBC : Here I should better append the file and go back to erase the central dir
+	$v_size = $v_central_dir['offset'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = fread($this->zip_fd, $v_read_size);
+	  @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      fclose($v_zip_temp_fd);
-      $this->privCloseFd();
-      @unlink($v_zip_temp_name);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
+	// ----- Swap the file descriptor
+	// Here is a trick : I swap the temporary fd with the zip fd, in order to use
+	// the following methods on the temporary fil and not the real archive
+	$v_swap = $this->zip_fd;
+	$this->zip_fd = $v_zip_temp_fd;
+	$v_zip_temp_fd = $v_swap;
+
+	// ----- Add the files
+	$v_header_list = array();
+	if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
+	{
+	  fclose($v_zip_temp_fd);
+	  $this->privCloseFd();
+	  @unlink($v_zip_temp_name);
+	  $this->privSwapBackMagicQuotes();
+
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Store the offset of the central dir
+	$v_offset = @ftell($this->zip_fd);
+
+	// ----- Copy the block of file headers from the old archive
+	$v_size = $v_central_dir['size'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
+	  @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          fclose($v_zip_temp_fd);
-          $this->privCloseFd();
-          @unlink($v_zip_temp_name);
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
+	// ----- Create the Central Dir files header
+	for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
+	{
+	  // ----- Create the file header
+	  if ($v_header_list[$i]['status'] == 'ok') {
+		if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+		  fclose($v_zip_temp_fd);
+		  $this->privCloseFd();
+		  @unlink($v_zip_temp_name);
+		  $this->privSwapBackMagicQuotes();
+
+		  // ----- Return
+		  return $v_result;
+		}
+		$v_count++;
+	  }
 
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
+	  // ----- Transform the header to a 'usable' info
+	  $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+	}
 
-    // ----- Zip file comment
-    $v_comment = $v_central_dir['comment'];
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
-      $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
-    }
+	// ----- Zip file comment
+	$v_comment = $v_central_dir['comment'];
+	if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+	  $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+	}
+	if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
+	  $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
+	}
+	if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
+	  $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
+	}
 
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
+	// ----- Calculate the size of the central header
+	$v_size = @ftell($this->zip_fd)-$v_offset;
 
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-      $this->privSwapBackMagicQuotes();
+	// ----- Create the central dir footer
+	if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
+	{
+	  // ----- Reset the file list
+	  unset($v_header_list);
+	  $this->privSwapBackMagicQuotes();
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
+	// ----- Swap back the file descriptor
+	$v_swap = $this->zip_fd;
+	$this->zip_fd = $v_zip_temp_fd;
+	$v_zip_temp_fd = $v_swap;
 
-    // ----- Close
-    $this->privCloseFd();
+	// ----- Close
+	$this->privCloseFd();
 
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
+	// ----- Close the temporary file
+	@fclose($v_zip_temp_fd);
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
+	// ----- Delete the zip file
+	// TBC : I should test the result ...
+	@unlink($this->zipname);
 
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
+	// ----- Rename the temporary file
+	// TBC : I should test the result ...
+	//@rename($v_zip_temp_name, $this->zipname);
+	PclZipUtilRename($v_zip_temp_name, $this->zipname);
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2342,30 +2342,30 @@ 
   // --------------------------------------------------------------------------------
   function privOpenFd($p_mode)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Look if already open
-    if ($this->zip_fd != 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
+	// ----- Look if already open
+	if ($this->zip_fd != 0)
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
+	// ----- Open the zip file
+	if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2376,14 +2376,14 @@ 
   // --------------------------------------------------------------------------------
   function privCloseFd()
   {
-    $v_result=1;
+	$v_result=1;
 
-    if ($this->zip_fd != 0)
-      @fclose($this->zip_fd);
-    $this->zip_fd = 0;
+	if ($this->zip_fd != 0)
+	  @fclose($this->zip_fd);
+	$this->zip_fd = 0;
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2403,56 +2403,56 @@ 
 //  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
   function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	$v_result=1;
+
+	// ----- Add the files
+	$v_header_list = array();
+	if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Create the Central Dir files header
-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
+	// ----- Store the offset of the central dir
+	$v_offset = @ftell($this->zip_fd);
+
+	// ----- Create the Central Dir files header
+	for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
+	{
+	  // ----- Create the file header
+	  if ($v_header_list[$i]['status'] == 'ok') {
+		if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+		  // ----- Return
+		  return $v_result;
+		}
+		$v_count++;
+	  }
 
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
+	  // ----- Transform the header to a 'usable' info
+	  $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+	}
 
-    // ----- Zip file comment
-    $v_comment = '';
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
+	// ----- Zip file comment
+	$v_comment = '';
+	if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+	  $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+	}
 
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
+	// ----- Calculate the size of the central header
+	$v_size = @ftell($this->zip_fd)-$v_offset;
 
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
+	// ----- Create the central dir footer
+	if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
+	{
+	  // ----- Reset the file list
+	  unset($v_header_list);
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2467,57 +2467,57 @@ 
   // --------------------------------------------------------------------------------
   function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
-    $v_header = array();
+	$v_result=1;
+	$v_header = array();
 
-    // ----- Recuperate the current number of elt in list
-    $v_nb = sizeof($p_result_list);
+	// ----- Recuperate the current number of elt in list
+	$v_nb = sizeof($p_result_list);
 
-    // ----- Loop on the files
-    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
-      // ----- Format the filename
-      $p_filedescr_list[$j]['filename']
-      = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
+	// ----- Loop on the files
+	for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
+	  // ----- Format the filename
+	  $p_filedescr_list[$j]['filename']
+	  = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
 
 
-      // ----- Skip empty file names
-      // TBC : Can this be possible ? not checked in DescrParseAtt ?
-      if ($p_filedescr_list[$j]['filename'] == "") {
-        continue;
-      }
+	  // ----- Skip empty file names
+	  // TBC : Can this be possible ? not checked in DescrParseAtt ?
+	  if ($p_filedescr_list[$j]['filename'] == "") {
+		continue;
+	  }
 
-      // ----- Check the filename
-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
-          && (!file_exists($p_filedescr_list[$j]['filename']))) {
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
-        return PclZip::errorCode();
-      }
+	  // ----- Check the filename
+	  if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
+		  && (!file_exists($p_filedescr_list[$j]['filename']))) {
+		PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
+		return PclZip::errorCode();
+	  }
 
-      // ----- Look if it is a file or a dir with no all path remove option
-      // or a dir with all its path removed
+	  // ----- Look if it is a file or a dir with no all path remove option
+	  // or a dir with all its path removed
 //      if (   (is_file($p_filedescr_list[$j]['filename']))
 //          || (   is_dir($p_filedescr_list[$j]['filename'])
-      if (   ($p_filedescr_list[$j]['type'] == 'file')
-          || ($p_filedescr_list[$j]['type'] == 'virtual_file')
-          || (   ($p_filedescr_list[$j]['type'] == 'folder')
-              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
-                  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-          ) {
-
-        // ----- Add the file
-        $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
-                                       $p_options);
-        if ($v_result != 1) {
-          return $v_result;
-        }
-
-        // ----- Store the file infos
-        $p_result_list[$v_nb++] = $v_header;
-      }
-    }
+	  if (   ($p_filedescr_list[$j]['type'] == 'file')
+		  || ($p_filedescr_list[$j]['type'] == 'virtual_file')
+		  || (   ($p_filedescr_list[$j]['type'] == 'folder')
+			  && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
+				  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
+		  ) {
+
+		// ----- Add the file
+		$v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
+									   $p_options);
+		if ($v_result != 1) {
+		  return $v_result;
+		}
+
+		// ----- Store the file infos
+		$p_result_list[$v_nb++] = $v_header;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2529,22 +2529,22 @@ 
   // --------------------------------------------------------------------------------
   function privAddFile($p_filedescr, &$p_header, &$p_options)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
+	// ----- Working variable
+	$p_filename = $p_filedescr['filename'];
 
-    // TBC : Already done in the fileAtt check ... ?
-    if ($p_filename == "") {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
+	// TBC : Already done in the fileAtt check ... ?
+	if ($p_filename == "") {
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Look for a stored different filename
-    /* TBC : Removed
+	// ----- Look for a stored different filename
+	/* TBC : Removed
     if (isset($p_filedescr['stored_filename'])) {
       $v_stored_filename = $p_filedescr['stored_filename'];
     }
@@ -2553,242 +2553,242 @@ 
     }
     */
 
-    // ----- Set the file properties
-    clearstatcache();
-    $p_header['version'] = 20;
-    $p_header['version_extracted'] = 10;
-    $p_header['flag'] = 0;
-    $p_header['compression'] = 0;
-    $p_header['crc'] = 0;
-    $p_header['compressed_size'] = 0;
-    $p_header['filename_len'] = strlen($p_filename);
-    $p_header['extra_len'] = 0;
-    $p_header['disk'] = 0;
-    $p_header['internal'] = 0;
-    $p_header['offset'] = 0;
-    $p_header['filename'] = $p_filename;
+	// ----- Set the file properties
+	clearstatcache();
+	$p_header['version'] = 20;
+	$p_header['version_extracted'] = 10;
+	$p_header['flag'] = 0;
+	$p_header['compression'] = 0;
+	$p_header['crc'] = 0;
+	$p_header['compressed_size'] = 0;
+	$p_header['filename_len'] = strlen($p_filename);
+	$p_header['extra_len'] = 0;
+	$p_header['disk'] = 0;
+	$p_header['internal'] = 0;
+	$p_header['offset'] = 0;
+	$p_header['filename'] = $p_filename;
 // TBC : Removed    $p_header['stored_filename'] = $v_stored_filename;
-    $p_header['stored_filename'] = $p_filedescr['stored_filename'];
-    $p_header['extra'] = '';
-    $p_header['status'] = 'ok';
-    $p_header['index'] = -1;
-
-    // ----- Look for regular file
-    if ($p_filedescr['type']=='file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = filesize($p_filename);
-    }
+	$p_header['stored_filename'] = $p_filedescr['stored_filename'];
+	$p_header['extra'] = '';
+	$p_header['status'] = 'ok';
+	$p_header['index'] = -1;
+
+	// ----- Look for regular file
+	if ($p_filedescr['type']=='file') {
+	  $p_header['external'] = 0x00000000;
+	  $p_header['size'] = filesize($p_filename);
+	}
 
-    // ----- Look for regular folder
-    else if ($p_filedescr['type']=='folder') {
-      $p_header['external'] = 0x00000010;
-      $p_header['mtime'] = filemtime($p_filename);
-      $p_header['size'] = filesize($p_filename);
-    }
+	// ----- Look for regular folder
+	else if ($p_filedescr['type']=='folder') {
+	  $p_header['external'] = 0x00000010;
+	  $p_header['mtime'] = filemtime($p_filename);
+	  $p_header['size'] = filesize($p_filename);
+	}
 
-    // ----- Look for virtual file
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = strlen($p_filedescr['content']);
-    }
+	// ----- Look for virtual file
+	else if ($p_filedescr['type'] == 'virtual_file') {
+	  $p_header['external'] = 0x00000000;
+	  $p_header['size'] = strlen($p_filedescr['content']);
+	}
 
 
-    // ----- Look for filetime
-    if (isset($p_filedescr['mtime'])) {
-      $p_header['mtime'] = $p_filedescr['mtime'];
-    }
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['mtime'] = time();
-    }
-    else {
-      $p_header['mtime'] = filemtime($p_filename);
-    }
+	// ----- Look for filetime
+	if (isset($p_filedescr['mtime'])) {
+	  $p_header['mtime'] = $p_filedescr['mtime'];
+	}
+	else if ($p_filedescr['type'] == 'virtual_file') {
+	  $p_header['mtime'] = time();
+	}
+	else {
+	  $p_header['mtime'] = filemtime($p_filename);
+	}
 
-    // ------ Look for file comment
-    if (isset($p_filedescr['comment'])) {
-      $p_header['comment_len'] = strlen($p_filedescr['comment']);
-      $p_header['comment'] = $p_filedescr['comment'];
-    }
-    else {
-      $p_header['comment_len'] = 0;
-      $p_header['comment'] = '';
-    }
+	// ------ Look for file comment
+	if (isset($p_filedescr['comment'])) {
+	  $p_header['comment_len'] = strlen($p_filedescr['comment']);
+	  $p_header['comment'] = $p_filedescr['comment'];
+	}
+	else {
+	  $p_header['comment_len'] = 0;
+	  $p_header['comment'] = '';
+	}
 
-    // ----- Look for pre-add callback
-    if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_header['status'] = "skipped";
-        $v_result = 1;
-      }
+	// ----- Look for pre-add callback
+	if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
+
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
+	  $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
+	  if ($v_result == 0) {
+		// ----- Change the file status
+		$p_header['status'] = "skipped";
+		$v_result = 1;
+	  }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
-        $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
-      }
-    }
+	  // ----- Update the informations
+	  // Only some fields can be modified
+	  if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
+		$p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
+	  }
+	}
 
-    // ----- Look for empty stored filename
-    if ($p_header['stored_filename'] == "") {
-      $p_header['status'] = "filtered";
-    }
+	// ----- Look for empty stored filename
+	if ($p_header['stored_filename'] == "") {
+	  $p_header['status'] = "filtered";
+	}
 
-    // ----- Check the path length
-    if (strlen($p_header['stored_filename']) > 0xFF) {
-      $p_header['status'] = 'filename_too_long';
-    }
+	// ----- Check the path length
+	if (strlen($p_header['stored_filename']) > 0xFF) {
+	  $p_header['status'] = 'filename_too_long';
+	}
 
-    // ----- Look if no error, or file not skipped
-    if ($p_header['status'] == 'ok') {
-
-      // ----- Look for a file
-      if ($p_filedescr['type'] == 'file') {
-        // ----- Look for using temporary file to zip
-        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
-            && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
-          $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
-          if ($v_result < PCLZIP_ERR_NO_ERROR) {
-            return $v_result;
-          }
-        }
+	// ----- Look if no error, or file not skipped
+	if ($p_header['status'] == 'ok') {
+
+	  // ----- Look for a file
+	  if ($p_filedescr['type'] == 'file') {
+		// ----- Look for using temporary file to zip
+		if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
+			&& (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
+				|| (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
+					&& ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
+		  $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
+		  if ($v_result < PCLZIP_ERR_NO_ERROR) {
+			return $v_result;
+		  }
+		}
 
-        // ----- Use "in memory" zip algo
-        else {
+		// ----- Use "in memory" zip algo
+		else {
 
-        // ----- Open the source file
-        if (($v_file = @fopen($p_filename, "rb")) == 0) {
-          PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-          return PclZip::errorCode();
-        }
+		// ----- Open the source file
+		if (($v_file = @fopen($p_filename, "rb")) == 0) {
+		  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+		  return PclZip::errorCode();
+		}
 
-        // ----- Read the file content
-        $v_content = @fread($v_file, $p_header['size']);
+		// ----- Read the file content
+		$v_content = @fread($v_file, $p_header['size']);
 
-        // ----- Close the file
-        @fclose($v_file);
+		// ----- Close the file
+		@fclose($v_file);
 
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
+		// ----- Calculate the CRC
+		$p_header['crc'] = @crc32($v_content);
 
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
+		// ----- Look for no compression
+		if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+		  // ----- Set header parameters
+		  $p_header['compressed_size'] = $p_header['size'];
+		  $p_header['compression'] = 0;
+		}
 
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
+		// ----- Look for normal compression
+		else {
+		  // ----- Compress the content
+		  $v_content = @gzdeflate($v_content);
 
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
+		  // ----- Set header parameters
+		  $p_header['compressed_size'] = strlen($v_content);
+		  $p_header['compression'] = 8;
+		}
 
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
-        }
+		// ----- Call the header generation
+		if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+		  @fclose($v_file);
+		  return $v_result;
+		}
 
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+		// ----- Write the compressed (or not) content
+		@fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
 
-        }
+		}
 
-      }
+	  }
 
-      // ----- Look for a virtual file (a file from string)
-      else if ($p_filedescr['type'] == 'virtual_file') {
+	  // ----- Look for a virtual file (a file from string)
+	  else if ($p_filedescr['type'] == 'virtual_file') {
 
-        $v_content = $p_filedescr['content'];
+		$v_content = $p_filedescr['content'];
 
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
+		// ----- Calculate the CRC
+		$p_header['crc'] = @crc32($v_content);
 
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
+		// ----- Look for no compression
+		if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+		  // ----- Set header parameters
+		  $p_header['compressed_size'] = $p_header['size'];
+		  $p_header['compression'] = 0;
+		}
 
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
+		// ----- Look for normal compression
+		else {
+		  // ----- Compress the content
+		  $v_content = @gzdeflate($v_content);
 
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
+		  // ----- Set header parameters
+		  $p_header['compressed_size'] = strlen($v_content);
+		  $p_header['compression'] = 8;
+		}
 
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
-        }
+		// ----- Call the header generation
+		if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+		  @fclose($v_file);
+		  return $v_result;
+		}
 
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
-      }
+		// ----- Write the compressed (or not) content
+		@fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+	  }
 
-      // ----- Look for a directory
-      else if ($p_filedescr['type'] == 'folder') {
-        // ----- Look for directory last '/'
-        if (@substr($p_header['stored_filename'], -1) != '/') {
-          $p_header['stored_filename'] .= '/';
-        }
-
-        // ----- Set the file properties
-        $p_header['size'] = 0;
-        //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
-
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
-        {
-          return $v_result;
-        }
-      }
-    }
+	  // ----- Look for a directory
+	  else if ($p_filedescr['type'] == 'folder') {
+		// ----- Look for directory last '/'
+		if (@substr($p_header['stored_filename'], -1) != '/') {
+		  $p_header['stored_filename'] .= '/';
+		}
+
+		// ----- Set the file properties
+		$p_header['size'] = 0;
+		//$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
+		$p_header['external'] = 0x00000010;   // Value for a folder : to be checked
+
+		// ----- Call the header generation
+		if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
+		{
+		  return $v_result;
+		}
+	  }
+	}
 
-    // ----- Look for post-add callback
-    if (isset($p_options[PCLZIP_CB_POST_ADD])) {
+	// ----- Look for post-add callback
+	if (isset($p_options[PCLZIP_CB_POST_ADD])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_header, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Ignored
-        $v_result = 1;
-      }
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
+	  $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
+	  if ($v_result == 0) {
+		// ----- Ignored
+		$v_result = 1;
+	  }
 
-      // ----- Update the informations
-      // Nothing can be modified
-    }
+	  // ----- Update the informations
+	  // Nothing can be modified
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2800,105 +2800,105 @@ 
   // --------------------------------------------------------------------------------
   function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
   {
-    $v_result=PCLZIP_ERR_NO_ERROR;
+	$v_result=PCLZIP_ERR_NO_ERROR;
 
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
+	// ----- Working variable
+	$p_filename = $p_filedescr['filename'];
 
 
-    // ----- Open the source file
-    if (($v_file = @fopen($p_filename, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-      return PclZip::errorCode();
-    }
+	// ----- Open the source file
+	if (($v_file = @fopen($p_filename, "rb")) == 0) {
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+	  return PclZip::errorCode();
+	}
 
-    // ----- Creates a compressed temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
+	// ----- Creates a compressed temporary file
+	$v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
+	if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
+	  fclose($v_file);
+	  PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = filesize($p_filename);
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @gzputs($v_file_compressed, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+	$v_size = filesize($p_filename);
+	while ($v_size != 0) {
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($v_file, $v_read_size);
+	  //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+	  @gzputs($v_file_compressed, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Close the file
-    @fclose($v_file);
-    @gzclose($v_file_compressed);
+	// ----- Close the file
+	@fclose($v_file);
+	@gzclose($v_file_compressed);
 
-    // ----- Check the minimum file size
-    if (filesize($v_gzip_temp_name) < 18) {
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
-      return PclZip::errorCode();
-    }
+	// ----- Check the minimum file size
+	if (filesize($v_gzip_temp_name) < 18) {
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
+	  return PclZip::errorCode();
+	}
 
-    // ----- Extract the compressed attributes
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
+	// ----- Extract the compressed attributes
+	if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the gzip file header
-    $v_binary_data = @fread($v_file_compressed, 10);
-    $v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
+	// ----- Read the gzip file header
+	$v_binary_data = @fread($v_file_compressed, 10);
+	$v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
 
-    // ----- Check some parameters
-    $v_data_header['os'] = bin2hex($v_data_header['os']);
+	// ----- Check some parameters
+	$v_data_header['os'] = bin2hex($v_data_header['os']);
 
-    // ----- Read the gzip file footer
-    @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
-    $v_binary_data = @fread($v_file_compressed, 8);
-    $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
+	// ----- Read the gzip file footer
+	@fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
+	$v_binary_data = @fread($v_file_compressed, 8);
+	$v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
 
-    // ----- Set the attributes
-    $p_header['compression'] = ord($v_data_header['cm']);
-    //$p_header['mtime'] = $v_data_header['mtime'];
-    $p_header['crc'] = $v_data_footer['crc'];
-    $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
+	// ----- Set the attributes
+	$p_header['compression'] = ord($v_data_header['cm']);
+	//$p_header['mtime'] = $v_data_header['mtime'];
+	$p_header['crc'] = $v_data_footer['crc'];
+	$p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
 
-    // ----- Close the file
-    @fclose($v_file_compressed);
+	// ----- Close the file
+	@fclose($v_file_compressed);
 
-    // ----- Call the header generation
-    if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-      return $v_result;
-    }
+	// ----- Call the header generation
+	if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+	  return $v_result;
+	}
 
-    // ----- Add the compressed data
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)
-    {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
+	// ----- Add the compressed data
+	if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)
+	{
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    fseek($v_file_compressed, 10);
-    $v_size = $p_header['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file_compressed, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+	fseek($v_file_compressed, 10);
+	$v_size = $p_header['compressed_size'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($v_file_compressed, $v_read_size);
+	  //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+	  @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Close the file
-    @fclose($v_file_compressed);
+	// ----- Close the file
+	@fclose($v_file_compressed);
 
-    // ----- Unlink the temporary file
-    @unlink($v_gzip_temp_name);
+	// ----- Unlink the temporary file
+	@unlink($v_gzip_temp_name);
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -2912,107 +2912,107 @@ 
   // --------------------------------------------------------------------------------
   function privCalculateStoredFilename(&$p_filedescr, &$p_options)
   {
-    $v_result=1;
-
-    // ----- Working variables
-    $p_filename = $p_filedescr['filename'];
-    if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
-      $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
-    }
-    else {
-      $p_add_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
-      $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
-    }
-    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 {
-      $p_remove_all_dir = 0;
-    }
+	$v_result=1;
 
+	// ----- Working variables
+	$p_filename = $p_filedescr['filename'];
+	if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
+	  $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
+	}
+	else {
+	  $p_add_dir = '';
+	}
+	if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
+	  $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
+	}
+	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 {
+	  $p_remove_all_dir = 0;
+	}
 
-    // ----- Look for full name change
-    if (isset($p_filedescr['new_full_name'])) {
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
-    }
 
-    // ----- Look for path and/or short name change
-    else {
+	// ----- Look for full name change
+	if (isset($p_filedescr['new_full_name'])) {
+	  // ----- Remove drive letter if any
+	  $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
+	}
 
-      // ----- Look for short name change
-      // Its when we cahnge just the filename but not the path
-      if (isset($p_filedescr['new_short_name'])) {
-        $v_path_info = pathinfo($p_filename);
-        $v_dir = '';
-        if ($v_path_info['dirname'] != '') {
-          $v_dir = $v_path_info['dirname'].'/';
-        }
-        $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
-      }
-      else {
-        // ----- Calculate the stored filename
-        $v_stored_filename = $p_filename;
-      }
+	// ----- Look for path and/or short name change
+	else {
+
+	  // ----- Look for short name change
+	  // Its when we cahnge just the filename but not the path
+	  if (isset($p_filedescr['new_short_name'])) {
+		$v_path_info = pathinfo($p_filename);
+		$v_dir = '';
+		if ($v_path_info['dirname'] != '') {
+		  $v_dir = $v_path_info['dirname'].'/';
+		}
+		$v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
+	  }
+	  else {
+		// ----- Calculate the stored filename
+		$v_stored_filename = $p_filename;
+	  }
 
-      // ----- Look for all path to remove
-      if ($p_remove_all_dir) {
-        $v_stored_filename = basename($p_filename);
-      }
-      // ----- Look for partial path remove
-      else if ($p_remove_dir != "") {
-        if (substr($p_remove_dir, -1) != '/')
-          $p_remove_dir .= "/";
+	  // ----- Look for all path to remove
+	  if ($p_remove_all_dir) {
+		$v_stored_filename = basename($p_filename);
+	  }
+	  // ----- Look for partial path remove
+	  else if ($p_remove_dir != "") {
+		if (substr($p_remove_dir, -1) != '/')
+		  $p_remove_dir .= "/";
 
-        if (   (substr($p_filename, 0, 2) == "./")
-            || (substr($p_remove_dir, 0, 2) == "./")) {
+		if (   (substr($p_filename, 0, 2) == "./")
+			|| (substr($p_remove_dir, 0, 2) == "./")) {
 
-          if (   (substr($p_filename, 0, 2) == "./")
-              && (substr($p_remove_dir, 0, 2) != "./")) {
-            $p_remove_dir = "./".$p_remove_dir;
-          }
-          if (   (substr($p_filename, 0, 2) != "./")
-              && (substr($p_remove_dir, 0, 2) == "./")) {
-            $p_remove_dir = substr($p_remove_dir, 2);
-          }
-        }
+		  if (   (substr($p_filename, 0, 2) == "./")
+			  && (substr($p_remove_dir, 0, 2) != "./")) {
+			$p_remove_dir = "./".$p_remove_dir;
+		  }
+		  if (   (substr($p_filename, 0, 2) != "./")
+			  && (substr($p_remove_dir, 0, 2) == "./")) {
+			$p_remove_dir = substr($p_remove_dir, 2);
+		  }
+		}
 
-        $v_compare = PclZipUtilPathInclusion($p_remove_dir,
-                                             $v_stored_filename);
-        if ($v_compare > 0) {
-          if ($v_compare == 2) {
-            $v_stored_filename = "";
-          }
-          else {
-            $v_stored_filename = substr($v_stored_filename,
-                                        strlen($p_remove_dir));
-          }
-        }
-      }
+		$v_compare = PclZipUtilPathInclusion($p_remove_dir,
+											 $v_stored_filename);
+		if ($v_compare > 0) {
+		  if ($v_compare == 2) {
+			$v_stored_filename = "";
+		  }
+		  else {
+			$v_stored_filename = substr($v_stored_filename,
+										strlen($p_remove_dir));
+		  }
+		}
+	  }
 
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
+	  // ----- Remove drive letter if any
+	  $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
 
-      // ----- 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;
-      }
-    }
+	  // ----- 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;
+	  }
+	}
 
-    // ----- Filename (reduce the path of stored name)
-    $v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
-    $p_filedescr['stored_filename'] = $v_stored_filename;
+	// ----- Filename (reduce the path of stored name)
+	$v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
+	$p_filedescr['stored_filename'] = $v_stored_filename;
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3024,40 +3024,40 @@ 
   // --------------------------------------------------------------------------------
   function privWriteFileHeader(&$p_header)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Store the offset position of the file
-    $p_header['offset'] = ftell($this->zip_fd);
+	// ----- Store the offset position of the file
+	$p_header['offset'] = ftell($this->zip_fd);
 
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+	// ----- Transform UNIX mtime to DOS format mdate/mtime
+	$v_date = getdate($p_header['mtime']);
+	$v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
+	$v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
 
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
-	                      $p_header['version_extracted'], $p_header['flag'],
-                          $p_header['compression'], $v_mtime, $v_mdate,
-                          $p_header['crc'], $p_header['compressed_size'],
+	// ----- Packed data
+	$v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
+						  $p_header['version_extracted'], $p_header['flag'],
+						  $p_header['compression'], $v_mtime, $v_mdate,
+						  $p_header['crc'], $p_header['compressed_size'],
 						  $p_header['size'],
-                          strlen($p_header['stored_filename']),
+						  strlen($p_header['stored_filename']),
 						  $p_header['extra_len']);
 
-    // ----- Write the first 148 bytes of the header in the archive
-    fputs($this->zip_fd, $v_binary_data, 30);
+	// ----- Write the first 148 bytes of the header in the archive
+	fputs($this->zip_fd, $v_binary_data, 30);
 
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
+	// ----- Write the variable fields
+	if (strlen($p_header['stored_filename']) != 0)
+	{
+	  fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+	}
+	if ($p_header['extra_len'] != 0)
+	{
+	  fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3069,48 +3069,48 @@ 
   // --------------------------------------------------------------------------------
   function privWriteCentralFileHeader(&$p_header)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // TBC
-    //for(reset($p_header); $key = key($p_header); next($p_header)) {
-    //}
+	// TBC
+	//for(reset($p_header); $key = key($p_header); next($p_header)) {
+	//}
 
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+	// ----- Transform UNIX mtime to DOS format mdate/mtime
+	$v_date = getdate($p_header['mtime']);
+	$v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
+	$v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
 
 
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
-	                      $p_header['version'], $p_header['version_extracted'],
-                          $p_header['flag'], $p_header['compression'],
+	// ----- Packed data
+	$v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
+						  $p_header['version'], $p_header['version_extracted'],
+						  $p_header['flag'], $p_header['compression'],
 						  $v_mtime, $v_mdate, $p_header['crc'],
-                          $p_header['compressed_size'], $p_header['size'],
-                          strlen($p_header['stored_filename']),
+						  $p_header['compressed_size'], $p_header['size'],
+						  strlen($p_header['stored_filename']),
 						  $p_header['extra_len'], $p_header['comment_len'],
-                          $p_header['disk'], $p_header['internal'],
+						  $p_header['disk'], $p_header['internal'],
 						  $p_header['external'], $p_header['offset']);
 
-    // ----- Write the 42 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 46);
+	// ----- Write the 42 bytes of the header in the zip file
+	fputs($this->zip_fd, $v_binary_data, 46);
 
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-    if ($p_header['comment_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
-    }
+	// ----- Write the variable fields
+	if (strlen($p_header['stored_filename']) != 0)
+	{
+	  fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+	}
+	if ($p_header['extra_len'] != 0)
+	{
+	  fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+	}
+	if ($p_header['comment_len'] != 0)
+	{
+	  fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3122,24 +3122,24 @@ 
   // --------------------------------------------------------------------------------
   function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
-	                      $p_nb_entries, $p_size,
+	// ----- Packed data
+	$v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
+						  $p_nb_entries, $p_size,
 						  $p_offset, strlen($p_comment));
 
-    // ----- Write the 22 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 22);
+	// ----- Write the 22 bytes of the header in the zip file
+	fputs($this->zip_fd, $v_binary_data, 22);
 
-    // ----- Write the variable fields
-    if (strlen($p_comment) != 0)
-    {
-      fputs($this->zip_fd, $p_comment, strlen($p_comment));
-    }
+	// ----- Write the variable fields
+	if (strlen($p_comment) != 0)
+	{
+	  fputs($this->zip_fd, $p_comment, strlen($p_comment));
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3151,69 +3151,69 @@ 
   // --------------------------------------------------------------------------------
   function privList(&$p_list)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
+	// ----- Open the zip file
+	if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
+	{
+	  // ----- Magic quotes trick
+	  $this->privSwapBackMagicQuotes();
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
+	// ----- Read the central directory informations
+	$v_central_dir = array();
+	if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	{
+	  $this->privSwapBackMagicQuotes();
+	  return $v_result;
+	}
 
-    // ----- Go to beginning of Central Dir
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_central_dir['offset']))
-    {
-      $this->privSwapBackMagicQuotes();
+	// ----- Go to beginning of Central Dir
+	@rewind($this->zip_fd);
+	if (@fseek($this->zip_fd, $v_central_dir['offset']))
+	{
+	  $this->privSwapBackMagicQuotes();
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++)
-    {
-      // ----- Read the file header
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return $v_result;
-      }
-      $v_header['index'] = $i;
+	// ----- Read each entry
+	for ($i=0; $i<$v_central_dir['entries']; $i++)
+	{
+	  // ----- Read the file header
+	  if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
+	  {
+		$this->privSwapBackMagicQuotes();
+		return $v_result;
+	  }
+	  $v_header['index'] = $i;
 
-      // ----- Get the only interesting attributes
-      $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
-      unset($v_header);
-    }
+	  // ----- Get the only interesting attributes
+	  $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
+	  unset($v_header);
+	}
 
-    // ----- Close the zip file
-    $this->privCloseFd();
+	// ----- Close the zip file
+	$this->privCloseFd();
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3238,24 +3238,24 @@ 
   // --------------------------------------------------------------------------------
   function privConvertHeader2FileInfo($p_header, &$p_info)
   {
-    $v_result=1;
-
-    // ----- Get the interesting attributes
-    $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
-    $p_info['filename'] = $v_temp_path;
-    $v_temp_path = PclZipUtilPathReduction($p_header['stored_filename']);
-    $p_info['stored_filename'] = $v_temp_path;
-    $p_info['size'] = $p_header['size'];
-    $p_info['compressed_size'] = $p_header['compressed_size'];
-    $p_info['mtime'] = $p_header['mtime'];
-    $p_info['comment'] = $p_header['comment'];
-    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
-    $p_info['index'] = $p_header['index'];
-    $p_info['status'] = $p_header['status'];
-    $p_info['crc'] = $p_header['crc'];
-
-    // ----- Return
-    return $v_result;
+	$v_result=1;
+
+	// ----- Get the interesting attributes
+	$v_temp_path = PclZipUtilPathReduction($p_header['filename']);
+	$p_info['filename'] = $v_temp_path;
+	$v_temp_path = PclZipUtilPathReduction($p_header['stored_filename']);
+	$p_info['stored_filename'] = $v_temp_path;
+	$p_info['size'] = $p_header['size'];
+	$p_info['compressed_size'] = $p_header['compressed_size'];
+	$p_info['mtime'] = $p_header['mtime'];
+	$p_info['comment'] = $p_header['comment'];
+	$p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
+	$p_info['index'] = $p_header['index'];
+	$p_info['status'] = $p_header['status'];
+	$p_info['crc'] = $p_header['crc'];
+
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3277,122 +3277,122 @@ 
   // --------------------------------------------------------------------------------
   function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
+	// ----- Magic quotes trick
+	$this->privDisableMagicQuotes();
 
-    // ----- Check the path
-    if (   ($p_path == "")
-	    || (   (substr($p_path, 0, 1) != "/")
-		    && (substr($p_path, 0, 3) != "../")
+	// ----- Check the path
+	if (   ($p_path == "")
+		|| (   (substr($p_path, 0, 1) != "/")
+			&& (substr($p_path, 0, 3) != "../")
 			&& (substr($p_path,1,2)!=":/")))
-      $p_path = "./".$p_path;
-
-    // ----- Reduce the path last (and duplicated) '/'
-    if (($p_path != "./") && ($p_path != "/"))
-    {
-      // ----- Look for the path end '/'
-      while (substr($p_path, -1) == "/")
-      {
-        $p_path = substr($p_path, 0, strlen($p_path)-1);
-      }
-    }
+	  $p_path = "./".$p_path;
+
+	// ----- Reduce the path last (and duplicated) '/'
+	if (($p_path != "./") && ($p_path != "/"))
+	{
+	  // ----- Look for the path end '/'
+	  while (substr($p_path, -1) == "/")
+	  {
+		$p_path = substr($p_path, 0, strlen($p_path)-1);
+	  }
+	}
 
-    // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))
-    {
-      $p_remove_path .= '/';
-    }
-    $p_remove_path_size = strlen($p_remove_path);
+	// ----- Look for path to remove format (should end by /)
+	if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))
+	{
+	  $p_remove_path .= '/';
+	}
+	$p_remove_path_size = strlen($p_remove_path);
 
-    // ----- Open the zip file
-    if (($v_result = $this->privOpenFd('rb')) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
+	// ----- Open the zip file
+	if (($v_result = $this->privOpenFd('rb')) != 1)
+	{
+	  $this->privSwapBackMagicQuotes();
+	  return $v_result;
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
+	// ----- Read the central directory informations
+	$v_central_dir = array();
+	if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	{
+	  // ----- Close the zip file
+	  $this->privCloseFd();
+	  $this->privSwapBackMagicQuotes();
 
-      return $v_result;
-    }
+	  return $v_result;
+	}
 
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
+	// ----- Start at beginning of Central Dir
+	$v_pos_entry = $v_central_dir['offset'];
 
-    // ----- Read each entry
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
+	// ----- Read each entry
+	$j_start = 0;
+	for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+	{
 
-      // ----- Read next Central dir entry
-      @rewind($this->zip_fd);
-      if (@fseek($this->zip_fd, $v_pos_entry))
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
+	  // ----- Read next Central dir entry
+	  @rewind($this->zip_fd);
+	  if (@fseek($this->zip_fd, $v_pos_entry))
+	  {
+		// ----- Close the zip file
+		$this->privCloseFd();
+		$this->privSwapBackMagicQuotes();
 
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
-        // ----- Return
-        return PclZip::errorCode();
-      }
+		// ----- Return
+		return PclZip::errorCode();
+	  }
 
-      // ----- Read the file header
-      $v_header = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
+	  // ----- Read the file header
+	  $v_header = array();
+	  if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
+	  {
+		// ----- Close the zip file
+		$this->privCloseFd();
+		$this->privSwapBackMagicQuotes();
 
-        return $v_result;
-      }
+		return $v_result;
+	  }
 
-      // ----- Store the index
-      $v_header['index'] = $i;
+	  // ----- Store the index
+	  $v_header['index'] = $i;
 
-      // ----- Store the file position
-      $v_pos_entry = ftell($this->zip_fd);
+	  // ----- Store the file position
+	  $v_pos_entry = ftell($this->zip_fd);
 
-      // ----- Look for the specific extract rules
-      $v_extract = false;
+	  // ----- Look for the specific extract rules
+	  $v_extract = false;
 
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+	  // ----- Look for extract by name rule
+	  if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+		  && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
 
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
+		  // ----- Look if the filename is in the list
+		  for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
 
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+			  // ----- Look for a directory
+			  if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
 
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_extract = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_extract = true;
-              }
-          }
-      }
+				  // ----- Look if the directory is in the filename path
+				  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
+					  && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+					  $v_extract = true;
+				  }
+			  }
+			  // ----- Look for a filename
+			  elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+				  $v_extract = true;
+			  }
+		  }
+	  }
 
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /*
+	  // ----- Look for extract by ereg rule
+	  // ereg() is deprecated with PHP 5.3
+	  /*
       else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
                && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
 
@@ -3402,207 +3402,207 @@ 
       }
       */
 
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+	  // ----- Look for extract by preg rule
+	  else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+			   && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
 
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
+		  if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
+			  $v_extract = true;
+		  }
+	  }
 
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+	  // ----- Look for extract by index rule
+	  else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+			   && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
 
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
+		  // ----- Look if the index is in the list
+		  for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
 
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_extract = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
+			  if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+				  $v_extract = true;
+			  }
+			  if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+				  $j_start = $j+1;
+			  }
 
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
+			  if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+				  break;
+			  }
+		  }
+	  }
 
-      // ----- Look for no rule, which means extract all the archive
-      else {
-          $v_extract = true;
-      }
+	  // ----- Look for no rule, which means extract all the archive
+	  else {
+		  $v_extract = true;
+	  }
 
 	  // ----- Check compression method
 	  if (   ($v_extract)
-	      && (   ($v_header['compression'] != 8)
-		      && ($v_header['compression'] != 0))) {
-          $v_header['status'] = 'unsupported_compression';
+		  && (   ($v_header['compression'] != 8)
+			  && ($v_header['compression'] != 0))) {
+		  $v_header['status'] = 'unsupported_compression';
 
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+		  // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+		  if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+			  && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
 
-              $this->privSwapBackMagicQuotes();
+			  $this->privSwapBackMagicQuotes();
 
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
-			                       "Filename '".$v_header['stored_filename']."' is "
-				  	    	  	   ."compressed by an unsupported compression "
-				  	    	  	   ."method (".$v_header['compression'].") ");
+			  PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
+								   "Filename '".$v_header['stored_filename']."' is "
+				  			  	   ."compressed by an unsupported compression "
+				  			  	   ."method (".$v_header['compression'].") ");
 
-              return PclZip::errorCode();
+			  return PclZip::errorCode();
 		  }
 	  }
 
 	  // ----- Check encrypted files
 	  if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
-          $v_header['status'] = 'unsupported_encryption';
+		  $v_header['status'] = 'unsupported_encryption';
 
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+		  // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+		  if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+			  && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
 
-              $this->privSwapBackMagicQuotes();
+			  $this->privSwapBackMagicQuotes();
 
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
-			                       "Unsupported encryption for "
-				  	    	  	   ." filename '".$v_header['stored_filename']
+			  PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
+								   "Unsupported encryption for "
+				  			  	   ." filename '".$v_header['stored_filename']
 								   ."'");
 
-              return PclZip::errorCode();
+			  return PclZip::errorCode();
 		  }
-    }
+	}
 
-      // ----- Look for real extraction
-      if (($v_extract) && ($v_header['status'] != 'ok')) {
-          $v_result = $this->privConvertHeader2FileInfo($v_header,
-		                                        $p_file_list[$v_nb_extracted++]);
-          if ($v_result != 1) {
-              $this->privCloseFd();
-              $this->privSwapBackMagicQuotes();
-              return $v_result;
-          }
+	  // ----- Look for real extraction
+	  if (($v_extract) && ($v_header['status'] != 'ok')) {
+		  $v_result = $this->privConvertHeader2FileInfo($v_header,
+												$p_file_list[$v_nb_extracted++]);
+		  if ($v_result != 1) {
+			  $this->privCloseFd();
+			  $this->privSwapBackMagicQuotes();
+			  return $v_result;
+		  }
 
-          $v_extract = false;
-      }
+		  $v_extract = false;
+	  }
 
-      // ----- Look for real extraction
-      if ($v_extract)
-      {
+	  // ----- Look for real extraction
+	  if ($v_extract)
+	  {
 
-        // ----- Go to the file position
-        @rewind($this->zip_fd);
-        if (@fseek($this->zip_fd, $v_header['offset']))
-        {
-          // ----- Close the zip file
-          $this->privCloseFd();
+		// ----- Go to the file position
+		@rewind($this->zip_fd);
+		if (@fseek($this->zip_fd, $v_header['offset']))
+		{
+		  // ----- Close the zip file
+		  $this->privCloseFd();
 
-          $this->privSwapBackMagicQuotes();
+		  $this->privSwapBackMagicQuotes();
 
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+		  // ----- Error log
+		  PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
-          // ----- Return
-          return PclZip::errorCode();
-        }
+		  // ----- Return
+		  return PclZip::errorCode();
+		}
 
-        // ----- Look for extraction as string
-        if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
+		// ----- Look for extraction as string
+		if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
 
-          $v_string = '';
+		  $v_string = '';
 
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
+		  // ----- Extracting the file
+		  $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
+		  if ($v_result1 < 1) {
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
+			return $v_result1;
+		  }
 
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
+		  // ----- Get the only interesting attributes
+		  if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
+		  {
+			// ----- Close the zip file
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
 
-            return $v_result;
-          }
+			return $v_result;
+		  }
 
-          // ----- Set the file content
-          $p_file_list[$v_nb_extracted]['content'] = $v_string;
+		  // ----- Set the file content
+		  $p_file_list[$v_nb_extracted]['content'] = $v_string;
 
-          // ----- Next extracted file
-          $v_nb_extracted++;
+		  // ----- Next extracted file
+		  $v_nb_extracted++;
 
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for extraction in standard output
-        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
-		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
-          // ----- Extracting the file in standard output
-          $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
+		  // ----- Look for user callback abort
+		  if ($v_result1 == 2) {
+		  	break;
+		  }
+		}
+		// ----- Look for extraction in standard output
+		elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
+				&& ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
+		  // ----- Extracting the file in standard output
+		  $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
+		  if ($v_result1 < 1) {
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
+			return $v_result1;
+		  }
 
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result;
-          }
+		  // ----- Get the only interesting attributes
+		  if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
+			return $v_result;
+		  }
 
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for normal extraction
-        else {
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFile($v_header,
-		                                      $p_path, $p_remove_path,
+		  // ----- Look for user callback abort
+		  if ($v_result1 == 2) {
+		  	break;
+		  }
+		}
+		// ----- Look for normal extraction
+		else {
+		  // ----- Extracting the file
+		  $v_result1 = $this->privExtractFile($v_header,
+											  $p_path, $p_remove_path,
 											  $p_remove_all_path,
 											  $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
+		  if ($v_result1 < 1) {
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
+			return $v_result1;
+		  }
 
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
+		  // ----- Get the only interesting attributes
+		  if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
+		  {
+			// ----- Close the zip file
+			$this->privCloseFd();
+			$this->privSwapBackMagicQuotes();
 
-            return $v_result;
-          }
+			return $v_result;
+		  }
 
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-      }
-    }
+		  // ----- Look for user callback abort
+		  if ($v_result1 == 2) {
+		  	break;
+		  }
+		}
+	  }
+	}
 
-    // ----- Close the zip file
-    $this->privCloseFd();
-    $this->privSwapBackMagicQuotes();
+	// ----- Close the zip file
+	$this->privCloseFd();
+	$this->privSwapBackMagicQuotes();
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3617,344 +3617,344 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	// ----- Read the file header
+	if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
 
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
+	// ----- Check that the file header is coherent with $p_entry info
+	if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+		// TBC
+	}
 
-    // ----- Look for all path to remove
-    if ($p_remove_all_path == true) {
-        // ----- Look for folder entry that not need to be extracted
-        if (($p_entry['external']&0x00000010)==0x00000010) {
+	// ----- Look for all path to remove
+	if ($p_remove_all_path == true) {
+		// ----- Look for folder entry that not need to be extracted
+		if (($p_entry['external']&0x00000010)==0x00000010) {
 
-            $p_entry['status'] = "filtered";
+			$p_entry['status'] = "filtered";
 
-            return $v_result;
-        }
+			return $v_result;
+		}
 
-        // ----- Get the basename of the path
-        $p_entry['filename'] = basename($p_entry['filename']);
-    }
+		// ----- Get the basename of the path
+		$p_entry['filename'] = basename($p_entry['filename']);
+	}
 
-    // ----- Look for path to remove
-    else if ($p_remove_path != "")
-    {
-      if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
-      {
+	// ----- Look for path to remove
+	else if ($p_remove_path != "")
+	{
+	  if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
+	  {
 
-        // ----- Change the file status
-        $p_entry['status'] = "filtered";
+		// ----- Change the file status
+		$p_entry['status'] = "filtered";
 
-        // ----- Return
-        return $v_result;
-      }
+		// ----- Return
+		return $v_result;
+	  }
 
-      $p_remove_path_size = strlen($p_remove_path);
-      if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
-      {
+	  $p_remove_path_size = strlen($p_remove_path);
+	  if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
+	  {
 
-        // ----- Remove the path
-        $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
+		// ----- Remove the path
+		$p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
 
-      }
-    }
+	  }
+	}
 
-    // ----- Add the path
-    if ($p_path != '') {
-      $p_entry['filename'] = $p_path."/".$p_entry['filename'];
-    }
+	// ----- Add the path
+	if ($p_path != '') {
+	  $p_entry['filename'] = $p_path."/".$p_entry['filename'];
+	}
 
-    // ----- Check a base_dir_restriction
-    if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
-      $v_inclusion
-      = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
-                                $p_entry['filename']);
-      if ($v_inclusion == 0) {
+	// ----- Check a base_dir_restriction
+	if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
+	  $v_inclusion
+	  = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
+								$p_entry['filename']);
+	  if ($v_inclusion == 0) {
 
-        PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
-			                     "Filename '".$p_entry['filename']."' is "
+		PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
+								 "Filename '".$p_entry['filename']."' is "
 								 ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
 
-        return PclZip::errorCode();
-      }
-    }
+		return PclZip::errorCode();
+	  }
+	}
 
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
+	// ----- Look for pre-extract callback
+	if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
+	  $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+	  if ($v_result == 0) {
+		// ----- Change the file status
+		$p_entry['status'] = "skipped";
+		$v_result = 1;
+	  }
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+		// ----- This status is internal and will be changed in 'skipped'
+		$p_entry['status'] = "aborted";
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
+	  // ----- Update the informations
+	  // Only some fields can be modified
+	  $p_entry['filename'] = $v_local_header['filename'];
+	}
 
 
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
+	// ----- Look if extraction should be done
+	if ($p_entry['status'] == 'ok') {
 
-    // ----- Look for specific actions while the file exist
-    if (file_exists($p_entry['filename']))
-    {
+	// ----- Look for specific actions while the file exist
+	if (file_exists($p_entry['filename']))
+	{
 
-      // ----- Look if file is a directory
-      if (is_dir($p_entry['filename']))
-      {
+	  // ----- Look if file is a directory
+	  if (is_dir($p_entry['filename']))
+	  {
 
-        // ----- Change the file status
-        $p_entry['status'] = "already_a_directory";
+		// ----- Change the file status
+		$p_entry['status'] = "already_a_directory";
 
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+		// ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+		// For historical reason first PclZip implementation does not stop
+		// when this kind of error occurs.
+		if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+			&& ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
 
-            PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
-			                     "Filename '".$p_entry['filename']."' is "
+			PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
+								 "Filename '".$p_entry['filename']."' is "
 								 ."already used by an existing directory");
 
-            return PclZip::errorCode();
-		    }
-      }
-      // ----- Look if file is write protected
-      else if (!is_writeable($p_entry['filename']))
-      {
+			return PclZip::errorCode();
+			}
+	  }
+	  // ----- Look if file is write protected
+	  else if (!is_writeable($p_entry['filename']))
+	  {
 
-        // ----- Change the file status
-        $p_entry['status'] = "write_protected";
+		// ----- Change the file status
+		$p_entry['status'] = "write_protected";
 
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+		// ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+		// For historical reason first PclZip implementation does not stop
+		// when this kind of error occurs.
+		if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+			&& ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
 
-            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			                     "Filename '".$p_entry['filename']."' exists "
+			PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
+								 "Filename '".$p_entry['filename']."' exists "
 								 ."and is write protected");
 
-            return PclZip::errorCode();
-		    }
-      }
+			return PclZip::errorCode();
+			}
+	  }
 
-      // ----- Look if the extracted file is older
-      else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
-      {
-        // ----- Change the file status
-        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
-		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
+	  // ----- Look if the extracted file is older
+	  else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
+	  {
+		// ----- Change the file status
+		if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
+			&& ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
 	  	  }
-		    else {
-            $p_entry['status'] = "newer_exist";
-
-            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-            // For historical reason first PclZip implementation does not stop
-            // when this kind of error occurs.
-            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-                PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			             "Newer version of '".$p_entry['filename']."' exists "
-					    ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
-
-                return PclZip::errorCode();
-		      }
-		    }
-      }
-      else {
-      }
-    }
+			else {
+			$p_entry['status'] = "newer_exist";
+
+			// ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+			// For historical reason first PclZip implementation does not stop
+			// when this kind of error occurs.
+			if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+				&& ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+
+				PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
+						 "Newer version of '".$p_entry['filename']."' exists "
+						."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
+
+				return PclZip::errorCode();
+			  }
+			}
+	  }
+	  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 (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
-
-          // ----- Change the file status
-          $p_entry['status'] = "path_creation_fail";
-
-          // ----- Return
-          //return $v_result;
-          $v_result = 1;
-        }
-      }
-    }
+	// ----- 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 (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
+
+		  // ----- Change the file status
+		  $p_entry['status'] = "path_creation_fail";
 
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
+		  // ----- Return
+		  //return $v_result;
+		  $v_result = 1;
+		}
+	  }
+	}
 
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
-      {
-        // ----- Look for not compressed file
-        if ($p_entry['compression'] == 0) {
+	// ----- Look if extraction should be done
+	if ($p_entry['status'] == 'ok') {
 
-    		  // ----- Opening destination file
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
-          {
+	  // ----- Do the extraction (if not a folder)
+	  if (!(($p_entry['external']&0x00000010)==0x00000010))
+	  {
+		// ----- Look for not compressed file
+		if ($p_entry['compression'] == 0) {
 
-            // ----- Change the file status
-            $p_entry['status'] = "write_error";
+			  // ----- Opening destination file
+		  if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
+		  {
 
-            // ----- Return
-            return $v_result;
-          }
+			// ----- Change the file status
+			$p_entry['status'] = "write_error";
+
+			// ----- Return
+			return $v_result;
+		  }
 
 
-          // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-          $v_size = $p_entry['compressed_size'];
-          while ($v_size != 0)
-          {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer = @fread($this->zip_fd, $v_read_size);
-            /* Try to speed up the code
+		  // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+		  $v_size = $p_entry['compressed_size'];
+		  while ($v_size != 0)
+		  {
+			$v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+			$v_buffer = @fread($this->zip_fd, $v_read_size);
+			/* Try to speed up the code
             $v_binary_data = pack('a'.$v_read_size, $v_buffer);
             @fwrite($v_dest_file, $v_binary_data, $v_read_size);
             */
-            @fwrite($v_dest_file, $v_buffer, $v_read_size);
-            $v_size -= $v_read_size;
-          }
+			@fwrite($v_dest_file, $v_buffer, $v_read_size);
+			$v_size -= $v_read_size;
+		  }
 
-          // ----- Closing the destination file
-          fclose($v_dest_file);
+		  // ----- Closing the destination file
+		  fclose($v_dest_file);
 
-          // ----- Change the file mtime
-          touch($p_entry['filename'], $p_entry['mtime']);
+		  // ----- Change the file mtime
+		  touch($p_entry['filename'], $p_entry['mtime']);
 
 
-        }
-        else {
-          // ----- TBC
-          // Need to be finished
-          if (($p_entry['flag'] & 1) == 1) {
-            PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
-            return PclZip::errorCode();
-          }
+		}
+		else {
+		  // ----- TBC
+		  // Need to be finished
+		  if (($p_entry['flag'] & 1) == 1) {
+			PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
+			return PclZip::errorCode();
+		  }
 
 
-          // ----- Look for using temporary file to unzip
-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
-              && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                  || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
-            $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
-            if ($v_result < PCLZIP_ERR_NO_ERROR) {
-              return $v_result;
-            }
-          }
+		  // ----- Look for using temporary file to unzip
+		  if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
+			  && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
+				  || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
+					  && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
+			$v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
+			if ($v_result < PCLZIP_ERR_NO_ERROR) {
+			  return $v_result;
+			}
+		  }
 
-          // ----- Look for extract in memory
-          else {
+		  // ----- Look for extract in memory
+		  else {
 
 
-            // ----- Read the compressed file in a buffer (one shot)
-            $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+			// ----- Read the compressed file in a buffer (one shot)
+			$v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
 
-            // ----- Decompress the file
-            $v_file_content = @gzinflate($v_buffer);
-            unset($v_buffer);
-            if ($v_file_content === FALSE) {
+			// ----- Decompress the file
+			$v_file_content = @gzinflate($v_buffer);
+			unset($v_buffer);
+			if ($v_file_content === FALSE) {
 
-              // ----- Change the file status
-              // TBC
-              $p_entry['status'] = "error";
+			  // ----- Change the file status
+			  // TBC
+			  $p_entry['status'] = "error";
 
-              return $v_result;
-            }
+			  return $v_result;
+			}
 
-            // ----- Opening destination file
-            if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+			// ----- Opening destination file
+			if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
 
-              // ----- Change the file status
-              $p_entry['status'] = "write_error";
+			  // ----- Change the file status
+			  $p_entry['status'] = "write_error";
 
-              return $v_result;
-            }
+			  return $v_result;
+			}
 
-            // ----- Write the uncompressed data
-            @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
-            unset($v_file_content);
+			// ----- Write the uncompressed data
+			@fwrite($v_dest_file, $v_file_content, $p_entry['size']);
+			unset($v_file_content);
 
-            // ----- Closing the destination file
-            @fclose($v_dest_file);
+			// ----- Closing the destination file
+			@fclose($v_dest_file);
 
-          }
+		  }
 
-          // ----- Change the file mtime
-          @touch($p_entry['filename'], $p_entry['mtime']);
-        }
+		  // ----- Change the file mtime
+		  @touch($p_entry['filename'], $p_entry['mtime']);
+		}
 
-        // ----- Look for chmod option
-        if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
+		// ----- Look for chmod option
+		if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
 
-          // ----- Change the mode of the file
-          @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
-        }
+		  // ----- Change the mode of the file
+		  @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
+		}
 
-      }
-    }
+	  }
+	}
 
   	// ----- Change abort status
   	if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
+		$p_entry['status'] = "skipped";
   	}
 
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+	// ----- Look for post-extract callback
+	elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
+	  $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -3966,71 +3966,71 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileUsingTempFile(&$p_entry, &$p_options)
   {
-    $v_result=1;
-
-    // ----- Creates a temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
+	$v_result=1;
+
+	// ----- Creates a temporary file
+	$v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
+	if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
+	  fclose($v_file);
+	  PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
+	  return PclZip::errorCode();
+	}
 
 
-    // ----- Write gz file format header
-    $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
-    @fwrite($v_dest_file, $v_binary_data, 10);
+	// ----- Write gz file format header
+	$v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
+	@fwrite($v_dest_file, $v_binary_data, 10);
 
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+	$v_size = $p_entry['compressed_size'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($this->zip_fd, $v_read_size);
+	  //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+	  @fwrite($v_dest_file, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Write gz file format footer
-    $v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
-    @fwrite($v_dest_file, $v_binary_data, 8);
+	// ----- Write gz file format footer
+	$v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
+	@fwrite($v_dest_file, $v_binary_data, 8);
 
-    // ----- Close the temporary file
-    @fclose($v_dest_file);
+	// ----- Close the temporary file
+	@fclose($v_dest_file);
 
-    // ----- Opening destination file
-    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-      $p_entry['status'] = "write_error";
-      return $v_result;
-    }
+	// ----- Opening destination file
+	if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+	  $p_entry['status'] = "write_error";
+	  return $v_result;
+	}
 
-    // ----- Open the temporary gz file
-    if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
-      @fclose($v_dest_file);
-      $p_entry['status'] = "read_error";
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
+	// ----- Open the temporary gz file
+	if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
+	  @fclose($v_dest_file);
+	  $p_entry['status'] = "read_error";
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+	  return PclZip::errorCode();
+	}
 
 
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['size'];
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @gzread($v_src_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-    @fclose($v_dest_file);
-    @gzclose($v_src_file);
+	// ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+	$v_size = $p_entry['size'];
+	while ($v_size != 0) {
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @gzread($v_src_file, $v_read_size);
+	  //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+	  @fwrite($v_dest_file, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
+	@fclose($v_dest_file);
+	@gzclose($v_src_file);
 
-    // ----- Delete the temporary file
-    @unlink($v_gzip_temp_name);
+	// ----- Delete the temporary file
+	@unlink($v_gzip_temp_name);
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4042,106 +4042,106 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileInOutput(&$p_entry, &$p_options)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
-      return $v_result;
-    }
+	// ----- Read the file header
+	if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+	  return $v_result;
+	}
 
 
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
+	// ----- Check that the file header is coherent with $p_entry info
+	if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+		// TBC
+	}
 
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+	// ----- Look for pre-extract callback
+	if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
 //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
+	  $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+	  if ($v_result == 0) {
+		// ----- Change the file status
+		$p_entry['status'] = "skipped";
+		$v_result = 1;
+	  }
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+		// ----- This status is internal and will be changed in 'skipped'
+		$p_entry['status'] = "aborted";
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
+	  // ----- Update the informations
+	  // Only some fields can be modified
+	  $p_entry['filename'] = $v_local_header['filename'];
+	}
 
-    // ----- Trace
+	// ----- Trace
 
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
+	// ----- Look if extraction should be done
+	if ($p_entry['status'] == 'ok') {
 
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-        if ($p_entry['compressed_size'] == $p_entry['size']) {
+	  // ----- Do the extraction (if not a folder)
+	  if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+		// ----- Look for not compressed file
+		if ($p_entry['compressed_size'] == $p_entry['size']) {
 
-          // ----- Read the file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+		  // ----- Read the file in a buffer (one shot)
+		  $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
 
-          // ----- Send the file to the output
-          echo $v_buffer;
-          unset($v_buffer);
-        }
-        else {
+		  // ----- Send the file to the output
+		  echo $v_buffer;
+		  unset($v_buffer);
+		}
+		else {
 
-          // ----- Read the compressed file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+		  // ----- Read the compressed file in a buffer (one shot)
+		  $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
 
-          // ----- Decompress the file
-          $v_file_content = gzinflate($v_buffer);
-          unset($v_buffer);
+		  // ----- Decompress the file
+		  $v_file_content = gzinflate($v_buffer);
+		  unset($v_buffer);
 
-          // ----- Send the file to the output
-          echo $v_file_content;
-          unset($v_file_content);
-        }
-      }
-    }
+		  // ----- Send the file to the output
+		  echo $v_file_content;
+		  unset($v_file_content);
+		}
+	  }
+	}
 
 	// ----- Change abort status
 	if ($p_entry['status'] == "aborted") {
-      $p_entry['status'] = "skipped";
+	  $p_entry['status'] = "skipped";
 	}
 
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+	// ----- Look for post-extract callback
+	elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
+	  $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
+	}
 
-    return $v_result;
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4153,116 +4153,116 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
   {
-    $v_result=1;
-
-    // ----- Read the file header
-    $v_header = array();
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	$v_result=1;
+
+	// ----- Read the file header
+	$v_header = array();
+	if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
 
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
+	// ----- Check that the file header is coherent with $p_entry info
+	if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+		// TBC
+	}
 
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
+	// ----- Look for pre-extract callback
+	if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
+	  $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+	  if ($v_result == 0) {
+		// ----- Change the file status
+		$p_entry['status'] = "skipped";
+		$v_result = 1;
+	  }
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+		// ----- This status is internal and will be changed in 'skipped'
+		$p_entry['status'] = "aborted";
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
+	  // ----- Update the informations
+	  // Only some fields can be modified
+	  $p_entry['filename'] = $v_local_header['filename'];
+	}
 
 
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
+	// ----- Look if extraction should be done
+	if ($p_entry['status'] == 'ok') {
 
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
+	  // ----- Do the extraction (if not a folder)
+	  if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+		// ----- Look for not compressed file
   //      if ($p_entry['compressed_size'] == $p_entry['size'])
-        if ($p_entry['compression'] == 0) {
+		if ($p_entry['compression'] == 0) {
 
-          // ----- Reading the file
-          $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
-        }
-        else {
+		  // ----- Reading the file
+		  $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
+		}
+		else {
 
-          // ----- Reading the file
-          $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
+		  // ----- Reading the file
+		  $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
 
-          // ----- Decompress the file
-          if (($p_string = @gzinflate($v_data)) === FALSE) {
-              // TBC
-          }
-        }
+		  // ----- Decompress the file
+		  if (($p_string = @gzinflate($v_data)) === FALSE) {
+			  // TBC
+		  }
+		}
 
-        // ----- Trace
-      }
-      else {
-          // TBC : error : can not extract a folder in a string
-      }
+		// ----- Trace
+	  }
+	  else {
+		  // TBC : error : can not extract a folder in a string
+	  }
 
-    }
+	}
 
   	// ----- Change abort status
   	if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
+		$p_entry['status'] = "skipped";
   	}
 
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+	// ----- Look for post-extract callback
+	elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+	  // ----- Generate a local information
+	  $v_local_header = array();
+	  $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
 
-      // ----- Swap the content to header
-      $v_local_header['content'] = $p_string;
-      $p_string = '';
+	  // ----- Swap the content to header
+	  $v_local_header['content'] = $p_string;
+	  $p_string = '';
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+	  // ----- Call the callback
+	  // Here I do not use call_user_func() because I need to send a reference to the
+	  // header.
+	  $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
 
-      // ----- Swap back the content to header
-      $p_string = $v_local_header['content'];
-      unset($v_local_header['content']);
+	  // ----- Swap back the content to header
+	  $p_string = $v_local_header['content'];
+	  unset($v_local_header['content']);
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
+	  // ----- Look for abort result
+	  if ($v_result == 2) {
+	  	$v_result = PCLZIP_ERR_USER_ABORTED;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4274,98 +4274,98 @@ 
   // --------------------------------------------------------------------------------
   function privReadFileHeader(&$p_header)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
+	// ----- Read the 4 bytes signature
+	$v_binary_data = @fread($this->zip_fd, 4);
+	$v_data = unpack('Vid', $v_binary_data);
 
-    // ----- Check signature
-    if ($v_data['id'] != 0x04034b50)
-    {
+	// ----- Check signature
+	if ($v_data['id'] != 0x04034b50)
+	{
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 26);
+	// ----- Read the first 42 bytes of the header
+	$v_binary_data = fread($this->zip_fd, 26);
 
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 26)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
+	// ----- Look for invalid block size
+	if (strlen($v_binary_data) != 26)
+	{
+	  $p_header['filename'] = "";
+	  $p_header['status'] = "invalid_header";
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Extract the values
-    $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
+	// ----- Extract the values
+	$v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
 
-    // ----- Get filename
-    $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
+	// ----- Get filename
+	$p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
 
-    // ----- Get extra_fields
-    if ($v_data['extra_len'] != 0) {
-      $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
-    }
-    else {
-      $p_header['extra'] = '';
-    }
+	// ----- Get extra_fields
+	if ($v_data['extra_len'] != 0) {
+	  $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
+	}
+	else {
+	  $p_header['extra'] = '';
+	}
 
-    // ----- Extract properties
-    $p_header['version_extracted'] = $v_data['version'];
-    $p_header['compression'] = $v_data['compression'];
-    $p_header['size'] = $v_data['size'];
-    $p_header['compressed_size'] = $v_data['compressed_size'];
-    $p_header['crc'] = $v_data['crc'];
-    $p_header['flag'] = $v_data['flag'];
-    $p_header['filename_len'] = $v_data['filename_len'];
-
-    // ----- Recuperate date in UNIX format
-    $p_header['mdate'] = $v_data['mdate'];
-    $p_header['mtime'] = $v_data['mtime'];
-    if ($p_header['mdate'] && $p_header['mtime'])
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+	// ----- Extract properties
+	$p_header['version_extracted'] = $v_data['version'];
+	$p_header['compression'] = $v_data['compression'];
+	$p_header['size'] = $v_data['size'];
+	$p_header['compressed_size'] = $v_data['compressed_size'];
+	$p_header['crc'] = $v_data['crc'];
+	$p_header['flag'] = $v_data['flag'];
+	$p_header['filename_len'] = $v_data['filename_len'];
+
+	// ----- Recuperate date in UNIX format
+	$p_header['mdate'] = $v_data['mdate'];
+	$p_header['mtime'] = $v_data['mtime'];
+	if ($p_header['mdate'] && $p_header['mtime'])
+	{
+	  // ----- Extract time
+	  $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
+	  $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
+	  $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+
+	  // ----- Extract date
+	  $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+	  $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+	  $v_day = $p_header['mdate'] & 0x001F;
+
+	  // ----- Get UNIX date format
+	  $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
 
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
+	}
+	else
+	{
+	  $p_header['mtime'] = time();
+	}
 
-    // TBC
-    //for(reset($v_data); $key = key($v_data); next($v_data)) {
-    //}
+	// TBC
+	//for(reset($v_data); $key = key($v_data); next($v_data)) {
+	//}
 
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
+	// ----- Set the stored filename
+	$p_header['stored_filename'] = $p_header['filename'];
 
-    // ----- Set the status field
-    $p_header['status'] = "ok";
+	// ----- Set the status field
+	$p_header['status'] = "ok";
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4377,101 +4377,101 @@ 
   // --------------------------------------------------------------------------------
   function privReadCentralFileHeader(&$p_header)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
+	// ----- Read the 4 bytes signature
+	$v_binary_data = @fread($this->zip_fd, 4);
+	$v_data = unpack('Vid', $v_binary_data);
 
-    // ----- Check signature
-    if ($v_data['id'] != 0x02014b50)
-    {
+	// ----- Check signature
+	if ($v_data['id'] != 0x02014b50)
+	{
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 42);
+	// ----- Read the first 42 bytes of the header
+	$v_binary_data = fread($this->zip_fd, 42);
 
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 42)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
+	// ----- Look for invalid block size
+	if (strlen($v_binary_data) != 42)
+	{
+	  $p_header['filename'] = "";
+	  $p_header['status'] = "invalid_header";
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Extract the values
-    $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'] = '';
-
-    // ----- Get 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'] = '';
-
-    // ----- Extract properties
-
-    // ----- Recuperate date in UNIX format
-    //if ($p_header['mdate'] && $p_header['mtime'])
-    // TBC : bug : this was ignoring time with 0/0/0
-    if (1)
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+	// ----- Extract the values
+	$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'] = '';
+
+	// ----- Get 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'] = '';
+
+	// ----- Extract properties
+
+	// ----- Recuperate date in UNIX format
+	//if ($p_header['mdate'] && $p_header['mtime'])
+	// TBC : bug : this was ignoring time with 0/0/0
+	if (1)
+	{
+	  // ----- Extract time
+	  $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
+	  $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
+	  $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+
+	  // ----- Extract date
+	  $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+	  $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+	  $v_day = $p_header['mdate'] & 0x001F;
+
+	  // ----- Get UNIX date format
+	  $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
 
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
+	}
+	else
+	{
+	  $p_header['mtime'] = time();
+	}
 
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
+	// ----- Set the stored filename
+	$p_header['stored_filename'] = $p_header['filename'];
 
-    // ----- Set default status to ok
-    $p_header['status'] = 'ok';
+	// ----- Set default status to ok
+	$p_header['status'] = 'ok';
 
-    // ----- Look if it is a directory
-    if (substr($p_header['filename'], -1) == '/') {
-      //$p_header['external'] = 0x41FF0010;
-      $p_header['external'] = 0x00000010;
-    }
+	// ----- Look if it is a directory
+	if (substr($p_header['filename'], -1) == '/') {
+	  //$p_header['external'] = 0x41FF0010;
+	  $p_header['external'] = 0x00000010;
+	}
 
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4485,7 +4485,7 @@ 
   // --------------------------------------------------------------------------------
   function privCheckFileHeaders(&$p_local_header, &$p_central_header)
   {
-    $v_result=1;
+	$v_result=1;
 
   	// ----- Check the static values
   	// TBC
@@ -4504,13 +4504,13 @@ 
 
   	// ----- Look for flag bit 3
   	if (($p_local_header['flag'] & 8) == 8) {
-          $p_local_header['size'] = $p_central_header['size'];
-          $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
-          $p_local_header['crc'] = $p_central_header['crc'];
+		  $p_local_header['size'] = $p_central_header['size'];
+		  $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
+		  $p_local_header['crc'] = $p_central_header['crc'];
   	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4522,152 +4522,152 @@ 
   // --------------------------------------------------------------------------------
   function privReadEndCentralDir(&$p_central_dir)
   {
-    $v_result=1;
-
-    // ----- Go to the end of the zip file
-    $v_size = filesize($this->zipname);
-    @fseek($this->zip_fd, $v_size);
-    if (@ftell($this->zip_fd) != $v_size)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	$v_result=1;
+
+	// ----- Go to the end of the zip file
+	$v_size = filesize($this->zipname);
+	@fseek($this->zip_fd, $v_size);
+	if (@ftell($this->zip_fd) != $v_size)
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
+
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- First try : look if this is an archive with no commentaries (most of the time)
-    // in this case the end of central dir is at 22 bytes of the file end
-    $v_found = 0;
-    if ($v_size > 26) {
-      @fseek($this->zip_fd, $v_size-22);
-      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
+	// ----- First try : look if this is an archive with no commentaries (most of the time)
+	// in this case the end of central dir is at 22 bytes of the file end
+	$v_found = 0;
+	if ($v_size > 26) {
+	  @fseek($this->zip_fd, $v_size-22);
+	  if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
+	  {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+
+		// ----- Return
+		return PclZip::errorCode();
+	  }
 
-      // ----- Read for bytes
-      $v_binary_data = @fread($this->zip_fd, 4);
-      $v_data = @unpack('Vid', $v_binary_data);
+	  // ----- Read for bytes
+	  $v_binary_data = @fread($this->zip_fd, 4);
+	  $v_data = @unpack('Vid', $v_binary_data);
 
-      // ----- Check signature
-      if ($v_data['id'] == 0x06054b50) {
-        $v_found = 1;
-      }
+	  // ----- Check signature
+	  if ($v_data['id'] == 0x06054b50) {
+		$v_found = 1;
+	  }
 
-      $v_pos = ftell($this->zip_fd);
-    }
+	  $v_pos = ftell($this->zip_fd);
+	}
 
-    // ----- 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;
-      @fseek($this->zip_fd, $v_size-$v_maximum_size);
-      if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
+	// ----- 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;
+	  @fseek($this->zip_fd, $v_size-$v_maximum_size);
+	  if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
+	  {
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+
+		// ----- Return
+		return PclZip::errorCode();
+	  }
 
-      // ----- Read byte per byte in order to find the signature
-      $v_pos = ftell($this->zip_fd);
-      $v_bytes = 0x00000000;
-      while ($v_pos < $v_size)
-      {
-        // ----- Read a byte
-        $v_byte = @fread($this->zip_fd, 1);
-
-        // -----  Add the byte
-        //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
-        // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
-        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
-
-        // ----- Compare the bytes
-        if ($v_bytes == 0x504b0506)
-        {
-          $v_pos++;
-          break;
-        }
-
-        $v_pos++;
-      }
+	  // ----- Read byte per byte in order to find the signature
+	  $v_pos = ftell($this->zip_fd);
+	  $v_bytes = 0x00000000;
+	  while ($v_pos < $v_size)
+	  {
+		// ----- Read a byte
+		$v_byte = @fread($this->zip_fd, 1);
+
+		// -----  Add the byte
+		//$v_bytes = ($v_bytes << 8) | Ord($v_byte);
+		// Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
+		// Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
+		$v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
+
+		// ----- Compare the bytes
+		if ($v_bytes == 0x504b0506)
+		{
+		  $v_pos++;
+		  break;
+		}
+
+		$v_pos++;
+	  }
 
-      // ----- Look if not found end of central dir
-      if ($v_pos == $v_size)
-      {
+	  // ----- Look if not found end of central dir
+	  if ($v_pos == $v_size)
+	  {
 
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
+		// ----- Error log
+		PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
 
-        // ----- Return
-        return PclZip::errorCode();
-      }
-    }
+		// ----- Return
+		return PclZip::errorCode();
+	  }
+	}
 
-    // ----- Read the first 18 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 18);
+	// ----- Read the first 18 bytes of the header
+	$v_binary_data = fread($this->zip_fd, 18);
 
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 18)
-    {
+	// ----- Look for invalid block size
+	if (strlen($v_binary_data) != 18)
+	{
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Extract the values
-    $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
+	// ----- Extract the values
+	$v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
 
-    // ----- Check the global size
-    if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
+	// ----- Check the global size
+	if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
 
 	  // ----- Removed in release 2.2 see readme file
 	  // The check of the file size is a little too strict.
 	  // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
 	  // While decrypted, zip has training 0 bytes
 	  if (0) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
-	                       'The central dir is not at the end of the archive.'
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
+						   'The central dir is not at the end of the archive.'
 						   .' Some trailing bytes exists after the archive.');
 
-      // ----- Return
-      return PclZip::errorCode();
+	  // ----- Return
+	  return PclZip::errorCode();
 	  }
-    }
+	}
 
-    // ----- 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'] = '';
-
-    $p_central_dir['entries'] = $v_data['entries'];
-    $p_central_dir['disk_entries'] = $v_data['disk_entries'];
-    $p_central_dir['offset'] = $v_data['offset'];
-    $p_central_dir['size'] = $v_data['size'];
-    $p_central_dir['disk'] = $v_data['disk'];
-    $p_central_dir['disk_start'] = $v_data['disk_start'];
-
-    // TBC
-    //for(reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
-    //}
-
-    // ----- Return
-    return $v_result;
+	// ----- 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'] = '';
+
+	$p_central_dir['entries'] = $v_data['entries'];
+	$p_central_dir['disk_entries'] = $v_data['disk_entries'];
+	$p_central_dir['offset'] = $v_data['offset'];
+	$p_central_dir['size'] = $v_data['size'];
+	$p_central_dir['disk'] = $v_data['disk'];
+	$p_central_dir['disk_start'] = $v_data['disk_start'];
+
+	// TBC
+	//for(reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
+	//}
+
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4679,96 +4679,96 @@ 
   // --------------------------------------------------------------------------------
   function privDeleteByRule(&$p_result_list, &$p_options)
   {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	$v_result=1;
+	$v_list_detail = array();
+
+	// ----- Open the zip file
+	if (($v_result=$this->privOpenFd('rb')) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
+	// ----- Read the central directory informations
+	$v_central_dir = array();
+	if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	{
+	  $this->privCloseFd();
+	  return $v_result;
+	}
 
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
+	// ----- Go to beginning of File
+	@rewind($this->zip_fd);
 
-    // ----- Scan all the files
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_pos_entry))
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
+	// ----- Scan all the files
+	// ----- Start at beginning of Central Dir
+	$v_pos_entry = $v_central_dir['offset'];
+	@rewind($this->zip_fd);
+	if (@fseek($this->zip_fd, $v_pos_entry))
+	{
+	  // ----- Close the zip file
+	  $this->privCloseFd();
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Read each entry
-    $v_header_list = array();
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
+	// ----- Read each entry
+	$v_header_list = array();
+	$j_start = 0;
+	for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+	{
 
-      // ----- Read the file header
-      $v_header_list[$v_nb_extracted] = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
+	  // ----- Read the file header
+	  $v_header_list[$v_nb_extracted] = array();
+	  if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)
+	  {
+		// ----- Close the zip file
+		$this->privCloseFd();
 
-        return $v_result;
-      }
+		return $v_result;
+	  }
 
 
-      // ----- Store the index
-      $v_header_list[$v_nb_extracted]['index'] = $i;
-
-      // ----- Look for the specific extract rules
-      $v_found = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  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 */
-                          && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_found = true;
-              }
-          }
-      }
+	  // ----- Store the index
+	  $v_header_list[$v_nb_extracted]['index'] = $i;
+
+	  // ----- Look for the specific extract rules
+	  $v_found = false;
+
+	  // ----- Look for extract by name rule
+	  if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+		  && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+
+		  // ----- Look if the filename is in the list
+		  for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
+
+			  // ----- Look for a directory
+			  if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+
+				  // ----- Look if the directory is in the filename path
+				  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 */
+						  && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+					  $v_found = true;
+				  }
+			  }
+			  // ----- Look for a filename
+			  elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+				  $v_found = true;
+			  }
+		  }
+	  }
 
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /*
+	  // ----- Look for extract by ereg rule
+	  // ereg() is deprecated with PHP 5.3
+	  /*
       else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
                && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
 
@@ -4778,201 +4778,201 @@ 
       }
       */
 
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+	  // ----- Look for extract by preg rule
+	  else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+			   && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
 
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
+		  if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
+			  $v_found = true;
+		  }
+	  }
 
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+	  // ----- Look for extract by index rule
+	  else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+			   && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
 
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
+		  // ----- Look if the index is in the list
+		  for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
 
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_found = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
+			  if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+				  $v_found = true;
+			  }
+			  if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+				  $j_start = $j+1;
+			  }
 
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-      else {
-      	$v_found = true;
-      }
+			  if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+				  break;
+			  }
+		  }
+	  }
+	  else {
+	  	$v_found = true;
+	  }
 
-      // ----- Look for deletion
-      if ($v_found)
-      {
-        unset($v_header_list[$v_nb_extracted]);
-      }
-      else
-      {
-        $v_nb_extracted++;
-      }
-    }
+	  // ----- Look for deletion
+	  if ($v_found)
+	  {
+		unset($v_header_list[$v_nb_extracted]);
+	  }
+	  else
+	  {
+		$v_nb_extracted++;
+	  }
+	}
 
-    // ----- Look if something need to be deleted
-    if ($v_nb_extracted > 0) {
-
-        // ----- Creates a temporay file
-        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-        // ----- Creates a temporary zip archive
-        $v_temp_zip = new PclZip($v_zip_temp_name);
-
-        // ----- Open the temporary zip file in write mode
-        if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
-            $this->privCloseFd();
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Look which file need to be kept
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
-
-            // ----- Calculate the position of the header
-            @rewind($this->zip_fd);
-            if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-                // ----- Return
-                return PclZip::errorCode();
-            }
-
-            // ----- Read the file header
-            $v_local_header = array();
-            if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Check that local file header is same as central file header
-            if ($this->privCheckFileHeaders($v_local_header,
-			                                $v_header_list[$i]) != 1) {
-                // TBC
-            }
-            unset($v_local_header);
-
-            // ----- Write the file header
-            if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Read/write the data block
-            if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-        }
-
-        // ----- Store the offset of the central dir
-        $v_offset = @ftell($v_temp_zip->zip_fd);
-
-        // ----- Re-Create the Central Dir files header
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
-            // ----- Create the file header
-            if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-                $v_temp_zip->privCloseFd();
-                $this->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Transform the header to a 'usable' info
-            $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-        }
-
-
-        // ----- Zip file comment
-        $v_comment = '';
-        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-          $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-        }
-
-        // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
-
-        // ----- Create the central dir footer
-        if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
-            // ----- Reset the file list
-            unset($v_header_list);
-            $v_temp_zip->privCloseFd();
-            $this->privCloseFd();
-            @unlink($v_zip_temp_name);
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Close
-        $v_temp_zip->privCloseFd();
-        $this->privCloseFd();
-
-        // ----- Delete the zip file
-        // TBC : I should test the result ...
-        @unlink($this->zipname);
-
-        // ----- Rename the temporary file
-        // TBC : I should test the result ...
-        //@rename($v_zip_temp_name, $this->zipname);
-        PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-        // ----- Destroy the temporary archive
-        unset($v_temp_zip);
-    }
+	// ----- Look if something need to be deleted
+	if ($v_nb_extracted > 0) {
+
+		// ----- Creates a temporay file
+		$v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+
+		// ----- Creates a temporary zip archive
+		$v_temp_zip = new PclZip($v_zip_temp_name);
+
+		// ----- Open the temporary zip file in write mode
+		if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
+			$this->privCloseFd();
+
+			// ----- Return
+			return $v_result;
+		}
+
+		// ----- Look which file need to be kept
+		for ($i=0; $i<sizeof($v_header_list); $i++) {
+
+			// ----- Calculate the position of the header
+			@rewind($this->zip_fd);
+			if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
+				// ----- Close the zip file
+				$this->privCloseFd();
+				$v_temp_zip->privCloseFd();
+				@unlink($v_zip_temp_name);
+
+				// ----- Error log
+				PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+				// ----- Return
+				return PclZip::errorCode();
+			}
+
+			// ----- Read the file header
+			$v_local_header = array();
+			if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
+				// ----- Close the zip file
+				$this->privCloseFd();
+				$v_temp_zip->privCloseFd();
+				@unlink($v_zip_temp_name);
+
+				// ----- Return
+				return $v_result;
+			}
+
+			// ----- Check that local file header is same as central file header
+			if ($this->privCheckFileHeaders($v_local_header,
+											$v_header_list[$i]) != 1) {
+				// TBC
+			}
+			unset($v_local_header);
+
+			// ----- Write the file header
+			if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
+				// ----- Close the zip file
+				$this->privCloseFd();
+				$v_temp_zip->privCloseFd();
+				@unlink($v_zip_temp_name);
+
+				// ----- Return
+				return $v_result;
+			}
+
+			// ----- Read/write the data block
+			if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
+				// ----- Close the zip file
+				$this->privCloseFd();
+				$v_temp_zip->privCloseFd();
+				@unlink($v_zip_temp_name);
+
+				// ----- Return
+				return $v_result;
+			}
+		}
+
+		// ----- Store the offset of the central dir
+		$v_offset = @ftell($v_temp_zip->zip_fd);
+
+		// ----- Re-Create the Central Dir files header
+		for ($i=0; $i<sizeof($v_header_list); $i++) {
+			// ----- Create the file header
+			if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+				$v_temp_zip->privCloseFd();
+				$this->privCloseFd();
+				@unlink($v_zip_temp_name);
+
+				// ----- Return
+				return $v_result;
+			}
+
+			// ----- Transform the header to a 'usable' info
+			$v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+		}
+
+
+		// ----- Zip file comment
+		$v_comment = '';
+		if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+		  $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+		}
+
+		// ----- Calculate the size of the central header
+		$v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
+
+		// ----- Create the central dir footer
+		if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
+			// ----- Reset the file list
+			unset($v_header_list);
+			$v_temp_zip->privCloseFd();
+			$this->privCloseFd();
+			@unlink($v_zip_temp_name);
+
+			// ----- Return
+			return $v_result;
+		}
+
+		// ----- Close
+		$v_temp_zip->privCloseFd();
+		$this->privCloseFd();
+
+		// ----- Delete the zip file
+		// TBC : I should test the result ...
+		@unlink($this->zipname);
+
+		// ----- Rename the temporary file
+		// TBC : I should test the result ...
+		//@rename($v_zip_temp_name, $this->zipname);
+		PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+		// ----- Destroy the temporary archive
+		unset($v_temp_zip);
+	}
 
-    // ----- Remove every files : reset the file
-    else if ($v_central_dir['entries'] != 0) {
-        $this->privCloseFd();
+	// ----- Remove every files : reset the file
+	else if ($v_central_dir['entries'] != 0) {
+		$this->privCloseFd();
 
-        if (($v_result = $this->privOpenFd('wb')) != 1) {
-          return $v_result;
-        }
+		if (($v_result = $this->privOpenFd('wb')) != 1) {
+		  return $v_result;
+		}
 
-        if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
-          return $v_result;
-        }
+		if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
+		  return $v_result;
+		}
 
-        $this->privCloseFd();
-    }
+		$this->privCloseFd();
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -4989,49 +4989,49 @@ 
   // --------------------------------------------------------------------------------
   function privDirCheck($p_dir, $p_is_dir=false)
   {
-    $v_result = 1;
+	$v_result = 1;
 
 
-    // ----- Remove the final '/'
-    if (($p_is_dir) && (substr($p_dir, -1)=='/'))
-    {
-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
-    }
+	// ----- Remove the final '/'
+	if (($p_is_dir) && (substr($p_dir, -1)=='/'))
+	{
+	  $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
+	}
 
-    // ----- Check the directory availability
-    if ((is_dir($p_dir)) || ($p_dir == ""))
-    {
-      return 1;
-    }
+	// ----- Check the directory availability
+	if ((is_dir($p_dir)) || ($p_dir == ""))
+	{
+	  return 1;
+	}
 
-    // ----- Extract parent directory
-    $p_parent_dir = dirname($p_dir);
-
-    // ----- Just a check
-    if ($p_parent_dir != $p_dir)
-    {
-      // ----- Look for parent directory
-      if ($p_parent_dir != "")
-      {
-        if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)
-        {
-          return $v_result;
-        }
-      }
-    }
+	// ----- Extract parent directory
+	$p_parent_dir = dirname($p_dir);
+
+	// ----- Just a check
+	if ($p_parent_dir != $p_dir)
+	{
+	  // ----- Look for parent directory
+	  if ($p_parent_dir != "")
+	  {
+		if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)
+		{
+		  return $v_result;
+		}
+	  }
+	}
 
-    // ----- Create the directory
-    if (!@mkdir($p_dir, 0777))
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
+	// ----- Create the directory
+	if (!@mkdir($p_dir, 0777))
+	{
+	  // ----- Error log
+	  PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5044,180 +5044,180 @@ 
   // --------------------------------------------------------------------------------
   function privMerge(&$p_archive_to_add)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Look if the archive_to_add exists
-    if (!is_file($p_archive_to_add->zipname))
-    {
+	// ----- Look if the archive_to_add exists
+	if (!is_file($p_archive_to_add->zipname))
+	{
 
-      // ----- Nothing to merge, so merge is a success
-      $v_result = 1;
+	  // ----- Nothing to merge, so merge is a success
+	  $v_result = 1;
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Look if the archive exists
-    if (!is_file($this->zipname))
-    {
+	// ----- Look if the archive exists
+	if (!is_file($this->zipname))
+	{
 
-      // ----- Do a duplicate
-      $v_result = $this->privDuplicate($p_archive_to_add->zipname);
+	  // ----- Do a duplicate
+	  $v_result = $this->privDuplicate($p_archive_to_add->zipname);
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	// ----- Open the zip file
+	if (($v_result=$this->privOpenFd('rb')) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
+	// ----- Read the central directory informations
+	$v_central_dir = array();
+	if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+	{
+	  $this->privCloseFd();
+	  return $v_result;
+	}
 
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
+	// ----- Go to beginning of File
+	@rewind($this->zip_fd);
 
-    // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
-    {
-      $this->privCloseFd();
+	// ----- Open the archive_to_add file
+	if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
+	{
+	  $this->privCloseFd();
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Read the central directory informations
-    $v_central_dir_to_add = array();
-    if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
+	// ----- Read the central directory informations
+	$v_central_dir_to_add = array();
+	if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
+	{
+	  $this->privCloseFd();
+	  $p_archive_to_add->privCloseFd();
 
-      return $v_result;
-    }
+	  return $v_result;
+	}
 
-    // ----- Go to beginning of File
-    @rewind($p_archive_to_add->zip_fd);
+	// ----- Go to beginning of File
+	@rewind($p_archive_to_add->zip_fd);
 
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+	// ----- Creates a temporay file
+	$v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
 
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
+	// ----- Open the temporary file in write mode
+	if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
+	{
+	  $this->privCloseFd();
+	  $p_archive_to_add->privCloseFd();
 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Copy the files from the archive to the temporary file
+	// TBC : Here I should better append the file and go back to erase the central dir
+	$v_size = $v_central_dir['offset'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = fread($this->zip_fd, $v_read_size);
+	  @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Copy the files from the archive_to_add into the temporary file
-    $v_size = $v_central_dir_to_add['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Copy the files from the archive_to_add into the temporary file
+	$v_size = $v_central_dir_to_add['offset'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
+	  @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($v_zip_temp_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Store the offset of the central dir
+	$v_offset = @ftell($v_zip_temp_fd);
+
+	// ----- Copy the block of file headers from the old archive
+	$v_size = $v_central_dir['size'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($this->zip_fd, $v_read_size);
+	  @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Copy the block of file headers from the archive_to_add
-    $v_size = $v_central_dir_to_add['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Copy the block of file headers from the archive_to_add
+	$v_size = $v_central_dir_to_add['size'];
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
+	  @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Merge the file comments
-    $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
+	// ----- Merge the file comments
+	$v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
 
-    // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
+	// ----- Calculate the size of the (new) central header
+	$v_size = @ftell($v_zip_temp_fd)-$v_offset;
 
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive fd
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
+	// ----- Swap the file descriptor
+	// Here is a trick : I swap the temporary fd with the zip fd, in order to use
+	// the following methods on the temporary fil and not the real archive fd
+	$v_swap = $this->zip_fd;
+	$this->zip_fd = $v_zip_temp_fd;
+	$v_zip_temp_fd = $v_swap;
 
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-      @fclose($v_zip_temp_fd);
-      $this->zip_fd = null;
+	// ----- Create the central dir footer
+	if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
+	{
+	  $this->privCloseFd();
+	  $p_archive_to_add->privCloseFd();
+	  @fclose($v_zip_temp_fd);
+	  $this->zip_fd = null;
 
-      // ----- Reset the file list
-      unset($v_header_list);
+	  // ----- Reset the file list
+	  unset($v_header_list);
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
+	// ----- Swap back the file descriptor
+	$v_swap = $this->zip_fd;
+	$this->zip_fd = $v_zip_temp_fd;
+	$v_zip_temp_fd = $v_swap;
 
-    // ----- Close
-    $this->privCloseFd();
-    $p_archive_to_add->privCloseFd();
+	// ----- Close
+	$this->privCloseFd();
+	$p_archive_to_add->privCloseFd();
 
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
+	// ----- Close the temporary file
+	@fclose($v_zip_temp_fd);
 
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
+	// ----- Delete the zip file
+	// TBC : I should test the result ...
+	@unlink($this->zipname);
 
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
+	// ----- Rename the temporary file
+	// TBC : I should test the result ...
+	//@rename($v_zip_temp_name, $this->zipname);
+	PclZipUtilRename($v_zip_temp_name, $this->zipname);
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5229,56 +5229,56 @@ 
   // --------------------------------------------------------------------------------
   function privDuplicate($p_archive_filename)
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Look if the $p_archive_filename exists
-    if (!is_file($p_archive_filename))
-    {
+	// ----- Look if the $p_archive_filename exists
+	if (!is_file($p_archive_filename))
+	{
 
-      // ----- Nothing to duplicate, so duplicate is a success.
-      $v_result = 1;
+	  // ----- Nothing to duplicate, so duplicate is a success.
+	  $v_result = 1;
 
-      // ----- Return
-      return $v_result;
-    }
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+	// ----- Open the zip file
+	if (($v_result=$this->privOpenFd('wb')) != 1)
+	{
+	  // ----- Return
+	  return $v_result;
+	}
 
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)
-    {
-      $this->privCloseFd();
+	// ----- Open the temporary file in write mode
+	if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)
+	{
+	  $this->privCloseFd();
 
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
+	  PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
+	  // ----- Return
+	  return PclZip::errorCode();
+	}
 
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = filesize($p_archive_filename);
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
+	// ----- Copy the files from the archive to the temporary file
+	// TBC : Here I should better append the file and go back to erase the central dir
+	$v_size = filesize($p_archive_filename);
+	while ($v_size != 0)
+	{
+	  $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+	  $v_buffer = fread($v_zip_temp_fd, $v_read_size);
+	  @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+	  $v_size -= $v_read_size;
+	}
 
-    // ----- Close
-    $this->privCloseFd();
+	// ----- Close
+	$this->privCloseFd();
 
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
+	// ----- Close the temporary file
+	@fclose($v_zip_temp_fd);
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5289,13 +5289,13 @@ 
   // --------------------------------------------------------------------------------
   function privErrorLog($p_error_code=0, $p_error_string='')
   {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclError($p_error_code, $p_error_string);
-    }
-    else {
-      $this->error_code = $p_error_code;
-      $this->error_string = $p_error_string;
-    }
+	if (PCLZIP_ERROR_EXTERNAL == 1) {
+	  PclError($p_error_code, $p_error_string);
+	}
+	else {
+	  $this->error_code = $p_error_code;
+	  $this->error_string = $p_error_string;
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -5306,13 +5306,13 @@ 
   // --------------------------------------------------------------------------------
   function privErrorReset()
   {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclErrorReset();
-    }
-    else {
-      $this->error_code = 0;
-      $this->error_string = '';
-    }
+	if (PCLZIP_ERROR_EXTERNAL == 1) {
+	  PclErrorReset();
+	}
+	else {
+	  $this->error_code = 0;
+	  $this->error_string = '';
+	}
   }
   // --------------------------------------------------------------------------------
 
@@ -5324,17 +5324,17 @@ 
   // --------------------------------------------------------------------------------
   function privDisableMagicQuotes()
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
+	// ----- Look if function exists
+	if (   (!function_exists("get_magic_quotes_runtime"))
+		|| (!function_exists("set_magic_quotes_runtime"))) {
+	  return $v_result;
 	}
 
-    // ----- Look if already done
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
+	// ----- Look if already done
+	if ($this->magic_quotes_status != -1) {
+	  return $v_result;
 	}
 
 	// ----- Get and memorize the magic_quote value
@@ -5345,8 +5345,8 @@ 
 	  @set_magic_quotes_runtime(0);
 	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5358,17 +5358,17 @@ 
   // --------------------------------------------------------------------------------
   function privSwapBackMagicQuotes()
   {
-    $v_result=1;
+	$v_result=1;
 
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
+	// ----- Look if function exists
+	if (   (!function_exists("get_magic_quotes_runtime"))
+		|| (!function_exists("set_magic_quotes_runtime"))) {
+	  return $v_result;
 	}
 
-    // ----- Look if something to do
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
+	// ----- Look if something to do
+	if ($this->magic_quotes_status != -1) {
+	  return $v_result;
 	}
 
 	// ----- Swap back magic_quotes
@@ -5376,8 +5376,8 @@ 
   	  @set_magic_quotes_runtime($this->magic_quotes_status);
 	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5393,67 +5393,67 @@ 
   // --------------------------------------------------------------------------------
   function PclZipUtilPathReduction($p_dir)
   {
-    $v_result = "";
-
-    // ----- Look for not empty path
-    if ($p_dir != "") {
-      // ----- Explode path by directory names
-      $v_list = explode("/", $p_dir);
-
-      // ----- Study directories from last to first
-      $v_skip = 0;
-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
-        // ----- Look for current path
-        if ($v_list[$i] == ".") {
-          // ----- Ignore this directory
-          // Should be the first $i=0, but no check is done
-        }
-        else if ($v_list[$i] == "..") {
+	$v_result = "";
+
+	// ----- Look for not empty path
+	if ($p_dir != "") {
+	  // ----- Explode path by directory names
+	  $v_list = explode("/", $p_dir);
+
+	  // ----- Study directories from last to first
+	  $v_skip = 0;
+	  for ($i=sizeof($v_list)-1; $i>=0; $i--) {
+		// ----- Look for current path
+		if ($v_list[$i] == ".") {
+		  // ----- Ignore this directory
+		  // Should be the first $i=0, but no check is done
+		}
+		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;
-		    if ($v_skip > 0) {
-		        // ----- It is an invalid path, so the path is not modified
-		        // TBC
-		        $v_result = $p_dir;
-                $v_skip = 0;
-		    }
+			$v_result = "/".$v_result;
+			if ($v_skip > 0) {
+				// ----- It is an invalid path, so the path is not modified
+				// TBC
+				$v_result = $p_dir;
+				$v_skip = 0;
+			}
 		  }
 		  // ----- Last '/' i.e. indicates a directory
 		  else if ($i == (sizeof($v_list)-1)) {
-            $v_result = $v_list[$i];
+			$v_result = $v_list[$i];
 		  }
 		  // ----- Double '/' inside the path
 		  else {
-            // ----- Ignore only the double '//' in path,
-            // but not the first and last '/'
+			// ----- 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--;
+			$v_skip--;
 		  }
 		  else {
-            $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
+			$v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
 		  }
-        }
-      }
+		}
+	  }
 
-      // ----- Look for skip
-      if ($v_skip > 0) {
-        while ($v_skip > 0) {
-            $v_result = '../'.$v_result;
-            $v_skip--;
-        }
-      }
-    }
+	  // ----- Look for skip
+	  if ($v_skip > 0) {
+		while ($v_skip > 0) {
+			$v_result = '../'.$v_result;
+			$v_skip--;
+		}
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5474,67 +5474,67 @@ 
   // --------------------------------------------------------------------------------
   function PclZipUtilPathInclusion($p_dir, $p_path)
   {
-    $v_result = 1;
+	$v_result = 1;
 
-    // ----- Look for path beginning by ./
-    if (   ($p_dir == '.')
-        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
-      $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
-    }
-    if (   ($p_path == '.')
-        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
-      $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
-    }
+	// ----- Look for path beginning by ./
+	if (   ($p_dir == '.')
+		|| ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
+	  $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
+	}
+	if (   ($p_path == '.')
+		|| ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
+	  $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
+	}
 
-    // ----- Explode dir and path by directory separator
-    $v_list_dir = explode("/", $p_dir);
-    $v_list_dir_size = sizeof($v_list_dir);
-    $v_list_path = explode("/", $p_path);
-    $v_list_path_size = sizeof($v_list_path);
-
-    // ----- Study directories paths
-    $i = 0;
-    $j = 0;
-    while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
-
-      // ----- Look for empty dir (path reduction)
-      if ($v_list_dir[$i] == '') {
-        $i++;
-        continue;
-      }
-      if ($v_list_path[$j] == '') {
-        $j++;
-        continue;
-      }
+	// ----- Explode dir and path by directory separator
+	$v_list_dir = explode("/", $p_dir);
+	$v_list_dir_size = sizeof($v_list_dir);
+	$v_list_path = explode("/", $p_path);
+	$v_list_path_size = sizeof($v_list_path);
+
+	// ----- Study directories paths
+	$i = 0;
+	$j = 0;
+	while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
+
+	  // ----- Look for empty dir (path reduction)
+	  if ($v_list_dir[$i] == '') {
+		$i++;
+		continue;
+	  }
+	  if ($v_list_path[$j] == '') {
+		$j++;
+		continue;
+	  }
 
-      // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
-        $v_result = 0;
-      }
+	  // ----- Compare the items
+	  if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
+		$v_result = 0;
+	  }
 
-      // ----- Next items
-      $i++;
-      $j++;
-    }
+	  // ----- Next items
+	  $i++;
+	  $j++;
+	}
 
-    // ----- 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++;
+	// ----- 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++;
 
-      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) {
-        // ----- The path is shorter than the dir
-        $v_result = 0;
-      }
-    }
+	  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) {
+		// ----- The path is shorter than the dir
+		$v_result = 0;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5551,51 +5551,51 @@ 
   // --------------------------------------------------------------------------------
   function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
   {
-    $v_result = 1;
-
-    if ($p_mode==0)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==1)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==2)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==3)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
+	$v_result = 1;
+
+	if ($p_mode==0)
+	{
+	  while ($p_size != 0)
+	  {
+		$v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+		$v_buffer = @fread($p_src, $v_read_size);
+		@fwrite($p_dest, $v_buffer, $v_read_size);
+		$p_size -= $v_read_size;
+	  }
+	}
+	else if ($p_mode==1)
+	{
+	  while ($p_size != 0)
+	  {
+		$v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+		$v_buffer = @gzread($p_src, $v_read_size);
+		@fwrite($p_dest, $v_buffer, $v_read_size);
+		$p_size -= $v_read_size;
+	  }
+	}
+	else if ($p_mode==2)
+	{
+	  while ($p_size != 0)
+	  {
+		$v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+		$v_buffer = @fread($p_src, $v_read_size);
+		@gzwrite($p_dest, $v_buffer, $v_read_size);
+		$p_size -= $v_read_size;
+	  }
+	}
+	else if ($p_mode==3)
+	{
+	  while ($p_size != 0)
+	  {
+		$v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+		$v_buffer = @gzread($p_src, $v_read_size);
+		@gzwrite($p_dest, $v_buffer, $v_read_size);
+		$p_size -= $v_read_size;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5613,22 +5613,22 @@ 
   // --------------------------------------------------------------------------------
   function PclZipUtilRename($p_src, $p_dest)
   {
-    $v_result = 1;
+	$v_result = 1;
 
-    // ----- Try to rename the files
-    if (!@rename($p_src, $p_dest)) {
+	// ----- Try to rename the files
+	if (!@rename($p_src, $p_dest)) {
 
-      // ----- Try to copy & unlink the src
-      if (!@copy($p_src, $p_dest)) {
-        $v_result = 0;
-      }
-      else if (!@unlink($p_src)) {
-        $v_result = 0;
-      }
-    }
+	  // ----- Try to copy & unlink the src
+	  if (!@copy($p_src, $p_dest)) {
+		$v_result = 0;
+	  }
+	  else if (!@unlink($p_src)) {
+		$v_result = 0;
+	  }
+	}
 
-    // ----- Return
-    return $v_result;
+	// ----- Return
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5644,20 +5644,20 @@ 
   function PclZipUtilOptionText($p_option)
   {
 
-    $v_list = get_defined_constants();
-    for (reset($v_list); $v_key = key($v_list); next($v_list)) {
-	    $v_prefix = substr($v_key, 0, 10);
-	    if ((   ($v_prefix == 'PCLZIP_OPT')
-           || ($v_prefix == 'PCLZIP_CB_')
-           || ($v_prefix == 'PCLZIP_ATT'))
-	        && ($v_list[$v_key] == $p_option)) {
-        return $v_key;
-	    }
-    }
+	$v_list = get_defined_constants();
+	for (reset($v_list); $v_key = key($v_list); next($v_list)) {
+		$v_prefix = substr($v_key, 0, 10);
+		if ((   ($v_prefix == 'PCLZIP_OPT')
+		   || ($v_prefix == 'PCLZIP_CB_')
+		   || ($v_prefix == 'PCLZIP_ATT'))
+			&& ($v_list[$v_key] == $p_option)) {
+		return $v_key;
+		}
+	}
 
-    $v_result = 'Unknown';
+	$v_result = 'Unknown';
 
-    return $v_result;
+	return $v_result;
   }
   // --------------------------------------------------------------------------------
 
@@ -5674,17 +5674,17 @@ 
   // --------------------------------------------------------------------------------
   function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
   {
-    if (stristr(php_uname(), 'windows')) {
-      // ----- Look for potential disk letter
-      if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
-      }
-      // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-          $p_path = strtr($p_path, '\\', '/');
-      }
-    }
-    return $p_path;
+	if (stristr(php_uname(), 'windows')) {
+	  // ----- Look for potential disk letter
+	  if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
+		  $p_path = substr($p_path, $v_position+1);
+	  }
+	  // ----- Change potential windows directory separator
+	  if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
+		  $p_path = strtr($p_path, '\\', '/');
+	  }
+	}
+	return $p_path;
   }
   // --------------------------------------------------------------------------------
 

Spacing +325 added lines, -325 removed lines

@@ -26,8 +26,8 @@ 
 // --------------------------------------------------------------------------------
 
   // ----- Constants
-  if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
-    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
+  if ( ! defined('PCLZIP_READ_BLOCK_SIZE')) {
+    define('PCLZIP_READ_BLOCK_SIZE', 2048);
   }
 
   // ----- File list separator
@@ -40,8 +40,8 @@ 
   // Recommanded values for compatibility with older versions :
   //define( 'PCLZIP_SEPARATOR', ' ' );
   // Recommanded values for smart separation of filenames.
-  if (!defined('PCLZIP_SEPARATOR')) {
-    define( 'PCLZIP_SEPARATOR', ',' );
+  if ( ! defined('PCLZIP_SEPARATOR')) {
+    define('PCLZIP_SEPARATOR', ',');
   }
 
   // ----- Error configuration
@@ -49,8 +49,8 @@ 
   // 1 : PclError external library error handling. By enabling this
   //     you must ensure that you have included PclError library.
   // [2,...] : reserved for futur use
-  if (!defined('PCLZIP_ERROR_EXTERNAL')) {
-    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
+  if ( ! defined('PCLZIP_ERROR_EXTERNAL')) {
+    define('PCLZIP_ERROR_EXTERNAL', 0);
   }
 
   // ----- Optional static temporary directory
@@ -62,8 +62,8 @@ 
   //       Samples :
   // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
   // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
-  if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    define( 'PCLZIP_TEMPORARY_DIR', '' );
+  if ( ! defined('PCLZIP_TEMPORARY_DIR')) {
+    define('PCLZIP_TEMPORARY_DIR', '');
   }
 
   // ----- Optional threshold ratio for use of temporary files
@@ -74,8 +74,8 @@ 
   //       Recommended values are under 0.5. Default 0.47.
   //       Samples :
   // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
-  if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
-    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
+  if ( ! defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
+    define('PCLZIP_TEMPORARY_FILE_RATIO', 0.47);
   }
 
 // --------------------------------------------------------------------------------
@@ -100,72 +100,72 @@ 
   //  -12 : Unable to rename file (rename)
   //  -13 : Invalid header checksum
   //  -14 : Invalid archive size
-  define( 'PCLZIP_ERR_USER_ABORTED', 2 );
-  define( 'PCLZIP_ERR_NO_ERROR', 0 );
-  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
-  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
-  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
-  define( 'PCLZIP_ERR_MISSING_FILE', -4 );
-  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
-  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
-  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
-  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
-  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
-  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
-  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
-  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
-  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
-  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
-  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
-  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
-  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
-  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
-  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
+  define('PCLZIP_ERR_USER_ABORTED', 2);
+  define('PCLZIP_ERR_NO_ERROR', 0);
+  define('PCLZIP_ERR_WRITE_OPEN_FAIL', -1);
+  define('PCLZIP_ERR_READ_OPEN_FAIL', -2);
+  define('PCLZIP_ERR_INVALID_PARAMETER', -3);
+  define('PCLZIP_ERR_MISSING_FILE', -4);
+  define('PCLZIP_ERR_FILENAME_TOO_LONG', -5);
+  define('PCLZIP_ERR_INVALID_ZIP', -6);
+  define('PCLZIP_ERR_BAD_EXTRACTED_FILE', -7);
+  define('PCLZIP_ERR_DIR_CREATE_FAIL', -8);
+  define('PCLZIP_ERR_BAD_EXTENSION', -9);
+  define('PCLZIP_ERR_BAD_FORMAT', -10);
+  define('PCLZIP_ERR_DELETE_FILE_FAIL', -11);
+  define('PCLZIP_ERR_RENAME_FILE_FAIL', -12);
+  define('PCLZIP_ERR_BAD_CHECKSUM', -13);
+  define('PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14);
+  define('PCLZIP_ERR_MISSING_OPTION_VALUE', -15);
+  define('PCLZIP_ERR_INVALID_OPTION_VALUE', -16);
+  define('PCLZIP_ERR_ALREADY_A_DIRECTORY', -17);
+  define('PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18);
+  define('PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19);
+  define('PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20);
+  define('PCLZIP_ERR_DIRECTORY_RESTRICTION', -21);
 
   // ----- Options values
-  define( 'PCLZIP_OPT_PATH', 77001 );
-  define( 'PCLZIP_OPT_ADD_PATH', 77002 );
-  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
-  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
-  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
-  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
-  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
-  define( 'PCLZIP_OPT_BY_NAME', 77008 );
-  define( 'PCLZIP_OPT_BY_INDEX', 77009 );
-  define( 'PCLZIP_OPT_BY_EREG', 77010 );
-  define( 'PCLZIP_OPT_BY_PREG', 77011 );
-  define( 'PCLZIP_OPT_COMMENT', 77012 );
-  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
-  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
-  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
-  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
-  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
+  define('PCLZIP_OPT_PATH', 77001);
+  define('PCLZIP_OPT_ADD_PATH', 77002);
+  define('PCLZIP_OPT_REMOVE_PATH', 77003);
+  define('PCLZIP_OPT_REMOVE_ALL_PATH', 77004);
+  define('PCLZIP_OPT_SET_CHMOD', 77005);
+  define('PCLZIP_OPT_EXTRACT_AS_STRING', 77006);
+  define('PCLZIP_OPT_NO_COMPRESSION', 77007);
+  define('PCLZIP_OPT_BY_NAME', 77008);
+  define('PCLZIP_OPT_BY_INDEX', 77009);
+  define('PCLZIP_OPT_BY_EREG', 77010);
+  define('PCLZIP_OPT_BY_PREG', 77011);
+  define('PCLZIP_OPT_COMMENT', 77012);
+  define('PCLZIP_OPT_ADD_COMMENT', 77013);
+  define('PCLZIP_OPT_PREPEND_COMMENT', 77014);
+  define('PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015);
+  define('PCLZIP_OPT_REPLACE_NEWER', 77016);
+  define('PCLZIP_OPT_STOP_ON_ERROR', 77017);
   // Having big trouble with crypt. Need to multiply 2 long int
   // which is not correctly supported by PHP ...
   //define( 'PCLZIP_OPT_CRYPT', 77018 );
-  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
-  define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
+  define('PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019);
+  define('PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020);
+  define('PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020); // alias
+  define('PCLZIP_OPT_TEMP_FILE_ON', 77021);
+  define('PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021); // alias
+  define('PCLZIP_OPT_TEMP_FILE_OFF', 77022);
+  define('PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022); // alias
 
   // ----- File description attributes
-  define( 'PCLZIP_ATT_FILE_NAME', 79001 );
-  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
-  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
-  define( 'PCLZIP_ATT_FILE_MTIME', 79004 );
-  define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );
-  define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );
+  define('PCLZIP_ATT_FILE_NAME', 79001);
+  define('PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002);
+  define('PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003);
+  define('PCLZIP_ATT_FILE_MTIME', 79004);
+  define('PCLZIP_ATT_FILE_CONTENT', 79005);
+  define('PCLZIP_ATT_FILE_COMMENT', 79006);
 
   // ----- Call backs values
-  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
-  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
-  define( 'PCLZIP_CB_PRE_ADD', 78003 );
-  define( 'PCLZIP_CB_POST_ADD', 78004 );
+  define('PCLZIP_CB_PRE_EXTRACT', 78001);
+  define('PCLZIP_CB_POST_EXTRACT', 78002);
+  define('PCLZIP_CB_PRE_ADD', 78003);
+  define('PCLZIP_CB_POST_ADD', 78004);
   /* For futur use
   define( 'PCLZIP_CB_PRE_LIST', 78005 );
   define( 'PCLZIP_CB_POST_LIST', 78006 );
@@ -216,7 +216,7 @@ 
   {
 
     // ----- Tests the zlib
-    if (!function_exists('gzopen'))
+    if ( ! function_exists('gzopen'))
     {
       die('Abort '.basename(__FILE__).' : Missing zlib extensions');
     }
@@ -274,7 +274,7 @@ 
   // --------------------------------------------------------------------------------
   function create($p_filelist)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -300,7 +300,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                            array(PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_ADD_PATH => 'optional',
                                                    PCLZIP_CB_PRE_ADD => 'optional',
@@ -386,7 +386,7 @@ 
 
     // ----- For each file in the list check the attributes
     $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+    = array(PCLZIP_ATT_FILE_NAME => 'mandatory'
              ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
              ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
              ,PCLZIP_ATT_FILE_MTIME => 'optional'
@@ -457,7 +457,7 @@ 
   // --------------------------------------------------------------------------------
   function add($p_filelist)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -483,7 +483,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                            array(PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_ADD_PATH => 'optional',
                                                    PCLZIP_CB_PRE_ADD => 'optional',
@@ -569,7 +569,7 @@ 
 
     // ----- For each file in the list check the attributes
     $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+    = array(PCLZIP_ATT_FILE_NAME => 'mandatory'
              ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
              ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
              ,PCLZIP_ATT_FILE_MTIME => 'optional'
@@ -646,13 +646,13 @@ 
   // --------------------------------------------------------------------------------
   function listContent()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
 
     // ----- Check archive
-    if (!$this->privCheckFormat()) {
+    if ( ! $this->privCheckFormat()) {
       return(0);
     }
 
@@ -703,13 +703,13 @@ 
   // --------------------------------------------------------------------------------
   function extract()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
 
     // ----- Check archive
-    if (!$this->privCheckFormat()) {
+    if ( ! $this->privCheckFormat()) {
       return(0);
     }
 
@@ -736,7 +736,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
+                                            array(PCLZIP_OPT_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_ADD_PATH => 'optional',
@@ -860,13 +860,13 @@ 
   //function extractByIndex($p_index, options...)
   function extractByIndex($p_index)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
 
     // ----- Check archive
-    if (!$this->privCheckFormat()) {
+    if ( ! $this->privCheckFormat()) {
       return(0);
     }
 
@@ -897,7 +897,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
+                                            array(PCLZIP_OPT_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
@@ -933,7 +933,7 @@ 
           }
           $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
         }
-        if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
+        if ( ! isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
           $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
         }
         else {
@@ -967,10 +967,10 @@ 
     // ----- Trick
     // Here I want to reuse extractByRule(), so I need to parse the $p_index
     // with privParseOptions()
-    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
+    $v_arg_trick = array(PCLZIP_OPT_BY_INDEX, $p_index);
     $v_options_trick = array();
     $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
-                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
+                                        array(PCLZIP_OPT_BY_INDEX => 'optional'));
     if ($v_result != 1) {
         return 0;
     }
@@ -1009,13 +1009,13 @@ 
   // --------------------------------------------------------------------------------
   function delete()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
 
     // ----- Check archive
-    if (!$this->privCheckFormat()) {
+    if ( ! $this->privCheckFormat()) {
       return(0);
     }
 
@@ -1032,10 +1032,10 @@ 
 
       // ----- Parse the options
       $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                        array (PCLZIP_OPT_BY_NAME => 'optional',
+                                        array(PCLZIP_OPT_BY_NAME => 'optional',
                                                PCLZIP_OPT_BY_EREG => 'optional',
                                                PCLZIP_OPT_BY_PREG => 'optional',
-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
+                                               PCLZIP_OPT_BY_INDEX => 'optional'));
       if ($v_result != 1) {
           return 0;
       }
@@ -1100,7 +1100,7 @@ 
     $this->privDisableMagicQuotes();
 
     // ----- Check archive
-    if (!$this->privCheckFormat()) {
+    if ( ! $this->privCheckFormat()) {
       $this->privSwapBackMagicQuotes();
       return(0);
     }
@@ -1184,7 +1184,7 @@ 
 
       // ----- Check that $p_archive is a valid zip file
       // TBC : Should also check the archive format
-      if (!is_file($p_archive)) {
+      if ( ! is_file($p_archive)) {
         // ----- Error log
         PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
         $v_result = PCLZIP_ERR_MISSING_FILE;
@@ -1230,7 +1230,7 @@ 
     $this->privErrorReset();
 
     // ----- Check archive
-    if (!$this->privCheckFormat()) {
+    if ( ! $this->privCheckFormat()) {
       return(0);
     }
 
@@ -1289,9 +1289,9 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
-  function errorName($p_with_code=false)
+  function errorName($p_with_code = false)
   {
-    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
+    $v_name = array(PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
                       PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
                       PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
                       PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
@@ -1335,7 +1335,7 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
-  function errorInfo($p_full=false)
+  function errorInfo($p_full = false)
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       return(PclErrorString());
@@ -1374,7 +1374,7 @@ 
   //   true on success,
   //   false on error, the error code is set.
   // --------------------------------------------------------------------------------
-  function privCheckFormat($p_level=0)
+  function privCheckFormat($p_level = 0)
   {
     $v_result = true;
 
@@ -1385,14 +1385,14 @@ 
     $this->privErrorReset();
 
     // ----- Look if the file exits
-    if (!is_file($this->zipname)) {
+    if ( ! is_file($this->zipname)) {
       // ----- Error log
       PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
       return(false);
     }
 
     // ----- Check that the file is readeable
-    if (!is_readable($this->zipname)) {
+    if ( ! is_readable($this->zipname)) {
       // ----- Error log
       PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
       return(false);
@@ -1427,16 +1427,16 @@ 
   //   1 on success.
   //   0 on failure.
   // --------------------------------------------------------------------------------
-  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
+  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options = false)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the options
-    $i=0;
-    while ($i<$p_size) {
+    $i = 0;
+    while ($i < $p_size) {
 
       // ----- Check if the option is supported
-      if (!isset($v_requested_options[$p_options_list[$i]])) {
+      if ( ! isset($v_requested_options[$p_options_list[$i]])) {
         // ----- Error log
         PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
 
@@ -1451,7 +1451,7 @@ 
         case PCLZIP_OPT_REMOVE_PATH :
         case PCLZIP_OPT_ADD_PATH :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1460,13 +1460,13 @@ 
           }
 
           // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], FALSE);
           $i++;
         break;
 
         case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
             return PclZip::errorCode();
           }
@@ -1478,14 +1478,14 @@ 
           }
 
           // ----- Check the value
-          $v_value = $p_options_list[$i+1];
-          if ((!is_integer($v_value)) || ($v_value<0)) {
+          $v_value = $p_options_list[$i + 1];
+          if (( ! is_integer($v_value)) || ($v_value < 0)) {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
             return PclZip::errorCode();
           }
 
           // ----- Get the value (and convert it in bytes)
-          $v_result_list[$p_options_list[$i]] = $v_value*1048576;
+          $v_result_list[$p_options_list[$i]] = $v_value * 1048576;
           $i++;
         break;
 
@@ -1516,7 +1516,7 @@ 
 
         case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1525,9 +1525,9 @@ 
           }
 
           // ----- Get the value
-          if (   is_string($p_options_list[$i+1])
-              && ($p_options_list[$i+1] != '')) {
-            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+          if (is_string($p_options_list[$i + 1])
+              && ($p_options_list[$i + 1] != '')) {
+            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], FALSE);
             $i++;
           }
           else {
@@ -1537,7 +1537,7 @@ 
         // ----- Look for options that request an array of string for value
         case PCLZIP_OPT_BY_NAME :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1546,11 +1546,11 @@ 
           }
 
           // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
+          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])) {
-              $v_result_list[$p_options_list[$i]] = $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 {
             // ----- Error log
@@ -1570,7 +1570,7 @@ 
         case PCLZIP_OPT_BY_PREG :
         //case PCLZIP_OPT_CRYPT :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1579,8 +1579,8 @@ 
           }
 
           // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          if (is_string($p_options_list[$i + 1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
@@ -1597,7 +1597,7 @@ 
         case PCLZIP_OPT_ADD_COMMENT :
         case PCLZIP_OPT_PREPEND_COMMENT :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
 			                     "Missing parameter value for option '"
@@ -1609,8 +1609,8 @@ 
           }
 
           // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          if (is_string($p_options_list[$i + 1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
@@ -1628,7 +1628,7 @@ 
         // ----- Look for options that request an array of index
         case PCLZIP_OPT_BY_INDEX :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1638,19 +1638,19 @@ 
 
           // ----- Get the value
           $v_work_list = array();
-          if (is_string($p_options_list[$i+1])) {
+          if (is_string($p_options_list[$i + 1])) {
 
               // ----- Remove spaces
-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
+              $p_options_list[$i + 1] = strtr($p_options_list[$i + 1], ' ', '');
 
               // ----- Parse items
-              $v_work_list = explode(",", $p_options_list[$i+1]);
+              $v_work_list = explode(",", $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_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])) {
-              $v_work_list = $p_options_list[$i+1];
+          else if (is_array($p_options_list[$i + 1])) {
+              $v_work_list = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
@@ -1664,9 +1664,9 @@ 
           // each index item in the list must be a couple with a start and
           // an end value : [0,3], [5-5], [8-10], ...
           // ----- Check the format of each item
-          $v_sort_flag=false;
-          $v_sort_value=0;
-          for ($j=0; $j<sizeof($v_work_list); $j++) {
+          $v_sort_flag = false;
+          $v_sort_value = 0;
+          for ($j = 0; $j < sizeof($v_work_list); $j++) {
               // ----- Explode the item
               $v_item_list = explode("-", $v_work_list[$j]);
               $v_size_item_list = sizeof($v_item_list);
@@ -1696,7 +1696,7 @@ 
 
               // ----- Look for list sort
               if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                  $v_sort_flag=true;
+                  $v_sort_flag = true;
 
                   // ----- TBC : An automatic sort should be writen ...
                   // ----- Error log
@@ -1730,7 +1730,7 @@ 
         // ----- Look for options that request an octal value
         case PCLZIP_OPT_SET_CHMOD :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1739,7 +1739,7 @@ 
           }
 
           // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           $i++;
         break;
 
@@ -1755,7 +1755,7 @@ 
         case PCLZIP_CB_POST_LIST :
         */
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1764,10 +1764,10 @@ 
           }
 
           // ----- Get the value
-          $v_function_name = $p_options_list[$i+1];
+          $v_function_name = $p_options_list[$i + 1];
 
           // ----- Check that the value is a valid existing function
-          if (!function_exists($v_function_name)) {
+          if ( ! function_exists($v_function_name)) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1796,11 +1796,11 @@ 
 
     // ----- Look for mandatory options
     if ($v_requested_options !== false) {
-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+      for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
         // ----- Look for mandatory option
         if ($v_requested_options[$key] == 'mandatory') {
           // ----- Look if present
-          if (!isset($v_result_list[$key])) {
+          if ( ! isset($v_result_list[$key])) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
 
@@ -1812,7 +1812,7 @@ 
     }
 
     // ----- Look for default values
-    if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+    if ( ! isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
 
     }
 
@@ -1829,7 +1829,7 @@ 
   // --------------------------------------------------------------------------------
   function privOptionDefaultThreshold(&$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
         || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
@@ -1842,16 +1842,16 @@ 
     $v_memory_limit_int = (int) $v_memory_limit;
     $last = strtolower(substr($v_memory_limit, -1));
 
-    if($last == 'g')
+    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 * 1073741824;
+    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;
+        $v_memory_limit_int = $v_memory_limit_int * 1048576;
+    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);
+    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit_int * PCLZIP_TEMPORARY_FILE_RATIO);
 
 
     // ----- Sanity check : No threshold if value lower than 1M
@@ -1872,15 +1872,15 @@ 
   //   1 on success.
   //   0 on failure.
   // --------------------------------------------------------------------------------
-  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
+  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options = false)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- For each file in the list check the attributes
     foreach ($p_file_list as $v_key => $v_value) {
 
       // ----- Check if the option is supported
-      if (!isset($v_requested_options[$v_key])) {
+      if ( ! isset($v_requested_options[$v_key])) {
         // ----- Error log
         PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
 
@@ -1891,7 +1891,7 @@ 
       // ----- Look for attribute
       switch ($v_key) {
         case PCLZIP_ATT_FILE_NAME :
-          if (!is_string($v_value)) {
+          if ( ! is_string($v_value)) {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
             return PclZip::errorCode();
           }
@@ -1906,7 +1906,7 @@ 
         break;
 
         case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
-          if (!is_string($v_value)) {
+          if ( ! is_string($v_value)) {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
             return PclZip::errorCode();
           }
@@ -1920,7 +1920,7 @@ 
         break;
 
         case PCLZIP_ATT_FILE_NEW_FULL_NAME :
-          if (!is_string($v_value)) {
+          if ( ! is_string($v_value)) {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
             return PclZip::errorCode();
           }
@@ -1935,7 +1935,7 @@ 
 
         // ----- Look for options that takes a string
         case PCLZIP_ATT_FILE_COMMENT :
-          if (!is_string($v_value)) {
+          if ( ! is_string($v_value)) {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
             return PclZip::errorCode();
           }
@@ -1944,7 +1944,7 @@ 
         break;
 
         case PCLZIP_ATT_FILE_MTIME :
-          if (!is_integer($v_value)) {
+          if ( ! is_integer($v_value)) {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
             return PclZip::errorCode();
           }
@@ -1967,11 +1967,11 @@ 
 
       // ----- Look for mandatory options
       if ($v_requested_options !== false) {
-        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+        for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
           // ----- Look for mandatory option
           if ($v_requested_options[$key] == 'mandatory') {
             // ----- Look if present
-            if (!isset($p_file_list[$key])) {
+            if ( ! isset($p_file_list[$key])) {
               PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
               return PclZip::errorCode();
             }
@@ -2003,13 +2003,13 @@ 
   // --------------------------------------------------------------------------------
   function privFileDescrExpand(&$p_filedescr_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Create a result list
     $v_result_list = array();
 
     // ----- Look each entry
-    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
+    for ($i = 0; $i < sizeof($p_filedescr_list); $i++) {
 
       // ----- Get filedescr
       $v_descr = $p_filedescr_list[$i];
@@ -2076,7 +2076,7 @@ 
             // Because the name of the folder was changed, the name of the
             // files/sub-folders also change
             if (($v_descr['stored_filename'] != $v_descr['filename'])
-                 && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+                 && ( ! 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;
               }
@@ -2128,7 +2128,7 @@ 
   // --------------------------------------------------------------------------------
   function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_list_detail = array();
 
     // ----- Magic quotes trick
@@ -2163,11 +2163,11 @@ 
   // --------------------------------------------------------------------------------
   function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_list_detail = array();
 
     // ----- Look if the archive exists or is empty
-    if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
+    if (( ! is_file($this->zipname)) || (filesize($this->zipname) == 0))
     {
 
       // ----- Do a create
@@ -2180,7 +2180,7 @@ 
     $this->privDisableMagicQuotes();
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
+    if (($v_result = $this->privOpenFd('rb')) != 1)
     {
       // ----- Magic quotes trick
       $this->privSwapBackMagicQuotes();
@@ -2261,7 +2261,7 @@ 
     }
 
     // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
+    for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++)
     {
       // ----- Create the file header
       if ($v_header_list[$i]['status'] == 'ok') {
@@ -2294,10 +2294,10 @@ 
     }
 
     // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
+    $v_size = @ftell($this->zip_fd) - $v_offset;
 
     // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
+    if (($v_result = $this->privWriteCentralHeader($v_count + $v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
     {
       // ----- Reset the file list
       unset($v_header_list);
@@ -2342,7 +2342,7 @@ 
   // --------------------------------------------------------------------------------
   function privOpenFd($p_mode)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if already open
     if ($this->zip_fd != 0)
@@ -2376,7 +2376,7 @@ 
   // --------------------------------------------------------------------------------
   function privCloseFd()
   {
-    $v_result=1;
+    $v_result = 1;
 
     if ($this->zip_fd != 0)
       @fclose($this->zip_fd);
@@ -2403,7 +2403,7 @@ 
 //  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
   function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Add the files
     $v_header_list = array();
@@ -2417,7 +2417,7 @@ 
     $v_offset = @ftell($this->zip_fd);
 
     // ----- Create the Central Dir files header
-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
+    for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++)
     {
       // ----- Create the file header
       if ($v_header_list[$i]['status'] == 'ok') {
@@ -2439,7 +2439,7 @@ 
     }
 
     // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
+    $v_size = @ftell($this->zip_fd) - $v_offset;
 
     // ----- Create the central dir footer
     if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
@@ -2467,14 +2467,14 @@ 
   // --------------------------------------------------------------------------------
   function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_header = array();
 
     // ----- Recuperate the current number of elt in list
     $v_nb = sizeof($p_result_list);
 
     // ----- Loop on the files
-    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
+    for ($j = 0; ($j < sizeof($p_filedescr_list)) && ($v_result == 1); $j++) {
       // ----- Format the filename
       $p_filedescr_list[$j]['filename']
       = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
@@ -2487,8 +2487,8 @@ 
       }
 
       // ----- Check the filename
-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
-          && (!file_exists($p_filedescr_list[$j]['filename']))) {
+      if (($p_filedescr_list[$j]['type'] != 'virtual_file')
+          && ( ! file_exists($p_filedescr_list[$j]['filename']))) {
         PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
         return PclZip::errorCode();
       }
@@ -2497,11 +2497,11 @@ 
       // or a dir with all its path removed
 //      if (   (is_file($p_filedescr_list[$j]['filename']))
 //          || (   is_dir($p_filedescr_list[$j]['filename'])
-      if (   ($p_filedescr_list[$j]['type'] == 'file')
+      if (($p_filedescr_list[$j]['type'] == 'file')
           || ($p_filedescr_list[$j]['type'] == 'virtual_file')
-          || (   ($p_filedescr_list[$j]['type'] == 'folder')
-              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
-                  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
+          || (($p_filedescr_list[$j]['type'] == 'folder')
+              && ( ! isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
+                  || ! $p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
           ) {
 
         // ----- Add the file
@@ -2529,7 +2529,7 @@ 
   // --------------------------------------------------------------------------------
   function privAddFile($p_filedescr, &$p_header, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Working variable
     $p_filename = $p_filedescr['filename'];
@@ -2574,13 +2574,13 @@ 
     $p_header['index'] = -1;
 
     // ----- Look for regular file
-    if ($p_filedescr['type']=='file') {
+    if ($p_filedescr['type'] == 'file') {
       $p_header['external'] = 0x00000000;
       $p_header['size'] = filesize($p_filename);
     }
 
     // ----- Look for regular folder
-    else if ($p_filedescr['type']=='folder') {
+    else if ($p_filedescr['type'] == 'folder') {
       $p_header['external'] = 0x00000010;
       $p_header['mtime'] = filemtime($p_filename);
       $p_header['size'] = filesize($p_filename);
@@ -2654,10 +2654,10 @@ 
       // ----- Look for a file
       if ($p_filedescr['type'] == 'file') {
         // ----- Look for using temporary file to zip
-        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
+        if (( ! isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
             && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
                 || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
+                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])))) {
           $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
           if ($v_result < PCLZIP_ERR_NO_ERROR) {
             return $v_result;
@@ -2757,7 +2757,7 @@ 
         // ----- Set the file properties
         $p_header['size'] = 0;
         //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
+        $p_header['external'] = 0x00000010; // Value for a folder : to be checked
 
         // ----- Call the header generation
         if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
@@ -2800,7 +2800,7 @@ 
   // --------------------------------------------------------------------------------
   function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
   {
-    $v_result=PCLZIP_ERR_NO_ERROR;
+    $v_result = PCLZIP_ERR_NO_ERROR;
 
     // ----- Working variable
     $p_filename = $p_filedescr['filename'];
@@ -2854,7 +2854,7 @@ 
     $v_data_header['os'] = bin2hex($v_data_header['os']);
 
     // ----- Read the gzip file footer
-    @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
+    @fseek($v_file_compressed, filesize($v_gzip_temp_name) - 8);
     $v_binary_data = @fread($v_file_compressed, 8);
     $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
 
@@ -2862,7 +2862,7 @@ 
     $p_header['compression'] = ord($v_data_header['cm']);
     //$p_header['mtime'] = $v_data_header['mtime'];
     $p_header['crc'] = $v_data_footer['crc'];
-    $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
+    $p_header['compressed_size'] = filesize($v_gzip_temp_name) - 18;
 
     // ----- Close the file
     @fclose($v_file_compressed);
@@ -2912,7 +2912,7 @@ 
   // --------------------------------------------------------------------------------
   function privCalculateStoredFilename(&$p_filedescr, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Working variables
     $p_filename = $p_filedescr['filename'];
@@ -2969,14 +2969,14 @@ 
         if (substr($p_remove_dir, -1) != '/')
           $p_remove_dir .= "/";
 
-        if (   (substr($p_filename, 0, 2) == "./")
+        if ((substr($p_filename, 0, 2) == "./")
             || (substr($p_remove_dir, 0, 2) == "./")) {
 
-          if (   (substr($p_filename, 0, 2) == "./")
+          if ((substr($p_filename, 0, 2) == "./")
               && (substr($p_remove_dir, 0, 2) != "./")) {
             $p_remove_dir = "./".$p_remove_dir;
           }
-          if (   (substr($p_filename, 0, 2) != "./")
+          if ((substr($p_filename, 0, 2) != "./")
               && (substr($p_remove_dir, 0, 2) == "./")) {
             $p_remove_dir = substr($p_remove_dir, 2);
           }
@@ -3024,15 +3024,15 @@ 
   // --------------------------------------------------------------------------------
   function privWriteFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Store the offset position of the file
     $p_header['offset'] = ftell($this->zip_fd);
 
     // ----- Transform UNIX mtime to DOS format mdate/mtime
     $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+    $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+    $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
 
     // ----- Packed data
     $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
@@ -3069,7 +3069,7 @@ 
   // --------------------------------------------------------------------------------
   function privWriteCentralFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // TBC
     //for(reset($p_header); $key = key($p_header); next($p_header)) {
@@ -3077,8 +3077,8 @@ 
 
     // ----- Transform UNIX mtime to DOS format mdate/mtime
     $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+    $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+    $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
 
 
     // ----- Packed data
@@ -3122,7 +3122,7 @@ 
   // --------------------------------------------------------------------------------
   function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Packed data
     $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
@@ -3151,7 +3151,7 @@ 
   // --------------------------------------------------------------------------------
   function privList(&$p_list)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Magic quotes trick
     $this->privDisableMagicQuotes();
@@ -3191,7 +3191,7 @@ 
     }
 
     // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++)
+    for ($i = 0; $i < $v_central_dir['entries']; $i++)
     {
       // ----- Read the file header
       if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
@@ -3238,7 +3238,7 @@ 
   // --------------------------------------------------------------------------------
   function privConvertHeader2FileInfo($p_header, &$p_info)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Get the interesting attributes
     $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
@@ -3249,7 +3249,7 @@ 
     $p_info['compressed_size'] = $p_header['compressed_size'];
     $p_info['mtime'] = $p_header['mtime'];
     $p_info['comment'] = $p_header['comment'];
-    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
+    $p_info['folder'] = (($p_header['external'] & 0x00000010) == 0x00000010);
     $p_info['index'] = $p_header['index'];
     $p_info['status'] = $p_header['status'];
     $p_info['crc'] = $p_header['crc'];
@@ -3277,16 +3277,16 @@ 
   // --------------------------------------------------------------------------------
   function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Magic quotes trick
     $this->privDisableMagicQuotes();
 
     // ----- Check the path
-    if (   ($p_path == "")
-	    || (   (substr($p_path, 0, 1) != "/")
+    if (($p_path == "")
+	    || ((substr($p_path, 0, 1) != "/")
 		    && (substr($p_path, 0, 3) != "../")
-			&& (substr($p_path,1,2)!=":/")))
+			&& (substr($p_path, 1, 2) != ":/")))
       $p_path = "./".$p_path;
 
     // ----- Reduce the path last (and duplicated) '/'
@@ -3295,7 +3295,7 @@ 
       // ----- Look for the path end '/'
       while (substr($p_path, -1) == "/")
       {
-        $p_path = substr($p_path, 0, strlen($p_path)-1);
+        $p_path = substr($p_path, 0, strlen($p_path) - 1);
       }
     }
 
@@ -3329,7 +3329,7 @@ 
 
     // ----- Read each entry
     $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+    for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++)
     {
 
       // ----- Read next Central dir entry
@@ -3368,17 +3368,17 @@ 
       $v_extract = false;
 
       // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+      if ((isset($p_options[PCLZIP_OPT_BY_NAME]))
           && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
 
           // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
+          for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && ( ! $v_extract); $j++) {
 
               // ----- Look for a directory
               if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
 
                   // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
+                  if ((strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
                       && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
                       $v_extract = true;
                   }
@@ -3403,7 +3403,7 @@ 
       */
 
       // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+      else if ((isset($p_options[PCLZIP_OPT_BY_PREG]))
                && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
 
           if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
@@ -3412,20 +3412,20 @@ 
       }
 
       // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+      else if ((isset($p_options[PCLZIP_OPT_BY_INDEX]))
                && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
 
           // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
+          for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && ( ! $v_extract); $j++) {
 
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+              if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
                   $v_extract = true;
               }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
+              if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                  $j_start = $j + 1;
               }
 
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
                   break;
               }
           }
@@ -3437,14 +3437,14 @@ 
       }
 
 	  // ----- Check compression method
-	  if (   ($v_extract)
-	      && (   ($v_header['compression'] != 8)
+	  if (($v_extract)
+	      && (($v_header['compression'] != 8)
 		      && ($v_header['compression'] != 0))) {
           $v_header['status'] = 'unsupported_compression';
 
           // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+          if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
               $this->privSwapBackMagicQuotes();
 
@@ -3462,8 +3462,8 @@ 
           $v_header['status'] = 'unsupported_encryption';
 
           // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+          if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
               $this->privSwapBackMagicQuotes();
 
@@ -3544,7 +3544,7 @@ 
           }
         }
         // ----- Look for extraction in standard output
-        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
+        elseif ((isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
 		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
           // ----- Extracting the file in standard output
           $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
@@ -3617,7 +3617,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the file header
     if (($v_result = $this->privReadFileHeader($v_header)) != 1)
@@ -3635,7 +3635,7 @@ 
     // ----- Look for all path to remove
     if ($p_remove_all_path == true) {
         // ----- Look for folder entry that not need to be extracted
-        if (($p_entry['external']&0x00000010)==0x00000010) {
+        if (($p_entry['external'] & 0x00000010) == 0x00000010) {
 
             $p_entry['status'] = "filtered";
 
@@ -3736,8 +3736,8 @@ 
         // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
         // For historical reason first PclZip implementation does not stop
         // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
             PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
 			                     "Filename '".$p_entry['filename']."' is "
@@ -3747,7 +3747,7 @@ 
 		    }
       }
       // ----- Look if file is write protected
-      else if (!is_writeable($p_entry['filename']))
+      else if ( ! is_writeable($p_entry['filename']))
       {
 
         // ----- Change the file status
@@ -3756,8 +3756,8 @@ 
         // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
         // For historical reason first PclZip implementation does not stop
         // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
             PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
 			                     "Filename '".$p_entry['filename']."' exists "
@@ -3771,8 +3771,8 @@ 
       else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
       {
         // ----- Change the file status
-        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
-		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
+        if ((isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
+		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER] === true)) {
 	  	  }
 		    else {
             $p_entry['status'] = "newer_exist";
@@ -3780,8 +3780,8 @@ 
             // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
             // For historical reason first PclZip implementation does not stop
             // when this kind of error occurs.
-            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+            if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
                 PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
 			             "Newer version of '".$p_entry['filename']."' exists "
@@ -3797,14 +3797,14 @@ 
 
     // ----- Check the directory availability and create it if necessary
     else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
+      if ((($p_entry['external'] & 0x00000010) == 0x00000010) || (substr($p_entry['filename'], -1) == '/'))
         $v_dir_to_check = $p_entry['filename'];
-      else if (!strstr($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) {
+        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external'] & 0x00000010) == 0x00000010))) != 1) {
 
           // ----- Change the file status
           $p_entry['status'] = "path_creation_fail";
@@ -3820,7 +3820,7 @@ 
     if ($p_entry['status'] == 'ok') {
 
       // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
+      if ( ! (($p_entry['external'] & 0x00000010) == 0x00000010))
       {
         // ----- Look for not compressed file
         if ($p_entry['compression'] == 0) {
@@ -3869,10 +3869,10 @@ 
 
 
           // ----- Look for using temporary file to unzip
-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
+          if (( ! isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
               && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
                   || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
+                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])))) {
             $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
             if ($v_result < PCLZIP_ERR_NO_ERROR) {
               return $v_result;
@@ -3966,7 +3966,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileUsingTempFile(&$p_entry, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Creates a temporary file
     $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
@@ -4042,7 +4042,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileInOutput(&$p_entry, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the file header
     if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
@@ -4091,7 +4091,7 @@ 
     if ($p_entry['status'] == 'ok') {
 
       // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+      if ( ! (($p_entry['external'] & 0x00000010) == 0x00000010)) {
         // ----- Look for not compressed file
         if ($p_entry['compressed_size'] == $p_entry['size']) {
 
@@ -4153,7 +4153,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the file header
     $v_header = array();
@@ -4203,7 +4203,7 @@ 
     if ($p_entry['status'] == 'ok') {
 
       // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+      if ( ! (($p_entry['external'] & 0x00000010) == 0x00000010)) {
         // ----- Look for not compressed file
   //      if ($p_entry['compressed_size'] == $p_entry['size'])
         if ($p_entry['compression'] == 0) {
@@ -4274,7 +4274,7 @@ 
   // --------------------------------------------------------------------------------
   function privReadFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->zip_fd, 4);
@@ -4338,7 +4338,7 @@ 
       // ----- Extract time
       $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
       $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+      $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
 
       // ----- Extract date
       $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
@@ -4377,7 +4377,7 @@ 
   // --------------------------------------------------------------------------------
   function privReadCentralFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->zip_fd, 4);
@@ -4441,7 +4441,7 @@ 
       // ----- Extract time
       $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
       $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+      $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
 
       // ----- Extract date
       $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
@@ -4485,7 +4485,7 @@ 
   // --------------------------------------------------------------------------------
   function privCheckFileHeaders(&$p_local_header, &$p_central_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
   	// ----- Check the static values
   	// TBC
@@ -4522,7 +4522,7 @@ 
   // --------------------------------------------------------------------------------
   function privReadEndCentralDir(&$p_central_dir)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Go to the end of the zip file
     $v_size = filesize($this->zipname);
@@ -4540,8 +4540,8 @@ 
     // in this case the end of central dir is at 22 bytes of the file end
     $v_found = 0;
     if ($v_size > 26) {
-      @fseek($this->zip_fd, $v_size-22);
-      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
+      @fseek($this->zip_fd, $v_size - 22);
+      if (($v_pos = @ftell($this->zip_fd)) != ($v_size - 22))
       {
         // ----- Error log
         PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
@@ -4563,12 +4563,12 @@ 
     }
 
     // ----- Go back to the maximum possible size of the Central Dir End Record
-    if (!$v_found) {
+    if ( ! $v_found) {
       $v_maximum_size = 65557; // 0xFFFF + 22;
       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))
+      @fseek($this->zip_fd, $v_size - $v_maximum_size);
+      if (@ftell($this->zip_fd) != ($v_size - $v_maximum_size))
       {
         // ----- Error log
         PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
@@ -4589,7 +4589,7 @@ 
         //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
         // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
         // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
+        $v_bytes = (($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
 
         // ----- Compare the bytes
         if ($v_bytes == 0x504b0506)
@@ -4679,11 +4679,11 @@ 
   // --------------------------------------------------------------------------------
   function privDeleteByRule(&$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_list_detail = array();
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
+    if (($v_result = $this->privOpenFd('rb')) != 1)
     {
       // ----- Return
       return $v_result;
@@ -4719,7 +4719,7 @@ 
     // ----- Read each entry
     $v_header_list = array();
     $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+    for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++)
     {
 
       // ----- Read the file header
@@ -4740,21 +4740,21 @@ 
       $v_found = false;
 
       // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+      if ((isset($p_options[PCLZIP_OPT_BY_NAME]))
           && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
 
           // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
+          for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && ( ! $v_found); $j++) {
 
               // ----- Look for a directory
               if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
 
                   // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
+                  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;
                   }
@@ -4779,7 +4779,7 @@ 
       */
 
       // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+      else if ((isset($p_options[PCLZIP_OPT_BY_PREG]))
                && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
 
           if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
@@ -4788,20 +4788,20 @@ 
       }
 
       // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+      else if ((isset($p_options[PCLZIP_OPT_BY_INDEX]))
                && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
 
           // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
+          for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && ( ! $v_found); $j++) {
 
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+              if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
                   $v_found = true;
               }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
+              if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                  $j_start = $j + 1;
               }
 
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
                   break;
               }
           }
@@ -4839,11 +4839,11 @@ 
         }
 
         // ----- Look which file need to be kept
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
+        for ($i = 0; $i < sizeof($v_header_list); $i++) {
 
             // ----- Calculate the position of the header
             @rewind($this->zip_fd);
-            if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
+            if (@fseek($this->zip_fd, $v_header_list[$i]['offset'])) {
                 // ----- Close the zip file
                 $this->privCloseFd();
                 $v_temp_zip->privCloseFd();
@@ -4902,7 +4902,7 @@ 
         $v_offset = @ftell($v_temp_zip->zip_fd);
 
         // ----- Re-Create the Central Dir files header
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
+        for ($i = 0; $i < sizeof($v_header_list); $i++) {
             // ----- Create the file header
             if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
                 $v_temp_zip->privCloseFd();
@@ -4925,7 +4925,7 @@ 
         }
 
         // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
+        $v_size = @ftell($v_temp_zip->zip_fd) - $v_offset;
 
         // ----- Create the central dir footer
         if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
@@ -4987,15 +4987,15 @@ 
   //    1 : OK
   //   -1 : Unable to create directory
   // --------------------------------------------------------------------------------
-  function privDirCheck($p_dir, $p_is_dir=false)
+  function privDirCheck($p_dir, $p_is_dir = false)
   {
     $v_result = 1;
 
 
     // ----- Remove the final '/'
-    if (($p_is_dir) && (substr($p_dir, -1)=='/'))
+    if (($p_is_dir) && (substr($p_dir, -1) == '/'))
     {
-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
+      $p_dir = substr($p_dir, 0, strlen($p_dir) - 1);
     }
 
     // ----- Check the directory availability
@@ -5021,7 +5021,7 @@ 
     }
 
     // ----- Create the directory
-    if (!@mkdir($p_dir, 0777))
+    if ( ! @mkdir($p_dir, 0777))
     {
       // ----- Error log
       PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
@@ -5044,10 +5044,10 @@ 
   // --------------------------------------------------------------------------------
   function privMerge(&$p_archive_to_add)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if the archive_to_add exists
-    if (!is_file($p_archive_to_add->zipname))
+    if ( ! is_file($p_archive_to_add->zipname))
     {
 
       // ----- Nothing to merge, so merge is a success
@@ -5058,7 +5058,7 @@ 
     }
 
     // ----- Look if the archive exists
-    if (!is_file($this->zipname))
+    if ( ! is_file($this->zipname))
     {
 
       // ----- Do a duplicate
@@ -5069,7 +5069,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
+    if (($v_result = $this->privOpenFd('rb')) != 1)
     {
       // ----- Return
       return $v_result;
@@ -5087,7 +5087,7 @@ 
     @rewind($this->zip_fd);
 
     // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
+    if (($v_result = $p_archive_to_add->privOpenFd('rb')) != 1)
     {
       $this->privCloseFd();
 
@@ -5171,7 +5171,7 @@ 
     $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
 
     // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
+    $v_size = @ftell($v_zip_temp_fd) - $v_offset;
 
     // ----- Swap the file descriptor
     // Here is a trick : I swap the temporary fd with the zip fd, in order to use
@@ -5181,7 +5181,7 @@ 
     $v_zip_temp_fd = $v_swap;
 
     // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
+    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries'] + $v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
     {
       $this->privCloseFd();
       $p_archive_to_add->privCloseFd();
@@ -5229,10 +5229,10 @@ 
   // --------------------------------------------------------------------------------
   function privDuplicate($p_archive_filename)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if the $p_archive_filename exists
-    if (!is_file($p_archive_filename))
+    if ( ! is_file($p_archive_filename))
     {
 
       // ----- Nothing to duplicate, so duplicate is a success.
@@ -5243,7 +5243,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('wb')) != 1)
+    if (($v_result = $this->privOpenFd('wb')) != 1)
     {
       // ----- Return
       return $v_result;
@@ -5287,7 +5287,7 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
-  function privErrorLog($p_error_code=0, $p_error_string='')
+  function privErrorLog($p_error_code = 0, $p_error_string = '')
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       PclError($p_error_code, $p_error_string);
@@ -5324,11 +5324,11 @@ 
   // --------------------------------------------------------------------------------
   function privDisableMagicQuotes()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
+    if (( ! function_exists("get_magic_quotes_runtime"))
+	    || ( ! function_exists("set_magic_quotes_runtime"))) {
       return $v_result;
 	}
 
@@ -5358,11 +5358,11 @@ 
   // --------------------------------------------------------------------------------
   function privSwapBackMagicQuotes()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
+    if (( ! function_exists("get_magic_quotes_runtime"))
+	    || ( ! function_exists("set_magic_quotes_runtime"))) {
       return $v_result;
 	}
 
@@ -5402,7 +5402,7 @@ 
 
       // ----- Study directories from last to first
       $v_skip = 0;
-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
+      for ($i = sizeof($v_list) - 1; $i >= 0; $i--) {
         // ----- Look for current path
         if ($v_list[$i] == ".") {
           // ----- Ignore this directory
@@ -5423,7 +5423,7 @@ 
 		    }
 		  }
 		  // ----- Last '/' i.e. indicates a directory
-		  else if ($i == (sizeof($v_list)-1)) {
+		  else if ($i == (sizeof($v_list) - 1)) {
             $v_result = $v_list[$i];
 		  }
 		  // ----- Double '/' inside the path
@@ -5438,7 +5438,7 @@ 
 		    $v_skip--;
 		  }
 		  else {
-            $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
+            $v_result = $v_list[$i].($i != (sizeof($v_list) - 1) ? "/".$v_result : "");
 		  }
         }
       }
@@ -5477,12 +5477,12 @@ 
     $v_result = 1;
 
     // ----- Look for path beginning by ./
-    if (   ($p_dir == '.')
-        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
+    if (($p_dir == '.')
+        || ((strlen($p_dir) >= 2) && (substr($p_dir, 0, 2) == './'))) {
       $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
     }
-    if (   ($p_path == '.')
-        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
+    if (($p_path == '.')
+        || ((strlen($p_path) >= 2) && (substr($p_path, 0, 2) == './'))) {
       $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
     }
 
@@ -5508,7 +5508,7 @@ 
       }
 
       // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
+      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ($v_list_path[$j] != '')) {
         $v_result = 0;
       }
 
@@ -5549,11 +5549,11 @@ 
   //             3 : src & dest gzip
   // Return Values :
   // --------------------------------------------------------------------------------
-  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
+  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode = 0)
   {
     $v_result = 1;
 
-    if ($p_mode==0)
+    if ($p_mode == 0)
     {
       while ($p_size != 0)
       {
@@ -5563,7 +5563,7 @@ 
         $p_size -= $v_read_size;
       }
     }
-    else if ($p_mode==1)
+    else if ($p_mode == 1)
     {
       while ($p_size != 0)
       {
@@ -5573,7 +5573,7 @@ 
         $p_size -= $v_read_size;
       }
     }
-    else if ($p_mode==2)
+    else if ($p_mode == 2)
     {
       while ($p_size != 0)
       {
@@ -5583,7 +5583,7 @@ 
         $p_size -= $v_read_size;
       }
     }
-    else if ($p_mode==3)
+    else if ($p_mode == 3)
     {
       while ($p_size != 0)
       {
@@ -5616,13 +5616,13 @@ 
     $v_result = 1;
 
     // ----- Try to rename the files
-    if (!@rename($p_src, $p_dest)) {
+    if ( ! @rename($p_src, $p_dest)) {
 
       // ----- Try to copy & unlink the src
-      if (!@copy($p_src, $p_dest)) {
+      if ( ! @copy($p_src, $p_dest)) {
         $v_result = 0;
       }
-      else if (!@unlink($p_src)) {
+      else if ( ! @unlink($p_src)) {
         $v_result = 0;
       }
     }
@@ -5647,7 +5647,7 @@ 
     $v_list = get_defined_constants();
     for (reset($v_list); $v_key = key($v_list); next($v_list)) {
 	    $v_prefix = substr($v_key, 0, 10);
-	    if ((   ($v_prefix == 'PCLZIP_OPT')
+	    if ((($v_prefix == 'PCLZIP_OPT')
            || ($v_prefix == 'PCLZIP_CB_')
            || ($v_prefix == 'PCLZIP_ATT'))
 	        && ($v_list[$v_key] == $p_option)) {
@@ -5672,15 +5672,15 @@ 
   // Return Values :
   //   The path translated.
   // --------------------------------------------------------------------------------
-  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
+  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter = true)
   {
     if (stristr(php_uname(), 'windows')) {
       // ----- Look for potential disk letter
       if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
+          $p_path = substr($p_path, $v_position + 1);
       }
       // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
+      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
           $p_path = strtr($p_path, '\\', '/');
       }
     }

Braces +115 added lines, -158 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'] = '';
     }
@@ -2918,20 +2891,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;
     }
 
@@ -2954,8 +2924,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;
       }
@@ -2966,8 +2935,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) == "./")) {
@@ -2987,8 +2957,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));
           }
@@ -3000,10 +2969,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;
+        }
       }
     }
 
@@ -3286,8 +3256,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 != "/"))
@@ -3773,8 +3744,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
@@ -3790,19 +3760,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) {
 
@@ -3858,8 +3828,7 @@ 
           touch($p_entry['filename'], $p_entry['mtime']);
 
 
-        }
-        else {
+        } else {
           // ----- TBC
           // Need to be finished
           if (($p_entry['flag'] & 1) == 1) {
@@ -4101,8 +4070,7 @@ 
           // ----- Send the file to the output
           echo $v_buffer;
           unset($v_buffer);
-        }
-        else {
+        } else {
 
           // ----- Read the compressed file in a buffer (one shot)
           $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
@@ -4210,8 +4178,7 @@ 
 
           // ----- Reading the file
           $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
-        }
-        else {
+        } else {
 
           // ----- Reading the file
           $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
@@ -4223,8 +4190,7 @@ 
         }
 
         // ----- Trace
-      }
-      else {
+      } else {
           // TBC : error : can not extract a folder in a string
       }
 
@@ -4316,8 +4282,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'] = '';
     }
 
@@ -4348,8 +4313,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();
     }
@@ -4414,22 +4378,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
 
@@ -4451,8 +4418,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();
     }
@@ -4565,8 +4531,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))
       {
@@ -4651,9 +4618,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'];
@@ -4753,8 +4720,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;
                   }
@@ -4805,8 +4771,7 @@ 
                   break;
               }
           }
-      }
-      else {
+      } else {
       	$v_found = true;
       }
 
@@ -4814,8 +4779,7 @@ 
       if ($v_found)
       {
         unset($v_header_list[$v_nb_extracted]);
-      }
-      else
+      } else
       {
         $v_nb_extracted++;
       }
@@ -5291,8 +5255,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;
     }
@@ -5308,8 +5271,7 @@ 
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       PclErrorReset();
-    }
-    else {
+    } else {
       $this->error_code = 0;
       $this->error_string = '';
     }
@@ -5407,11 +5369,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;
@@ -5431,13 +5391,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:"");
 		  }
         }
@@ -5520,14 +5478,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;
       }
@@ -5562,8 +5523,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)
       {
@@ -5572,8 +5532,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)
       {
@@ -5582,8 +5541,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)
       {
@@ -5621,8 +5579,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;
       }
     }