$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.');
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);
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..
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);
$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.
'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
) );
$this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>…');
$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.');
}
// 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;
}
// 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) {
// 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;
}
$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);
$this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>…');
$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 */
$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;
}
$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;
}
$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;
}
$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']);
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;
}
}
return;
$this->done_header = true;
echo '<div class="wrap">';
- echo screen_icon();
+ screen_icon();
echo '<h2>' . $this->options['title'] . '</h2>';
}
function footer() {
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: <strong>%2$s</strong>.');
+ $this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: <strong>%2$s</strong>');
$this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
$this->upgrader->strings['skin_update_successful'] = __('%1$s updated successfully.').' <a onclick="%2$s" href="#" class="hide-if-no-js"><span>'.__('Show Details').'</span><span class="hidden">'.__('Hide Details').'</span>.</a>';
$this->upgrader->strings['skin_upgrade_end'] = __('All updates have been completed.');
echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').show();</script>';
}
- if ( !empty($this->result) && !is_wp_error($this->result) ) {
- echo '<div class="updated"><p>' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '</p></div>';
+ if ( $this->result && ! is_wp_error( $this->result ) ) {
+ if ( ! $this->error )
+ echo '<div class="updated"><p>' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '</p></div>';
echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
}
$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() {
$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') );
}
$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'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&from=import&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin & Run Importer') . '</a>';
}
/**
- * 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.
*
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 );