Wordpress 4.6

[autoinstalls/wordpress.git] / wp-admin / includes / class-wp-plugin-install-list-table.php

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 e1a730610ba11fe7b484c07c4cec1a2e66c2874b..6e389b1a2e7ba0adbecba004bb03c4e6c876dd9e 100644 (file)
--- a/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -1,11 +1,19 @@
 <?php
 /**
 <?php
 /**

- * Plugin Installer List Table class.
+ * List Table API: WP_Plugin_Install_List_Table class

  *
  * @package WordPress
  *
  * @package WordPress

- * @subpackage List_Table
+ * @subpackage Administration
+ * @since 3.1.0
+ */
+
+/**
+ * Core class used to implement displaying plugins to install in a list table.
+ *

  * @since 3.1.0
  * @access private
  * @since 3.1.0
  * @access private

+ *
+ * @see WP_List_Table

  */
 class WP_Plugin_Install_List_Table extends WP_List_Table {
 
  */
 class WP_Plugin_Install_List_Table extends WP_List_Table {
 


@@ -15,6 +23,10 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 
        private $error;
 
 
        private $error;
 

+       /**
+        *
+        * @return bool
+        */

        public function ajax_user_can() {
                return current_user_can('install_plugins');
        }
        public function ajax_user_can() {
                return current_user_can('install_plugins');
        }


@@ -28,6 +40,8 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
         *
         * @since 4.0.0
         * @access protected
         *
         * @since 4.0.0
         * @access protected

+        *
+        * @return array

         */
        protected function get_installed_plugin_slugs() {
                $slugs = array();
         */
        protected function get_installed_plugin_slugs() {
                $slugs = array();


@@ -48,6 +62,15 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                return $slugs;
        }
 
                return $slugs;
        }
 

+       /**
+        *
+        * @global array  $tabs
+        * @global string $tab
+        * @global int    $paged
+        * @global string $type
+        * @global string $term
+        * @global string $wp_version
+        */

        public function prepare_items() {
                include( ABSPATH . 'wp-admin/includes/plugin-install.php' );
 
        public function prepare_items() {
                include( ABSPATH . 'wp-admin/includes/plugin-install.php' );
 


@@ -62,15 +85,16 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                // These are the tabs which are shown on the page
                $tabs = array();
 
                // These are the tabs which are shown on the page
                $tabs = array();
 

-               if ( 'search' == $tab )
-                       $tabs['search'] = __( 'Search Results' );
-               $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 ( 'search' === $tab ) {
+                       $tabs['search'] = __( 'Search Results' );
+               }

                if ( $tab === 'beta' || false !== strpos( $GLOBALS['wp_version'], '-' ) ) {
                if ( $tab === 'beta' || false !== strpos( $GLOBALS['wp_version'], '-' ) ) {

-                       $tabs['beta']      = _x( 'Beta Testing', 'Plugin Installer' );
+                       $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().
                if ( current_user_can( 'upload_plugins' ) ) {
                        // No longer a real tab. Here for filter compatibility.
                        // Gets skipped in get_views().


@@ -80,7 +104,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                $nonmenu_tabs = array( 'plugin-information' ); // Valid actions to perform which do not have a Menu item.
 
                /**
                $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
                 *
                 *
                 * @since 2.7.0
                 *


@@ -90,7 +114,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                $tabs = apply_filters( 'install_plugins_tabs', $tabs );
 
                /**
                $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
                 *
                 *
                 * @since 2.7.0
                 *


@@ -146,8 +170,13 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                                break;
 
                        case 'favorites':
                                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
                                if ( $user )
                                        $args['user'] = $user;
                                else


@@ -162,7 +191,7 @@ 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 include 'featured', 'popular', 'recommended', 'favorites', and 'upload'.
                 *
                 * The dynamic portion of the hook name, `$tab`, refers to the plugin install tabs.
                 * Default tabs include 'featured', 'popular', 'recommended', 'favorites', and 'upload'.


@@ -199,6 +228,9 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                }
        }
 
                }
        }
 

+       /**
+        * @access public
+        */

        public function no_items() {
                if ( isset( $this->error ) ) {
                        $message = $this->error->get_error_message() . '<p class="hide-if-no-js"><a href="#" class="button" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a></p>';
        public function no_items() {
                if ( isset( $this->error ) ) {
                        $message = $this->error->get_error_message() . '<p class="hide-if-no-js"><a href="#" class="button" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a></p>';


@@ -208,12 +240,19 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                echo '<div class="no-plugin-results">' . $message . '</div>';
        }
 
                echo '<div class="no-plugin-results">' . $message . '</div>';
        }
 

+       /**
+        *
+        * @global array $tabs
+        * @global string $tab
+        *
+        * @return array
+        */

        protected function get_views() {
                global $tabs, $tab;
 
                $display_tabs = array();
                foreach ( (array) $tabs as $action => $text ) {
        protected function get_views() {
                global $tabs, $tab;
 
                $display_tabs = array();
                foreach ( (array) $tabs as $action => $text ) {

-                       $class = ( $action == $tab ) ? ' current' : '';
+                       $class = ( $action === $tab ) ? ' current' : '';

                        $href = self_admin_url('plugin-install.php?tab=' . $action);
                        $display_tabs['plugin-install-'.$action] = "<a href='$href' class='$class'>$text</a>";
                }
                        $href = self_admin_url('plugin-install.php?tab=' . $action);
                        $display_tabs['plugin-install-'.$action] = "<a href='$href' class='$class'>$text</a>";
                }


@@ -232,6 +271,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                /** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
                $views = apply_filters( "views_{$this->screen->id}", $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' );

 ?>
 <div class="wp-filter">
        <ul class="filter-links">
 ?>
 <div class="wp-filter">
        <ul class="filter-links">


@@ -245,7 +285,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                ?>
        </ul>
 
                ?>
        </ul>
 

-       <?php install_search_form( isset( $views['plugin-install-search'] ) ); ?>
+       <?php install_search_form(); ?>

 </div>
 <?php
        }
 </div>
 <?php
        }


@@ -266,7 +306,9 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 
 ?>
 <div class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
 
 ?>
 <div class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">

-
+<?php
+       $this->screen->render_screen_reader_content( 'heading_list' );
+?>

        <div id="the-list"<?php echo $data_attr; ?>>
                <?php $this->display_rows_or_placeholder(); ?>
        </div>
        <div id="the-list"<?php echo $data_attr; ?>>
                <?php $this->display_rows_or_placeholder(); ?>
        </div>


@@ -276,6 +318,8 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
        }
 
        /**
        }
 
        /**

+        * @global string $tab
+        *

         * @param string $which
         */
        protected function display_tablenav( $which ) {
         * @param string $which
         */
        protected function display_tablenav( $which ) {


@@ -283,7 +327,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                        return;
                }
 
                        return;
                }
 

-               if ( 'top' ==  $which ) {
+               if ( 'top' === $which ) {

                        wp_referer_field();
                ?>
                        <div class="tablenav top">
                        wp_referer_field();
                ?>
                        <div class="tablenav top">


@@ -308,10 +352,16 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                }
        }
 
                }
        }
 

+       /**
+        * @return array
+        */

        protected function get_table_classes() {
                return array( 'widefat', $this->_args['plural'] );
        }
 
        protected function get_table_classes() {
                return array( 'widefat', $this->_args['plural'] );
        }
 

+       /**
+        * @return array
+        */

        public function get_columns() {
                return array();
        }
        public function get_columns() {
                return array();
        }


@@ -334,13 +384,16 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                        return 0;
                }
 
                        return 0;
                }
 

-               if ( 'DESC' == $this->order ) {
+               if ( 'DESC' === $this->order ) {

                        return ( $a < $b ) ? 1 : -1;
                } else {
                        return ( $a < $b ) ? -1 : 1;
                }
        }
 
                        return ( $a < $b ) ? 1 : -1;
                } else {
                        return ( $a < $b ) ? -1 : 1;
                }
        }
 

+       /**
+        * @global string $wp_version
+        */

        public function display_rows() {
                $plugins_allowedtags = array(
                        'a' => array( 'href' => array(),'title' => array(), 'target' => array() ),
        public function display_rows() {
                $plugins_allowedtags = array(
                        'a' => array( 'href' => array(),'title' => array(), 'target' => array() ),


@@ -408,18 +461,45 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                                                        /* translators: 1: Plugin name and version. */
                                                        $action_links[] = '<a class="install-now button" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Install %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Install Now' ) . '</a>';
                                                }
                                                        /* translators: 1: Plugin name and version. */
                                                        $action_links[] = '<a class="install-now button" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Install %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Install Now' ) . '</a>';
                                                }

-

                                                break;
                                                break;

+

                                        case 'update_available':
                                                if ( $status['url'] ) {
                                                        /* translators: 1: Plugin name and version */
                                        case 'update_available':
                                                if ( $status['url'] ) {
                                                        /* translators: 1: Plugin name and version */

-                                                       $action_links[] = '<a class="update-now button" data-plugin="' . esc_attr( $status['file'] ) . '" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Update %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Update Now' ) . '</a>';
+                                                       $action_links[] = '<a class="update-now button aria-button-if-js" data-plugin="' . esc_attr( $status['file'] ) . '" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Update %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Update Now' ) . '</a>';

                                                }
                                                }

-

                                                break;
                                                break;

+

                                        case 'latest_installed':
                                        case 'newer_installed':
                                        case 'latest_installed':
                                        case 'newer_installed':

-                                               $action_links[] = '<span class="button button-disabled" title="' . esc_attr__( 'This plugin is already installed and is up to date' ) . ' ">' . _x( 'Installed', 'plugin' ) . '</span>';
+                                               if ( is_plugin_active( $status['file'] ) ) {
+                                                       $action_links[] = '<button type="button" class="button button-disabled" disabled="disabled">' . _x( 'Active', 'plugin' ) . '</button>';
+                                               } 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(
+                                                               '<a href="%1$s" class="button activate-now button-secondary" aria-label="%2$s">%3$s</a>',
+                                                               esc_url( $activate_url ),
+                                                               esc_attr( sprintf( $button_label, $plugin['name'] ) ),
+                                                               $button_text
+                                                       );
+                                               } else {
+                                                       $action_links[] = '<button type="button" class="button button-disabled" disabled="disabled">' . _x( 'Installed', 'plugin' ) . '</button>';
+                                               }

                                                break;
                                }
                        }
                                                break;
                                }
                        }


@@ -428,7 +508,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                                                                '&amp;TB_iframe=true&amp;width=600&amp;height=550' );
 
                        /* translators: 1: Plugin name and version. */
                                                                '&amp;TB_iframe=true&amp;width=600&amp;height=550' );
 
                        /* translators: 1: Plugin name and version. */

-                       $action_links[] = '<a href="' . esc_url( $details_link ) . '" class="thickbox" aria-label="' . esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '" data-title="' . esc_attr( $name ) . '">' . __( 'More Details' ) . '</a>';
+                       $action_links[] = '<a href="' . esc_url( $details_link ) . '" class="thickbox open-plugin-details-modal" aria-label="' . esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '" data-title="' . esc_attr( $name ) . '">' . __( 'More Details' ) . '</a>';

 
                        if ( !empty( $plugin['icons']['svg'] ) ) {
                                $plugin_icon_url = $plugin['icons']['svg'];
 
                        if ( !empty( $plugin['icons']['svg'] ) ) {
                                $plugin_icon_url = $plugin['icons']['svg'];


@@ -441,7 +521,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                        }
 
                        /**
                        }
 
                        /**

-                        * Filter the install action links for a plugin.
+                        * Filters the install action links for a plugin.

                         *
                         * @since 2.7.0
                         *
                         *
                         * @since 2.7.0
                         *


@@ -450,14 +530,17 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                         */
                        $action_links = apply_filters( 'plugin_install_action_links', $action_links, $plugin );
 
                         */
                        $action_links = apply_filters( 'plugin_install_action_links', $action_links, $plugin );
 

-                       $date_format = __( 'M j, Y @ H:i' );

                        $last_updated_timestamp = strtotime( $plugin['last_updated'] );
                ?>
                <div class="plugin-card plugin-card-<?php echo sanitize_html_class( $plugin['slug'] ); ?>">
                        <div class="plugin-card-top">
                        $last_updated_timestamp = strtotime( $plugin['last_updated'] );
                ?>
                <div class="plugin-card plugin-card-<?php echo sanitize_html_class( $plugin['slug'] ); ?>">
                        <div class="plugin-card-top">

-                               <a href="<?php echo esc_url( $details_link ); ?>" class="thickbox plugin-icon"><img src="<?php echo esc_attr( $plugin_icon_url ) ?>" /></a>

                                <div class="name column-name">
                                <div class="name column-name">

-                                       <h4><a href="<?php echo esc_url( $details_link ); ?>" class="thickbox"><?php echo $title; ?></a></h4>
+                                       <h3>
+                                               <a href="<?php echo esc_url( $details_link ); ?>" class="thickbox open-plugin-details-modal">
+                                               <?php echo $title; ?>
+                                               <img src="<?php echo esc_attr( $plugin_icon_url ) ?>" class="plugin-icon" alt="">
+                                               </a>
+                                       </h3>

                                </div>
                                <div class="action-links">
                                        <?php
                                </div>
                                <div class="action-links">
                                        <?php


@@ -474,12 +557,10 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                        <div class="plugin-card-bottom">
                                <div class="vers column-rating">
                                        <?php wp_star_rating( array( 'rating' => $plugin['rating'], 'type' => 'percent', 'number' => $plugin['num_ratings'] ) ); ?>
                        <div class="plugin-card-bottom">
                                <div class="vers column-rating">
                                        <?php wp_star_rating( array( 'rating' => $plugin['rating'], 'type' => 'percent', 'number' => $plugin['num_ratings'] ) ); ?>

-                                       <span class="num-ratings">(<?php echo number_format_i18n( $plugin['num_ratings'] ); ?>)</span>
+                                       <span class="num-ratings" aria-hidden="true">(<?php echo number_format_i18n( $plugin['num_ratings'] ); ?>)</span>

                                </div>
                                <div class="column-updated">
                                </div>
                                <div class="column-updated">

-                                       <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>
+                                       <strong><?php _e( 'Last Updated:' ); ?></strong> <?php printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) ); ?>

                                </div>
                                <div class="column-downloaded">
                                        <?php
                                </div>
                                <div class="column-downloaded">
                                        <?php