Ticket #35191: 35191.3.diff

src/wp-admin/css/common.css

@@ -2276 +2276 @@
 
 .importers td {
         padding-right: 14px;
+        line-height: 1.5em;
 }
 
 .importers {
@@ -2283 +2284 @@
         width: auto;
 }
 
+.importer-title,
+.importer-desc,
+.importer-status,
+.importer-action {
+        display: block;
+}
+
+.importer-action {
+        margin-bottom: 1em;
+        color: #ddd;
+}
+
 #post-body #post-body-content #namediv h3, /* Back-compat for pre-4.4 */
 #post-body #post-body-content #namediv h2 {
         margin-top: 0;

src/wp-admin/import.php

@@ -30 +30 @@
         '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
-if ( current_user_can( 'install_plugins' ) )
+if ( current_user_can( 'install_plugins' ) ) {
+        // List of popular importer plugins from the WordPress.org API.
         $popular_importers = wp_get_popular_importers();
-else
-        $popular_importers = array();
+} else {
+        $popular_importers = array();
+}
 
 // Detect and redirect invalid importers like 'movabletype', which is registered as 'mt'
 if ( ! empty( $_GET['invalid'] ) && isset( $popular_importers[ $_GET['invalid'] ] ) ) {
@@ -66 +68 @@
 <p><?php _e('If you have posts or comments in another system, WordPress can import those into this site. To get started, choose a system to import from below:'); ?></p>
 
 <?php
-
+// Registered (already installed) importers. They're stored in the global $wp_importers.
 $importers = get_importers();
 
 // If a popular importer is not registered, create a dummy registration that links to the plugin installer.
@@ -75 +77 @@
                 continue;
         if ( isset( $importers[ $pop_data['importer-id'] ] ) )
                 continue;
+
+        // Merge the importers from the WordPress.org API in the array of registered (already installed) importers.
         $importers[ $pop_data['importer-id'] ] = array( $pop_data['name'], $pop_data['description'], 'install' => $pop_data['plugin-slug'] );
 }
 
@@ -87 +91 @@
 
 <?php
         foreach ($importers as $importer_id => $data) {
-                $action = '';
+                $action = $status = $status_class = '';
+
                 if ( isset( $data['install'] ) ) {
                         $plugin_slug = $data['install'];
+
                         if ( file_exists( WP_PLUGIN_DIR . '/' . $plugin_slug ) ) {
-                                // Looks like Importer is installed, But not active
+                                // Looks like an importer is installed, but not active.
                                 $plugins = get_plugins( '/' . $plugin_slug );
                                 if ( !empty($plugins) ) {
                                         $keys = array_keys($plugins);
                                         $plugin_file = $plugin_slug . '/' . $keys[0];
-                                        $action = '<a href="' . esc_url(wp_nonce_url(admin_url('plugins.php?action=activate&plugin=' . $plugin_file . '&from=import'), 'activate-plugin_' . $plugin_file)) .
-                                                                                        '"title="' . esc_attr__('Activate importer') . '"">' . $data[0] . '</a>';
+                                        $status = _x( 'Installed and not activated', 'importer plugin' );
+                                        $status_class = ' importer-inactive';
+                                        $url = esc_url( wp_nonce_url( add_query_arg( array(
+                                                'action' => 'activate',
+                                                'plugin' => $plugin_file,
+                                                'from'   => 'import',
+                                        ), admin_url( 'plugins.php' ) ), 'activate-plugin_' . $plugin_file ) );
+                                        $action = sprintf( '<a href="%1$s">%2$s</a>', $url, __( 'Activate and run' ) );
                                 }
                         }
+
                         if ( empty($action) ) {
                                 if ( is_main_site() ) {
-                                        $action = '<a href="' . esc_url( network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_slug .
-                                                                                '&from=import&TB_iframe=true&width=600&height=550' ) ) . '" class="thickbox open-plugin-details-modal" title="' .
-                                                                                esc_attr__('Install importer') . '">' . $data[0] . '</a>';
+                                        $url = esc_url( wp_nonce_url( add_query_arg( array(
+                                                'action' => 'install-plugin',
+                                                'plugin' => $plugin_slug,
+                                                'from'   => 'import',
+                                        ), self_admin_url( 'update.php' ) ), 'install-plugin_' . $plugin_slug ) );
+                                        $action = sprintf( '<a href="%1$s">%2$s</a>', $url, __( 'Install' ) );
                                 } else {
-                                        $action = $data[0];
-                                        $data[1] = sprintf( __( 'This importer is not installed. Please install importers from <a href="%s">the main site</a>.' ), get_admin_url( $current_site->blog_id, 'import.php' ) );
+                                        $action = sprintf( __( 'This importer is not installed. Please install importers from <a href="%s">the main site</a>.' ),
+                                                get_admin_url( get_current_network_id(), 'import.php' )
+                                        );
                                 }
+
+                                $status = _x( 'Not installed', 'importer plugin' );
                         }
                 } else {
-                        $action = "<a href='" . esc_url( "admin.php?import=$importer_id" ) . "' title='" . esc_attr( wptexturize( strip_tags( $data[1] ) ) ) ."'>{$data[0]}</a>";
+                        $status = _x( 'Installed and activated', 'importer plugin' );
+                        $status_class = ' importer-active';
+                        $url = esc_url( add_query_arg( array(
+                                'import' => $importer_id,
+                        ), self_admin_url( 'admin.php' ) ) );
+                        $action = sprintf( '<a href="%1$s">%2$s</a>', $url, __( 'Activate and run' ) );
+                }
+
+                if ( isset( $plugin_slug ) ) {
+                        $url = esc_url( add_query_arg( array(
+                                'tab'       => 'plugin-information',
+                                'plugin'    => $plugin_slug,
+                                'from'      => 'impport',
+                                'TB_iframe' => 'true',
+                                'width'     => 600,
+                                'height'    => 550,
+                        ), network_admin_url( 'plugin-install.php' ) ) );
+                        $action .= sprintf( ' | <a href="%1$s" class="thickbox open-plugin-details-modal">%2$s</a>', $url, __( 'Details' ) );
                 }
 
                 echo "
-                        <tr>
-                                <td class='import-system row-title'>$action</td>
-                                <td class='desc'>{$data[1]}</td>
+                        <tr class='importer-item{$status_class}'>
+                                <td class='import-system'>
+                                        <span class='importer-title row-title'>{$data[0]}</span>
+                                        <span class='importer-action'>{$action}</span>
+                                </td>
+                                <td class='desc'>
+                                        <span class='importer-status'>{$status}</span>
+                                        <span class='importer-desc'>{$data[1]}</span>
+                                </td>
                         </tr>";
         }
 ?>

src/wp-admin/includes/import.php

@@ -157 +157 @@
                 // slug => name, description, plugin slug, and register_importer() slug
                 'blogger' => array(
                         'name' => __( 'Blogger' ),
-                        'description' => __( 'Install the Blogger importer to import posts, comments, and users from a Blogger blog.' ),
+                        'description' => __( 'Import posts, comments, and users from a Blogger blog.' ),
                         'plugin-slug' => 'blogger-importer',
                         'importer-id' => 'blogger',
                 ),
                 'wpcat2tag' => array(
                         'name' => __( 'Categories and Tags Converter' ),
-                        'description' => __( 'Install the category/tag converter to convert existing categories to tags or tags to categories, selectively.' ),
+                        'description' => __( 'Convert existing categories to tags or tags to categories, selectively.' ),
                         'plugin-slug' => 'wpcat2tag-importer',
                         'importer-id' => 'wp-cat2tag',
                 ),
                 'livejournal' => array(
                         'name' => __( 'LiveJournal' ),
-                        'description' => __( 'Install the LiveJournal importer to import posts from LiveJournal using their API.' ),
+                        'description' => __( 'Import posts from LiveJournal using their API.' ),
                         'plugin-slug' => 'livejournal-importer',
                         'importer-id' => 'livejournal',
                 ),
                 'movabletype' => array(
                         'name' => __( 'Movable Type and TypePad' ),
-                        'description' => __( 'Install the Movable Type importer to import posts and comments from a Movable Type or TypePad blog.' ),
+                        'description' => __( 'Import posts and comments from a Movable Type or TypePad blog.' ),
                         'plugin-slug' => 'movabletype-importer',
                         'importer-id' => 'mt',
                 ),
                 'opml' => array(
                         'name' => __( 'Blogroll' ),
-                        'description' => __( 'Install the blogroll importer to import links in OPML format.' ),
+                        'description' => __( 'Import links in OPML format.' ),
                         'plugin-slug' => 'opml-importer',
                         'importer-id' => 'opml',
                 ),
                 'rss' => array(
                         'name' => __( 'RSS' ),
-                        'description' => __( 'Install the RSS importer to import posts from an RSS feed.' ),
+                        'description' => __( 'Import posts from an RSS feed.' ),
                         'plugin-slug' => 'rss-importer',
                         'importer-id' => 'rss',
                 ),
                 'tumblr' => array(
                         'name' => __( 'Tumblr' ),
-                        'description' => __( 'Install the Tumblr importer to import posts & media from Tumblr using their API.' ),
+                        'description' => __( 'Import posts & media from Tumblr using their API.' ),
                         'plugin-slug' => 'tumblr-importer',
                         'importer-id' => 'tumblr',
                 ),
                 'wordpress' => array(
                         'name' => 'WordPress',
-                        'description' => __( 'Install the WordPress importer to import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.' ),
+                        'description' => __( 'Import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.' ),
                         'plugin-slug' => 'wordpress-importer',
                         'importer-id' => 'wordpress',
                 ),

src/wp-includes/pluggable.php

@@ -1049 +1049 @@
         if ( -1 == $action )
                 _doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2.0' );
 
-        $adminurl = strtolower(admin_url());
-        $referer = strtolower(wp_get_referer());
         $result = isset($_REQUEST[$query_arg]) ? wp_verify_nonce($_REQUEST[$query_arg], $action) : false;
 
         /**