WordPress 4.7.1-scripts

[autoinstalls/wordpress.git] / wp-admin / import.php

diff --git a/wp-admin/import.php b/wp-admin/import.php
index 0200e56136ead0b247724e859fb34ac692db9662..1aa682ae9bc2ee0df755aeb81879c34fce2db1f4 100644 (file)
--- a/wp-admin/import.php
+++ b/wp-admin/import.php
@@ -9,139 +9,198 @@
 define('WP_LOAD_IMPORTERS', true);
 
 /** Load WordPress Bootstrap */
 define('WP_LOAD_IMPORTERS', true);
 
 /** Load WordPress Bootstrap */

-require_once ('admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );

 
 

-if ( !current_user_can('import') )
-       wp_die(__('You do not have sufficient permissions to import content in this site.'));
+if ( ! current_user_can( 'import' ) ) {
+       wp_die( __( 'Sorry, you are not allowed to import content.' ) );
+}

 
 $title = __('Import');
 
 
 $title = __('Import');
 

-add_contextual_help($current_screen,
-       '<p>' . __('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.') . '</p>' .
-       '<p>' . __('In previous versions of WordPress, all the importers were built-in, but they have been turned into plugins as of version 3.0 since most people only use them once or infrequently.') . '</p>' .
+get_current_screen()->add_help_tab( array(
+       'id'      => 'overview',
+       'title'   => __('Overview'),
+       'content' => '<p>' . __('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.') . '</p>' .
+               '<p>' . __('In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently.') . '</p>',
+) );
+
+get_current_screen()->set_help_sidebar(

        '<p><strong>' . __('For more information:') . '</strong></p>' .
        '<p><strong>' . __('For more information:') . '</strong></p>' .

-       '<p>' . __('<a href="http://codex.wordpress.org/Tools_Import_Screen" target="_blank">Documentation on Import</a>') . '</p>' .
-       '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+       '<p>' . __('<a href="https://codex.wordpress.org/Tools_Import_Screen">Documentation on Import</a>') . '</p>' .
+       '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'

 );
 
 );
 

-$popular_importers = array();
-if ( current_user_can('install_plugins') )
-       $popular_importers = array(
-               'blogger' => array( __('Blogger'), __('Install the Blogger importer to import posts, comments, and users from a Blogger blog.'), 'install' ),
-               'wpcat2tag' => array(__('Categories and Tags Converter'), __('Install the category/tag converter to convert existing categories to tags or tags to categories, selectively.'), 'install', 'wp-cat2tag' ),
-               'livejournal' => array( __( 'LiveJournal' ), __( 'Install the LiveJournal importer to import posts from LiveJournal using their API.' ), 'install' ),
-               'movabletype' => array( __('Movable Type and TypePad'), __('Install the Movable Type importer to import posts and comments from a Movable Type or TypePad blog.'), 'install', 'mt' ),
-               'opml' => array( __('Blogroll'), __('Install the blogroll importer to import links in OPML format.'), 'install' ),
-               'rss' => array( __('RSS'), __('Install the RSS importer to import posts from an RSS feed.'), 'install' ),
-               'wordpress' => array( 'WordPress', __('Install the WordPress importer to import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.'), 'install' )
-       );
-
-if ( ! empty( $_GET['invalid'] ) && !empty($popular_importers[$_GET['invalid']][3]) ) {
-       wp_redirect( admin_url('import.php?import=' . $popular_importers[$_GET['invalid']][3]) );
-       exit;
+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();
+}
+
+// Detect and redirect invalid importers like 'movabletype', which is registered as 'mt'
+if ( ! empty( $_GET['invalid'] ) && isset( $popular_importers[ $_GET['invalid'] ] ) ) {
+       $importer_id = $popular_importers[ $_GET['invalid'] ]['importer-id'];
+       if ( $importer_id != $_GET['invalid'] ) { // Prevent redirect loops.
+               wp_redirect( admin_url( 'admin.php?import=' . $importer_id ) );
+               exit;
+       }
+       unset( $importer_id );

 }
 
 add_thickbox();
 wp_enqueue_script( 'plugin-install' );
 }
 
 add_thickbox();
 wp_enqueue_script( 'plugin-install' );

-wp_admin_css( 'plugin-install' );
+wp_enqueue_script( 'updates' );

 
 

-require_once ('admin-header.php');
+require_once( ABSPATH . 'wp-admin/admin-header.php' );

 $parent_file = 'tools.php';
 ?>
 
 <div class="wrap">
 $parent_file = 'tools.php';
 ?>
 
 <div class="wrap">

-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>

 <?php if ( ! empty( $_GET['invalid'] ) ) : ?>
 <?php if ( ! empty( $_GET['invalid'] ) ) : ?>

-       <div class="error"><p><strong><?php _e('ERROR:')?></strong> <?php printf( __('The <strong>%s</strong> importer is invalid or is not installed.'), esc_html( $_GET['invalid'] ) ); ?></p></div>
+       <div class="error">
+               <p><strong><?php _e( 'ERROR:' ); ?></strong> <?php
+                       /* translators: %s: importer slug */
+                       printf( __( 'The %s importer is invalid or is not installed.' ), '<strong>' . esc_html( $_GET['invalid'] ) . '</strong>' );
+               ?></p>
+       </div>

 <?php endif; ?>
 <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
 <?php endif; ?>
 <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

-
-// Load all importers so that they can register.
-$import_loc = 'wp-admin/import';
-$import_root = ABSPATH . $import_loc;
-
-if ( file_exists( $import_root ) ) {
-       $imports_dir = opendir($import_root);
-       if ($imports_dir) {
-               while (($file = readdir($imports_dir)) !== false) {
-                       if ($file[0] == '.') {
-                               continue;
-                       } elseif (substr($file, -4) == '.php') {
-                               require_once($import_root . '/' . $file);
-                       }
-               }
-       }
-       closedir( $imports_dir );
-}
-
+// 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.
 foreach ( $popular_importers as $pop_importer => $pop_data ) {
 $importers = get_importers();
 
 // If a popular importer is not registered, create a dummy registration that links to the plugin installer.
 foreach ( $popular_importers as $pop_importer => $pop_data ) {

-       if ( isset($importers[$pop_importer] ) )
+       if ( isset( $importers[ $pop_importer ] ) )

                continue;
                continue;

-       if ( isset( $pop_data[3] ) && isset( $importers[ $pop_data[3] ] ) )
+       if ( isset( $importers[ $pop_data['importer-id'] ] ) )

                continue;
 
                continue;
 

-       $importers[$pop_importer] = $popular_importers[$pop_importer];
+       // Fill the array of registered (already installed) importers with data of the popular importers from the WordPress.org API.
+       $importers[ $pop_data['importer-id'] ] = array( $pop_data['name'], $pop_data['description'], 'install' => $pop_data['plugin-slug'] );

 }
 
 }
 

-if (empty ($importers)) {
-       echo '<p>'.__('No importers are available.').'</p>'; // TODO: make more helpful
+if ( empty( $importers ) ) {
+       echo '<p>' . __('No importers are available.') . '</p>'; // TODO: make more helpful

 } else {
 } else {

-       uasort($importers, create_function('$a, $b', 'return strcmp($a[0], $b[0]);'));
+       uasort( $importers, '_usort_by_first_member' );

 ?>
 ?>

-<table class="widefat" cellspacing="0">
+<table class="widefat importers striped">
+
+       <?php
+       foreach ( $importers as $importer_id => $data ) {
+               $plugin_slug = $action = '';
+               $is_plugin_installed = false;
+
+               if ( isset( $data['install'] ) ) {
+                       $plugin_slug = $data['install'];

 
 

-<?php
-       $style = '';
-       foreach ($importers as $id => $data) {
-               $style = ('class="alternate"' == $style || 'class="alternate active"' == $style) ? '' : 'alternate';
-               $action = '';
-               if ( 'install' == $data[2] ) {
-                       $plugin_slug = $id . '-importer';

                        if ( file_exists( WP_PLUGIN_DIR . '/' . $plugin_slug ) ) {
                        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 );
                                $plugins = get_plugins( '/' . $plugin_slug );

-                               if ( !empty($plugins) ) {
-                                       $keys = array_keys($plugins);
+                               if ( ! empty( $plugins ) ) {
+                                       $keys = array_keys( $plugins );

                                        $plugin_file = $plugin_slug . '/' . $keys[0];
                                        $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>';
+                                       $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="%s" aria-label="%s">%s</a>',
+                                               esc_url( $url ),
+                                               /* translators: %s: Importer name */
+                                               esc_attr( sprintf( __( 'Run %s' ), $data[0] ) ),
+                                               __( 'Run Importer' )
+                                       );
+
+                                       $is_plugin_installed = true;
+                               }
+                       }
+
+                       if ( empty( $action ) ) {
+                               if ( is_main_site() ) {
+                                       $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" class="install-now" data-slug="%2$s" data-name="%3$s" aria-label="%4$s">%5$s</a>',
+                                               esc_url( $url ),
+                                               esc_attr( $plugin_slug ),
+                                               esc_attr( $data[0] ),
+                                               /* translators: %s: Importer name */
+                                               esc_attr( sprintf( __( 'Install %s' ), $data[0] ) ),
+                                               __( 'Install Now' )
+                                       );
+                               } else {
+                                       $action = sprintf(
+                                               /* translators: URL to wp-admin/import.php */
+                                               __( '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' )
+                                       );

                                }
                        }
                                }
                        }

-                       if ( empty($action) )
-                               $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" title="' .
-                                                                               esc_attr__('Install importer') . '">' . $data[0] . '</a>';

                } else {
                } else {

-                       $action = "<a href='" . esc_url("admin.php?import=$id") . "' title='" . esc_attr( wptexturize(strip_tags($data[1])) ) ."'>{$data[0]}</a>";
+                       $url = add_query_arg( array(
+                               'import' => $importer_id,
+                       ), self_admin_url( 'admin.php' ) );
+                       $action = sprintf(
+                               '<a href="%1$s" aria-label="%2$s">%3$s</a>',
+                               esc_url( $url ),
+                               /* translators: %s: Importer name */
+                               esc_attr( sprintf( __( 'Run %s' ), $data[0] ) ),
+                               __( 'Run Importer' )
+                       );
+
+                       $is_plugin_installed = true;
+               }
+
+               if ( ! $is_plugin_installed && is_main_site() ) {
+                       $url = add_query_arg( array(
+                               'tab'       => 'plugin-information',
+                               'plugin'    => $plugin_slug,
+                               'from'      => 'import',
+                               '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" aria-label="%2$s">%3$s</a>',
+                               esc_url( $url ),
+                               /* translators: %s: Importer name */
+                               esc_attr( sprintf( __( 'More information about %s' ), $data[0] ) ),
+                               __( 'Details' )
+                       );

                }
 
                }
 

-               if ($style != '')
-                       $style = 'class="'.$style.'"';

                echo "
                echo "

-                       <tr $style>
-                               <td class='import-system row-title'>$action</td>
-                               <td class='desc'>{$data[1]}</td>
+                       <tr class='importer-item'>
+                               <td class='import-system'>
+                                       <span class='importer-title'>{$data[0]}</span>
+                                       <span class='importer-action'>{$action}</span>
+                               </td>
+                               <td class='desc'>
+                                       <span class='importer-desc'>{$data[1]}</span>
+                               </td>

                        </tr>";
        }
                        </tr>";
        }

-?>
-
+       ?>

 </table>
 <?php
 }
 
 if ( current_user_can('install_plugins') )
 </table>
 <?php
 }
 
 if ( current_user_can('install_plugins') )

-       echo '<p>' . sprintf( __('If the importer you need is not listed, <a href="%s">search the plugins directory</a> to see if an importer is available.'), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '</p>';
+       echo '<p>' . sprintf( __('If the importer you need is not listed, <a href="%s">search the plugin directory</a> to see if an importer is available.'), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '</p>';

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

+wp_print_request_filesystem_credentials_modal();
+wp_print_admin_notice_templates();

 
 

-include ('admin-footer.php');
-?>
+include( ABSPATH . 'wp-admin/admin-footer.php' );