post_content); ?>
diff -uNr a/mp-wp/wp-admin/edit-page-form.php b/mp-wp/wp-admin/edit-page-form.php
--- a/mp-wp/wp-admin/edit-page-form.php 86fd23e1bdaee66780c0e6abad986574fabc356be898629f73db5e705d06cb41e5828befa072c69156c9cb7b6a7f2c12a40e99abda3f52e35092d8415c006ee5
+++ b/mp-wp/wp-admin/edit-page-form.php 460d8cc71819108bcd5b7c75f9b98ffa739cbd9e88c167e1bddf4327084370f6b1fc00ca497454b3c61c7118b478b11ed22ed531af867aa92b51325f1333dadf
@@ -447,7 +447,7 @@
post_content); ?>
$blogtitle {$blog['host']} $pstat $cstat
";
- echo "
- \n";
- }
-
- // Handy function for stopping the script after a number of seconds.
- function have_time() {
- global $importer_started;
- if ( time() - $importer_started > MAX_EXECUTION_TIME )
- die('continue');
- return true;
- }
-
- function get_total_results($type, $host) {
- $headers = array(
- "GET /feeds/$type/default?max-results=1&start-index=2 HTTP/1.0",
- "Host: $host",
- "Authorization: AuthSub token=\"$this->token\""
- );
- $request = join( "\r\n", $headers ) . "\r\n\r\n";
- $sock = $this->_get_blogger_sock( $host );
- if ( ! $sock ) return;
- $response = $this->_txrx( $sock, $request );
- $response = $this->parse_response( $response );
- $parser = xml_parser_create();
- xml_parse_into_struct($parser, $response['body'], $struct, $index);
- xml_parser_free($parser);
- $total_results = $struct[$index['OPENSEARCH:TOTALRESULTS'][0]]['value'];
- return (int) $total_results;
- }
-
- function import_blog($blogID) {
- global $importing_blog;
- $importing_blog = $blogID;
-
- if ( isset($_GET['authors']) )
- return print($this->get_author_form());
-
- header('Content-Type: text/plain');
-
- if ( isset($_GET['status']) )
- die($this->get_js_status());
-
- if ( isset($_GET['saveauthors']) )
- die($this->save_authors());
-
- $blog = $this->blogs[$blogID];
- $total_results = $this->get_total_results('posts', $blog['host']);
- $this->blogs[$importing_blog]['total_posts'] = $total_results;
-
- $start_index = $total_results - MAX_RESULTS + 1;
-
- if ( isset( $this->blogs[$importing_blog]['posts_start_index'] ) )
- $start_index = (int) $this->blogs[$importing_blog]['posts_start_index'];
- elseif ( $total_results > MAX_RESULTS )
- $start_index = $total_results - MAX_RESULTS + 1;
- else
- $start_index = 1;
-
- // This will be positive until we have finished importing posts
- if ( $start_index > 0 ) {
- // Grab all the posts
- $this->blogs[$importing_blog]['mode'] = 'posts';
- $query = "start-index=$start_index&max-results=" . MAX_RESULTS;
- do {
- $index = $struct = $entries = array();
- $headers = array(
- "GET /feeds/posts/default?$query HTTP/1.0",
- "Host: {$blog['host']}",
- "Authorization: AuthSub token=\"$this->token\""
- );
- $request = join( "\r\n", $headers ) . "\r\n\r\n";
- $sock = $this->_get_blogger_sock( $blog['host'] );
- if ( ! $sock ) return; // TODO: Error handling
- $response = $this->_txrx( $sock, $request );
-
- $response = $this->parse_response( $response );
-
- // Extract the entries and send for insertion
- preg_match_all( '/]*>.*?<\/entry>/s', $response['body'], $matches );
- if ( count( $matches[0] ) ) {
- $entries = array_reverse($matches[0]);
- foreach ( $entries as $entry ) {
- $entry = "$entry ";
- $AtomParser = new AtomParser();
- $AtomParser->parse( $entry );
- $result = $this->import_post($AtomParser->entry);
- if ( is_wp_error( $result ) )
- return $result;
- unset($AtomParser);
- }
- } else break;
-
- // Get the 'previous' query string which we'll use on the next iteration
- $query = '';
- $links = preg_match_all('/]*)>/', $response['body'], $matches);
- if ( count( $matches[1] ) )
- foreach ( $matches[1] as $match )
- if ( preg_match('/rel=.previous./', $match) )
- $query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match) );
-
- if ( $query ) {
- parse_str($query, $q);
- $this->blogs[$importing_blog]['posts_start_index'] = (int) $q['start-index'];
- } else
- $this->blogs[$importing_blog]['posts_start_index'] = 0;
- $this->save_vars();
- } while ( !empty( $query ) && $this->have_time() );
- }
-
- $total_results = $this->get_total_results( 'comments', $blog['host'] );
- $this->blogs[$importing_blog]['total_comments'] = $total_results;
-
- if ( isset( $this->blogs[$importing_blog]['comments_start_index'] ) )
- $start_index = (int) $this->blogs[$importing_blog]['comments_start_index'];
- elseif ( $total_results > MAX_RESULTS )
- $start_index = $total_results - MAX_RESULTS + 1;
- else
- $start_index = 1;
-
- if ( $start_index > 0 ) {
- // Grab all the comments
- $this->blogs[$importing_blog]['mode'] = 'comments';
- $query = "start-index=$start_index&max-results=" . MAX_RESULTS;
- do {
- $index = $struct = $entries = array();
- $headers = array(
- "GET /feeds/comments/default?$query HTTP/1.0",
- "Host: {$blog['host']}",
- "Authorization: AuthSub token=\"$this->token\""
- );
- $request = join( "\r\n", $headers ) . "\r\n\r\n";
- $sock = $this->_get_blogger_sock( $blog['host'] );
- if ( ! $sock ) return; // TODO: Error handling
- $response = $this->_txrx( $sock, $request );
-
- $response = $this->parse_response( $response );
-
- // Extract the comments and send for insertion
- preg_match_all( '/]*>.*?<\/entry>/s', $response['body'], $matches );
- if ( count( $matches[0] ) ) {
- $entries = array_reverse( $matches[0] );
- foreach ( $entries as $entry ) {
- $entry = "$entry ";
- $AtomParser = new AtomParser();
- $AtomParser->parse( $entry );
- $this->import_comment($AtomParser->entry);
- unset($AtomParser);
- }
- }
-
- // Get the 'previous' query string which we'll use on the next iteration
- $query = '';
- $links = preg_match_all('/]*)>/', $response['body'], $matches);
- if ( count( $matches[1] ) )
- foreach ( $matches[1] as $match )
- if ( preg_match('/rel=.previous./', $match) )
- $query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match) );
-
- parse_str($query, $q);
-
- $this->blogs[$importing_blog]['comments_start_index'] = (int) $q['start-index'];
- $this->save_vars();
- } while ( !empty( $query ) && $this->have_time() );
- }
- $this->blogs[$importing_blog]['mode'] = 'authors';
- $this->save_vars();
- if ( !$this->blogs[$importing_blog]['posts_done'] && !$this->blogs[$importing_blog]['comments_done'] )
- die('nothing');
- do_action('import_done', 'blogger');
- die('done');
- }
-
- function convert_date( $date ) {
- preg_match('#([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(?:\.[0-9]+)?(Z|[\+|\-][0-9]{2,4}){0,1}#', $date, $date_bits);
- $offset = iso8601_timezone_to_offset( $date_bits[7] );
- $timestamp = gmmktime($date_bits[4], $date_bits[5], $date_bits[6], $date_bits[2], $date_bits[3], $date_bits[1]);
- $timestamp -= $offset; // Convert from Blogger local time to GMT
- $timestamp += get_option('gmt_offset') * 3600; // Convert from GMT to WP local time
- return gmdate('Y-m-d H:i:s', $timestamp);
- }
-
- function no_apos( $string ) {
- return str_replace( ''', "'", $string);
- }
-
- function min_whitespace( $string ) {
- return preg_replace( '|\s+|', ' ', $string );
- }
-
- function import_post( $entry ) {
- global $importing_blog;
-
- // The old permalink is all Blogger gives us to link comments to their posts.
- if ( isset( $entry->draft ) )
- $rel = 'self';
- else
- $rel = 'alternate';
- foreach ( $entry->links as $link ) {
- if ( $link['rel'] == $rel ) {
- $parts = parse_url( $link['href'] );
- $entry->old_permalink = $parts['path'];
- break;
- }
- }
-
- $post_date = $this->convert_date( $entry->published );
- $post_content = trim( addslashes( $this->no_apos( html_entity_decode( $entry->content ) ) ) );
- $post_title = trim( addslashes( $this->no_apos( $this->min_whitespace( $entry->title ) ) ) );
- $post_status = isset( $entry->draft ) ? 'draft' : 'publish';
-
- // Clean up content
- $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
- $post_content = str_replace('
', '
', $post_content); - $post_content = str_replace('
', '
', $post_content); - - // Checks for duplicates - if ( isset( $this->blogs[$importing_blog]['posts'][$entry->old_permalink] ) ) { - ++$this->blogs[$importing_blog]['posts_skipped']; - } elseif ( $post_id = post_exists( $post_title, $post_content, $post_date ) ) { - $this->blogs[$importing_blog]['posts'][$entry->old_permalink] = $post_id; - ++$this->blogs[$importing_blog]['posts_skipped']; - } else { - $post = compact('post_date', 'post_content', 'post_title', 'post_status'); - - $post_id = wp_insert_post($post); - if ( is_wp_error( $post_id ) ) - return $post_id; - - wp_create_categories( array_map( 'addslashes', $entry->categories ), $post_id ); - - $author = $this->no_apos( strip_tags( $entry->author ) ); - - add_post_meta( $post_id, 'blogger_blog', $this->blogs[$importing_blog]['host'], true ); - add_post_meta( $post_id, 'blogger_author', $author, true ); - add_post_meta( $post_id, 'blogger_permalink', $entry->old_permalink, true ); - - $this->blogs[$importing_blog]['posts'][$entry->old_permalink] = $post_id; - ++$this->blogs[$importing_blog]['posts_done']; - } - $this->save_vars(); - return; - } - - function import_comment( $entry ) { - global $importing_blog; - - // Drop the #fragment and we have the comment's old post permalink. - foreach ( $entry->links as $link ) { - if ( $link['rel'] == 'alternate' ) { - $parts = parse_url( $link['href'] ); - $entry->old_permalink = $parts['fragment']; - $entry->old_post_permalink = $parts['path']; - break; - } - } - - $comment_post_ID = (int) $this->blogs[$importing_blog]['posts'][$entry->old_post_permalink]; - preg_match('#(.+?) .*(?:\(.+?) )?#', $entry->author, $matches);
- $comment_author = addslashes( $this->no_apos( strip_tags( (string) $matches[1] ) ) );
- $comment_author_url = addslashes( $this->no_apos( strip_tags( (string) $matches[2] ) ) );
- $comment_date = $this->convert_date( $entry->updated );
- $comment_content = addslashes( $this->no_apos( html_entity_decode( $entry->content ) ) );
-
- // Clean up content
- $comment_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $comment_content);
- $comment_content = str_replace('
', '
', $comment_content); - $comment_content = str_replace('
', '
', $comment_content); - - // Checks for duplicates - if ( - isset( $this->blogs[$importing_blog]['comments'][$entry->old_permalink] ) || - comment_exists( $comment_author, $comment_date ) - ) { - ++$this->blogs[$importing_blog]['comments_skipped']; - } else { - $comment = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_date', 'comment_content'); - - $comment_id = wp_insert_comment($comment); - - $this->blogs[$importing_blog]['comments'][$entry->old_permalink] = $comment_id; - - ++$this->blogs[$importing_blog]['comments_done']; - } - $this->save_vars(); - } - - function get_js_status($blog = false) { - global $importing_blog; - if ( $blog === false ) - $blog = $this->blogs[$importing_blog]; - else - $blog = $this->blogs[$blog]; - $p1 = isset( $blog['posts_done'] ) ? (int) $blog['posts_done'] : 0; - $p2 = isset( $blog['total_posts'] ) ? (int) $blog['total_posts'] : 0; - $c1 = isset( $blog['comments_done'] ) ? (int) $blog['comments_done'] : 0; - $c2 = isset( $blog['total_comments'] ) ? (int) $blog['total_comments'] : 0; - return "{p1:$p1,p2:$p2,c1:$c1,c2:$c2}"; - } - - function get_author_form($blog = false) { - global $importing_blog, $wpdb, $current_user; - if ( $blog === false ) - $blog = & $this->blogs[$importing_blog]; - else - $blog = & $this->blogs[$blog]; - - if ( !isset( $blog['authors'] ) ) { - $post_ids = array_values($blog['posts']); - $authors = (array) $wpdb->get_col("SELECT DISTINCT meta_value FROM $wpdb->postmeta WHERE meta_key = 'blogger_author' AND post_id IN (" . join( ',', $post_ids ) . ")"); - $blog['authors'] = array_map(null, $authors, array_fill(0, count($authors), $current_user->ID)); - $this->save_vars(); - } - - $directions = __('All posts were imported with the current user as author. Use this form to move each Blogger user\'s posts to a different WordPress user. You may add users and then return to this page and complete the user mapping. This form may be used as many times as you like until you activate the "Restart" function below.'); - $heading = __('Author mapping'); - $blogtitle = "{$blog['title']} ({$blog['host']})"; - $mapthis = __('Blogger username'); - $tothis = __('WordPress login'); - $submit = js_escape( __('Save Changes') ); - - foreach ( $blog['authors'] as $i => $author ) - $rows .= "
';
- }
-
- function unhtmlentities($string) { // From php.net for < 4.3 compat
- $trans_tbl = get_html_translation_table(HTML_ENTITIES);
- $trans_tbl = array_flip($trans_tbl);
- return strtr($string, $trans_tbl);
- }
-
- function greet() {
- echo '
diff -uNr a/mp-wp/wp-admin/gears-manifest.php b/mp-wp/wp-admin/gears-manifest.php
--- a/mp-wp/wp-admin/gears-manifest.php d25acc5a65cbf7c45ac4e1af9bbedab42f0b72a673c94ea9a7fb9fde145ba43d7476e059ce84cd8f4b17f95678dc8ac23d516efb24e1dcdb325c21c37284b337
+++ b/mp-wp/wp-admin/gears-manifest.php false
@@ -1,317 +0,0 @@
-registered as $script ) {
- if ( empty($script->src) ) continue;
- $ver = empty($script->ver) ? $wp_version : $script->ver;
- if ( 'editor' == $script->handle ) $mce_ver = $script->ver;
- $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $script->src );
- $defaults .= '{ "url" : "' . $src . '?ver=' . $ver . '" },' . "\n";
- $man_version .= $ver;
-}
-
-foreach ( $wp_styles->registered as $style ) {
- if ( empty($style->src) ) continue;
-
- $ver = empty($style->ver) ? $wp_version : $style->ver;
- $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->src );
- if ( 'colors' == $style->handle ) $src = 'css/colors-classic.css';
- $defaults .= '{ "url" : "' . $src . '?ver=' . $ver . '" },' . "\n";
-
- if ( isset($style->extra['rtl']) && $style->extra['rtl'] ) {
- if ( is_bool( $style->extra['rtl'] ) )
- $rtl_href = str_replace( '.css', '-rtl.css', $src );
- else
- $rtl_href = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->extra['rtl'] );
-
- $defaults .= '{ "url" : "' . $rtl_href . '?ver=' . $ver . '" },' . "\n";
- }
- $man_version .= $ver;
-}
-
-$man_version = md5($man_version);
-
-header( 'Expires: Wed, 11 Jan 1984 05:00:00 GMT' );
-header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
-header( 'Cache-Control: no-cache, must-revalidate, max-age=0' );
-header( 'Pragma: no-cache' );
-header( 'Content-Type: application/x-javascript; charset=UTF-8' );
-?>
-{
-"betaManifestVersion" : 1,
-"version" : "_20081201",
-"entries" : [
-
-
-{ "url" : "images/align-center.svg" },
-{ "url" : "images/align-left.svg" },
-{ "url" : "images/align-none.svg" },
-{ "url" : "images/align-right.svg" },
-{ "url" : "images/archive-link.svg" },
-{ "url" : "images/blue-grad.svg" },
-{ "url" : "images/browse-happy.svg" },
-{ "url" : "images/bubble_bg.svg" },
-{ "url" : "images/bubble_bg-rtl.svg" },
-{ "url" : "images/button-grad.svg" },
-{ "url" : "images/button-grad-active.svg" },
-{ "url" : "images/comment-grey-bubble.svg" },
-{ "url" : "images/date-button.svg" },
-{ "url" : "images/ed-bg.svg" },
-{ "url" : "images/fade-butt.svg" },
-{ "url" : "images/fav.svg" },
-{ "url" : "images/fav-arrow.svg" },
-{ "url" : "images/fav-arrow-rtl.svg" },
-{ "url" : "images/fav-top.svg" },
-{ "url" : "images/generic.svg" },
-{ "url" : "images/gray-grad.svg" },
-{ "url" : "images/icons32.svg" },
-{ "url" : "images/icons32-vs.svg" },
-{ "url" : "images/list.svg" },
-{ "url" : "images/list-vs.svg" },
-{ "url" : "images/loading.svg" },
-{ "url" : "images/loading-publish.svg" },
-{ "url" : "images/logo.svg" },
-{ "url" : "images/logo-ghost.svg" },
-{ "url" : "images/logo-login.svg" },
-{ "url" : "images/media-button-image.svg" },
-{ "url" : "images/media-button-music.svg" },
-{ "url" : "images/media-button-other.svg" },
-{ "url" : "images/media-button-video.svg" },
-{ "url" : "images/menu.svg" },
-{ "url" : "images/menu-vs.svg" },
-{ "url" : "images/menu-arrows.svg" },
-{ "url" : "images/menu-bits.svg" },
-{ "url" : "images/menu-bits-rtl.svg" },
-{ "url" : "images/menu-dark.svg" },
-{ "url" : "images/menu-dark-rtl.svg" },
-{ "url" : "images/no.svg" },
-{ "url" : "images/required.svg" },
-{ "url" : "images/resize.svg" },
-{ "url" : "images/screen-options-left.svg" },
-{ "url" : "images/screen-options-right.svg" },
-{ "url" : "images/screen-options-right-up.svg" },
-{ "url" : "images/se.svg" },
-{ "url" : "images/star.svg" },
-{ "url" : "images/toggle-arrow.svg" },
-{ "url" : "images/toggle-arrow-rtl.svg" },
-{ "url" : "images/white-grad.svg" },
-{ "url" : "images/white-grad-active.svg" },
-{ "url" : "images/wordpress-logo.svg" },
-{ "url" : "images/wp-logo.svg" },
-{ "url" : "images/xit.svg" },
-{ "url" : "images/yes.svg" },
-
-
-{ "url" : "../wp-includes/js/tinymce/tiny_mce.js", "src" : "../wp-includes/js/tinymce/tiny_mce.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/langs/wp-langs-en.js", "src" : "../wp-includes/js/tinymce/langs/wp-langs-en.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/wordpress.css", "src" : "../wp-includes/js/tinymce/wordpress.css?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/utils/mctabs.js", "src" : "../wp-includes/js/tinymce/utils/mctabs.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/utils/validate.js", "src" : "../wp-includes/js/tinymce/utils/validate.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/utils/form_utils.js", "src" : "../wp-includes/js/tinymce/utils/form_utils.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/utils/editable_selects.js", "src" : "../wp-includes/js/tinymce/utils/editable_selects.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/tiny_mce_popup.js", "src" : "../wp-includes/js/tinymce/tiny_mce_popup.js?ver=", "ignoreQuery" : true },
-
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js", "src" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/image.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/image.htm?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/link.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/link.htm?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/image.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/image.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css", "src" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css", "src" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css", "src" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css?ver=", "ignoreQuery" : true },
-
-{ "url" : "../wp-includes/js/tinymce/plugins/autosave/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/autosave/editor_plugin.js?ver=", "ignoreQuery" : true },
-
-{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm", "src" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=", "ignoreQuery" : true },
-
-{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm", "src" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css", "src" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css?ver=", "ignoreQuery" : true },
-
-{ "url" : "../wp-includes/js/tinymce/plugins/media/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/media/editor_plugin.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/media/js/media.js", "src" : "../wp-includes/js/tinymce/plugins/media/js/media.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/media/media.htm", "src" : "../wp-includes/js/tinymce/plugins/media/media.htm?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/media/css/content.css", "src" : "../wp-includes/js/tinymce/plugins/media/css/content.css?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/media/css/media.css", "src" : "../wp-includes/js/tinymce/plugins/media/css/media.css?ver=", "ignoreQuery" : true },
-
-{ "url" : "../wp-includes/js/tinymce/plugins/paste/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/paste/editor_plugin.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js", "src" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js", "src" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm", "src" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/paste/blank.htm", "src" : "../wp-includes/js/tinymce/plugins/paste/blank.htm?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm", "src" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css", "src" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css", "src" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=", "ignoreQuery" : true },
-
-{ "url" : "../wp-includes/js/tinymce/plugins/safari/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/safari/editor_plugin.js?ver=", "ignoreQuery" : true },
-
-{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css", "src" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css?ver=", "ignoreQuery" : true },
-
-{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css", "src" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css?ver=", "ignoreQuery" : true },
-
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=", "ignoreQuery" : true },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=", "ignoreQuery" : true },
-
-{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js?ver=", "ignoreQuery" : true },
-
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/icons.svg" },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/colorpicker.svg" },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/fm.svg" },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/gotmoxie.svg" },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/sflogo.svg" },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.svg" },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.svg" },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.svg" },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.svg" },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/default/img/progress.svg" },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_check.svg" },
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_arrow.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/media/img/flash.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/media/img/flv_player.swf" },
-{ "url" : "../wp-includes/js/tinymce/plugins/media/img/quicktime.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/media/img/realmedia.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/media/img/shockwave.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/media/img/windowsmedia.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/media/img/trans.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/img/wline.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/more.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/more_bug.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/page.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/page_bug.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/toolbars.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/help.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/image.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/media.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/video.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/audio.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/image.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/img/delete.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/img/edit.svg" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/img/gallery.svg" },
-
-
-{ "url" : "../wp-includes/images/crystal/archive.svg" },
-{ "url" : "../wp-includes/images/crystal/audio.svg" },
-{ "url" : "../wp-includes/images/crystal/code.svg" },
-{ "url" : "../wp-includes/images/crystal/default.svg" },
-{ "url" : "../wp-includes/images/crystal/document.svg" },
-{ "url" : "../wp-includes/images/crystal/interactive.svg" },
-{ "url" : "../wp-includes/images/crystal/text.svg" },
-{ "url" : "../wp-includes/images/crystal/video.svg" },
-{ "url" : "../wp-includes/images/crystal/spreadsheet.svg" },
-{ "url" : "../wp-includes/images/rss.svg" },
-{ "url" : "../wp-includes/js/thickbox/loadingAnimation.svg" },
-{ "url" : "../wp-includes/js/thickbox/tb-close.svg" }
-]}
diff -uNr a/mp-wp/wp-admin/images/archive-link.svg b/mp-wp/wp-admin/images/archive-link.svg
--- a/mp-wp/wp-admin/images/archive-link.svg 47415221e0cf7e554e014a1adf52c34a52e789280d2a5898356018a9dd3c150414fd3d13969a62b4da50365ce9d5c878750bd9b143803ce92aa28d57c6beaaf0
+++ b/mp-wp/wp-admin/images/archive-link.svg false
@@ -1,8 +0,0 @@
-
-
diff -uNr a/mp-wp/wp-admin/images/loading-publish.svg b/mp-wp/wp-admin/images/loading-publish.svg
--- a/mp-wp/wp-admin/images/loading-publish.svg 0e9deacc9db2b4aac0d2c1c1e101d48d0b2a8c79405667d06573e9f1f7276628d36d78cb40c71ad2c0d088d9b7a7b37bb50f066abe02b914d4558ba0a2c454e5
+++ b/mp-wp/wp-admin/images/loading-publish.svg false
@@ -1,104 +0,0 @@
-
-
diff -uNr a/mp-wp/wp-admin/images/logo-ghost.svg b/mp-wp/wp-admin/images/logo-ghost.svg
--- a/mp-wp/wp-admin/images/logo-ghost.svg 7675d0b9d482f8ab90379547e57d9b2164e6359d741c7cbfc592e7a605473d99e9583f5f517e837fb79d8116a3017ef837fce65c0ebcf74bcb74a5f54848b6cf
+++ b/mp-wp/wp-admin/images/logo-ghost.svg false
@@ -1,15 +0,0 @@
-
-
diff -uNr a/mp-wp/wp-admin/images/resize.svg b/mp-wp/wp-admin/images/resize.svg
--- a/mp-wp/wp-admin/images/resize.svg f3f1e0b33edf93ffe9adcf5da9c2441ecd1f25da7316a0942f949b4c8db4f737f543b10c6f8c6e264f4180552b5770a1a25ed2d69f81bb1c23f7416cd161325b
+++ b/mp-wp/wp-admin/images/resize.svg false
@@ -1,7 +0,0 @@
-
-
diff -uNr a/mp-wp/wp-admin/images/toggle-arrow-rtl.svg b/mp-wp/wp-admin/images/toggle-arrow-rtl.svg
--- a/mp-wp/wp-admin/images/toggle-arrow-rtl.svg 84abf66c99347a7b5931bf35124e643507550246ab00790e8d9ccef40e5c030d65c82a5a95680f15c9c4ecd3b5f884ca65ab083ec2f043d85c520e055aa23ee5
+++ b/mp-wp/wp-admin/images/toggle-arrow-rtl.svg false
@@ -1,7 +0,0 @@
-
-
diff -uNr a/mp-wp/wp-admin/images/toggle-arrow.svg b/mp-wp/wp-admin/images/toggle-arrow.svg
--- a/mp-wp/wp-admin/images/toggle-arrow.svg 55ae57e83727710d8db8ac426770543094baef39db7cf40d83885dbb28d55e0a88bae87d13678da4b03d2e9e275b9a5bdb581118fcc8686f6b6c3bd5219546f0
+++ b/mp-wp/wp-admin/images/toggle-arrow.svg false
@@ -1,7 +0,0 @@
-
-
diff -uNr a/mp-wp/wp-admin/import/blogger.php b/mp-wp/wp-admin/import/blogger.php
--- a/mp-wp/wp-admin/import/blogger.php 4b8f4fa9b2b81709d307fb19ff5bb38006a93b29f9abd31a6b13026db2aaffbecc26f6e94101315ef8e62fff8ef600c85690b87b20b0d481757dd6760d251bde
+++ b/mp-wp/wp-admin/import/blogger.php false
@@ -1,1061 +0,0 @@
-
- ".screen_icon()."
-
\n";
- }
-
- function uh_oh($title, $message, $info) {
- echo "$title
-$welcome
$prereqs
$stepone
- -";
- screen_icon();
- echo "
";
- }
-
- function auth() {
- // We have a single-use token that must be upgraded to a session token.
- $token = preg_replace( '/[^-_0-9a-zA-Z]/', '', $_GET['token'] );
- $headers = array(
- "GET /accounts/AuthSubSessionToken HTTP/1.0",
- "Authorization: AuthSub token=\"$token\""
- );
- $request = join( "\r\n", $headers ) . "\r\n\r\n";
- $sock = $this->_get_auth_sock( );
- if ( ! $sock ) return false;
- $response = $this->_txrx( $sock, $request );
- preg_match( '/token=([-_0-9a-z]+)/i', $response, $matches );
- if ( empty( $matches[1] ) ) {
- $this->uh_oh(
- __( 'Authorization failed' ),
- __( 'Something went wrong. If the problem persists, send this info to support:' ),
- htmlspecialchars($response)
- );
- return false;
- }
- $this->token = $matches[1];
-
- wp_redirect( remove_query_arg( array( 'token', 'noheader' ) ) );
- }
-
- function get_token_info() {
- $headers = array(
- "GET /accounts/AuthSubTokenInfo HTTP/1.0",
- "Authorization: AuthSub token=\"$this->token\""
- );
- $request = join( "\r\n", $headers ) . "\r\n\r\n";
- $sock = $this->_get_auth_sock( );
- if ( ! $sock ) return;
- $response = $this->_txrx( $sock, $request );
- return $this->parse_response($response);
- }
-
- function token_is_valid() {
- $info = $this->get_token_info();
-
- if ( $info['code'] == 200 )
- return true;
-
- return false;
- }
-
- function show_blogs($iter = 0) {
- if ( empty($this->blogs) ) {
- $headers = array(
- "GET /feeds/default/blogs HTTP/1.0",
- "Host: www.blogger.com",
- "Authorization: AuthSub token=\"$this->token\""
- );
- $request = join( "\r\n", $headers ) . "\r\n\r\n";
- $sock = $this->_get_blogger_sock( );
- if ( ! $sock ) return;
- $response = $this->_txrx( $sock, $request );
-
- // Quick and dirty XML mining.
- list( $headers, $xml ) = explode( "\r\n\r\n", $response );
- $p = xml_parser_create();
- xml_parse_into_struct($p, $xml, $vals, $index);
- xml_parser_free($p);
-
- $this->title = $vals[$index['TITLE'][0]]['value'];
-
- // Give it a few retries... this step often flakes out the first time.
- if ( empty( $index['ENTRY'] ) ) {
- if ( $iter < 3 ) {
- return $this->show_blogs($iter + 1);
- } else {
- $this->uh_oh(
- __('Trouble signing in'),
- __('We were not able to gain access to your account. Try starting over.'),
- ''
- );
- return false;
- }
- }
-
- foreach ( $index['ENTRY'] as $i ) {
- $blog = array();
- while ( ( $tag = $vals[$i] ) && ! ( $tag['tag'] == 'ENTRY' && $tag['type'] == 'close' ) ) {
- if ( $tag['tag'] == 'TITLE' ) {
- $blog['title'] = $tag['value'];
- } elseif ( $tag['tag'] == 'SUMMARY' ) {
- $blog['summary'] == $tag['value'];
- } elseif ( $tag['tag'] == 'LINK' ) {
- if ( $tag['attributes']['REL'] == 'alternate' && $tag['attributes']['TYPE'] == 'text/html' ) {
- $parts = parse_url( $tag['attributes']['HREF'] );
- $blog['host'] = $parts['host'];
- } elseif ( $tag['attributes']['REL'] == 'edit' )
- $blog['gateway'] = $tag['attributes']['HREF'];
- }
- ++$i;
- }
- if ( ! empty ( $blog ) ) {
- $blog['total_posts'] = $this->get_total_results('posts', $blog['host']);
- $blog['total_comments'] = $this->get_total_results('comments', $blog['host']);
- $blog['mode'] = 'init';
- $this->blogs[] = $blog;
- }
- }
-
- if ( empty( $this->blogs ) ) {
- $this->uh_oh(
- __('No blogs found'),
- __('We were able to log in but there were no blogs. Try a different account next time.'),
- ''
- );
- return false;
- }
- }
-//echo '$title
$message
$info
'.print_r($this,1).''; - $start = js_escape( __('Import') ); - $continue = js_escape( __('Continue') ); - $stop = js_escape( __('Importing...') ); - $authors = js_escape( __('Set Authors') ); - $loadauth = js_escape( __('Preparing author mapping form...') ); - $authhead = js_escape( __('Final Step: Author Mapping') ); - $nothing = js_escape( __('Nothing was imported. Had you already imported this blog?') ); - $title = __('Blogger Blogs'); - $name = __('Blog Name'); - $url = __('Blog URL'); - $action = __('The Magic Button'); - $posts = __('Posts'); - $comments = __('Comments'); - $noscript = __('This feature requires Javascript but it seems to be disabled. Please enable Javascript and then reload this page. Don\'t worry, you can turn it back off when you\'re done.'); - - $interval = STATUS_INTERVAL * 1000; - - foreach ( $this->blogs as $i => $blog ) { - if ( $blog['mode'] == 'init' ) - $value = $start; - elseif ( $blog['mode'] == 'posts' || $blog['mode'] == 'comments' ) - $value = $continue; - else - $value = $authors; - $blogtitle = js_escape( $blog['title'] ); - $pdone = isset($blog['posts_done']) ? (int) $blog['posts_done'] : 0; - $cdone = isset($blog['comments_done']) ? (int) $blog['comments_done'] : 0; - $init .= "blogs[$i]=new blog($i,'$blogtitle','{$blog['mode']}'," . $this->get_js_status($i) . ');'; - $pstat = "
$pdone/{$blog['total_posts']}
";
- $cstat = "$cdone/{$blog['total_comments']}
";
- $rows .= "$title
| $name | $url | $posts | $comments | $action |
', '
', $post_content); - $post_content = str_replace('
', '
', $post_content); - - // Checks for duplicates - if ( isset( $this->blogs[$importing_blog]['posts'][$entry->old_permalink] ) ) { - ++$this->blogs[$importing_blog]['posts_skipped']; - } elseif ( $post_id = post_exists( $post_title, $post_content, $post_date ) ) { - $this->blogs[$importing_blog]['posts'][$entry->old_permalink] = $post_id; - ++$this->blogs[$importing_blog]['posts_skipped']; - } else { - $post = compact('post_date', 'post_content', 'post_title', 'post_status'); - - $post_id = wp_insert_post($post); - if ( is_wp_error( $post_id ) ) - return $post_id; - - wp_create_categories( array_map( 'addslashes', $entry->categories ), $post_id ); - - $author = $this->no_apos( strip_tags( $entry->author ) ); - - add_post_meta( $post_id, 'blogger_blog', $this->blogs[$importing_blog]['host'], true ); - add_post_meta( $post_id, 'blogger_author', $author, true ); - add_post_meta( $post_id, 'blogger_permalink', $entry->old_permalink, true ); - - $this->blogs[$importing_blog]['posts'][$entry->old_permalink] = $post_id; - ++$this->blogs[$importing_blog]['posts_done']; - } - $this->save_vars(); - return; - } - - function import_comment( $entry ) { - global $importing_blog; - - // Drop the #fragment and we have the comment's old post permalink. - foreach ( $entry->links as $link ) { - if ( $link['rel'] == 'alternate' ) { - $parts = parse_url( $link['href'] ); - $entry->old_permalink = $parts['fragment']; - $entry->old_post_permalink = $parts['path']; - break; - } - } - - $comment_post_ID = (int) $this->blogs[$importing_blog]['posts'][$entry->old_post_permalink]; - preg_match('#
', '
', $comment_content); - $comment_content = str_replace('
', '
', $comment_content); - - // Checks for duplicates - if ( - isset( $this->blogs[$importing_blog]['comments'][$entry->old_permalink] ) || - comment_exists( $comment_author, $comment_date ) - ) { - ++$this->blogs[$importing_blog]['comments_skipped']; - } else { - $comment = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_date', 'comment_content'); - - $comment_id = wp_insert_comment($comment); - - $this->blogs[$importing_blog]['comments'][$entry->old_permalink] = $comment_id; - - ++$this->blogs[$importing_blog]['comments_done']; - } - $this->save_vars(); - } - - function get_js_status($blog = false) { - global $importing_blog; - if ( $blog === false ) - $blog = $this->blogs[$importing_blog]; - else - $blog = $this->blogs[$blog]; - $p1 = isset( $blog['posts_done'] ) ? (int) $blog['posts_done'] : 0; - $p2 = isset( $blog['total_posts'] ) ? (int) $blog['total_posts'] : 0; - $c1 = isset( $blog['comments_done'] ) ? (int) $blog['comments_done'] : 0; - $c2 = isset( $blog['total_comments'] ) ? (int) $blog['total_comments'] : 0; - return "{p1:$p1,p2:$p2,c1:$c1,c2:$c2}"; - } - - function get_author_form($blog = false) { - global $importing_blog, $wpdb, $current_user; - if ( $blog === false ) - $blog = & $this->blogs[$importing_blog]; - else - $blog = & $this->blogs[$blog]; - - if ( !isset( $blog['authors'] ) ) { - $post_ids = array_values($blog['posts']); - $authors = (array) $wpdb->get_col("SELECT DISTINCT meta_value FROM $wpdb->postmeta WHERE meta_key = 'blogger_author' AND post_id IN (" . join( ',', $post_ids ) . ")"); - $blog['authors'] = array_map(null, $authors, array_fill(0, count($authors), $current_user->ID)); - $this->save_vars(); - } - - $directions = __('All posts were imported with the current user as author. Use this form to move each Blogger user\'s posts to a different WordPress user. You may add users and then return to this page and complete the user mapping. This form may be used as many times as you like until you activate the "Restart" function below.'); - $heading = __('Author mapping'); - $blogtitle = "{$blog['title']} ({$blog['host']})"; - $mapthis = __('Blogger username'); - $tothis = __('WordPress login'); - $submit = js_escape( __('Save Changes') ); - - foreach ( $blog['authors'] as $i => $author ) - $rows .= "
$heading
$blogtitle
$directions
'.__('Congratulations!').'
'.__('Now that you have imported your Blogger blog into WordPress, what are you going to do? Here are some suggestions:').'
- '.__('That was hard work! Take a break.').' '; - if ( count($this->import['blogs']) > 1 ) - echo '
- '.__('In case you haven\'t done it already, you can import the posts from your other blogs:'). $this->show_blogs() . ' '; - if ( $n = count($this->import['blogs'][$blog]['newusers']) ) - echo '
- '.sprintf(__('Go to Authors & Users, where you can modify the new user(s) or delete them. If you want to make all of the imported posts yours, you will be given that option when you delete the new authors.'), 'users.php', '_parent').' '; - echo '
- '.__('For security, click the link below to reset this importer.').' '; - echo '
$restart
$message
'.__('Import Blogware').'
'; - } - - function footer() { - echo '';
- echo '
';
- }
-
- function import_posts() {
- global $wpdb, $current_user;
-
- set_magic_quotes_runtime(0);
- $importdata = file($this->file); // Read the file into an array
- $importdata = implode('', $importdata); // squish it
- $importdata = str_replace(array ("\r\n", "\r"), "\n", $importdata);
-
- preg_match_all('|('.__('Howdy! This importer allows you to extract posts from Blogware XML export file into your blog. Pick a Blogware file to upload and click Import.').'
'; - wp_import_upload_form("admin.php?import=blogware&step=1"); - echo '- ';
- foreach ($posts as $post) {
- flush();
- preg_match('|
- |is', $post, $post_type);
- $post_type = $post_type[1];
- if($post_type == "photo") {
- preg_match('|
(.*?) |is', $post, $post_title); - } else { - preg_match('|(.*?) |is', $post, $post_title); - } - $post_title = $wpdb->escape(trim($post_title[1])); - - preg_match('|(.*?) |is', $post, $post_date); - $post_date = strtotime($post_date[1]); - $post_date = gmdate('Y-m-d H:i:s', $post_date); - - preg_match_all('|(.*?) |is', $post, $categories); - $categories = $categories[1]; - - $cat_index = 0; - foreach ($categories as $category) { - $categories[$cat_index] = $wpdb->escape($this->unhtmlentities($category)); - $cat_index++; - } - - if(strcasecmp($post_type, "photo") === 0) { - preg_match('|(.*?) |is', $post, $post_content); - $post_content = ''; - $post_content = $this->unhtmlentities($post_content); - } else { - preg_match('|(.*?)|is', $post, $post_content); - $post_content = str_replace(array (''), '', trim($post_content[1])); - $post_content = $this->unhtmlentities($post_content); - } - - // Clean up content - $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content); - $post_content = str_replace('
', '
', $post_content); - $post_content = str_replace('
', '
', $post_content); - $post_content = $wpdb->escape($post_content); - - $post_author = $current_user->ID; - preg_match('|(.*?) |is', $post, $post_status); - $post_status = trim($post_status[1]); - - echo '- '; - if ($post_id = post_exists($post_title, $post_content, $post_date)) { - printf(__('Post %s already exists.'), stripslashes($post_title)); - } else { - printf(__('Importing post %s...'), stripslashes($post_title)); - $postdata = compact('post_author', 'post_date', 'post_content', 'post_title', 'post_status'); - $post_id = wp_insert_post($postdata); - if ( is_wp_error( $post_id ) ) { - return $post_id; - } - if (!$post_id) { - _e("Couldn't get post ID"); - echo '
'; - break; - } - if(0 != count($categories)) - wp_create_categories($categories, $post_id); - } - - preg_match_all('|(.*?) |is', $post, $comments); - $comments = $comments[1]; - - if ( $comments ) { - $comment_post_ID = (int) $post_id; - $num_comments = 0; - foreach ($comments as $comment) { - preg_match('|(.*?)|is', $comment, $comment_content); - $comment_content = str_replace(array (''), '', trim($comment_content[1])); - $comment_content = $this->unhtmlentities($comment_content); - - // Clean up content - $comment_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $comment_content); - $comment_content = str_replace('
', '
', $comment_content); - $comment_content = str_replace('
', '
', $comment_content); - $comment_content = $wpdb->escape($comment_content); - - preg_match('|(.*?) |is', $comment, $comment_date); - $comment_date = trim($comment_date[1]); - $comment_date = date('Y-m-d H:i:s', strtotime($comment_date)); - - preg_match('|(.*?) |is', $comment, $comment_author); - $comment_author = $wpdb->escape(trim($comment_author[1])); - - $comment_author_email = NULL; - - $comment_approved = 1; - // Check if it's already there - if (!comment_exists($comment_author, $comment_date)) { - $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_date', 'comment_content', 'comment_approved'); - $commentdata = wp_filter_comment($commentdata); - wp_insert_comment($commentdata); - $num_comments++; - } - } - } - if ( $num_comments ) { - echo ' '; - printf( __ngettext('%s comment', '%s comments', $num_comments), $num_comments ); - } - echo ''; - flush(); - ob_flush(); - } - echo '
'; - printf(__('All done. Have fun!'), get_option('home')); - echo '
'; - } - - function dispatch() { - if (empty ($_GET['step'])) - $step = 0; - else - $step = (int) $_GET['step']; - - $this->header(); - - switch ($step) { - case 0 : - $this->greet(); - break; - case 1 : - $result = $this->import(); - if ( is_wp_error( $result ) ) - $result->get_error_message(); - break; - } - - $this->footer(); - } - - function BW_Import() { - // Nothing. - } -} - -$blogware_import = new BW_Import(); - -register_importer('blogware', __('Blogware'), __('Import posts from Blogware.'), array ($blogware_import, 'dispatch')); -?> diff -uNr a/mp-wp/wp-admin/import/btt.php b/mp-wp/wp-admin/import/btt.php --- a/mp-wp/wp-admin/import/btt.php 157a7579d966b8160af5d42fb504acb4e959d2529a5f8b2a9187d5139b35109c0f3e0aca21ac88a82221c63627bdab15f04849fbfebf0faa8ad314e9a4098545 +++ b/mp-wp/wp-admin/import/btt.php false @@ -1,130 +0,0 @@ -'; - screen_icon(); - echo ''.__('Import Bunny’s Technorati Tags').'
'; - echo ''.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'
