<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2177] 2013/frederickding/importer/trunk: Big change: removing all previously-ported processes from the plugin class.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://gsoc.trac.wordpress.org/changeset/2177">2177</a></dd>
<dt>Author</dt> <dd>frederick.ding</dd>
<dt>Date</dt> <dd>2013-07-30 01:14:00 +0000 (Tue, 30 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Big change: removing all previously-ported processes from the plugin class.
- See <a href="http://gsoc.trac.wordpress.org/ticket/327">#327</a>, <a href="http://gsoc.trac.wordpress.org/ticket/340">#340</a>
- Some cleanup actions are also removed from the cron class while some setup
actions are added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#2013frederickdingimportertrunkclasswordpressimporterphp">2013/frederickding/importer/trunk/class-wordpress-importer.php</a></li>
<li><a href="#2013frederickdingimportertrunkwordpressimporterphp">2013/frederickding/importer/trunk/wordpress-importer.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013frederickdingimportertrunkclasswordpressimporterphp"></a>
<div class="modfile"><h4>Modified: 2013/frederickding/importer/trunk/class-wordpress-importer.php (2176 => 2177)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/frederickding/importer/trunk/class-wordpress-importer.php 2013-07-29 19:57:46 UTC (rev 2176)
+++ 2013/frederickding/importer/trunk/class-wordpress-importer.php 2013-07-30 01:14:00 UTC (rev 2177)
</span><span class="lines">@@ -242,6 +242,9 @@
</span><span class="cx"> $this->set_param( 'admin_user_id', $user );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ wp_defer_term_counting( true );
+ wp_defer_comment_counting( true );
+
</ins><span class="cx"> /**
</span><span class="cx"> *
</span><span class="cx"> * @todo persistent storage without taking up too much space, or more
</span><span class="lines">@@ -322,11 +325,8 @@
</span><span class="cx"> * be debugged.
</span><span class="cx"> */
</span><span class="cx"> public function do_cleanup() {
</span><del>- /*
- * @todo remove this, which has to do with attachments and UI rather
- * than actual importer logic
- */
- wp_import_cleanup( $this->id );
</del><ins>+ // cleanup related to the uploaded WXR file should be handled by the
+ // external controller, not this model
</ins><span class="cx">
</span><span class="cx"> wp_cache_flush();
</span><span class="cx"> foreach ( get_taxonomies() as $tax ) {
</span></span></pre></div>
<a id="2013frederickdingimportertrunkwordpressimporterphp"></a>
<div class="modfile"><h4>Modified: 2013/frederickding/importer/trunk/wordpress-importer.php (2176 => 2177)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/frederickding/importer/trunk/wordpress-importer.php 2013-07-29 19:57:46 UTC (rev 2176)
+++ 2013/frederickding/importer/trunk/wordpress-importer.php 2013-07-30 01:14:00 UTC (rev 2177)
</span><span class="lines">@@ -20,53 +20,34 @@
</span><span class="cx"> if ( ! defined( 'IMPORT_DEBUG' ) )
</span><span class="cx"> define( 'IMPORT_DEBUG', false );
</span><span class="cx">
</span><del>-// Load Importer API
</del><ins>+// Load importer API, cron class, and WXR parsers
</ins><span class="cx"> require_once ABSPATH . 'wp-admin/includes/import.php';
</span><ins>+require dirname(__FILE__) . '/class-wp-importer-cron.php';
+require dirname( __FILE__ ) . '/class-wxr-parser.php';
</ins><span class="cx">
</span><del>-if ( ! class_exists( 'WP_Importer' ) ) {
- $class_wp_importer = ABSPATH . 'wp-admin/includes/class-wp-importer.php';
- if ( file_exists( $class_wp_importer ) )
- require $class_wp_importer;
</del><ins>+// Load specifc cron importer implementation
+if ( ! class_exists( 'WordPress_Importer' ) ) {
+ require dirname(__FILE__) . '/class-wordpress-importer.php';
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-// include WXR file parsers
-require dirname( __FILE__ ) . '/class-wxr-parser.php';
-
</del><span class="cx"> /**
</span><del>- * WordPress Importer class for managing the import process of a WXR file
</del><ins>+ * WordPress Importer class for managing the import UI for a WXR file
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Importer
</span><span class="cx"> */
</span><span class="cx"> if ( class_exists( 'WP_Importer' ) ) {
</span><span class="cx"> class WP_Import extends WP_Importer {
</span><del>- var $max_wxr_version = 1.2; // max. supported WXR version
</del><span class="cx">
</span><span class="cx"> var $id; // WXR attachment ID
</span><span class="cx">
</span><del>- // information to import from WXR file
- var $version;
- var $authors = array();
- var $posts = array();
- var $terms = array();
- var $categories = array();
- var $tags = array();
- var $base_url = '';
</del><ins>+ /**
+ * Instance of the cron importer.
+ *
+ * @var WordPress_Importer
+ */
+ protected $importer;
</ins><span class="cx">
</span><del>- // mappings from old information to new
- var $processed_authors = array();
- var $author_mapping = array();
- var $processed_terms = array();
- var $processed_posts = array();
- var $post_orphans = array();
- var $processed_menu_items = array();
- var $menu_item_orphans = array();
- var $missing_menu_items = array();
-
- var $fetch_attachments = false;
- var $url_remap = array();
- var $featured_images = array();
-
</del><span class="cx"> function WP_Import() { /* nothing */ }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -89,7 +70,9 @@
</span><span class="cx"> break;
</span><span class="cx"> case 2:
</span><span class="cx"> check_admin_referer( 'import-wordpress' );
</span><del>- $this->fetch_attachments = ( ! empty( $_POST['fetch_attachments'] ) && $this->allow_fetch_attachments() );
</del><ins>+ $this->fetch_attachments = (! empty(
+ $_POST['fetch_attachments'] ) &&
+ $this->importer->is_allowed_attachment_fetch());
</ins><span class="cx"> $this->id = (int) $_POST['import_id'];
</span><span class="cx"> $file = get_attached_file( $this->id );
</span><span class="cx"> set_time_limit(0);
</span><span class="lines">@@ -141,7 +124,7 @@
</span><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $import_data = $this->parse( $file );
</del><ins>+ $import_data = $this->importer->do_parse( $file );
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error( $import_data ) ) {
</span><span class="cx"> echo '<p><strong>' . __( 'Sorry, there has been an error.', 'wordpress-importer' ) . '</strong><br />';
</span><span class="lines">@@ -150,17 +133,6 @@
</span><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $this->version = $import_data['version'];
- $this->get_authors_from_import( $import_data );
- $this->posts = $import_data['posts'];
- $this->terms = $import_data['terms'];
- $this->categories = $import_data['categories'];
- $this->tags = $import_data['tags'];
- $this->base_url = esc_url( $import_data['base_url'] );
-
- wp_defer_term_counting( true );
- wp_defer_comment_counting( true );
-
</del><span class="cx"> do_action( 'import_start' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -168,20 +140,12 @@
</span><span class="cx"> * Performs post-import cleanup of files and the cache
</span><span class="cx"> */
</span><span class="cx"> function import_end() {
</span><ins>+ // delete the WXR attachment
</ins><span class="cx"> wp_import_cleanup( $this->id );
</span><span class="cx">
</span><del>- wp_cache_flush();
- foreach ( get_taxonomies() as $tax ) {
- delete_option( "{$tax}_children" );
- _get_term_hierarchy( $tax );
- }
</del><ins>+ // run the cron importer's cleanup routine
+ $this->importer->do_cleanup();
</ins><span class="cx">
</span><del>- wp_defer_term_counting( false );
- wp_defer_comment_counting( false );
-
- echo '<p>' . __( 'All done.', 'wordpress-importer' ) . ' <a href="' . admin_url() . '">' . __( 'Have fun!', 'wordpress-importer' ) . '</a>' . '</p>';
- echo '<p>' . __( 'Remember to update the passwords and roles of imported users.', 'wordpress-importer' ) . '</p>';
-
</del><span class="cx"> do_action( 'import_end' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -262,7 +226,9 @@
</span><span class="cx"> function import_options() {
</span><span class="cx"> $j = 0;
</span><span class="cx"> ?>
</span><del>-<form action="<?php echo admin_url( 'admin.php?import=wordpress&step=2' ); ?>" method="post">
</del><ins>+<form
+ action="<?php echo admin_url( 'admin.php?import=wordpress&step=2' ); ?>"
+ method="post">
</ins><span class="cx"> <?php wp_nonce_field( 'import-wordpress' ); ?>
</span><span class="cx"> <input type="hidden" name="import_id" value="<?php echo $this->id; ?>" />
</span><span class="cx">
</span><span class="lines">@@ -282,12 +248,15 @@
</span><span class="cx"> <?php if ( $this->allow_fetch_attachments() ) : ?>
</span><span class="cx"> <h3><?php _e( 'Import Attachments', 'wordpress-importer' ); ?></h3>
</span><span class="cx"> <p>
</span><del>- <input type="checkbox" value="1" name="fetch_attachments" id="import-attachments" />
- <label for="import-attachments"><?php _e( 'Download and import file attachments', 'wordpress-importer' ); ?></label>
</del><ins>+ <input type="checkbox" value="1" name="fetch_attachments"
+ id="import-attachments" /> <label for="import-attachments"><?php _e( 'Download and import file attachments', 'wordpress-importer' ); ?></label>
</ins><span class="cx"> </p>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <p class="submit"><input type="submit" class="button" value="<?php esc_attr_e( 'Submit', 'wordpress-importer' ); ?>" /></p>
</del><ins>+ <p class="submit">
+ <input type="submit" class="button"
+ value="<?php esc_attr_e( 'Submit', 'wordpress-importer' ); ?>" />
+ </p>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -332,704 +301,6 @@
</span><span class="cx"> echo '</div>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /**
- * Map old author logins to local user IDs based on decisions made
- * in import options form. Can map to an existing user, create a new user
- * or falls back to the current user in case of error with either of the previous
- */
- function get_author_mapping() {
- if ( ! isset( $_POST['imported_authors'] ) )
- return;
-
- $create_users = $this->allow_create_users();
-
- foreach ( (array) $_POST['imported_authors'] as $i => $old_login ) {
- // Multisite adds strtolower to sanitize_user. Need to sanitize here to stop breakage in process_posts.
- $santized_old_login = sanitize_user( $old_login, true );
- $old_id = isset( $this->authors[$old_login]['author_id'] ) ? intval($this->authors[$old_login]['author_id']) : false;
-
- if ( ! empty( $_POST['user_map'][$i] ) ) {
- $user = get_userdata( intval($_POST['user_map'][$i]) );
- if ( isset( $user->ID ) ) {
- if ( $old_id )
- $this->processed_authors[$old_id] = $user->ID;
- $this->author_mapping[$santized_old_login] = $user->ID;
- }
- } else if ( $create_users ) {
- if ( ! empty($_POST['user_new'][$i]) ) {
- $user_id = wp_create_user( $_POST['user_new'][$i], wp_generate_password() );
- } else if ( $this->version != '1.0' ) {
- $user_data = array(
- 'user_login' => $old_login,
- 'user_pass' => wp_generate_password(),
- 'user_email' => isset( $this->authors[$old_login]['author_email'] ) ? $this->authors[$old_login]['author_email'] : '',
- 'display_name' => $this->authors[$old_login]['author_display_name'],
- 'first_name' => isset( $this->authors[$old_login]['author_first_name'] ) ? $this->authors[$old_login]['author_first_name'] : '',
- 'last_name' => isset( $this->authors[$old_login]['author_last_name'] ) ? $this->authors[$old_login]['author_last_name'] : '',
- );
- $user_id = wp_insert_user( $user_data );
- }
-
- if ( ! is_wp_error( $user_id ) ) {
- if ( $old_id )
- $this->processed_authors[$old_id] = $user_id;
- $this->author_mapping[$santized_old_login] = $user_id;
- } else {
- printf( __( 'Failed to create new user for %s. Their posts will be attributed to the current user.', 'wordpress-importer' ), esc_html($this->authors[$old_login]['author_display_name']) );
- if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG )
- echo ' ' . $user_id->get_error_message();
- echo '<br />';
- }
- }
-
- // failsafe: if the user_id was invalid, default to the current user
- if ( ! isset( $this->author_mapping[$santized_old_login] ) ) {
- if ( $old_id )
- $this->processed_authors[$old_id] = (int) get_current_user_id();
- $this->author_mapping[$santized_old_login] = (int) get_current_user_id();
- }
- }
- }
-
- /**
- * Create new categories based on import information
- *
- * Doesn't create a new category if its slug already exists
- */
- function process_categories() {
- $this->categories = apply_filters( 'wp_import_categories', $this->categories );
-
- if ( empty( $this->categories ) )
- return;
-
- foreach ( $this->categories as $cat ) {
- // if the category already exists leave it alone
- $term_id = term_exists( $cat['category_nicename'], 'category' );
- if ( $term_id ) {
- if ( is_array($term_id) ) $term_id = $term_id['term_id'];
- if ( isset($cat['term_id']) )
- $this->processed_terms[intval($cat['term_id'])] = (int) $term_id;
- continue;
- }
-
- $category_parent = empty( $cat['category_parent'] ) ? 0 : category_exists( $cat['category_parent'] );
- $category_description = isset( $cat['category_description'] ) ? $cat['category_description'] : '';
- $catarr = array(
- 'category_nicename' => $cat['category_nicename'],
- 'category_parent' => $category_parent,
- 'cat_name' => $cat['cat_name'],
- 'category_description' => $category_description
- );
-
- $id = wp_insert_category( $catarr );
- if ( ! is_wp_error( $id ) ) {
- if ( isset($cat['term_id']) )
- $this->processed_terms[intval($cat['term_id'])] = $id;
- } else {
- printf( __( 'Failed to import category %s', 'wordpress-importer' ), esc_html($cat['category_nicename']) );
- if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG )
- echo ': ' . $id->get_error_message();
- echo '<br />';
- continue;
- }
- }
-
- unset( $this->categories );
- }
-
- /**
- * Create new post tags based on import information
- *
- * Doesn't create a tag if its slug already exists
- */
- function process_tags() {
- $this->tags = apply_filters( 'wp_import_tags', $this->tags );
-
- if ( empty( $this->tags ) )
- return;
-
- foreach ( $this->tags as $tag ) {
- // if the tag already exists leave it alone
- $term_id = term_exists( $tag['tag_slug'], 'post_tag' );
- if ( $term_id ) {
- if ( is_array($term_id) ) $term_id = $term_id['term_id'];
- if ( isset($tag['term_id']) )
- $this->processed_terms[intval($tag['term_id'])] = (int) $term_id;
- continue;
- }
-
- $tag_desc = isset( $tag['tag_description'] ) ? $tag['tag_description'] : '';
- $tagarr = array( 'slug' => $tag['tag_slug'], 'description' => $tag_desc );
-
- $id = wp_insert_term( $tag['tag_name'], 'post_tag', $tagarr );
- if ( ! is_wp_error( $id ) ) {
- if ( isset($tag['term_id']) )
- $this->processed_terms[intval($tag['term_id'])] = $id['term_id'];
- } else {
- printf( __( 'Failed to import post tag %s', 'wordpress-importer' ), esc_html($tag['tag_name']) );
- if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG )
- echo ': ' . $id->get_error_message();
- echo '<br />';
- continue;
- }
- }
-
- unset( $this->tags );
- }
-
- /**
- * Create new terms based on import information
- *
- * Doesn't create a term its slug already exists
- */
- function process_terms() {
- $this->terms = apply_filters( 'wp_import_terms', $this->terms );
-
- if ( empty( $this->terms ) )
- return;
-
- foreach ( $this->terms as $term ) {
- // if the term already exists in the correct taxonomy leave it alone
- $term_id = term_exists( $term['slug'], $term['term_taxonomy'] );
- if ( $term_id ) {
- if ( is_array($term_id) ) $term_id = $term_id['term_id'];
- if ( isset($term['term_id']) )
- $this->processed_terms[intval($term['term_id'])] = (int) $term_id;
- continue;
- }
-
- if ( empty( $term['term_parent'] ) ) {
- $parent = 0;
- } else {
- $parent = term_exists( $term['term_parent'], $term['term_taxonomy'] );
- if ( is_array( $parent ) ) $parent = $parent['term_id'];
- }
- $description = isset( $term['term_description'] ) ? $term['term_description'] : '';
- $termarr = array( 'slug' => $term['slug'], 'description' => $description, 'parent' => intval($parent) );
-
- $id = wp_insert_term( $term['term_name'], $term['term_taxonomy'], $termarr );
- if ( ! is_wp_error( $id ) ) {
- if ( isset($term['term_id']) )
- $this->processed_terms[intval($term['term_id'])] = $id['term_id'];
- } else {
- printf( __( 'Failed to import %s %s', 'wordpress-importer' ), esc_html($term['term_taxonomy']), esc_html($term['term_name']) );
- if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG )
- echo ': ' . $id->get_error_message();
- echo '<br />';
- continue;
- }
- }
-
- unset( $this->terms );
- }
-
- /**
- * Create new posts based on import information
- *
- * Posts marked as having a parent which doesn't exist will become top level items.
- * Doesn't create a new post if: the post type doesn't exist, the given post ID
- * is already noted as imported or a post with the same title and date already exists.
- * Note that new/updated terms, comments and meta are imported for the last of the above.
- */
- function process_posts() {
- $this->posts = apply_filters( 'wp_import_posts', $this->posts );
-
- foreach ( $this->posts as $post ) {
- $post = apply_filters( 'wp_import_post_data_raw', $post );
-
- if ( ! post_type_exists( $post['post_type'] ) ) {
- printf( __( 'Failed to import “%s”: Invalid post type %s', 'wordpress-importer' ),
- esc_html($post['post_title']), esc_html($post['post_type']) );
- echo '<br />';
- do_action( 'wp_import_post_exists', $post );
- continue;
- }
-
- if ( isset( $this->processed_posts[$post['post_id']] ) && ! empty( $post['post_id'] ) )
- continue;
-
- if ( $post['status'] == 'auto-draft' )
- continue;
-
- if ( 'nav_menu_item' == $post['post_type'] ) {
- $this->process_menu_item( $post );
- continue;
- }
-
- $post_type_object = get_post_type_object( $post['post_type'] );
-
- $post_exists = post_exists( $post['post_title'], '', $post['post_date'] );
- if ( $post_exists && get_post_type( $post_exists ) == $post['post_type'] ) {
- printf( __('%s “%s” already exists.', 'wordpress-importer'), $post_type_object->labels->singular_name, esc_html($post['post_title']) );
- echo '<br />';
- $comment_post_ID = $post_id = $post_exists;
- } else {
- $post_parent = (int) $post['post_parent'];
- if ( $post_parent ) {
- // if we already know the parent, map it to the new local ID
- if ( isset( $this->processed_posts[$post_parent] ) ) {
- $post_parent = $this->processed_posts[$post_parent];
- // otherwise record the parent for later
- } else {
- $this->post_orphans[intval($post['post_id'])] = $post_parent;
- $post_parent = 0;
- }
- }
-
- // map the post author
- $author = sanitize_user( $post['post_author'], true );
- if ( isset( $this->author_mapping[$author] ) )
- $author = $this->author_mapping[$author];
- else
- $author = (int) get_current_user_id();
-
- $postdata = array(
- 'import_id' => $post['post_id'], 'post_author' => $author, 'post_date' => $post['post_date'],
- 'post_date_gmt' => $post['post_date_gmt'], 'post_content' => $post['post_content'],
- 'post_excerpt' => $post['post_excerpt'], 'post_title' => $post['post_title'],
- 'post_status' => $post['status'], 'post_name' => $post['post_name'],
- 'comment_status' => $post['comment_status'], 'ping_status' => $post['ping_status'],
- 'guid' => $post['guid'], 'post_parent' => $post_parent, 'menu_order' => $post['menu_order'],
- 'post_type' => $post['post_type'], 'post_password' => $post['post_password']
- );
-
- $original_post_ID = $post['post_id'];
- $postdata = apply_filters( 'wp_import_post_data_processed', $postdata, $post );
-
- if ( 'attachment' == $postdata['post_type'] ) {
- $remote_url = ! empty($post['attachment_url']) ? $post['attachment_url'] : $post['guid'];
-
- // try to use _wp_attached file for upload folder placement to ensure the same location as the export site
- // e.g. location is 2003/05/image.jpg but the attachment post_date is 2010/09, see media_handle_upload()
- $postdata['upload_date'] = $post['post_date'];
- if ( isset( $post['postmeta'] ) ) {
- foreach( $post['postmeta'] as $meta ) {
- if ( $meta['key'] == '_wp_attached_file' ) {
- if ( preg_match( '%^[0-9]{4}/[0-9]{2}%', $meta['value'], $matches ) )
- $postdata['upload_date'] = $matches[0];
- break;
- }
- }
- }
-
- $comment_post_ID = $post_id = $this->process_attachment( $postdata, $remote_url );
- } else {
- $comment_post_ID = $post_id = wp_insert_post( $postdata, true );
- do_action( 'wp_import_insert_post', $post_id, $original_post_ID, $postdata, $post );
- }
-
- if ( is_wp_error( $post_id ) ) {
- printf( __( 'Failed to import %s “%s”', 'wordpress-importer' ),
- $post_type_object->labels->singular_name, esc_html($post['post_title']) );
- if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG )
- echo ': ' . $post_id->get_error_message();
- echo '<br />';
- continue;
- }
-
- if ( $post['is_sticky'] == 1 )
- stick_post( $post_id );
- }
-
- // map pre-import ID to local ID
- $this->processed_posts[intval($post['post_id'])] = (int) $post_id;
-
- if ( ! isset( $post['terms'] ) )
- $post['terms'] = array();
-
- $post['terms'] = apply_filters( 'wp_import_post_terms', $post['terms'], $post_id, $post );
-
- // add categories, tags and other terms
- if ( ! empty( $post['terms'] ) ) {
- $terms_to_set = array();
- foreach ( $post['terms'] as $term ) {
- // back compat with WXR 1.0 map 'tag' to 'post_tag'
- $taxonomy = ( 'tag' == $term['domain'] ) ? 'post_tag' : $term['domain'];
- $term_exists = term_exists( $term['slug'], $taxonomy );
- $term_id = is_array( $term_exists ) ? $term_exists['term_id'] : $term_exists;
- if ( ! $term_id ) {
- $t = wp_insert_term( $term['name'], $taxonomy, array( 'slug' => $term['slug'] ) );
- if ( ! is_wp_error( $t ) ) {
- $term_id = $t['term_id'];
- do_action( 'wp_import_insert_term', $t, $term, $post_id, $post );
- } else {
- printf( __( 'Failed to import %s %s', 'wordpress-importer' ), esc_html($taxonomy), esc_html($term['name']) );
- if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG )
- echo ': ' . $t->get_error_message();
- echo '<br />';
- do_action( 'wp_import_insert_term_failed', $t, $term, $post_id, $post );
- continue;
- }
- }
- $terms_to_set[$taxonomy][] = intval( $term_id );
- }
-
- foreach ( $terms_to_set as $tax => $ids ) {
- $tt_ids = wp_set_post_terms( $post_id, $ids, $tax );
- do_action( 'wp_import_set_post_terms', $tt_ids, $ids, $tax, $post_id, $post );
- }
- unset( $post['terms'], $terms_to_set );
- }
-
- if ( ! isset( $post['comments'] ) )
- $post['comments'] = array();
-
- $post['comments'] = apply_filters( 'wp_import_post_comments', $post['comments'], $post_id, $post );
-
- // add/update comments
- if ( ! empty( $post['comments'] ) ) {
- $num_comments = 0;
- $inserted_comments = array();
- foreach ( $post['comments'] as $comment ) {
- $comment_id = $comment['comment_id'];
- $newcomments[$comment_id]['comment_post_ID'] = $comment_post_ID;
- $newcomments[$comment_id]['comment_author'] = $comment['comment_author'];
- $newcomments[$comment_id]['comment_author_email'] = $comment['comment_author_email'];
- $newcomments[$comment_id]['comment_author_IP'] = $comment['comment_author_IP'];
- $newcomments[$comment_id]['comment_author_url'] = $comment['comment_author_url'];
- $newcomments[$comment_id]['comment_date'] = $comment['comment_date'];
- $newcomments[$comment_id]['comment_date_gmt'] = $comment['comment_date_gmt'];
- $newcomments[$comment_id]['comment_content'] = $comment['comment_content'];
- $newcomments[$comment_id]['comment_approved'] = $comment['comment_approved'];
- $newcomments[$comment_id]['comment_type'] = $comment['comment_type'];
- $newcomments[$comment_id]['comment_parent'] = $comment['comment_parent'];
- $newcomments[$comment_id]['commentmeta'] = isset( $comment['commentmeta'] ) ? $comment['commentmeta'] : array();
- if ( isset( $this->processed_authors[$comment['comment_user_id']] ) )
- $newcomments[$comment_id]['user_id'] = $this->processed_authors[$comment['comment_user_id']];
- }
- ksort( $newcomments );
-
- foreach ( $newcomments as $key => $comment ) {
- // if this is a new post we can skip the comment_exists() check
- if ( ! $post_exists || ! comment_exists( $comment['comment_author'], $comment['comment_date'] ) ) {
- if ( isset( $inserted_comments[$comment['comment_parent']] ) )
- $comment['comment_parent'] = $inserted_comments[$comment['comment_parent']];
- $comment = wp_filter_comment( $comment );
- $inserted_comments[$key] = wp_insert_comment( $comment );
- do_action( 'wp_import_insert_comment', $inserted_comments[$key], $comment, $comment_post_ID, $post );
-
- foreach( $comment['commentmeta'] as $meta ) {
- $value = maybe_unserialize( $meta['value'] );
- add_comment_meta( $inserted_comments[$key], $meta['key'], $value );
- }
-
- $num_comments++;
- }
- }
- unset( $newcomments, $inserted_comments, $post['comments'] );
- }
-
- if ( ! isset( $post['postmeta'] ) )
- $post['postmeta'] = array();
-
- $post['postmeta'] = apply_filters( 'wp_import_post_meta', $post['postmeta'], $post_id, $post );
-
- // add/update post meta
- if ( ! empty( $post['postmeta'] ) ) {
- foreach ( $post['postmeta'] as $meta ) {
- $key = apply_filters( 'import_post_meta_key', $meta['key'], $post_id, $post );
- $value = false;
-
- if ( '_edit_last' == $key ) {
- if ( isset( $this->processed_authors[intval($meta['value'])] ) )
- $value = $this->processed_authors[intval($meta['value'])];
- else
- $key = false;
- }
-
- if ( $key ) {
- // export gets meta straight from the DB so could have a serialized string
- if ( ! $value )
- $value = maybe_unserialize( $meta['value'] );
-
- add_post_meta( $post_id, $key, $value );
- do_action( 'import_post_meta', $post_id, $key, $value );
-
- // if the post has a featured image, take note of this in case of remap
- if ( '_thumbnail_id' == $key )
- $this->featured_images[$post_id] = (int) $value;
- }
- }
- }
- }
-
- unset( $this->posts );
- }
-
- /**
- * Attempt to create a new menu item from import data
- *
- * Fails for draft, orphaned menu items and those without an associated nav_menu
- * or an invalid nav_menu term. If the post type or term object which the menu item
- * represents doesn't exist then the menu item will not be imported (waits until the
- * end of the import to retry again before discarding).
- *
- * @param array $item Menu item details from WXR file
- */
- function process_menu_item( $item ) {
- // skip draft, orphaned menu items
- if ( 'draft' == $item['status'] )
- return;
-
- $menu_slug = false;
- if ( isset($item['terms']) ) {
- // loop through terms, assume first nav_menu term is correct menu
- foreach ( $item['terms'] as $term ) {
- if ( 'nav_menu' == $term['domain'] ) {
- $menu_slug = $term['slug'];
- break;
- }
- }
- }
-
- // no nav_menu term associated with this menu item
- if ( ! $menu_slug ) {
- _e( 'Menu item skipped due to missing menu slug', 'wordpress-importer' );
- echo '<br />';
- return;
- }
-
- $menu_id = term_exists( $menu_slug, 'nav_menu' );
- if ( ! $menu_id ) {
- printf( __( 'Menu item skipped due to invalid menu slug: %s', 'wordpress-importer' ), esc_html( $menu_slug ) );
- echo '<br />';
- return;
- } else {
- $menu_id = is_array( $menu_id ) ? $menu_id['term_id'] : $menu_id;
- }
-
- foreach ( $item['postmeta'] as $meta )
- $$meta['key'] = $meta['value'];
-
- if ( 'taxonomy' == $_menu_item_type && isset( $this->processed_terms[intval($_menu_item_object_id)] ) ) {
- $_menu_item_object_id = $this->processed_terms[intval($_menu_item_object_id)];
- } else if ( 'post_type' == $_menu_item_type && isset( $this->processed_posts[intval($_menu_item_object_id)] ) ) {
- $_menu_item_object_id = $this->processed_posts[intval($_menu_item_object_id)];
- } else if ( 'custom' != $_menu_item_type ) {
- // associated object is missing or not imported yet, we'll retry later
- $this->missing_menu_items[] = $item;
- return;
- }
-
- if ( isset( $this->processed_menu_items[intval($_menu_item_menu_item_parent)] ) ) {
- $_menu_item_menu_item_parent = $this->processed_menu_items[intval($_menu_item_menu_item_parent)];
- } else if ( $_menu_item_menu_item_parent ) {
- $this->menu_item_orphans[intval($item['post_id'])] = (int) $_menu_item_menu_item_parent;
- $_menu_item_menu_item_parent = 0;
- }
-
- // wp_update_nav_menu_item expects CSS classes as a space separated string
- $_menu_item_classes = maybe_unserialize( $_menu_item_classes );
- if ( is_array( $_menu_item_classes ) )
- $_menu_item_classes = implode( ' ', $_menu_item_classes );
-
- $args = array(
- 'menu-item-object-id' => $_menu_item_object_id,
- 'menu-item-object' => $_menu_item_object,
- 'menu-item-parent-id' => $_menu_item_menu_item_parent,
- 'menu-item-position' => intval( $item['menu_order'] ),
- 'menu-item-type' => $_menu_item_type,
- 'menu-item-title' => $item['post_title'],
- 'menu-item-url' => $_menu_item_url,
- 'menu-item-description' => $item['post_content'],
- 'menu-item-attr-title' => $item['post_excerpt'],
- 'menu-item-target' => $_menu_item_target,
- 'menu-item-classes' => $_menu_item_classes,
- 'menu-item-xfn' => $_menu_item_xfn,
- 'menu-item-status' => $item['status']
- );
-
- $id = wp_update_nav_menu_item( $menu_id, 0, $args );
- if ( $id && ! is_wp_error( $id ) )
- $this->processed_menu_items[intval($item['post_id'])] = (int) $id;
- }
-
- /**
- * If fetching attachments is enabled then attempt to create a new attachment
- *
- * @param array $post Attachment post details from WXR
- * @param string $url URL to fetch attachment from
- * @return int|WP_Error Post ID on success, WP_Error otherwise
- */
- function process_attachment( $post, $url ) {
- if ( ! $this->fetch_attachments )
- return new WP_Error( 'attachment_processing_error',
- __( 'Fetching attachments is not enabled', 'wordpress-importer' ) );
-
- // if the URL is absolute, but does not contain address, then upload it assuming base_site_url
- if ( preg_match( '|^/[\w\W]+$|', $url ) )
- $url = rtrim( $this->base_url, '/' ) . $url;
-
- $upload = $this->fetch_remote_file( $url, $post );
- if ( is_wp_error( $upload ) )
- return $upload;
-
- if ( $info = wp_check_filetype( $upload['file'] ) )
- $post['post_mime_type'] = $info['type'];
- else
- return new WP_Error( 'attachment_processing_error', __('Invalid file type', 'wordpress-importer') );
-
- $post['guid'] = $upload['url'];
-
- // as per wp-admin/includes/upload.php
- $post_id = wp_insert_attachment( $post, $upload['file'] );
- wp_update_attachment_metadata( $post_id, wp_generate_attachment_metadata( $post_id, $upload['file'] ) );
-
- // remap resized image URLs, works by stripping the extension and remapping the URL stub.
- if ( preg_match( '!^image/!', $info['type'] ) ) {
- $parts = pathinfo( $url );
- $name = basename( $parts['basename'], ".{$parts['extension']}" ); // PATHINFO_FILENAME in PHP 5.2
-
- $parts_new = pathinfo( $upload['url'] );
- $name_new = basename( $parts_new['basename'], ".{$parts_new['extension']}" );
-
- $this->url_remap[$parts['dirname'] . '/' . $name] = $parts_new['dirname'] . '/' . $name_new;
- }
-
- return $post_id;
- }
-
- /**
- * Attempt to download a remote file attachment
- *
- * @param string $url URL of item to fetch
- * @param array $post Attachment details
- * @return array|WP_Error Local file location details on success, WP_Error otherwise
- */
- function fetch_remote_file( $url, $post ) {
- // extract the file name and extension from the url
- $file_name = basename( $url );
-
- // get placeholder file in the upload dir with a unique, sanitized filename
- $upload = wp_upload_bits( $file_name, 0, '', $post['upload_date'] );
- if ( $upload['error'] )
- return new WP_Error( 'upload_dir_error', $upload['error'] );
-
- // fetch the remote url and write it to the placeholder file
- $headers = wp_get_http( $url, $upload['file'] );
-
- // request failed
- if ( ! $headers ) {
- @unlink( $upload['file'] );
- return new WP_Error( 'import_file_error', __('Remote server did not respond', 'wordpress-importer') );
- }
-
- // make sure the fetch was successful
- if ( $headers['response'] != '200' ) {
- @unlink( $upload['file'] );
- return new WP_Error( 'import_file_error', sprintf( __('Remote server returned error response %1$d %2$s', 'wordpress-importer'), esc_html($headers['response']), get_status_header_desc($headers['response']) ) );
- }
-
- $filesize = filesize( $upload['file'] );
-
- if ( isset( $headers['content-length'] ) && $filesize != $headers['content-length'] ) {
- @unlink( $upload['file'] );
- return new WP_Error( 'import_file_error', __('Remote file is incorrect size', 'wordpress-importer') );
- }
-
- if ( 0 == $filesize ) {
- @unlink( $upload['file'] );
- return new WP_Error( 'import_file_error', __('Zero size file downloaded', 'wordpress-importer') );
- }
-
- $max_size = (int) $this->max_attachment_size();
- if ( ! empty( $max_size ) && $filesize > $max_size ) {
- @unlink( $upload['file'] );
- return new WP_Error( 'import_file_error', sprintf(__('Remote file is too large, limit is %s', 'wordpress-importer'), size_format($max_size) ) );
- }
-
- // keep track of the old and new urls so we can substitute them later
- $this->url_remap[$url] = $upload['url'];
- $this->url_remap[$post['guid']] = $upload['url']; // r13735, really needed?
- // keep track of the destination if the remote url is redirected somewhere else
- if ( isset($headers['x-final-location']) && $headers['x-final-location'] != $url )
- $this->url_remap[$headers['x-final-location']] = $upload['url'];
-
- return $upload;
- }
-
- /**
- * Attempt to associate posts and menu items with previously missing parents
- *
- * An imported post's parent may not have been imported when it was first created
- * so try again. Similarly for child menu items and menu items which were missing
- * the object (e.g. post) they represent in the menu
- */
- function backfill_parents() {
- global $wpdb;
-
- // find parents for post orphans
- foreach ( $this->post_orphans as $child_id => $parent_id ) {
- $local_child_id = $local_parent_id = false;
- if ( isset( $this->processed_posts[$child_id] ) )
- $local_child_id = $this->processed_posts[$child_id];
- if ( isset( $this->processed_posts[$parent_id] ) )
- $local_parent_id = $this->processed_posts[$parent_id];
-
- if ( $local_child_id && $local_parent_id )
- $wpdb->update( $wpdb->posts, array( 'post_parent' => $local_parent_id ), array( 'ID' => $local_child_id ), '%d', '%d' );
- }
-
- // all other posts/terms are imported, retry menu items with missing associated object
- $missing_menu_items = $this->missing_menu_items;
- foreach ( $missing_menu_items as $item )
- $this->process_menu_item( $item );
-
- // find parents for menu item orphans
- foreach ( $this->menu_item_orphans as $child_id => $parent_id ) {
- $local_child_id = $local_parent_id = 0;
- if ( isset( $this->processed_menu_items[$child_id] ) )
- $local_child_id = $this->processed_menu_items[$child_id];
- if ( isset( $this->processed_menu_items[$parent_id] ) )
- $local_parent_id = $this->processed_menu_items[$parent_id];
-
- if ( $local_child_id && $local_parent_id )
- update_post_meta( $local_child_id, '_menu_item_menu_item_parent', (int) $local_parent_id );
- }
- }
-
- /**
- * Use stored mapping information to update old attachment URLs
- */
- function backfill_attachment_urls() {
- global $wpdb;
- // make sure we do the longest urls first, in case one is a substring of another
- uksort( $this->url_remap, array(&$this, 'cmpr_strlen') );
-
- foreach ( $this->url_remap as $from_url => $to_url ) {
- // remap urls in post_content
- $wpdb->query( $wpdb->prepare("UPDATE {$wpdb->posts} SET post_content = REPLACE(post_content, %s, %s)", $from_url, $to_url) );
- // remap enclosure urls
- $result = $wpdb->query( $wpdb->prepare("UPDATE {$wpdb->postmeta} SET meta_value = REPLACE(meta_value, %s, %s) WHERE meta_key='enclosure'", $from_url, $to_url) );
- }
- }
-
- /**
- * Update _thumbnail_id meta to new, imported attachment IDs
- */
- function remap_featured_images() {
- // cycle through posts that have a featured image
- foreach ( $this->featured_images as $post_id => $value ) {
- if ( isset( $this->processed_posts[$value] ) ) {
- $new_id = $this->processed_posts[$value];
- // only update if there's a difference
- if ( $new_id != $value )
- update_post_meta( $post_id, '_thumbnail_id', $new_id );
- }
- }
- }
-
- /**
- * Parse a WXR file
- *
- * @param string $file Path to WXR file for parsing
- * @return array Information gathered from the WXR file
- */
- function parse( $file ) {
- $parser = new WXR_Parser();
- return $parser->parse( $file );
- }
-
</del><span class="cx"> // Display import page title
</span><span class="cx"> function header() {
</span><span class="cx"> echo '<div class="wrap">';
</span><span class="lines">@@ -1063,74 +334,31 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Decide if the given meta key maps to information we will want to import
- *
- * @param string $key The meta key to check
- * @return string|bool The key if we do want to import, false if not
- */
- function is_valid_meta_key( $key ) {
- // skip attachment metadata since we'll regenerate it from scratch
- // skip _edit_lock as not relevant for import
- if ( in_array( $key, array( '_wp_attached_file', '_wp_attachment_metadata', '_edit_lock' ) ) )
- return false;
- return $key;
- }
-
- /**
- * Decide whether or not the importer is allowed to create users.
- * Default is true, can be filtered via import_allow_create_users
- *
- * @return bool True if creating users is allowed
- */
- function allow_create_users() {
- return apply_filters( 'import_allow_create_users', true );
- }
-
- /**
- * Decide whether or not the importer should attempt to download attachment files.
- * Default is true, can be filtered via import_allow_fetch_attachments. The choice
- * made at the import options screen must also be true, false here hides that checkbox.
- *
- * @return bool True if downloading attachments is allowed
- */
- function allow_fetch_attachments() {
- return apply_filters( 'import_allow_fetch_attachments', true );
- }
-
- /**
- * Decide what the maximum file size for downloaded attachments is.
- * Default is 0 (unlimited), can be filtered via import_attachment_size_limit
- *
- * @return int Maximum attachment file size to import
- */
- function max_attachment_size() {
- return apply_filters( 'import_attachment_size_limit', 0 );
- }
-
- /**
</del><span class="cx"> * Added to http_request_timeout filter to force timeout at 60 seconds during import
</span><span class="cx"> * @return int 60
</span><span class="cx"> */
</span><span class="cx"> function bump_request_timeout( $val ) {
</span><span class="cx"> return 60;
</span><span class="cx"> }
</span><del>-
- // return the difference in length between two strings
- function cmpr_strlen( $a, $b ) {
- return strlen($b) - strlen($a);
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // class_exists( 'WP_Importer' )
</span><del>-
</del><span class="cx"> function wordpress_importer_init() {
</span><del>- load_plugin_textdomain( 'wordpress-importer', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
</del><ins>+ load_plugin_textdomain( 'wordpress-importer', false,
+ dirname( plugin_basename( __FILE__ ) ) . '/languages' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WordPress Importer object for registering the import callback
</span><ins>+ *
</ins><span class="cx"> * @global WP_Import $wp_import
</span><span class="cx"> */
</span><span class="cx"> $GLOBALS['wp_import'] = new WP_Import();
</span><del>- register_importer( 'wordpress', 'WordPress', __('Import <strong>posts, pages, comments, custom fields, categories, and tags</strong> from a WordPress export file.', 'wordpress-importer'), array( $GLOBALS['wp_import'], 'dispatch' ) );
</del><ins>+ register_importer( 'wordpress', 'WordPress',
+ __(
+ 'Import <strong>posts, pages, comments, custom fields, categories, and tags</strong> from a WordPress export file.',
+ 'wordpress-importer' ),
+ array(
+ $GLOBALS['wp_import'],
+ 'dispatch' ) );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'admin_init', 'wordpress_importer_init' );
</span></span></pre>
</div>
</div>
</body>
</html>