X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/baca9ce86a38dc54c4574890ee2d352fd81f78b2..61343b82c4f0da4c68e4c6373daafff4a81efdd1:/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 63155927..6c399c7e 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -50,6 +50,7 @@ class WP_Upgrader { $this->strings['download_failed'] = __('Download failed.'); $this->strings['installing_package'] = __('Installing the latest version…'); + $this->strings['no_files'] = __('The package contains no files.'); $this->strings['folder_exists'] = __('Destination folder already exists.'); $this->strings['mkdir_failed'] = __('Could not create directory.'); $this->strings['incompatible_archive'] = __('The package could not be installed.'); @@ -166,6 +167,7 @@ class WP_Upgrader { global $wp_filesystem; $defaults = array( 'source' => '', 'destination' => '', //Please always pass these 'clear_destination' => false, 'clear_working' => false, + 'abort_if_destination_exists' => true, 'hook_extra' => array()); $args = wp_parse_args($args, $defaults); @@ -193,8 +195,8 @@ 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( '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. + return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], $this->strings['no_files'] ); //There are no files? + else //It's 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.. @@ -224,7 +226,7 @@ class WP_Upgrader { return $removed; else if ( ! $removed ) return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']); - } elseif ( $wp_filesystem->exists($remote_destination) ) { + } elseif ( $abort_if_destination_exists && $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); @@ -272,6 +274,7 @@ class WP_Upgrader { $defaults = array( 'package' => '', //Please always pass this. 'destination' => '', //And this 'clear_destination' => false, + 'abort_if_destination_exists' => true, // Abort if the Destination directory exists, Pass clear_destination as false please 'clear_working' => true, 'is_multi' => false, 'hook_extra' => array() //Pass any extra $hook_extra args here, this will be passed to any hooked filters. @@ -318,6 +321,7 @@ class WP_Upgrader { 'source' => $working_dir, 'destination' => $destination, 'clear_destination' => $clear_destination, + 'abort_if_destination_exists' => $abort_if_destination_exists, 'clear_working' => $clear_working, 'hook_extra' => $hook_extra ) ); @@ -385,6 +389,7 @@ class Plugin_Upgrader extends WP_Upgrader { $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['no_files'] = __('The plugin contains no files.'); $this->strings['process_failed'] = __('Plugin install failed.'); $this->strings['process_success'] = __('Plugin installed successfully.'); } @@ -412,6 +417,7 @@ class Plugin_Upgrader extends WP_Upgrader { // Force refresh of plugin update information delete_site_transient('update_plugins'); wp_cache_delete( 'plugins', 'plugins' ); + do_action( 'upgrader_process_complete', $this, array( 'action' => 'install', 'type' => 'plugin' ), $package ); return true; } @@ -457,6 +463,7 @@ class Plugin_Upgrader extends WP_Upgrader { // Force refresh of plugin update information delete_site_transient('update_plugins'); wp_cache_delete( 'plugins', 'plugins' ); + do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'plugin' ), $plugin ); } function bulk_upgrade($plugins) { @@ -539,6 +546,7 @@ class Plugin_Upgrader extends WP_Upgrader { // Force refresh of plugin update information delete_site_transient('update_plugins'); wp_cache_delete( 'plugins', 'plugins' ); + do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'plugin', 'bulk' => true ), $plugins ); return $results; } @@ -615,11 +623,11 @@ class Plugin_Upgrader extends WP_Upgrader { $plugins_dir = $wp_filesystem->wp_plugins_dir(); $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) ); - if ( ! $wp_filesystem->exists($this_plugin_dir) ) //If its already vanished. + if ( ! $wp_filesystem->exists($this_plugin_dir) ) //If it's already vanished. 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 separator 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 it's not the root plugin folder $deleted = $wp_filesystem->delete($this_plugin_dir, true); else $deleted = $wp_filesystem->delete($plugins_dir . $plugin); @@ -661,6 +669,7 @@ class Theme_Upgrader extends WP_Upgrader { $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['no_files'] = __('The theme contains no files.'); $this->strings['process_failed'] = __('Theme install failed.'); $this->strings['process_success'] = __('Theme installed successfully.'); /* translators: 1: theme name, 2: version */ @@ -757,13 +766,14 @@ class Theme_Upgrader extends WP_Upgrader { $this->run($options); remove_filter('upgrader_source_selection', array(&$this, 'check_package') ); - remove_filter('upgrader_post_install', array(&$this, 'check_parent_theme_filter'), 10, 3); + remove_filter('upgrader_post_install', array(&$this, 'check_parent_theme_filter')); if ( ! $this->result || is_wp_error($this->result) ) return $this->result; // Force refresh of theme update information wp_clean_themes_cache(); + do_action( 'upgrader_process_complete', $this, array( 'action' => 'install', 'type' => 'theme' ), $package ); return true; } @@ -801,15 +811,16 @@ 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); + remove_filter('upgrader_pre_install', array(&$this, 'current_before')); + remove_filter('upgrader_post_install', array(&$this, 'current_after')); + remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme')); if ( ! $this->result || is_wp_error($this->result) ) return $this->result; // Force refresh of theme update information wp_clean_themes_cache(); + do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'theme' ), $theme ); return true; } @@ -891,12 +902,13 @@ class Theme_Upgrader extends WP_Upgrader { $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); + remove_filter('upgrader_pre_install', array(&$this, 'current_before')); + remove_filter('upgrader_post_install', array(&$this, 'current_after')); + remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme')); // Force refresh of theme update information wp_clean_themes_cache(); + do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'theme', 'bulk' => true ), $themes ); return $results; } @@ -1020,9 +1032,6 @@ class Core_Upgrader extends WP_Upgrader { $this->init(); $this->upgrade_strings(); - if ( !empty($feedback) ) - add_filter('update_feedback', $feedback); - // Is an update available? if ( !isset( $current->response ) || $current->response == 'latest' ) return new WP_Error('up_to_date', $this->strings['up_to_date']); @@ -1067,7 +1076,9 @@ class Core_Upgrader extends WP_Upgrader { if ( ! function_exists( 'update_core' ) ) return new WP_Error( 'copy_failed_space', $this->strings['copy_failed_space'] ); - return update_core($working_dir, $wp_dir); + $result = update_core( $working_dir, $wp_dir ); + do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'core' ), $result ); + return $result; } } @@ -1118,7 +1129,7 @@ class WP_Upgrader_Skin { return; $this->done_header = true; echo '
'; - echo screen_icon(); + screen_icon(); echo '

' . $this->options['title'] . '

'; } function footer() { @@ -1234,7 +1245,7 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin { 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_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.').' '.__('Show Details').'.'; $this->upgrader->strings['skin_upgrade_end'] = __('All updates have been completed.'); @@ -1310,8 +1321,9 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin { echo ''; } - if ( !empty($this->result) && !is_wp_error($this->result) ) { - echo '

' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '

'; + if ( $this->result && ! is_wp_error( $this->result ) ) { + if ( ! $this->error ) + echo '

' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '

'; echo ''; } @@ -1342,11 +1354,11 @@ class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin { $this->upgrader->strings['skin_before_update_header'] = __('Updating Plugin %1$s (%2$d/%3$d)'); } - function before() { + function before($title = '') { parent::before($this->plugin_info['Title']); } - function after() { + function after($title = '') { parent::after($this->plugin_info['Title']); } function bulk_footer() { @@ -1376,11 +1388,11 @@ class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin { $this->upgrader->strings['skin_before_update_header'] = __('Updating Theme %1$s (%2$d/%3$d)'); } - function before() { + function before($title = '') { parent::before( $this->theme_info->display('Name') ); } - function after() { + function after($title = '') { parent::after( $this->theme_info->display('Name') ); } @@ -1433,7 +1445,7 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin { $install_actions = array(); - $from = isset($_GET['from']) ? stripslashes($_GET['from']) : 'plugins'; + $from = isset($_GET['from']) ? wp_unslash( $_GET['from'] ) : 'plugins'; if ( 'import' == $from ) $install_actions['activate_plugin'] = '' . __('Activate Plugin & Run Importer') . ''; @@ -1603,7 +1615,7 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin { } /** - * Upgrade Skin helper for File uploads. This class handles the upload process and passes it as if its a local file to the Upgrade/Installer functions. + * Upgrade Skin helper for File uploads. This class handles the upload process and passes it as if it's a local file to the Upgrade/Installer functions. * * @TODO More Detailed docs, for methods as well. * @@ -1621,7 +1633,7 @@ class File_Upload_Upgrader { if ( empty($_FILES[$form]['name']) && empty($_GET[$urlholder]) ) wp_die(__('Please select a file')); - //Handle a newly uploaded file, Else assume its already been uploaded + //Handle a newly uploaded file, Else assume it's already been uploaded if ( ! empty($_FILES) ) { $overrides = array( 'test_form' => false, 'test_type' => false ); $file = wp_handle_upload( $_FILES[$form], $overrides );