X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/41578db67d72562346e4dbb2a14889b23d522813..88550bc3400cc7c035ff590ecb007c7938041ded:/wp-admin/includes/plugin-install.php?ds=inline diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php index 44a6a1b4..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. @@ -128,11 +134,10 @@ function install_dashboard() { ?>

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,60 +340,97 @@ 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 ) ) + $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 ); + } } $_tab = esc_attr( $tab ); - $section = isset( $_REQUEST['section'] ) ? wp_unslash( $_REQUEST['section'] ) : 'description'; //Default to the Description tab, Do not translate, API returns English. + $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') ); + iframe_header( __( 'Plugin Install' ) ); + + $_with_banner = ''; + + if ( ! empty( $api->banners ) && ( ! empty( $api->banners['low'] ) || ! empty( $api->banners['high'] ) ) ) { + $_with_banner = 'with-banner'; + $low = empty( $api->banners['low'] ) ? $api->banners['high'] : $api->banners['low']; + $high = empty( $api->banners['high'] ) ? $api->banners['low'] : $api->banners['high']; + ?> + + {$api->name}"; - echo "
\n"; + echo '
'; + echo "

{$api->name}

"; + echo "
\n"; - foreach ( (array)$api->sections as $section_name => $content ) { + foreach ( (array) $api->sections as $section_name => $content ) { + if ( 'reviews' === $section_name && ( empty( $api->ratings ) || 0 === array_sum( (array) $api->ratings ) ) ) { + continue; + } - if ( isset( $plugins_section_titles[ $section_name ] ) ) + if ( isset( $plugins_section_titles[ $section_name ] ) ) { $title = $plugins_section_titles[ $section_name ]; - else + } else { $title = ucwords( str_replace( '_', ' ', $section_name ) ); + } - $class = ( $section_name == $section ) ? ' class="current"' : ''; + $class = ( $section_name === $section ) ? ' class="current"' : ''; $href = add_query_arg( array('tab' => $tab, 'section' => $section_name) ); $href = esc_url( $href ); $san_section = esc_attr( $section_name ); @@ -373,55 +440,94 @@ function install_plugin_information() { echo "
\n"; ?> -
+
    -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 ) ) : ?> -

+ 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 ) ); ?> + 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.') . '

'; + } + 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 $content; @@ -429,23 +535,26 @@ function install_plugin_information() { } echo "
\n"; echo "
\n"; + echo "
\n"; // #plugin-information-scrollable echo "