X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..8f374b7233bc2815ccc387e448d208c5434eb961:/wp-admin/includes/update.php diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php index c90bd7aa..ff787167 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 @@ -26,17 +26,17 @@ function get_preferred_from_update_core() { * Get available core updates * * @param array $options Set $options['dismissed'] to true to show dismissed upgrades too, - * set $options['available'] to false to skip not-dimissed updates. + * set $options['available'] to false to skip not-dismissed updates. * @return array Array of the update objects */ function get_core_updates( $options = array() ) { $options = array_merge( array('available' => true, 'dismissed' => false ), $options ); - $dismissed = get_option( 'dismissed_update_core' ); + $dismissed = get_site_option( 'dismissed_update_core' ); if ( !is_array( $dismissed ) ) $dismissed = array(); - $from_api = get_option( 'update_core' ); + $from_api = get_site_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(); @@ -57,21 +57,21 @@ function get_core_updates( $options = array() ) { } function dismiss_core_update( $update ) { - $dismissed = get_option( 'dismissed_update_core' ); + $dismissed = get_site_option( 'dismissed_update_core' ); $dismissed[ $update->current.'|'.$update->locale ] = true; - return update_option( 'dismissed_update_core', $dismissed ); + return update_site_option( 'dismissed_update_core', $dismissed ); } function undismiss_core_update( $version, $locale ) { - $dismissed = get_option( 'dismissed_update_core' ); + $dismissed = get_site_option( 'dismissed_update_core' ); $key = $version.'|'.$locale; if ( !isset( $dismissed[$key] ) ) return false; unset( $dismissed[$key] ); - return update_option( 'dismissed_update_core', $dismissed ); + return update_site_option( 'dismissed_update_core', $dismissed ); } function find_core_update( $version, $locale ) { - $from_api = get_option( 'update_core' ); + $from_api = get_site_transient( 'update_core' ); if ( !is_array( $from_api->updates ) ) return false; $updates = $from_api->updates; foreach($updates as $update) { @@ -82,8 +82,8 @@ function find_core_update( $version, $locale ) { } function core_update_footer( $msg = '' ) { - if ( !current_user_can('manage_options') ) - return sprintf( '| '.__( 'Version %s' ), $GLOBALS['wp_version'] ); + if ( !current_user_can('update_core') ) + return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] ); $cur = get_preferred_from_update_core(); if ( ! isset( $cur->current ) ) @@ -97,14 +97,12 @@ function core_update_footer( $msg = '' ) { switch ( $cur->response ) { case 'development' : - return sprintf( __( 'You are using a development version (%1$s). Cool! Please stay updated.' ), $GLOBALS['wp_version'], 'update-core.php'); + return sprintf( __( 'You are using a development version (%1$s). Cool! Please stay updated.' ), $GLOBALS['wp_version'], network_admin_url( 'update-core.php' ) ); break; case 'upgrade' : - if ( current_user_can('manage_options') ) { - return sprintf( ''.__( 'Get Version %2$s' ).'', 'update-core.php', $cur->current); - break; - } + return sprintf( ''.__( 'Get Version %2$s' ).'', network_admin_url( 'update-core.php' ), $cur->current); + break; case 'latest' : default : @@ -115,6 +113,9 @@ function core_update_footer( $msg = '' ) { add_filter( 'update_footer', 'core_update_footer' ); function update_nag() { + if ( is_multisite() && !current_user_can('update_core') ) + return false; + global $pagenow; if ( 'update-core.php' == $pagenow ) @@ -125,354 +126,169 @@ function update_nag() { if ( ! isset( $cur->response ) || $cur->response != 'upgrade' ) return false; - if ( current_user_can('manage_options') ) - $msg = sprintf( __('WordPress %1$s is available! Please update now.'), $cur->current, 'update-core.php' ); - else - $msg = sprintf( __('WordPress %1$s is available! Please notify the site administrator.'), $cur->current ); - - echo "
$msg
"; + if ( current_user_can('update_core') ) { + $msg = sprintf( __('WordPress %1$s is available! Please update now.'), $cur->current, network_admin_url( 'update-core.php' ) ); + } else { + $msg = sprintf( __('WordPress %1$s is available! Please notify the site administrator.'), $cur->current ); + } + echo "
$msg
"; } add_action( 'admin_notices', 'update_nag', 3 ); // Called directly from dashboard function update_right_now_message() { - $cur = get_preferred_from_update_core(); - $msg = sprintf( __('You are using WordPress %s.'), $GLOBALS['wp_version'] ); - if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('manage_options') ) - $msg .= " " . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . ''; - - echo "$msg"; -} - -function wp_plugin_update_row( $file, $plugin_data ) { - $current = get_option( 'update_plugins' ); - if ( !isset( $current->response[ $file ] ) ) - return false; - - $r = $current->response[ $file ]; - $details_url = admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '&TB_iframe=true&width=600&height=800'); + if ( current_user_can('update_core') ) { + $cur = get_preferred_from_update_core(); - 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); - 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); - 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) ); + if ( isset( $cur->response ) && $cur->response == 'upgrade' ) + $msg .= " " . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . ''; + } - echo ''; + echo "$msg"; } -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); +function get_plugin_updates() { + $all_plugins = get_plugins(); + $upgrade_plugins = array(); + $current = get_site_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 ]; + } + } - //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.')); + return $upgrade_plugins; +} - //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).')); +function wp_plugin_update_rows() { + if ( !current_user_can('update_plugins' ) ) + return; - $plugins_dir = trailingslashit( $plugins_dir ); - $content_dir = trailingslashit( $content_dir ); + $plugins = get_site_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' ); - // Get the URL to the zip file - $r = $current->response[ $plugin ]; +function wp_plugin_update_row( $file, $plugin_data ) { + $current = get_site_transient( 'update_plugins' ); + if ( !isset( $current->response[ $file ] ) ) + return false; - if ( empty($r->package) ) - return new WP_Error('no_package', __('Upgrade package not available.')); + $r = $current->response[ $file ]; - // Download the package - $package = $r->package; - apply_filters('update_feedback', sprintf(__('Downloading update from %s'), $package)); - $download_file = download_url($package); + $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 ); - if ( is_wp_error($download_file) ) - return new WP_Error('download_failed', __('Download failed.'), $download_file->get_error_message()); + $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '§ion=changelog&TB_iframe=true&width=600&height=800'); - $working_dir = $content_dir . 'upgrade/' . basename($plugin, '.php'); + $wp_list_table = _get_list_table('WP_Plugins_List_Table'); - // Clean up working directory - if ( $wp_filesystem->is_dir($working_dir) ) - $wp_filesystem->delete($working_dir, true); + if ( is_network_admin() || !is_multisite() ) { + echo '
'; - apply_filters('update_feedback', __('Unpacking the update')); - // Unzip package to working directory - $result = unzip_file($download_file, $working_dir); + if ( ! current_user_can('update_plugins') ) + 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 %4$s details. Automatic update is 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 %4$s details or update now.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url( self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file) ); - // Once extracted, delete the package - unlink($download_file); + do_action( "in_plugin_update_message-$file", $plugin_data, $r ); - if ( is_wp_error($result) ) { - $wp_filesystem->delete($working_dir, true); - return $result; + echo '
'; } +} - 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); - } +function wp_update_plugin($plugin, $feedback = '') { + if ( !empty($feedback) ) + add_filter('update_feedback', $feedback); - // Remove the existing plugin. - apply_filters('update_feedback', __('Removing the old version of the plugin')); - $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) ); + include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; + $upgrader = new Plugin_Upgrader(); + return $upgrader->upgrade($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); +function get_theme_updates() { + $themes = wp_get_themes(); + $current = get_site_transient('update_themes'); - if ( ! $deleted ) { - $wp_filesystem->delete($working_dir, true); - return new WP_Error('delete_failed', __('Could not remove the old plugin')); - } + if ( ! isset( $current->response ) ) + return array(); - 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; + $update_themes = array(); + foreach ( $current->response as $stylesheet => $data ) { + $update_themes[ $stylesheet ] = wp_get_theme( $stylesheet ); + $update_themes[ $stylesheet ]->update = $data; } - //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); + include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; + $upgrader = new Theme_Upgrader(); + return $upgrader->upgrade($theme); +} - if ( is_wp_error($result) ) { - $wp_filesystem->delete($working_dir, true); - return $result; - } +function wp_theme_update_rows() { + if ( !current_user_can('update_themes' ) ) + return; - //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')); - } + $themes = get_site_transient( 'update_themes' ); + if ( isset($themes->response) && is_array($themes->response) ) { + $themes = array_keys( $themes->response ); - 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; + foreach( $themes as $theme ) { + add_action( "after_theme_row_$theme", 'wp_theme_update_row', 10, 2 ); + } } +} +add_action( 'admin_init', 'wp_theme_update_rows' ); - //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) ); +function wp_theme_update_row( $theme_key, $theme ) { + $current = get_site_transient( 'update_themes' ); + if ( !isset( $current->response[ $theme_key ] ) ) + return false; + $r = $current->response[ $theme_key ]; + $themes_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array()); + $theme_name = wp_kses( $theme['Name'], $themes_allowedtags ); - // Remove working directory - $wp_filesystem->delete($working_dir, true); + $details_url = self_admin_url("theme-install.php?tab=theme-information&theme=$theme_key&TB_iframe=true&width=600&height=400"); - // Force refresh of plugin update information - delete_option('update_themes'); + $wp_list_table = _get_list_table('WP_MS_Themes_List_Table'); - /*if( empty($filelist) ) - return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup. + echo '
'; + if ( ! current_user_can('update_themes') ) + printf( __('There is a new version of %1$s available. View version %4$s details.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r->new_version ); + else if ( empty( $r['package'] ) ) + printf( __('There is a new version of %1$s available. View version %4$s details. Automatic update is unavailable for this theme.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'] ); + else + printf( __('There is a new version of %1$s available. View version %4$s details or update now.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'], wp_nonce_url( self_admin_url('update.php?action=upgrade-theme&theme=') . $theme_key, 'upgrade-theme_' . $theme_key) ); - $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 + do_action( "in_theme_update_message-$theme_key", $theme, $r ); - return $folder . '/' . $pluginfiles[0];*/ + echo '
'; } - 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 ); + include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; + $upgrader = new Core_Upgrader(); + return $upgrader->upgrade($current); - // 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'); - - return update_core($working_dir, $wp_dir); } function maintenance_nag() { @@ -480,13 +296,11 @@ function maintenance_nag() { if ( ! isset( $upgrading ) ) return false; - if ( current_user_can('manage_options') ) + if ( current_user_can('update_core') ) $msg = sprintf( __('An automated WordPress update has failed to complete - please attempt the update again now.'), 'update-core.php' ); else $msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.'); - echo "
$msg
"; + echo "
$msg
"; } add_action( 'admin_notices', 'maintenance_nag' ); - -?>