X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/4713a14935b83517997f3c88f808eb41da55033d..ef91a7f4f3c6468973e192335a27ec0e0faca0b5:/wp-admin/includes/class-wp-plugin-install-list-table.php?ds=sidebyside
diff --git a/wp-admin/includes/class-wp-plugin-install-list-table.php b/wp-admin/includes/class-wp-plugin-install-list-table.php
index 868c08ca..cd718360 100644
--- a/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -1,19 +1,76 @@
no_update ) ) {
+ foreach ( $plugin_info->no_update as $plugin ) {
+ $slugs[] = $plugin->slug;
+ }
+ }
+
+ if ( isset( $plugin_info->response ) ) {
+ foreach ( $plugin_info->response as $plugin ) {
+ $slugs[] = $plugin->slug;
+ }
+ }
+
+ return $slugs;
+ }
+
+ /**
+ *
+ * @global array $tabs
+ * @global string $tab
+ * @global int $paged
+ * @global string $type
+ * @global string $term
+ */
+ public function prepare_items() {
include( ABSPATH . 'wp-admin/includes/plugin-install.php' );
global $tabs, $tab, $paged, $type, $term;
@@ -26,29 +83,37 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
// These are the tabs which are shown on the page
$tabs = array();
- $tabs['dashboard'] = __( 'Search' );
- if ( 'search' == $tab )
- $tabs['search'] = __( 'Search Results' );
- $tabs['upload'] = __( 'Upload' );
- $tabs['featured'] = _x( 'Featured', 'Plugin Installer' );
- $tabs['popular'] = _x( 'Popular', 'Plugin Installer' );
- $tabs['new'] = _x( 'Newest', 'Plugin Installer' );
- $tabs['favorites'] = _x( 'Favorites', 'Plugin Installer' );
- $nonmenu_tabs = array( 'plugin-information' ); //Valid actions to perform which do not have a Menu item.
+ if ( 'search' === $tab ) {
+ $tabs['search'] = __( 'Search Results' );
+ }
+ if ( $tab === 'beta' || false !== strpos( get_bloginfo( 'version' ), '-' ) ) {
+ $tabs['beta'] = _x( 'Beta Testing', 'Plugin Installer' );
+ }
+ $tabs['featured'] = _x( 'Featured', 'Plugin Installer' );
+ $tabs['popular'] = _x( 'Popular', 'Plugin Installer' );
+ $tabs['recommended'] = _x( 'Recommended', 'Plugin Installer' );
+ $tabs['favorites'] = _x( 'Favorites', 'Plugin Installer' );
+ if ( current_user_can( 'upload_plugins' ) ) {
+ // No longer a real tab. Here for filter compatibility.
+ // Gets skipped in get_views().
+ $tabs['upload'] = __( 'Upload Plugin' );
+ }
+
+ $nonmenu_tabs = array( 'plugin-information' ); // Valid actions to perform which do not have a Menu item.
/**
- * Filter the tabs shown on the Plugin Install screen.
+ * Filters the tabs shown on the Plugin Install screen.
*
* @since 2.7.0
*
- * @param array $tabs The tabs shown on the Plugin Install screen. Defaults are 'dashboard', 'search',
- * 'upload', 'featured', 'popular', 'new', and 'favorites'.
+ * @param array $tabs The tabs shown on the Plugin Install screen. Defaults include 'featured', 'popular',
+ * 'recommended', 'favorites', and 'upload'.
*/
$tabs = apply_filters( 'install_plugins_tabs', $tabs );
/**
- * Filter tabs not associated with a menu item on the Plugin Install screen.
+ * Filters tabs not associated with a menu item on the Plugin Install screen.
*
* @since 2.7.0
*
@@ -60,7 +125,18 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
$tab = key( $tabs );
- $args = array( 'page' => $paged, 'per_page' => $per_page );
+ $args = array(
+ 'page' => $paged,
+ 'per_page' => $per_page,
+ 'fields' => array(
+ 'last_updated' => true,
+ 'icons' => true,
+ 'active_installs' => true
+ ),
+ // Send the locale and installed plugin slugs to the API so it can provide context-sensitive results.
+ 'locale' => get_user_locale(),
+ 'installed_plugins' => $this->get_installed_plugin_slugs(),
+ );
switch ( $tab ) {
case 'search':
@@ -79,18 +155,27 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
break;
}
- add_action( 'install_plugins_table_header', 'install_search_form', 10, 0 );
break;
case 'featured':
+ $args['fields']['group'] = true;
+ $this->orderby = 'group';
+ // No break!
case 'popular':
case 'new':
+ case 'beta':
+ case 'recommended':
$args['browse'] = $tab;
break;
case 'favorites':
- $user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
- update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
+ $action = 'save_wporg_username_' . get_current_user_id();
+ if ( isset( $_GET['_wpnonce'] ) && wp_verify_nonce( wp_unslash( $_GET['_wpnonce'] ), $action ) ) {
+ $user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
+ update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
+ } else {
+ $user = get_user_option( 'wporg_favorites' );
+ }
if ( $user )
$args['user'] = $user;
else
@@ -105,53 +190,145 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
}
/**
- * Filter API request arguments for each Plugin Install screen tab.
+ * Filters API request arguments for each Plugin Install screen tab.
*
- * The dynamic portion of the hook name, $tab, refers to the plugin install tabs.
- * Default tabs are 'dashboard', 'search', 'upload', 'featured', 'popular', 'new',
- * and 'favorites'.
+ * The dynamic portion of the hook name, `$tab`, refers to the plugin install tabs.
+ * Default tabs include 'featured', 'popular', 'recommended', 'favorites', and 'upload'.
*
* @since 3.7.0
*
* @param array|bool $args Plugin Install API arguments.
*/
- $args = apply_filters( "install_plugins_table_api_args_$tab", $args );
+ $args = apply_filters( "install_plugins_table_api_args_{$tab}", $args );
if ( !$args )
return;
$api = plugins_api( 'query_plugins', $args );
- if ( is_wp_error( $api ) )
- wp_die( $api->get_error_message() . '
' . __( 'Try again' ) . '' );
+ if ( is_wp_error( $api ) ) {
+ $this->error = $api;
+ return;
+ }
$this->items = $api->plugins;
+ if ( $this->orderby ) {
+ uasort( $this->items, array( $this, 'order_callback' ) );
+ }
+
$this->set_pagination_args( array(
'total_items' => $api->info['results'],
'per_page' => $args['per_page'],
) );
+
+ if ( isset( $api->info['groups'] ) ) {
+ $this->groups = $api->info['groups'];
+ }
}
- function no_items() {
- _e( 'No plugins match your request.' );
+ /**
+ * @access public
+ */
+ public function no_items() {
+ if ( isset( $this->error ) ) {
+ $message = $this->error->get_error_message() . '
' . __( 'Try again' ) . '
';
+ } else {
+ $message = __( 'No plugins match your request.' );
+ }
+ echo '' . $message . '
';
}
- function get_views() {
+ /**
+ *
+ * @global array $tabs
+ * @global string $tab
+ *
+ * @return array
+ */
+ protected function get_views() {
global $tabs, $tab;
$display_tabs = array();
foreach ( (array) $tabs as $action => $text ) {
- $class = ( $action == $tab ) ? ' class="current"' : '';
+ $class = ( $action === $tab ) ? ' current' : '';
$href = self_admin_url('plugin-install.php?tab=' . $action);
- $display_tabs['plugin-install-'.$action] = "$text";
+ $display_tabs['plugin-install-'.$action] = "$text";
}
+ // No longer a real tab.
+ unset( $display_tabs['plugin-install-upload'] );
return $display_tabs;
}
- function display_tablenav( $which ) {
- if ( 'top' == $which ) { ?>
+ /**
+ * Override parent views so we can use the filter bar display.
+ */
+ public function views() {
+ $views = $this->get_views();
+
+ /** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
+ $views = apply_filters( "views_{$this->screen->id}", $views );
+
+ $this->screen->render_screen_reader_content( 'heading_views' );
+?>
+
+
+ $view ) {
+ $views[ $class ] = "\t- $view";
+ }
+ echo implode( "
\n", $views ) . "\n";
+ }
+ ?>
+
+
+
+
+_args['singular'];
+
+ $data_attr = '';
+
+ if ( $singular ) {
+ $data_attr = " data-wp-lists='list:$singular'";
+ }
+
+ $this->display_tablenav( 'top' );
+
+?>
+
+screen->render_screen_reader_content( 'heading_list' );
+?>
+
>
+ display_rows_or_placeholder(); ?>
+
+
+display_tablenav( 'bottom' );
+ }
+
+ /**
+ * @global string $tab
+ *
+ * @param string $which
+ */
+ protected function display_tablenav( $which ) {
+ if ( $GLOBALS['tab'] === 'featured' ) {
+ return;
+ }
+
+ if ( 'top' === $which ) {
+ wp_referer_field();
+ ?>
_args );
+ /**
+ * @return array
+ */
+ protected function get_table_classes() {
+ return array( 'widefat', $this->_args['plural'] );
+ }
- return array( 'widefat', $plural );
+ /**
+ * @return array
+ */
+ public function get_columns() {
+ return array();
}
- function get_columns() {
- return array(
- 'name' => _x( 'Name', 'plugin name' ),
- 'version' => __( 'Version' ),
- 'rating' => __( 'Rating' ),
- 'description' => __( 'Description' ),
- );
+ /**
+ * @param object $plugin_a
+ * @param object $plugin_b
+ * @return int
+ */
+ private function order_callback( $plugin_a, $plugin_b ) {
+ $orderby = $this->orderby;
+ if ( ! isset( $plugin_a->$orderby, $plugin_b->$orderby ) ) {
+ return 0;
+ }
+
+ $a = $plugin_a->$orderby;
+ $b = $plugin_b->$orderby;
+
+ if ( $a == $b ) {
+ return 0;
+ }
+
+ if ( 'DESC' === $this->order ) {
+ return ( $a < $b ) ? 1 : -1;
+ } else {
+ return ( $a < $b ) ? -1 : 1;
+ }
}
- function display_rows() {
+ public function display_rows() {
$plugins_allowedtags = array(
'a' => array( 'href' => array(),'title' => array(), 'target' => array() ),
'abbr' => array( 'title' => array() ),'acronym' => array( 'title' => array() ),
@@ -197,65 +398,126 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array()
);
- list( $columns, $hidden ) = $this->get_column_info();
+ $plugins_group_titles = array(
+ 'Performance' => _x( 'Performance', 'Plugin installer group title' ),
+ 'Social' => _x( 'Social', 'Plugin installer group title' ),
+ 'Tools' => _x( 'Tools', 'Plugin installer group title' ),
+ );
- $style = array();
- foreach ( $columns as $column_name => $column_display_name ) {
- $style[ $column_name ] = in_array( $column_name, $hidden ) ? 'style="display:none;"' : '';
- }
+ $group = null;
foreach ( (array) $this->items as $plugin ) {
- if ( is_object( $plugin ) )
+ if ( is_object( $plugin ) ) {
$plugin = (array) $plugin;
+ }
+
+ // Display the group heading if there is one
+ if ( isset( $plugin['group'] ) && $plugin['group'] != $group ) {
+ if ( isset( $this->groups[ $plugin['group'] ] ) ) {
+ $group_name = $this->groups[ $plugin['group'] ];
+ if ( isset( $plugins_group_titles[ $group_name ] ) ) {
+ $group_name = $plugins_group_titles[ $group_name ];
+ }
+ } else {
+ $group_name = $plugin['group'];
+ }
+ // Starting a new group, close off the divs of the last one
+ if ( ! empty( $group ) ) {
+ echo '
';
+ }
+
+ echo '' . esc_html( $group_name ) . '
';
+ // needs an extra wrapping div for nth-child selectors to work
+ echo '
';
+
+ $group = $plugin['group'];
+ }
$title = wp_kses( $plugin['name'], $plugins_allowedtags );
- //Limit description to 400char, and remove any HTML.
- $description = strip_tags( $plugin['description'] );
- if ( strlen( $description ) > 400 )
- $description = mb_substr( $description, 0, 400 ) . '…';
- //remove any trailing entities
- $description = preg_replace( '/&[^;\s]{0,6}$/', '', $description );
- //strip leading/trailing & multiple consecutive lines
- $description = trim( $description );
- $description = preg_replace( "|(\r?\n)+|", "\n", $description );
- //\n =>
- $description = nl2br( $description );
+
+ // Remove any HTML from the description.
+ $description = strip_tags( $plugin['short_description'] );
$version = wp_kses( $plugin['version'], $plugins_allowedtags );
$name = strip_tags( $title . ' ' . $version );
- $author = $plugin['author'];
- if ( ! empty( $plugin['author'] ) )
- $author = '
' . sprintf( __( 'By %s' ), $author ) . '.';
-
- $author = wp_kses( $author, $plugins_allowedtags );
+ $author = wp_kses( $plugin['author'], $plugins_allowedtags );
+ if ( ! empty( $author ) ) {
+ $author = '
' . sprintf( __( 'By %s' ), $author ) . '';
+ }
$action_links = array();
- $action_links[] = '
' . __( 'Details' ) . '';
if ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) {
$status = install_plugin_install_status( $plugin );
switch ( $status['status'] ) {
case 'install':
- if ( $status['url'] )
- $action_links[] = '
' . __( 'Install Now' ) . '';
+ if ( $status['url'] ) {
+ /* translators: 1: Plugin name and version. */
+ $action_links[] = '
' . __( 'Install Now' ) . '';
+ }
break;
+
case 'update_available':
- if ( $status['url'] )
- $action_links[] = '
' . __( 'Update Now' ) . '';
+ if ( $status['url'] ) {
+ /* translators: 1: Plugin name and version */
+ $action_links[] = '
' . __( 'Update Now' ) . '';
+ }
break;
+
case 'latest_installed':
case 'newer_installed':
- $action_links[] = '
' . _x( 'Installed', 'plugin' ) . '';
+ if ( is_plugin_active( $status['file'] ) ) {
+ $action_links[] = '
';
+ } elseif ( current_user_can( 'activate_plugins' ) ) {
+ $button_text = __( 'Activate' );
+ /* translators: %s: Plugin name */
+ $button_label = _x( 'Activate %s', 'plugin' );
+ $activate_url = add_query_arg( array(
+ '_wpnonce' => wp_create_nonce( 'activate-plugin_' . $status['file'] ),
+ 'action' => 'activate',
+ 'plugin' => $status['file'],
+ ), network_admin_url( 'plugins.php' ) );
+
+ if ( is_network_admin() ) {
+ $button_text = __( 'Network Activate' );
+ /* translators: %s: Plugin name */
+ $button_label = _x( 'Network Activate %s', 'plugin' );
+ $activate_url = add_query_arg( array( 'networkwide' => 1 ), $activate_url );
+ }
+
+ $action_links[] = sprintf(
+ '
%3$s',
+ esc_url( $activate_url ),
+ esc_attr( sprintf( $button_label, $plugin['name'] ) ),
+ $button_text
+ );
+ } else {
+ $action_links[] = '
';
+ }
break;
}
}
+ $details_link = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin['slug'] .
+ '&TB_iframe=true&width=600&height=550' );
+
+ /* translators: 1: Plugin name and version. */
+ $action_links[] = '
' . __( 'More Details' ) . '';
+
+ if ( !empty( $plugin['icons']['svg'] ) ) {
+ $plugin_icon_url = $plugin['icons']['svg'];
+ } elseif ( !empty( $plugin['icons']['2x'] ) ) {
+ $plugin_icon_url = $plugin['icons']['2x'];
+ } elseif ( !empty( $plugin['icons']['1x'] ) ) {
+ $plugin_icon_url = $plugin['icons']['1x'];
+ } else {
+ $plugin_icon_url = $plugin['icons']['default'];
+ }
+
/**
- * Filter the install action links for a plugin.
+ * Filters the install action links for a plugin.
*
* @since 2.7.0
*
@@ -263,18 +525,72 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
* @param array $plugin The plugin currently being listed.
*/
$action_links = apply_filters( 'plugin_install_action_links', $action_links, $plugin );
+
+ $last_updated_timestamp = strtotime( $plugin['last_updated'] );
?>
-
- >
-
- |
- > |
- >
- $plugin['rating'], 'type' => 'percent', 'number' => $plugin['num_ratings'] ) ); ?>
- |
- > |
-
+
+
+
+
+
' . implode( '', $action_links ) . '';
+ }
+ ?>
+
+
+
+
+
+ $plugin['rating'], 'type' => 'percent', 'number' => $plugin['num_ratings'] ) ); ?>
+ ()
+
+
+
+
+
+ = 1000000 ) {
+ $active_installs_text = _x( '1+ Million', 'Active plugin installs' );
+ } elseif ( 0 == $plugin['active_installs'] ) {
+ $active_installs_text = _x( 'Less Than 10', 'Active plugin installs' );
+ } else {
+ $active_installs_text = number_format_i18n( $plugin['active_installs'] ) . '+';
+ }
+ printf( __( '%s Active Installs' ), $active_installs_text );
+ ?>
+
+
+ ' ) ) {
+ echo '' . __( 'Untested with your version of WordPress' ) . '';
+ } elseif ( ! empty( $plugin['requires'] ) && version_compare( substr( $wp_version, 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '<' ) ) {
+ echo '' . __( 'Incompatible with your version of WordPress' ) . '';
+ } else {
+ echo '' . __( 'Compatible with your version of WordPress' ) . '';
+ }
+ ?>
+
+
+
';
+ }
}
}