site_iri: comparison web/wp-admin/includes/class-wp-upgrader.php

equal deleted inserted replaced

-:a4642baaf829
+:4d4862461b8d
 		if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
 			return new WP_Error('fs_error', $this->strings['fs_error'], $wp_filesystem->errors);
 		foreach ( (array)$directories as $dir ) {
-			if ( ABSPATH == $dir && ! $wp_filesystem->abspath() )
+			switch ( $dir ) {
-				return new WP_Error('fs_no_root_dir', $this->strings['fs_no_root_dir']);
+				case ABSPATH:
+					if ( ! $wp_filesystem->abspath() )
-			elseif ( WP_CONTENT_DIR == $dir && ! $wp_filesystem->wp_content_dir() )
+						return new WP_Error('fs_no_root_dir', $this->strings['fs_no_root_dir']);
-				return new WP_Error('fs_no_content_dir', $this->strings['fs_no_content_dir']);
+					break;
+				case WP_CONTENT_DIR:
-			elseif ( WP_PLUGIN_DIR == $dir && ! $wp_filesystem->wp_plugins_dir() )
+					if ( ! $wp_filesystem->wp_content_dir() )
-				return new WP_Error('fs_no_plugins_dir', $this->strings['fs_no_plugins_dir']);
+						return new WP_Error('fs_no_content_dir', $this->strings['fs_no_content_dir']);
+					break;
-			elseif ( WP_CONTENT_DIR . '/themes' == $dir && ! $wp_filesystem->find_folder(WP_CONTENT_DIR . '/themes') )
+				case WP_PLUGIN_DIR:
-				return new WP_Error('fs_no_themes_dir', $this->strings['fs_no_themes_dir']);
+					if ( ! $wp_filesystem->wp_plugins_dir() )
+						return new WP_Error('fs_no_plugins_dir', $this->strings['fs_no_plugins_dir']);
-			elseif ( ! $wp_filesystem->find_folder($dir) )
+					break;
-				return new WP_Error('fs_no_folder', sprintf($strings['fs_no_folder'], $dir));
+				case WP_CONTENT_DIR . '/themes':
+					if ( ! $wp_filesystem->find_folder(WP_CONTENT_DIR . '/themes') )
+						return new WP_Error('fs_no_themes_dir', $this->strings['fs_no_themes_dir']);
+					break;
+				default:
+					if ( ! $wp_filesystem->find_folder($dir) )
+						return new WP_Error('fs_no_folder', sprintf($this->strings['fs_no_folder'], $dir));
+					break;
+			}
 		}
 		return true;
 	} //end fs_connect();
 	function download_package($package) {
 		if ( in_array( $destination, array(ABSPATH, WP_CONTENT_DIR, WP_PLUGIN_DIR, WP_CONTENT_DIR . '/themes') ) ) {
 			$remote_destination = trailingslashit($remote_destination) . trailingslashit(basename($source));
 			$destination = trailingslashit($destination) . trailingslashit(basename($source));
 		}
-		//If we're not clearing the destination folder, and something exists there allready, Bail.
+		if ( $wp_filesystem->exists($remote_destination) ) {
-		if ( ! $clear_destination && $wp_filesystem->exists($remote_destination) ) {
+			if ( $clear_destination ) {
-			$wp_filesystem->delete($remote_source, true); //Clear out the source files.
+				//We're going to clear the destination if theres something there
-			return new WP_Error('folder_exists', $this->strings['folder_exists'], $remote_destination );
+				$this->skin->feedback('remove_old');
-		} else if ( $clear_destination ) {
-			//We're going to clear the destination if theres something there
-			$this->skin->feedback('remove_old');
-			$removed = true;
-			if ( $wp_filesystem->exists($remote_destination) )
 				$removed = $wp_filesystem->delete($remote_destination, true);
+				$removed = apply_filters('upgrader_clear_destination', $removed, $local_destination, $remote_destination, $hook_extra);
-			$removed = apply_filters('upgrader_clear_destination', $removed, $local_destination, $remote_destination, $hook_extra);
+				if ( is_wp_error($removed) )
-			if ( is_wp_error($removed) )
+					return $removed;
-				return $removed;
+				else if ( ! $removed )
-			else if ( ! $removed )
+					return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
-				return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
+			} else {
+				//If we're not clearing the destination folder and something exists there allready, Bail.
+				//But first check to see if there are actually any files in the folder.
+				$_files = $wp_filesystem->dirlist($remote_destination);
+				if ( ! empty($_files) ) {
+					$wp_filesystem->delete($remote_source, true); //Clear out the source files.
+					return new WP_Error('folder_exists', $this->strings['folder_exists'], $remote_destination );
+				}
+			}
 		}
 		//Create destination if needed
 		if ( !$wp_filesystem->exists($remote_destination) )
 			if ( !$wp_filesystem->mkdir($remote_destination, FS_CHMOD_DIR) )
 		$defaults = array( 	'package' => '', //Please always pass this.
 							'destination' => '', //And this
 							'clear_destination' => false,
 							'clear_working' => true,
+							'is_multi' => false,
 							'hook_extra' => array() //Pass any extra $hook_extra args here, this will be passed to any hooked filters.
 						);
 		$options = wp_parse_args($options, $defaults);
 		extract($options);
 		if ( is_wp_error($res) ) {
 			$this->skin->error($res);
 			return $res;
 		}
-		$this->skin->header();
+		if ( !$is_multi ) // call $this->header separately if running multiple times
+			$this->skin->header();
 		$this->skin->before();
 		//Download the package (Note, This just returns the filename of the file if the package is a local file)
 		$download = $this->download_package( $package );
 		if ( is_wp_error($download) ) {
 		} else {
 			//Install Suceeded
 			$this->skin->feedback('process_success');
 		}
 		$this->skin->after();
-		$this->skin->footer();
+		if ( !$is_multi )
+			$this->skin->footer();
 		return $result;
 	}
 	function maintenance_mode($enable = false) {
 		global $wp_filesystem;
 * @since 2.8.0
 */
 class Plugin_Upgrader extends WP_Upgrader {
 	var $result;
+	var $bulk = false;
+	var $show_before = '';
 	function upgrade_strings() {
 		$this->strings['up_to_date'] = __('The plugin is at the latest version.');
 		$this->strings['no_package'] = __('Upgrade package not available.');
 		$this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>.');
 					'hook_extra' => array(
 								'plugin' => $plugin
 					)
 				));
-		//Cleanup our hooks, incase something else does a upgrade on this connection.
+		// Cleanup our hooks, incase something else does a upgrade on this connection.
 		remove_filter('upgrader_pre_install', array(&$this, 'deactivate_plugin_before_upgrade'));
 		remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'));
 		if ( ! $this->result || is_wp_error($this->result) )
 			return $this->result;
 		// Force refresh of plugin update information
 		delete_transient('update_plugins');
+	}
+	function bulk_upgrade($plugins) {
+		$this->init();
+		$this->bulk = true;
+		$this->upgrade_strings();
+		$current = get_transient( 'update_plugins' );
+		add_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'), 10, 4);
+		$this->skin->header();
+		// Connect to the Filesystem first.
+		$res = $this->fs_connect( array(WP_CONTENT_DIR, WP_PLUGIN_DIR) );
+		if ( ! $res ) {
+			$this->skin->footer();
+			return false;
+		}
+		$this->maintenance_mode(true);
+		$all = count($plugins);
+		$i = 1;
+		foreach ( $plugins as $plugin ) {
+			$this->show_before = sprintf( '<h4>' . __('Updating plugin %1$d of %2$d...') . '</h4>', $i, $all );
+			$i++;
+			if ( !isset( $current->response[ $plugin ] ) ) {
+				$this->skin->set_result(false);
+				$this->skin->error('up_to_date');
+				$this->skin->after();
+				$results[$plugin] = false;
+				continue;
+			}
+			// Get the URL to the zip file
+			$r = $current->response[ $plugin ];
+			$this->skin->plugin_active = is_plugin_active($plugin);
+			$result = $this->run(array(
+						'package' => $r->package,
+						'destination' => WP_PLUGIN_DIR,
+						'clear_destination' => true,
+						'clear_working' => true,
+						'is_multi' => true,
+						'hook_extra' => array(
+									'plugin' => $plugin
+						)
+					));
+			$results[$plugin] = $this->result;
+			// Prevent credentials auth screen from displaying multiple times
+			if ( false === $result )
+				break;
+		}
+		$this->maintenance_mode(false);
+		$this->skin->footer();
+		// Cleanup our hooks, incase something else does a upgrade on this connection.
+		remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'));
+		// Force refresh of plugin update information
+		delete_transient('update_plugins');
+		return $results;
 	}
 	//return plugin info.
 	function plugin_info() {
 		if ( ! is_array($this->result) )
 			$this->skin->set_result(false);
 			$this->skin->error('up_to_date');
 			$this->skin->after();
 			return false;
 		}
 		$r = $current->response[ $theme ];
 		add_filter('upgrader_pre_install', array(&$this, 'current_before'), 10, 2);
 		add_filter('upgrader_post_install', array(&$this, 'current_after'), 10, 2);
 		add_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'), 10, 4);
 		parent::__construct($args);
 	}
 	function after() {
+		if ( $this->upgrader->bulk )
+			return;
 		$this->plugin = $this->upgrader->plugin_info();
 		if( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
 			show_message(__('Attempting reactivation of the plugin'));
 			echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) .'"></iframe>';
 		}
 		$update_actions =  array(
 			'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>',
 			'plugins_page' => '<a href="' . admin_url('plugins.php') . '" title="' . esc_attr__('Goto plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>'
 		);
 		if ( $this->plugin_active )
 		$update_actions = apply_filters('update_plugin_complete_actions', $update_actions, $this->plugin);
 		if ( ! empty($update_actions) )
 			$this->feedback('<strong>' . __('Actions:') . '</strong> ' . implode(' | ', (array)$update_actions));
 	}
+	function before() {
+		if ( $this->upgrader->show_before ) {
+			echo $this->upgrader->show_before;
+			$this->upgrader->show_before = '';
+		}
+	}
 }
 /**
 * Plugin Installer Skin for WordPress Plugin Installer.
 *
 			!empty($theme_info) ) {
 			$name = $theme_info['Name'];
 			$stylesheet = $this->upgrader->result['destination_name'];
 			$template = !empty($theme_info['Template']) ? $theme_info['Template'] : $stylesheet;
 			$preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), trailingslashit(esc_url(get_option('home'))) ) );
 			$activate_link = wp_nonce_url("themes.php?action=activate&amp;template=" . urlencode($template) . "&amp;stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
 			$update_actions =  array(
 				'preview' => '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>',
 				'activate' => '<a href="' . $activate_link .  '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>',
 			);
 			if ( ( ! $this->result || is_wp_error($this->result) ) || $stylesheet == get_stylesheet() )

branch	wordpress
changeset 132	4d4862461b8d
parent 109	03b0d1493584