WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@335 7be80a69-a1ef-0310-a953-fb0f7c49ff36

7 files changed, 701 insertions, 21 deletions

diff --git a/wp-inst/wp-admin/admin-functions.php b/wp-inst/wp-admin/admin-functions.php
index 8a7b6a7..5db2579 100644
--- a/wp-inst/wp-admin/admin-functions.php
+++ b/wp-inst/wp-admin/admin-functions.php
@@ -480,7 +480,6 @@ function wp_delete_user($id, $reassign = 'novalue') {
 	return true;
 }
 
-
 function post_exists($title, $content = '', $post_date = '') {
 	global $wpdb;
 	
@@ -495,6 +494,13 @@ function post_exists($title, $content = '', $post_date = '') {
 	return 0;
 }
 
+function comment_exists($comment_author, $comment_date) {
+	global $wpdb;
+
+	return $wpdb->get_var("SELECT comment_post_ID FROM $wpdb->comments
+		WHERE comment_author = '$comment_author' AND comment_date = '$comment_date'");
+}
+
 function url_shorten ($url) {
 	$short_url = str_replace('http://', '', stripslashes($url));
 	$short_url = str_replace('www.', '', $short_url);
@@ -959,9 +965,9 @@ function insert_with_markers($filename, $marker, $insertion) {
 		if ($markerdata) {
 			$state = true;
 			foreach($markerdata as $markerline) {
-				if (strstr($markerline, "# BEGIN {$marker}\n")) $state = false;
+				if (strstr($markerline, "# BEGIN {$marker}")) $state = false;
 				if ($state) fwrite($f, "{$markerline}\n");
-				if (strstr($markerline, "# END {$marker}\n")) {
+				if (strstr($markerline, "# END {$marker}")) {
 					fwrite($f, "# BEGIN {$marker}\n");
 					if(is_array($insertion)) foreach($insertion as $insertline) fwrite($f, "{$insertline}\n");
 					fwrite($f, "# END {$marker}\n");
diff --git a/wp-inst/wp-admin/import/blogger.php b/wp-inst/wp-admin/import/blogger.php
index e69de29..bd0bd58 100644
--- a/wp-inst/wp-admin/import/blogger.php
+++ b/wp-inst/wp-admin/import/blogger.php
@@ -0,0 +1,654 @@
+<?php
+
+class Blogger_Import {
+	
+	var $import = array();
+	var $template = '<br />
+<br />
+<br />
+<MainPage>
+<p>Are you looking for %title%? It is temporarily out of service. Please try again in an hour. Meanwhile, discover <a href="http://wordpress.org">a better blogging tool</a>.</p>
+<BloggerArchives>
+<a class="archive" href="<$BlogArchiveURL$>"><$BlogArchiveName$></a><br />
+</BloggerArchives>
+</MainPage>
+<ArchivePage>
+<Blogger><wordpresspost><$BlogItemDateTime$>|W|P|<$BlogItemAuthorNickname$>|W|P|<$BlogItemBody$>|W|P|<$BlogItemNumber$>|W|P|<$BlogItemTitle$>|W|P|<$BlogItemAuthorEmail$><BlogItemCommentsEnabled><BlogItemComments><wordpresscomment><$BlogCommentDateTime$>|W|P|<$BlogCommentAuthor$>|W|P|<$BlogCommentBody$></BlogItemComments></BlogItemCommentsEnabled></Blogger>
+</ArchivePage>';
+
+	// Shows the welcome screen and the magic iframe.
+	function greet() {
+		echo '<div class="wrap">';
+		echo '<h2>'.__('Import Blogger').'</h2>';
+		_e("<p>Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress blog.</p>
+<p>Before you get started, you may want to back up your Blogger template by copying and pasting it into a text file on your computer. This script has to modify your template and other Blogger settings so it can get your posts and comments. It should restore everything afterwards but if you have put a lot of work into your template, it would be a good idea to make your own backup first.</p>
+<p>When you are ready to begin, enter your Blogger username and password below and click Start. Do not close this window until the process is complete.</p>");
+		echo "<iframe src='admin.php?import=blogger&noheader=true' height='350px' width = '99%'></iframe>";
+		echo "<p><a href='admin.php?import=blogger&amp;restart=true&amp;noheader=true' onclick='return confirm(\"This will delete everything saved by the Blogger importer. Are you sure you want to do this?\")'>Reset this importer</a></p>";
+		echo '</div>';
+	}
+
+	// Deletes saved data and redirect.
+	function restart() {
+		delete_option('import-blogger');
+		header("Location: admin.php?import=blogger");
+		die();
+	}
+
+	// Generates a string that will make the page reload in a specified interval.
+	function refresher($msec) {
+		return "<html><head><script type='text/javascript'>window.onload=setInterval('window.location.reload()', $msec);</script>\n</head>\n<body>";
+	}
+
+	// Returns associative array of code, header, cookies, body. Based on code from php.net.
+	function parse_response($this_response) {
+		// Split response into header and body sections
+		list($response_headers, $response_body) = explode("\r\n\r\n", $this_response, 2);
+		$response_header_lines = explode("\r\n", $response_headers);
+
+		// First line of headers is the HTTP response code
+		$http_response_line = array_shift($response_header_lines);
+		if(preg_match('@^HTTP/[0-9]\.[0-9] ([0-9]{3})@',$http_response_line, $matches)) { $response_code = $matches[1]; }
+
+		// put the rest of the headers in an array
+		$response_header_array = array();
+		foreach($response_header_lines as $header_line) {
+			list($header,$value) = explode(': ', $header_line, 2);
+			$response_header_array[$header] .= $value."\n";
+		}
+
+		$cookie_array = array();
+		$cookies = explode("\n", $response_header_array["Set-Cookie"]);
+		foreach($cookies as $this_cookie) { array_push($cookie_array, "Cookie: ".$this_cookie); }
+
+		return array("code" => $response_code, "header" => $response_header_array, "cookies" => $cookie_array, "body" => $response_body);
+	}
+
+	// Prints a form for the user to enter Blogger creds.
+	function login_form($text='') {
+		echo "<h1>Log in to Blogger</h1>\n<p>$text</p>\n";
+		die("<form method='post' action='admin.php?import=blogger&amp;noheader=true&amp;step=0'><input type='text' name='user' /><input type='password' name='pass' /><input type='submit' value='Start' /></form>");
+	}
+
+	// Sends creds to Blogger, returns the session cookies an array of headers.
+	function login_blogger($user, $pass) {
+		$_url = 'http://www.blogger.com/login.do';
+		$params = "username=$user&password=$pass";
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_POST,1);
+		curl_setopt($ch, CURLOPT_POSTFIELDS,$params);
+		curl_setopt($ch, CURLOPT_URL,$_url);
+		curl_setopt($ch, CURLOPT_USERAGENT, 'Developing Blogger Exporter');
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
+		curl_setopt($ch, CURLOPT_HEADER,1);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);
+		$response = curl_exec ($ch);
+
+		$response = $this->parse_response($response);
+
+		return $response['cookies'];
+	}
+
+	// Requests page from Blogger, returns the response array.
+	function get_blogger($url, $header = '', $user=false, $pass=false) {
+		$ch = curl_init();
+		if ($user && $pass) curl_setopt($ch, CURLOPT_USERPWD,"{$user}:{$pass}");
+		curl_setopt($ch, CURLOPT_URL,$url);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+		curl_setopt($ch, CURLOPT_HEADER,1);
+		if (is_array($header)) curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+		$response = curl_exec ($ch);
+
+		$response = $this->parse_response($response);
+		$response['url'] = $url;
+
+		if (curl_errno($ch)) {
+			print curl_error($ch);
+		} else {
+			curl_close($ch);
+		}
+
+		return $response;
+	}
+
+	// Posts data to Blogger, returns response array.
+	function post_blogger($url, $header = false, $paramary = false, $parse=true) {
+		$params = '';
+		if ( is_array($paramary) ) {
+			foreach($paramary as $key=>$value)
+				if($key && $value != '')
+					$params.=$key."=".urlencode(stripslashes($value))."&";
+		}
+		if ($user && $pass) $params .= "username=$user&password=$pass";
+		$params = trim($params,'&');
+	//echo addslashes(print_r(array('url'=>$url,'header'=>$header,'params'=>$params),1));
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_POST,1);
+		curl_setopt($ch, CURLOPT_POSTFIELDS,$params);
+		if ($user && $pass) curl_setopt($ch, CURLOPT_USERPWD,"{$user}:{$pass}");
+		curl_setopt($ch, CURLOPT_URL,$url);
+		curl_setopt($ch, CURLOPT_USERAGENT, 'Developing Blogger Exporter');
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+		curl_setopt($ch, CURLOPT_HEADER,$parse);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);
+		if ($header) curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+		$response = curl_exec ($ch);
+	
+		if ($parse) {
+			$response = $this->parse_response($response);
+			$response['url'] = $url;
+			return $response;
+		}
+	
+		return $response;
+	}
+
+	// Prints the list of blogs for import.
+	function show_blogs() {
+		global $import;
+		echo "<h1>Selecting a Blog</h1>\n<ul>";
+		foreach ( $this->import['blogs'] as $blog ) {
+			if (9 == $blog['nextstep']) $status = "100%";
+			elseif (8 == $blog['nextstep']) $status = "90%";
+			elseif (7 == $blog['nextstep']) $status = "82.5%";
+			elseif (6 == $blog['nextstep']) $status = "75%";
+			elseif (5 == $blog['nextstep']) $status = "57%";
+			elseif (4 == $blog['nextstep']) $status = "28%";
+			elseif (3 == $blog['nextstep']) $status = "14%";
+			else $status = "0%";
+			echo "\t<li><a href='admin.php?import=blogger&amp;noheader=true&amp;blog={$blog['id']}'>{$blog['title']}</a> $status</li>\n";
+		}
+		die("</ul>\n");
+	}
+
+	// Publishes.
+	function publish_blogger($i) {
+		if ( ! $this->import['blogs'][$_GET['blog']]['publish'][$i] ) {
+			// First call. Start the publish process.
+			$paramary = array('blogID' => $_GET['blog'], 'all' => '1', 'republishAll' => 'Republish Entire Blog', 'publish' => '1', 'redirectUrl' => "/publish.do?blogID={$_GET['blog']}&inprogress=true");
+			$response = $this->post_blogger("http://www.blogger.com/publish.do?blogID={$_GET['blog']}", $this->import['cookies'], $paramary);
+			if ( $response['code'] == '302' ) {
+				$url = str_replace('publish.g', 'publish-body.g', $response['header']['Location']);
+				$this->import['blogs'][$_GET['blog']]['publish'][$i] = $url;
+				update_option('import-blogger', $this->import);
+				$response = $this->get_blogger($url, $this->import['cookies']);
+				if ( preg_match('#<p class="progressIndicator">.*</p>#U', $response['body'], $matches) ) {
+					$progress = $matches[0];
+					die($progress);
+				} else {
+					echo "matches:<pre>" . print_r($matches,1) . "</pre>\n";
+				}
+			} else {
+				echo "<h1>Publish error: No 302</h1><p>Please tell the devs.</p><pre>" . addslashes(print_r($response,1)) . "</pre>\n";
+			}
+			die();
+		} else {
+			// Subsequent call. Keep checking status until Blogger reports publish complete.
+			$url = $this->import['blogs'][$_GET['blog']]['publish'][$i];
+			$response = $this->get_blogger($url, $this->import['cookies']);
+			if ( preg_match('#<p class="progressIndicator">.*</p>#U', $response['body'], $matches) ) {
+				$progress = $matches[0];
+				if ( strstr($progress, '100%') )
+					$this->set_next_step($i);
+				die($progress);
+			} else {
+				echo "<h1>Publish error: No matches</h1><p>Please tell the devs.</p><pre>" . print_r($matches,1) . "</pre>\n";
+			}
+		}
+	}
+
+	// Sets next step, saves options
+	function set_next_step($step) {
+		$this->import['blogs'][$_GET['blog']]['nextstep'] = $step;
+		update_option('import-blogger', $this->import);
+	}
+	
+	// Redirects to next step
+	function do_next_step() {
+		header("Location: admin.php?import=blogger&noheader=true&blog={$_GET['blog']}");
+		die();
+	}
+
+	// Step 0: Do Blogger login, get userid and blogid/title pairs.
+	function do_login() {
+		if ( ( ! $this->import['user'] && ! is_array($this->import['cookies']) ) ) {
+			// The user must provide a Blogger username and password.
+			if ( ! ( $_POST['user'] && $_POST['pass'] ) ) {
+				$this->login_form("Please log in using your Blogger credentials.");
+			}
+		
+			// Try logging in. If we get an array of cookies back, we at least connected.		
+			$this->import['cookies'] = $this->login_blogger($_POST['user'], $_POST['pass']);
+			if ( !is_array( $this->import['cookies'] ) ) {
+				$this->login_form("Login failed. Please enter your credentials again.");
+			}
+			
+			// Save the password so we can log the browser in when it's time to publish.
+			$this->import['pass'] = $_POST['pass'];
+			$this->import['user'] = $_POST['user'];
+
+			// Get the blog numbers so we can give the user a choice.
+			$response = $this->get_blogger('https://www.blogger.com/atom','',$_POST['user'],$_POST['pass']);
+			$blogger = $response['body'];
+
+			// Save the userID if we got one from Blogger, otherwise re-login.
+			$useridary = array();
+			preg_match('#>(\d+)</userid#', $blogger, $useridary);
+
+			if (! $this->import['userid'] = $useridary[1]) $this->login_form("Login failed. Please re-enter your username and password.");
+			unset($useridary);
+
+			// Save the blogs
+			$blogsary = array();
+			preg_match_all('#/atom/(\d+)" rel\="service.feed" title="([^"]+)"#', $blogger, $blogsary);
+			if ( ! is_array( $blogsary[1] ) )
+				die('No blogs found for this user.');
+			$this->import['blogs'] = array();
+			foreach ( $blogsary[1] as $key => $id ) {
+				// Define the required Blogger options.
+				$blog_opts = array(
+					'blog-options-basic' => false,
+					'blog-formatting' => array('timeStampFormat' => '0', 'encoding'=>'UTF-8', 'convertLineBreaks'=>'false', 'floatAlignment'=>'false'),
+					'blog-comments' => array('commentsTimeStampFormat' => '0'),
+					'blog-options-archiving' => array('archiveFrequency' => 'm'),
+					'template-edit' => array( 'templateText' =>  str_replace('%title%', $blogsary[2][$key], $this->template) ),
+					'blog-publishing' => array('publishMode'=>'0', 'blogID' => "$id", 'subdomain' => mt_rand().mt_rand(), 'pingWeblogs' => 'false')
+				);
+
+				// Build the blog options array template
+				foreach ($blog_opts as $blog_opt => $modify)
+					$new_opts["$blog_opt"] = array('backup'=>false, 'modify' => $modify, 'error'=>false);
+
+				$this->import['blogs']["$id"] = array(
+					'id' => $id,
+					'title' => $blogsary[2][$key],
+					'options' => $new_opts,
+					'url' => false,
+					'publish_cookies' => false,
+					'published' => false,
+					'archives' => false,
+					'newusers' => array(),
+					'lump_authors' => false,
+					'newusers' => 0,
+					'nextstep' => 2
+				);
+			}
+			update_option('import-blogger', $this->import);
+			header("Location: admin.php?import=blogger&noheader=true&step=1");
+		}
+		die();
+	}
+
+	// Step 1: Select one of the blogs belonging to the user logged in.
+	function select_blog() {
+		if ( is_array($this->import['blogs']) ) {
+			$this->show_blogs();
+			die();
+		} else {
+			$this->restart();
+		}
+	}
+
+	// Step 2: Backup the Blogger options pages, updating some of them.
+	function backup_settings() {
+		$output.= "<h1>Backing up Blogger options</h1>\n";
+		$form = false;
+		foreach ($this->import['blogs'][$_GET['blog']]['options'] as $blog_opt => $optary) {
+			if ( $blog_opt == $_GET['form'] ) {
+				// Make sure not to overwrite any existing backups!
+				if ( $this->import['blogs'][$_GET['blog']]['options']["$blog_opt"]['backup'] ) continue;
+
+				// Save the posted form data
+				$this->import['blogs'][$_GET['blog']]['options']["$blog_opt"]['backup'] = $_POST;
+				update_option('import-blogger',$this->import);
+
+				// Post the modified form data to Blogger
+				if ( $optary['modify'] ) {
+					$posturl = "http://www.blogger.com/{$blog_opt}.do";
+					$headers = array_merge($this->import['blogs'][$_GET['blog']]['options']["$blog_opt"]['cookies'], $this->import['cookies']);
+					switch ($blog_opt) {
+					case 'blog-publishing':
+						if ( $_POST['publishMode'] > 0 ) {
+							$response = $this->get_blogger("http://www.blogger.com/blog-publishing.g?blogID={$_GET['blog']}&publishMode=0", $headers);
+							if ( $response['code'] >= 400 )
+								die('<h2>Failed attempt to change publishMode:</h2><pre>' . addslashes(print_r($headers, 1)) . addslashes(print_r($response, 1)) . '</pre>');
+							$this->import['blogs'][$_GET['blog']]['url'] = 'http://' . $optary['modify']['subdomain'] . '.blogspot.com/';
+						} else {
+							$this->import['blogs'][$_GET['blog']]['url'] = 'http://' . $_POST['subdomain'] . '.blogspot.com/';
+							update_option('import-blogger', $this->import);
+							continue 2;
+						}
+						$paramary = $optary['modify'];
+						break;
+					case 'template-edit':
+						$this->import['blogs'][$_GET['blog']]['publish_cookies'] = $headers;
+						update_option('import-blogger', $this->import);
+					default:
+						$paramary = array_merge($_POST, $optary['modify']);
+					}
+					$response = $this->post_blogger($posturl, $headers, $paramary);
+					if ( $response['code'] >= 400 || strstr($response['body'], 'There are errors on this form') )
+						die( "<p>Error on form submission. Refresh/Reload and click YES to resubmit.</p>" . addslashes(print_r($response, 1)));
+					//header("Location: admin.php?import=blogger&noheader=true&step=2&blog={$_GET['blog']}");
+					//die();
+				}
+				$output .= "<del><p>$blog_opt</p></del>\n";
+			} elseif ( is_array($this->import['blogs'][$_GET['blog']]['options']["$blog_opt"]['backup']) ) {
+				// This option set has already been backed up.
+				$output .= "<del><p>$blog_opt</p></del>\n";
+			} elseif ( ! $form ) {
+				// This option page needs to be downloaded and given to the browser for submission back to this script.
+				$response = $this->get_blogger("http://www.blogger.com/{$blog_opt}.g?blogID={$_GET['blog']}", $this->import['cookies']);
+				$this->import['blogs'][$_GET['blog']]['options']["$blog_opt"]['cookies'] = $response['cookies'];
+				update_option('import-blogger',$this->import);
+				$body = $response['body'];
+				$body = preg_replace("|\<!DOCTYPE.*\<body[^>]*>|ms","",$body);
+				$body = preg_replace("|/?{$blog_opt}.do|","admin.php?import=blogger&amp;noheader=true&amp;step=2&amp;blog={$_GET['blog']}&amp;form={$blog_opt}",$body);
+				$body = str_replace("name='submit'","name='supermit'",$body);
+				$body = str_replace('name="submit"','name="supermit"',$body);
+				$body = str_replace('</body>','',str_replace('</html>','',$body));
+				$form = "<div style='height:0px;width:0px;overflow:hidden;'>";
+				$form.= $body;
+				$form.= "</div><script type='text/javascript'>forms=document.getElementsByTagName('form');for(i=0;i<forms.length;i++){if(forms[i].action.search('{$blog_opt}')){forms[i].submit();break;}}</script>";
+				$output.= "<p><strong>$blog_opt</strong> in progress, please wait...</p>\n";
+			} else {
+				$output.= "<p>$blog_opt</p>\n";
+			}
+		}
+		if ( $form )
+			die($output . $form);
+
+		$this->set_next_step(3);
+		$this->do_next_step();
+	}
+
+	// Step 3: Publish with the new template and settings.
+	function publish_blog() {
+		echo $this->refresher(2400) . "<h1>Publishing with new template and options</h1>\n";
+		$this->publish_blogger(5);
+	}
+
+	// Step 4: Deprecated. :-D
+
+	// Step 5: Get the archive URLs from the new blog.
+	function get_archive_urls() {
+		$bloghtml = file($this->import['blogs'][$_GET['blog']]['url']);
+		if (! is_array($bloghtml) ) die('Trouble connecting to your blog. Try reloading this page.');
+		preg_match_all('#<a class="archive" href="([^"]*)"#', implode('',$bloghtml), $archives);
+		if ( count($archives[1]) == 0 ) die ("That's odd. No archives were found. Does <a href='{$import['blogs'][$_GET['blog']]['url']}'>your blog</a> say Temporary Template?");
+		foreach ($archives[1] as $archive) {
+			$this->import['blogs'][$_GET['blog']]['archives'][$archive] = false;
+		}
+		$this->set_next_step(6);
+		$this->do_next_step();
+	}
+
+	// Step 6: Get each monthly archive, import it, mark it done.
+	function get_archive() {
+		global $wpdb;
+		$output = "<h2>Importing Blogger archives into WordPress</h2>\n";
+		$did_one = false;
+		foreach ( $this->import['blogs'][$_GET['blog']]['archives'] as $url => $status ) {
+			$archivename = substr(basename($url),0,7);
+			if ( $status || $did_one ) {
+				$foo = 'bar';
+				// Do nothing.
+			} else {
+				// Import the selected month
+				$postcount = 0;
+				$skippedpostcount = 0;
+				$commentcount = 0;
+				$skippedcommentcount = 0;
+				$status = '';
+				$archive = implode('',file($url));
+	
+				$posts = explode('<wordpresspost>', $archive);
+				for ($i = 1; $i < count($posts); $i = $i + 1) {
+					$postparts = explode('<wordpresscomment>', $posts[$i]);
+					$postinfo = explode('|W|P|', $postparts[0]);
+					$post_date = $postinfo[0];
+					$post_content = $postinfo[2];
+					// Don't try to re-use the original numbers
+					// because the new, longer numbers are too
+					// big to handle as ints.
+					//$post_number = $postinfo[3];
+					$post_title = ( $postinfo[4] != '' ) ? $postinfo[4] : $postinfo[3];
+					$post_author = trim($wpdb->escape($postinfo[1]));
+					$post_author_name = trim(addslashes($postinfo[1]));
+					$post_author_email = $postinfo[5] ? $postinfo[5] : 'no@email.com';
+	
+					if ( $this->import['blogs'][$_GET['blog']]['lump_authors'] ) {
+						// Ignore Blogger authors. Use the current user_ID for all posts imported.
+						$post_author = $GLOBALS['user_ID']; // For WPMU only. Assume all posts belong to the current user.
+					} else {
+						// Add a user for each new author encountered.
+						if (! username_exists($post_author_name) ) {
+							$user_joindate = '1979-06-06 00:41:00'; // that's my birthdate (gmt+1) - I could choose any other date. You could change the date too. Just remember the year must be >=1970 or the world would just randomly fall on your head (everything might look fine, and then blam! major headache!)
+							$user_login = $wpdb->escape($post_author_name);
+							$pass1 = $wpdb->escape('password');
+							$user_email = $wpdb->escape($post_author_email);
+							$user_url = $wpdb->escape('');
+							$user_joindate = $wpdb->escape($user_joindate);
+							$user_password = substr(md5(uniqid(microtime())), 0, 6);
+							$result = wp_create_user( $user_login, $user_password, $user_email );
+							$status.= "Registered user <strong>$user_login</strong>. ";
+							++$this->import['blogs'][$_GET['blog']]['newusers'];
+						}
+						$userdata = get_userdatabylogin( $post_author_name );
+						$post_author = $userdata->ID;
+					}
+					$post_date = explode(' ', $post_date);
+					$post_date_Ymd = explode('/', $post_date[0]);
+					$postyear = $post_date_Ymd[2];
+					$postmonth = zeroise($post_date_Ymd[0], 2);
+					$postday = zeroise($post_date_Ymd[1], 2);
+					$post_date_His = explode(':', $post_date[1]);
+					$posthour = zeroise($post_date_His[0], 2);
+					$postminute = zeroise($post_date_His[1], 2);
+					$postsecond = zeroise($post_date_His[2], 2);
+	
+					if (($post_date[2] == 'PM') && ($posthour != '12'))
+						$posthour = $posthour + 12;
+					else if (($post_date[2] == 'AM') && ($posthour == '12'))
+						$posthour = '00';
+	
+					$post_date = "$postyear-$postmonth-$postday $posthour:$postminute:$postsecond";
+	
+					$post_content = addslashes($post_content);
+					$post_content = str_replace('<br>', '<br />', $post_content); // the XHTML touch... ;)
+	
+					$post_title = addslashes($post_title);
+			
+					$post_status = 'publish';
+	
+					if ( post_exists($post_title, '', $post_date) ) {
+						$skippedpostcount++;
+						$comment_post_ID = $dupcheck[0]['ID'];
+					} else {
+						$post_array = compact('post_author', 'post_content', 'post_title', 'post_category', 'post_author', 'post_date', 'post_status');
+						$comment_post_ID = wp_insert_post($post_array);
+					}
+					
+					// Import any comments attached to this post.
+					if ($postparts[1]) :
+					for ($j = 1; $j < count($postparts); $j = $j + 1) {
+						$commentinfo = explode('|W|P|', $postparts[$j]);
+						$comment_date = explode(' ', $commentinfo[0]);
+						$comment_date_Ymd = explode('/', $comment_date[0]);
+						$commentyear = $comment_date_Ymd[2];
+						$commentmonth = zeroise($comment_date_Ymd[0], 2);
+						$commentday = zeroise($comment_date_Ymd[1], 2);
+						$comment_date_His = explode(':', $comment_date[1]);
+						$commenthour = zeroise($comment_date_His[0], 2);
+						$commentminute = zeroise($comment_date_His[1], 2);
+						$commentsecond = '00';
+						if (($comment_date[2] == 'PM') && ($commenthour != '12'))
+							$commenthour = $commenthour + 12;
+						else if (($comment_date[2] == 'AM') && ($commenthour == '12'))
+							$commenthour = '00';
+						$comment_date = "$commentyear-$commentmonth-$commentday $commenthour:$commentminute:$commentsecond";
+						$comment_author = addslashes(strip_tags(html_entity_decode($commentinfo[1]))); // Believe it or not, Blogger allows a user to call himself "Mr. Hell's Kitchen" which, as a string, really confuses SQL.
+						if ( strpos($commentinfo[1], 'a href') ) {
+							$comment_author_parts = explode('&quot;', htmlentities($commentinfo[1]));
+							$comment_author_url = $comment_author_parts[1];
+						} else $comment_author_url = '';
+						$comment_content = addslashes($commentinfo[2]);
+						$comment_content = str_replace('<br>', '<br />', $comment_content);
+						if ( $comment_post_ID == comment_exists($comment_author, $comment_date) ) {
+							$skippedcommentcount++;
+						} else {
+							$result = $wpdb->query("
+							INSERT INTO $wpdb->comments 
+							(comment_post_ID,comment_author,comment_author_url,comment_date,comment_content)
+							VALUES 
+								('$comment_post_ID','$comment_author','$comment_author_url','$comment_date','$comment_content')
+						");
+						}
+						$commentcount++;
+					}
+					endif;
+					$postcount++;
+				}
+				$status = "$postcount post(s) parsed, $skippedpostcount skipped... $commentcount comment(s) parsed, $skippedcommentcount skipped... <strong>Done</strong>";
+				$import = $this->import;
+				$import['blogs'][$_GET['blog']]['archives']["$url"] = $status;
+				update_option('import-blogger', $import);
+				$did_one = true;
+			}
+			$output.= "<p>$archivename $status</p>\n";
+ 		}
+		if ( ! $did_one )
+			$this->set_next_step(7);
+		die( $this->refresher(5000) . $output );
+	}
+
+	// Step 7: Restore the backed-up settings to Blogger
+	function restore_settings() {
+		$output = "<h1>Restoring your Blogger options</h1>\n";
+		$did_one = false;
+		foreach ( $this->import['blogs'][$_GET['blog']]['options'] as $blog_opt => $optary ) {
+			if ( $did_one ) {
+				$output .= "<p>$blog_opt</p>\n";
+			} elseif ( $optary['restored'] ) {
+				$output .= "<p><del>$blog_opt</del></p>\n";
+			} elseif ( ! $optary['modify'] ) {
+				$output .= "<p><del>$blog_opt</del></p>\n";
+			} else {
+				$posturl = "http://www.blogger.com/{$blog_opt}.do";
+				$headers = array_merge($this->import['blogs'][$_GET['blog']]['options']["$blog_opt"]['cookies'], $this->import['cookies']);
+				if ( 'blog-publishing' == $blog_opt) {
+					if ( $optary['backup']['publishMode'] > 0 ) {
+						$response = $this->get_blogger("http://www.blogger.com/blog-publishing.g?blogID={$_GET['blog']}&publishMode={$optary['backup']['publishMode']}", $headers);
+						if ( $response['code'] >= 400 )
+							die('<h1>Error restoring publishMode.</h1><p>Please tell the devs.</p>' . addslashes(print_r($response, 1)) );
+					}
+				}
+				if ( $optary['backup'] != $optary['modify'] ) {
+					$response = $this->post_blogger($posturl, $headers, $optary['backup']);
+					if ( $response['code'] >= 400 || strstr($response['body'], 'There are errors on this form') )
+						die( "<h1>Error on form submission in Step 7.</h1><p>Please tell the devs.</p>" . addslashes(print_r($response, 1)));
+				}
+				$this->import['blogs'][$_GET['blog']]['options']["$blog_opt"]['restored'] = true;
+				update_option('import-blogger', $this->import);
+				$did_one = true;
+				$output .= "<p><strong>$blog_opt</strong> in progress. Please wait...";
+			}
+		}
+
+		if ( $did_one ) {
+			die( $this->refresher(1000) . $output );
+		}
+
+		$this->set_next_step(8);
+		$this->do_next_step();
+	}
+
+	// Step 8: Republish, all back to normal
+	function republish_blog() {
+		echo $this->refresher(2400) . "<h1>Publishing with original template and options</h1>\n";
+		$this->publish_blogger(9);
+	}
+
+	// Step 9: Congratulate the user
+	function congrats() {
+		echo "<h1>Congratulations!</h1>
+<p>Now that you have imported your Blogger blog into WordPress, what are you going to do? Here are some suggestions:</p>
+<ul>
+<li>That was hard work! Take a break.</li>
+";
+		if ( count($this->import['blogs']) > 1 )
+			echo "<li>In case you haven't done it already, you can import the posts from any other blogs you may have:" . $this->show_blogs() . "</li>\n";
+		if ( $n = count($this->import['blogs'][$_GET['blog']]['newusers']) )
+			echo "<li>Since we had to create $n new users, you probably want to go to <a href='users.php' target='_parent'>Authors & Users</a>, where you can give them new passwords 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.</li>\n";
+		
+		echo "\n<ul>";
+	}
+
+	// Figures out what to do, then does it.
+	function start() {
+		if ( $_GET['restart'] == 'true' ) {
+			$this->restart();
+		}
+		
+		if ( isset($_GET['noheader']) ) {
+			$this->import = get_settings('import-blogger');
+
+			if ( isset($_GET['step']) ) {
+				$step = (int) $_GET['step'];
+			} elseif ( isset($_GET['blog']) ) {
+				$step = $this->import['blogs'][$_GET['blog']]['nextstep'];
+			} elseif ( is_array($this->import['blogs']) ) {
+				$step = 1;
+			} else {
+				$step = 0;
+			}
+			switch ($step) {
+				case 0 :
+					$this->do_login();
+					break;
+				case 1 :
+					$this->select_blog();
+					break;
+				case 2 :
+					$this->backup_settings();
+					break;
+				case 3 :
+					$this->publish_blog();
+					break;
+				case 4 :
+				case 5 :
+					$this->get_archive_urls();
+					break;
+				case 6 :
+					$this->get_archive();
+					break;
+				case 7 :
+					$this->restore_settings();
+					break;
+				case 8 :
+					$this->republish_blog();
+					break;
+				case 9 :
+					$this->congrats();
+					break;
+			}
+
+			die;
+
+		} else {
+			$this->greet();
+		}
+	}
+
+	function Blogger_Import() {
+		// This space intentionally left blank.
+	}
+}
+
+$blogger_import = new Blogger_Import();
+
+register_importer('blogger', 'Blogger', __('Import posts and comments from a Blogger account'), array ($blogger_import, 'start'));
+?>
diff --git a/wp-inst/wp-content/themes/default/searchform.php b/wp-inst/wp-content/themes/default/searchform.php
index 340a34b..fdb226e 100644
--- a/wp-inst/wp-content/themes/default/searchform.php
+++ b/wp-inst/wp-content/themes/default/searchform.php
@@ -1,5 +1,5 @@
-<form method="get" id="searchform" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<form method="get" id="searchform" action="<?php bloginfo('home'); ?>">
 <div><input type="text" value="<?php echo wp_specialchars($s, 1); ?>" name="s" id="s" />
 <input type="submit" id="searchsubmit" value="Search" />
 </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/wp-inst/wp-includes/classes.php b/wp-inst/wp-includes/classes.php
index a12493d..b8991ff 100644
--- a/wp-inst/wp-includes/classes.php
+++ b/wp-inst/wp-includes/classes.php
@@ -30,7 +30,7 @@ class WP_Query {
 	var $is_comments_popup = false;
 	var $is_admin = false;
 
-	function init () {
+	function init_query_flags() {
 		$this->is_single = false;
 		$this->is_page = false;
 		$this->is_archive = false;
@@ -48,7 +48,9 @@ class WP_Query {
 		$this->is_404 = false;
 		$this->is_paged = false;
 		$this->is_admin = false;
-
+	}
+	
+	function init () {
 		unset($this->posts);
 		unset($this->query);
 		unset($this->query_vars);
@@ -57,6 +59,8 @@ class WP_Query {
 		$this->post_count = 0;
 		$this->current_post = -1;
 		$this->in_the_loop = false;
+		
+		$this->init_query_flags();
 	}
 
 	// Reparse the query vars.
@@ -73,6 +77,14 @@ class WP_Query {
 			$this->query_vars = $qv;
 		}
 
+		if ('404' == $qv['error']) {
+			$this->is_404 = true;
+			if ( !empty($query) ) {
+				do_action('parse_query', array(&$this));
+			}
+			return;
+		}
+
 		$qv['m'] =  (int) $qv['m'];
 		$qv['p'] =  (int) $qv['p'];
 
@@ -182,10 +194,6 @@ class WP_Query {
 			$this->is_trackback = true;
 		}
 
-		if ('404' == $qv['error']) {
-			$this->is_404 = true;
-		}
-
 		if ('' != $qv['paged']) {
 			$this->is_paged = true;
 		}
@@ -207,6 +215,11 @@ class WP_Query {
 		}
 	}
 
+	function set_404() {
+		$this->init_query_flags();
+		$this->is_404 = true;	
+	}
+	
 	function get($query_var) {
 		if (isset($this->query_vars[$query_var])) {
 			return $this->query_vars[$query_var];
@@ -1518,7 +1531,7 @@ class WP {
 		if ( (0 == count($wp_query->posts)) && !is_404() && !is_search()
 				 && ( $this->did_permalink || (!empty($_SERVER['QUERY_STRING']) &&
 																	(false === strpos($_SERVER['REQUEST_URI'], '?'))) ) ) {
-			$wp_query->is_404 = true;
+			$wp_query->set_404();
 			status_header( 404 );
 		}	else {
 			status_header( 200 );
diff --git a/wp-inst/wp-includes/comment-functions.php b/wp-inst/wp-includes/comment-functions.php
index c62ed97..ee940f9 100644
--- a/wp-inst/wp-includes/comment-functions.php
+++ b/wp-inst/wp-includes/comment-functions.php
@@ -39,13 +39,17 @@ function clean_url( $url ) {
 	return $url;
 }
 
-function get_comments_number( $comment_id ) {
-	global $wpdb, $comment_count_cache;
-	$comment_id = (int) $comment_id;
-	if (!isset($comment_count_cache[$comment_id]))
-		$comment_count_cache[$comment_id] =  $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = '$comment_id' AND comment_approved = '1'");
+function get_comments_number( $post_id = 0 ) {
+	global $wpdb, $comment_count_cache, $id;
+	$post_id = (int) $post_id;
+
+	if ( !$post_id )
+		$post_id = $id;
+
+	if ( !isset($comment_count_cache[$post_id]) )
+		$comment_count_cache[$post_id] =  $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = '$post_id' AND comment_approved = '1'");
 	
-	return apply_filters('get_comments_number', $comment_count_cache[$comment_id]);
+	return apply_filters('get_comments_number', $comment_count_cache[$post_id]);
 }
 
 function comments_number( $zero = 'No Comments', $one = '1 Comment', $more = '% Comments', $number = '' ) {
diff --git a/wp-inst/wp-includes/functions-post.php b/wp-inst/wp-includes/functions-post.php
index 824cf30..8681a85 100644
--- a/wp-inst/wp-includes/functions-post.php
+++ b/wp-inst/wp-includes/functions-post.php
@@ -180,7 +180,7 @@ function wp_insert_post($postarr = array()) {
 			add_post_meta($post_ID, '_wp_page_template',  $page_template, true);
 	}
 
-	return $rval;
+	return $post_ID;
 }
 
 function wp_get_single_post($postid = 0, $mode = OBJECT) {
diff --git a/wp-inst/wp-includes/gettext.php b/wp-inst/wp-includes/gettext.php
index 45af0f6..ad605cf 100644
--- a/wp-inst/wp-includes/gettext.php
+++ b/wp-inst/wp-includes/gettext.php
@@ -61,12 +61,15 @@ class gettext_reader {
    * @return Integer from the Stream
    */
   function readint() {
+      $stream = $this->STREAM->read(4);
       if ($this->BYTEORDER == 0) {
         // low endian
-        return array_shift(unpack('V', $this->STREAM->read(4)));
+        $unpacked = unpack('V',$stream);
+        return array_shift($unpacked);
       } else {
         // big endian
-        return array_shift(unpack('N', $this->STREAM->read(4)));
+        $unpacked = unpack('N',$stream);
+        return array_shift($unpacked);
       }
     }