WordPress 4.0-scripts

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

diff --git a/wp-admin/import.php b/wp-admin/import.php
index a9de2654b96eff86eacacf05952eb8dd0ebf15b0..e6f05e0eb332997d243575f3d536c10357c2af64 100644 (file)
--- a/wp-admin/import.php
+++ b/wp-admin/import.php
@@ -9,7 +9,7 @@
 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.'));
@@ -26,36 +26,32 @@ get_current_screen()->add_help_tab( array(
 get_current_screen()->set_help_sidebar(
        '<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://wordpress.org/support/" target="_blank">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' ),
-               'tumblr' => array( __('Tumblr'), __('Install the Tumblr importer to import posts &amp; media from Tumblr using their API.'), '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' ) )
+       $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' );
 
-require_once ('admin-header.php');
+require_once( ABSPATH . 'wp-admin/admin-header.php' );
 $parent_file = 'tools.php';
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 <?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>
@@ -68,28 +64,26 @@ $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;
-       if ( isset( $pop_data[3] ) && isset( $importers[ $pop_data[3] ] ) )
+       if ( isset( $importers[ $pop_data['importer-id'] ] ) )
                continue;
-
-       $importers[$pop_importer] = $popular_importers[$pop_importer];
+       $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 {
-       uasort($importers, create_function('$a, $b', 'return strcmp($a[0], $b[0]);'));
+       uasort( $importers, '_usort_by_first_member' );
 ?>
-<table class="widefat importers" cellspacing="0">
+<table class="widefat importers">
 
 <?php
-       $style = '';
-       foreach ($importers as $id => $data) {
-               $style = ('class="alternate"' == $style || 'class="alternate active"' == $style) ? '' : 'alternate';
+       $alt = '';
+       foreach ($importers as $importer_id => $data) {
                $action = '';
-               if ( 'install' == $data[2] ) {
-                       $plugin_slug = $id . '-importer';
+               if ( isset( $data['install'] ) ) {
+                       $plugin_slug = $data['install'];
                        if ( file_exists( WP_PLUGIN_DIR . '/' . $plugin_slug ) ) {
                                // Looks like Importer is installed, But not active
                                $plugins = get_plugins( '/' . $plugin_slug );
@@ -111,13 +105,12 @@ if ( empty($importers) ) {
                                }
                        }
                } else {
-                       $action = "<a href='" . esc_url("admin.php?import=$id") . "' title='" . esc_attr( wptexturize(strip_tags($data[1])) ) ."'>{$data[0]}</a>";
+                       $action = "<a href='" . esc_url( "admin.php?import=$importer_id" ) . "' title='" . esc_attr( wptexturize( strip_tags( $data[1] ) ) ) ."'>{$data[0]}</a>";
                }
 
-               if ($style != '')
-                       $style = 'class="'.$style.'"';
+               $alt = $alt ? '' : ' class="alternate"';
                echo "
-                       <tr $style>
+                       <tr$alt>
                                <td class='import-system row-title'>$action</td>
                                <td class='desc'>{$data[1]}</td>
                        </tr>";
@@ -136,4 +129,4 @@ if ( current_user_can('install_plugins') )
 
 <?php
 
-include ('admin-footer.php');
+include( ABSPATH . 'wp-admin/admin-footer.php' );