X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..7f1521bf193b382565eb753043c161f4cb3fcda7:/wp-admin/update.php?ds=sidebyside diff --git a/wp-admin/update.php b/wp-admin/update.php index 0664ac8f..4cfdeca6 100644 --- a/wp-admin/update.php +++ b/wp-admin/update.php @@ -6,10 +6,13 @@ * @subpackage Administration */ +if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) ) + define( 'IFRAME_REQUEST', true ); + /** WordPress Administration Bootstrap */ -require_once('./admin.php'); +require_once( dirname( __FILE__ ) . '/admin.php' ); -include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; +include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); if ( isset($_GET['action']) ) { $plugin = isset($_REQUEST['plugin']) ? trim($_REQUEST['plugin']) : ''; @@ -34,8 +37,7 @@ if ( isset($_GET['action']) ) { $url = 'update.php?action=update-selected&plugins=' . urlencode(implode(',', $plugins)); $nonce = 'bulk-update-plugins'; - require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); - wp_enqueue_script('jquery'); + wp_enqueue_script( 'updates' ); iframe_header(); $upgrader = new Plugin_Upgrader( new Bulk_Plugin_Upgrader_Skin( compact( 'nonce', 'url' ) ) ); @@ -49,18 +51,20 @@ if ( isset($_GET['action']) ) { check_admin_referer('upgrade-plugin_' . $plugin); - $title = __('Upgrade Plugin'); + $title = __('Update Plugin'); $parent_file = 'plugins.php'; $submenu_file = 'plugins.php'; - require_once('./admin-header.php'); + + wp_enqueue_script( 'updates' ); + require_once(ABSPATH . 'wp-admin/admin-header.php'); $nonce = 'upgrade-plugin_' . $plugin; - $url = 'update.php?action=upgrade-plugin&plugin=' . $plugin; + $url = 'update.php?action=upgrade-plugin&plugin=' . urlencode( $plugin ); $upgrader = new Plugin_Upgrader( new Plugin_Upgrader_Skin( compact('title', 'nonce', 'url', 'plugin') ) ); $upgrader->upgrade($plugin); - include('./admin-footer.php'); + include(ABSPATH . 'wp-admin/admin-footer.php'); } elseif ('activate-plugin' == $action ) { if ( ! current_user_can('update_plugins') ) @@ -68,9 +72,9 @@ if ( isset($_GET['action']) ) { check_admin_referer('activate-plugin_' . $plugin); if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) { - wp_redirect( 'update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] ); - activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ) ); - wp_redirect( 'update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] ); + wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) ); + activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ), true ); + wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) ); die(); } iframe_header( __('Plugin Reactivation'), true ); @@ -80,21 +84,18 @@ if ( isset($_GET['action']) ) { if ( isset($_GET['failure']) ){ echo '

' . __('Plugin failed to reactivate due to a fatal error.') . '

'; - if ( defined('E_RECOVERABLE_ERROR') ) - error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR); - else - error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING); - + error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR ); @ini_set('display_errors', true); //Ensure that Fatal errors are displayed. - include(WP_PLUGIN_DIR . '/' . $plugin); + wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin ); + include( WP_PLUGIN_DIR . '/' . $plugin ); } iframe_footer(); } elseif ( 'install-plugin' == $action ) { if ( ! current_user_can('install_plugins') ) - wp_die(__('You do not have sufficient permissions to install plugins for this site.')); + wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) ); - include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api.. + include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api.. check_admin_referer('install-plugin_' . $plugin); $api = plugins_api('plugin_information', array('slug' => $plugin, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth. @@ -105,11 +106,11 @@ if ( isset($_GET['action']) ) { $title = __('Plugin Install'); $parent_file = 'plugins.php'; $submenu_file = 'plugin-install.php'; - require_once('./admin-header.php'); + require_once(ABSPATH . 'wp-admin/admin-header.php'); $title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version ); $nonce = 'install-plugin_' . $plugin; - $url = 'update.php?action=install-plugin&plugin=' . $plugin; + $url = 'update.php?action=install-plugin&plugin=' . urlencode( $plugin ); if ( isset($_GET['from']) ) $url .= '&from=' . urlencode(stripslashes($_GET['from'])); @@ -118,12 +119,13 @@ if ( isset($_GET['action']) ) { $upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) ); $upgrader->install($api->download_link); - include('./admin-footer.php'); + include(ABSPATH . 'wp-admin/admin-footer.php'); } elseif ( 'upload-plugin' == $action ) { - if ( ! current_user_can('install_plugins') ) - wp_die(__('You do not have sufficient permissions to install plugins for this site.')); + if ( ! current_user_can( 'upload_plugins' ) ) { + wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) ); + } check_admin_referer('plugin-upload'); @@ -132,17 +134,20 @@ if ( isset($_GET['action']) ) { $title = __('Upload Plugin'); $parent_file = 'plugins.php'; $submenu_file = 'plugin-install.php'; - require_once('./admin-header.php'); + require_once(ABSPATH . 'wp-admin/admin-header.php'); - $title = sprintf( __('Installing Plugin from uploaded file: %s'), basename( $file_upload->filename ) ); + $title = sprintf( __('Installing Plugin from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) ); $nonce = 'plugin-upload'; - $url = add_query_arg(array('package' => $file_upload->filename ), 'update.php?action=upload-plugin'); + $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-plugin'); $type = 'upload'; //Install plugin type, From Web or an Upload. $upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) ); - $upgrader->install( $file_upload->package ); + $result = $upgrader->install( $file_upload->package ); + + if ( $result || is_wp_error($result) ) + $file_upload->cleanup(); - include('./admin-footer.php'); + include(ABSPATH . 'wp-admin/admin-footer.php'); } elseif ( 'upgrade-theme' == $action ) { @@ -151,20 +156,21 @@ if ( isset($_GET['action']) ) { check_admin_referer('upgrade-theme_' . $theme); - add_thickbox(); - wp_enqueue_script('theme-preview'); - $title = __('Upgrade Theme'); + wp_enqueue_script( 'customize-loader' ); + wp_enqueue_script( 'updates' ); + + $title = __('Update Theme'); $parent_file = 'themes.php'; $submenu_file = 'themes.php'; - require_once('./admin-header.php'); + require_once(ABSPATH . 'wp-admin/admin-header.php'); $nonce = 'upgrade-theme_' . $theme; - $url = 'update.php?action=upgrade-theme&theme=' . $theme; + $url = 'update.php?action=upgrade-theme&theme=' . urlencode( $theme ); $upgrader = new Theme_Upgrader( new Theme_Upgrader_Skin( compact('title', 'nonce', 'url', 'theme') ) ); $upgrader->upgrade($theme); - include('./admin-footer.php'); + include(ABSPATH . 'wp-admin/admin-footer.php'); } elseif ( 'update-selected-themes' == $action ) { if ( ! current_user_can( 'update_themes' ) ) wp_die( __( 'You do not have sufficient permissions to update themes for this site.' ) ); @@ -183,8 +189,7 @@ if ( isset($_GET['action']) ) { $url = 'update.php?action=update-selected-themes&themes=' . urlencode(implode(',', $themes)); $nonce = 'bulk-update-themes'; - require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); - wp_enqueue_script('jquery'); + wp_enqueue_script( 'updates' ); iframe_header(); $upgrader = new Theme_Upgrader( new Bulk_Theme_Upgrader_Skin( compact( 'nonce', 'url' ) ) ); @@ -194,60 +199,74 @@ if ( isset($_GET['action']) ) { } elseif ( 'install-theme' == $action ) { if ( ! current_user_can('install_themes') ) - wp_die(__('You do not have sufficient permissions to install themes for this site.')); + wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) ); - include_once ABSPATH . 'wp-admin/includes/theme-install.php'; //for themes_api.. + include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); //for themes_api.. - check_admin_referer('install-theme_' . $theme); - $api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth. + check_admin_referer( 'install-theme_' . $theme ); + $api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth. if ( is_wp_error($api) ) wp_die($api); - add_thickbox(); - wp_enqueue_script('theme-preview'); + wp_enqueue_script( 'customize-loader' ); + $title = __('Install Themes'); $parent_file = 'themes.php'; $submenu_file = 'themes.php'; - require_once('./admin-header.php'); + require_once(ABSPATH . 'wp-admin/admin-header.php'); $title = sprintf( __('Installing Theme: %s'), $api->name . ' ' . $api->version ); $nonce = 'install-theme_' . $theme; - $url = 'update.php?action=install-theme&theme=' . $theme; + $url = 'update.php?action=install-theme&theme=' . urlencode( $theme ); $type = 'web'; //Install theme type, From Web or an Upload. $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) ); $upgrader->install($api->download_link); - include('./admin-footer.php'); + include(ABSPATH . 'wp-admin/admin-footer.php'); } elseif ( 'upload-theme' == $action ) { - if ( ! current_user_can('install_themes') ) - wp_die(__('You do not have sufficient permissions to install themes for this site.')); + if ( ! current_user_can( 'upload_themes' ) ) { + wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) ); + } check_admin_referer('theme-upload'); $file_upload = new File_Upload_Upgrader('themezip', 'package'); + wp_enqueue_script( 'customize-loader' ); + $title = __('Upload Theme'); $parent_file = 'themes.php'; $submenu_file = 'theme-install.php'; - add_thickbox(); - wp_enqueue_script('theme-preview'); - require_once('./admin-header.php'); - $title = sprintf( __('Installing Theme from uploaded file: %s'), basename( $file_upload->filename ) ); + require_once(ABSPATH . 'wp-admin/admin-header.php'); + + $title = sprintf( __('Installing Theme from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) ); $nonce = 'theme-upload'; - $url = add_query_arg(array('package' => $file_upload->filename), 'update.php?action=upload-theme'); + $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-theme'); $type = 'upload'; //Install plugin type, From Web or an Upload. $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) ); - $upgrader->install( $file_upload->package ); + $result = $upgrader->install( $file_upload->package ); + + if ( $result || is_wp_error($result) ) + $file_upload->cleanup(); - include('./admin-footer.php'); + include(ABSPATH . 'wp-admin/admin-footer.php'); } else { - do_action('update-custom_' . $action); + /** + * Fires when a custom plugin or theme update request is received. + * + * The dynamic portion of the hook name, `$action`, refers to the action + * provided in the request for wp-admin/update.php. Can be used to + * provide custom update functionality for themes and plugins. + * + * @since 2.8.0 + */ + do_action( "update-custom_{$action}" ); } }