X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/cc5aa27dd564435b195ea084fa46b3069e78bbff..88550bc3400cc7c035ff590ecb007c7938041ded:/wp-admin/includes/plugin-install.php diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php index 58a9e9ba..30313419 100644 --- a/wp-admin/includes/plugin-install.php +++ b/wp-admin/includes/plugin-install.php @@ -28,11 +28,17 @@ */ function plugins_api($action, $args = null) { - if ( is_array($args) ) - $args = (object)$args; + if ( is_array( $args ) ) { + $args = (object) $args; + } - if ( !isset($args->per_page) ) + if ( ! isset( $args->per_page ) ) { $args->per_page = 24; + } + + if ( ! isset( $args->locale ) ) { + $args->locale = get_locale(); + } /** * Override the Plugin Install API arguments. @@ -53,7 +59,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 +80,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,13 +132,12 @@ 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' ) ); ?>

-

- + -

-

+

+


'; } -add_action('install_plugins_dashboard', 'install_dashboard'); +add_action( 'install_plugins_featured', 'install_dashboard' ); /** * Display search form for searching plugins. @@ -163,8 +168,15 @@ add_action('install_plugins_dashboard', 'install_dashboard'); function install_search_form( $type_selector = true ) { $type = isset($_REQUEST['type']) ? wp_unslash( $_REQUEST['type'] ) : 'term'; $term = isset($_REQUEST['s']) ? wp_unslash( $_REQUEST['s'] ) : ''; + $input_attrs = ''; + $button_type = 'button screen-reader-text'; + + // assume no $type_selector means it's a simplified search form + if ( ! $type_selector ) { + $input_attrs = 'class="wp-filter-search" placeholder="' . esc_attr__( 'Search Plugins' ) . '" '; + } - ?>
+ ?> - - - + + 'search-submit' ) ); ?>
-

+

@@ -195,6 +208,7 @@ function install_plugins_upload( $page = 1 ) {
+
' . __( 'These suggestions are based on the plugins you and other users have installed.' ) . '

'; + break; + } - $wp_list_table->display(); + ?> +
+ display(); ?> +
+ response ) ) { foreach ( (array)$update_plugins->response as $file => $plugin ) { @@ -310,143 +340,225 @@ function install_plugin_install_status($api, $loop = false) { function install_plugin_information() { global $tab; - $api = plugins_api( 'plugin_information', array( 'slug' => wp_unslash( $_REQUEST['plugin'] ), 'is_ssl' => is_ssl() ) ); + if ( empty( $_REQUEST['plugin'] ) ) { + return; + } - if ( is_wp_error($api) ) - wp_die($api); + $api = plugins_api( 'plugin_information', array( + 'slug' => wp_unslash( $_REQUEST['plugin'] ), + 'is_ssl' => is_ssl(), + 'fields' => array( 'banners' => true, 'reviews' => true ) + ) ); + + if ( is_wp_error( $api ) ) { + wp_die( $api ); + } $plugins_allowedtags = array( 'a' => array( 'href' => array(), 'title' => array(), 'target' => array() ), 'abbr' => array( 'title' => array() ), 'acronym' => array( 'title' => array() ), 'code' => array(), 'pre' => array(), 'em' => array(), 'strong' => array(), - 'div' => array(), 'p' => array(), 'ul' => array(), 'ol' => array(), 'li' => array(), + 'div' => array( 'class' => array() ), 'span' => array( 'class' => array() ), + 'p' => array(), 'ul' => array(), 'ol' => array(), 'li' => array(), 'h1' => array(), 'h2' => array(), 'h3' => array(), 'h4' => array(), 'h5' => array(), 'h6' => array(), 'img' => array( 'src' => array(), 'class' => array(), 'alt' => array() ) ); $plugins_section_titles = array( - 'description' => _x('Description', 'Plugin installer section title'), - 'installation' => _x('Installation', 'Plugin installer section title'), - 'faq' => _x('FAQ', 'Plugin installer section title'), - 'screenshots' => _x('Screenshots', 'Plugin installer section title'), - 'changelog' => _x('Changelog', 'Plugin installer section title'), - 'other_notes' => _x('Other Notes', 'Plugin installer section title') + 'description' => _x( 'Description', 'Plugin installer section title' ), + 'installation' => _x( 'Installation', 'Plugin installer section title' ), + 'faq' => _x( 'FAQ', 'Plugin installer section title' ), + 'screenshots' => _x( 'Screenshots', 'Plugin installer section title' ), + 'changelog' => _x( 'Changelog', 'Plugin installer section title' ), + 'reviews' => _x( 'Reviews', 'Plugin installer section title' ), + 'other_notes' => _x( 'Other Notes', 'Plugin installer section title' ) ); - //Sanitize HTML - foreach ( (array)$api->sections as $section_name => $content ) - $api->sections[$section_name] = wp_kses($content, $plugins_allowedtags); + // Sanitize HTML + 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 ) ) + if ( isset( $api->$key ) ) { $api->$key = wp_kses( $api->$key, $plugins_allowedtags ); + } } - $section = isset( $_REQUEST['section'] ) ? wp_unslash( $_REQUEST['section'] ) : 'description'; //Default to the Description tab, Do not translate, API returns English. + $_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 ); $section = array_shift( $section_titles ); } - 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 ?>
    • -author) ) : ?> -
  • author, '_blank') ?>
    • -last_updated) ) : ?> -
  • last_updated)) ) ?>
    • -requires) ) : ?> -
  • requires) ?>
    • -tested) ) : ?> -
  • tested ?>
    • -downloaded) ) : ?> -
  • downloaded), number_format_i18n($api->downloaded)) ?>
    • -slug) && empty($api->external) ) : ?> -
    • -homepage) ) : ?> -
    • - + version ) ) { ?> +
  • version; ?>
    • + author ) ) { ?> +
  • author, '_blank' ); ?>
    • + last_updated ) ) { ?> +
  • + last_updated ) ) ); ?> +
    • + requires ) ) { ?> +
  • requires ); ?>
    • + tested ) ) { ?> +
  • tested; ?>
    • + downloaded ) ) { ?> +
  • downloaded ), number_format_i18n( $api->downloaded ) ); ?>
    • + slug ) && empty( $api->external ) ) { ?> +
    • + homepage ) ) { ?> +
    • + donate_link ) && empty( $api->contributors ) ) { ?> +
    • +
- rating) ) : ?> -

-
-
-
- num_ratings), number_format_i18n($api->num_ratings)); ?> - + rating ) ) { ?> +

+ $api->rating, 'type' => 'percent', 'number' => $api->num_ratings ) ); ?> + num_ratings ), number_format_i18n( $api->num_ratings ) ); ?> + ratings ) && array_sum( (array) $api->ratings ) > 0 ) { + foreach( $api->ratings as $key => $ratecount ) { + // Avoid div-by-zero. + $_rating = $api->num_ratings ? ( $ratecount / $api->num_ratings ) : 0; + ?> +
+ + + + + +
+ contributors ) ) { ?> +

+
    + contributors as $contrib_username => $contrib_profile ) { + if ( empty( $contrib_username ) && empty( $contrib_profile ) ) { + continue; + } + if ( empty( $contrib_username ) ) { + $contrib_username = preg_replace( '/^.+\/(.+)\/?$/', '\1', $contrib_profile ); + } + $contrib_username = sanitize_user( $contrib_username ); + if ( empty( $contrib_profile ) ) { + echo "
  • {$contrib_username}
    • "; + } else { + echo "
  • {$contrib_username}
    • "; + } + } + ?> +
+ donate_link ) ) { ?> + + +
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, '<') ) - echo '

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

'; - - foreach ( (array)$api->sections as $section_name => $content ) { - - if ( isset( $plugins_section_titles[ $section_name ] ) ) - $title = $plugins_section_titles[ $section_name ]; - else - $title = ucwords( str_replace( '_', ' ', $section_name ) ); + 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, '<' ) ) { + echo '

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

'; + } - $content = links_add_base_url($content, 'http://wordpress.org/plugins/' . $api->slug . '/'); - $content = links_add_target($content, '_blank'); + foreach ( (array) $api->sections as $section_name => $content ) { + $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'; + $display = ( $section_name === $section ) ? 'block' : 'none'; echo "\t
\n"; - echo "\t\t

$title

"; echo $content; echo "\t
\n"; } echo "
\n"; + echo "
\n"; + echo "
\n"; // #plugin-information-scrollable + echo "\n"; iframe_footer(); exit;