X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/d3b1ea255664edd2deef17f900a655613d20820d..5aa86a9053fb0fa15846bb60aac2fb8fdfff524a:/wp-admin/includes/class-wp-upgrader.php
diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php
index 76b11fe8..e61e0ef5 100644
--- a/wp-admin/includes/class-wp-upgrader.php
+++ b/wp-admin/includes/class-wp-upgrader.php
@@ -25,9 +25,6 @@ class WP_Upgrader {
var $skin = null;
var $result = array();
- function WP_Upgrader($skin = null) {
- return $this->__construct($skin);
- }
function __construct($skin = null) {
if ( null == $skin )
$this->skin = new WP_Upgrader_Skin();
@@ -43,21 +40,22 @@ class WP_Upgrader {
function generic_strings() {
$this->strings['bad_request'] = __('Invalid Data provided.');
$this->strings['fs_unavailable'] = __('Could not access filesystem.');
- $this->strings['fs_error'] = __('Filesystem error');
+ $this->strings['fs_error'] = __('Filesystem error.');
$this->strings['fs_no_root_dir'] = __('Unable to locate WordPress Root directory.');
$this->strings['fs_no_content_dir'] = __('Unable to locate WordPress Content directory (wp-content).');
$this->strings['fs_no_plugins_dir'] = __('Unable to locate WordPress Plugin directory.');
$this->strings['fs_no_themes_dir'] = __('Unable to locate WordPress Theme directory.');
+ /* translators: %s: directory name */
$this->strings['fs_no_folder'] = __('Unable to locate needed folder (%s).');
$this->strings['download_failed'] = __('Download failed.');
- $this->strings['installing_package'] = __('Installing the latest version.');
+ $this->strings['installing_package'] = __('Installing the latest version…');
$this->strings['folder_exists'] = __('Destination folder already exists.');
$this->strings['mkdir_failed'] = __('Could not create directory.');
- $this->strings['bad_package'] = __('Incompatible Archive');
+ $this->strings['incompatible_archive'] = __('The package could not be installed.');
- $this->strings['maintenance_start'] = __('Enabling Maintenance mode.');
- $this->strings['maintenance_end'] = __('Disabling Maintenance mode.');
+ $this->strings['maintenance_start'] = __('Enabling Maintenance mode…');
+ $this->strings['maintenance_end'] = __('Disabling Maintenance mode…');
}
function fs_connect( $directories = array() ) {
@@ -81,20 +79,28 @@ class WP_Upgrader {
return new WP_Error('fs_error', $this->strings['fs_error'], $wp_filesystem->errors);
foreach ( (array)$directories as $dir ) {
- if ( ABSPATH == $dir && ! $wp_filesystem->abspath() )
- return new WP_Error('fs_no_root_dir', $this->strings['fs_no_root_dir']);
-
- elseif ( WP_CONTENT_DIR == $dir && ! $wp_filesystem->wp_content_dir() )
- return new WP_Error('fs_no_content_dir', $this->strings['fs_no_content_dir']);
-
- elseif ( WP_PLUGIN_DIR == $dir && ! $wp_filesystem->wp_plugins_dir() )
- return new WP_Error('fs_no_plugins_dir', $this->strings['fs_no_plugins_dir']);
-
- elseif ( WP_CONTENT_DIR . '/themes' == $dir && ! $wp_filesystem->find_folder(WP_CONTENT_DIR . '/themes') )
- return new WP_Error('fs_no_themes_dir', $this->strings['fs_no_themes_dir']);
-
- elseif ( ! $wp_filesystem->find_folder($dir) )
- return new WP_Error('fs_no_folder', sprintf($strings['fs_no_folder'], $dir));
+ switch ( $dir ) {
+ case ABSPATH:
+ if ( ! $wp_filesystem->abspath() )
+ return new WP_Error('fs_no_root_dir', $this->strings['fs_no_root_dir']);
+ break;
+ case WP_CONTENT_DIR:
+ if ( ! $wp_filesystem->wp_content_dir() )
+ return new WP_Error('fs_no_content_dir', $this->strings['fs_no_content_dir']);
+ break;
+ case WP_PLUGIN_DIR:
+ if ( ! $wp_filesystem->wp_plugins_dir() )
+ return new WP_Error('fs_no_plugins_dir', $this->strings['fs_no_plugins_dir']);
+ break;
+ 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();
@@ -147,6 +153,9 @@ class WP_Upgrader {
if ( is_wp_error($result) ) {
$wp_filesystem->delete($working_dir, true);
+ if ( 'incompatible_archive' == $result->get_error_code() ) {
+ return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], $result->get_error_data() );
+ }
return $result;
}
@@ -184,8 +193,9 @@ class WP_Upgrader {
if ( 1 == count($source_files) && $wp_filesystem->is_dir( trailingslashit($source) . $source_files[0] . '/') ) //Only one folder? Then we want its contents.
$source = trailingslashit($source) . trailingslashit($source_files[0]);
elseif ( count($source_files) == 0 )
- return new WP_Error('bad_package', $this->strings['bad_package']); //There are no files?
- //else //Its only a single file, The upgrader will use the foldername of this file as the destination folder. foldername is based on zip filename.
+ return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __( 'The plugin contains no files.' ) ); //There are no files?
+ else //Its only a single file, The upgrader will use the foldername of this file as the destination folder. foldername is based on zip filename.
+ $source = trailingslashit($source);
//Hook ability to change the source file location..
$source = apply_filters('upgrader_source_selection', $source, $remote_source, $this);
@@ -202,24 +212,26 @@ class WP_Upgrader {
$destination = trailingslashit($destination) . trailingslashit(basename($source));
}
- //If we're not clearing the destination folder, and something exists there allready, Bail.
- if ( ! $clear_destination && $wp_filesystem->exists($remote_destination) ) {
- $wp_filesystem->delete($remote_source, true); //Clear out the source files.
- return new WP_Error('folder_exists', $this->strings['folder_exists'], $remote_destination );
- } else if ( $clear_destination ) {
- //We're going to clear the destination if theres something there
+ if ( $clear_destination ) {
+ //We're going to clear the destination if there's 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);
if ( is_wp_error($removed) )
return $removed;
else if ( ! $removed )
return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
+ } elseif ( $wp_filesystem->exists($remote_destination) ) {
+ //If we're not clearing the destination folder and something exists there already, 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
@@ -261,6 +273,7 @@ class WP_Upgrader {
'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.
);
@@ -277,20 +290,26 @@ class WP_Upgrader {
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) ) {
$this->skin->error($download);
+ $this->skin->after();
return $download;
}
- //Unzip's the file into a temporary directory
- $working_dir = $this->unpack_package( $download );
+ $delete_package = ($download != $package); // Do not delete a "local" file
+
+ //Unzips the file into a temporary directory
+ $working_dir = $this->unpack_package( $download, $delete_package );
if ( is_wp_error($working_dir) ) {
$this->skin->error($working_dir);
+ $this->skin->after();
return $working_dir;
}
@@ -307,11 +326,14 @@ class WP_Upgrader {
$this->skin->error($result);
$this->skin->feedback('process_failed');
} else {
- //Install Suceeded
+ //Install Succeeded
$this->skin->feedback('process_success');
}
$this->skin->after();
- $this->skin->footer();
+
+ if ( !$is_multi )
+ $this->skin->footer();
+
return $result;
}
@@ -344,26 +366,28 @@ class WP_Upgrader {
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 %s.');
- $this->strings['unpack_package'] = __('Unpacking the update.');
- $this->strings['deactivate_plugin'] = __('Deactivating the plugin.');
- $this->strings['remove_old'] = __('Removing the old version of the plugin.');
+ $this->strings['no_package'] = __('Update package not available.');
+ $this->strings['downloading_package'] = __('Downloading update from %s…');
+ $this->strings['unpack_package'] = __('Unpacking the update…');
+ $this->strings['deactivate_plugin'] = __('Deactivating the plugin…');
+ $this->strings['remove_old'] = __('Removing the old version of the plugin…');
$this->strings['remove_old_failed'] = __('Could not remove the old plugin.');
- $this->strings['process_failed'] = __('Plugin upgrade Failed.');
- $this->strings['process_success'] = __('Plugin upgraded successfully.');
+ $this->strings['process_failed'] = __('Plugin update failed.');
+ $this->strings['process_success'] = __('Plugin updated successfully.');
}
function install_strings() {
$this->strings['no_package'] = __('Install package not available.');
- $this->strings['downloading_package'] = __('Downloading install package from %s.');
- $this->strings['unpack_package'] = __('Unpacking the package.');
- $this->strings['installing_package'] = __('Installing the plugin.');
- $this->strings['process_failed'] = __('Plugin Install Failed.');
- $this->strings['process_success'] = __('Plugin Installed successfully.');
+ $this->strings['downloading_package'] = __('Downloading install package from %s…');
+ $this->strings['unpack_package'] = __('Unpacking the package…');
+ $this->strings['installing_package'] = __('Installing the plugin…');
+ $this->strings['process_failed'] = __('Plugin install failed.');
+ $this->strings['process_success'] = __('Plugin installed successfully.');
}
function install($package) {
@@ -371,6 +395,8 @@ class Plugin_Upgrader extends WP_Upgrader {
$this->init();
$this->install_strings();
+ add_filter('upgrader_source_selection', array(&$this, 'check_package') );
+
$this->run(array(
'package' => $package,
'destination' => WP_PLUGIN_DIR,
@@ -379,9 +405,15 @@ class Plugin_Upgrader extends WP_Upgrader {
'hook_extra' => array()
));
+ remove_filter('upgrader_source_selection', array(&$this, 'check_package') );
+
+ if ( ! $this->result || is_wp_error($this->result) )
+ return $this->result;
+
// Force refresh of plugin update information
- delete_transient('update_plugins');
+ delete_site_transient('update_plugins');
+ return true;
}
function upgrade($plugin) {
@@ -389,8 +421,9 @@ class Plugin_Upgrader extends WP_Upgrader {
$this->init();
$this->upgrade_strings();
- $current = get_transient( 'update_plugins' );
+ $current = get_site_transient( 'update_plugins' );
if ( !isset( $current->response[ $plugin ] ) ) {
+ $this->skin->before();
$this->skin->set_result(false);
$this->skin->error('up_to_date');
$this->skin->after();
@@ -402,7 +435,7 @@ class Plugin_Upgrader extends WP_Upgrader {
add_filter('upgrader_pre_install', array(&$this, 'deactivate_plugin_before_upgrade'), 10, 2);
add_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'), 10, 4);
- //'source_selection' => array(&$this, 'source_selection'), //theres a track ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.
+ //'source_selection' => array(&$this, 'source_selection'), //there's a trac ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.
$this->run(array(
'package' => $r->package,
@@ -414,7 +447,7 @@ class Plugin_Upgrader extends WP_Upgrader {
)
));
- //Cleanup our hooks, incase something else does a upgrade on this connection.
+ // Cleanup our hooks, in case 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'));
@@ -422,7 +455,116 @@ class Plugin_Upgrader extends WP_Upgrader {
return $this->result;
// Force refresh of plugin update information
- delete_transient('update_plugins');
+ delete_site_transient('update_plugins');
+ }
+
+ function bulk_upgrade($plugins) {
+
+ $this->init();
+ $this->bulk = true;
+ $this->upgrade_strings();
+
+ $current = get_site_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->skin->bulk_header();
+
+ // Only start maintenance mode if running in Multisite OR the plugin is in use
+ $maintenance = is_multisite(); // @TODO: This should only kick in for individual sites if at all possible.
+ foreach ( $plugins as $plugin )
+ $maintenance = $maintenance || (is_plugin_active($plugin) && isset($current->response[ $plugin ]) ); // Only activate Maintenance mode if a plugin is active AND has an update available
+ if ( $maintenance )
+ $this->maintenance_mode(true);
+
+ $results = array();
+
+ $this->update_count = count($plugins);
+ $this->update_current = 0;
+ foreach ( $plugins as $plugin ) {
+ $this->update_current++;
+ $this->skin->plugin_info = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin, false, true);
+
+ if ( !isset( $current->response[ $plugin ] ) ) {
+ $this->skin->set_result(false);
+ $this->skin->before();
+ $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;
+ } //end foreach $plugins
+
+ $this->maintenance_mode(false);
+
+ $this->skin->bulk_footer();
+
+ $this->skin->footer();
+
+ // Cleanup our hooks, in case 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_site_transient('update_plugins');
+
+ return $results;
+ }
+
+ function check_package($source) {
+ global $wp_filesystem;
+
+ if ( is_wp_error($source) )
+ return $source;
+
+ $working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
+ if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, lets not prevent installation.
+ return $source;
+
+ // Check the folder contains at least 1 valid plugin.
+ $plugins_found = false;
+ foreach ( glob( $working_directory . '*.php' ) as $file ) {
+ $info = get_plugin_data($file, false, false);
+ if ( !empty( $info['Name'] ) ) {
+ $plugins_found = true;
+ break;
+ }
+ }
+
+ if ( ! $plugins_found )
+ return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __('No valid plugins were found.') );
+
+ return $source;
}
//return plugin info.
@@ -476,7 +618,7 @@ class Plugin_Upgrader extends WP_Upgrader {
return $removed;
// If plugin is in its own directory, recursively delete the directory.
- if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory seperator AND that its not the root plugin folder
+ if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that its not the root plugin folder
$deleted = $wp_filesystem->delete($this_plugin_dir, true);
else
$deleted = $wp_filesystem->delete($plugins_dir . $plugin);
@@ -484,7 +626,7 @@ class Plugin_Upgrader extends WP_Upgrader {
if ( ! $deleted )
return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
- return $removed;
+ return true;
}
}
@@ -500,25 +642,26 @@ class Plugin_Upgrader extends WP_Upgrader {
class Theme_Upgrader extends WP_Upgrader {
var $result;
+ var $bulk = false;
function upgrade_strings() {
$this->strings['up_to_date'] = __('The theme is at the latest version.');
- $this->strings['no_package'] = __('Upgrade package not available.');
- $this->strings['downloading_package'] = __('Downloading update from %s.');
- $this->strings['unpack_package'] = __('Unpacking the update.');
- $this->strings['remove_old'] = __('Removing the old version of the theme.');
+ $this->strings['no_package'] = __('Update package not available.');
+ $this->strings['downloading_package'] = __('Downloading update from %s…');
+ $this->strings['unpack_package'] = __('Unpacking the update…');
+ $this->strings['remove_old'] = __('Removing the old version of the theme…');
$this->strings['remove_old_failed'] = __('Could not remove the old theme.');
- $this->strings['process_failed'] = __('Theme upgrade Failed.');
- $this->strings['process_success'] = __('Theme upgraded successfully.');
+ $this->strings['process_failed'] = __('Theme update failed.');
+ $this->strings['process_success'] = __('Theme updated successfully.');
}
function install_strings() {
$this->strings['no_package'] = __('Install package not available.');
- $this->strings['downloading_package'] = __('Downloading install package from %s.');
- $this->strings['unpack_package'] = __('Unpacking the package.');
- $this->strings['installing_package'] = __('Installing the theme.');
- $this->strings['process_failed'] = __('Theme Install Failed.');
- $this->strings['process_success'] = __('Theme Installed successfully.');
+ $this->strings['downloading_package'] = __('Downloading install package from %s…');
+ $this->strings['unpack_package'] = __('Unpacking the package…');
+ $this->strings['installing_package'] = __('Installing the theme…');
+ $this->strings['process_failed'] = __('Theme install failed.');
+ $this->strings['process_success'] = __('Theme installed successfully.');
}
function install($package) {
@@ -526,6 +669,8 @@ class Theme_Upgrader extends WP_Upgrader {
$this->init();
$this->install_strings();
+ add_filter('upgrader_source_selection', array(&$this, 'check_package') );
+
$options = array(
'package' => $package,
'destination' => WP_CONTENT_DIR . '/themes',
@@ -535,16 +680,15 @@ class Theme_Upgrader extends WP_Upgrader {
$this->run($options);
+ remove_filter('upgrader_source_selection', array(&$this, 'check_package') );
+
if ( ! $this->result || is_wp_error($this->result) )
return $this->result;
// Force refresh of theme update information
- delete_transient('update_themes');
+ delete_site_transient('update_themes');
- if ( empty($result['destination_name']) )
- return false;
- else
- return $result['destination_name'];
+ return true;
}
function upgrade($theme) {
@@ -553,14 +697,15 @@ class Theme_Upgrader extends WP_Upgrader {
$this->upgrade_strings();
// Is an update available?
- $current = get_transient( 'update_themes' );
+ $current = get_site_transient( 'update_themes' );
if ( !isset( $current->response[ $theme ] ) ) {
+ $this->skin->before();
$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);
@@ -579,15 +724,130 @@ class Theme_Upgrader extends WP_Upgrader {
$this->run($options);
+ remove_filter('upgrader_pre_install', array(&$this, 'current_before'), 10, 2);
+ remove_filter('upgrader_post_install', array(&$this, 'current_after'), 10, 2);
+ remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'), 10, 4);
+
if ( ! $this->result || is_wp_error($this->result) )
return $this->result;
// Force refresh of theme update information
- delete_transient('update_themes');
+ delete_site_transient('update_themes');
return true;
}
+ function bulk_upgrade($themes) {
+
+ $this->init();
+ $this->bulk = true;
+ $this->upgrade_strings();
+
+ $current = get_site_transient( 'update_themes' );
+
+ 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);
+
+ $this->skin->header();
+
+ // Connect to the Filesystem first.
+ $res = $this->fs_connect( array(WP_CONTENT_DIR) );
+ if ( ! $res ) {
+ $this->skin->footer();
+ return false;
+ }
+
+ $this->skin->bulk_header();
+
+ // Only start maintenance mode if running in Multisite OR the theme is in use
+ $maintenance = is_multisite(); // @TODO: This should only kick in for individual sites if at all possible.
+ foreach ( $themes as $theme )
+ $maintenance = $maintenance || $theme == get_stylesheet() || $theme == get_template();
+ if ( $maintenance )
+ $this->maintenance_mode(true);
+
+ $results = array();
+
+ $this->update_count = count($themes);
+ $this->update_current = 0;
+ foreach ( $themes as $theme ) {
+ $this->update_current++;
+
+ if ( !isset( $current->response[ $theme ] ) ) {
+ $this->skin->set_result(false);
+ $this->skin->before();
+ $this->skin->error('up_to_date');
+ $this->skin->after();
+ $results[$theme] = false;
+ continue;
+ }
+
+ $this->skin->theme_info = $this->theme_info($theme);
+
+ // Get the URL to the zip file
+ $r = $current->response[ $theme ];
+
+ $options = array(
+ 'package' => $r['package'],
+ 'destination' => WP_CONTENT_DIR . '/themes',
+ 'clear_destination' => true,
+ 'clear_working' => true,
+ 'hook_extra' => array(
+ 'theme' => $theme
+ )
+ );
+
+ $result = $this->run($options);
+
+ $results[$theme] = $this->result;
+
+ // Prevent credentials auth screen from displaying multiple times
+ if ( false === $result )
+ break;
+ } //end foreach $plugins
+
+ $this->maintenance_mode(false);
+
+ $this->skin->bulk_footer();
+
+ $this->skin->footer();
+
+ // Cleanup our hooks, in case something else does a upgrade on this connection.
+ remove_filter('upgrader_pre_install', array(&$this, 'current_before'), 10, 2);
+ remove_filter('upgrader_post_install', array(&$this, 'current_after'), 10, 2);
+ remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'), 10, 4);
+
+ // Force refresh of theme update information
+ delete_site_transient('update_themes');
+
+ return $results;
+ }
+
+ function check_package($source) {
+ global $wp_filesystem;
+
+ if ( is_wp_error($source) )
+ return $source;
+
+ // Check the folder contains a valid theme
+ $working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
+ if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, lets not prevent installation.
+ return $source;
+
+ if ( ! file_exists( $working_directory . 'style.css' ) ) // A proper archive should have a style.css file in the single subdirectory
+ return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __('The theme is missing the style.css
stylesheet.') );
+
+ $info = get_theme_data( $working_directory . 'style.css' );
+ if ( empty($info['Name']) )
+ return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __("The style.css
stylesheet doesn't contain a valid theme header.") );
+
+ if ( empty($info['Template']) && ! file_exists( $working_directory . 'index.php' ) ) // If no template is set, it must have at least an index.php to be legit.
+ return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __('The theme is missing the index.php
file.') );
+
+ return $source;
+ }
+
function current_before($return, $theme) {
if ( is_wp_error($return) )
@@ -597,11 +857,13 @@ class Theme_Upgrader extends WP_Upgrader {
if ( $theme != get_stylesheet() ) //If not current
return $return;
- //Change to maintainence mode now.
- $this->maintenance_mode(true);
+ //Change to maintenance mode now.
+ if ( ! $this->bulk )
+ $this->maintenance_mode(true);
return $return;
}
+
function current_after($return, $theme) {
if ( is_wp_error($return) )
return $return;
@@ -612,6 +874,7 @@ class Theme_Upgrader extends WP_Upgrader {
return $return;
//Ensure stylesheet name hasnt changed after the upgrade:
+ // @TODO: Note, This doesn't handle the Template changing, or the Template name changing.
if ( $theme == get_stylesheet() && $theme != $this->result['destination_name'] ) {
$theme_info = $this->theme_info();
$stylesheet = $this->result['destination_name'];
@@ -619,8 +882,9 @@ class Theme_Upgrader extends WP_Upgrader {
switch_theme($template, $stylesheet, true);
}
- //Time to remove maintainence mode
- $this->maintenance_mode(false);
+ //Time to remove maintenance mode
+ if ( ! $this->bulk )
+ $this->maintenance_mode(false);
return $return;
}
@@ -639,16 +903,21 @@ class Theme_Upgrader extends WP_Upgrader {
return true;
}
- function theme_info() {
- if ( empty($this->result['destination_name']) )
- return false;
- return get_theme_data(WP_CONTENT_DIR . '/themes/' . $this->result['destination_name'] . '/style.css');
+ function theme_info($theme = null) {
+
+ if ( empty($theme) ) {
+ if ( !empty($this->result['destination_name']) )
+ $theme = $this->result['destination_name'];
+ else
+ return false;
+ }
+ return get_theme_data(WP_CONTENT_DIR . '/themes/' . $theme . '/style.css');
}
}
/**
- * Core Upgrader class for WordPress. It allows for WordPress to upgrade itself in combiantion with the wp-admin/includes/update-core.php file
+ * Core Upgrader class for WordPress. It allows for WordPress to upgrade itself in combination with the wp-admin/includes/update-core.php file
*
* @TODO More Detailed docs, for methods as well.
*
@@ -660,14 +929,14 @@ class Core_Upgrader extends WP_Upgrader {
function upgrade_strings() {
$this->strings['up_to_date'] = __('WordPress is at the latest version.');
- $this->strings['no_package'] = __('Upgrade package not available.');
- $this->strings['downloading_package'] = __('Downloading update from %s.');
- $this->strings['unpack_package'] = __('Unpacking the update.');
+ $this->strings['no_package'] = __('Update package not available.');
+ $this->strings['downloading_package'] = __('Downloading update from %s…');
+ $this->strings['unpack_package'] = __('Unpacking the update…');
$this->strings['copy_failed'] = __('Could not copy files.');
}
function upgrade($current) {
- global $wp_filesystem;
+ global $wp_filesystem, $wp_version;
$this->init();
$this->upgrade_strings();
@@ -685,7 +954,21 @@ class Core_Upgrader extends WP_Upgrader {
$wp_dir = trailingslashit($wp_filesystem->abspath());
- $download = $this->download_package( $current->package );
+ // If partial update is returned from the API, use that, unless we're doing a reinstall.
+ // If we cross the new_bundled version number, then use the new_bundled zip.
+ // Don't though if the constant is set to skip bundled items.
+ // If the API returns a no_content zip, go with it. Finally, default to the full zip.
+ if ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version )
+ $to_download = 'partial';
+ elseif ( $current->packages->new_bundled && version_compare( $wp_version, $current->new_bundled, '<' )
+ && ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) )
+ $to_download = 'new_bundled';
+ elseif ( $current->packages->no_content )
+ $to_download = 'no_content';
+ else
+ $to_download = 'full';
+
+ $download = $this->download_package( $current->packages->$to_download );
if ( is_wp_error($download) )
return $download;
@@ -720,10 +1003,8 @@ class WP_Upgrader_Skin {
var $upgrader;
var $done_header = false;
+ var $result = false;
- function WP_Upgrader_Skin($args = array()) {
- return $this->__construct($args);
- }
function __construct($args = array()) {
$defaults = array( 'url' => '', 'nonce' => '', 'title' => '', 'context' => false );
$this->options = wp_parse_args($args, $defaults);
@@ -732,7 +1013,12 @@ class WP_Upgrader_Skin {
function set_upgrader(&$upgrader) {
if ( is_object($upgrader) )
$this->upgrader =& $upgrader;
+ $this->add_strings();
+ }
+
+ function add_strings() {
}
+
function set_result($result) {
$this->result = $result;
}
@@ -803,31 +1089,30 @@ class WP_Upgrader_Skin {
class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
var $plugin = '';
var $plugin_active = false;
-
- function Plugin_Upgrader_Skin($args = array()) {
- return $this->__construct($args);
- }
+ var $plugin_network_active = false;
function __construct($args = array()) {
- $defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Upgrade Plugin') );
+ $defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') );
$args = wp_parse_args($args, $defaults);
$this->plugin = $args['plugin'];
- $this->plugin_active = is_plugin_active($this->plugin);
+ $this->plugin_active = is_plugin_active( $this->plugin );
+ $this->plugin_network_active = is_plugin_active_for_network( $this->plugin );
parent::__construct($args);
}
function after() {
$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 '';
+ if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
+ show_message(__('Reactivating the plugin…'));
+ echo '';
}
+
$update_actions = array(
'activate_plugin' => '' . __('Activate Plugin') . '',
- 'plugins_page' => '' . __('Return to Plugins page') . ''
+ 'plugins_page' => '' . __('Return to Plugins page') . ''
);
if ( $this->plugin_active )
unset( $update_actions['activate_plugin'] );
@@ -836,7 +1121,191 @@ class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
$update_actions = apply_filters('update_plugin_complete_actions', $update_actions, $this->plugin);
if ( ! empty($update_actions) )
- $this->feedback('' . __('Actions:') . ' ' . implode(' | ', (array)$update_actions));
+ $this->feedback(implode(' | ', (array)$update_actions));
+ }
+
+ function before() {
+ if ( $this->upgrader->show_before ) {
+ echo $this->upgrader->show_before;
+ $this->upgrader->show_before = '';
+ }
+ }
+}
+
+/**
+ * Plugin Upgrader Skin for WordPress Plugin Upgrades.
+ *
+ * @package WordPress
+ * @subpackage Upgrader
+ * @since 3.0.0
+ */
+class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
+ var $in_loop = false;
+ var $error = false;
+
+ function __construct($args = array()) {
+ $defaults = array( 'url' => '', 'nonce' => '' );
+ $args = wp_parse_args($args, $defaults);
+
+ parent::__construct($args);
+ }
+
+ function add_strings() {
+ $this->upgrader->strings['skin_upgrade_start'] = __('The update process is starting. This process may take a while on some hosts, so please be patient.');
+ $this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: %2$s.');
+ $this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
+ $this->upgrader->strings['skin_update_successful'] = __('%1$s updated successfully.').' ';
+ $this->upgrader->strings['skin_upgrade_end'] = __('All updates have been completed.');
+ }
+
+ function feedback($string) {
+ if ( isset( $this->upgrader->strings[$string] ) )
+ $string = $this->upgrader->strings[$string];
+
+ if ( strpos($string, '%') !== false ) {
+ $args = func_get_args();
+ $args = array_splice($args, 1);
+ if ( !empty($args) )
+ $string = vsprintf($string, $args);
+ }
+ if ( empty($string) )
+ return;
+ if ( $this->in_loop )
+ echo "$string
\n";
+ else
+ echo "
$string
\n"; + } + + function header() { + // Nothing, This will be displayed within a iframe. + } + + function footer() { + // Nothing, This will be displayed within a iframe. + } + function error($error) { + if ( is_string($error) && isset( $this->upgrader->strings[$error] ) ) + $this->error = $this->upgrader->strings[$error]; + + if ( is_wp_error($error) ) { + foreach ( $error->get_error_messages() as $emessage ) { + if ( $error->get_error_data() ) + $messages[] = $emessage . ' ' . $error->get_error_data(); + else + $messages[] = $emessage; + } + $this->error = implode(', ', $messages); + } + echo ''; + } + + function bulk_header() { + $this->feedback('skin_upgrade_start'); + } + + function bulk_footer() { + $this->feedback('skin_upgrade_end'); + } + + function before($title = '') { + $this->in_loop = true; + printf( '' . sprintf($this->upgrader->strings['skin_update_failed_error'], $title, $this->error) . '
' . sprintf($this->upgrader->strings['skin_update_failed'], $title) . '
' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '