X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/ceb5a929e00123b4e224977c6b5a149f6431b250..refs/tags/wordpress-3.9:/wp-admin/includes/plugin-install.php diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php index 37d862e0..44a6a1b4 100644 --- a/wp-admin/includes/plugin-install.php +++ b/wp-admin/includes/plugin-install.php @@ -53,7 +53,7 @@ function plugins_api($action, $args = null) { * * @since 2.7.0 * - * @param bool|object The result object. Default is false. + * @param bool|object $result The result object. Default false. * @param string $action The type of information being requested from the Plugin Install API. * @param object $args Plugin API arguments. */ @@ -74,16 +74,16 @@ function plugins_api($action, $args = null) { $request = wp_remote_post( $url, $args ); if ( $ssl && is_wp_error( $request ) ) { - 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 ); + 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 ); $request = wp_remote_post( $http_url, $args ); } if ( is_wp_error($request) ) { - $res = new WP_Error('plugins_api_failed', __( '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.' ), $request->get_error_message() ); + $res = new WP_Error('plugins_api_failed', __( '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.' ), $request->get_error_message() ); } else { $res = maybe_unserialize( wp_remote_retrieve_body( $request ) ); if ( ! is_object( $res ) && ! is_array( $res ) ) - $res = new WP_Error('plugins_api_failed', __( '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.' ), wp_remote_retrieve_body( $request ) ); + $res = new WP_Error('plugins_api_failed', __( '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.' ), wp_remote_retrieve_body( $request ) ); } } elseif ( !is_wp_error($res) ) { $res->external = true; @@ -126,7 +126,7 @@ function install_popular_tags( $args = array() ) { function install_dashboard() { ?> -

WordPress Plugin Directory or upload a plugin in .zip format via this page.' ), 'http://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?>

+

WordPress Plugin Directory or upload a plugin in .zip format via this page.' ), 'https://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?>

@@ -312,8 +312,8 @@ function install_plugin_information() { $api = plugins_api( 'plugin_information', array( 'slug' => wp_unslash( $_REQUEST['plugin'] ), 'is_ssl' => is_ssl() ) ); - if ( is_wp_error($api) ) - wp_die($api); + if ( is_wp_error( $api ) ) + wp_die( $api ); $plugins_allowedtags = array( 'a' => array( 'href' => array(), 'title' => array(), 'target' => array() ), @@ -334,13 +334,17 @@ function install_plugin_information() { ); //Sanitize HTML - foreach ( (array)$api->sections as $section_name => $content ) + foreach ( (array)$api->sections as $section_name => $content ) { $api->sections[$section_name] = wp_kses($content, $plugins_allowedtags); + } + foreach ( array( 'version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug' ) as $key ) { if ( isset( $api->$key ) ) $api->$key = wp_kses( $api->$key, $plugins_allowedtags ); } + $_tab = esc_attr( $tab ); + $section = isset( $_REQUEST['section'] ) ? wp_unslash( $_REQUEST['section'] ) : 'description'; //Default to the Description tab, Do not translate, API returns English. if ( empty( $section ) || ! isset( $api->sections[ $section ] ) ) { $section_titles = array_keys( (array) $api->sections ); @@ -348,8 +352,10 @@ function install_plugin_information() { } iframe_header( __('Plugin Install') ); - echo "
\n"; - echo "\n"; + echo "
\n"; + ?> -
- download_link) && ( current_user_can('install_plugins') || current_user_can('update_plugins') ) ) : ?> -

- ' . __('Install Now') . ''; - break; - case 'update_available': - if ( $status['url'] ) - echo '' . __('Install Update Now') .''; - break; - case 'newer_installed': - echo '' . sprintf(__('Newer Version (%s) Installed'), $status['version']) . ''; - break; - case 'latest_installed': - echo '' . __('Latest Version Installed') . ''; - break; - } - ?> -

- -

+
+
    -version) ) : ?> +version ) ) : ?>
  • version ?>
    • -author) ) : ?> +author ) ) : ?>
  • author, '_blank') ?>
    • -last_updated) ) : ?> +last_updated ) ) : ?>
  • last_updated)) ) ?>
    • -requires) ) : ?> +requires ) ) : ?>
  • requires) ?>
    • -tested) ) : ?> +tested ) ) : ?>
  • tested ?>
    • -downloaded) ) : ?> +downloaded ) ) : ?>
  • downloaded), number_format_i18n($api->downloaded)) ?>
    • -slug) && empty($api->external) ) : ?> -
    • -homepage) ) : ?> +slug ) && empty( $api->external ) ) : ?> +
    • +homepage ) ) : ?>
- rating) ) : ?> -

+ rating ) ) : ?> +

$api->rating, 'type' => 'percent', 'number' => $api->num_ratings ) ); ?> - num_ratings), number_format_i18n($api->num_ratings)); ?> + num_ratings), number_format_i18n($api->num_ratings) ); ?>
tested) && version_compare( substr($GLOBALS['wp_version'], 0, strlen($api->tested)), $api->tested, '>') ) + if ( ! empty( $api->tested ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->tested ) ), $api->tested, '>' ) ) echo '

' . __('Warning: This plugin has not been tested with your current version of WordPress.') . '

'; - else if ( !empty($api->requires) && version_compare( substr($GLOBALS['wp_version'], 0, strlen($api->requires)), $api->requires, '<') ) + else if ( ! empty( $api->requires ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->requires ) ), $api->requires, '<' ) ) echo '

' . __('Warning: This plugin has not been marked as compatible with your version of WordPress.') . '

'; foreach ( (array)$api->sections as $section_name => $content ) { @@ -432,19 +416,40 @@ function install_plugin_information() { else $title = ucwords( str_replace( '_', ' ', $section_name ) ); - $content = links_add_base_url($content, 'http://wordpress.org/plugins/' . $api->slug . '/'); - $content = links_add_target($content, '_blank'); + $content = links_add_base_url( $content, 'https://wordpress.org/plugins/' . $api->slug . '/' ); + $content = links_add_target( $content, '_blank' ); $san_section = esc_attr( $section_name ); $display = ( $section_name == $section ) ? 'block' : 'none'; echo "\t
\n"; - echo "\t\t

$title

"; echo $content; echo "\t
\n"; } echo "
\n"; + echo "
\n"; + echo "\n"; iframe_footer(); exit;