*/
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.
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 <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(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 );
+ $request = wp_remote_post( $http_url, $http_args );
}
if ( is_wp_error($request) ) {
$input_attrs = 'class="wp-filter-search" placeholder="' . esc_attr__( 'Search Plugins' ) . '" ';
}
- ?><form class="search-form search-plugins" method="get" action="">
+ ?><form class="search-form search-plugins" method="get">
<input type="hidden" name="tab" value="search" />
<?php if ( $type_selector ) : ?>
<select name="type" id="typeselector">
/**
* Upload from zip
* @since 2.8.0
- *
- * @param string $page
*/
-function install_plugins_upload( $page = 1 ) {
+function install_plugins_upload() {
?>
<div class="upload-plugin">
<p class="install-help"><?php _e('If you have a plugin in a .zip format, you may install it by uploading it here.'); ?></p>
</div>
<?php
}
-add_action('install_plugins_upload', 'install_plugins_upload', 10, 1);
+add_action('install_plugins_upload', 'install_plugins_upload' );
/**
* Show a username form for the favorites page
$user = ! empty( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
?>
<p class="install-help"><?php _e( 'If you have marked plugins as favorites on WordPress.org, you can browse them here.' ); ?></p>
- <form method="get" action="">
+ <form method="get">
<input type="hidden" name="tab" value="favorites" />
<p>
<label for="user"><?php _e( 'Your WordPress.org username:' ); ?></label>
function display_plugins_table() {
global $wp_list_table;
- if ( current_filter() == 'install_plugins_favorites' && empty( $_GET['user'] ) && ! get_user_option( 'wporg_favorites' ) )
- return;
+ switch ( current_filter() ) {
+ case 'install_plugins_favorites' :
+ if ( empty( $_GET['user'] ) && ! get_user_option( 'wporg_favorites' ) ) {
+ return;
+ }
+ break;
+ case 'install_plugins_recommended' :
+ echo '<p>' . __( 'These suggestions are based on the plugins you and other users have installed.' ) . '</p>';
+ break;
+ }
- $wp_list_table->display();
+ ?>
+ <form id="plugin-filter" method="post">
+ <?php $wp_list_table->display(); ?>
+ </form>
+ <?php
}
-add_action( 'install_plugins_search', 'display_plugins_table' );
-add_action( 'install_plugins_popular', 'display_plugins_table' );
-add_action( 'install_plugins_new', 'display_plugins_table' );
-add_action( 'install_plugins_beta', 'display_plugins_table' );
-add_action( 'install_plugins_favorites', 'display_plugins_table' );
+add_action( 'install_plugins_search', 'display_plugins_table' );
+add_action( 'install_plugins_popular', 'display_plugins_table' );
+add_action( 'install_plugins_recommended', 'display_plugins_table' );
+add_action( 'install_plugins_new', 'display_plugins_table' );
+add_action( 'install_plugins_beta', 'display_plugins_table' );
+add_action( 'install_plugins_favorites', 'display_plugins_table' );
/**
* Determine the status we can perform on a plugin.
// Default to a "new" plugin
$status = 'install';
$url = false;
+ $update_file = false;
/*
* Check to see if this plugin is known to be installed,
$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'], '<') ) {
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' );
}
/**
function install_plugin_information() {
global $tab;
+ if ( empty( $_REQUEST['plugin'] ) ) {
+ return;
+ }
+
$api = plugins_api( 'plugin_information', array(
'slug' => wp_unslash( $_REQUEST['plugin'] ),
'is_ssl' => is_ssl(),
- 'fields' => array( 'banners' => true, 'reviews' => true )
+ 'fields' => array(
+ 'banners' => true,
+ 'reviews' => true,
+ 'downloaded' => false,
+ 'active_installs' => true
+ )
) );
if ( is_wp_error( $api ) ) {
$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 "</div>\n";
+ $date_format = __( 'M j, Y @ H:i' );
+ $last_updated_timestamp = strtotime( $api->last_updated );
?>
<div id="<?php echo $_tab; ?>-content" class='<?php echo $_with_banner; ?>'>
<div class="fyi">
<?php } if ( ! empty( $api->author ) ) { ?>
<li><strong><?php _e( 'Author:' ); ?></strong> <?php echo links_add_target( $api->author, '_blank' ); ?></li>
<?php } if ( ! empty( $api->last_updated ) ) { ?>
- <li><strong><?php _e( 'Last Updated:' ); ?></strong> <span title="<?php echo $api->last_updated; ?>">
- <?php printf( __( '%s ago' ), human_time_diff( strtotime( $api->last_updated ) ) ); ?>
+ <li><strong><?php _e( 'Last Updated:' ); ?></strong> <span title="<?php echo esc_attr( date_i18n( $date_format, $last_updated_timestamp ) ); ?>">
+ <?php printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) ); ?>
</span></li>
<?php } if ( ! empty( $api->requires ) ) { ?>
<li><strong><?php _e( 'Requires WordPress Version:' ); ?></strong> <?php printf( __( '%s or higher' ), $api->requires ); ?></li>
<?php } if ( ! empty( $api->tested ) ) { ?>
<li><strong><?php _e( 'Compatible up to:' ); ?></strong> <?php echo $api->tested; ?></li>
- <?php } if ( ! empty( $api->downloaded ) ) { ?>
- <li><strong><?php _e( 'Downloaded:' ); ?></strong> <?php printf( _n( '%s time', '%s times', $api->downloaded ), number_format_i18n( $api->downloaded ) ); ?></li>
+ <?php } if ( ! empty( $api->active_installs ) ) { ?>
+ <li><strong><?php _e( 'Active Installs:' ); ?></strong> <?php
+ if ( $api->active_installs >= 1000000 ) {
+ _ex( '1+ Million', 'Active plugin installs' );
+ } else {
+ echo number_format_i18n( $api->active_installs ) . '+';
+ }
+ ?></li>
<?php } if ( ! empty( $api->slug ) && empty( $api->external ) ) { ?>
<li><a target="_blank" href="https://wordpress.org/plugins/<?php echo $api->slug; ?>/"><?php _e( 'WordPress.org Plugin Page »' ); ?></a></li>
<?php } if ( ! empty( $api->homepage ) ) { ?>
$_rating = $api->num_ratings ? ( $ratecount / $api->num_ratings ) : 0;
?>
<div class="counter-container">
- <a href="<?php echo esc_url( self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $api->slug . '&section=reviews' ) ); ?>"
- title="<?php echo esc_attr( sprintf( _n( 'Click to see reviews that provided a rating of %d star', 'Click to see reviews that provided a rating of %d stars', $key ), $key ) ); ?>">
- <span class="counter-label"><?php printf( _n( '%d star', '%d stars', $key ), $key ); ?></span>
- <span class="counter-back">
- <span class="counter-bar" style="width: <?php echo 92 * $_rating; ?>px;"></span>
- </span>
- </a>
+ <span class="counter-label"><a href="https://wordpress.org/support/view/plugin-reviews/<?php echo $api->slug; ?>?filter=<?php echo $key; ?>"
+ target="_blank"
+ title="<?php echo esc_attr( sprintf( _n( 'Click to see reviews that provided a rating of %d star', 'Click to see reviews that provided a rating of %d stars', $key ), $key ) ); ?>"><?php printf( _n( '%d star', '%d stars', $key ), $key ); ?></a></span>
+ <span class="counter-back">
+ <span class="counter-bar" style="width: <?php echo 92 * $_rating; ?>px;"></span>
+ </span>
<span class="counter-count"><?php echo number_format_i18n( $ratecount ); ?></span>
</div>
<?php
<div id="section-holder" class="wrap">
<?php
if ( ! empty( $api->tested ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->tested ) ), $api->tested, '>' ) ) {
- echo '<div class="
error"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been tested</strong> with your current version of WordPress.') . '</p></div>';
- } else if ( ! empty( $api->requires ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->requires ) ), $api->requires, '<' ) ) {
- echo '<div class="
error"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been marked as compatible</strong> with your version of WordPress.') . '</p></div>';
+ echo '<div class="
notice notice-warning"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been tested</strong> with your current version of WordPress.') . '</p></div>';
+ } elseif ( ! empty( $api->requires ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->requires ) ), $api->requires, '<' ) ) {
+ echo '<div class="
notice notice-warning"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been marked as compatible</strong> with your version of WordPress.') . '</p></div>';
}
foreach ( (array) $api->sections as $section_name => $content ) {
break;
case 'update_available':
if ( $status['url'] ) {
- echo '<a class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __( 'Install Update Now' ) .'</a>';
+ echo '<a data-slug="' . esc_attr( $api->slug ) . '" id="plugin_update_from_iframe" class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __( 'Install Update Now' ) .'</a>';
}
break;
case 'newer_installed':
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff