diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/includes/class-wp-plugins-list-table.php --- a/wp/wp-admin/includes/class-wp-plugins-list-table.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-admin/includes/class-wp-plugins-list-table.php Mon Oct 14 18:28:13 2019 +0200 @@ -32,17 +32,21 @@ public function __construct( $args = array() ) { global $status, $page; - parent::__construct( array( - 'plural' => 'plugins', - 'screen' => isset( $args['screen'] ) ? $args['screen'] : null, - ) ); + parent::__construct( + array( + 'plural' => 'plugins', + 'screen' => isset( $args['screen'] ) ? $args['screen'] : null, + ) + ); $status = 'all'; - if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) ) + if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search', 'paused' ) ) ) { $status = $_REQUEST['plugin_status']; + } - if ( isset($_REQUEST['s']) ) - $_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']) ); + if ( isset( $_REQUEST['s'] ) ) { + $_SERVER['REQUEST_URI'] = add_query_arg( 's', wp_unslash( $_REQUEST['s'] ) ); + } $page = $this->get_pagenum(); } @@ -58,11 +62,10 @@ * @return bool */ public function ajax_user_can() { - return current_user_can('activate_plugins'); + return current_user_can( 'activate_plugins' ); } /** - * * @global string $status * @global array $plugins * @global array $totals @@ -96,6 +99,7 @@ 'upgrade' => array(), 'mustuse' => array(), 'dropins' => array(), + 'paused' => array(), ); $screen = $this->screen; @@ -122,15 +126,16 @@ } /** This action is documented in wp-admin/includes/class-wp-plugins-list-table.php */ - if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) ) + if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) ) { $plugins['dropins'] = get_dropins(); + } if ( current_user_can( 'update_plugins' ) ) { $current = get_site_transient( 'update_plugins' ); foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) { if ( isset( $current->response[ $plugin_file ] ) ) { $plugins['all'][ $plugin_file ]['update'] = true; - $plugins['upgrade'][ $plugin_file ] = $plugins['all'][ $plugin_file ]; + $plugins['upgrade'][ $plugin_file ] = $plugins['all'][ $plugin_file ]; } } } @@ -164,7 +169,7 @@ foreach ( $recently_activated as $key => $time ) { if ( $time + WEEK_IN_SECONDS < time() ) { - unset( $recently_activated[$key] ); + unset( $recently_activated[ $key ] ); } } @@ -179,17 +184,18 @@ foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) { // Extra info if known. array_merge() ensures $plugin_data has precedence if keys collide. if ( isset( $plugin_info->response[ $plugin_file ] ) ) { - $plugins['all'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data ); + $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data ); + $plugins['all'][ $plugin_file ] = $plugin_data; // Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) { - $plugins['upgrade'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data ); + $plugins['upgrade'][ $plugin_file ] = $plugin_data; } - } elseif ( isset( $plugin_info->no_update[ $plugin_file ] ) ) { - $plugins['all'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data ); + $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data ); + $plugins['all'][ $plugin_file ] = $plugin_data; // Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) { - $plugins['upgrade'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data ); + $plugins['upgrade'][ $plugin_file ] = $plugin_data; } } @@ -215,6 +221,10 @@ // On the non-network screen, populate the active list with plugins that are individually activated // On the network-admin screen, populate the active list with plugins that are network activated $plugins['active'][ $plugin_file ] = $plugin_data; + + if ( ! $screen->in_admin( 'network' ) && is_plugin_paused( $plugin_file ) ) { + $plugins['paused'][ $plugin_file ] = $plugin_data; + } } else { if ( isset( $recently_activated[ $plugin_file ] ) ) { // Populate the recently activated list with plugins that have been recently activated @@ -226,21 +236,23 @@ } if ( strlen( $s ) ) { - $status = 'search'; + $status = 'search'; $plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) ); } $totals = array(); - foreach ( $plugins as $type => $list ) + foreach ( $plugins as $type => $list ) { $totals[ $type ] = count( $list ); + } - if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) ) + if ( empty( $plugins[ $status ] ) && ! in_array( $status, array( 'all', 'search' ) ) ) { $status = 'all'; + } $this->items = array(); foreach ( $plugins[ $status ] as $plugin_file => $plugin_data ) { // Translate, Don't Apply Markup, Sanitize HTML - $this->items[$plugin_file] = _get_plugin_data_markup_translate( $plugin_file, $plugin_data, false, true ); + $this->items[ $plugin_file ] = _get_plugin_data_markup_translate( $plugin_file, $plugin_data, false, true ); } $total_this_page = $totals[ $status ]; @@ -250,10 +262,14 @@ $js_plugins[ $key ] = array_keys( (array) $list ); } - wp_localize_script( 'updates', '_wpUpdatesItemCounts', array( - 'plugins' => $js_plugins, - 'totals' => wp_get_update_data(), - ) ); + wp_localize_script( + 'updates', + '_wpUpdatesItemCounts', + array( + 'plugins' => $js_plugins, + 'totals' => wp_get_update_data(), + ) + ); if ( ! $orderby ) { $orderby = 'Name'; @@ -269,13 +285,16 @@ $start = ( $page - 1 ) * $plugins_per_page; - if ( $total_this_page > $plugins_per_page ) + if ( $total_this_page > $plugins_per_page ) { $this->items = array_slice( $this->items, $start, $plugins_per_page ); + } - $this->set_pagination_args( array( - 'total_items' => $total_this_page, - 'per_page' => $plugins_per_page, - ) ); + $this->set_pagination_args( + array( + 'total_items' => $total_this_page, + 'per_page' => $plugins_per_page, + ) + ); } /** @@ -306,11 +325,12 @@ public function _order_callback( $plugin_a, $plugin_b ) { global $orderby, $order; - $a = $plugin_a[$orderby]; - $b = $plugin_b[$orderby]; + $a = $plugin_a[ $orderby ]; + $b = $plugin_b[ $orderby ]; - if ( $a == $b ) + if ( $a == $b ) { return 0; + } if ( 'DESC' === $order ) { return strcasecmp( $b, $a ); @@ -320,7 +340,6 @@ } /** - * * @global array $plugins */ public function no_items() { @@ -329,16 +348,18 @@ if ( ! empty( $_REQUEST['s'] ) ) { $s = esc_html( wp_unslash( $_REQUEST['s'] ) ); + /* translators: %s: plugin search term */ printf( __( 'No plugins found for “%s”.' ), $s ); // We assume that somebody who can install plugins in multisite is experienced enough to not need this helper link. if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) { echo ' ' . __( 'Search for plugins in the WordPress Plugin Directory.' ) . ''; } - } elseif ( ! empty( $plugins['all'] ) ) + } elseif ( ! empty( $plugins['all'] ) ) { _e( 'No plugins found.' ); - else + } else { _e( 'You do not appear to have any plugins available at this time.' ); + } } /** @@ -372,7 +393,6 @@ } /** - * * @global string $status * @return array */ @@ -380,7 +400,7 @@ global $status; return array( - 'cb' => !in_array( $status, array( 'mustuse', 'dropins' ) ) ? '' : '', + 'cb' => ! in_array( $status, array( 'mustuse', 'dropins' ) ) ? '' : '', 'name' => __( 'Plugin' ), 'description' => __( 'Description' ), ); @@ -394,7 +414,6 @@ } /** - * * @global array $totals * @global string $status * @return array @@ -404,39 +423,52 @@ $status_links = array(); foreach ( $totals as $type => $count ) { - if ( !$count ) + if ( ! $count ) { continue; + } switch ( $type ) { case 'all': + /* translators: %s: plugin count */ $text = _nx( 'All (%s)', 'All (%s)', $count, 'plugins' ); break; case 'active': + /* translators: %s: plugin count */ $text = _n( 'Active (%s)', 'Active (%s)', $count ); break; case 'recently_activated': + /* translators: %s: plugin count */ $text = _n( 'Recently Active (%s)', 'Recently Active (%s)', $count ); break; case 'inactive': + /* translators: %s: plugin count */ $text = _n( 'Inactive (%s)', 'Inactive (%s)', $count ); break; case 'mustuse': + /* translators: %s: plugin count */ $text = _n( 'Must-Use (%s)', 'Must-Use (%s)', $count ); break; case 'dropins': - $text = _n( 'Drop-ins (%s)', 'Drop-ins (%s)', $count ); + /* translators: %s: plugin count */ + $text = _n( 'Drop-in (%s)', 'Drop-ins (%s)', $count ); + break; + case 'paused': + /* translators: %s: plugin count */ + $text = _n( 'Paused (%s)', 'Paused (%s)', $count ); break; case 'upgrade': + /* translators: %s: plugin count */ $text = _n( 'Update Available (%s)', 'Update Available (%s)', $count ); break; } if ( 'search' !== $type ) { - $status_links[$type] = sprintf( "%s", - add_query_arg('plugin_status', $type, 'plugins.php'), + $status_links[ $type ] = sprintf( + "%s", + add_query_arg( 'plugin_status', $type, 'plugins.php' ), ( $type === $status ) ? ' class="current" aria-current="page"' : '', sprintf( $text, number_format_i18n( $count ) ) - ); + ); } } @@ -444,7 +476,6 @@ } /** - * * @global string $status * @return array */ @@ -453,17 +484,21 @@ $actions = array(); - if ( 'active' != $status ) + if ( 'active' != $status ) { $actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' ); + } - if ( 'inactive' != $status && 'recent' != $status ) + if ( 'inactive' != $status && 'recent' != $status ) { $actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' ); + } - if ( !is_multisite() || $this->screen->in_admin( 'network' ) ) { - if ( current_user_can( 'update_plugins' ) ) + if ( ! is_multisite() || $this->screen->in_admin( 'network' ) ) { + if ( current_user_can( 'update_plugins' ) ) { $actions['update-selected'] = __( 'Update' ); - if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) ) + } + if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) ) { $actions['delete-selected'] = __( 'Delete' ); + } } return $actions; @@ -476,8 +511,9 @@ public function bulk_actions( $which = '' ) { global $status; - if ( in_array( $status, array( 'mustuse', 'dropins' ) ) ) + if ( in_array( $status, array( 'mustuse', 'dropins' ) ) ) { return; + } parent::bulk_actions( $which ); } @@ -489,21 +525,24 @@ protected function extra_tablenav( $which ) { global $status; - if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) ) + if ( ! in_array( $status, array( 'recently_activated', 'mustuse', 'dropins' ) ) ) { return; + } echo '
' . sprintf( __( 'Files in the %s directory are executed automatically.' ), + echo '
' . sprintf(
+ /* translators: %s: mu-plugins directory name */
+ __( 'Files in the %s directory are executed automatically.' ),
'' . str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) . '
'
) . '
' . sprintf( __( 'Drop-ins are advanced plugins in the %s directory that replace WordPress functionality when present.' ), + echo '
' . sprintf(
+ /* translators: %s: wp-content directory name */
+ __( 'Drop-ins are advanced plugins in the %s directory that replace WordPress functionality when present.' ),
'' . str_replace( ABSPATH, '', WP_CONTENT_DIR ) . '
'
) . '
' . $dropins[ $plugin_file ][0] . '
'; } elseif ( defined( $dropins[ $plugin_file ][1] ) && constant( $dropins[ $plugin_file ][1] ) ) { // Constant is true - $is_active = true; + $is_active = true; $description = '' . $dropins[ $plugin_file ][0] . '
'; } else { - $is_active = false; + $is_active = false; $description = '' . $dropins[ $plugin_file ][0] . ' define('" . $dropins[ $plugin_file ][1] . "', true);
",
'wp-config.php
'
) . '
' . $plugin_data['Description'] . '
'; + } } else { if ( $screen->in_admin( 'network' ) ) { $is_active = is_plugin_active_for_network( $plugin_file ); } else { - $is_active = is_plugin_active( $plugin_file ); + $is_active = is_plugin_active( $plugin_file ); $restrict_network_active = ( is_multisite() && is_plugin_active_for_network( $plugin_file ) ); - $restrict_network_only = ( is_multisite() && is_network_only_plugin( $plugin_file ) && ! $is_active ); + $restrict_network_only = ( is_multisite() && is_network_only_plugin( $plugin_file ) && ! $is_active ); } if ( $screen->in_admin( 'network' ) ) { @@ -599,7 +643,7 @@ if ( current_user_can( 'manage_network_plugins' ) ) { /* translators: %s: plugin name */ $actions['deactivate'] = '' . __( 'Network Deactivate' ) . ''; - } + } } else { if ( current_user_can( 'manage_network_plugins' ) ) { /* translators: %s: plugin name */ @@ -624,6 +668,10 @@ /* translators: %s: plugin name */ $actions['deactivate'] = '' . __( 'Deactivate' ) . ''; } + if ( current_user_can( 'resume_plugin', $plugin_file ) && is_plugin_paused( $plugin_file ) ) { + /* translators: %s: plugin name */ + $actions['resume'] = '' . __( 'Resume' ) . ''; + } } else { if ( current_user_can( 'activate_plugin', $plugin_file ) ) { /* translators: %s: plugin name */ @@ -635,9 +683,7 @@ $actions['delete'] = '' . __( 'Delete' ) . ''; } } // end if $is_active - - } // end if $screen->in_admin( 'network' ) - + } // end if $screen->in_admin( 'network' ) } // end if $context $actions = array_filter( $actions ); @@ -649,12 +695,12 @@ * * @since 3.1.0 * - * @param array $actions An array of plugin action links. By default this can include 'activate', - * 'deactivate', and 'delete'. - * @param string $plugin_file Path to the plugin file relative to the plugins directory. - * @param array $plugin_data An array of plugin data. See `get_plugin_data()`. - * @param string $context The plugin context. By default this can include 'all', 'active', 'inactive', - * 'recently_activated', 'upgrade', 'mustuse', 'dropins', and 'search'. + * @param string[] $actions An array of plugin action links. By default this can include 'activate', + * 'deactivate', and 'delete'. + * @param string $plugin_file Path to the plugin file relative to the plugins directory. + * @param array $plugin_data An array of plugin data. See `get_plugin_data()`. + * @param string $context The plugin context. By default this can include 'all', 'active', 'inactive', + * 'recently_activated', 'upgrade', 'mustuse', 'dropins', and 'search'. */ $actions = apply_filters( 'network_admin_plugin_action_links', $actions, $plugin_file, $plugin_data, $context ); @@ -666,12 +712,12 @@ * * @since 3.1.0 * - * @param array $actions An array of plugin action links. By default this can include 'activate', - * 'deactivate', and 'delete'. - * @param string $plugin_file Path to the plugin file relative to the plugins directory. - * @param array $plugin_data An array of plugin data. See `get_plugin_data()`. - * @param string $context The plugin context. By default this can include 'all', 'active', 'inactive', - * 'recently_activated', 'upgrade', 'mustuse', 'dropins', and 'search'. + * @param string[] $actions An array of plugin action links. By default this can include 'activate', + * 'deactivate', and 'delete'. + * @param string $plugin_file Path to the plugin file relative to the plugins directory. + * @param array $plugin_data An array of plugin data. See `get_plugin_data()`. + * @param string $context The plugin context. By default this can include 'all', 'active', 'inactive', + * 'recently_activated', 'upgrade', 'mustuse', 'dropins', and 'search'. */ $actions = apply_filters( "network_admin_plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context ); @@ -684,13 +730,13 @@ * @since 2.6.0 The `$context` parameter was added. * @since 4.9.0 The 'Edit' link was removed from the list of action links. * - * @param array $actions An array of plugin action links. By default this can include 'activate', - * 'deactivate', and 'delete'. With Multisite active this can also include - * 'network_active' and 'network_only' items. - * @param string $plugin_file Path to the plugin file relative to the plugins directory. - * @param array $plugin_data An array of plugin data. See `get_plugin_data()`. - * @param string $context The plugin context. By default this can include 'all', 'active', 'inactive', - * 'recently_activated', 'upgrade', 'mustuse', 'dropins', and 'search'. + * @param string[] $actions An array of plugin action links. By default this can include 'activate', + * 'deactivate', and 'delete'. With Multisite active this can also include + * 'network_active' and 'network_only' items. + * @param string $plugin_file Path to the plugin file relative to the plugins directory. + * @param array $plugin_data An array of plugin data. See `get_plugin_data()`. + * @param string $context The plugin context. By default this can include 'all', 'active', 'inactive', + * 'recently_activated', 'upgrade', 'mustuse', 'dropins', and 'search'. */ $actions = apply_filters( 'plugin_action_links', $actions, $plugin_file, $plugin_data, $context ); @@ -703,24 +749,27 @@ * @since 2.7.0 * @since 4.9.0 The 'Edit' link was removed from the list of action links. * - * @param array $actions An array of plugin action links. By default this can include 'activate', - * 'deactivate', and 'delete'. With Multisite active this can also include - * 'network_active' and 'network_only' items. - * @param string $plugin_file Path to the plugin file relative to the plugins directory. - * @param array $plugin_data An array of plugin data. See `get_plugin_data()`. - * @param string $context The plugin context. By default this can include 'all', 'active', 'inactive', - * 'recently_activated', 'upgrade', 'mustuse', 'dropins', and 'search'. + * @param string[] $actions An array of plugin action links. By default this can include 'activate', + * 'deactivate', and 'delete'. With Multisite active this can also include + * 'network_active' and 'network_only' items. + * @param string $plugin_file Path to the plugin file relative to the plugins directory. + * @param array $plugin_data An array of plugin data. See `get_plugin_data()`. + * @param string $context The plugin context. By default this can include 'all', 'active', 'inactive', + * 'recently_activated', 'upgrade', 'mustuse', 'dropins', and 'search'. */ $actions = apply_filters( "plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context ); } - $class = $is_active ? 'active' : 'inactive'; - $checkbox_id = "checkbox_" . md5($plugin_data['Name']); - if ( $restrict_network_active || $restrict_network_only || in_array( $status, array( 'mustuse', 'dropins' ) ) ) { + $requires_php = isset( $plugin_data['requires_php'] ) ? $plugin_data['requires_php'] : null; + $compatible_php = is_php_version_compatible( $requires_php ); + $class = $is_active ? 'active' : 'inactive'; + $checkbox_id = 'checkbox_' . md5( $plugin_data['Name'] ); + if ( $restrict_network_active || $restrict_network_only || in_array( $status, array( 'mustuse', 'dropins' ) ) || ! $compatible_php ) { $checkbox = ''; } else { - $checkbox = "" + /* translators: %s: plugin name */ + $checkbox = "' . ""; } if ( 'dropins' != $context ) { @@ -728,11 +777,19 @@ $plugin_name = $plugin_data['Name']; } - if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) ) + if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) ) { $class .= ' update'; + } + + $paused = ! $screen->in_admin( 'network' ) && is_plugin_paused( $plugin_file ); + + if ( $paused ) { + $class .= ' paused'; + } $plugin_slug = isset( $plugin_data['slug'] ) ? $plugin_data['slug'] : sanitize_title( $plugin_name ); - printf( '%s
', $notice_text ); + + $error = wp_get_plugin_error( $plugin_file ); + + if ( false !== $error ) { + printf( '%s