X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/256a3b381f63716209b3527d0a14442ae570c283..7f1521bf193b382565eb753043c161f4cb3fcda7:/wp-admin/includes/plugin-install.php
diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index 37d862e0..b8cf32f0 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.
*/
@@ -64,26 +70,26 @@ function plugins_api($action, $args = null) {
if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
$url = set_url_scheme( $url, 'https' );
- $args = array(
+ $http_args = array(
'timeout' => 15,
'body' => array(
'action' => $action,
'request' => serialize( $args )
)
);
- $request = wp_remote_post( $url, $args );
+ $request = wp_remote_post( $url, $http_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 );
- $request = wp_remote_post( $http_url, $args );
+ 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, $http_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' ) . '" ';
+ }
- ?>
-
+
-
+ response ) ) {
foreach ( (array)$update_plugins->response as $file => $plugin ) {
@@ -275,7 +304,8 @@ function install_plugin_install_status($api, $loop = false) {
$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
} else {
$key = array_keys( $installed_plugin );
- $key = array_shift( $key ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
+ $key = reset( $key ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
+ $update_file = $api->slug . '/' . $key;
if ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '=') ){
$status = 'latest_installed';
} elseif ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '<') ) {
@@ -299,7 +329,8 @@ function install_plugin_install_status($api, $loop = false) {
if ( isset($_GET['from']) )
$url .= '&from=' . urlencode( wp_unslash( $_GET['from'] ) );
- return compact('status', 'url', 'version');
+ $file = $update_file;
+ return compact( 'status', 'url', 'version', 'file' );
}
/**
@@ -310,141 +341,238 @@ 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,
+ 'downloaded' => false,
+ 'active_installs' => 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 );
+ $section = reset( $section_titles );
}
- iframe_header( __('Plugin Install') );
- echo "