X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/41497a896330304904ef6d5783c724ea713739f6..a349837896628462bf8c9bdc27d1477a10fe03eb:/wp-includes/update.php?ds=sidebyside diff --git a/wp-includes/update.php b/wp-includes/update.php index 34573478..ead8e398 100644 --- a/wp-includes/update.php +++ b/wp-includes/update.php @@ -17,9 +17,11 @@ * @since 2.3.0 * @uses $wp_version Used to check against the newest WordPress version. * + * @param array $extra_stats Extra statistics to report to the WordPress.org API. + * @param bool $force_check Whether to bypass the transient cache and force a fresh update check. Defaults to false, true if $extra_stats is set. * @return mixed Returns null if update is unsupported. Returns false if check is too soon. */ -function wp_version_check() { +function wp_version_check( $extra_stats = array(), $force_check = false ) { if ( defined('WP_INSTALLING') ) return; @@ -28,19 +30,36 @@ function wp_version_check() { $php_version = phpversion(); $current = get_site_transient( 'update_core' ); + $translations = wp_get_installed_translations( 'core' ); + + // Invalidate the transient when $wp_version changes + if ( is_object( $current ) && $wp_version != $current->version_checked ) + $current = false; + if ( ! is_object($current) ) { $current = new stdClass; $current->updates = array(); $current->version_checked = $wp_version; } + if ( ! empty( $extra_stats ) ) + $force_check = true; + // Wait 60 seconds between multiple version check requests $timeout = 60; $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked ); - if ( $time_not_changed ) + if ( ! $force_check && $time_not_changed ) return false; - $locale = apply_filters( 'core_version_check_locale', get_locale() ); + $locale = get_locale(); + /** + * Filter the locale requested for WordPress core translations. + * + * @since 2.8.0 + * + * @param string $locale Current locale. + */ + $locale = apply_filters( 'core_version_check_locale', $locale ); // Update last_checked for current to prevent multiple blocking requests if request hangs $current->last_checked = time(); @@ -51,13 +70,13 @@ function wp_version_check() { else $mysql_version = 'N/A'; - if ( is_multisite( ) ) { - $user_count = get_user_count( ); - $num_blogs = get_blog_count( ); - $wp_install = network_site_url( ); + if ( is_multisite() ) { + $user_count = get_user_count(); + $num_blogs = get_blog_count(); + $wp_install = network_site_url(); $multisite_enabled = 1; } else { - $user_count = count_users( ); + $user_count = count_users(); $user_count = $user_count['total_users']; $multisite_enabled = 0; $num_blogs = 1; @@ -72,10 +91,19 @@ function wp_version_check() { 'local_package' => isset( $wp_local_package ) ? $wp_local_package : '', 'blogs' => $num_blogs, 'users' => $user_count, - 'multisite_enabled' => $multisite_enabled + 'multisite_enabled' => $multisite_enabled, ); - $url = 'http://api.wordpress.org/core/version-check/1.6/?' . http_build_query( $query, null, '&' ); + $post_body = array( + 'translations' => json_encode( $translations ), + ); + + if ( is_array( $extra_stats ) ) + $post_body = array_merge( $post_body, $extra_stats ); + + $url = $http_url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' ); + if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) + $url = set_url_scheme( $url, 'https' ); $options = array( 'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ), @@ -83,16 +111,21 @@ function wp_version_check() { 'headers' => array( 'wp_install' => $wp_install, 'wp_blog' => home_url( '/' ) - ) + ), + 'body' => $post_body, ); - $response = wp_remote_get($url, $options); + $response = wp_remote_post( $url, $options ); + if ( $ssl && is_wp_error( $response ) ) { + trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE ); + $response = wp_remote_post( $http_url, $options ); + } if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) return false; $body = trim( wp_remote_retrieve_body( $response ) ); - $body = maybe_unserialize( $body ); + $body = json_decode( $body, true ); if ( ! is_array( $body ) || ! isset( $body['offers'] ) ) return false; @@ -103,20 +136,24 @@ function wp_version_check() { foreach ( $offer as $offer_key => $value ) { if ( 'packages' == $offer_key ) $offer['packages'] = (object) array_intersect_key( array_map( 'esc_url', $offer['packages'] ), - array_fill_keys( array( 'full', 'no_content', 'new_bundled', 'partial' ), '' ) ); + array_fill_keys( array( 'full', 'no_content', 'new_bundled', 'partial', 'rollback' ), '' ) ); elseif ( 'download' == $offer_key ) $offer['download'] = esc_url( $value ); else $offer[ $offer_key ] = esc_html( $value ); } $offer = (object) array_intersect_key( $offer, array_fill_keys( array( 'response', 'download', 'locale', - 'packages', 'current', 'php_version', 'mysql_version', 'new_bundled', 'partial_version' ), '' ) ); + 'packages', 'current', 'version', 'php_version', 'mysql_version', 'new_bundled', 'partial_version', 'notify_email' ), '' ) ); } $updates = new stdClass(); $updates->updates = $offers; $updates->last_checked = time(); $updates->version_checked = $wp_version; + + if ( isset( $body['translations'] ) ) + $updates->translations = $body['translations']; + set_site_transient( 'update_core', $updates); } @@ -131,9 +168,10 @@ function wp_version_check() { * @since 2.3.0 * @uses $wp_version Used to notify the WordPress version. * + * @param array $extra_stats Extra statistics to report to the WordPress.org API. * @return mixed Returns null if update is unsupported. Returns false if check is too soon. */ -function wp_update_plugins() { +function wp_update_plugins( $extra_stats = array() ) { include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version if ( defined('WP_INSTALLING') ) @@ -144,6 +182,8 @@ function wp_update_plugins() { require_once( ABSPATH . 'wp-admin/includes/plugin.php' ); $plugins = get_plugins(); + $translations = wp_get_installed_translations( 'plugins' ); + $active = get_option( 'active_plugins', array() ); $current = get_site_transient( 'update_plugins' ); if ( ! is_object($current) ) @@ -154,20 +194,23 @@ function wp_update_plugins() { // Check for update on a different schedule, depending on the page. switch ( current_filter() ) { + case 'upgrader_process_complete' : + $timeout = 0; + break; case 'load-update-core.php' : - $timeout = 60; // 1 min + $timeout = MINUTE_IN_SECONDS; break; case 'load-plugins.php' : case 'load-update.php' : - $timeout = 3600; // 1 hour + $timeout = HOUR_IN_SECONDS; break; default : - $timeout = 43200; // 12 hours + $timeout = 12 * HOUR_IN_SECONDS; } $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked ); - if ( $time_not_changed ) { + if ( $time_not_changed && ! $extra_stats ) { $plugin_changed = false; foreach ( $plugins as $file => $p ) { $new_option->checked[ $file ] = $p['Version']; @@ -194,25 +237,58 @@ function wp_update_plugins() { $current->last_checked = time(); set_site_transient( 'update_plugins', $current ); - $to_send = (object) compact('plugins', 'active'); + $to_send = compact( 'plugins', 'active' ); + + $locales = array( get_locale() ); + /** + * Filter the locales requested for plugin translations. + * + * @since 3.7.0 + * + * @param array $locales Plugin locale. Default is current locale of the site. + */ + $locales = apply_filters( 'plugins_update_check_locales', $locales ); $options = array( 'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3), - 'body' => array( 'plugins' => serialize( $to_send ) ), + 'body' => array( + 'plugins' => json_encode( $to_send ), + 'translations' => json_encode( $translations ), + 'locale' => json_encode( $locales ), + ), 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ) ); - $raw_response = wp_remote_post('http://api.wordpress.org/plugins/update-check/1.0/', $options); + if ( $extra_stats ) { + $options['body']['update_stats'] = json_encode( $extra_stats ); + } + + $url = $http_url = 'http://api.wordpress.org/plugins/update-check/1.1/'; + if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) + $url = set_url_scheme( $url, 'https' ); + + $raw_response = wp_remote_post( $url, $options ); + if ( $ssl && is_wp_error( $raw_response ) ) { + trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE ); + $raw_response = wp_remote_post( $http_url, $options ); + } if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) return false; - $response = maybe_unserialize( wp_remote_retrieve_body( $raw_response ) ); + $response = json_decode( wp_remote_retrieve_body( $raw_response ), true ); + foreach ( $response['plugins'] as &$plugin ) { + $plugin = (object) $plugin; + } + unset( $plugin ); - if ( is_array( $response ) ) - $new_option->response = $response; - else + if ( is_array( $response ) ) { + $new_option->response = $response['plugins']; + $new_option->translations = $response['translations']; + } else { $new_option->response = array(); + $new_option->translations = array(); + } set_site_transient( 'update_plugins', $new_option ); } @@ -228,24 +304,26 @@ function wp_update_plugins() { * @since 2.7.0 * @uses $wp_version Used to notify the WordPress version. * + * @param array $extra_stats Extra statistics to report to the WordPress.org API. * @return mixed Returns null if update is unsupported. Returns false if check is too soon. */ -function wp_update_themes() { +function wp_update_themes( $extra_stats = array() ) { include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version if ( defined( 'WP_INSTALLING' ) ) return false; $installed_themes = wp_get_themes(); + $translations = wp_get_installed_translations( 'themes' ); + $last_update = get_site_transient( 'update_themes' ); if ( ! is_object($last_update) ) $last_update = new stdClass; - $themes = array(); - $checked = array(); + $themes = $checked = $request = array(); // Put slug of current theme into request. - $themes['current_theme'] = get_option( 'stylesheet' ); + $request['active'] = get_option( 'stylesheet' ); foreach ( $installed_themes as $theme ) { $checked[ $theme->get_stylesheet() ] = $theme->get('Version'); @@ -263,24 +341,25 @@ function wp_update_themes() { // Check for update on a different schedule, depending on the page. switch ( current_filter() ) { + case 'upgrader_process_complete' : + $timeout = 0; + break; case 'load-update-core.php' : - $timeout = 60; // 1 min + $timeout = MINUTE_IN_SECONDS; break; case 'load-themes.php' : case 'load-update.php' : - $timeout = 3600; // 1 hour + $timeout = HOUR_IN_SECONDS; break; default : - $timeout = 43200; // 12 hours + $timeout = 12 * HOUR_IN_SECONDS; } - $time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time( ) - $last_update->last_checked ); + $time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time() - $last_update->last_checked ); - if ( $time_not_changed ) { + if ( $time_not_changed && ! $extra_stats ) { $theme_changed = false; foreach ( $checked as $slug => $v ) { - $update_request->checked[ $slug ] = $v; - if ( !isset( $last_update->checked[ $slug ] ) || strval($last_update->checked[ $slug ]) !== strval($v) ) $theme_changed = true; } @@ -303,29 +382,95 @@ function wp_update_themes() { $last_update->last_checked = time(); set_site_transient( 'update_themes', $last_update ); + $request['themes'] = $themes; + + $locales = array( get_locale() ); + /** + * Filter the locales requested for theme translations. + * + * @since 3.7.0 + * + * @param array $locales Theme locale. Default is current locale of the site. + */ + $locales = apply_filters( 'themes_update_check_locales', $locales ); + $options = array( 'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3), - 'body' => array( 'themes' => serialize( $themes ) ), + 'body' => array( + 'themes' => json_encode( $request ), + 'translations' => json_encode( $translations ), + 'locale' => json_encode( $locales ), + ), 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ) ); - $raw_response = wp_remote_post( 'http://api.wordpress.org/themes/update-check/1.0/', $options ); + if ( $extra_stats ) { + $options['body']['update_stats'] = json_encode( $extra_stats ); + } + + $url = $http_url = 'http://api.wordpress.org/themes/update-check/1.1/'; + if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) + $url = set_url_scheme( $url, 'https' ); + + $raw_response = wp_remote_post( $url, $options ); + if ( $ssl && is_wp_error( $raw_response ) ) { + trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE ); + $raw_response = wp_remote_post( $http_url, $options ); + } if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) return false; $new_update = new stdClass; - $new_update->last_checked = time( ); + $new_update->last_checked = time(); $new_update->checked = $checked; - $response = maybe_unserialize( wp_remote_retrieve_body( $raw_response ) ); - if ( is_array( $response ) ) - $new_update->response = $response; + $response = json_decode( wp_remote_retrieve_body( $raw_response ), true ); + + if ( is_array( $response ) ) { + $new_update->response = $response['themes']; + $new_update->translations = $response['translations']; + } set_site_transient( 'update_themes', $new_update ); } -/* +/** + * Performs WordPress automatic background updates. + * + * @since 3.7.0 + */ +function wp_maybe_auto_update() { + include_once ABSPATH . '/wp-admin/includes/admin.php'; + include_once ABSPATH . '/wp-admin/includes/class-wp-upgrader.php'; + + $upgrader = new WP_Automatic_Updater; + $upgrader->run(); +} + +/** + * Retrieves a list of all language updates available. + * + * @since 3.7.0 + */ +function wp_get_translation_updates() { + $updates = array(); + $transients = array( 'update_core' => 'core', 'update_plugins' => 'plugin', 'update_themes' => 'theme' ); + foreach ( $transients as $transient => $type ) { + + $transient = get_site_transient( $transient ); + if ( empty( $transient->translations ) ) + continue; + + foreach ( $transient->translations as $translation ) { + $updates[] = (object) $translation; + } + } + + return $updates; +} + +/** * Collect counts and UI strings for available updates * * @since 3.3.0 @@ -333,38 +478,57 @@ function wp_update_themes() { * @return array */ function wp_get_update_data() { - $counts = array( 'plugins' => 0, 'themes' => 0, 'wordpress' => 0 ); + $counts = array( 'plugins' => 0, 'themes' => 0, 'wordpress' => 0, 'translations' => 0 ); - if ( current_user_can( 'update_plugins' ) ) { + if ( $plugins = current_user_can( 'update_plugins' ) ) { $update_plugins = get_site_transient( 'update_plugins' ); if ( ! empty( $update_plugins->response ) ) $counts['plugins'] = count( $update_plugins->response ); } - if ( current_user_can( 'update_themes' ) ) { + if ( $themes = current_user_can( 'update_themes' ) ) { $update_themes = get_site_transient( 'update_themes' ); if ( ! empty( $update_themes->response ) ) $counts['themes'] = count( $update_themes->response ); } - if ( function_exists( 'get_core_updates' ) && current_user_can( 'update_core' ) ) { + if ( ( $core = current_user_can( 'update_core' ) ) && function_exists( 'get_core_updates' ) ) { $update_wordpress = get_core_updates( array('dismissed' => false) ); if ( ! empty( $update_wordpress ) && ! in_array( $update_wordpress[0]->response, array('development', 'latest') ) && current_user_can('update_core') ) $counts['wordpress'] = 1; } - $counts['total'] = $counts['plugins'] + $counts['themes'] + $counts['wordpress']; - $update_title = array(); + if ( ( $core || $plugins || $themes ) && wp_get_translation_updates() ) + $counts['translations'] = 1; + + $counts['total'] = $counts['plugins'] + $counts['themes'] + $counts['wordpress'] + $counts['translations']; + $titles = array(); if ( $counts['wordpress'] ) - $update_title[] = sprintf(__('%d WordPress Update'), $counts['wordpress']); + $titles['wordpress'] = sprintf( __( '%d WordPress Update'), $counts['wordpress'] ); if ( $counts['plugins'] ) - $update_title[] = sprintf(_n('%d Plugin Update', '%d Plugin Updates', $counts['plugins']), $counts['plugins']); + $titles['plugins'] = sprintf( _n( '%d Plugin Update', '%d Plugin Updates', $counts['plugins'] ), $counts['plugins'] ); if ( $counts['themes'] ) - $update_title[] = sprintf(_n('%d Theme Update', '%d Theme Updates', $counts['themes']), $counts['themes']); - - $update_title = ! empty( $update_title ) ? esc_attr( implode( ', ', $update_title ) ) : ''; - - return array( 'counts' => $counts, 'title' => $update_title ); + $titles['themes'] = sprintf( _n( '%d Theme Update', '%d Theme Updates', $counts['themes'] ), $counts['themes'] ); + if ( $counts['translations'] ) + $titles['translations'] = __( 'Translation Updates' ); + + $update_title = $titles ? esc_attr( implode( ', ', $titles ) ) : ''; + + $update_data = array( 'counts' => $counts, 'title' => $update_title ); + /** + * Filter the returned array of update data for plugins, themes, and WordPress core. + * + * @since 3.5.0 + * + * @param array $update_data { + * Fetched update data. + * + * @type array $counts An array of counts for available plugin, theme, and WordPress updates. + * @type string $update_title Titles of available updates. + * } + * @param array $titles An array of update counts and UI strings for available updates. + */ + return apply_filters( 'wp_get_update_data', $update_data, $titles ); } function _maybe_update_core() { @@ -373,7 +537,7 @@ function _maybe_update_core() { $current = get_site_transient( 'update_core' ); if ( isset( $current->last_checked ) && - 43200 > ( time() - $current->last_checked ) && + 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) && isset( $current->version_checked ) && $current->version_checked == $wp_version ) return; @@ -392,7 +556,7 @@ function _maybe_update_core() { */ function _maybe_update_plugins() { $current = get_site_transient( 'update_plugins' ); - if ( isset( $current->last_checked ) && 43200 > ( time() - $current->last_checked ) ) + if ( isset( $current->last_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) ) return; wp_update_plugins(); } @@ -406,9 +570,9 @@ function _maybe_update_plugins() { * @since 2.7.0 * @access private */ -function _maybe_update_themes( ) { +function _maybe_update_themes() { $current = get_site_transient( 'update_themes' ); - if ( isset( $current->last_checked ) && 43200 > ( time( ) - $current->last_checked ) ) + if ( isset( $current->last_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) ) return; wp_update_themes(); @@ -428,6 +592,20 @@ function wp_schedule_update_checks() { if ( !wp_next_scheduled('wp_update_themes') && !defined('WP_INSTALLING') ) wp_schedule_event(time(), 'twicedaily', 'wp_update_themes'); + + if ( ! wp_next_scheduled( 'wp_maybe_auto_update' ) && ! defined( 'WP_INSTALLING' ) ) { + // Schedule auto updates for 7 a.m. and 7 p.m. in the timezone of the site. + $next = strtotime( 'today 7am' ); + $now = time(); + // Find the next instance of 7 a.m. or 7 p.m., but skip it if it is within 3 hours from now. + while ( ( $now + 3 * HOUR_IN_SECONDS ) > $next ) { + $next += 12 * HOUR_IN_SECONDS; + } + $next = $next - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS; + // Add a random number of minutes, so we don't have all sites trying to update exactly on the hour + $next = $next + rand( 0, 59 ) * MINUTE_IN_SECONDS; + wp_schedule_event( $next, 'twicedaily', 'wp_maybe_auto_update' ); + } } if ( ( ! is_main_site() && ! is_network_admin() ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) @@ -435,17 +613,22 @@ if ( ( ! is_main_site() && ! is_network_admin() ) || ( defined( 'DOING_AJAX' ) & add_action( 'admin_init', '_maybe_update_core' ); add_action( 'wp_version_check', 'wp_version_check' ); +add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 ); add_action( 'load-plugins.php', 'wp_update_plugins' ); add_action( 'load-update.php', 'wp_update_plugins' ); add_action( 'load-update-core.php', 'wp_update_plugins' ); add_action( 'admin_init', '_maybe_update_plugins' ); add_action( 'wp_update_plugins', 'wp_update_plugins' ); +add_action( 'upgrader_process_complete', 'wp_update_plugins', 10, 0 ); add_action( 'load-themes.php', 'wp_update_themes' ); add_action( 'load-update.php', 'wp_update_themes' ); add_action( 'load-update-core.php', 'wp_update_themes' ); add_action( 'admin_init', '_maybe_update_themes' ); add_action( 'wp_update_themes', 'wp_update_themes' ); +add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 ); + +add_action( 'wp_maybe_auto_update', 'wp_maybe_auto_update' ); add_action('init', 'wp_schedule_update_checks');