X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..refs/tags/wordpress-2.9:/wp-admin/includes/update.php diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php index c90bd7aa..0d0e6604 100644 --- a/wp-admin/includes/update.php +++ b/wp-admin/includes/update.php @@ -3,7 +3,7 @@ * WordPress Administration Update API * * @package WordPress - * @subpackage Admin + * @subpackage Administration */ // The admin side of our 1.1 update system @@ -33,10 +33,10 @@ function get_core_updates( $options = array() ) { $options = array_merge( array('available' => true, 'dismissed' => false ), $options ); $dismissed = get_option( 'dismissed_update_core' ); if ( !is_array( $dismissed ) ) $dismissed = array(); - $from_api = get_option( 'update_core' ); + $from_api = get_transient( 'update_core' ); if ( empty($from_api) ) return false; - if ( !is_array( $from_api->updates ) ) return false; + if ( !isset( $from_api->updates ) || !is_array( $from_api->updates ) ) return false; $updates = $from_api->updates; if ( !is_array( $updates ) ) return false; $result = array(); @@ -71,7 +71,7 @@ function undismiss_core_update( $version, $locale ) { } function find_core_update( $version, $locale ) { - $from_api = get_option( 'update_core' ); + $from_api = get_transient( 'update_core' ); if ( !is_array( $from_api->updates ) ) return false; $updates = $from_api->updates; foreach($updates as $update) { @@ -83,7 +83,7 @@ function find_core_update( $version, $locale ) { function core_update_footer( $msg = '' ) { if ( !current_user_can('manage_options') ) - return sprintf( '| '.__( 'Version %s' ), $GLOBALS['wp_version'] ); + return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] ); $cur = get_preferred_from_update_core(); if ( ! isset( $cur->current ) ) @@ -145,334 +145,102 @@ function update_right_now_message() { echo "$msg"; } +function get_plugin_updates() { + $all_plugins = get_plugins(); + $upgrade_plugins = array(); + $current = get_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 ]; + } + } + + return $upgrade_plugins; +} + +function wp_plugin_update_rows() { + $plugins = get_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 ); + } + } +} +add_action( 'admin_init', 'wp_plugin_update_rows' ); + function wp_plugin_update_row( $file, $plugin_data ) { - $current = get_option( 'update_plugins' ); + $current = get_transient( 'update_plugins' ); if ( !isset( $current->response[ $file ] ) ) return false; $r = $current->response[ $file ]; + $plugins_allowedtags = 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 = admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '&TB_iframe=true&width=600&height=800'); - echo ''; + echo '
'; if ( ! current_user_can('update_plugins') ) - printf( __('There is a new version of %1$s available. View version %3$s Details.'), $plugin_data['Name'], $details_url, $r->new_version); + printf( __('There is a new version of %1$s available. View version %4$s Details.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version ); else if ( empty($r->package) ) - printf( __('There is a new version of %1$s available. View version %3$s Details automatic upgrade unavailable for this plugin.'), $plugin_data['Name'], $details_url, $r->new_version); + printf( __('There is a new version of %1$s available. View version %4$s Details automatic upgrade unavailable for this plugin.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version ); else - printf( __('There is a new version of %1$s available. View version %3$s Details or upgrade automatically.'), $plugin_data['Name'], $details_url, $r->new_version, wp_nonce_url('update.php?action=upgrade-plugin&plugin=' . $file, 'upgrade-plugin_' . $file) ); + printf( __('There is a new version of %1$s available. View version %4$s Details or upgrade automatically.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url('update.php?action=upgrade-plugin&plugin=' . $file, 'upgrade-plugin_' . $file) ); - echo ''; + do_action( "in_plugin_update_message-$file", $plugin_data, $r ); + + echo '
'; } -add_action( 'after_plugin_row', 'wp_plugin_update_row', 10, 2 ); function wp_update_plugin($plugin, $feedback = '') { - global $wp_filesystem; if ( !empty($feedback) ) add_filter('update_feedback', $feedback); - // Is an update available? - $current = get_option( 'update_plugins' ); - if ( !isset( $current->response[ $plugin ] ) ) - return new WP_Error('up_to_date', __('The plugin is at the latest version.')); - - // Is a filesystem accessor setup? - if ( ! $wp_filesystem || ! is_object($wp_filesystem) ) - WP_Filesystem(); - - if ( ! is_object($wp_filesystem) ) - return new WP_Error('fs_unavailable', __('Could not access filesystem.')); - - if ( $wp_filesystem->errors->get_error_code() ) - return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors); - - //Get the base plugin folder - $plugins_dir = $wp_filesystem->wp_plugins_dir(); - if ( empty($plugins_dir) ) - return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress Plugin directory.')); - - //And the same for the Content directory. - $content_dir = $wp_filesystem->wp_content_dir(); - if( empty($content_dir) ) - return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).')); - - $plugins_dir = trailingslashit( $plugins_dir ); - $content_dir = trailingslashit( $content_dir ); - - // Get the URL to the zip file - $r = $current->response[ $plugin ]; - - if ( empty($r->package) ) - return new WP_Error('no_package', __('Upgrade package not available.')); - - // Download the package - $package = $r->package; - apply_filters('update_feedback', sprintf(__('Downloading update from %s'), $package)); - $download_file = download_url($package); - - if ( is_wp_error($download_file) ) - return new WP_Error('download_failed', __('Download failed.'), $download_file->get_error_message()); - - $working_dir = $content_dir . 'upgrade/' . basename($plugin, '.php'); - - // Clean up working directory - if ( $wp_filesystem->is_dir($working_dir) ) - $wp_filesystem->delete($working_dir, true); - - apply_filters('update_feedback', __('Unpacking the update')); - // Unzip package to working directory - $result = unzip_file($download_file, $working_dir); - - // Once extracted, delete the package - unlink($download_file); - - if ( is_wp_error($result) ) { - $wp_filesystem->delete($working_dir, true); - return $result; - } - - if ( is_plugin_active($plugin) ) { - //Deactivate the plugin silently, Prevent deactivation hooks from running. - apply_filters('update_feedback', __('Deactivating the plugin')); - deactivate_plugins($plugin, true); - } - - // Remove the existing plugin. - apply_filters('update_feedback', __('Removing the old version of the plugin')); - $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) ); - - // 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 - $deleted = $wp_filesystem->delete($this_plugin_dir, true); - else - $deleted = $wp_filesystem->delete($plugins_dir . $plugin); - - if ( ! $deleted ) { - $wp_filesystem->delete($working_dir, true); - return new WP_Error('delete_failed', __('Could not remove the old plugin')); - } + include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; + $upgrader = new Plugin_Upgrader(); + return $upgrader->upgrade($plugin); +} - apply_filters('update_feedback', __('Installing the latest version')); - // Copy new version of plugin into place. - $result = copy_dir($working_dir, $plugins_dir); - if ( is_wp_error($result) ) { - $wp_filesystem->delete($working_dir, true); - return $result; +function get_theme_updates() { + $themes = get_themes(); + $current = get_transient('update_themes'); + $update_themes = array(); + + foreach ( $themes as $theme ) { + $theme = (object) $theme; + if ( isset($current->response[ $theme->Stylesheet ]) ) { + $update_themes[$theme->Stylesheet] = $theme; + $update_themes[$theme->Stylesheet]->update = $current->response[ $theme->Stylesheet ]; + } } - //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin - $filelist = array_keys( $wp_filesystem->dirlist($working_dir) ); - - // Remove working directory - $wp_filesystem->delete($working_dir, true); - - // Force refresh of plugin update information - delete_option('update_plugins'); - - if( empty($filelist) ) - return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup. - - $folder = $filelist[0]; - $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash - $pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list - - return $folder . '/' . $pluginfiles[0]; + return $update_themes; } function wp_update_theme($theme, $feedback = '') { - global $wp_filesystem; if ( !empty($feedback) ) add_filter('update_feedback', $feedback); - // Is an update available? - $current = get_option( 'update_themes' ); - if ( !isset( $current->response[ $theme ] ) ) - return new WP_Error('up_to_date', __('The theme is at the latest version.')); - - $r = $current->response[ $theme ]; - - $themes = get_themes(); - foreach ( (array) $themes as $this_theme ) { - if ( $this_theme['Stylesheet'] == $theme ) { - $theme_directory = preg_replace('!^/themes/!i', '', $this_theme['Stylesheet Dir']); - break; - } - } - unset($themes); - - if ( empty($theme_directory) ) - return new WP_Error('theme_non_existant', __('Theme does not exist.')); - - // Is a filesystem accessor setup? - if ( ! $wp_filesystem || ! is_object($wp_filesystem) ) - WP_Filesystem(); - - if ( ! is_object($wp_filesystem) ) - return new WP_Error('fs_unavailable', __('Could not access filesystem.')); - - if ( $wp_filesystem->errors->get_error_code() ) - return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors); - - //Get the base plugin folder - $themes_dir = $wp_filesystem->wp_themes_dir(); - if ( empty($themes_dir) ) - return new WP_Error('fs_no_themes_dir', __('Unable to locate WordPress Theme directory.')); - - //And the same for the Content directory. - $content_dir = $wp_filesystem->wp_content_dir(); - if( empty($content_dir) ) - return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).')); - - $themes_dir = trailingslashit( $themes_dir ); - $content_dir = trailingslashit( $content_dir ); - - if ( empty($r->package) ) - return new WP_Error('no_package', __('Upgrade package not available.')); - - // Download the package - apply_filters('update_feedback', sprintf(__('Downloading update from %s'), $r['package'])); - $download_file = download_url($r['package']); - - if ( is_wp_error($download_file) ) - return new WP_Error('download_failed', __('Download failed.'), $download_file->get_error_message()); - - $working_dir = $content_dir . 'upgrade/' . basename($theme_directory); - - // Clean up working directory - if ( $wp_filesystem->is_dir($working_dir) ) - $wp_filesystem->delete($working_dir, true); - - apply_filters('update_feedback', __('Unpacking the update')); - // Unzip package to working directory - $result = unzip_file($download_file, $working_dir); - - // Once extracted, delete the package - unlink($download_file); - - if ( is_wp_error($result) ) { - $wp_filesystem->delete($working_dir, true); - return $result; - } - - //TODO: Is theme currently active? If so, set default theme - /* - if ( is_plugin_active($plugin) ) { - //Deactivate the plugin silently, Prevent deactivation hooks from running. - apply_filters('update_feedback', __('Deactivating the plugin')); - deactivate_plugins($plugin, true); - }*/ - - // Remove the existing plugin. - apply_filters('update_feedback', __('Removing the old version of the theme')); - $deleted = $wp_filesystem->delete($themes_dir . $theme_directory, true); - - if ( ! $deleted ) { - $wp_filesystem->delete($working_dir, true); - return new WP_Error('delete_failed', __('Could not remove the old plugin')); - } - - apply_filters('update_feedback', __('Installing the latest version')); - // Copy new version of plugin into place. - $result = copy_dir($working_dir, $themes_dir); - if ( is_wp_error($result) ) { - $wp_filesystem->delete($working_dir, true); - return $result; - } - - //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin - //$filelist = array_keys( $wp_filesystem->dirlist($working_dir) ); - - // Remove working directory - $wp_filesystem->delete($working_dir, true); - - // Force refresh of plugin update information - delete_option('update_themes'); - - /*if( empty($filelist) ) - return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup. - - $folder = $filelist[0]; - $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash - $pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list - - return $folder . '/' . $pluginfiles[0];*/ + include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; + $upgrader = new Theme_Upgrader(); + return $upgrader->upgrade($theme); } function wp_update_core($current, $feedback = '') { - global $wp_filesystem; - - @set_time_limit( 300 ); 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', __('WordPress is at the latest version.')); - - // Is a filesystem accessor setup? - if ( ! $wp_filesystem || ! is_object($wp_filesystem) ) - WP_Filesystem(); - - if ( ! is_object($wp_filesystem) ) - return new WP_Error('fs_unavailable', __('Could not access filesystem.')); - - if ( $wp_filesystem->errors->get_error_code() ) - return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors); - - // Get the base WP folder - $wp_dir = $wp_filesystem->abspath(); - if ( empty($wp_dir) ) - return new WP_Error('fs_no_wp_dir', __('Unable to locate WordPress directory.')); - - // And the same for the Content directory. - $content_dir = $wp_filesystem->wp_content_dir(); - if( empty($content_dir) ) - return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).')); - - $wp_dir = trailingslashit( $wp_dir ); - $content_dir = trailingslashit( $content_dir ); - - // Get the URL to the zip file - $package = $current->package; - - // Download the package - apply_filters('update_feedback', sprintf(__('Downloading update from %s'), $package)); - $download_file = download_url($package); - - if ( is_wp_error($download_file) ) - return new WP_Error('download_failed', __('Download failed.'), $download_file->get_error_message()); - - $working_dir = $content_dir . 'upgrade/core'; - // Clean up working directory - if ( $wp_filesystem->is_dir($working_dir) ) { - $wp_filesystem->delete($working_dir, true); - } - - apply_filters('update_feedback', __('Unpacking the core update')); - // Unzip package to working directory - $result = unzip_file($download_file, $working_dir); - // Once extracted, delete the package - unlink($download_file); - - if ( is_wp_error($result) ) { - $wp_filesystem->delete($working_dir, true); - return $result; - } - - // Copy update-core.php from the new version into place. - if ( !$wp_filesystem->copy($working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true) ) { - $wp_filesystem->delete($working_dir, true); - return new WP_Error('copy_failed', __('Could not copy files')); - } - $wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE); - - require(ABSPATH . 'wp-admin/includes/update-core.php'); + include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; + $upgrader = new Core_Upgrader(); + return $upgrader->upgrade($current); - return update_core($working_dir, $wp_dir); } function maintenance_nag() {