Index: wp-includes/js/swfupload/handlers.js =================================================================== --- wp-includes/js/swfupload/handlers.js (revision 10331) +++ wp-includes/js/swfupload/handlers.js (working copy) @@ -285,3 +285,22 @@ }); } })(jQuery); + + +// Success handler for the import tools instance of the uploader +function importUploadSuccess(fileObj, serverData) { + // if async-upload returned an error message, place it in the media item div and return + if ( serverData.match('media-upload-error') ) { + jQuery('#media-item-' + fileObj.id).html(serverData); + return; + } + + // Remove progress bar + jQuery('#media-item-' + fileObj.id + ' .progress').remove(); + + // Add the link to go to the next step, indicating which attachment is the data file + jQuery('#media-item-' + fileObj.id).append('' + swfuploadL10n.import_continue + ''); + + // Remove the upload button to prevent them from trying to upload more + jQuery('#flash-upload-msg').remove() +} Index: wp-includes/script-loader.php =================================================================== --- wp-includes/script-loader.php (revision 10331) +++ wp-includes/script-loader.php (working copy) @@ -130,6 +130,7 @@ 'dismiss' => __('Dismiss'), 'crunching' => __('Crunching…'), 'deleted' => __('Deleted'), + 'import_continue' => __('Continue Import »'), 'l10n_print_after' => 'try{convertEntities(swfuploadL10n);}catch(e){};' ) ); } else { @@ -152,6 +153,7 @@ 'dismiss' => __('Dismiss'), 'crunching' => __('Crunching…'), 'deleted' => __('Deleted'), + 'import_continue' => __('Continue Import »'), 'l10n_print_after' => 'try{convertEntities(swfuploadL10n);}catch(e){};' ) ); $scripts->add( 'swfupload-swfobject', false, array('swfupload') ); Index: wp-admin/wp-admin.css =================================================================== --- wp-admin/wp-admin.css (revision 10331) +++ wp-admin/wp-admin.css (working copy) @@ -2940,3 +2940,8 @@ line-height: 1; padding-left: 25px; } + +ol { + list-style-type: decimal; + margin-left: 2em; +} \ No newline at end of file Index: wp-admin/includes/import.php =================================================================== --- wp-admin/includes/import.php (revision 10331) +++ wp-admin/includes/import.php (working copy) @@ -59,28 +59,34 @@ * @return array */ function wp_import_handle_upload() { - $overrides = array( 'test_form' => false, 'test_type' => false ); - $_FILES['import']['name'] .= '.import'; - $file = wp_handle_upload( $_FILES['import'], $overrides ); + if (!empty($_FILES['import'])) { + // Handle upload of file and storage as attachment + $overrides = array( 'test_form' => false, 'test_type' => false ); + $_FILES['import']['name'] .= '.import'; + $file = wp_handle_upload( $_FILES['import'], $overrides ); - if ( isset( $file['error'] ) ) - return $file; + if ( isset( $file['error'] ) ) + return $file; - $url = $file['url']; - $type = $file['type']; - $file = addslashes( $file['file'] ); - $filename = basename( $file ); + $url = $file['url']; + $type = $file['type']; + $file = addslashes( $file['file'] ); + $filename = basename( $file ); - // Construct the object array - $object = array( 'post_title' => $filename, - 'post_content' => $url, - 'post_mime_type' => $type, - 'guid' => $url - ); + // Construct the object array + $object = array( 'post_title' => $filename, + 'post_content' => $url, + 'post_mime_type' => $type, + 'guid' => $url + ); - // Save the data - $id = wp_insert_attachment( $object, $file ); - + // Save the data + $id = wp_insert_attachment( $object, $file ); + } else { + // Populate details based on ID passed in from async upload + $id = $_REQUEST['attachment_id']; + $file = get_attached_file($id); + } return array( 'file' => $file, 'id' => $id ); } Index: wp-admin/includes/template.php =================================================================== --- wp-admin/includes/template.php (revision 10331) +++ wp-admin/includes/template.php (working copy) @@ -2693,18 +2693,92 @@ function wp_import_upload_form( $action ) { $bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() ); $size = wp_convert_bytes_to_hr( $bytes ); + + // If Mac and mod_security, no Flash. :( + $flash = true; + if ( false !== strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'mac') && apache_mod_loaded('mod_security') ) + $flash = false; + + if (isset($_REQUEST['flash']) && '0' == $_REQUEST['flash']) + $flash = false; + + $flash = apply_filters('import_flash_uploader', $flash); ?> +
-

- - () - - - -

-

- -

+ + + + +
+ +
+ +
+ +
+ + + +
+ +

+ + () + + + +

+ +

+ +

+ + +
+
'; - echo '

'.__('Howdy! Upload your LiveJournal XML export file and we’ll import the posts into this blog.').'

'; - echo '

'.__('Choose a LiveJournal XML file to upload, then click Upload file and import.').'

'; + echo '

'.__('Howdy! Let\'s get your LiveJournal posts imported into this blog.').'

'; + echo '
    '; + echo '
  1. '.__('Use the LiveJournal Export Journal tool to export all of your posts. You will need to export each month separately, and save the files to your computer. Use these options when exporting:'); + echo '
    2. '; + echo '
  2. '.__('Come back here when you\'re done and upload each file using the form below to import the entries into this blog.').'
    3. '; + echo '
'; wp_import_upload_form("admin.php?import=livejournal&step=1"); echo ''; } @@ -70,9 +82,17 @@ $post_content = $this->unhtmlentities($post_content); // Clean up content - $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content); + $post_content = preg_replace_callback('|<(/?[A-Z]+)|', create_function('$match', 'return "<" . strtolower($match[1]);'), $post_content); $post_content = str_replace('
', '
', $post_content); $post_content = str_replace('
', '
', $post_content); + // Links to other LJ users + $post_content = preg_replace('||', '$1', $post_content); + // lj-cut ==> + $post_content = str_replace(array('', ''), array('', ''), $post_content); + // Remove all but the first + $first = strpos($post_content, ''); + $post_content = str_replace(substr($post_content, $first + 1), str_replace('', '', substr($post_content, $first + 1)), $post_content); + $post_content = $wpdb->escape($post_content); $post_author = $current_user->ID; @@ -106,7 +126,7 @@ $comment_content = $this->unhtmlentities($comment_content); // Clean up content - $comment_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $comment_content); + $comment_content = preg_replace_callback('|<(/?[A-Z]+)|', create_function('$match', 'return "<" . strtolower($match[1]);'), $comment_content); $comment_content = str_replace('
', '
', $comment_content); $comment_content = str_replace('
', '
', $comment_content); $comment_content = $wpdb->escape($comment_content); Index: wp-admin/import/rss.php =================================================================== --- wp-admin/import/rss.php (revision 10331) +++ wp-admin/import/rss.php (working copy) @@ -118,9 +118,9 @@ echo '
    '; foreach ($this->posts as $post) { - echo "
  1. ".__('Importing post...'); - + echo "
  2. "; extract($post); + printf(__('Importing post %s...'), stripslashes($post_title)); if ($post_id = post_exists($post_title, $post_content, $post_date)) { _e('Post already imported');