Backport from Mark J.

git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@3642 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Version bump
2006-03-14 06:12:59 +00:00 · 2006-03-07 01:52:01 +00:00 · 2006-03-07 01:47:45 +00:00 · 2005-12-13 21:32:46 +00:00 · 2005-08-15 03:57:54 +00:00 · 2005-08-14 18:21:38 +00:00
485 changed files with 23854 additions and 80524 deletions
--- a/index.php
+++ b/index.php
@@ -1,4 +1,4 @@
-<?php
+<?php 
 /* Short and sweet */
 define('WP_USE_THEMES', true);
 require('./wp-blog-header.php');
--- a/readme.html
+++ b/readme.html
@@ -1,83 +1,118 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>WordPress &rsaquo; ReadMe</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<link rel="stylesheet" href="wp-admin/css/install.css" type="text/css" />
+<title>WordPress &rsaquo; ReadMe</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<style type="text/css" media="screen">
+	<!--
+	html {
+		background: #eee;
+	}
+	body {
+		background: #fff;
+		color: #000;
+		font-family: Georgia, "Times New Roman", Times, serif;
+		margin-left: 25%;
+		margin-right: 25%;
+		padding: .2em 2em;
+	}
+	
+	h1 {
+		color: #006;
+		font-size: 18px;
+		font-weight: lighter;
+	}
+	
+	h2 {
+		font-size: 16px;
+	}
+	
+	p, li, dt {
+		line-height: 140%;
+		padding-bottom: 2px;
+	}
+
+	ul, ol {
+		padding: 5px 5px 5px 20px;
+	}
+	-->
+	</style>
 </head>
 <body>
-<h1 id="logo" style="text-align: center">
-	<img alt="WordPress" src="wp-admin/images/wordpress-logo.png" />
-	<br /> Version 2.3
-</h1>
-<p style="text-align: center">Semantic Personal Publishing Platform</p>
-
+<h1 style="text-align: center"><img alt="WordPress" src="http://wordpress.org/images/wordpress.gif" /> <br />
+	Version 1.5</h1>
+<p style="text-align: center"> Semantic Personal Publishing Platform </p>
 <h1>First Things First</h1>
 <p>Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I'm proud to be a part of. Thousands of hours have gone into WordPress, and we're dedicated to making it better every day. Thank you for making it part of your world.</p>
-<p style="text-align: right;">&#8212; Matt Mullenweg</p>
+<p style="text-align: right;">&#8212; Matt Mullenweg </p>

-<h1>Installation: Famous 5-minute install</h1>
+<h1 id="installation">Installation: Famous 5-minute install</h1>
 <ol>
-	<li>Unzip the package in an empty directory.</li>
-	<li>Open up <code>wp-config-sample.php</code> with a text editor like WordPad or similar and fill in your database connection details.</li>
-	<li>Save the file as <code>wp-config.php</code></li>
+	<li>Unzip the package in an empty directory</li>
+	<li>Open up <code>wp-config-sample.php</code> with a text editor like WordPad or similar and fill in your database connection details</li>
+	<li>Save the file as <code>wp-config.php</code> </li>
 	<li>Upload everything.</li>
-	<li>Open <span class="file"><a href="wp-admin/install.php">/wp-admin/install.php</a></span> in your browser. This should setup the tables needed for your blog. If there is an error, double check your <span class="file">wp-config.php</span> file, and try again. If it fails again, please go to the <a href="http://wordpress.org/support/">support forums</a> with as much data as you can gather.</li>
+	<li>Launch <span class="file"><a href="wp-admin/install.php">/wp-admin/install.php</a></span> in your browser. This should setup the tables needed for your blog. If there is an error, double check your <span class="file">wp-config.php</span> file, and try again. If it fails again, please go to the <a href="http://wordpress.org/support/">support forums</a> with as much data as you can gather. </li>
 	<li><strong>Note the password given to you.</strong></li>
 	<li> The install script should then send you to the <a href="wp-login.php">login page</a>. Sign in with the username <code>admin</code> and the password generated during the installation. You can then click on 'Profile' to change the password.</li>
 </ol>

 <h1>Upgrading</h1>
 <p>Before you upgrade anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</p>
-<h2>Upgrading from any previous WordPress to 2.3:</h2>
+<h2>Upgrading from any previous WordPress to 1.5:</h2>
 <ol>
-	<li>Delete your old WP files, saving ones you've modified.</li>
-	<li>Upload the new files.</li>
-	<li>Point your browser to <span class="file"><a href="wp-admin/upgrade.php">/wp-admin/upgrade.php</a>.</span></li>
+	<li>Delete your old WP files, saving ones you've modified </li>
+	<li>Upload the new files</li>
+	<li>Point your browser to <span class="file"><a href="wp-admin/upgrade.php">/wp-admin/upgrade.php</a></span></li>
 	<li>You wanted more, perhaps? That's it!</li>
 </ol>
 <h2>Template Changes</h2>
 <p>If you have customized your templates you will probably have to make some changes to them. If you're converting your 1.2 or earlier templates, <a href="http://codex.wordpress.org/Upgrade_1.2_to_1.5">we've created a special guide for you</a>. </p>
-
 <h1>Online Resources</h1>
 <p>If you have any questions that aren't addressed in this document, please take advantage of WordPress' numerous online resources:</p>
 <dl>
 	<dt><a href="http://codex.wordpress.org/">The WordPress Codex </a></dt>
-		<dd>The Codex is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available.</dd>
+	<dd>The Codex is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available. </dd>
 	<dt><a href="http://wordpress.org/development/">The Development Blog</a></dt>
-		<dd>This is where you'll find the latest updates and news related to WordPress. Bookmark and check often.</dd>
+	<dd>This is where you'll find the latest updates and news related to WordPress. Bookmark and check often. </dd>
 	<dt><a href="http://planet.wordpress.org/">WordPress Planet </a></dt>
-		<dd>The WordPress Planet is a news aggregator that brings together posts from WordPress blogs around the web.</dd>
+	<dd>The WordPress Planet is a news aggregator that brings together posts from WordPress blogs around the web. </dd>
 	<dt><a href="http://wordpress.org/support/">WordPress Support Forums</a></dt>
-		<dd>If you've looked everywhere and still can't find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.</dd>
+	<dd>If you've looked everywhere and still can't find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible. </dd>
 	<dt><a href="http://codex.wordpress.org/IRC">WordPress IRC Channel</a></dt>
-		<dd>Finally, there is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (<a href="irc://irc.freenode.net/wordpress">irc.freenode.net #wordpress</a>)</dd>
+	<dd>Finally, there is an online chat channel that is used for discussion amoung people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (irc.freenode.net #wordpresss) </dd>
 </dl>

-<h1>System Recommendations</h1>
+<h1 id="requirements">System Recommendations</h1>
 <ul>
-	<li>PHP version <strong>4.2</strong> or higher.</li>
-	<li>MySQL version <strong>4.0</strong> or higher.</li>
-	<li>... and a link to <a href="http://wordpress.org/">http://wordpress.org</a> on your site.</li>
+	<li>PHP version <strong>4.1</strong> or higher</li>
+	<li>MySQL version <strong>3.23.23</strong> or higher</li>
+	<li>... and a link to <a href="http://wordpress.org">http://wordpress.org</a> on your site.</li>
 </ul>
-<p>WordPress is the official continuation of <a href="http://cafelog.com/">b2/caf&eacute;log</a>, which came from Michel V. The work has been continued by the <a href="http://wordpress.org/about/">WordPress developers</a>. If you would like to support WordPress, please consider <a href="http://wordpress.org/donate/">donating</a>.</p>
+<p>WordPress is the official continuation of <a href="http://cafelog.com/">b2/caf&eacute;log</a>, which came from Michel V. The work has been continued by the <a href="http://wordpress.org/about/">WordPress developers</a>. If you would like to support WordPress, please consider <a href="http://wordpress.org/donate/">donating</a>. </p>

 <h1>Upgrading from another system</h1>
-<p>WordPress can <a href="http://codex.wordpress.org/Importing_Content">import from a number of systems</a>. First you need to get WordPress installed and working as described above.</p>
+<p>WordPress can <a href="http://codex.wordpress.org/Importing_from_other_blogging_software">import from a number of systems</a>. First you need to get WordPress installed and working as described above.</p>

-<h1>XML-RPC and Atom Interface</h1>
-<p>You can now post to your WordPress blog with tools like <a href="http://windowslivewriter.spaces.live.com/">Windows Live Writer</a>, <a href="http://ecto.kung-foo.tv/">Ecto</a>, <a href="http://bloggar.com/">Bloggar</a>, <a href="http://radio.userland.com">Radio Userland</a> (which means you can use Radio's email-to-blog feature), <a href="http://www.newzcrawler.com/">NewzCrawler</a>, and other tools that support the Blogging APIs! :) You can read more about <a href="http://codex.wordpress.org/XML-RPC_Support">XML-RPC support on the Codex</a>.</p>
+<h1 id="templates">XML-RPC Interface</h1>
+<p>You can now post to your WordPress blog with tools like <a href="http://ecto.kung-foo.tv/">Ecto</a>, <a href="http://blogbuddy.sourceforge.net">BlogBuddy</a>, <a href="http://bloggar.com/">Bloggar</a>, <a href="http://www.ubique.ch/wapblogger/">WapBlogger</a> (post from your Wap cellphone!), <a href="http://radio.userland.com">Radio Userland</a> (which means you can use Radio's email-to-blog feature), <a href="http://www.zempt.com/">Zempt</a>, <a href="http://www.newzcrawler.com/">NewzCrawler</a>, and other tools that support the Blogging APIs! :) You can read more about <a href="http://codex.wordpress.org/XML-RPC_Support">XML-RPC support on the Codex</a>.</p>

 <h1>Post via Email</h1>
-<p>You can post from an email client! To set this up go to your &quot;Writing&quot; options screen and fill in the connection details for your secret POP3 account. Then you need to set up <code>wp-mail.php</code> to execute periodically to check the mailbox for new posts. You can do it with Cron-jobs, or if your host doesn't support it you can look into the various website-monitoring services, and make them check your <code>wp-mail.php</code> URL.</p>
-<p>Posting is easy: Any email sent to the address you specify will be posted, with the subject as the title. It is best to keep the address dicrete. The script will <i>delete</i> emails that are successfully posted.</p>
-
-<h1>User Roles</h1>
-<p>We've eliminated user levels in order to make way for the much more flexible roles system introduced in 2.0. You can <a href="http://codex.wordpress.org/Roles_and_Capabilities">read more about Roles and Capabilities on the Codex</a>.</p>
-
+<p>You can post from an email client! To set this up go to your &quot;Writing&quot; options screen and fill in the connection details for your secret POP3 account. Then you need to set up <code>wp-mail.php</code> to execute periodically to check the mailbox for new posts. You can do it with Cron-jobs, or if your host doesn't support it you can look into the various website-monitoring services, and make them check your <code>wp-mail.php</code> URL. </p>
+<p> Posting is easy: Any email sent to the address you specify will be posted, with the subject as the title. It is best to keep the address dicrete. The script will <i>delete</i> emails that are successfully posted. </p>
+<h1 id="notes">User Levels </h1>
+<p>You may allow or disallow user registration in your <a href="wp-admin/options-general.php">General options</a>. If &quot;new users can blog&quot; is disabled you must first raise the level of a newly registered user to allow them to post. Click the plus sign next to their name on the <a href="wp-admin/users.php">Users</a> page. </p>
+<h2>User Levels</h2>
+<ul>
+	<li>0 - New User </li>
+	<li>1 - User can post, edit, and delete their own posts.</li>
+	<li>5+ - Admin; can post, edit, delete other people's posts, and change the options.</li>
+	<li>Any user whose level is higher than 1, can edit and delete the posts and change the level of lower users. Example: a level 2 user is not an admin, but can edit the posts of level 1 users, and up the level of a new user from 0 to 1.</li>
+</ul>
+<p>Usually you want to have a team of level 1 users except for you.</p>
 <h1> Final notes</h1>
 <ul>
-	<li>If you have any suggestions, ideas, comments, or if you (gasp!) found a bug, join us in the <a href="http://wordpress.org/support/">Support Forums</a>.</li>
+	<li>If you have any suggestions, ideas, comments, or if you (gasp!) found a bug, join us in the <a href="http://wordpress.org/support/">Support Forums</a></li>
 	<li>WordPress now has a robust plugin API that makes extending the code easy. If you are a developer interested in utilizing this see the <a href="http://codex.wordpress.org/Plugin_API">plugin documentation in the Codex</a>. In most all cases you shouldn't modify any of the core code.</li>
 </ul>

@@ -88,4 +123,4 @@
 <p>WordPress is released under the <abbr title="GNU Public License">GPL</abbr> (see <a href="license.txt">license.txt</a>).</p>

 </body>
-</html>
+</html>
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -1,320 +0,0 @@
-<?php
-require_once('../wp-config.php');
-require_once('includes/admin.php');
-
-define('DOING_AJAX', true);
-
-check_ajax_referer();
-if ( !is_user_logged_in() )
-	die('-1');
-
-function get_out_now() { exit; }
-add_action( 'shutdown', 'get_out_now', -1 );
-
-function wp_ajax_meta_row( $pid, $mid, $key, $value ) {
-	$value = attribute_escape($value);
-	$key_js = addslashes(wp_specialchars($key, 'double'));
-	$key = attribute_escape($key);
-	$r .= "<tr id='meta-$mid'><td valign='top'>";
-	$r .= "<input name='meta[$mid][key]' tabindex='6' onkeypress='return killSubmit(\"theList.ajaxUpdater(&#039;meta&#039;,&#039;meta-$mid&#039;);\",event);' type='text' size='20' value='$key' />";
-	$r .= "</td><td><textarea name='meta[$mid][value]' tabindex='6' rows='2' cols='30'>$value</textarea></td><td align='center'>";
-	$r .= "<input name='updatemeta' type='button' class='updatemeta' tabindex='6' value='".attribute_escape(__('Update'))."' onclick='return theList.ajaxUpdater(&#039;meta&#039;,&#039;meta-$mid&#039;);' /><br />";
-	$r .= "<input name='deletemeta[$mid]' type='submit' onclick=\"return deleteSomething( 'meta', $mid, '";
-	$r .= js_escape(sprintf(__("You are about to delete the '%s' custom field on this post.\n'OK' to delete, 'Cancel' to stop."), $key_js));
-	$r .= "' );\" class='deletemeta' tabindex='6' value='".attribute_escape(__('Delete'))."' /></td></tr>";
-	return $r;
-}
-
-$id = (int) $_POST['id'];
-switch ( $_POST['action'] ) :
-case 'delete-comment' :
-	if ( !$comment = get_comment( $id ) )
-		die('0');
-	if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
-		die('-1');
-
-	if ( wp_delete_comment( $comment->comment_ID ) )
-		die('1');
-	else	die('0');
-	break;
-case 'delete-comment-as-spam' :
-	if ( !$comment = get_comment( $id ) )
-		die('0');
-	if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
-		die('-1');
-
-	if ( wp_set_comment_status( $comment->comment_ID, 'spam' ) )
-		die('1');
-	else	die('0');
-	break;
-case 'delete-cat' :
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-
-	if ( wp_delete_category( $id ) )
-		die('1');
-	else	die('0');
-	break;
-case 'delete-link' :
-	if ( !current_user_can( 'manage_links' ) )
-		die('-1');
-
-	if ( wp_delete_link( $id ) )
-		die('1');
-	else	die('0');
-	break;
-case 'delete-meta' :
-	if ( !$meta = get_post_meta_by_id( $id ) )
-		die('0');
-	if ( !current_user_can( 'edit_post', $meta->post_id ) )
-		die('-1');
-	if ( delete_meta( $meta->meta_id ) )
-		die('1');
-	die('0');
-	break;
-case 'delete-post' :
-	if ( !current_user_can( 'delete_post', $id ) )
-		die('-1');
-
-	if ( wp_delete_post( $id ) )
-		die('1');
-	else	die('0');
-	break;
-case 'delete-page' :
-	if ( !current_user_can( 'delete_page', $id ) )
-		die('-1');
-
-	if ( wp_delete_post( $id ) )
-		die('1');
-	else	die('0');
-	break;
-case 'dim-comment' :
-	if ( !$comment = get_comment( $id ) )
-		die('0');
-	if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
-		die('-1');
-	if ( !current_user_can( 'moderate_comments' ) )
-		die('-1');
-
-	if ( 'unapproved' == wp_get_comment_status($comment->comment_ID) ) {
-		if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) )
-			die('1');
-	} else {
-		if ( wp_set_comment_status( $comment->comment_ID, 'hold' ) )
-			die('1');
-	}
-	die('0');
-	break;
-case 'add-category' : // On the Fly
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-	$names = explode(',', $_POST['newcat']);
-	$x = new WP_Ajax_Response();
-	foreach ( $names as $cat_name ) {
-		$cat_name = trim($cat_name);
-		if ( !$category_nicename = sanitize_title($cat_name) )
-			die('0');
-		if ( !$cat_id = category_exists( $cat_name ) )
-			$cat_id = wp_create_category( $cat_name );
-		$cat_name = wp_specialchars(stripslashes($cat_name));
-		$x->add( array(
-			'what' => 'category',
-			'id' => $cat_id,
-			'data' => "<li id='category-$cat_id'><label for='in-category-$cat_id' class='selectit'><input value='$cat_id' type='checkbox' checked='checked' name='post_category[]' id='in-category-$cat_id'/> $cat_name</label></li>"
-		) );
-	}
-	$x->send();
-	break;
-case 'add-link-category' : // On the Fly
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-	$names = explode(',', $_POST['newcat']);
-	$x = new WP_Ajax_Response();
-	foreach ( $names as $cat_name ) {
-		$cat_name = trim($cat_name);
-		if ( !$slug = sanitize_title($cat_name) )
-			die('0');
-		if ( !$cat_id = is_term( $cat_name, 'link_category' ) ) {
-			$cat_id = wp_insert_term( $cat_name, 'link_category' );
-			$cat_id = $cat_id['term_id'];
-		}
-		$cat_name = wp_specialchars(stripslashes($cat_name));
-		$x->add( array(
-			'what' => 'link-category',
-			'id' => $cat_id,
-			'data' => "<li id='link-category-$cat_id'><label for='in-link-category-$cat_id' class='selectit'><input value='$cat_id' type='checkbox' checked='checked' name='link_category[]' id='in-link-category-$cat_id'/> $cat_name</label></li>"
-		) );
-	}
-	$x->send();
-	break;
-case 'add-cat' : // From Manage->Categories
-	if ( !current_user_can( 'manage_categories' ) )
-		die('-1');
-	if ( !$cat = wp_insert_category( $_POST ) )
-		die('0');
-	if ( !$cat = get_category( $cat ) )
-		die('0');
-	$level = 0;
-	$cat_full_name = $cat->cat_name;
-	$_cat = $cat;
-	while ( $_cat->category_parent ) {
-		$_cat = get_category( $_cat->category_parent );
-		$cat_full_name = $_cat->cat_name . ' &#8212; ' . $cat_full_name;
-		$level++;
-	}
-	$cat_full_name = attribute_escape($cat_full_name);
-
-	$x = new WP_Ajax_Response( array(
-		'what' => 'cat',
-		'id' => $cat->cat_ID,
-		'data' => _cat_row( $cat, $level, $cat_full_name ),
-		'supplemental' => array('name' => $cat_full_name, 'show-link' => sprintf(__( 'Category <a href="#%s">%s</a> added' ), "cat-$cat->cat_ID", $cat_full_name))
-	) );
-	$x->send();
-	break;
-case 'add-comment' :
-	if ( !current_user_can( 'edit_post', $id ) )
-		die('-1');
-	$search = isset($_POST['s']) ? $_POST['s'] : false;
-	$start = isset($_POST['page']) ? intval($_POST['page']) * 25 : 25;
-
-	list($comments, $total) = _wp_get_comment_list( $search, $start, 1 );
-
-	if ( !$comments )
-		die('1');
-	$x = new WP_Ajax_Response();
-	foreach ( (array) $comments as $comment ) {
-		get_comment( $comment );
-		ob_start();
-			_wp_comment_list_item( $comment->comment_ID );
-			$comment_list_item = ob_get_contents();
-		ob_end_clean();
-		$x->add( array(
-			'what' => 'comment',
-			'id' => $comment->comment_ID,
-			'data' => $comment_list_item
-		) );
-	}
-	$x->send();
-	break;
-case 'add-meta' :
-	if ( !current_user_can( 'edit_post', $id ) )
-		die('-1');
-	if ( $id < 0 ) {
-		$now = current_time('timestamp', 1);
-		if ( $pid = wp_insert_post( array(
-			'post_title' => sprintf('Draft created on %s at %s', date(get_option('date_format'), $now), date(get_option('time_format'), $now))
-		) ) ) {
-			if ( is_wp_error( $pid ) )
-				return $pid;
-			$mid = add_meta( $pid );
-		}
-		else
-			die('0');
-	} else if ( !$mid = add_meta( $id ) ) {
-		die('0');
-	}
-
-	$meta = get_post_meta_by_id( $mid );
-	$key = $meta->meta_key;
-	$value = $meta->meta_value;
-	$pid = (int) $meta->post_id;
-
-	$x = new WP_Ajax_Response( array(
-		'what' => 'meta',
-		'id' => $mid,
-		'data' => wp_ajax_meta_row( $pid, $mid, $key, $value ),
-		'supplemental' => array('postid' => $pid)
-	) );
-	$x->send();
-	break;
-case 'update-meta' :
-	$mid = (int) array_pop(array_keys($_POST['meta']));
-	$key = $_POST['meta'][$mid]['key'];
-	$value = $_POST['meta'][$mid]['value'];
-	if ( !$meta = get_post_meta_by_id( $mid ) )
-		die('0'); // if meta doesn't exist
-	if ( !current_user_can( 'edit_post', $meta->post_id ) )
-		die('-1');
-	if ( $u = update_meta( $mid, $key, $value ) ) {
-		$key = stripslashes($key);
-		$value = stripslashes($value);
-		$x = new WP_Ajax_Response( array(
-			'what' => 'meta',
-			'id' => $mid,
-			'data' => wp_ajax_meta_row( $meta->post_id, $mid, $key, $value ),
-			'supplemental' => array('postid' => $meta->post_id)
-		) );
-		$x->send();
-	}
-	die('1'); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
-	break;
-case 'add-user' :
-	if ( !current_user_can('edit_users') )
-		die('-1');
-	require_once(ABSPATH . WPINC . '/registration.php');
-	if ( !$user_id = add_user() )
-		die('0');
-	elseif ( is_wp_error( $user_id ) ) {
-		foreach( $user_id->get_error_messages() as $message )
-			echo "<p>$message<p>";
-		exit;
-	}
-	$user_object = new WP_User( $user_id );
-	$x = new WP_Ajax_Response( array(
-		'what' => 'user',
-		'id' => $user_id,
-		'data' => user_row( $user_object ),
-		'supplemental' => array('show-link' => sprintf(__( 'User <a href="#%s">%s</a> added' ), "user-$user_id", $user_object->user_login))
-	) );
-	$x->send();
-	break;
-case 'autosave' : // The name of this action is hardcoded in edit_post()
-	$_POST['post_content'] = $_POST['content'];
-	$_POST['post_excerpt'] = $_POST['excerpt'];
-	$_POST['post_status'] = 'draft';
-	$_POST['post_category'] = explode(",", $_POST['catslist']);
-	if($_POST['post_type'] == 'page' || empty($_POST['post_category']))
-		unset($_POST['post_category']);
-
-	if($_POST['post_ID'] < 0) {
-		$_POST['temp_ID'] = $_POST['post_ID'];
-		$id = wp_write_post();
-		if( is_wp_error($id) )
-			die($id->get_error_message());
-		else
-			die("$id");
-	} else {
-		$post_ID = (int) $_POST['post_ID'];
-		$_POST['ID'] = $post_ID;
-		$post = get_post($post_ID);
-		if ( 'page' == $post->post_type ) {
-			if ( !current_user_can('edit_page', $post_ID) )
-				die(__('You are not allowed to edit this page.'));
-		} else {
-			if ( !current_user_can('edit_post', $post_ID) )
-				die(__('You are not allowed to edit this post.'));
-		}
-		wp_update_post($_POST);
-	}
-	die('0');
-break;
-case 'autosave-generate-nonces' :
-	$ID = (int) $_POST['post_ID'];
-	if($_POST['post_type'] == 'post') {
-		if(current_user_can('edit_post', $ID))
-			die(wp_create_nonce('update-post_' . $ID));
-	}
-	if($_POST['post_type'] == 'page') {
-		if(current_user_can('edit_page', $ID)) {
-			die(wp_create_nonce('update-page_' . $ID));
-		}
-	}
-	die('0');
-break;
-default :
-	do_action( 'wp_ajax_' . $_POST['action'] );
-	die('0');
-	break;
-endswitch;
-?>
--- a/wp-admin/admin-footer.php
+++ b/wp-admin/admin-footer.php
@@ -1,13 +1,13 @@

-<div id="footer">
-<p><?php
+<div id="footer"><p><a href="http://wordpress.org/"><img src="../wp-images/wp-small.png" alt="WordPress" /></a><br />
+<?php bloginfo('version'); ?> <br /> 
+<a href="http://codex.wordpress.org/"><?php _e('Documentation'); ?></a> &#8212; <a href="http://wordpress.org/support/"><?php _e('Support Forums'); ?></a> <br />
+<?php printf(__('%s seconds'), number_format(timer_stop(), 2)); ?>
+</p>

-$upgrade = apply_filters( 'update_footer', '' );
-echo __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>').' | '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' | '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>').' '.$upgrade;
-
-?></p>
 </div>
+
 <?php do_action('admin_footer', ''); ?>
-<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
+
 </body>
-</html>
+</html>
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -1,54 +1,98 @@
-<?php
-@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
-if (!isset($_GET["page"])) require_once('admin.php');
-if ( $editing ) {
-	wp_enqueue_script( array('dbx-admin-key?pagenow=' . attribute_escape($pagenow),'admin-custom-fields') );
-	if ( current_user_can('manage_categories') )
-		wp_enqueue_script( 'ajaxcat' );
-	if ( user_can_richedit() )
-		wp_enqueue_script( 'wp_tiny_mce' );
-}
-
-get_admin_page_title();
-
-?>
+<?php 
+@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
+if (!isset($_GET["page"])) require_once('admin.php'); ?>
+<?php get_admin_page_title(); ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-<title><?php bloginfo('name') ?> &rsaquo; <?php echo wp_specialchars( strip_tags( $title ) ); ?> &#8212; WordPress</title>
-<?php wp_admin_css(); ?>
+<title><?php bloginfo('name') ?> &rsaquo; <?php echo $title; ?> &#8212; WordPress</title>
+<link rel="stylesheet" href="<?php echo get_settings('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
+
 <script type="text/javascript">
 //<![CDATA[
-function addLoadEvent(func) {if ( typeof wpOnload!='function'){wpOnload=func;}else{ var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}}
+
+function customToggleLink() {
+	// TODO: Only show link if there's a hidden row
+	document.write('<small>(<a href="javascript:;" id="customtoggle" onclick="toggleHidden()"><?php _e('Show hidden'); ?></a>)</small>');
+	// TODO: Rotate link to say "show" or "hide"
+	// TODO: Use DOM
+}
+
+function toggleHidden() {
+	var allElements = document.getElementsByTagName('tr');
+	for (i = 0; i < allElements.length; i++) {
+		if ( allElements[i].className.indexOf('hidden') != -1 ) {
+			 allElements[i].className = allElements[i].className.replace('hidden', '');
+		}
+	}
+}
+
+<?php if ( isset($xfn) ) : ?>
+
+function GetElementsWithClassName(elementName, className) {
+	var allElements = document.getElementsByTagName(elementName);
+	var elemColl = new Array();
+	for (i = 0; i < allElements.length; i++) {
+		if (allElements[i].className == className) {
+			elemColl[elemColl.length] = allElements[i];
+		}
+	}
+	return elemColl;
+}
+
+function meChecked() {
+  var undefined;
+  var eMe = document.getElementById('me');
+  if (eMe == undefined) return false;
+  else return eMe.checked;
+}
+
+function upit() {
+	var isMe = meChecked(); //document.getElementById('me').checked;
+	var inputColl = GetElementsWithClassName('input', 'valinp');
+	var results = document.getElementById('rel');
+	var linkText, linkUrl, inputs = '';
+	for (i = 0; i < inputColl.length; i++) {
+		 inputColl[i].disabled = isMe;
+		 inputColl[i].parentNode.className = isMe ? 'disabled' : '';
+		 if (!isMe && inputColl[i].checked && inputColl[i].value != '') {
+			inputs += inputColl[i].value + ' ';
+				}
+		 }
+	inputs = inputs.substr(0,inputs.length - 1);
+	if (isMe) inputs='me';
+	results.value = inputs;
+	}
+
+function blurry() {
+	if (!document.getElementById) return;
+
+	var aInputs = document.getElementsByTagName('input');
+
+	for (var i = 0; i < aInputs.length; i++) {		
+		 aInputs[i].onclick = aInputs[i].onkeyup = upit;
+	}
+}
+
+window.onload = blurry;
+<?php endif; ?>
+
 //]]>
 </script>
-<?php if ( ($parent_file != 'link-manager.php') && ($parent_file != 'options-general.php') ) : ?>
-<style type="text/css">* html { overflow-x: hidden; }</style>
-<?php endif;
-if ( isset($page_hook) )
-	do_action('admin_print_scripts-' . $page_hook);
-else if ( isset($plugin_page) )
-	do_action('admin_print_scripts-' . $plugin_page);
-do_action('admin_print_scripts');

-if ( isset($page_hook) )
-	do_action('admin_head-' . $page_hook);
-else if ( isset($plugin_page) )
-	do_action('admin_head-' . $plugin_page);
-do_action('admin_head');
-?>
+<?php do_action('admin_head', ''); ?>
 </head>
-<body class="wp-admin <?php echo apply_filters( 'admin_body_class', '' ); ?>">
+<body>
+
 <div id="wphead">
-<h1><?php bloginfo('name'); ?> <span id="viewsite">(<a href="<?php echo get_option('home') . '/'; ?>"><?php _e('View site &raquo;') ?></a>)</span></h1>
+<h1><?php echo wptexturize(get_settings(('blogname'))); ?> <span>(<a href="<?php echo get_settings('home') . '/'; ?>"><?php _e('View site') ?> &raquo;</a>)</span></h1>
 </div>
-<div id="user_info"><p><?php printf(__('Howdy, <strong>%s</strong>.'), $user_identity) ?> [<a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php _e('Sign Out'); ?></a>, <a href="profile.php"><?php _e('My Profile'); ?></a>] </p></div>

 <?php
-require(ABSPATH . 'wp-admin/menu-header.php');
+require(ABSPATH . '/wp-admin/menu-header.php');

 if ( $parent_file == 'options-general.php' ) {
-	require(ABSPATH . 'wp-admin/options-head.php');
+	require(ABSPATH . '/wp-admin/options-head.php');
 }
 ?>
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -3,108 +3,69 @@ if ( defined('ABSPATH') )
 	require_once( ABSPATH . 'wp-config.php');
 else
    require_once('../wp-config.php');
-
-if ( get_option('db_version') != $wp_db_version ) {
-	wp_redirect(get_option('siteurl') . '/wp-admin/upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI'])));
-	exit;
-}
-
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
-
+    
+require_once(ABSPATH . 'wp-admin/admin-functions.php');
 auth_redirect();

-nocache_headers();
+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');

 update_category_cache();

-wp_get_current_user();
+get_currentuserinfo();

-$posts_per_page = get_option('posts_per_page');
-$what_to_show = get_option('what_to_show');
-$date_format = get_option('date_format');
-$time_format = get_option('time_format');
+$posts_per_page = get_settings('posts_per_page');
+$what_to_show = get_settings('what_to_show');
+$date_format = get_settings('date_format');
+$time_format = get_settings('time_format');

-wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback'));
-
-wp_enqueue_script( 'fat' );
-
-$editing = false;
-
-if (isset($_GET['page'])) {
-	$plugin_page = stripslashes($_GET['page']);
-	$plugin_page = plugin_basename($plugin_page);
+$wpvarstoreset = array('profile','redirect','redirect_url','a','popuptitle','popupurl','text', 'trackback', 'pingback');
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+    $wpvar = $wpvarstoreset[$i];
+    if (!isset($$wpvar)) {
+        if (empty($_POST["$wpvar"])) {
+            if (empty($_GET["$wpvar"])) {
+                $$wpvar = '';
+            } else {
+                $$wpvar = $_GET["$wpvar"];
+            }
+        } else {
+            $$wpvar = $_POST["$wpvar"];
+        }
+    }
 }

-require(ABSPATH . 'wp-admin/menu.php');
+require(ABSPATH . '/wp-admin/menu.php');

 // Handle plugin admin pages.
-if (isset($plugin_page)) {
+if (isset($_GET['page'])) {
+	$plugin_page = plugin_basename($_GET['page']);
 	$page_hook = get_plugin_page_hook($plugin_page, $pagenow);

 	if ( $page_hook ) {
-		do_action('load-' . $page_hook);
 		if (! isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
-
+			require_once(ABSPATH . '/wp-admin/admin-header.php');
+		
 		do_action($page_hook);
 	} else {
 		if ( validate_file($plugin_page) ) {
-			wp_die(__('Invalid plugin page'));
+			die(__('Invalid plugin page'));
 		}
-
-		if (! file_exists(ABSPATH . PLUGINDIR . "/$plugin_page"))
-			wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
-
-		do_action('load-' . $plugin_page);
+		
+		if (! file_exists(ABSPATH . "wp-content/plugins/$plugin_page"))
+			die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));

 		if (! isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
-
-		include(ABSPATH . PLUGINDIR . "/$plugin_page");
+			require_once(ABSPATH . '/wp-admin/admin-header.php');
+		
+		include(ABSPATH . "wp-content/plugins/$plugin_page");
 	}
-
+	
 	include(ABSPATH . 'wp-admin/admin-footer.php');

 	exit();
-} else if (isset($_GET['import'])) {
-
-	$importer = $_GET['import'];
-
-	if ( ! current_user_can('import') )
-		wp_die(__('You are not allowed to import.'));
-
-	if ( validate_file($importer) ) {
-		wp_die(__('Invalid importer.'));
-	}
-
-	// Allow plugins to define importers as well
-	if (! is_callable($wp_importers[$importer][2]))
-	{
-		if (! file_exists(ABSPATH . "wp-admin/import/$importer.php"))
-		{
-			wp_die(__('Cannot load importer.'));
-		}
-		include(ABSPATH . "wp-admin/import/$importer.php");
-	}
-
-	$parent_file = 'edit.php';
-	$submenu_file = 'import.php';
-	$title = __('Import');
-
-	if (! isset($_GET['noheader']))
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
-
-	require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
-
-	define('WP_IMPORTING', true);
-
-	call_user_func($wp_importers[$importer][2]);
-
-	include(ABSPATH . 'wp-admin/admin-footer.php');
-
-	exit();
-} else {
-	do_action("load-$pagenow");
 }

-?>
+?>
--- a/wp-admin/bookmarklet.php
+++ b/wp-admin/bookmarklet.php
@@ -2,10 +2,11 @@
 $mode = 'bookmarklet';
 require_once('admin.php');

-if ( ! current_user_can('edit_posts') )
-	wp_die(__('Cheatin&#8217; uh?'));
+if ($user_level == 0)
+	die ("Cheatin' uh?");
+
+if ('b' == $a) {

-if ('b' == $a):
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -18,40 +19,41 @@ window.close()
 <body></body>
 </html>
 <?php
-exit;
-endif;
-
-$post = get_default_post_to_edit();
-
-$popuptitle = wp_specialchars(stripslashes($popuptitle));
-$text       = wp_specialchars(stripslashes(urldecode($text)));
-
-$popuptitle = funky_javascript_fix($popuptitle);
-$text       = funky_javascript_fix($text);
-
-$post_title = wp_specialchars($_REQUEST['post_title']);
-if (!empty($post_title))
-	$post->post_title =  stripslashes($post_title);
-else
-	$post->post_title = $popuptitle;
-
-
-$content  = wp_specialchars($_REQUEST['content']);
-$popupurl = clean_url($_REQUEST['popupurl']);
-if ( !empty($content) ) {
-	$post->post_content = wp_specialchars( stripslashes($_REQUEST['content']) );
 } else {
-	$post->post_content = '<a href="'.$popupurl.'">'.$popuptitle.'</a>'."\n$text";
-}
+	$popuptitle = wp_specialchars(stripslashes($popuptitle));
+	$text       = wp_specialchars(stripslashes(urldecode($text)));
+	
+	$popuptitle = funky_javascript_fix($popuptitle);
+	$text       = funky_javascript_fix($text);
+	
+	$post_title = wp_specialchars($_REQUEST['post_title']);
+	if (!empty($post_title)) {
+		$post_title =  stripslashes($post_title);
+	} else {
+		$post_title = $popuptitle;
+	}
+	
+	$edited_post_title = wp_specialchars($post_title);

-/* /big funky fixes */
+// $post_pingback needs to be set in any file that includes edit-form.php
+    $post_pingback = get_settings('default_pingback_flag');
+    
+    $content  = wp_specialchars($_REQUEST['content']);
+	$popupurl = wp_specialchars($_REQUEST['popupurl']);
+    if ( !empty($content) ) {
+        $content = wp_specialchars( stripslashes($_REQUEST['content']) );
+    } else {
+        $content = '<a href="'.$popupurl.'">'.$popuptitle.'</a>'."\n$text";
+    }
+    
+    /* /big funky fixes */

 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title><?php bloginfo('name') ?> &rsaquo; Bookmarklet &#8212; WordPress</title>
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-<?php wp_admin_css(); ?>
+<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
+<link rel="stylesheet" href="wp-admin.css" type="text/css" />

 <style type="text/css">
 <!--
@@ -77,15 +79,15 @@ if ( !empty($content) ) {
 }

 #wpbookmarklet .wrap {
-	border: 0px;
+    border: 0px;
 }

 #wpbookmarklet #postdiv {
-	margin-bottom: 0.5em;
+    margin-bottom: 0.5em;
 }

 #wpbookmarklet #titlediv {
-	margin-bottom: 1em;
+    margin-bottom: 1em;
 }

 -->
@@ -101,4 +103,6 @@ if ( !empty($content) ) {
 <?php do_action('admin_footer', ''); ?>

 </body>
-</html>
+</html><?php
+}
+?>
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -4,118 +4,178 @@ require_once('admin.php');
 $title = __('Categories');
 $parent_file = 'edit.php';

-wp_reset_vars(array('action', 'cat'));
+$wpvarstoreset = array('action','cat');
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+    $wpvar = $wpvarstoreset[$i];
+    if (!isset($$wpvar)) {
+        if (empty($_POST["$wpvar"])) {
+            if (empty($_GET["$wpvar"])) {
+                $$wpvar = '';
+            } else {
+                $$wpvar = $_GET["$wpvar"];
+            }
+        } else {
+            $$wpvar = $_POST["$wpvar"];
+        }
+    }
+}

 switch($action) {

 case 'addcat':
-
-	check_admin_referer('add-category');
-
-	if ( !current_user_can('manage_categories') )
-		wp_die(__('Cheatin&#8217; uh?'));
-
-	if( wp_insert_category($_POST ) ) {
-		wp_redirect('categories.php?message=1#addcat');
-	} else {
-		wp_redirect('categories.php?message=4#addcat');
-	}
-	exit;
+	if ($user_level < 3)
+		die (__('Cheatin&#8217; uh?'));
+	
+	$cat_name= wp_specialchars($_POST['cat_name']);
+	$id_result = $wpdb->get_row("SHOW TABLE STATUS LIKE '$wpdb->categories'");
+	$cat_ID = $id_result->Auto_increment;
+	$category_nicename = sanitize_title($cat_name, $cat_ID);
+	$category_description = $_POST['category_description'];
+	$cat = intval($_POST['cat']);
+	
+	$wpdb->query("INSERT INTO $wpdb->categories (cat_ID, cat_name, category_nicename, category_description, category_parent) VALUES ('0', '$cat_name', '$category_nicename', '$category_description', '$cat')");
+	do_action('add_category', $wpdb->insert_id);
+	
+	header('Location: categories.php?message=1#addcat');
 break;

 case 'delete':
+
+	check_admin_referer();
+
 	$cat_ID = (int) $_GET['cat_ID'];
-	check_admin_referer('delete-category_' .  $cat_ID);
-
-	if ( !current_user_can('manage_categories') )
-		wp_die(__('Cheatin&#8217; uh?'));
-
 	$cat_name = get_catname($cat_ID);
+	$category = $wpdb->get_row("SELECT * FROM $wpdb->categories WHERE cat_ID = '$cat_ID'");
+	$cat_parent = $category->category_parent;

-	// Don't delete the default cats.
-    if ( $cat_ID == get_option('default_category') )
-		wp_die(sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name));
+	if ( 1 == $cat_ID )
+		die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one"), $cat_name));

-	wp_delete_category($cat_ID);
+	if ( $user_level < 3 )
+		die (__('Cheatin&#8217; uh?'));

-	wp_redirect('categories.php?message=2');
-	exit;
+	$wpdb->query("DELETE FROM $wpdb->categories WHERE cat_ID = '$cat_ID'");
+	$wpdb->query("UPDATE $wpdb->categories SET category_parent = '$cat_parent' WHERE category_parent = '$cat_ID'");
+	// TODO: Only set categories to general if they're not in another category already
+	$wpdb->query("UPDATE $wpdb->post2cat SET category_id='1' WHERE category_id='$cat_ID'");
+	do_action('delete_category', $cat_ID);
+
+	header('Location: categories.php?message=2');

 break;

 case 'edit':

-	require_once ('admin-header.php');
-	$cat_ID = (int) $_GET['cat_ID'];
-	$category = get_category_to_edit($cat_ID);
-	include('edit-category-form.php');
+    require_once ('admin-header.php');
+    $cat_ID = (int) $_GET['cat_ID'];
+    $category = $wpdb->get_row("SELECT * FROM $wpdb->categories WHERE cat_ID = '$cat_ID'");
+    $cat_name = $category->cat_name;
+    ?>
+
+<div class="wrap">
+ <h2><?php _e('Edit Category') ?></h2>
+ <form name="editcat" action="categories.php" method="post">
+	  <table class="editform" width="100%" cellspacing="2" cellpadding="5">
+		<tr>
+		  <th width="33%" scope="row"><?php _e('Category name:') ?></th>
+		  <td width="67%"><input name="cat_name" type="text" value="<?php echo wp_specialchars($cat_name); ?>" size="40" /> <input type="hidden" name="action" value="editedcat" />
+<input type="hidden" name="cat_ID" value="<?php echo $cat_ID ?>" /></td>
+		</tr>
+		<tr>
+			<th scope="row"><?php _e('Category slug:') ?></th>
+			<td><input name="category_nicename" type="text" value="<?php echo wp_specialchars($category->category_nicename); ?>" size="40" /></td>
+		</tr>
+		<tr>
+			<th scope="row"><?php _e('Category parent:') ?></th>
+			<td>        
+			<select name='cat'>
+	  <option value='0' <?php if (!$category->category_parent) echo " selected='selected'"; ?>><?php _e('None') ?></option>
+	  <?php wp_dropdown_cats($category->cat_ID, $category->category_parent); ?>
+	  </select></td>
+		</tr>
+		<tr>
+			<th scope="row"><?php _e('Description:') ?></th>
+			<td><textarea name="category_description" rows="5" cols="50" style="width: 97%;"><?php echo wp_specialchars($category->category_description, 1); ?></textarea></td>
+		</tr>
+		</table>
+	  <p class="submit"><input type="submit" name="submit" value="<?php _e('Edit category') ?> &raquo;" /></p>
+ </form>
+ <p><a href="categories.php"><?php _e('&laquo; Return to category list'); ?></a></p>
+</div>
+    <?php

 break;

 case 'editedcat':
+	if ($user_level < 3)
+		die (__('Cheatin&#8217; uh?'));
+	
+	$cat_name = wp_specialchars($_POST['cat_name']);
 	$cat_ID = (int) $_POST['cat_ID'];
-	check_admin_referer('update-category_' . $cat_ID);
+	$category_nicename = sanitize_title($_POST['category_nicename'], $cat_ID);
+	$category_description = $_POST['category_description'];
+	
+	$wpdb->query("UPDATE $wpdb->categories SET cat_name = '$cat_name', category_nicename = '$category_nicename', category_description = '$category_description', category_parent = '$cat' WHERE cat_ID = '$cat_ID'");

-	if ( !current_user_can('manage_categories') )
-		wp_die(__('Cheatin&#8217; uh?'));
-
-	if ( wp_update_category($_POST) )
-		wp_redirect('categories.php?message=3');
-	else
-		wp_redirect('categories.php?message=5');
-
-	exit;
+	header('Location: categories.php?message=3');
 break;

 default:

-wp_enqueue_script( 'admin-categories' );
 require_once ('admin-header.php');

 $messages[1] = __('Category added.');
 $messages[2] = __('Category deleted.');
 $messages[3] = __('Category updated.');
-$messages[4] = __('Category not added.');
-$messages[5] = __('Category not updated.');
 ?>

 <?php if (isset($_GET['message'])) : ?>
-<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
+<div class="updated"><p><?php echo $messages[$_GET['message']]; ?></p></div>
 <?php endif; ?>

 <div class="wrap">
-<?php if ( current_user_can('manage_categories') ) : ?>
+<?php if ( $user_level > 3 ) : ?>
 	<h2><?php printf(__('Categories (<a href="%s">add new</a>)'), '#addcat') ?> </h2>
 <?php else : ?>
 	<h2><?php _e('Categories') ?> </h2>
 <?php endif; ?>
-<table class="widefat">
-	<thead>
+<table width="100%" cellpadding="3" cellspacing="3">
 	<tr>
-		<th scope="col" style="text-align: center"><?php _e('ID') ?></th>
+		<th scope="col"><?php _e('ID') ?></th>
        <th scope="col"><?php _e('Name') ?></th>
        <th scope="col"><?php _e('Description') ?></th>
-        <th scope="col" width="90" style="text-align: center"><?php _e('Posts') ?></th>
-        <th colspan="2" style="text-align: center"><?php _e('Action') ?></th>
+        <th scope="col"><?php _e('# Posts') ?></th>
+        <th colspan="2"><?php _e('Action') ?></th>
 	</tr>
-	</thead>
-	<tbody id="the-list">
 <?php
 cat_rows();
 ?>
-	</tbody>
 </table>

 </div>

-<?php if ( current_user_can('manage_categories') ) : ?>
+<?php if ( $user_level > 3 ) : ?>
 <div class="wrap">
-<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_catname(get_option('default_category')))) ?></p>
-<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'admin.php?import=wp-cat2tag') ?></p>
+    <p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete posts from that category, it will just set them back to the default category <strong>%s</strong>.'), get_catname(1)) ?>
+  </p>
 </div>

-<?php include('edit-category-form.php'); ?>
-
+<div class="wrap">
+    <h2><?php _e('Add New Category') ?></h2>
+    <form name="addcat" id="addcat" action="categories.php" method="post">
+        
+        <p><?php _e('Name:') ?><br />
+        <input type="text" name="cat_name" value="" /></p>
+        <p><?php _e('Category parent:') ?><br />
+        <select name='cat' class='postform'>
+        <option value='0'><?php _e('None') ?></option>
+        <?php wp_dropdown_cats(0); ?>
+        </select></p>
+        <p><?php _e('Description: (optional)') ?> <br />
+        <textarea name="category_description" rows="5" cols="50" style="width: 97%;"></textarea></p>
+        <p class="submit"><input type="hidden" name="action" value="addcat" /><input type="submit" name="submit" value="<?php _e('Add Category &raquo;') ?>" /></p>
+    </form>
+</div>
 <?php endif; ?>

 <?php
@@ -123,5 +183,4 @@ break;
 }

 include('admin-footer.php');
-
 ?>
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -1,213 +0,0 @@
-<?php
-require_once('admin.php');
-
-$parent_file = 'edit-comments.php';
-$submenu_file = 'edit-comments.php';
-
-wp_reset_vars(array('action'));
-
-if ( isset( $_POST['deletecomment'] ) )
-	$action = 'deletecomment';
-
-switch($action) {
-case 'editcomment':
-	$title = __('Edit Comment');
-
-	require_once ('admin-header.php');
-
-	$comment = (int) $_GET['c'];
-
-	if ( ! $comment = get_comment($comment) )
-		wp_die(__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!', 'javascript:history.go(-1)'));
-
-	if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-		wp_die( __('You are not allowed to edit comments on this post.') );
-
-	$comment = get_comment_to_edit($comment);
-
-	include('edit-form-comment.php');
-
-	break;
-
-case 'cdc':
-case 'mac':
-
-	require_once('./admin-header.php');
-
-	$comment = (int) $_GET['c'];
-	$formaction = 'cdc' == $action ? 'deletecomment' : 'approvecomment';
-	$nonce_action = 'cdc' == $action ? 'delete-comment_' : 'approve-comment_';
-	$nonce_action .= $comment;
-
-	if ( ! $comment = get_comment_to_edit($comment) )
-		wp_die(__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php'));
-
-	if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-		wp_die( 'cdc' == $action ? __('You are not allowed to delete comments on this post.') : __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
-?>
-<div class='wrap'>
-
-<div class="narrow">
-<?php if ( 'spam' == $_GET['dt'] ) { ?>
-<p><?php echo '<strong>'.__('Caution:').'</strong> '.__('You are about to mark the following comment as spam:'); ?></p>
-<?php } elseif ( 'cdc' == $action ) { ?>
-<p><?php echo '<strong>'.__('Caution:').'</strong> '.__('You are about to delete the following comment:'); ?></p>
-<?php } else { ?>
-<p><?php echo '<strong>'.__('Caution:').'</strong> '.__('You are about to approve the following comment:'); ?></p>
-<?php } ?>
-
-<p><?php _e('Are you sure you want to do that?'); ?></p>
-
-<form action='<?php echo get_option('siteurl'); ?>/wp-admin/comment.php' method='get'>
-
-<table width="100%">
-<tr>
-<td><input type='button' value='<?php _e('No'); ?>' onclick="self.location='<?php echo get_option('siteurl'); ?>/wp-admin/edit-comments.php';" /></td>
-<td align="right"><input type='submit' value='<?php _e('Yes'); ?>' /></td>
-</tr>
-</table>
-
-<?php wp_nonce_field($nonce_action); ?>
-<input type='hidden' name='action' value='<?php echo $formaction; ?>' />
-<?php if ( 'spam' == $_GET['dt'] ) { ?>
-<input type='hidden' name='dt' value='spam' />
-<?php } ?>
-<input type='hidden' name='p' value='<?php echo $comment->comment_post_ID; ?>' />
-<input type='hidden' name='c' value='<?php echo $comment->comment_ID; ?>' />
-<input type='hidden' name='noredir' value='1' />
-</form>
-
-<table class="editform" cellpadding="5">
-<tr class="alt">
-<th scope="row"><?php _e('Author:'); ?></th>
-<td><?php echo $comment->comment_author; ?></td>
-</tr>
-<?php if ( $comment->comment_author_email ) { ?>
-<tr>
-<th scope="row"><?php _e('E-mail:'); ?></th>
-<td><?php echo $comment->comment_author_email; ?></td>
-</tr>
-<?php } ?>
-<?php if ( $comment->comment_author_url ) { ?>
-<tr>
-<th scope="row"><?php _e('URL:'); ?></th>
-<td><a href='<?php echo $comment->comment_author_url; ?>'><?php echo $comment->comment_author_url; ?></a></td>
-</tr>
-<?php } ?>
-<tr>
-<th scope="row" valign="top"><p><?php _e('Comment:'); ?></p></th>
-<td><?php echo $comment->comment_content; ?></td>
-</tr>
-</table>
-
-</div>
-</div>
-<?php
-	break;
-
-case 'deletecomment':
-	$comment = (int) $_REQUEST['c'];
-	check_admin_referer('delete-comment_' . $comment);
-
-	if ( isset($_REQUEST['noredir']) ) {
-		$noredir = true;
-	} else {
-		$noredir = false;
-	}
-
-	if ( ! $comment = get_comment($comment) )
-			 wp_die(__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit-comments.php'));
-
-	if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-		wp_die( __('You are not allowed to edit comments on this post.') );
-
-	if ( 'spam' == $_REQUEST['dt'] )
-		wp_set_comment_status($comment->comment_ID, 'spam');
-	else
-		wp_delete_comment($comment->comment_ID);
-
-	if ((wp_get_referer() != '') && (false == $noredir)) {
-		wp_redirect(wp_get_referer());
-	} else {
-		wp_redirect(get_option('siteurl') .'/wp-admin/edit-comments.php');
-	}
-	exit();
-	break;
-
-case 'unapprovecomment':
-	$comment = (int) $_GET['c'];
-	check_admin_referer('unapprove-comment_' . $comment);
-
-	if (isset($_GET['noredir'])) {
-		$noredir = true;
-	} else {
-		$noredir = false;
-	}
-
-	if ( ! $comment = get_comment($comment) )
-		wp_die(__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php'));
-
-	if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-		wp_die( __('You are not allowed to edit comments on this post, so you cannot disapprove this comment.') );
-
-	wp_set_comment_status($comment->comment_ID, "hold");
-
-	if ((wp_get_referer() != "") && (false == $noredir)) {
-		wp_redirect(wp_get_referer());
-	} else {
-		wp_redirect(get_option('siteurl') .'/wp-admin/edit.php?p=' . (int) $comment->comment_post_ID.'&c=1#comments');
-	}
-	exit();
-	break;
-
-case 'approvecomment':
-	$comment = (int) $_GET['c'];
-	check_admin_referer('approve-comment_' . $comment);
-
-	if (isset($_GET['noredir'])) {
-		$noredir = true;
-	} else {
-		$noredir = false;
-	}
-
-	if ( ! $comment = get_comment($comment) )
-		wp_die(__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php'));
-
-	if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-		wp_die( __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
-
-	wp_set_comment_status($comment->comment_ID, "approve");
-	if (get_option("comments_notify") == true) {
-		wp_notify_postauthor($comment->comment_ID);
-	}
-
-
-	if ((wp_get_referer() != "") && (false == $noredir)) {
-		wp_redirect(wp_get_referer());
-	} else {
-		wp_redirect(get_option('siteurl') .'/wp-admin/edit.php?p=' . (int) $comment->comment_post_ID.'&c=1#comments');
-	}
-	exit();
-	break;
-
-case 'editedcomment':
-
-	$comment_ID = (int) $_POST['comment_ID'];
-	$comment_post_ID = (int) $_POST['comment_post_id'];
-
-	check_admin_referer('update-comment_' . $comment_ID);
-
-	edit_comment();
-
-	$location = ( empty($_POST['referredby']) ? "edit.php?p=$comment_post_ID&c=1" : $_POST['referredby'] ) . '#comment-' . $comment_ID;
-	$location = apply_filters('comment_edit_redirect', $location, $comment_ID);
-	wp_redirect($location);
-	exit();
-	break;
-default:
-	break;
-} // end switch
-
-include('admin-footer.php');
-
-?>
--- a/wp-admin/css/install-rtl.css
+++ b/wp-admin/css/install-rtl.css
@@ -1,15 +0,0 @@
-body { font: 13px Tahoma, Georgia, "Times New Roman", Times, serif; }
-
-ul, ol { padding: 5px 20px 5px 5px; }
-
-h1, h2, h3 { font-family: "Times New Roman", Times, serif; font-weight: 700 }
-
-.step, th { text-align: left }
-
-input { font-family: "Times New Roman", Times, serif; padding: 1px }
-
-#logo {	background: url(../wp-content/plugins/WP-Jalali/wp-fa-logo.png) center right no-repeat;	text-align: left; }
-
-#admin_email {direction: ltr; text-align: left; }
-
-#footer { font-style: normal; }
--- a/wp-admin/css/install.css
+++ b/wp-admin/css/install.css
@@ -1,40 +0,0 @@
-html { background: #eee; }
-
-body {
-	background: #fff;
-	color: #000;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	margin-left: 20%;
-	margin-right: 20%;
-	padding: .2em 2em;
-}
-
-h1 {
-	color: #006;
-	font-size: 18px;
-	font-weight: lighter;
-}
-
-h2 { font-size: 16px; }
-
-p, li, dt {
-	line-height: 140%;
-	padding-bottom: 2px;
-}
-
-ul, ol { padding: 5px 5px 5px 20px; }
-
-#logo { margin-bottom: 2em; }
-
-.step a, .step input { font-size: 2em; }
-
-td input { font-size: 1.5em; }
-
-.step, th { text-align: right; }
-
-#footer {
-	text-align: center; 
-	border-top: 1px solid #ccc; 
-	padding-top: 1em; 
-	font-style: italic;
-}
--- a/wp-admin/css/upload-rtl.css
+++ b/wp-admin/css/upload-rtl.css
@@ -1,12 +0,0 @@
-html {
-	direction: ltr;
-	}
-#uploadoptions, table {
-	direction: rtl;
-	}
-td {
-	padding: 1px 6px 0;
-	}
-.submit {
-	text-align: left;
-	}
--- a/wp-admin/css/upload.css
+++ b/wp-admin/css/upload.css
@@ -1,204 +0,0 @@
-body { background: #f9fcfe; }
-
-.upload-file-data { display: none; }
-
-#upload-menu {
-	border-top: 2em solid #247fab;
-	margin: 0;
-	padding: 0;
-	height: 0;
-	list-style: none;
-	width: 100%;
-}
-
-body > #upload-menu { border-bottom: 7px solid #fff; }
-
-#upload-menu li {
-	margin: 0;
-	position: relative;
-	top: -2em;
-	padding-bottom: 5px;
-	border: none;
-	border-top: 3px solid #247fab;
-}
-
-#upload-menu li a.upload-tab-link {
-	margin-left: 0.75em;
-	padding: 5px 5px 0;
-	display: block;
-	float: left;
-	height: 100%;
-	text-decoration: none;
-	border-bottom: none;
-	color: #fff;
-}
-
-#upload-menu li.current {
-	border-right: 2px solid #448abd;
-	color: #000;
-}
-
-#upload-menu li.current a.upload-tab-link, #upload-menu li a:hover {
-	background: #f9fcfe;
-	color: #000;
-}
-
-#upload-menu li #current-tab-nav {
-	background: #f9fcfe;
-	float: left;
-	padding: 5px 5px 0 0;
-	margin-left: -5px;
-}
-
-#upload-menu li span .page-numbers {
-	padding: 0;
-	border: none;
-}
-
-#upload-menu li span a.page-numbers { color: #00019b; }
-#upload-menu li span a.page-numbers:hover { text-decoration: underline; }
-
-#upload-content {
-	position: relative;
-	clear: both;
-	margin: 0;
-	padding: 0;
-	border: none;
-	width: 100%;
-	height: 100%;
-	background: none;
-}
-
-#upload-file {
-	margin: 0 auto;
-	top: 0;
-	left: 0;
-	width: 95%;
-	height: 100%;
-	background: #f9fcfe;
-}
-
-#upload-file th {
-	width: 8em;
-}
-
-form#upload-file input, form#upload-file textarea, div#upload-content.upload table { width: 100%; }
-
-form#upload-file .submit input { width: auto; }
-
-#upload-file-view { padding: 0 0 0 75px; }
-
-#file-title {
-	margin: 0 0 .2em 75px;
-	padding: 0;
-	display: block;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size: 16px;
-}
-
-h2 {
-	margin: 0 .2em 0 0;
-	padding: 0;
-	display: inline;
-	border: none;
-	color: #000;
-	font-size: 1.4em;
-	line-height: 1.4em;
-}
-
-.wrap h2 {
-	margin: .4em 0 .5em;
-	display: block;
-	border-bottom: .5em solid #e5f3ff;
-	color: #333;
-	font: normal 32px/5px serif;
-	clear: both;
-}
-
-* html .wrap h2 {
-	margin-top: 1em;
-}
-
-.back {
-	display: block;
-	position: absolute;
-	left: 14px;
-	top: 10px;
-}
-
-#upload-files {
-	list-style-type: none;
-	margin: 0;
-	padding: 15px 0 0;
-}
-
-#upload-files li { margin: 0 0 15px 15px; }
-
-#upload-files a, #upload-file-view a, a.file-link {
-	border: none;
-	text-decoration: none;
-}
-
-#upload-file-view a img { padding-bottom: .2em; border-bottom: 1px solid #6699CC; }
-
-#upload-files a.file-link {
-	display: block;
-	width: 130px;
-	height: 128px;
-	background-color: rgb(209, 226, 239);
-	text-align: center;
-	overflow: hidden;
-}
-
-#upload-files a.text {
-	padding-top: 40px;
-	height: 88px;
-	font-size: 16px;
-}
-
-#upload-files a.file-link.image {
-	font-size: 2px;
-	letter-spacing: 0;
-}
-
-#upload-files a.file-link img { vertical-align: middle; }
-
-#the-attachment-links textarea {
-	font-size: 10px;
-	overflow: hidden;
-}
-
-form table { float: none; padding: 0 15px; }
-
-table {
-	float: left;
-	margin: 0;
-	padding: 0;
-}
-
-th { text-align: right; vertical-align: text-top; }
-
-tr, td, th {
-	margin-top: 0;
-	padding-top: 0;
-}
-
-#uploadoptions th {
-	width: 80px;
-}
-
-#uploadoptions p {
-	margin: 0;
-	padding: 0;
-}
-
-#uploadoptions td {
-	padding-left: 1em;
-	line-height: 140%;
-}
-
-#uploadoptions table {
-	width: 300px;
-}
-
-input.readonly { background-color: #ddd; }
--- a/wp-admin/css/widgets-rtl.css
+++ b/wp-admin/css/widgets-rtl.css
@@ -1,38 +0,0 @@
-.dropzone,
-#palettediv,
-.handle,
-.controlform {
-	direction: rtl;
-	text-align: justify;
-	}
-.dropzone {
-	float: right;
-	margin-left: 10px;
-	margin-right: auto;
-	width: 240px;
-	}
-* html .dropzone ul {
-	margin-right: 0;
-	}
-* .handle, #lastmodule span {
-	border-left: 1px solid #e8e8e8;
-	border-right: 1px solid #f2f2f2;
-	}
-* .popper {
-	right: auto;
-	left: 3px;
-	}
-#palettediv .module, #lastmodule {
-	margin-right: auto;
-	margin-left: 10px;
-	float: right;
-	}
-#palettediv ul {
-	padding: 0 10px 0 0;
-	margin-right: 0;
-	width: 100%;
-	}
-.placemat {
-	margin-right: 0;
-	float: right;
-	}
--- a/wp-admin/css/widgets.css
+++ b/wp-admin/css/widgets.css
@@ -1,236 +0,0 @@
-body {
-	height: 100%;
-}
-
-#sbadmin #zones {
-	-moz-user-select: none;
-	-khtml-user-select: none;
-	user-select: none;
-}
-
-#sbreset {
-	float: left;
-	margin: 1px 0;
-}
-
-.dropzone {
-	border: 1px solid #bbb;
-	float: left;
-	margin-right: 10px;
-	padding: 5px;
-	background-color: #f0f8ff;
-}
-
-.dropzone h3 {
-	text-align: center;
-	color: #333;
-}
-
-.dropzone input {
-	display: none;
-}
-
-.dropzone ul {
-	float: left;
-	list-style-type: none;
-	width: 240px;
-	margin: 0;
-	min-height: 200px;
-	padding: 0;
-	display: block;
-}
-
-* .module {
-	width: 238px;
-	padding: 0;
-	margin: 5px 0;
-	cursor: move;
-	display: block;
-	border: 1px solid #ccc;
-	background-color: #fbfbfb;
-	position: relative;
-	text-align: left;
-	line-height: 25px;
-}
-
-* .handle {
-	display: block;
-	width: 216px;
-	padding: 0 10px;
-	position: relative;
-	border-top: 1px solid #f2f2f2;
-	border-right: 1px solid #e8e8e8;
-	border-bottom: 1px solid #e8e8e8;
-	border-left: 1px solid #f2f2f2;
-}
-
-* .popper {
-	margin: 0;
-	display: inline;
-	position: absolute;
-	top: 3px;
-	right: 3px;
-	overflow: hidden;
-	text-align: center;
-	height: 16px;
-	font-size: 18px;
-	line-height: 14px;
-	cursor: pointer;
-	padding: 0 3px 1px;
-	border-top: 4px solid #6da6d1;
-	background: url( ../images/fade-butt.png ) -5px 0px;
-}
-
-* html .popper {
-	padding: 1px 6px 0;
-	font-size: 16px;
-}
-
-#sbadmin p.submit {
-	padding-right: 10px;
-	clear: left;
-}
-
-.placemat {
-	cursor: default;
-	margin: 0;
-	padding: 0;
-	position: relative;
-}
-
-.placemat h4 {
-	text-align: center;
-}
-
-.placemat span {
-	background-color: #ffe;
-	border: 1px solid #ccc;
-	padding: 0 10px 10px;
-	position: absolute;
-	text-align: justify;
-}
-
-#palettediv {
-	border: 1px solid #bbb;
-	background-color: #f0f8ff;
-	height:auto;
-	margin-top: 10px;
-	padding-bottom: 10px;
-}
-
-#palettediv:after, #zones:after, .dropzone:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}
-
-#palettediv, #zones, .dropzone {
-	display: block;
-	min-height: 1px;
-}
-
-* html #palettediv, * html #zones, * html .dropzone {
-	height: 1%;
-}
-
-#palettediv h3 {
-	text-align: center;
-	color: #333;
-	min-height: 1px;
-}
-
-#palettediv ul {
-	padding: 0 0 0 10px;
-}
-
-#palettediv .module {
-	margin-right: 10px;
-	float: left;
-	width: 120px;
-}
-
-#palettediv .handle {
-	height: 40px;
-	font-size: 90%;
-	width: 110px;
-	padding: 0 5px;
-}
-
-#palettediv .popper {
-	visibility: hidden;
-}
-
-* html #palettediv ul {
-	margin: 0;
-	padding: 0 0 0 10px;
-}
-
-#controls {
-	height: 0px;
-}
-
-.control {
-	position: absolute;
-	display: block;
-	background: #f9fcfe;
-	padding: 0;
-}
-
-.controlhandle {
-	cursor: move;
-	background-color: #6da6d1;
-	border-bottom: 2px solid #448abd;
-	color: #333;
-	display: block;
-	margin: 0 0 5px;
-	padding: 4px;
-	font-size: 120%;
-}
-
-.controlcloser {
-	cursor: pointer;
-	font-size: 120%;
-	display: block;
-	position: absolute;
-	top: 2px;
-	right: 8px;
-	padding: 0 3px;
-	font-weight: bold;
-}
-
-.controlform {
-	margin: 20px 30px;
-}
-
-.controlform p {
-	text-align: center;
-}
-
-.control .checkbox {
-	border: none;
-	background: transparent;
-}
-
-.hidden {
-	display: none;
-}
-
-#shadow {
-	background: black;
-	display: none;
-	position: absolute;
-	top: 0px;
-	left: 0px;
-	width: 100%;
-}
-
-#dragHelper {
-	position: absolute;
-}
-
-#dragHelper li.module {
-	display: block;
-	float: left;
-}
--- a/wp-admin/custom-header.php
+++ b/wp-admin/custom-header.php
@@ -1,332 +0,0 @@
-<?php
-
-class Custom_Image_Header {
-	var $admin_header_callback;
-
-	function Custom_Image_Header($admin_header_callback) {
-		$this->admin_header_callback = $admin_header_callback;
-	}
-
-	function init() {
-		$page = add_theme_page(__('Custom Image Header'), __('Custom Image Header'), 'edit_themes', 'custom-header', array(&$this, 'admin_page'));
-
-		add_action("admin_print_scripts-$page", array(&$this, 'js_includes'));
-		add_action("admin_head-$page", array(&$this, 'js'), 50);
-		add_action("admin_head-$page", $this->admin_header_callback, 51);
-	}
-
-	function js_includes() {
-		wp_enqueue_script('cropper');
-		wp_enqueue_script('colorpicker');
-	}
-
-	function js() {
-
-		if ( isset( $_POST['textcolor'] ) ) {
-			check_admin_referer('custom-header');
-			if ( 'blank' == $_POST['textcolor'] ) {
-				set_theme_mod('header_textcolor', 'blank');
-			} else {
-				$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['textcolor']);
-				if ( strlen($color) == 6 || strlen($color) == 3 )
-					set_theme_mod('header_textcolor', $color);
-			}
-		}
-		if ( isset($_POST['resetheader']) ) {
-			check_admin_referer('custom-header');
-			remove_theme_mods();
-		}
-	?>
-<script type="text/javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	// with a supplied ratio
-	Event.observe(
-		window,
-		'load',
-		function() {
-			var xinit = <?php echo HEADER_IMAGE_WIDTH; ?>;
-			var yinit = <?php echo HEADER_IMAGE_HEIGHT; ?>;
-			var ratio = xinit / yinit;
-			var ximg = $('upload').width;
-			var yimg = $('upload').height;
-			if ( yimg < yinit || ximg < xinit ) {
-				if ( ximg / yimg > ratio ) {
-					yinit = yimg;
-					xinit = yinit * ratio;
-				} else {
-					xinit = ximg;
-					yinit = xinit / ratio;
-				}
-			}
-			new Cropper.Img(
-				'upload',
-				{
-					ratioDim: { x: xinit, y: yinit },
-					displayOnInit: true,
-					onEndCrop: onEndCrop
-				}
-			)
-		}
-	);
-
-	var cp = new ColorPicker();
-
-	function pickColor(color) {
-		$('name').style.color = color;
-		$('desc').style.color = color;
-		$('textcolor').value = color;
-	}
-	function PopupWindow_hidePopup(magicword) {
-		if ( magicword != 'prettyplease' )
-			return false;
-		if (this.divName != null) {
-			if (this.use_gebi) {
-				document.getElementById(this.divName).style.visibility = "hidden";
-			}
-			else if (this.use_css) {
-				document.all[this.divName].style.visibility = "hidden";
-			}
-			else if (this.use_layers) {
-				document.layers[this.divName].visibility = "hidden";
-			}
-		}
-		else {
-			if (this.popupWindow && !this.popupWindow.closed) {
-				this.popupWindow.close();
-				this.popupWindow = null;
-			}
-		}
-		return false;
-	}
-	function colorSelect(t,p) {
-		if ( cp.p == p && document.getElementById(cp.divName).style.visibility != "hidden" ) {
-			cp.hidePopup('prettyplease');
-		} else {
-			cp.p = p;
-			cp.select(t,p);
-		}
-	}
-	function colorDefault() {
-		pickColor('<?php echo HEADER_TEXTCOLOR; ?>');
-	}
-
-	function hide_text() {
-		$('name').style.display = 'none';
-		$('desc').style.display = 'none';
-		$('pickcolor').style.display = 'none';
-		$('defaultcolor').style.display = 'none';
-		$('textcolor').value = 'blank';
-		$('hidetext').value = '<?php _e('Show Text'); ?>';
-//		$('hidetext').onclick = 'show_text()';
-		Event.observe( $('hidetext'), 'click', show_text );
-	}
-
-	function show_text() {
-		$('name').style.display = 'block';
-		$('desc').style.display = 'block';
-		$('pickcolor').style.display = 'inline';
-		$('defaultcolor').style.display = 'inline';
-		$('textcolor').value = '<?php echo HEADER_TEXTCOLOR; ?>';
-		$('hidetext').value = '<?php _e('Hide Text'); ?>';
-		Event.stopObserving( $('hidetext'), 'click', show_text );
-		Event.observe( $('hidetext'), 'click', hide_text );
-	}
-
-	<?php if ( 'blank' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) ) { ?>
-Event.observe( window, 'load', hide_text );
-	<?php } ?>
-
-</script>
-<?php
-	}
-
-	function step_1() {
-		if ( $_GET['updated'] ) { ?>
-<div id="message" class="updated fade">
-<p><?php _e('Header updated.') ?></p>
-</div>
-		<?php } ?>
-
-<div class="wrap">
-<h2><?php _e('Your Header Image'); ?></h2>
-<p><?php _e('This is your header image. You can change the text color or upload and crop a new image.'); ?></p>
-
-<div id="headimg" style="background-image: url(<?php clean_url(header_image()) ?>);">
-<h1><a onclick="return false;" href="<?php bloginfo('url'); ?>" title="<?php bloginfo('name'); ?>" id="name"><?php bloginfo('name'); ?></a></h1>
-<div id="desc"><?php bloginfo('description');?></div>
-</div>
-<?php if ( !defined( 'NO_HEADER_TEXT' ) ) { ?>
-<form method="post" action="<?php echo get_option('siteurl') ?>/wp-admin/themes.php?page=custom-header&amp;updated=true">
-<input type="button" value="<?php _e('Hide Text'); ?>" onclick="hide_text()" id="hidetext" />
-<input type="button" value="<?php _e('Select a Text Color'); ?>" onclick="colorSelect($('textcolor'), 'pickcolor')" id="pickcolor" /><input type="button" value="<?php _e('Use Original Color'); ?>" onclick="colorDefault()" id="defaultcolor" />
-<?php wp_nonce_field('custom-header') ?>
-<input type="hidden" name="textcolor" id="textcolor" value="#<?php attribute_escape(header_textcolor()) ?>" /><input name="submit" type="submit" value="<?php _e('Save Changes &raquo;'); ?>" /></form>
-<?php } ?>
-
-<div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;visibility:hidden;"> </div>
-</div>
-<div class="wrap">
-<h2><?php _e('Upload New Header Image'); ?></h2><p><?php _e('Here you can upload a custom header image to be shown at the top of your blog instead of the default one. On the next screen you will be able to crop the image.'); ?></p>
-<p><?php printf(__('Images of exactly <strong>%1$d x %2$d pixels</strong> will be used as-is.'), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); ?></p>
-
-<form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo attribute_escape(add_query_arg('step', 2)) ?>" style="margin: auto; width: 50%;">
-<label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br /><input type="file" id="upload" name="import" />
-<input type="hidden" name="action" value="save" />
-<?php wp_nonce_field('custom-header') ?>
-<p class="submit">
-<input type="submit" value="<?php _e('Upload &raquo;'); ?>" />
-</p>
-</form>
-
-</div>
-
-		<?php if ( get_theme_mod('header_image') || get_theme_mod('header_textcolor') ) : ?>
-<div class="wrap">
-<h2><?php _e('Reset Header Image and Color'); ?></h2>
-<p><?php _e('This will restore the original header image and color. You will not be able to retrieve any customizations.') ?></p>
-<form method="post" action="<?php echo attribute_escape(add_query_arg('step', 1)) ?>">
-<?php wp_nonce_field('custom-header'); ?>
-<input type="submit" name="resetheader" value="<?php _e('Restore Original Header'); ?>" />
-</form>
-</div>
-		<?php endif;
-
-	}
-
-	function step_2() {
-		check_admin_referer('custom-header');
-		$overrides = array('test_form' => false);
-		$file = wp_handle_upload($_FILES['import'], $overrides);
-
-		if ( isset($file['error']) )
-		die( $file['error'] );
-
-		$url = $file['url'];
-		$file = $file['file'];
-		$filename = basename($file);
-
-		// Construct the object array
-		$object = array(
-		'post_title' => $filename,
-		'post_content' => $url,
-		'post_mime_type' => 'import',
-		'guid' => $url);
-
-		// Save the data
-		$id = wp_insert_attachment($object, $file);
-
-		$upload = array('file' => $file, 'id' => $id);
-
-		list($width, $height, $type, $attr) = getimagesize( $file );
-
-		if ( $width == HEADER_IMAGE_WIDTH && $height == HEADER_IMAGE_HEIGHT ) {
-			set_theme_mod('header_image', clean_url($url));
-			$header = apply_filters('wp_create_file_in_uploads', $file, $id); // For replication
-			return $this->finished();
-		} elseif ( $width > HEADER_IMAGE_WIDTH ) {
-			$oitar = $width / HEADER_IMAGE_WIDTH;
-			$image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
-			$image = apply_filters('wp_create_file_in_uploads', $image, $id); // For replication
-
-			$url = str_replace(basename($url), basename($image), $url);
-			$width = $width / $oitar;
-			$height = $height / $oitar;
-		} else {
-			$oitar = 1;
-		}
-		?>
-
-<div class="wrap">
-
-<form method="POST" action="<?php echo attribute_escape(add_query_arg('step', 3)) ?>">
-
-<p><?php _e('Choose the part of the image you want to use as your header.'); ?></p>
-<div id="testWrap">
-<img src="<?php echo $url; ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" />
-</div>
-
-<p class="submit">
-<input type="hidden" name="x1" id="x1" />
-<input type="hidden" name="y1" id="y1" />
-<input type="hidden" name="x2" id="x2" />
-<input type="hidden" name="y2" id="y2" />
-<input type="hidden" name="width" id="width" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo $id; ?>" />
-<input type="hidden" name="oitar" id="oitar" value="<?php echo $oitar; ?>" />
-<?php wp_nonce_field('custom-header') ?>
-<input type="submit" value="<?php _e('Crop Header &raquo;'); ?>" />
-</p>
-
-</form>
-</div>
-		<?php
-	}
-
-	function step_3() {
-		check_admin_referer('custom-header');
-		if ( $_POST['oitar'] > 1 ) {
-			$_POST['x1'] = $_POST['x1'] * $_POST['oitar'];
-			$_POST['y1'] = $_POST['y1'] * $_POST['oitar'];
-			$_POST['width'] = $_POST['width'] * $_POST['oitar'];
-			$_POST['height'] = $_POST['height'] * $_POST['oitar'];
-		}
-
-		$header = wp_crop_image($_POST['attachment_id'], $_POST['x1'], $_POST['y1'], $_POST['width'], $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT);
-		$header = apply_filters('wp_create_file_in_uploads', $header); // For replication
-
-		$parent = get_post($_POST['attachment_id']);
-
-		$parent_url = $parent->guid;
-
-		$url = str_replace(basename($parent_url), basename($header), $parent_url);
-
-		set_theme_mod('header_image', $url);
-
-		// cleanup
-		$file = get_attached_file( $_POST['attachment_id'] );
-		$medium = str_replace(basename($file), 'midsize-'.basename($file), $file);
-		@unlink( apply_filters( 'wp_delete_file', $medium ) );
-		wp_delete_attachment( $_POST['attachment_id'] );
-
-		return $this->finished();
-	}
-
-	function finished() {
-		?>
-<div class="wrap">
-<h2><?php _e('Header complete!'); ?></h2>
-
-<p><?php _e('Visit your site and you should see the new header now.'); ?></p>
-
-</div>
-		<?php
-	}
-
-	function admin_page() {
-		if ( !isset( $_GET['step'] ) )
-			$step = 1;
-		else
-			$step = (int) $_GET['step'];
-
-		if ( 1 == $step ) {
-			$this->step_1();
-		} elseif ( 2 == $step ) {
-			$this->step_2();
-		} elseif ( 3 == $step ) {
-			$this->step_3();
-		}
-
-	}
-
-}
-?>
--- a/wp-admin/edit-category-form.php
+++ b/wp-admin/edit-category-form.php
@@ -1,49 +0,0 @@
-<?php
-if ( ! empty($cat_ID) ) {
-	$heading = __('Edit Category');
-	$submit_text = __('Edit Category &raquo;');
-	$form = '<form name="editcat" id="editcat" method="post" action="categories.php">';
-	$action = 'editedcat';
-	$nonce_action = 'update-category_' . $cat_ID;
-	do_action('edit_category_form_pre', $category);
-} else {
-	$heading = __('Add Category');
-	$submit_text = __('Add Category &raquo;');
-	$form = '<form name="addcat" id="addcat" method="post" action="categories.php">';
-	$action = 'addcat';
-	$nonce_action = 'add-category';
-	do_action('add_category_form_pre', $category);
-}
-?>
-
-<div class="wrap">
-<h2><?php echo $heading ?></h2>
-<div id="ajax-response"></div>
-<?php echo $form ?>
-<input type="hidden" name="action" value="<?php echo $action ?>" />
-<input type="hidden" name="cat_ID" value="<?php echo $category->term_id ?>" />
-<?php wp_nonce_field($nonce_action); ?>
-	<table class="editform" width="100%" cellspacing="2" cellpadding="5">
-		<tr>
-			<th width="33%" scope="row" valign="top"><label for="cat_name"><?php _e('Category name:') ?></label></th>
-			<td width="67%"><input name="cat_name" id="cat_name" type="text" value="<?php echo attribute_escape($category->name); ?>" size="40" /></td>
-		</tr>
-		<tr>
-			<th scope="row" valign="top"><label for="category_nicename"><?php _e('Category slug:') ?></label></th>
-			<td><input name="category_nicename" id="category_nicename" type="text" value="<?php echo attribute_escape($category->slug); ?>" size="40" /></td>
-		</tr>
-		<tr>
-			<th scope="row" valign="top"><label for="category_parent"><?php _e('Category parent:') ?></label></th>
-			<td>
-	  			<?php wp_dropdown_categories('hide_empty=0&name=category_parent&orderby=name&selected=' . $category->parent . '&hierarchical=1&show_option_none=' . __('None')); ?>
-	  		</td>
-		</tr>
-		<tr>
-			<th scope="row" valign="top"><label for="category_description"><?php _e('Description: (optional)') ?></label></th>
-			<td><textarea name="category_description" id="category_description" rows="5" cols="50" style="width: 97%;"><?php echo wp_specialchars($category->description); ?></textarea></td>
-		</tr>
-	</table>
-<p class="submit"><input type="submit" name="submit" value="<?php echo $submit_text ?>" /></p>
-<?php do_action('edit_category_form', $category); ?>
-</form>
-</div>
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -2,12 +2,11 @@
 require_once('admin.php');

 $title = __('Edit Comments');
-$parent_file = 'edit-comments.php';
-wp_enqueue_script( 'admin-comments' );
+$parent_file = 'edit.php';

 require_once('admin-header.php');
 if (empty($_GET['mode'])) $mode = 'view';
-else $mode = attribute_escape($_GET['mode']);
+else $mode = wp_specialchars($_GET['mode'], 1);
 ?>

 <script type="text/javascript">
@@ -23,166 +22,139 @@ function checkAll(form)
 		}
 	}
 }
-
-function getNumChecked(form)
-{
-	var num = 0;
-	for (i = 0, n = form.elements.length; i < n; i++) {
-		if(form.elements[i].type == "checkbox") {
-			if(form.elements[i].checked == true)
-				num++;
-		}
-	}
-	return num;
-}
 //-->
 </script>
 <div class="wrap">
 <h2><?php _e('Comments'); ?></h2>
-<form name="searchform" action="" method="get" id="editcomments">
-  <fieldset>
-  <legend><?php _e('Show Comments That Contain...') ?></legend>
-  <input type="text" name="s" value="<?php if (isset($_GET['s'])) echo attribute_escape($_GET['s']); ?>" size="17" />
-  <input type="submit" name="submit" value="<?php _e('Search') ?>"  />
+<form name="searchform" action="" method="get"> 
+  <fieldset> 
+  <legend><?php _e('Show Comments That Contain...') ?></legend> 
+  <input type="text" name="s" value="<?php if (isset($_GET['s'])) echo wp_specialchars($_GET['s'], 1); ?>" size="17" /> 
+  <input type="submit" name="submit" value="<?php _e('Search') ?>"  />  
  <input type="hidden" name="mode" value="<?php echo $mode; ?>" />
-  <?php _e('(Searches within comment text, e-mail, URL, and IP address.)') ?>
-  </fieldset>
+  <?php _e('(Searches within comment text, e-mail, URI, and IP address.)') ?>
+  </fieldset> 
 </form>
 <p><a href="?mode=view"><?php _e('View Mode') ?></a> | <a href="?mode=edit"><?php _e('Mass Edit Mode') ?></a></p>
 <?php
 if ( !empty( $_POST['delete_comments'] ) ) :
-	check_admin_referer('bulk-comments');
-
 	$i = 0;
 	foreach ($_POST['delete_comments'] as $comment) : // Check the permissions on each
 		$comment = (int) $comment;
-		$post_id = (int) $wpdb->get_var("SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = $comment");
-		// $authordata = get_userdata( $wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $post_id") );
-		if ( current_user_can('edit_post', $post_id) ) {
-			if ( !empty( $_POST['spam_button'] ) )
-				wp_set_comment_status($comment, 'spam');
-			else
-				wp_set_comment_status($comment, 'delete');
+		$post_id = $wpdb->get_var("SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = $comment");
+		$authordata = get_userdata( $wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $post_id") );
+		if ( user_can_delete_post_comments($user_ID, $post_id) ) :
+			$wpdb->query("DELETE FROM $wpdb->comments WHERE comment_ID = $comment");
 			++$i;
-		}
+		endif;
 	endforeach;
-	echo '<div style="background-color: rgb(207, 235, 247);" id="message" class="updated fade"><p>';
-	if ( !empty( $_POST['spam_button'] ) ) {
-		printf(__ngettext('%s comment marked as spam', '%s comments marked as spam.', $i), $i);
-	} else {
-		printf(__ngettext('%s comment deleted.', '%s comments deleted.', $i), $i);
-	}
-	echo '</p></div>';
+	echo "<div class='wrap'><p>" . sprintf(__('%s comments deleted.'), $i) . "</p></div>";
 endif;

-if ( isset( $_GET['apage'] ) )
-	$page = abs( (int) $_GET['apage'] );
-else
-	$page = 1;
-
-$start = $offset = ( $page - 1 ) * 20;
-
-list($_comments, $total) = _wp_get_comment_list( isset($_GET['s']) ? $_GET['s'] : false, $start, 25 ); // Grab a few extra
-
-$comments = array_slice($_comments, 0, 20);
-$extra_comments = array_slice($_comments, 20);
-
-$page_links = paginate_links( array(
-	'base' => add_query_arg( 'apage', '%#%' ),
-	'format' => '',
-	'total' => ceil($total / 20),
-	'current' => $page
-));
-
-if ( $page_links )
-	echo "<p class='pagenav'>$page_links</p>";
+if (isset($_GET['s'])) {
+	$s = $wpdb->escape($_GET['s']);
+	$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments  WHERE
+		(comment_author LIKE '%$s%' OR
+		comment_author_email LIKE '%$s%' OR
+		comment_author_url LIKE ('%$s%') OR
+		comment_author_IP LIKE ('%$s%') OR
+		comment_content LIKE ('%$s%') ) AND
+		comment_approved != 'spam'
+		ORDER BY comment_date DESC");
+} else {
+	if ( isset($_GET['offset']) )
+		$offset = (int) $_GET['offset'] * 20;
+	else
+		$offset = 0;

+	$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_approved = '0' OR comment_approved = '1' ORDER BY comment_date DESC LIMIT $offset,20");
+}
 if ('view' == $mode) {
 	if ($comments) {
-		$offset = $offset + 1;
-		$start = " start='$offset'";
+		if ($offset)
+			$start = " start='$offset'";
+		else
+			$start = '';

-		echo "<ol id='the-comment-list' class='commentlist' $start>\n";
+		echo "<ol class='commentlist' $start>";
 		$i = 0;
-		foreach ( $comments as $comment ) {
-			get_comment( $comment ); // Cache it
-			_wp_comment_list_item( $comment->comment_ID, ++$i );
-		}
-		echo "</ol>\n\n";
+		foreach ($comments as $comment) {
+		++$i; $class = '';
+		$authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID"));
+			$comment_status = wp_get_comment_status($comment->comment_ID);
+			if ('unapproved' == $comment_status) 
+				$class .= ' unapproved';
+			if ($i % 2)
+				$class .= ' alternate';
+			echo "<li class='$class'>";
+?>		
+        <p><strong><?php _e('Name:') ?></strong> <?php comment_author() ?> <?php if ($comment->comment_author_email) { ?>| <strong><?php _e('E-mail:') ?></strong> <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url) { ?> | <strong><?php _e('URI:') ?></strong> <?php comment_author_url_link() ?> <?php } ?>| <strong><?php _e('IP:') ?></strong> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
+		
+		<?php comment_text() ?>

-if ( $extra_comments ) : ?>
-<div id="extra-comments" style="display:none">
-<ul id="the-extra-comment-list" class="commentlist">
-<?php
-	foreach ( $extra_comments as $comment ) {
-		get_comment( $comment ); // Cache it
-		_wp_comment_list_item( $comment->comment_ID, ++$i );
-	}
-?>
-</ul>
-</div>
-<?php endif; // $extra_comments ?>
+        <p><?php _e('Posted'); echo ' '; comment_date('M j, g:i A');  
+			if ( user_can_edit_post_comments($user_ID, $comment->comment_post_ID) ) {
+				echo " | <a href=\"post.php?action=editcomment&amp;comment=".$comment->comment_ID."\">" . __('Edit Comment') . "</a>";
+			}
+			if ( user_can_delete_post_comments($user_ID, $comment->comment_post_ID) ) {
+				echo " | <a href=\"post.php?action=deletecomment&amp;p=".$comment->comment_post_ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return confirm('" . sprintf(__("You are about to delete this comment by \'%s\'\\n  \'Cancel\' to stop, \'OK\' to delete."), $comment->comment_author) . "')\">" . __('Delete Comment') . "</a> &#8212; ";
+			} // end if any comments to show
+			// Get post title
+			if ( user_can_edit_post($user_ID, $comment->comment_post_ID) ) {
+				$post_title = $wpdb->get_var("SELECT post_title FROM $wpdb->posts WHERE ID = $comment->comment_post_ID");
+				$post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
+				?> <a href="post.php?action=edit&amp;post=<?php echo $comment->comment_post_ID; ?>"><?php printf(__('Edit Post &#8220;%s&#8221;'), stripslashes($post_title)); ?></a>
+				<?php } ?>
+			 | <a href="<?php echo get_permalink($comment->comment_post_ID); ?>"><?php _e('View Post') ?></a></p>
+		</li>

-<div id="ajax-response"></div>
+<?php } // end foreach ?>
+</ol>

 <?php
-	} else { //no comments to show
+	} else {

 		?>
 		<p>
-			<strong><?php _e('No comments found.') ?></strong></p>
-
+        <strong><?php _e('No comments found.') ?></strong></p>
+		
 		<?php
 	} // end if ($comments)
 } elseif ('edit' == $mode) {

 	if ($comments) {
-		echo '<form name="deletecomments" id="deletecomments" action="" method="post"> ';
-		wp_nonce_field('bulk-comments');
-		echo '<table class="widefat">
-<thead>
+		echo '<form name="deletecomments" id="deletecomments" action="" method="post"> 
+		<table width="100%" cellpadding="3" cellspacing="3">
  <tr>
-    <th scope="col" style="text-align: center"><input type="checkbox" onclick="checkAll(document.getElementById(\'deletecomments\'));" /></th>
+    <th scope="col">*</th>
    <th scope="col">' .  __('Name') . '</th>
    <th scope="col">' .  __('E-mail') . '</th>
    <th scope="col">' . __('IP') . '</th>
    <th scope="col">' . __('Comment Excerpt') . '</th>
-	<th scope="col" colspan="3" style="text-align: center">' .  __('Actions') . '</th>
-  </tr>
-</thead>';
+	<th scope="col" colspan="3">' .  __('Actions') . '</th>
+  </tr>';
 		foreach ($comments as $comment) {
-		$post = get_post($comment->comment_post_ID);
-		$authordata = get_userdata($post->post_author);
-		$comment_status = wp_get_comment_status($comment->comment_ID);
+		$authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID"));
 		$class = ('alternate' == $class) ? '' : 'alternate';
-		$class .= ('unapproved' == $comment_status) ? ' unapproved' : '';
 ?>
-  <tr id="comment-<?php echo $comment->comment_ID; ?>" class='<?php echo $class; ?>'>
-    <td style="text-align: center"><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { ?><input type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" /><?php } ?></td>
+  <tr class='<?php echo $class; ?>'>
+    <td><?php if (user_can_delete_post_comments($user_ID, $comment->comment_post_ID) ) { ?><input type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" /><?php } ?></td>
    <td><?php comment_author_link() ?></td>
    <td><?php comment_author_email_link() ?></td>
-    <td><a href="edit-comments.php?s=<?php comment_author_IP() ?>&amp;mode=edit"><?php comment_author_IP() ?></a></td>
+    <td><a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></td>
    <td><?php comment_excerpt(); ?></td>
-    <td>
-    	<?php if ('unapproved' == $comment_status) {
-    		_e('Unapproved');
-    	} else { ?>
-    		<a href="<?php echo get_permalink($comment->comment_post_ID); ?>#comment-<?php comment_ID() ?>" class="edit"><?php _e('View') ?></a>
-    	<?php } ?>
-    </td>
-    <td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-	echo "<a href='comment.php?action=editcomment&amp;c=$comment->comment_ID' class='edit'>" .  __('Edit') . "</a>"; } ?></td>
-    <td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-		echo "<a href=\"comment.php?action=deletecomment&amp;p=".$comment->comment_post_ID."&amp;c=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to delete this comment by '%s'. \n  'Cancel' to stop, 'OK' to delete."), $comment->comment_author ))  . "', theCommentList );\" class='delete'>" . __('Delete') . "</a> ";
-		} ?></td>
+    <td><a href="<?php echo get_permalink($comment->comment_post_ID); ?>#comment-<?php comment_ID() ?>" class="edit"><?php _e('View') ?></a></td>
+    <td><?php if ( user_can_edit_post_comments($user_ID, $comment->comment_post_ID) ) {
+	echo "<a href='post.php?action=editcomment&amp;comment=$comment->comment_ID' class='edit'>" .  __('Edit') . "</a>"; } ?></td>
+    <td><?php if ( user_can_delete_post_comments($user_ID, $comment->comment_post_ID) ) {
+            echo "<a href=\"post.php?action=deletecomment&amp;p=".$comment->comment_post_ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return confirm('" . sprintf(__("You are about to delete this comment by \'%s\'\\n  \'Cancel\' to stop, \'OK\' to delete."), $comment->comment_author) . "')\"    class='delete'>" . __('Delete') . "</a>"; } ?></td>
  </tr>
-		<?php
+		<?php 
 		} // end foreach
 	?></table>
-<p class="submit"><input type="submit" name="delete_button" class="delete" value="<?php _e('Delete Checked Comments &raquo;') ?>" onclick="var numchecked = getNumChecked(document.getElementById('deletecomments')); if(numchecked < 1) { alert('<?php echo js_escape(__("Please select some comments to delete")); ?>'); return false } return confirm('<?php echo sprintf(js_escape(__("You are about to delete %s comments permanently \n  'Cancel' to stop, 'OK' to delete.")), "' + numchecked + '"); ?>')" />
-			<input type="submit" name="spam_button" value="<?php _e('Mark Checked Comments as Spam &raquo;') ?>" onclick="var numchecked = getNumChecked(document.getElementById('deletecomments')); if(numchecked < 1) { alert('<?php echo js_escape(__("Please select some comments to mark as spam")); ?>'); return false } return confirm('<?php echo sprintf(js_escape(__("You are about to mark %s comments as spam \n  'Cancel' to stop, 'OK' to mark as spam.")), "' + numchecked + '"); ?>')" /></p>
+    <p><a href="javascript:;" onclick="checkAll(document.getElementById('deletecomments')); return false; "><?php _e('Invert Checkbox Selection') ?></a></p>
+            <p class="submit"><input type="submit" name="Submit" value="<?php _e('Delete Checked Comments') ?> &raquo;" onclick="return confirm('<?php _e("You are about to delete these comments permanently \\n  \'Cancel\' to stop, \'OK\' to delete.") ?>')" />	</p>
  </form>
-<div id="ajax-response"></div>
 <?php
 	} else {
 ?>
@@ -192,12 +164,8 @@ if ( $extra_comments ) : ?>
 <?php
 	} // end if ($comments)
 }
-
-if ( $page_links )
-	echo "<p class='pagenav'>$page_links</p>";
-
-?>
+	?>

 </div>

-<?php include('admin-footer.php'); ?>
+<?php include('admin-footer.php'); ?>
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -1,265 +1,206 @@
 <?php
-if ( isset($_GET['message']) )
-	$_GET['message'] = (int) $_GET['message'];
 $messages[1] = __('Post updated');
 $messages[2] = __('Custom field updated');
 $messages[3] = __('Custom field deleted.');
 ?>
 <?php if (isset($_GET['message'])) : ?>
-<div id="message" class="updated fade"><p><?php echo wp_specialchars($messages[$_GET['message']]); ?></p></div>
+<div class="updated"><p><?php echo $messages[$_GET['message']]; ?></p></div>
 <?php endif; ?>

 <form name="post" action="post.php" method="post" id="post">
-<?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?>
-<input type="hidden" name="mode" value="bookmarklet" />
-<?php endif; ?>

 <div class="wrap">
+<h2><?php _e('Write Post'); ?></h2>
 <?php

 if (0 == $post_ID) {
 	$form_action = 'post';
-	$temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post()
-	$form_extra = "<input type='hidden' id='post_ID' name='temp_ID' value='$temp_ID' />";
-	wp_nonce_field('add-post');
 } else {
-	$post_ID = (int) $post_ID;
 	$form_action = 'editpost';
-	$form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
-	wp_nonce_field('update-post_' .  $post_ID);
+	$form_extra = "<input type='hidden' name='post_ID' value='$post_ID' />";
 }

-$form_pingback = '<input type="hidden" name="post_pingback" value="' . (int) get_option('default_pingback_flag') . '" id="post_pingback" />';
+$form_pingback = '<input type="hidden" name="post_pingback" value="' . get_option('default_pingback_flag') . '" id="post_pingback" />';

-$form_prevstatus = '<input type="hidden" name="prev_status" value="' . attribute_escape( $post->post_status ) . '" />';
+$form_prevstatus = '<input type="hidden" name="prev_status" value="'.$post_status.'" />';

-$form_trackback = '<input type="text" name="trackback_url" style="width: 415px" id="trackback" tabindex="7" value="'. attribute_escape( str_replace("\n", ' ', $post->to_ping) ) .'" />';
+$form_trackback = '<input type="text" name="trackback_url" style="width: 415px" id="trackback" tabindex="7" value="'. str_replace("\n", ' ', $to_ping) .'" />';

-if ('' != $post->pinged) {
-	$pings = '<p>'. __('Already pinged:') . '</p><ul>';
-	$already_pinged = explode("\n", trim($post->pinged));
+if ('' != $pinged) {
+	$pings .= '<p>'. __('Already pinged:') . '</p><ul>';
+	$already_pinged = explode("\n", trim($pinged));
 	foreach ($already_pinged as $pinged_url) {
-		$pings .= "\n\t<li>" . wp_specialchars($pinged_url) . "</li>";
+		$pings .= "\n\t<li>$pinged_url</li>";
 	}
 	$pings .= '</ul>';
 }

-$saveasdraft = '<input name="save" type="submit" id="save" tabindex="3" value="' . attribute_escape( __('Save and Continue Editing') ) . '" />';
+$saveasdraft = '<input name="save" type="submit" id="save" tabindex="6" value="' . __('Save and Continue Editing') . '" />';

-if (empty($post->post_status)) $post->post_status = 'draft';
+if (empty($post_status)) $post_status = 'draft';

 ?>

-<input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" />
-<input type="hidden" id="hiddenaction" name="action" value="<?php echo $form_action ?>" />
-<input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" />
-<input type="hidden" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" />
-<input type="hidden" id="post_type" name="post_type" value="post" />
+<input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" />
+<input type="hidden" name="action" value="<?php echo $form_action ?>" />
+<input type="hidden" name="post_author" value="<?php echo $post_author ?>" />

 <?php echo $form_extra ?>
-<?php if ((isset($post->post_title) && '' == $post->post_title) || (isset($_GET['message']) && 2 > $_GET['message'])) : ?>
+<?php if (isset($_GET['message']) && 2 > $_GET['message']) : ?>
 <script type="text/javascript">
+<!--
 function focusit() {
 	// focus on first input field
 	document.post.title.focus();
 }
-addLoadEvent(focusit);
+window.onload = focusit;
+//-->
 </script>
 <?php endif; ?>
 <div id="poststuff">
+    <fieldset id="titlediv">
+      <legend><a href="http://wordpress.org/docs/reference/post/#title" title="<?php _e('Help on titles') ?>"><?php _e('Title') ?></a></legend> 
+	  <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo $edited_post_title; ?>" id="title" /></div>
+    </fieldset>

-<div id="moremeta">
-<div id="grabit" class="dbx-group">
+    <fieldset id="categorydiv">
+      <legend><a href="http://wordpress.org/docs/reference/post/#category" title="<?php _e('Help on categories') ?>"><?php _e('Categories') ?></a></legend> 
+	  <div><?php dropdown_categories(get_settings('default_category')); ?></div>
+    </fieldset>

-<fieldset id="categorydiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Categories') ?></h3>
-<div class="dbx-content">
-<p id="jaxcat"></p>
-<ul id="categorychecklist"><?php dropdown_categories(); ?></ul></div>
-</fieldset>
-
-<fieldset id="commentstatusdiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Discussion') ?></h3>
-<div class="dbx-content">
-<input name="advanced_view" type="hidden" value="1" />
-<label for="comment_status" class="selectit">
-<input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> />
-<?php _e('Allow Comments') ?></label>
-<label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label>
+    <fieldset id="commentstatusdiv">
+      <legend><a href="http://wordpress.org/docs/reference/post/#comments" title="<?php _e('Help on comment status') ?>"><?php _e('Discussion') ?></a></legend> 
+	  <div>
+	  <input name="advanced_view" type="hidden" value="1" />
+	  <label for="comment_status" class="selectit">
+	      <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($comment_status, 'open'); ?> />
+         <?php _e('Allow Comments') ?></label> 
+		 <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label>
 </div>
 </fieldset>
+    <fieldset id="postpassworddiv">
+      <legend><a href="http://wordpress.org/docs/reference/post/#post_password" title="<?php _e('Help on post password') ?>"><?php _e('Post Password') ?></a></legend> 
+	  <div><input name="post_password" type="text" size="13" id="post_password" value="<?php echo $post_password ?>" /></div>
+    </fieldset>

-<fieldset id="passworddiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Post Password') ?></h3>
-<div class="dbx-content"><input name="post_password" type="text" size="13" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></div>
+<br />
+<fieldset id="postexcerpt">
+<legend><a href="http://wordpress.org/docs/reference/post/#excerpt" title="<?php _e('Help with excerpts') ?>"><?php _e('Excerpt') ?></a></legend>
+<div><textarea rows="1" cols="40" name="excerpt" tabindex="4" id="excerpt"><?php echo $excerpt ?></textarea></div>
 </fieldset>
-
-<fieldset id="slugdiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Post Slug') ?></h3>
-<div class="dbx-content"><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" /></div>
-</fieldset>
-
-<fieldset id="poststatusdiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Post Status') ?></h3>
-<div class="dbx-content">
-<?php if ( current_user_can('publish_posts') ) : ?>
-	<label for="post_status_publish" class="selectit"><input id="post_status_publish" name="post_status" type="radio" value="publish" <?php checked($post->post_status, 'publish'); checked($post->post_status, 'future'); ?> /> <?php _e('Published') ?></label>
-<?php endif; ?>
-	<label for="post_status_pending" class="selectit"><input id="post_status_pending" name="post_status" type="radio" value="pending" <?php checked($post->post_status, 'pending'); ?> /> <?php _e('Pending Review') ?></label>
-	  <label for="post_status_draft" class="selectit"><input id="post_status_draft" name="post_status" type="radio" value="draft" <?php checked($post->post_status, 'draft'); ?> /> <?php _e('Draft') ?></label>
-	  <label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="radio" value="private" <?php checked($post->post_status, 'private'); ?> /> <?php _e('Private') ?></label></div>
-</fieldset>
-
-<?php if ( current_user_can('edit_posts') ) : ?>
-<fieldset id="posttimestampdiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Post Timestamp'); ?></h3>
-<div class="dbx-content"><?php touch_time(($action == 'edit')); ?></div>
-</fieldset>
-<?php endif; ?>
-
+<fieldset id="postdiv">
+       <legend><a href="http://wordpress.org/docs/reference/post/#post" title="<?php _e('Help with post field') ?>"><?php _e('Post') ?></a></legend>
+<?php the_quicktags(); ?>
 <?php
-$authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
-if ( $post->post_author && !in_array($post->post_author, $authors) )
-	$authors[] = $post->post_author;
-if ( $authors && count( $authors ) > 1 ) :
+ $rows = get_settings('default_post_edit_rows');
+ if (($rows < 3) || ($rows > 100)) {
+     $rows = 10;
+ }
 ?>
-<fieldset id="authordiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Post Author'); ?></h3>
-<div class="dbx-content">
-<?php wp_dropdown_users( array('include' => $authors, 'name' => 'post_author_override', 'selected' => empty($post_ID) ? $user_ID : $post->post_author) ); ?>
-</div>
-</fieldset>
-<?php endif; ?>
-
-<?php do_action('dbx_post_sidebar'); ?>
-
-</div>
-</div>
-
-<fieldset id="titlediv">
-	<legend><?php _e('Title') ?></legend>
-	<div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" /></div>
-</fieldset>
-
-<fieldset id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>">
-<legend><?php _e('Post') ?>
-
-<?php if ( 'publish' == $post->post_status ) { ?>
-<a href="<?php echo clean_url(get_permalink($post->ID)); ?>" class="view-link" target="_blank"><?php _e('View &raquo;'); ?></a>
-<?php } elseif ( 'edit' == $action ) { ?>
-<a href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" class="view-link" target="_blank"><?php _e('Preview &raquo;'); ?></a>
-<?php } ?>
-</legend>
-
-	<?php the_editor($post->post_content); ?>
+<div><textarea rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="5" id="content"><?php echo $content ?></textarea></div>
 </fieldset>
+<?php
+?>
+<script type="text/javascript">
+<!--
+edCanvas = document.getElementById('content');
+//-->
+</script>

 <?php echo $form_pingback ?>
 <?php echo $form_prevstatus ?>

-<fieldset id="tagdiv">
-	<legend><?php _e('Tags (separate multiple tags with commas: cats, pet food, dogs)'); ?></legend>
-	<div><input type="text" name="tags_input" class="tags-input" id="tags-input" size="30" tabindex="3" value="<?php echo get_tags_to_edit( $post_ID ); ?>" /></div>
-</fieldset>

-<p class="submit">
-<span id="autosave"></span>
-<?php echo $saveasdraft; ?>
-<input type="submit" name="submit" value="<?php _e('Save'); ?>" style="font-weight: bold;" tabindex="4" />
-<?php
-if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_ID ) {
+<p class="submit"><?php echo $saveasdraft; ?> <input type="submit" name="submit" value="<?php _e('Save') ?>" style="font-weight: bold;" tabindex="6" /> 
+<?php 
+if ('publish' != $post_status || 0 == $post_ID) {
 ?>
-<?php if ( current_user_can('publish_posts') ) : ?>
-	<input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" />
-<?php else : ?>
-	<input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" />
+<?php if ( user_can_create_post($user_ID) ) : ?>
+	<input name="publish" type="submit" id="publish" tabindex="10" value="<?php _e('Publish') ?>" /> 
 <?php endif; ?>
 <?php
 }
 ?>
-<input name="referredby" type="hidden" id="referredby" value="<?php
-if ( !empty($_REQUEST['popupurl']) )
-	echo clean_url(stripslashes($_REQUEST['popupurl']));
-else if ( url_to_postid(wp_get_referer()) == $post_ID )
-	echo 'redo';
-else
-	echo clean_url(stripslashes(wp_get_referer()));
-?>" /></p>
+	<input name="referredby" type="hidden" id="referredby" value="<?php echo wp_specialchars($_SERVER['HTTP_REFERER']); ?>" />
+</p>

-<?php do_action('edit_form_advanced'); ?>
-
-<?php
-if (current_user_can('upload_files')) {
-	$uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID);
-	$uploading_iframe_src = wp_nonce_url("upload.php?style=inline&amp;tab=upload&amp;post_id=$uploading_iframe_ID", 'inlineuploading');
-	$uploading_iframe_src = apply_filters('uploading_iframe_src', $uploading_iframe_src);
-	if ( false != $uploading_iframe_src )
-		echo '<iframe id="uploading" name="uploading" frameborder="0" src="' . $uploading_iframe_src . '">' . __('This feature requires iframe support.') . '</iframe>';
-}
-?>
-
-<div id="advancedstuff" class="dbx-group" >
-
-<div class="dbx-b-ox-wrapper">
-<fieldset id="postexcerpt" class="dbx-box">
-<div class="dbx-h-andle-wrapper">
-<h3 class="dbx-handle"><?php _e('Optional Excerpt') ?></h3>
+<?php do_action('edit_form_advanced', ''); ?>
 </div>
-<div class="dbx-c-ontent-wrapper">
-<div class="dbx-content"><textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt"><?php echo $post->post_excerpt ?></textarea></div>
+
+</div>
+
+<div class="wrap">
+<h2><?php _e('Advanced'); ?></h2>
+
+<table width="100%" cellspacing="2" cellpadding="5" class="editform">
+	<tr>
+		<th scope="row" valign="top"><?php _e('Post Status') ?>:</th>
+		<td><?php if ( user_can_create_post($user_ID) ) : ?>
+<label for="post_status_publish" class="selectit"><input id="post_status_publish" name="post_status" type="radio" value="publish" <?php checked($post_status, 'publish'); ?> /> <?php _e('Published') ?></label><br />
+<?php endif; ?>
+	  <label for="post_status_draft" class="selectit"><input id="post_status_draft" name="post_status" type="radio" value="draft" <?php checked($post_status, 'draft'); ?> /> <?php _e('Draft') ?></label><br />
+	  <label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="radio" value="private" <?php checked($post_status, 'private'); ?> /> <?php _e('Private') ?></label></td>
+	</tr>
+	<tr>
+		<th scope="row" valign="top"><?php _e('Send trackbacks to'); ?>:</th>
+		<td><?php echo $form_trackback; ?> <br />
+		<?php _e('Separate multiple URIs with spaces'); ?></td>
+	</tr>
+	<tr valign="top">
+		<th scope="row" width="25%"><?php _e('Post slug') ?>:</th>
+		<td><input name="post_name" type="text" size="25" id="post_name" value="<?php echo $post_name ?>" /></td>
+	</tr>
+<?php if ($user_level > 7 && $users = $wpdb->get_results("SELECT ID, user_login, user_firstname, user_lastname FROM $wpdb->users WHERE user_level <= $user_level AND user_level > 0") ) : ?>
+	<tr>
+		<th scope="row"><?php _e('Post author'); ?>:</th>
+		<td>
+		<select name="post_author_override" id="post_author_override">
+		<?php 
+		foreach ($users as $o) :
+			if ( $post_author == $o->ID || ( empty($post_ID) && $user_ID == $o->ID ) ) $selected = 'selected="selected"';
+			else $selected = '';
+			echo "<option value='$o->ID' $selected>$o->user_login ($o->user_firstname $o->user_lastname)</option>";
+		endforeach;
+		?>
+		</select>
+		</td>
+	</tr>
+<?php endif; ?>
+<?php if ($user_level > 4) : ?>
+	<tr>
+		<th scope="row"><?php _e('Edit time'); ?>:</th>
+		<td><?php touch_time(($action == 'edit')); ?></td>
+	</tr>
+<?php endif; ?>
+<?php if ('edit' == $action) : ?>
+	<tr>
+		<th scope="row"><?php _e('Delete'); ?>:</th>
+		<td>
+		<input name="deletepost" class="button" type="submit" id="deletepost" tabindex="10" value="<?php _e('Delete this post') ?>" <?php echo "onclick=\"return confirm('" . sprintf(__("You are about to delete this post \'%s\'\\n  \'Cancel\' to stop, \'OK\' to delete."), addslashes($edited_post_title) ) . "')\""; ?> />
+</td>
+<?php endif; ?>
+	</tr>
+</table>
+
+<fieldset id="postcustom">
+<legend><?php _e('Custom Fields') ?></legend>
+<div id="postcustomstuff">
+<?php 
+if($metadata = has_meta($post_ID)) {
+?>
+<?php
+	list_meta($metadata); 
+?>
+<?php
+}
+	meta_form();
+?>
 </div>
 </fieldset>
-</div>
-
-<div class="dbx-b-ox-wrapper">
-<fieldset id="trackbacksdiv" class="dbx-box">
-<div class="dbx-h-andle-wrapper">
-<h3 class="dbx-handle"><?php _e('Trackbacks') ?></h3>
-</div>
-<div class="dbx-c-ontent-wrapper">
-<div class="dbx-content"><?php _e('Send trackbacks to:'); ?> <?php echo $form_trackback; ?> (<?php _e('Separate multiple URLs with spaces'); ?>)
-<?php
-if ( ! empty($pings) )
+<?php 
+if ('' != $pinged)
 	echo $pings;
 ?>
 </div>
-</div>
-</fieldset>
-</div>

-<div class="dbx-b-ox-wrapper">
-<fieldset id="postcustom" class="dbx-box">
-<div class="dbx-h-andle-wrapper">
-<h3 class="dbx-handle"><?php _e('Custom Fields') ?></h3>
-</div>
-<div class="dbx-c-ontent-wrapper">
-<div id="postcustomstuff" class="dbx-content">
-<table cellpadding="3">
-<?php
-$metadata = has_meta($post_ID);
-list_meta($metadata);
-?>
-
-</table>
-<?php
-	meta_form();
-?>
-<div id="ajax-response"></div>
-</div>
-</div>
-</fieldset>
-</div>
-
-<?php do_action('dbx_post_advanced'); ?>
-
-</div>
-
-<?php if ('edit' == $action) : $delete_nonce = wp_create_nonce( 'delete-post_' . $post_ID ); ?>
-<input name="deletepost" class="button delete" type="submit" id="deletepost" tabindex="10" value="<?php echo ( 'draft' == $post->post_status ) ? __('Delete this draft') : __('Delete this post'); ?>" <?php echo "onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { document.forms.post._wpnonce.value = '$delete_nonce'; return true;}return false;\""; ?> />
-<?php endif; ?>
-
-</div>
-
-</div>
-
-</form>
+</form>
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -1,49 +1,61 @@
 <?php
 $submitbutton_text = __('Edit Comment &raquo;');
-$toprow_title = sprintf(__('Editing Comment # %s'), $comment->comment_ID);
+$toprow_title = sprintf(__('Editing Comment # %s'), $commentdata['comment_ID']);
 $form_action = 'editedcomment';
-$form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . $comment->comment_ID . "' />\n<input type='hidden' name='comment_post_ID' value='" . $comment->comment_post_ID;
+$form_extra = "' />\n<input type='hidden' name='comment_ID' value='$comment' />\n<input type='hidden' name='comment_post_ID' value='".$commentdata["comment_post_ID"];
 ?>

-<form name="post" action="comment.php" method="post" id="post">
-<h2><?php echo $toprow_title; ?></h2>
-<?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
+<form name="post" action="post.php" method="post" id="post">
 <div class="wrap">
-<input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" />
+<input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" />
 <input type="hidden" name="action" value='<?php echo $form_action . $form_extra ?>' />

 <script type="text/javascript">
-function focusit() { // focus on first input field
+function focusit() {
+	// focus on first input field
 	document.post.name.focus();
 }
-addLoadEvent(focusit);
+window.onload = focusit;
 </script>
 <fieldset id="namediv">
-    <legend><label for="name"><?php _e('Name:') ?></label></legend>
+    <legend><?php _e('Name:') ?></legend>
 	<div>
-	  <input type="text" name="newcomment_author" size="25" value="<?php echo attribute_escape( $comment->comment_author ); ?>" tabindex="1" id="name" />
+	  <input type="text" name="newcomment_author" size="22" value="<?php echo format_to_edit($commentdata['comment_author']) ?>" tabindex="1" id="name" />
    </div>
 </fieldset>
 <fieldset id="emaildiv">
-        <legend><label for="email"><?php _e('E-mail:') ?></label></legend>
+        <legend><?php _e('E-mail:') ?></legend>
 		<div>
-		  <input type="text" name="newcomment_author_email" size="20" value="<?php echo attribute_escape( $comment->comment_author_email ); ?>" tabindex="2" id="email" />
+		  <input type="text" name="newcomment_author_email" size="30" value="<?php echo format_to_edit($commentdata['comment_author_email']) ?>" tabindex="2" id="email" />
    </div>
 </fieldset>
 <fieldset id="uridiv">
-        <legend><label for="newcomment_author_url"><?php _e('URL:') ?></label></legend>
+        <legend><?php _e('URI:') ?></legend>
 		<div>
-		  <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="35" value="<?php echo attribute_escape( $comment->comment_author_url ); ?>" tabindex="2" />
+		  <input type="text" name="newcomment_author_url" size="35" value="<?php echo format_to_edit($commentdata['comment_author_url']) ?>" tabindex="3" id="URL" />
    </div>
 </fieldset>

 <fieldset style="clear: both;">
        <legend><?php _e('Comment') ?></legend>
-	<?php the_editor($comment->comment_content, 'content', 'newcomment_author_url'); ?>
+<?php the_quicktags(); ?>
+<?php
+ $rows = get_settings('default_post_edit_rows');
+ if (($rows < 3) || ($rows > 100)) {
+     $rows = 10;
+ }
+?>
+<div><textarea rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="4" id="content" style="width: 99%"><?php echo $content ?></textarea></div>
 </fieldset>

+<script type="text/javascript">
+<!--
+edCanvas = document.getElementById('content');
+//-->
+</script>
+
 <p class="submit"><input type="submit" name="editcomment" id="editcomment" value="<?php echo $submitbutton_text ?>" style="font-weight: bold;" tabindex="6" />
-  <input name="referredby" type="hidden" id="referredby" value="<?php echo wp_get_referer(); ?>" />
+  <input name="referredby" type="hidden" id="referredby" value="<?php echo $_SERVER['HTTP_REFERER']; ?>" />
 </p>

 </div>
@@ -54,25 +66,21 @@ addLoadEvent(focusit);
 <table width="100%" cellspacing="2" cellpadding="5" class="editform">
 	<tr>
 		<th scope="row" valign="top"><?php _e('Comment Status') ?>:</th>
-		<td><label for="comment_status_approved" class="selectit"><input id="comment_status_approved" name="comment_status" type="radio" value="1" <?php checked($comment->comment_approved, '1'); ?> tabindex="4" /> <?php _e('Approved') ?></label> &nbsp;
-		<label for="comment_status_moderated" class="selectit"><input id="comment_status_moderated" name="comment_status" type="radio" value="0" <?php checked($comment->comment_approved, '0'); ?> tabindex="4" /> <?php _e('Moderated') ?></label> &nbsp;
-		<label for="comment_status_spam" class="selectit"><input id="comment_status_spam" name="comment_status" type="radio" value="spam" <?php checked($comment->comment_approved, 'spam'); ?> tabindex="4" /> <?php _e('Spam') ?></label></td>
+		<td><label for="comment_status_approved" class="selectit"><input id="comment_status_approved" name="comment_status" type="radio" value="1" <?php checked($comment_status, '1'); ?> /> <?php _e('Approved') ?></label><br />
+	  <label for="comment_status_moderated" class="selectit"><input id="comment_status_moderated" name="comment_status" type="radio" value="0" <?php checked($comment_status, '0'); ?> /> <?php _e('Moderated') ?></label><br />
+	  <label for="comment_status_spam" class="selectit"><input id="comment_status_spam" name="comment_status" type="radio" value="spam" <?php checked($comment_status, 'spam'); ?> /> <?php _e('Spam') ?></label></td>
 	</tr>

-<?php if ( current_user_can('edit_posts') ) : ?>
+<?php if ($user_level > 4) : ?>
 	<tr>
-		<th scope="row" valign="top"><?php _e('Edit time'); ?>:</th>
-		<td><?php touch_time(('editcomment' == $action), 0, 5); ?> </td>
+		<th scope="row"><?php _e('Edit time'); ?>:</th>
+		<td><?php touch_time(('editcomment' == $action), 0); ?></td>
 	</tr>
 <?php endif; ?>

 	<tr>
-		<th scope="row" valign="top">&nbsp;</th>
-		<td><input name="deletecomment" class="button delete" type="submit" id="deletecomment" tabindex="10" value="<?php _e('Delete this comment') ?>" <?php echo "onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ) { document.forms.post._wpnonce.value = '" . wp_create_nonce( 'delete-comment_' . $comment->comment_ID ) . "'; return true; } return false;\""; ?> />
-		<input type="hidden" name="c" value="<?php echo $comment->comment_ID ?>" />
-		<input type="hidden" name="p" value="<?php echo $comment->comment_post_ID ?>" />
-		<input type="hidden" name="noredir" value="1" />
-	</td>
+		<th scope="row"><?php _e('Delete'); ?>:</th>
+		<td><p><a class="delete" href="post.php?action=confirmdeletecomment&amp;noredir=true&amp;comment=<?php echo $commentdata['comment_ID']; ?>&amp;p=<?php echo $commentdata['comment_post_ID']; ?>"><?php _e('Delete comment') ?></a></p></td>
 	</tr>
 </table>

--- a/wp-admin/edit-form.php
+++ b/wp-admin/edit-form.php
@@ -6,39 +6,41 @@
 <?php if (isset($mode) && 'bookmarklet' == $mode) : ?>
 <input type="hidden" name="mode" value="bookmarklet" />
 <?php endif; ?>
-<input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" />
+<input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" />
 <input type="hidden" name="action" value='post' />

 <script type="text/javascript">
 <!--
-function focusit() { // focus on first input field
+function focusit() {
+	// focus on first input field
 	document.getElementById('title').focus();
 }
-addLoadEvent(focusit);
+window.onload = focusit;
 //-->
 </script>

 <div id="poststuff">
    <fieldset id="titlediv">
-      <legend><a href="http://wordpress.org/docs/reference/post/#title" title="<?php _e('Help on titles') ?>"><?php _e('Title') ?></a></legend>
-	  <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" /></div>
+      <legend><a href="http://wordpress.org/docs/reference/post/#title" title="<?php _e('Help on titles') ?>"><?php _e('Title') ?></a></legend> 
+	  <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo $edited_post_title; ?>" id="title" /></div>
    </fieldset>

    <fieldset id="categorydiv">
-      <legend><a href="http://wordpress.org/docs/reference/post/#category" title="<?php _e('Help on categories') ?>"><?php _e('Categories') ?></a></legend>
-	  <div><?php dropdown_categories($post->post_category); ?></div>
+      <legend><a href="http://wordpress.org/docs/reference/post/#category" title="<?php _e('Help on categories') ?>"><?php _e('Categories') ?></a></legend> 
+	  <div><?php dropdown_categories($default_post_cat); ?></div>
    </fieldset>

 <br />
 <fieldset id="postdiv">
    <legend><a href="http://wordpress.org/docs/reference/post/#post" title="<?php _e('Help with post field') ?>"><?php _e('Post') ?></a></legend>
+<?php the_quicktags(); ?>
 <?php
- $rows = get_option('default_post_edit_rows');
+ $rows = get_settings('default_post_edit_rows');
 if (($rows < 3) || ($rows > 100)) {
     $rows = 10;
 }
 ?>
-<div><textarea rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="4" id="content"><?php echo $post->post_content ?></textarea></div>
+<div><textarea rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="4" id="content"><?php echo $content ?></textarea></div>
 </fieldset>


@@ -48,22 +50,22 @@ edCanvas = document.getElementById('content');
 //-->
 </script>

-<input type="hidden" name="post_pingback" value="<?php echo (int) get_option('default_pingback_flag') ?>" id="post_pingback" />
+<input type="hidden" name="post_pingback" value="<?php echo get_option('default_pingback_flag') ?>" id="post_pingback" />

-<p><label for="trackback"> <?php printf(__('<a href="%s" title="Help on trackbacks"><strong>TrackBack</strong> a <abbr title="Universal Resource Locator">URL</abbr></a>:</label> (Separate multiple <abbr title="Universal Resource Locator">URL</abbr>s with spaces.)'), 'http://wordpress.org/docs/reference/post/#trackback'); echo '<br />'; ?>
+<p><label for="trackback"> <?php printf(__('<a href="%s" title="Help on trackbacks"><strong>TrackBack</strong> a <abbr title="Universal Resource Identifier">URI</abbr></a>:</label> (Separate multiple <abbr title="Universal Resource Identifier">URI</abbr>s with spaces.)<br />'), 'http://wordpress.org/docs/reference/post/#trackback') ?>
 	<input type="text" name="trackback_url" style="width: 360px" id="trackback" tabindex="7" /></p>

-<p class="submit"><input name="saveasdraft" type="submit" id="saveasdraft" tabindex="9" value="<?php _e('Save as Draft') ?>" />
-	<input name="saveasprivate" type="submit" id="saveasprivate" tabindex="10" value="<?php _e('Save as Private') ?>" />
+<p class="submit"><input name="saveasdraft" type="submit" id="saveasdraft" tabindex="9" value="<?php _e('Save as Draft') ?>" /> 
+  <input name="saveasprivate" type="submit" id="saveasprivate" tabindex="10" value="<?php _e('Save as Private') ?>" />

-	 <?php if ( current_user_can('edit_posts') ) : ?>
-	<input name="publish" type="submit" id="publish" tabindex="6" style="font-weight: bold;" value="<?php _e('Publish') ?>" />
+	 <?php if ( user_can_create_post($user_ID) ) : ?>
+  <input name="publish" type="submit" id="publish" tabindex="6" style="font-weight: bold;" value="<?php _e('Publish') ?>" /> 
 <?php endif; ?>

 <?php if ('bookmarklet' != $mode) {
-		echo '<input name="advanced" type="submit" id="advancededit" tabindex="7" value="' .  __('Advanced Editing &raquo;') . '" />';
-	} ?>
-	<input name="referredby" type="hidden" id="referredby" value="<?php if ( $refby = wp_get_referer() ) echo urlencode($refby); ?>" />
+      echo '<input name="advanced" type="submit" id="advancededit" tabindex="7" value="' .  __('Advanced Editing &raquo;') . '" />';
+  } ?>
+  <input name="referredby" type="hidden" id="referredby" value="<?php if (isset($_SERVER['HTTP_REFERER'])) echo urlencode($_SERVER['HTTP_REFERER']); ?>" />
 </p>

 <?php do_action('simple_edit_form', ''); ?>
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -1,93 +0,0 @@
-<?php
-require_once('admin.php');
-
-$title = __('Categories');
-$parent_file = 'link-manager.php';
-
-//wp_enqueue_script( 'admin-categories' );  TODO: Fix AJAX
-require_once ('admin-header.php');
-
-$messages[1] = __('Category added.');
-$messages[2] = __('Category deleted.');
-$messages[3] = __('Category updated.');
-$messages[4] = __('Category not added.');
-$messages[5] = __('Category not updated.');
-
-function link_cat_row($category) {
-	global $class;
-
-	if ( current_user_can( 'manage_categories' ) ) {
-		$edit = "<a href='link-category.php?action=edit&amp;cat_ID=$category->term_id' class='edit'>".__( 'Edit' )."</a></td>";
-		$default_cat_id = (int) get_option( 'default_link_category' );
-
-		if ( $category->term_id != $default_cat_id )
-			$edit .= "<td><a href='" . wp_nonce_url( "link-category.php?action=delete&amp;cat_ID=$category->term_id", 'delete-link-category_' . $category->term_id ) . "' onclick=\"return deleteSomething( 'cat', $category->term_id, '" . js_escape(sprintf( __("You are about to delete the category '%s'.\nAll links that were only assigned to this category will be assigned to the '%s' category.\n'OK' to delete, 'Cancel' to stop." ), $category->name, get_term_field( 'name', $default_cat_id,  'link_category' ))) . "' );\" class='delete'>".__( 'Delete' )."</a>";
-		else
-			$edit .= "<td style='text-align:center'>".__( "Default" );
-	} else {
-		$edit = '';
-	}
-
-	$class = ( ( defined( 'DOING_AJAX' ) && DOING_AJAX ) || " class='alternate'" == $class ) ? '' : " class='alternate'";
-
-	$category->count = number_format_i18n( $category->count );
-	$count = ( $category->count > 0 ) ? "<a href='link-manager.php?cat_id=$category->term_id'>$category->count</a>" : $category->count;
-	return "<tr id='cat-$category->term_id'$class>
-		<th scope='row' style='text-align: center'>$category->term_id</th>
-		<td>" . ( $name_override ? $name_override : $pad . ' ' . $category->name ) . "</td>
-		<td>$category->description</td>
-		<td align='center'>$count</td>
-		<td>$edit</td>\n\t</tr>\n";
-}
-?>
-
-<?php if (isset($_GET['message'])) : ?>
-<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
-<?php endif; ?>
-
-<div class="wrap">
-<?php if ( current_user_can('manage_categories') ) : ?>
-	<h2><?php printf(__('Categories (<a href="%s">add new</a>)'), '#addcat') ?> </h2>
-<?php else : ?>
-	<h2><?php _e('Categories') ?> </h2>
-<?php endif; ?>
-<table class="widefat">
-	<thead>
-	<tr>
-		<th scope="col" style="text-align: center"><?php _e('ID') ?></th>
-        <th scope="col"><?php _e('Name') ?></th>
-        <th scope="col"><?php _e('Description') ?></th>
-        <th scope="col" width="90" style="text-align: center"><?php _e('Links') ?></th>
-        <th colspan="2" style="text-align: center"><?php _e('Action') ?></th>
-	</tr>
-	</thead>
-	<tbody id="the-list">
-<?php
-$categories = get_terms( 'link_category', 'hide_empty=0' );
-if ( $categories ) {
-	$output = '';
-	foreach ( $categories as $category ) {
-		$category = sanitize_term($category, 'link_category', 'display');
-		$output .= link_cat_row($category);
-	}
-	$output = apply_filters('cat_rows', $output);
-	echo $output;
-	unset($category);
-}
-
-?>
-	</tbody>
-</table>
-
-</div>
-
-<?php if ( current_user_can('manage_categories') ) : ?>
-<div class="wrap">
-<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the links in that category. Instead, links that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), get_term_field('name', get_option('default_link_category'), 'link_category')) ?></p>
-</div>
-
-<?php include('edit-link-category-form.php'); ?>
-
-<?php endif; ?>
-
-<?php include('admin-footer.php'); ?>
--- a/wp-admin/edit-link-category-form.php
+++ b/wp-admin/edit-link-category-form.php
@@ -1,43 +0,0 @@
-<?php
-if ( ! empty($cat_ID) ) {
-	$heading = __('Edit Category');
-	$submit_text = __('Edit Category &raquo;');
-	$form = '<form name="editcat" id="editcat" method="post" action="link-category.php">';
-	$action = 'editedcat';
-	$nonce_action = 'update-link-category_' . $cat_ID;
-	do_action('edit_link_category_form_pre', $category);
-} else {
-	$heading = __('Add Category');
-	$submit_text = __('Add Category &raquo;');
-	$form = '<form name="addcat" id="addcat" method="post" action="link-category.php">';
-	$action = 'addcat';
-	$nonce_action = 'add-link-category';
-	do_action('add_link_category_form_pre', $category);
-}
-?>
-
-<div class="wrap">
-<h2><?php echo $heading ?></h2>
-<div id="ajax-response"></div>
-<?php echo $form ?>
-<input type="hidden" name="action" value="<?php echo $action ?>" />
-<input type="hidden" name="cat_ID" value="<?php echo $category->term_id ?>" />
-<?php wp_nonce_field($nonce_action); ?>
-	<table class="editform" width="100%" cellspacing="2" cellpadding="5">
-		<tr>
-			<th width="33%" scope="row" valign="top"><label for="name"><?php _e('Category name:') ?></label></th>
-			<td width="67%"><input name="name" id="name" type="text" value="<?php echo $category->name; ?>" size="40" /></td>
-		</tr>
-		<tr>
-			<th scope="row" valign="top"><label for="slug"><?php _e('Category slug:') ?></label></th>
-			<td><input name="slug" id="slug" type="text" value="<?php echo $category->slug; ?>" size="40" /></td>
-		</tr>
-		<tr>
-			<th scope="row" valign="top"><label for="description"><?php _e('Description: (optional)') ?></label></th>
-			<td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo $category->description; ?></textarea></td>
-		</tr>
-	</table>
-<p class="submit"><input type="submit" name="submit" value="<?php echo $submit_text ?>" /></p>
-<?php do_action('edit_link_category_form', $category); ?>
-</form>
-</div>
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -1,258 +0,0 @@
-<?php
-if ( ! empty($link_id) ) {
-	$heading = __('Edit Link');
-	$submit_text = __('Save Changes &raquo;');
-	$form = '<form name="editlink" id="editlink" method="post" action="link.php">';
-	$nonce_action = 'update-bookmark_' . $link_id;
-} else {
-	$heading = __('Add Link');
-	$submit_text = __('Add Link &raquo;');
-	$form = '<form name="addlink" id="addlink" method="post" action="link.php">';
-	$nonce_action = 'add-bookmark';
-}
-
-function xfn_check($class, $value = '', $type = 'check') {
-	global $link;
-
-	$link_rel = $link->link_rel;
-	$rels = preg_split('/\s+/', $link_rel);
-
-	if ('' != $value && in_array($value, $rels) ) {
-		echo ' checked="checked"';
-	}
-
-	if ('' == $value) {
-		if ('family' == $class && strpos($link_rel, 'child') === false && strpos($link_rel, 'parent') === false && strpos($link_rel, 'sibling') === false && strpos($link_rel, 'spouse') === false && strpos($link_rel, 'kin') === false) echo ' checked="checked"';
-		if ('friendship' == $class && strpos($link_rel, 'friend') === false && strpos($link_rel, 'acquaintance') === false && strpos($link_rel, 'contact') === false) echo ' checked="checked"';
-		if ('geographical' == $class && strpos($link_rel, 'co-resident') === false && strpos($link_rel, 'neighbor') === false) echo ' checked="checked"';
-		if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"';
-	}
-}
-?>
-
-<div class="wrap">
-<h2><?php echo $heading ?></h2>
-<?php echo $form ?>
-<?php wp_nonce_field($nonce_action); ?>
-
-<div id="poststuff">
-<div id="moremeta">
-<div id="grabit" class="dbx-group">
-
-<fieldset id="categorydiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Categories') ?></h3>
-<div class="dbx-content">
-<p id="jaxcat"></p>
-<ul id="linkcategorychecklist"><?php dropdown_link_categories(get_option('default_link_category')); ?></ul>
-</div>
-</fieldset>
-
-<fieldset class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Target') ?></h3>
-<div class="dbx-content">
-<label for="link_target_blank" class="selectit">
-<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo(($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
-<code>_blank</code></label>
-<label for="link_target_top" class="selectit">
-<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo(($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
-<code>_top</code></label>
-<label for="link_target_none" class="selectit">
-<input id="link_target_none" type="radio" name="link_target" value="" <?php echo(($link->link_target == '') ? 'checked="checked"' : ''); ?> />
-<?php _e('none') ?></label>
-</div>
-</fieldset>
-
-<fieldset class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Visible') ?></h3>
-<div class="dbx-content">
-<label for="link_visible_yes" class="selectit">
-<input id="link_visible_yes" type="radio" name="link_visible" <?php if ($link->link_visible == 'Y') echo "checked='checked'"; ?> value="Y" />
-<?php _e('Yes') ?></label>
-<label for="link_visible_no" class="selectit">
-<input id="link_visible_no" type="radio" name="link_visible" <?php if ($link->link_visible == 'N') echo "checked='checked'"; ?> value="N" />
-<?php _e('No') ?></label>
-</div>
-</fieldset>
-
-</div>
-</div>
-
-<table class="editform" width="100%" cellspacing="2" cellpadding="5">
-<tr>
-<th scope="row" valign="top"><label for="link_name"><?php _e('Name:') ?></label></th>
-<td><input type="text" name="link_name" id="link_name" value="<?php echo $link->link_name; ?>" style="width: 95%" /></td>
-</tr>
-<tr>
-<th width="20%" scope="row" valign="top"><label for="link_url"><?php _e('Address:') ?></label></th>
-<td width="80%"><input type="text" name="link_url" id="link_url" value="<?php echo $link->link_url; if ( empty( $link->link_url ) ) echo 'http://'; ?>" style="width: 95%" /></td>
-</tr>
-<tr>
-<th scope="row" valign="top"><label for="link_description"><?php _e('Description:') ?></label></th>
-<td><input type="text" name="link_description" id="link_description" value="<?php echo $link->link_description; ?>" style="width: 95%" /></td>
-</tr>
-</table>
-
-<p class="submit">
-<input type="submit" name="submit" value="<?php echo $submit_text ?>" />
-</p>
-
-<div id="advancedstuff" class="dbx-group" >
-
-<fieldset id="xfn" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Link Relationship (XFN)') ?></h3>
-<div class="dbx-content">
-<table class="editform" width="100%" cellspacing="2" cellpadding="5">
-	<tr>
-		<th width="20%" scope="row"><?php _e('rel:') ?></th>
-		<td width="80%"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo $link->link_rel; ?>" /></td>
-	</tr>
-	<tr>
-		<th scope="row"><?php _e('<a href="http://gmpg.org/xfn/">XFN</a> Creator:') ?></th>
-		<td>
-			<table cellpadding="3" cellspacing="5">
-				<tr>
-					<th scope="row"> <?php _e('identity') ?> </th>
-					<td>
-						<label for="me">
-						<input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> />
-						<?php _e('another web address of mine') ?></label>
-					</td>
-				</tr>
-				<tr>
-					<th scope="row"> <?php _e('friendship') ?> </th>
-					<td>
-						<label for="contact">
-						<input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php _e('contact') ?></label>
-						<label for="acquaintance">
-						<input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance', 'radio'); ?> />  <?php _e('acquaintance') ?></label>
-						<label for="friend">
-						<input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php _e('friend') ?></label>
-						<label for="friendship">
-						<input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php _e('none') ?></label>
-					</td>
-				</tr>
-				<tr>
-					<th scope="row"> <?php _e('physical') ?> </th>
-					<td>
-						<label for="met">
-						<input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />
-						<?php _e('met') ?></label>
-					</td>
-				</tr>
-				<tr>
-					<th scope="row"> <?php _e('professional') ?> </th>
-					<td>
-						<label for="co-worker">
-						<input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> />
-						<?php _e('co-worker') ?></label>
-						<label for="colleague">
-						<input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> />
-						<?php _e('colleague') ?></label>
-					</td>
-				</tr>
-				<tr>
-					<th scope="row"> <?php _e('geographical') ?> </th>
-					<td>
-						<label for="co-resident">
-						<input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident', 'radio'); ?> />
-						<?php _e('co-resident') ?></label>
-						<label for="neighbor">
-						<input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check('geographical', 'neighbor', 'radio'); ?> />
-						<?php _e('neighbor') ?></label>
-						<label for="geographical">
-						<input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical', '', 'radio'); ?> />
-						<?php _e('none') ?></label>
-					</td>
-				</tr>
-				<tr>
-					<th scope="row"> <?php _e('family') ?> </th>
-					<td>
-						<label for="child">
-						<input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child', 'radio'); ?>  />
-						<?php _e('child') ?></label>
-						<label for="kin">
-						<input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin', 'radio'); ?>  />
-						<?php _e('kin') ?></label>
-						<label for="parent">
-						<input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent', 'radio'); ?> />
-						<?php _e('parent') ?></label>
-						<label for="sibling">
-						<input class="valinp" type="radio" name="family" value="sibling" id="sibling" <?php xfn_check('family', 'sibling', 'radio'); ?> />
-						<?php _e('sibling') ?></label>
-						<label for="spouse">
-						<input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check('family', 'spouse', 'radio'); ?> />
-						<?php _e('spouse') ?></label>
-						<label for="family">
-						<input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family', '', 'radio'); ?> />
-						<?php _e('none') ?></label>
-					</td>
-				</tr>
-				<tr>
-					<th scope="row"> <?php _e('romantic') ?> </th>
-					<td>
-						<label for="muse">
-						<input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> />
-						<?php _e('muse') ?></label>
-						<label for="crush">
-						<input class="valinp" type="checkbox" name="romantic" value="crush" id="crush" <?php xfn_check('romantic', 'crush'); ?> />
-						<?php _e('crush') ?></label>
-						<label for="date">
-						<input class="valinp" type="checkbox" name="romantic" value="date" id="date" <?php xfn_check('romantic', 'date'); ?> />
-						<?php _e('date') ?></label>
-						<label for="romantic">
-						<input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> />
-						<?php _e('sweetheart') ?></label>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-</div>
-</fieldset>
-
-<fieldset id="advanced" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Advanced') ?></h3>
-<div class="dbx-content">
-<table class="editform" width="100%" cellspacing="2" cellpadding="5">
-	<tr>
-		<th width="20%" scope="row"><?php _e('Image Address:') ?></th>
-		<td width="80%"><input type="text" name="link_image" size="50" value="<?php echo $link->link_image; ?>" style="width: 95%" /></td>
-	</tr>
-	<tr>
-		<th scope="row"><?php _e('RSS Address:') ?> </th>
-		<td><input name="link_rss" type="text" id="rss_uri" value="<?php echo $link->link_rss; ?>" size="50" style="width: 95%" /></td>
-	</tr>
-	<tr>
-		<th scope="row"><?php _e('Notes:') ?></th>
-		<td><textarea name="link_notes" cols="50" rows="10" style="width: 95%"><?php echo $link->link_notes; ?></textarea></td>
-	</tr>
-	<tr>
-		<th scope="row"><?php _e('Rating:') ?></th>
-		<td><select name="link_rating" size="1">
-		<?php
-			for ($r = 0; $r < 10; $r++) {
-				echo('            <option value="'.$r.'" ');
-				if ($link->link_rating == $r)
-					echo 'selected="selected"';
-				echo('>'.$r.'</option>');
-			}
-		?></select>&nbsp;<?php _e('(Leave at 0 for no rating.)') ?>
-		</td>
-	</tr>
-</table>
-</div>
-</fieldset>
-</div>
-
-<?php if ( $link_id ) : ?>
-<input type="hidden" name="action" value="save" />
-<input type="hidden" name="link_id" value="<?php echo (int) $link_id; ?>" />
-<input type="hidden" name="order_by" value="<?php echo attribute_escape($order_by); ?>" />
-<input type="hidden" name="cat_id" value="<?php echo (int) $cat_id ?>" />
-<?php else: ?>
-<input type="hidden" name="action" value="add" />
-<?php endif; ?>
-</div>
-</form>
-</div>
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -1,209 +1,164 @@

 <div class="wrap">
-<h2 id="write-post"><?php _e('Write Page'); ?></h2>
+<h2><?php _e('Write Page'); ?></h2>
 <?php
-
 if (0 == $post_ID) {
 	$form_action = 'post';
-	$nonce_action = 'add-page';
-	$temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post()
-	$form_extra = "<input type='hidden' id='post_ID' name='temp_ID' value='$temp_ID' />";
+	$form_extra = '';
 } else {
-	$post_ID = (int) $post_ID;
 	$form_action = 'editpost';
-	$nonce_action = 'update-page_' . $post_ID;
-	$form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
+	$form_extra = "<input type='hidden' name='post_ID' value='$post_ID' />";
 }

-$temp_ID = (int) $temp_ID;
-$user_ID = (int) $user_ID;
-
-$sendto = clean_url(stripslashes(wp_get_referer()));
+$sendto = $_SERVER['HTTP_REFERER'];

 if ( 0 != $post_ID && $sendto == get_permalink($post_ID) )
-	$sendto = 'redo';
+ 	$sendto = 'redo';
+$sendto = wp_specialchars( $sendto );
+
 ?>

-<form name="post" action="page.php" method="post" id="post">
+<form name="post" action="post.php" method="post" id="post">

 <?php
-wp_nonce_field($nonce_action);
-
 if (isset($mode) && 'bookmarklet' == $mode) {
-	echo '<input type="hidden" name="mode" value="bookmarklet" />';
+    echo '<input type="hidden" name="mode" value="bookmarklet" />';
 }
 ?>
 <input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" />
-<input type="hidden" id="hiddenaction" name="action" value='<?php echo $form_action ?>' />
-<input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" />
+<input type="hidden" name="action" value='<?php echo $form_action ?>' />
 <?php echo $form_extra ?>
-<input type="hidden" id="post_type" name="post_type" value="page" />
+<input type="hidden" name="post_status" value="static" />

 <script type="text/javascript">
-// <![CDATA[
-function focusit() { // focus on first input field
+<!--
+function focusit() {
+	// focus on first input field
 	document.post.title.focus();
 }
-addLoadEvent(focusit);
-// ]]>
+window.onload = focusit;
+//-->
 </script>
-<div id="poststuff">
-
-<div id="moremeta">
-<div id="grabit" class="dbx-group">
-<fieldset id="commentstatusdiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Discussion') ?></h3>
-<div class="dbx-content">
-<input name="advanced_view" type="hidden" value="1" />
-<label for="comment_status" class="selectit">
-<input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> />
-<?php _e('Allow Comments') ?></label>
-<label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label>
-</div>
+    <fieldset id="titlediv">
+      <legend><?php _e('Page Title') ?></legend> 
+ 	  <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo $edited_post_title; ?>" id="title" /></div>
+    </fieldset>
+<fieldset id="commentstatusdiv">
+      <legend><?php _e('Discussion') ?></legend> 
+	  <div>
+	  <input name="advanced_view" type="hidden" value="1" />
+	  <label for="comment_status" class="selectit">
+	      <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($comment_status, 'open'); ?> />
+         <?php _e('Allow Comments') ?></label> 
+		 <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label>
+	</div>
 </fieldset>
-
-<fieldset class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Page Status') ?></h3>
-<div class="dbx-content"><?php if ( current_user_can('publish_pages') ) : ?>
-<label for="post_status_publish" class="selectit"><input id="post_status_publish" name="post_status" type="radio" value="publish" <?php checked($post->post_status, 'publish'); checked($post->post_status, 'future'); ?> /> <?php _e('Published') ?></label>
-<?php endif; ?>
-	  <label for="post_status_draft" class="selectit"><input id="post_status_draft" name="post_status" type="radio" value="draft" <?php checked($post->post_status, 'draft'); ?> /> <?php _e('Draft') ?></label>
-	  <label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="radio" value="private" <?php checked($post->post_status, 'private'); ?> /> <?php _e('Private') ?></label></div>
-</fieldset>
-
-<fieldset id="passworddiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Page Password') ?></h3>
-<div class="dbx-content"><input name="post_password" type="text" size="13" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></div>
-</fieldset>
-
-<fieldset id="pageparent" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Page Parent') ?></h3>
-<div class="dbx-content"><p><select name="parent_id">
-<option value='0'><?php _e('Main Page (no parent)'); ?></option>
-<?php parent_dropdown($post->post_parent); ?>
-</select></p>
-</div>
-</fieldset>
-
-<?php if ( 0 != count( get_page_templates() ) ) { ?>
-<fieldset id="pagetemplate" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Page Template') ?></h3>
-<div class="dbx-content"><p><select name="page_template">
-		<option value='default'><?php _e('Default Template'); ?></option>
-		<?php page_template_dropdown($post->page_template); ?>
-		</select></p>
-</div>
-</fieldset>
-<?php } ?>
-
-<fieldset id="slugdiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Page Slug') ?></h3>
-<div class="dbx-content"><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" /></div>
-</fieldset>
-
-<?php if ( $authors = get_editable_authors( $current_user->id ) ) : // TODO: ROLE SYSTEM ?>
-<fieldset id="authordiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Page Author'); ?></h3>
-<div class="dbx-content">
-<select name="post_author_override" id="post_author_override">
+    <fieldset id="postpassworddiv">
+      <legend><?php _e('Page Password') ?></legend> 
+	  <div><input name="post_password" type="text" size="13" id="post_password" value="<?php echo $post_password ?>" /></div>
+    </fieldset>
+    <fieldset id="pageparent">
+      <legend><?php _e('Page Parent') ?></legend> 
+	  <div><select name="parent_id">
+	  <option value='0'><?php _e('Main Page (no parent)'); ?></option>
+			<?php parent_dropdown($post_parent); ?>
+        </select>
+	  </div>
+    </fieldset>
+<fieldset id="postdiv">
+    <legend><?php _e('Page Content') ?></legend>
+<?php the_quicktags(); ?>
 <?php
-foreach ($authors as $o) :
-$o = get_userdata( $o->ID );
-if ( $post->post_author == $o->ID || ( empty($post_ID) && $user_ID == $o->ID ) ) $selected = 'selected="selected"';
-else $selected = '';
-$o->ID = (int) $o->ID;
-$o->display_name = wp_specialchars( $o->display_name );
-echo "<option value='$o->ID' $selected>$o->display_name</option>";
-endforeach;
+ $rows = get_settings('default_post_edit_rows');
+ if (($rows < 3) || ($rows > 100)) {
+     $rows = 10;
+ }
 ?>
-</select>
-</div>
-</fieldset>
-<?php endif; ?>
-
-<fieldset id="pageorder" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Page Order') ?></h3>
-<div class="dbx-content"><p><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo $post->menu_order ?>" /></p></div>
-</fieldset>
-
-<?php do_action('dbx_page_sidebar'); ?>
-
-</div>
-</div>
-
-<fieldset id="titlediv">
-  <legend><?php _e('Page Title') ?></legend>
-  <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" /></div>
+<div><textarea rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="4" id="content"><?php echo $content ?></textarea></div>
 </fieldset>


-<fieldset id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>">
-<legend><?php _e('Page Content') ?>
-
-<?php if ( 'publish' == $post->post_status ) { ?>
-<a href="<?php echo clean_url(get_permalink($post->ID)); ?>" style="position: absolute; right: 2em; margin-right: 19em; text-decoration: underline;" target="_blank"><?php _e('View &raquo;'); ?></a>
-<?php } elseif ( 'edit' == $action ) { ?>
-<a href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" style="position: absolute; right: 2em; margin-right: 19em; text-decoration: underline;" target="_blank"><?php _e('Preview &raquo;'); ?></a>
-<?php } ?>
-</legend>
-	<?php the_editor($post->post_content); ?>
-</fieldset>
+<script type="text/javascript">
+<!--
+edCanvas = document.getElementById('content');
+//-->
+</script>

 <p class="submit">
-<span id="autosave"></span>
-<input name="save" type="submit" id="save" tabindex="3" value="<?php _e('Save and Continue Editing'); ?>" />
-<input type="submit" name="submit" value="<?php _e('Save') ?>" style="font-weight: bold;" tabindex="4" />
-<?php
-if ('publish' != $post->post_status || 0 == $post_ID):
-?>
-<?php if ( current_user_can('publish_pages') ) : ?>
-	<input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" />
-<?php endif; endif;?>
+<?php if ( $post_ID ) : ?>
+<input name="save" type="submit" id="save" tabindex="5" value=" <?php _e('Save and Continue Editing'); ?> "/> 
+<input name="savepage" type="submit" id="savepage" tabindex="6" value="<?php $post_ID ? _e('Edit Page') : _e('Create New Page') ?> &raquo;" /> 
+<?php else : ?>
+<input name="savepage" type="submit" id="savepage" tabindex="6" value="<?php _e('Create New Page') ?> &raquo;" /> 
+<?php endif; ?>
 <input name="referredby" type="hidden" id="referredby" value="<?php echo $sendto; ?>" />
 </p>

-<?php do_action('edit_page_form'); ?>
-
-<?php
-if (current_user_can('upload_files')) {
-	$uploading_iframe_ID = (0 == $post_ID ? $temp_ID : $post_ID);
-	$uploading_iframe_src = wp_nonce_url("upload.php?style=inline&amp;tab=upload&amp;post_id=$uploading_iframe_ID", 'inlineuploading');
-	$uploading_iframe_src = apply_filters('uploading_iframe_src', $uploading_iframe_src);
-	if ( false != $uploading_iframe_src )
-		echo '<iframe id="uploading" name="uploading" frameborder="0" src="' . $uploading_iframe_src . '">' . __('This feature requires iframe support.') . '</iframe>';
-}
-?>
-
-<div id="advancedstuff" class="dbx-group">
-
-<fieldset id="postcustom" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Custom Fields') ?></h3>
-<div id="postcustomstuff" class="dbx-content">
-<table cellpadding="3">
-<?php
-$metadata = has_meta($post_ID);
-list_meta($metadata);
-?>
-
+<fieldset id="pageoptions">
+	 <legend><?php _e('Page Options') ?></legend>
+<table width="100%" cellspacing="2" cellpadding="5" class="editform">
+<?php if ( 0 != count( get_page_templates() ) ) { ?>
+	<tr valign="top">
+		<th scope="row" width="30%"><?php _e('Page Template:') ?></th>
+		<td><div><select name="page_template">
+		<option value='default'><?php _e('Default Template'); ?></option>
+		<?php page_template_dropdown($page_template); ?>
+		</select>
+		
+		</div>
+		</td>
+	</tr>
+<?php } ?>
+	<tr valign="top">
+		<th scope="row" width="30%"><?php _e('Page slug') ?>:</th>
+		<td><input name="post_name" type="text" size="25" id="post_name" value="<?php echo $post_name ?>" /></td>
+	</tr>
+<?php if ($user_level > 7 && $users = $wpdb->get_results("SELECT ID, user_login, user_firstname, user_lastname FROM $wpdb->users WHERE user_level <= $user_level AND user_level > 0") ) : ?>
+	<tr>
+		<th scope="row" width="30%"><?php _e('Page owner'); ?>:</th>
+		<td>
+		<select name="post_author" id="post_author">
+		<?php 
+		foreach ($users as $o) :
+			if ( $post_author == $o->ID ) $selected = 'selected="selected"';
+			else $selected = '';
+			echo "<option value='$o->ID' $selected>$o->user_login ($o->user_firstname $o->user_lastname)</option>";
+		endforeach;
+		?>
+		</select>
+		</td>
+	</tr>
+<?php endif; ?>
+	<tr>
+		<th scope="row" width="25%"><?php _e('Page Order') ?>:</th>
+		<td><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo $menu_order ?>" /></td>
+	</tr>
+	<tr>
+		<th scope="row"><?php _e('Delete'); ?>:</th>
+		<td><?php if ('edit' == $action) : ?>
+		<input name="deletepost" class="delete" type="submit" id="deletepost" tabindex="10" value="<?php _e('Delete this page') ?>" <?php echo "onclick=\"return confirm('" . sprintf(__("You are about to delete this page \'%s\'\\n  \'Cancel\' to stop, \'OK\' to delete."), addslashes($edited_post_title) ) . "')\""; ?> />
+<?php endif; ?></td>
+	</tr>
 </table>
+</fieldset>
+
+<fieldset id="postcustom">
+<legend><?php _e('Custom Fields') ?> <script type="text/javascript">customToggleLink();</script></legend>
+<div id="postcustomstuff">
+<?php 
+if($metadata = has_meta($post_ID)) {
+?>
 <?php
+	list_meta($metadata); 
+?>
+<?php
+}
 	meta_form();
 ?>
 </div>
-<div id="ajax-response"></div>
 </fieldset>

-<?php do_action('dbx_page_advanced'); ?>
-
-</div>
-
-<?php if ('edit' == $action) :
-	$delete_nonce = wp_create_nonce( 'delete-page_' . $post_ID );
-	if ( current_user_can('delete_page', $post->ID) ) ?>
-		<input name="deletepost" class="button delete" type="submit" id="deletepost" tabindex="10" value="<?php _e('Delete this page') ?>" <?php echo "onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this page '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { document.forms.post._wpnonce.value = '$delete_nonce'; return true;}return false;\""; ?> />
-<?php endif; ?>
-</div>
-
+<?php do_action('edit_page_form', ''); ?>
 </form>

 </div>
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -2,102 +2,50 @@
 require_once('admin.php');
 $title = __('Pages');
 $parent_file = 'edit.php';
-wp_enqueue_script( 'listman' );
 require_once('admin-header.php');

-$post_stati  = array(	//	array( adj, noun )
-			'publish' => array(__('Published'), __('Published pages')),
-			'draft'   => array(__('Draft'), __('Draft pages')),
-			'private' => array(__('Private'), __('Private pages'))
-		);
-
-
-$post_status_label = __('Pages');
-$post_status_q = '';
-if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) ) {
-	$post_status_label = $post_stati[$_GET['post_status']][1];
-	$post_status_q = '&post_status=' . $_GET['post_status'];
-}
-
+get_currentuserinfo();
 ?>

 <div class="wrap">
-
-<h2><?php
-// Use $_GET instead of is_ since they can override each other
-$h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( stripslashes( $_GET['s'] ) ) ) : '';
-$h2_author = '';
-if ( isset($_GET['author']) && $_GET['author'] ) {
-	$author_user = get_userdata( (int) $_GET['author'] );
-	$h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name ));
-}
-printf( _c( '%1$s%2$s%3$s|You can reorder these: 1: Pages, 2: by {s}, 3: matching {s}' ), $post_status_label, $h2_author, $h2_search );
-?></h2>
-
-<p><?php _e('Pages are like posts except they live outside of the normal blog chronology and can be hierarchical. You can use pages to organize and manage any amount of content.'); ?> <a href="page-new.php"><?php _e('Create a new page &raquo;'); ?></a></p>
-
-<form name="searchform" id="searchform" action="" method="get">
-	<fieldset><legend><?php _e('Search Terms&hellip;') ?></legend>
-		<input type="text" name="s" id="s" value="<?php echo attribute_escape( stripslashes( $_GET['s'] ) ); ?>" size="17" />
-	</fieldset>
-
-
-	<fieldset><legend><?php _e('Page Type&hellip;'); ?></legend>
-		<select name='post_status'>
-			<option<?php selected( @$_GET['post_status'], 0 ); ?> value='0'><?php _e('Any'); ?></option>
-<?php	foreach ( $post_stati as $status => $label ) : ?>
-			<option<?php selected( @$_GET['post_status'], $status ); ?> value='<?php echo $status; ?>'><?php echo $label[0]; ?></option>
-<?php	endforeach; ?>
-		</select>
-	</fieldset>
-
-<?php $editable_ids = get_editable_user_ids( $user_ID ); if ( $editable_ids && count( $editable_ids ) > 1 ) : ?>
-
-	<fieldset><legend><?php _e('Author&hellip;'); ?></legend>
-		<?php wp_dropdown_users( array('include' => $editable_ids, 'show_option_all' => __('Any'), 'name' => 'author', 'selected' => isset($_GET['author']) ? $_GET['author'] : 0) ); ?>
-	</fieldset>
-
-<?php endif; ?>
-
-	<input type="submit" id="post-query-submit" value="<?php _e('Filter &#187;'); ?>" class="button" />
-</form>
-
-<br style="clear:both;" />
+<h2><?php _e('Page Management'); ?></h2>

 <?php
-wp("post_type=page&orderby=menu_order&what_to_show=posts$post_status_q&posts_per_page=-1&posts_per_archive_page=-1&order=asc");
-
-$all = !( $h2_search || $post_status_q );
+if (isset($user_ID) && ('' != intval($user_ID))) {
+	$posts = $wpdb->get_results("
+	SELECT $wpdb->posts.*, $wpdb->users.user_level FROM $wpdb->posts
+	INNER JOIN $wpdb->users ON ($wpdb->posts.post_author = $wpdb->users.ID)
+	WHERE $wpdb->posts.post_status = 'static'
+	AND ($wpdb->users.user_level < $user_level OR $wpdb->posts.post_author = $user_ID)
+	");
+} else {
+    $posts = $wpdb->get_results("SELECT * FROM $wpdb->posts WHERE post_status = 'static'");
+}

 if ($posts) {
 ?>
-<table class="widefat">
-  <thead>
-  <tr>
-    <th scope="col" style="text-align: center"><?php _e('ID') ?></th>
-    <th scope="col"><?php _e('Title') ?></th>
+<table width="100%" cellpadding="3" cellspacing="3"> 
+  <tr> 
+    <th scope="col"><?php _e('ID') ?></th> 
+    <th scope="col"><?php _e('Title') ?></th> 
    <th scope="col"><?php _e('Owner') ?></th>
 	<th scope="col"><?php _e('Updated') ?></th>
-	<th scope="col" colspan="3" style="text-align: center"><?php _e('Action'); ?></th>
-  </tr>
-  </thead>
-  <tbody id="the-list">
-<?php page_rows(0, 0, $posts, $all); ?>
-  </tbody>
-</table>
-
-<div id="ajax-response"></div>
-
+	<th scope="col"></th> 
+    <th scope="col"></th> 
+    <th scope="col"></th> 
+  </tr> 
+<?php page_rows(); ?>
+</table> 
 <?php
 } else {
 ?>
-<p><?php _e('No pages found.') ?></p>
+<p><?php _e('No pages yet.') ?></p>
 <?php
 } // end if ($posts)
-?>
+?> 
+<p><?php _e('Pages are like posts except they live outside of the normal blog chronology. You can use pages to organize and manage any amount of content.'); ?></p>
+<h3><a href="page-new.php"><?php _e('Create New Page'); ?> &raquo;</a></h3>
+</div> 

-<h3><a href="page-new.php"><?php _e('Create New Page &raquo;'); ?></a></h3>

-</div>
-
-<?php include('admin-footer.php'); ?>
+<?php include('admin-footer.php'); ?> 
--- a/wp-admin/edit-post-rows.php
+++ b/wp-admin/edit-post-rows.php
@@ -1,117 +0,0 @@
-<table class="widefat">
-	<thead>
-	<tr>
-
-<?php foreach($posts_columns as $column_display_name) { ?>
-	<th scope="col"><?php echo $column_display_name; ?></th>
-<?php } ?>
-
-	</tr>
-	</thead>
-	<tbody id="the-list">
-<?php
-if ( have_posts() ) {
-$bgcolor = '';
-add_filter('the_title','wp_specialchars');
-while (have_posts()) : the_post();
-$class = ('alternate' == $class) ? '' : 'alternate';
-global $current_user;
-$post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' );
-?>
-	<tr id='post-<?php echo $id; ?>' class='<?php echo trim( $class . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>'>
-
-<?php
-
-foreach($posts_columns as $column_name=>$column_display_name) {
-
-	switch($column_name) {
-
-	case 'id':
-		?>
-		<th scope="row" style="text-align: center"><?php echo $id ?></th>
-		<?php
-		break;
-	case 'modified':
-		?>
-		<td><?php if ( '0000-00-00 00:00:00' ==$post->post_modified ) _e('Never'); else the_modified_time(__('Y-m-d \<\b\r \/\> g:i:s a')); ?></td>
-		<?php
-		break;
-	case 'date':
-		?>
-		<td><?php if ( '0000-00-00 00:00:00' ==$post->post_date) _e('Unpublished'); else the_time(__('Y-m-d \<\b\r \/\> g:i:s a')); ?></td>
-		<?php
-		break;
-	case 'title':
-		?>
-		<td><?php the_title() ?>
-		<?php if ('private' == $post->post_status) _e(' - <strong>Private</strong>'); ?></td>
-		<?php
-		break;
-
-	case 'categories':
-		?>
-		<td><?php the_category(','); ?></td>
-		<?php
-		break;
-
-	case 'comments':
-		?>
-		<td style="text-align: center">
-		<?php
-		$left = get_pending_comments_num( $post->ID );
-		$pending_phrase = sprintf( __('%s pending'), number_format( $left ) );
-		if ( $left )
-			echo '<strong>';
-		comments_number("<a href='edit.php?p=$id&amp;c=1' title='$pending_phrase'>" . __('0') . '</a>', "<a href='edit.php?p=$id&amp;c=1' title='$pending_phrase'>" . __('1') . '</a>', "<a href='edit.php?p=$id&amp;c=1' title='$pending_phrase'>" . __('%') . '</a>');
-		if ( $left )
-			echo '</strong>';
-		?>
-		</td>
-		<?php
-		break;
-
-	case 'author':
-		?>
-		<td><?php the_author() ?></td>
-		<?php
-		break;
-
-	case 'control_view':
-		?>
-		<td><a href="<?php the_permalink(); ?>" rel="permalink" class="view"><?php _e('View'); ?></a></td>
-		<?php
-		break;
-
-	case 'control_edit':
-		?>
-		<td><?php if ( current_user_can('edit_post',$post->ID) ) { echo "<a href='post.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td>
-		<?php
-		break;
-
-	case 'control_delete':
-		?>
-		<td><?php if ( current_user_can('delete_post',$post->ID) ) { echo "<a href='" . wp_nonce_url("post.php?action=delete&amp;post=$id", 'delete-post_' . $post->ID) . "' class='delete' onclick=\"return deleteSomething( 'post', " . $id . ", '" . js_escape(sprintf(__("You are about to delete this post '%s'.\n'OK' to delete, 'Cancel' to stop."), get_the_title())) . "' );\">" . __('Delete') . "</a>"; } ?></td>
-		<?php
-		break;
-
-	default:
-		?>
-		<td><?php do_action('manage_posts_custom_column', $column_name, $id); ?></td>
-		<?php
-		break;
-	}
-}
-?>
-	</tr>
-<?php
-endwhile;
-} else {
-?>
-  <tr style='background-color: <?php echo $bgcolor; ?>'>
-    <td colspan="8"><?php _e('No posts found.') ?></td>
-  </tr>
-<?php
-} // end if ( have_posts() )
-?>
-	</tbody>
-</table>
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -3,61 +3,134 @@ require_once('admin.php');

 $title = __('Posts');
 $parent_file = 'edit.php';
-wp_enqueue_script( 1 == $_GET['c'] ? 'admin-comments' : 'listman' );
 require_once('admin-header.php');

-$_GET['m']   = (int) $_GET['m'];
-$_GET['cat'] = (int) $_GET['cat'];
-$post_stati  = array(	//	array( adj, noun )
-			'publish' => array(__('Published'), __('Published posts')),
-			'future' => array(__('Scheduled'), __('Scheduled posts')),
-			'pending' => array(__('Pending Review'), __('Pending posts')),
-			'draft' => array(__('Draft'), _c('Drafts|manage posts header')),
-			'private' => array(__('Private'), __('Private posts'))
-		);
+$_GET['m'] = (int) $_GET['m'];

-$avail_post_stati = $wpdb->get_col("SELECT DISTINCT post_status FROM $wpdb->posts WHERE post_type = 'post'");
+get_currentuserinfo();

-$post_status_q = '';
-$post_status_label = __('Posts');
-if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) ) {
-	$post_status_label = $post_stati[$_GET['post_status']][1];
-	$post_status_q = '&post_status=' . $_GET['post_status'];
+$drafts = $wpdb->get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_status = 'draft' AND post_author = $user_ID");
+if (1 < $user_level) {
+	$editable = $wpdb->get_col("SELECT ID FROM $wpdb->users WHERE user_level <= '$user_level' AND ID != $user_ID");
+	if( is_array( $editable ) == false )
+			$other_drafts = '';
+	else {
+		$editable = join(',', $editable);
+		$other_drafts = $wpdb->get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_status = 'draft' AND post_author IN ($editable) ");
+	}
+} else {
+	$other_drafts = false;
 }
-?>
+
+if ($drafts || $other_drafts) {
+?> 
+<div class="wrap">
+<?php if ($drafts) { ?>
+    <p><strong><?php _e('Your Drafts:') ?></strong> 
+    <?php
+	$i = 0;
+	foreach ($drafts as $draft) {
+		if (0 != $i)
+			echo ', ';
+		$draft->post_title = stripslashes($draft->post_title);
+		if ($draft->post_title == '')
+			$draft->post_title = sprintf(__('Post #%s'), $draft->ID);
+		echo "<a href='post.php?action=edit&amp;post=$draft->ID' title='" . __('Edit this draft') . "'>$draft->post_title</a>";
+		++$i;
+		}
+	?> 
+    .</p> 
+<?php } ?>
+
+<?php if ($other_drafts) { ?> 
+    <p><strong><?php _e('Other&#8217;s Drafts:') ?></strong> 
+    <?php
+	$i = 0;
+	foreach ($other_drafts as $draft) {
+		if (0 != $i)
+			echo ', ';
+		$draft->post_title = stripslashes($draft->post_title);
+		if ($draft->post_title == '')
+			$draft->post_title = sprintf(__('Post #%s'), $draft->ID);
+		echo "<a href='post.php?action=edit&amp;post=$draft->ID' title='" . __('Edit this draft') . "'>$draft->post_title</a>";
+		++$i;
+		}
+	?> 
+    .</p> 
+
+<?php } ?>
+
+</div>
+<?php } ?>

 <div class="wrap">
+<h2>
+<?php
+$what_to_show = 'posts';
+$posts_per_page = 15;
+$posts_per_archive_page = -1;
+
+include(ABSPATH.'wp-blog-header.php');
+
+if ( is_month() ) {
+	single_month_title(' ');
+} elseif ( is_search() ) {
+	printf(__('Search for &#8220;%s&#8221;'), wp_specialchars($_GET['s']) );
+} else {
+	if ( ! is_paged() || get_query_var('paged') == 1 )
+		_e('Last 15 Posts');
+	else
+		_e('Previous Posts');
+}
+?>
+</h2>
+
+<form name="searchform" action="" method="get" style="float: left; width: 16em; margin-right: 3em;"> 
+  <fieldset> 
+  <legend><?php _e('Search Posts&hellip;') ?></legend> 
+  <input type="text" name="s" value="<?php if (isset($s)) echo wp_specialchars($s, 1); ?>" size="17" /> 
+  <input type="submit" name="submit" value="<?php _e('Search') ?>"  /> 
+  </fieldset>
+</form>
+
+<form name="viewarc" action="" method="get" style="float: left; width: 20em; margin-bottom: 1em;">
+	<fieldset>
+	<legend><?php _e('Browse Month&hellip;') ?></legend>
+    <select name='m'>
+	<?php
+		$arc_result=$wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts ORDER BY post_date DESC");
+		foreach ($arc_result as $arc_row) {			
+			$arc_year  = $arc_row->yyear;
+			$arc_month = $arc_row->mmonth;
+			
+			if( isset($_GET['m']) && $arc_year . zeroise($arc_month, 2) == (int) $_GET['m'] )
+				$default = 'selected="selected"';
+			else
+				$default = null;
+			
+			echo "<option $default value=\"" . $arc_year.zeroise($arc_month, 2) . '">';
+			echo $month[zeroise($arc_month, 2)] . " $arc_year";
+			echo "</option>\n";
+		}
+	?>
+	</select>
+		<input type="submit" name="submit" value="<?php _e('Show Month') ?>"  /> 
+	</fieldset>
+</form>
+
+<br style="clear:both;" />

 <?php

-if ( 'pending' === $_GET['post_status'] ) {
-	$order = 'ASC';
-	$orderby = 'modified';
-} elseif ( 'draft' === $_GET['post_status'] ) {
-	$order = 'DESC';
-	$orderby = 'modified';
-} else {
-	$order = 'DESC';
-	$orderby = 'date';
-}
-
-wp("what_to_show=posts$post_status_q&posts_per_page=15&order=$order&orderby=$orderby");
-
 // define the columns to display, the syntax is 'internal name' => 'display name'
-$posts_columns = array();
-$posts_columns['id'] = '<div style="text-align: center">' . __('ID') . '</div>';
-if ( 'draft' === $_GET['post_status'] )
-	$posts_columns['modified'] = __('Modified');
-elseif ( 'pending' === $_GET['post_status'] )
-	$posts_columns['modified'] = __('Submitted');
-else
-	$posts_columns['date'] = __('When');
-$posts_columns['title'] = __('Title');
-$posts_columns['categories'] = __('Categories');
-if ( !in_array($_GET['post_status'], array('pending', 'draft', 'future')) )
-	$posts_columns['comments'] = '<div style="text-align: center">' . __('Comments') . '</div>';
-$posts_columns['author'] = __('Author');
-
+$posts_columns = array(
+  'id'         => __('ID'),
+  'date'       => __('When'),
+  'title'      => __('Title'),
+  'categories' => __('Categories'),
+  'comments'   => __('Comments'),
+  'author'     => __('Author')
+);
 $posts_columns = apply_filters('manage_posts_columns', $posts_columns);

 // you can not edit these at the moment
@@ -67,102 +140,104 @@ $posts_columns['control_delete'] = '';

 ?>

-<h2><?php
-if ( is_single() ) {
-	printf(__('Comments on %s'), apply_filters( "the_title", $post->post_title));
-} else {
-	if ( $post_listing_pageable && !is_archive() && !is_search() )
-		$h2_noun = is_paged() ? sprintf(__( 'Previous %s' ), $post_status_label) : sprintf(__('Latest %s'), $post_status_label);
-	else
-		$h2_noun = $post_status_label;
-	// Use $_GET instead of is_ since they can override each other
-	$h2_author = '';
-	$_GET['author'] = (int) $_GET['author'];
-	if ( $_GET['author'] != 0 ) {
-		if ( $_GET['author'] == '-' . $user_ID ) { // author exclusion
-			$h2_author = ' ' . __('by other authors');
-		} else {
-			$author_user = get_userdata( get_query_var( 'author' ) );
-			$h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name ));
-		}
-	}
-	$h2_search = isset($_GET['s'])   && $_GET['s']   ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( get_search_query() ) ) : '';
-	$h2_cat    = isset($_GET['cat']) && $_GET['cat'] ? ' ' . sprintf( __('in &#8220;%s&#8221;'), single_cat_title('', false) ) : '';
-	$h2_month  = isset($_GET['m'])   && $_GET['m']   ? ' ' . sprintf( __('during %s'), single_month_title(' ', false) ) : '';
-	printf( _c( '%1$s%2$s%3$s%4$s%5$s|You can reorder these: 1: Posts, 2: by {s}, 3: matching {s}, 4: in {s}, 5: during {s}' ), $h2_noun, $h2_author, $h2_search, $h2_cat, $h2_month );
-}
-?></h2>
-
-<form name="searchform" id="searchform" action="" method="get">
-	<fieldset><legend><?php _e('Search terms&hellip;'); ?></legend>
-		<input type="text" name="s" id="s" value="<?php the_search_query(); ?>" size="17" />
-	</fieldset>
-
-	<fieldset><legend><?php _e('Status&hellip;'); ?></legend>
-		<select name='post_status'>
-			<option<?php selected( @$_GET['post_status'], 0 ); ?> value='0'><?php _e('Any'); ?></option>
-<?php	foreach ( $post_stati as $status => $label ) : if ( !in_array($status, $avail_post_stati) ) continue; ?>
-			<option<?php selected( @$_GET['post_status'], $status ); ?> value='<?php echo $status; ?>'><?php echo $label[0]; ?></option>
-<?php	endforeach; ?>
-		</select>
-	</fieldset>
-
-<?php
-$editable_ids = get_editable_user_ids( $user_ID );
-if ( $editable_ids && count( $editable_ids ) > 1 ) :
-?>
-	<fieldset><legend><?php _e('Author&hellip;'); ?></legend>
-		<?php wp_dropdown_users( array('include' => $editable_ids, 'show_option_all' => __('Any'), 'name' => 'author', 'selected' => isset($_GET['author']) ? $_GET['author'] : 0) ); ?>
-	</fieldset>
-
-<?php
-endif;
-
-$arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'post' ORDER BY post_date DESC";
-
-$arc_result = $wpdb->get_results( $arc_query );
-
-$month_count = count($arc_result);
-
-if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ?>
-
-	<fieldset><legend><?php _e('Month&hellip;') ?></legend>
-		<select name='m'>
-			<option<?php selected( @$_GET['m'], 0 ); ?> value='0'><?php _e('Any'); ?></option>
-		<?php
-		foreach ($arc_result as $arc_row) {
-			if ( $arc_row->yyear == 0 )
-				continue;
-			$arc_row->mmonth = zeroise($arc_row->mmonth, 2);
-
-			if ( $arc_row->yyear . $arc_row->mmonth == $_GET['m'] )
-				$default = ' selected="selected"';
-			else
-				$default = '';
-
-			echo "<option$default value='$arc_row->yyear$arc_row->mmonth'>";
-			echo $wp_locale->get_month($arc_row->mmonth) . " $arc_row->yyear";
-			echo "</option>\n";
-		}
-		?>
-		</select>
-	</fieldset>
+<table width="100%" cellpadding="3" cellspacing="3"> 
+	<tr>

+<?php foreach($posts_columns as $column_display_name) { ?>
+	<th scope="col"><?php echo $column_display_name; ?></th>
 <?php } ?>

-	<fieldset><legend><?php _e('Category&hellip;') ?></legend>
-		<?php wp_dropdown_categories('show_option_all='.__('All').'&hide_empty=1&hierarchical=1&show_count=1&selected='.$cat);?>
-	</fieldset>
-	<input type="submit" id="post-query-submit" value="<?php _e('Filter &#187;'); ?>" class="button" />
-</form>
+	</tr>
+<?php
+if ($posts) {
+$bgcolor = '';
+foreach ($posts as $post) { start_wp();
+$class = ('alternate' == $class) ? '' : 'alternate';
+?> 
+	<tr class='<?php echo $class; ?>'>

-<?php do_action('restrict_manage_posts'); ?>
+<?php

-<br style="clear:both;" />
+foreach($posts_columns as $column_name=>$column_display_name) {

-<?php include( 'edit-post-rows.php' ); ?>
+	switch($column_name) {
+	
+	case 'id':
+		?>
+		<th scope="row"><?php echo $id ?></th>
+		<?php
+		break;

-<div id="ajax-response"></div>
+	case 'date':
+		?>
+		<td><?php the_time('Y-m-d \<\b\r \/\> g:i:s a'); ?></td>
+		<?php
+		break;
+	case 'title':
+		?>
+		<td><?php the_title() ?>
+		<?php if ('private' == $post->post_status) _e(' - <strong>Private</strong>'); ?></td>
+		<?php
+		break;
+
+	case 'categories':
+		?>
+		<td><?php the_category(','); ?></td>
+		<?php
+		break;
+
+	case 'comments':
+		?>
+		<td><a href="edit.php?p=<?php echo $id ?>&amp;c=1"> 
+      <?php comments_number(__('0'), __('1'), __('%')) ?> 
+      </a></td>
+		<?php
+		break;
+
+	case 'author':
+		?>
+		<td><?php the_author() ?></td>
+		<?php
+		break;
+
+	case 'control_view':
+		?>
+		<td><a href="<?php the_permalink(); ?>" rel="permalink" class="edit"><?php _e('View'); ?></a></td>
+		<?php
+		break;
+
+	case 'control_edit':
+		?>
+		<td><?php if ( user_can_edit_post($user_ID,$post->ID) ) { echo "<a href='post.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td>
+		<?php
+		break;
+
+	case 'control_delete':
+		?>
+		<td><?php if ( user_can_edit_post($user_ID,$post->ID) ) { echo "<a href='post.php?action=delete&amp;post=$id' class='delete' onclick=\"return confirm('" . sprintf(__("You are about to delete this post \'%s\'\\n  \'OK\' to delete, \'Cancel\' to stop."), wp_specialchars(get_the_title('', ''), 1) ) . "')\">" . __('Delete') . "</a>"; } ?></td>
+		<?php
+		break;
+
+	default:
+		?>
+		<td><?php do_action('manage_posts_custom_column', $column_name, $id); ?></td>
+		<?php
+		break;
+	}
+}
+?>
+	</tr> 
+<?php
+}
+} else {
+?>
+  <tr style='background-color: <?php echo $bgcolor; ?>'> 
+    <td colspan="8"><?php _e('No posts found.') ?></td> 
+  </tr> 
+<?php
+} // end if ($posts)
+?> 
+</table> 

 <div class="navigation">
 <div class="alignleft"><?php next_posts_link(__('&laquo; Previous Entries')) ?></div>
@@ -170,54 +245,57 @@ if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ?
 </div>

 <?php
-
 if ( 1 == count($posts) ) {

 	$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved != 'spam' ORDER BY comment_date");
 	if ($comments) {
-		update_comment_cache($comments);
-	?>
-<h3 id="comments"><?php _e('Comments') ?></h3>
-<ol id="the-comment-list" class="commentlist">
+	?> 
+<h3><?php _e('Comments') ?></h3> 
+<ol id="comments"> 
 <?php
-$i = 0;
 foreach ($comments as $comment) {
+$comment_status = wp_get_comment_status($comment->comment_ID);
+?> 

-		++$i; $class = '';
-		$post = get_post($comment->comment_post_ID);
-		$authordata = get_userdata($post->post_author);
-			$comment_status = wp_get_comment_status($comment->comment_ID);
-			if ('unapproved' == $comment_status)
-				$class .= ' unapproved';
-			if ($i % 2)
-				$class .= ' alternate';
-			echo "<li id='comment-$comment->comment_ID' class='$class'>";
-?>
-<p><strong><?php comment_author() ?></strong> <?php if ($comment->comment_author_email) { ?>| <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> | <?php comment_author_url_link() ?> <?php } ?>| <?php _e('IP:') ?> <a href="edit-comments.php?s=<?php comment_author_IP() ?>&amp;mode=edit"><?php comment_author_IP() ?></a></p>
-
-<?php comment_text() ?>
-
-<p><?php comment_date(__('M j, g:i A')); ?> &#8212; [
-<?php
-if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-	echo " <a href='comment.php?action=editcomment&amp;c=".$comment->comment_ID."'>" . __('Edit') . '</a>';
-	echo ' | <a href="' . wp_nonce_url('comment.php?action=deletecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . '" onclick="return deleteSomething( \'comment\', ' . $comment->comment_ID . ', \'' . js_escape(sprintf(__("You are about to delete this comment by '%s'.\n'Cancel' to stop, 'OK' to delete."), $comment->comment_author)) . "', theCommentList );\">" . __('Delete') . '</a> ';
-	if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) {
-		echo '<span class="unapprove"> | <a href="' . wp_nonce_url('comment.php?action=unapprovecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'unapprove-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Unapprove') . '</a> </span>';
-		echo '<span class="approve"> | <a href="' . wp_nonce_url('comment.php?action=approvecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'approve-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Approve') . '</a> </span>';
-	}
-	echo " | <a href=\"" . wp_nonce_url("comment.php?action=deletecomment&amp;dt=spam&amp;p=" . $comment->comment_post_ID . "&amp;c=" . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to mark as spam this comment by '%s'.\n'Cancel' to stop, 'OK' to mark as spam."), $comment->comment_author)) . "', theCommentList );\">" . __('Spam') . "</a> ";
-}
-?> ]
-</p>
-		</li>
+<li <?php if ("unapproved" == $comment_status) echo "class='unapproved'"; ?> >
+  <?php comment_date('Y-n-j') ?> 
+  @
+  <?php comment_time('g:m:s a') ?> 
+  <?php 
+			if (($user_level > $authordata->user_level) or ($user_login == $authordata->user_login)) {
+				echo "[ <a href=\"post.php?action=editcomment&amp;comment=".$comment->comment_ID."\">" .  __('Edit') . "</a>";
+				echo " - <a href=\"post.php?action=deletecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return confirm('" . sprintf(__("You are about to delete this comment by \'%s\'\\n  \'OK\' to delete, \'Cancel\' to stop."), $comment->comment_author) . "')\">" . __('Delete') . "</a> ";
+				if ( ('none' != $comment_status) && ($user_level >= 3) ) {
+					if ('approved' == wp_get_comment_status($comment->comment_ID)) {
+						echo " - <a href=\"post.php?action=unapprovecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">" . __('Unapprove') . "</a> ";
+					} else {
+						echo " - <a href=\"post.php?action=approvecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">" . __('Approve') . "</a> ";
+					}
+				}
+				echo "]";
+			} // end if any comments to show
+			?> 
+  <br /> 
+  <strong> 
+  <?php comment_author() ?> 
+  (
+  <?php comment_author_email_link() ?> 
+  /
+  <?php comment_author_url_link() ?> 
+  )</strong> (IP:
+  <?php comment_author_IP() ?> 
+  )
+  <?php comment_text() ?> 

+</li> 
+<!-- /comment --> 
 <?php //end of the loop, don't delete
 		} // end foreach
 	echo '</ol>';
 	}//end if comments
 	?>
-<?php } ?>
-</div>
-
-<?php include('admin-footer.php'); ?>
+<?php } ?> 
+</div> 
+<?php 
+ include('admin-footer.php');
+?> 
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -1,272 +0,0 @@
-<?php
-require_once ('admin.php');
-$title = __('Export');
-$parent_file = 'edit.php';
-
-if ( isset( $_GET['download'] ) )
-	export_wp();
-
-require_once ('admin-header.php');
-?>
-
-<div class="wrap">
-<h2><?php _e('Export'); ?></h2>
-<div class="narrow">
-<p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
-<p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, comments, custom fields, and categories.'); ?></p>
-<p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function on another WordPress blog to import this blog.'); ?></p>
-<form action="" method="get">
-<h3><?php _e('Optional options'); ?></h3>
-
-<table>
-<tr>
-<th><?php _e('Restrict Author:'); ?></th>
-<td>
-<select name="author">
-<option value="all" selected="selected"><?php _e('All'); ?></option>
-<?php
-$authors = $wpdb->get_col( "SELECT post_author FROM $wpdb->posts GROUP BY post_author" );
-foreach ( $authors as $id ) {
-	$o = get_userdata( $id );
-	echo "<option value='$o->ID'>$o->display_name</option>";
-}
-?>
-</select>
-</td>
-</tr>
-</table>
-<p class="submit"><input type="submit" name="submit" value="<?php _e('Download Export File'); ?> &raquo;" />
-<input type="hidden" name="download" value="true" />
-</p>
-</form>
-</div>
-</div>
-
-<?php
-
-function export_wp() {
-global $wpdb, $post_ids, $post;
-
-do_action('export_wp');
-
-$filename = 'wordpress.' . date('Y-m-d') . '.xml';
-
-header('Content-Description: File Transfer');
-header("Content-Disposition: attachment; filename=$filename");
-header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
-
-$where = '';
-if ( isset( $_GET['author'] ) && $_GET['author'] != 'all' ) {
-	$author_id = (int) $_GET['author'];
-	$where = " WHERE post_author = '$author_id' ";
-}
-
-// grab a snapshot of post IDs, just in case it changes during the export
-$post_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts $where ORDER BY post_date_gmt ASC");
-
-$categories = (array) get_categories('get=all');
-$tags = (array) get_tags('get=all');
-
-function wxr_missing_parents($categories) {
-	if ( !is_array($categories) || empty($categories) )
-		return array();
-
-	foreach ( $categories as $category )
-		$parents[$category->term_id] = $category->parent;
-
-	$parents = array_unique(array_diff($parents, array_keys($parents)));
-
-	if ( $zero = array_search('0', $parents) )
-		unset($parents[$zero]);
-
-	return $parents;
-}
-
-while ( $parents = wxr_missing_parents($categories) ) {
-	$found_parents = get_categories("include=" . join(', ', $parents));
-	if ( is_array($found_parents) && count($found_parents) )
-		$categories = array_merge($categories, $found_parents);
-	else
-		break;
-}
-
-// Put them in order to be inserted with no child going before its parent
-$pass = 0;
-$passes = 1000 + count($categories);
-while ( ( $cat = array_shift($categories) ) && ++$pass < $passes ) {
-	if ( $cat->parent == 0 || isset($cats[$cat->parent]) ) {
-		$cats[$cat->term_id] = $cat;
-	} else {
-		$categories[] = $cat;
-	}
-}
-unset($categories);
-
-function wxr_cdata($str) {
-	if ( seems_utf8($str) == false )
-		$str = utf8_encode($str);
-
-	// $str = ent2ncr(wp_specialchars($str));
-
-	$str = "<![CDATA[$str" . ( ( substr($str, -1) == ']' ) ? ' ' : '') . "]]>";
-
-	return $str;
-}
-
-function wxr_cat_name($c) {
-	if ( empty($c->name) )
-		return;
-
-	echo '<wp:cat_name>' . wxr_cdata($c->name) . '</wp:cat_name>';
-}
-
-function wxr_category_description($c) {
-	if ( empty($c->description) )
-		return;
-
-	echo '<wp:category_description>' . wxr_cdata($c->description) . '</wp:category_description>';
-}
-
-function wxr_tag_name($t) {
-	if ( empty($t->name) )
-		return;
-
-	echo '<wp:tag_name>' . wxr_cdata($t->name) . '</wp:tag_name>';
-}
-
-function wxr_tag_description($t) {
-	if ( empty($t->description) )
-		return;
-
-	echo '<wp:tag_description>' . wxr_cdata($t->description) . '</wp:tag_description>';
-}
-
-function wxr_post_taxonomy() {
-	$categories = get_the_category();
-	$tags = get_the_tags();
-	$cat_names = array();
-	$tag_names = array();
-	$the_list = '';
-	$filter = 'rss';
-
-	if ( !empty($categories) ) foreach ( (array) $categories as $category ) {
-		$cat_name = sanitize_term_field('name', $category->name, $category->term_id, 'category', $filter);
-		$the_list .= "\n\t\t<category><![CDATA[$cat_name]]></category>\n";
-	}
-
-	if ( !empty($tags) ) foreach ( (array) $tags as $tag ) {
-		$tag_name = sanitize_term_field('name', $tag->name, $tag->term_id, 'post_tag', $filter);
-		$the_list .= "\n\t\t<category domain=\"tag\"><![CDATA[$tag_name]]></category>\n";
-	}
-
-	echo $the_list;
-}
-
-echo '<?xml version="1.0" encoding="' . get_bloginfo('charset') . '"?' . ">\n";
-
-?>
-<!-- This is a WordPress eXtended RSS file generated by WordPress as an export of your blog. -->
-<!-- It contains information about your blog's posts, comments, and categories. -->
-<!-- You may use this file to transfer that content from one site to another. -->
-<!-- This file is not intended to serve as a complete backup of your blog. -->
-
-<!-- To import this information into a WordPress blog follow these steps. -->
-<!-- 1. Log into that blog as an administrator. -->
-<!-- 2. Go to Manage: Import in the blog's admin panels. -->
-<!-- 3. Choose "WordPress" from the list. -->
-<!-- 4. Upload this file using the form provided on that page. -->
-<!-- 5. You will first be asked to map the authors in this export file to users -->
-<!--    on the blog.  For each author, you may choose to map to an -->
-<!--    existing user on the blog or to create a new user -->
-<!-- 6. WordPress will then import each of the posts, comments, and categories -->
-<!--    contained in this file into your blog -->
-
-<!-- generator="wordpress/<?php bloginfo_rss('version') ?>" created="<?php echo date('Y-m-d H:i'); ?>"-->
-<rss version="2.0"
-	xmlns:content="http://purl.org/rss/1.0/modules/content/"
-	xmlns:wfw="http://wellformedweb.org/CommentAPI/"
-	xmlns:dc="http://purl.org/dc/elements/1.1/"
-	xmlns:wp="http://wordpress.org/export/1.0/"
->
-
-<channel>
-	<title><?php bloginfo_rss('name'); ?></title>
-	<link><?php bloginfo_rss('url') ?></link>
-	<description><?php bloginfo_rss("description") ?></description>
-	<pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></pubDate>
-	<generator>http://wordpress.org/?v=<?php bloginfo_rss('version'); ?></generator>
-	<language><?php echo get_option('rss_language'); ?></language>
-<?php if ( $cats ) : foreach ( $cats as $c ) : ?>
-	<wp:category><wp:category_nicename><?php echo $c->slug; ?></wp:category_nicename><wp:category_parent><?php echo $c->parent ? $cats[$c->parent]->name : ''; ?></wp:category_parent><?php wxr_cat_name($c); ?><?php wxr_category_description($c); ?></wp:category>
-<?php endforeach; endif; ?>
-<?php if ( $tags ) : foreach ( $tags as $t ) : ?>
-	<wp:tag><wp:tag_slug><?php echo $t->slug; ?></wp:tag_slug><?php wxr_tag_name($t); ?><?php wxr_tag_description($t); ?></wp:tag>
-<?php endforeach; endif; ?>
-	<?php do_action('rss2_head'); ?>
-	<?php if ($post_ids) {
-		global $wp_query;
-		$wp_query->in_the_loop = true;  // Fake being in the loop.
-		// fetch 20 posts at a time rather than loading the entire table into memory
-		while ( $next_posts = array_splice($post_ids, 0, 20) ) {
-			$where = "WHERE ID IN (".join(',', $next_posts).")";
-			$posts = $wpdb->get_results("SELECT * FROM $wpdb->posts $where ORDER BY post_date_gmt ASC");
-				foreach ($posts as $post) {
-			setup_postdata($post); ?>
-<item>
-<title><?php the_title_rss() ?></title>
-<link><?php the_permalink_rss() ?></link>
-<pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_post_time('Y-m-d H:i:s', true), false); ?></pubDate>
-<dc:creator><?php the_author() ?></dc:creator>
-<?php wxr_post_taxonomy() ?>
-
-<guid isPermaLink="false"><?php the_guid(); ?></guid>
-<description></description>
-<content:encoded><![CDATA[<?php echo $post->post_content ?>]]></content:encoded>
-<wp:post_id><?php echo $post->ID; ?></wp:post_id>
-<wp:post_date><?php echo $post->post_date; ?></wp:post_date>
-<wp:post_date_gmt><?php echo $post->post_date_gmt; ?></wp:post_date_gmt>
-<wp:comment_status><?php echo $post->comment_status; ?></wp:comment_status>
-<wp:ping_status><?php echo $post->ping_status; ?></wp:ping_status>
-<wp:post_name><?php echo $post->post_name; ?></wp:post_name>
-<wp:status><?php echo $post->post_status; ?></wp:status>
-<wp:post_parent><?php echo $post->post_parent; ?></wp:post_parent>
-<wp:menu_order><?php echo $post->menu_order; ?></wp:menu_order>
-<wp:post_type><?php echo $post->post_type; ?></wp:post_type>
-<?php
-$postmeta = $wpdb->get_results("SELECT * FROM $wpdb->postmeta WHERE post_id = $post->ID");
-if ( $postmeta ) {
-?>
-<?php foreach( $postmeta as $meta ) { ?>
-<wp:postmeta>
-<wp:meta_key><?php echo $meta->meta_key; ?></wp:meta_key>
-<wp:meta_value><?Php echo $meta->meta_value; ?></wp:meta_value>
-</wp:postmeta>
-<?php } ?>
-<?php } ?>
-<?php
-$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $post->ID");
-if ( $comments ) { foreach ( $comments as $c ) { ?>
-<wp:comment>
-<wp:comment_id><?php echo $c->comment_ID; ?></wp:comment_id>
-<wp:comment_author><?php echo wxr_cdata($c->comment_author); ?></wp:comment_author>
-<wp:comment_author_email><?php echo $c->comment_author_email; ?></wp:comment_author_email>
-<wp:comment_author_url><?php echo $c->comment_author_url; ?></wp:comment_author_url>
-<wp:comment_author_IP><?php echo $c->comment_author_IP; ?></wp:comment_author_IP>
-<wp:comment_date><?php echo $c->comment_date; ?></wp:comment_date>
-<wp:comment_date_gmt><?php echo $c->comment_date_gmt; ?></wp:comment_date_gmt>
-<wp:comment_content><?php echo $c->comment_content; ?></wp:comment_content>
-<wp:comment_approved><?php echo $c->comment_approved; ?></wp:comment_approved>
-<wp:comment_type><?php echo $c->comment_type; ?></wp:comment_type>
-<wp:comment_parent><?php echo $c->comment_parent; ?></wp:comment_parent>
-</wp:comment>
-<?php } } ?>
-	</item>
-<?php } } } ?>
-</channel>
-</rss>
-<?php
-	die();
-}
-
-include ('admin-footer.php');
-?>
--- a/wp-admin/images/box-bg-left.gif
+++ b/wp-admin/images/box-bg-left.gif
--- a/wp-admin/images/box-bg-right.gif
+++ b/wp-admin/images/box-bg-right.gif
--- a/wp-admin/images/box-bg.gif
+++ b/wp-admin/images/box-bg.gif
--- a/wp-admin/images/box-butt-left.gif
+++ b/wp-admin/images/box-butt-left.gif
--- a/wp-admin/images/box-butt-right.gif
+++ b/wp-admin/images/box-butt-right.gif
--- a/wp-admin/images/box-butt.gif
+++ b/wp-admin/images/box-butt.gif
--- a/wp-admin/images/box-head-left.gif
+++ b/wp-admin/images/box-head-left.gif
--- a/wp-admin/images/box-head-right.gif
+++ b/wp-admin/images/box-head-right.gif
--- a/wp-admin/images/box-head.gif
+++ b/wp-admin/images/box-head.gif
--- a/wp-admin/images/browse-happy.gif
+++ b/wp-admin/images/browse-happy.gif
--- a/wp-admin/images/heading-bg.gif
+++ b/wp-admin/images/heading-bg.gif
--- a/wp-admin/images/login-bkg-bottom.gif
+++ b/wp-admin/images/login-bkg-bottom.gif
--- a/wp-admin/images/login-bkg-tile.gif
+++ b/wp-admin/images/login-bkg-tile.gif
--- a/wp-admin/images/logo-ghost.png
+++ b/wp-admin/images/logo-ghost.png
--- a/wp-admin/images/notice.gif
+++ b/wp-admin/images/notice.gif
--- a/wp-admin/images/toggle.gif
+++ b/wp-admin/images/toggle.gif
--- a/wp-admin/images/wordpress-logo.png
+++ b/wp-admin/images/wordpress-logo.png
--- a/wp-admin/import-b2.php
+++ b/wp-admin/import-b2.php
@@ -0,0 +1,247 @@
+<?php
+if (!file_exists('../wp-config.php')) die("There doesn't seem to be a wp-config.php file. Double check that you updated wp-config-sample.php with the proper database connection information and renamed it to wp-config.php.");
+require_once('../wp-config.php');
+require('upgrade-functions.php');
+$step = $_GET['step'];
+if (!$step) $step = 0;
+header( 'Content-Type: text/html; charset=utf-8' );
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<title>WordPress &#8212; b2 Conversion</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<style media="screen" type="text/css">
+	body {
+		font-family: Georgia, "Times New Roman", Times, serif;
+		margin-left: 15%;
+		margin-right: 15%;
+	}
+	#logo {
+		margin: 0;
+		padding: 0;
+		background-image: url(http://wordpress.org/images/wordpress.gif);
+		background-repeat: no-repeat;
+		height: 60px;
+		border-bottom: 4px solid #333;
+	}
+	#logo a {
+		display: block;
+		height: 60px;
+	}
+	#logo a span {
+		display: none;
+	}
+	p, li {
+		line-height: 140%;
+	}
+	</style>
+</head>
+<body>
+<h1 id="logo"><a href="http://wordpress.org"><span>WordPress</span></a></h1>
+<?php
+switch($step) {
+
+	case 0:
+?>
+<p>Welcome to WordPress. Since you&#8217;re upgrading from b2 everything should be relatively 
+  familiar to you. Here are some notes on upgrading:</p>
+<ul>
+  <li>If you&#8217;re using an older version of b2, it's probably a good idea to upgrade 
+    to at least .61 before making the leap to WordPress.</li>
+  <li>The templates are so much better, and there is so much more going on than 
+    before it&#8217;s probably worth it to start from scratch and work back to your 
+    design.</li>
+  <li>You need to transfer some of your settings from your old <code>b2config.php</code>
+    to <code>wp-config.php</code> file.</li>
+  <li>WordPress issues should be discussed in our <a href="http://wordpress.org/support/">support 
+    forums</a>.</li>
+  <li><strong>Back up</strong> your database before you do anything. Yes, you.</li>
+</ul>
+<p>Have you looked at the <a href="../readme.html">readme</a>? If 
+  you&#8217;re all ready, <a href="import-b2.php?step=1">let&#8217;s go</a>!</p>
+<?php
+	break;
+	
+	case 1:
+?>
+<h1>Step 1</h1>
+<p>Okay first we&#8217;re going to set up the links database. This will allow you to host your own blogroll, complete with Weblogs.com updates.</p>
+<?php
+
+$got_links = false;
+$got_cats = false;
+$got_row = false;
+?>
+<p>Installing WP-Links.</p>
+<p>Checking for tables...</p>
+<?php
+$result = mysql_list_tables(DB_NAME);
+if (!$result) {
+    print "DB Error, could not list tables\n";
+    print 'MySQL Error: ' . mysql_error();
+    exit;
+}
+
+while ($row = mysql_fetch_row($result)) {
+    if ($row[0] == $wpdb->links)
+        $got_links = true;
+    if ($row[0] == $wpdb->linkcategories)
+        $got_cats = true;
+    //print "Table: $row[0]<br />\n";
+}
+if (!$got_cats) {
+    echo "<p>Can't find table '$wpdb->linkcategories', gonna create it...</p>\n";
+    $sql = "CREATE TABLE $wpdb->linkcategories ( " .
+           " cat_id int(11) NOT NULL auto_increment, " .
+           " cat_name tinytext NOT NULL, ".
+           " auto_toggle enum ('Y','N') NOT NULL default 'N', ".
+           " PRIMARY KEY (cat_id) ".
+           ") ";
+    $result = mysql_query($sql) or print ("Can't create the table '$wpdb->linkcategories' in the database.<br />" . $sql . "<br />" . mysql_error());
+    if ($result != false) {
+        echo "<p>Table '$wpdb->linkcategories' created OK</p>\n";
+        $got_cats = true;
+    }
+} else {
+    echo "<p>Found table '$wpdb->linkcategories', don't need to create it...</p>\n";
+        $got_cats = true;
+}
+if (!$got_links) {
+    echo "<p>Can't find '$wpdb->links', gonna create it...</p>\n";
+    $sql = "CREATE TABLE $wpdb->links ( " .
+           " link_id int(11) NOT NULL auto_increment,           " .
+           " link_url varchar(255) NOT NULL default '',         " .
+           " link_name varchar(255) NOT NULL default '',        " .
+           " link_image varchar(255) NOT NULL default '',       " .
+           " link_target varchar(25) NOT NULL default '',       " .
+           " link_category int(11) NOT NULL default 0,          " .
+           " link_description varchar(255) NOT NULL default '', " .
+           " link_visible enum ('Y','N') NOT NULL default 'Y',  " .
+           " link_owner int NOT NULL DEFAULT '1',               " .
+           " link_rating int NOT NULL DEFAULT '0',              " .
+           " link_updated DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', " .
+           " link_rel varchar(255) NOT NULL default '',         " .
+           " link_notes MEDIUMTEXT NOT NULL default '',         " .
+           " PRIMARY KEY (link_id)                              " .
+           ") ";
+    $result = mysql_query($sql) or print ("Can't create the table '$wpdb->links' in the database.<br />" . $sql . "<br />" . mysql_error());
+	$links = mysql_query("INSERT INTO $wpdb->links VALUES ('', 'http://wordpress.org/', 'WordPress', '', '', 1, '', 'Y', 1, 0, '0000-00-00 00:00:00', '');");
+	$links = mysql_query("INSERT INTO $wpdb->links VALUES ('', 'http://photomatt.net/', 'Matt', '', '', 1, '', 'Y', 1, 0, '0000-00-00 00:00:00', '');");
+	$links = mysql_query("INSERT INTO $wpdb->links VALUES ('', 'http://zed1.com/b2/', 'Mike', '', '', 1, '', 'Y', 1, 0, '0000-00-00 00:00:00', '');");
+
+    if ($result != false) {
+        echo "<p>Table '$wpdb->links' created OK</p>\n";
+        $got_links = true;
+    }
+} else {
+    echo "<p>Found table '$wpdb->links', don't need to create it...</p>\n";
+    echo "<p>... may need to update it though. Looking for column link_updated...</p>\n";
+    $query = "SELECT link_updated FROM $wpdb->links LIMIT 1";
+    $q = @mysql_query($query);
+    if ($q != false) {
+        if ($row = mysql_fetch_object($q)) {
+            echo "<p>You have  column link_updated. Good!</p>\n";
+        }
+    } else {
+        $query = "ALTER TABLE $wpdb->links ADD COLUMN link_updated DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'";
+        $q = mysql_query($query) or mysql_doh("Doh, couldn't add column.", $query, mysql_error());
+        echo "<p>Added column link_updated...</p>\n";
+    }
+    echo "<p>Looking for column link_rel...</p>\n";
+    $query = "SELECT link_rel FROM $wpdb->links LIMIT 1";
+    $q = @mysql_query($query);
+    if ($q != false) {
+        if ($row = mysql_fetch_object($q)) {
+            echo "<p>You have column link_rel. Good!</p>\n";
+        }
+    } else {
+        $query = "ALTER TABLE $wpdb->links ADD COLUMN link_rel varchar(255) NOT NULL DEFAULT '' ";
+        $q = mysql_query($query) or mysql_doh("Doh, couldn't add column.", $query, mysql_error());
+        echo "<p>Added column link_rel...</p>\n";
+    }
+    $got_links = true;
+}
+
+if ($got_links && $got_cats) {
+    echo "<p>Looking for category 1...</p>\n";
+    $sql = "SELECT * FROM $wpdb->linkcategories WHERE cat_id=1 ";
+    $result = mysql_query($sql) or print ("Can't query '$wpdb->linkcategories'.<br />" . $sql . "<br />" . mysql_error());
+    if ($result != false) {
+        if ($row = mysql_fetch_object($result)) {
+            echo "<p>You have at least 1 category. Good!</p>\n";
+            $got_row = true;
+        } else {
+            echo "<p>Gonna insert category 1...</p>\n";
+            $sql = "INSERT INTO $wpdb->linkcategories (cat_id, cat_name) VALUES (1, 'General')";
+            $result = mysql_query($sql) or print ("Can't query insert category.<br />" . $sql . "<br />" . mysql_error());
+            if ($result != false) {
+                echo "<p>Inserted category Ok</p>\n";
+                $got_row = true;
+            }
+        }
+    }
+}
+
+if ($got_row) {
+    echo "<p>All done!</p>\n";
+}
+?>
+<p>Did you defeat the boss monster at the end? Good, then you&#8217;re ready for 
+  <a href="import-b2.php?step=2">Step 2</a>.</p>
+<?php
+	break;
+	case 2:
+?>
+<h1>Step 2</h1>
+<p>First we&#8217;re going to add excerpt, post, and password functionality...</p>
+
+<?php
+
+$query = "ALTER TABLE $wpdb->posts ADD COLUMN post_excerpt text NOT NULL;";
+$q = $wpdb->query($query);
+// 0.71 mods
+$query = "ALTER TABLE $wpdb->posts ADD post_status ENUM('publish','draft','private') NOT NULL,
+ADD comment_status ENUM('open','closed') NOT NULL,
+ADD ping_status ENUM('open','closed') NOT NULL,
+ADD post_password varchar(20) NOT NULL;";
+$q = $wpdb->query($query);
+?>
+
+<p>That went well! Now let's clean up the b2 database structure a bit...</p>
+
+<?php
+$query = "ALTER TABLE $wpdb->posts DROP INDEX ID";
+
+$q = $wpdb->query($query);
+
+?>
+
+<p>One down, two to go...</p>
+
+
+<p>So far so good.</p>
+<?php
+
+$query="ALTER TABLE $wpdb->posts DROP post_karma";
+$q = $wpdb->query($query);
+flush();
+?>
+
+<p>Almost there...</p>
+
+<?php
+
+$query = "ALTER TABLE $wpdb->users DROP INDEX ID";
+
+$q = $wpdb->query($query);
+upgrade_all();
+?>
+
+<p>Welcome to the family. <a href="../">Have fun</a>!</p>
+  <?php
+	break;
+}
+?>
+
+</body>
+</html>
--- a/wp-admin/import-blogger.php
+++ b/wp-admin/import-blogger.php
@@ -0,0 +1,221 @@
+<?php
+
+$wpvarstoreset = array('action');
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+	$wpvar = $wpvarstoreset[$i];
+	if (!isset($$wpvar)) {
+		if (empty($_POST["$wpvar"])) {
+			if (empty($_GET["$wpvar"])) {
+				$$wpvar = '';
+			} else {
+				$$wpvar = $_GET["$wpvar"];
+			}
+		} else {
+			$$wpvar = $_POST["$wpvar"];
+		}
+	}
+}
+require_once('../wp-config.php');
+require('upgrade-functions.php');
+header( 'Content-Type: text/html; charset=utf-8' );
+switch ($action) {
+
+case "step1":
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+	<title>Blogger to WordPress - Converting...</title>
+	<link rel="stylesheet" href="wp-admin.css" type="text/css">
+</head>
+<body>
+<div class="wrap">
+<h1>Blogger to <img src="../wp-images/wpminilogo.png" width="50" height="50" border="0" alt="WordPress" align="top" /></h1>
+<p>The importer is running...</p>
+<ul>
+	<li>Importing posts and users
+		<ul><?php
+
+	for($bgy=1999; $bgy<=(date('Y')); $bgy++) {
+		for($bgm=1; $bgm<13; $bgm++) {
+
+		$bgmm = zeroise($bgm,2);
+	
+		$archivefile = "../$bgy"."_"."$bgmm"."_01_wordpress.php";
+		
+		if (file_exists($archivefile)) {
+
+			$f = fopen($archivefile,"r");
+			$archive = fread($f, filesize($archivefile));
+			fclose($f);
+			echo "<li>$bgy/$bgmm ";
+
+			$posts = explode('<wordpresspost>', $archive);
+
+			for ($i = 1; $i < count($posts); $i = $i + 1) {
+
+			$postinfo = explode('|||', $posts[$i]);
+			$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];
+
+			$post_author = trim(addslashes($postinfo[1]));
+			// we'll check the author is registered already
+			$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_login = '$post_author'");
+			if (!$user) { // seems s/he's not, so let's register
+				$user_ip = '127.0.0.1';
+				$user_domain = 'localhost';
+				$user_browser = 'server';
+				$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 = addslashes($post_author);
+				$pass1 = addslashes('password');
+				$user_nickname = addslashes($post_author);
+				$user_email = addslashes('user@wordpress.org');
+				$user_url = addslashes('');
+				$user_joindate = addslashes($user_joindate);
+				$result = $wpdb->query("
+				INSERT INTO $wpdb->users (
+					user_login,
+					user_pass,
+					user_nickname,
+					user_email,
+					user_url,
+					user_ip,
+					user_domain,
+					user_browser,
+					user_registered,
+					user_level,
+					user_idmode
+				) VALUES (
+					'$user_login',
+					'$pass1',
+					'$user_nickname',
+					'$user_email',
+					'$user_url',
+					'$user_ip',
+					'$user_domain',
+					'$user_browser',
+					'$user_joindate',
+					'1',
+					'nickname'
+				)");
+
+				echo ": Registered user <strong>$user_login</strong>";
+			}
+
+			$post_author_ID = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_login = '$post_author'");
+
+			$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);
+			
+			// Quick-n-dirty check for dups:
+			$dupcheck = $wpdb->get_results("SELECT ID,post_date,post_title FROM $wpdb->posts WHERE post_date='$post_date' AND post_title='$post_title' LIMIT 1",ARRAY_A);
+			if ($dupcheck[0]['ID']) {
+				print "<br />\nSkipping duplicate post, ID = '" . $dupcheck[0]['ID'] . "'<br />\n";
+				print "Timestamp: " . $post_date . "<br />\n";
+				print "Post Title: '" . stripslashes($post_title) . "'<br />\n";
+				continue;
+			}
+
+			$result = $wpdb->query("
+			INSERT INTO $wpdb->posts 
+				(post_author,post_date,post_content,post_title,post_category)
+			VALUES 
+				('$post_author_ID','$post_date','$post_content','$post_title','1')
+			");
+
+
+			} echo '... <strong>Done</strong></li>';
+			
+		}}
+	}
+
+	upgrade_all();
+	?>
+</ul>
+<strong>Done</strong>
+</li>
+</ul>
+<p>&nbsp;</p>
+<p>Completed Blogger to WordPress import!</p>
+<p>Now you can go and <a href="../wp-login.php">log in</a>, have fun!</p>
+</div>
+</body>
+</html>
+	<?php
+	break;
+
+default:
+
+	?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+	<title>Blogger to WordPress Import Utility</title>
+	<link rel="stylesheet" href="wp-admin.css" type="text/css">
+</head>
+
+<body>
+<div class="wrap">
+<h1>Blogger to <img src="../wp-images/wpminilogo.png" width="50" height="50" border="0" alt="WordPress" align="top" /></h1>
+<p>This is a basic Blogger to WordPress import script.</p>
+<p>What it does:</p>
+<ul>
+	<li>Parses your archives to retrieve your blogger posts.</li>
+	<li>Adds an author whenever it sees a new nickname, all authors are imported at level 1, with a default profile and the password 'password'</li>
+</ul>
+<p>What it does not:</p>
+<ul>
+	<li>It sucks at making coffee.</li>
+	<li>It always forgets to call back.</li>
+</ul>
+
+<h2>First step: Install WordPress</h2>
+<p>Install the WordPress blog as explained in the <a href="../readme.html">read me</a>, then immediately come back here.</p>
+
+<h3>Second step: let's play with Blogger</h3>
+<p>Log into your Blogger account.<br />
+Go to the Settings, and make Blogger publish your files in the directory where your WordPress resides. Change the Date/Time format to be mm/dd/yyyy hh:mm:ss AM/PM (the first choice in the dropdown menu). In Archives: set the frequency to 'monthly' and the archive filename to 'wordpress.php' (without the quotes), set the ftp archive path to make Blogger publish the archives in your WordPress directory. Click 'save changes'.<br />
+Go to the Templates. Replace your existing template with this line (copy and paste):
+<blockquote>&lt;Blogger>&lt;wordpresspost>&lt;$BlogItemDateTime$>|||&lt;$BlogItemAuthorNickname$>|||&lt;$BlogItemBody$>|||&lt;$BlogItemNumber$>|||&lt;$BlogItemSubject$>&lt;/Blogger></blockquote>
+Go to the Archives, and click 'republish all'.<br />
+Check in your FTP that you've got the archive files published. They should look like this example: <code>2001_10_01_wordpress.php</code>. If they aren't there, redo the republish process.</p>
+<p>You're done with the hard part. :)</p>
+
+<form name="stepOne" method="get">
+<input type="hidden" name="action" value="step1" />
+<h3>Third step: w00t, let's click OK:</h3>
+<p>When you're ready, click OK to start importing: <input type="submit" name="submit" value="OK" /><br /><br />
+<i>Note: the script might take some time, like 1 second for 100 entries
+imported. DO NOT STOP IT or else you won't have a complete import.</i></p>
+</form>
+</div>
+</body>
+</html>
+	<?php
+	break;
+
+}
+
+?>
--- a/wp-admin/import-greymatter.php
+++ b/wp-admin/import-greymatter.php
@@ -0,0 +1,322 @@
+<?php
+if (!file_exists('../wp-config.php')) die("There doesn't seem to be a wp-config.php file. You must install WordPress before you import any entries.");
+
+require_once('../wp-config.php');
+require('upgrade-functions.php');
+
+$wpvarstoreset = array('action', 'gmpath', 'archivespath', 'lastentry');
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+	$wpvar = $wpvarstoreset[$i];
+	if (!isset($$wpvar)) {
+		if (empty($_POST["$wpvar"])) {
+			if (empty($_GET["$wpvar"])) {
+				$$wpvar = '';
+			} else {
+				$$wpvar = $_GET["$wpvar"];
+			}
+		} else {
+			$$wpvar = $_POST["$wpvar"];
+		}
+	}
+}
+
+header( 'Content-Type: text/html; charset=utf-8' );
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<title>WordPress &rsaquo; Import from GreyMatter</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<style media="screen" type="text/css">
+	body {
+		font-family: Georgia, "Times New Roman", Times, serif;
+		margin-left: 20%;
+		margin-right: 20%;
+	}
+	#logo {
+		margin: 0;
+		padding: 0;
+		background-image: url(http://wordpress.org/images/logo.png);
+		background-repeat: no-repeat;
+		height: 60px;
+		border-bottom: 4px solid #333;
+	}
+	#logo a {
+		display: block;
+		text-decoration: none;
+		text-indent: -100em;
+		height: 60px;
+	}
+	p {
+		line-height: 140%;
+	}
+	#authors li 	{
+		padding:3px;
+		border: 1px solid #ccc;
+		width: 40%;
+		margin-bottom:2px;
+	}
+	</style>
+</head><body> 
+<h1 id="logo"><a href="http://wordpress.org">WordPress</a></h1> 
+
+<?php
+switch ($action) {
+
+case "step1":
+
+	function gm2autobr($string) { // transforms GM's |*| into wp's <br />\n
+		$string = str_replace("|*|","<br />\n",$string);
+		return($string);
+	}
+
+	if (!@chdir($archivespath))
+		die("Wrong path, $archivespath\ndoesn't exist\non the server");
+
+	if (!@chdir($gmpath))
+		die("Wrong path, $gmpath\ndoesn't exist\non the server");
+?>
+
+<p>The importer is running...</p>
+<ul>
+<li>importing users... <ul><?php
+
+	chdir($gmpath);
+	$userbase = file("gm-authors.cgi");
+
+	foreach($userbase as $user) {
+		$userdata=explode("|", $user);
+
+		$user_ip="127.0.0.1";
+		$user_domain="localhost";
+		$user_browser="server";
+
+		$s=$userdata[4];
+		$user_joindate=substr($s,6,4)."-".substr($s,0,2)."-".substr($s,3,2)." 00:00:00";
+
+		$user_login=addslashes($userdata[0]);
+		$pass1=addslashes($userdata[1]);
+		$user_nickname=addslashes($userdata[0]);
+		$user_email=addslashes($userdata[2]);
+		$user_url=addslashes($userdata[3]);
+		$user_joindate=addslashes($user_joindate);
+
+		$loginthere = $wpdb->get_var("SELECT user_login FROM $wpdb->users WHERE user_login = '$user_login'");
+		if ($loginthere) {
+			echo "<li>user <i>$user_login</i>... <b>Already exists</b></li>";
+			continue;
+		}
+
+		$query = "INSERT INTO $wpdb->users (user_login,user_pass,user_nickname,user_email,user_url,user_ip,user_domain,user_browser,user_registered,user_level,user_idmode) VALUES ('$user_login','$pass1','$user_nickname','$user_email','$user_url','$user_ip','$user_domain','$user_browser','$user_joindate','1','nickname')";
+		$result = $wpdb->query($query);
+		if ($result==false) {
+			die ("<strong>ERROR</strong>: couldn't register an user!");
+		}
+		echo "<li>user <i>$user_login</i>... <b>Done</b></li>";
+
+	}
+
+?></ul><b>Done</b></li>
+<li>importing posts, comments, and karma...<br /><ul><?php
+
+	chdir($archivespath);
+	
+	for($i = 0; $i <= $lastentry; $i = $i + 1) {
+		
+		$entryfile = "";
+		
+		if ($i<10000000) {
+			$entryfile .= "0";
+			if ($i<1000000) {
+				$entryfile .= "0";
+				if ($i<100000) {
+					$entryfile .= "0";
+					if ($i<10000) {
+						$entryfile .= "0";
+						if ($i<1000) {
+							$entryfile .= "0";
+							if ($i<100) {
+								$entryfile .= "0";
+								if ($i<10) {
+									$entryfile .= "0";
+		}}}}}}}
+
+		$entryfile .= "$i";
+
+		if (is_file($entryfile.".cgi")) {
+
+			$entry=file($entryfile.".cgi");
+			echo "<li>entry # $entryfile ";
+			$postinfo=explode("|",$entry[0]);
+			$postmaincontent=gm2autobr($entry[2]);
+			$postmorecontent=gm2autobr($entry[3]);
+
+			$post_author=trim(addslashes($postinfo[1]));
+			// we'll check the author is registered, or if it's a deleted author
+			$sql = "SELECT * FROM $wpdb->users WHERE user_login = '$post_author'";
+			$result = $wpdb->query($sql);
+			if (! $result) { // if deleted from GM, we register the author as a level 0 user in wp
+				$user_ip="127.0.0.1";
+				$user_domain="localhost";
+				$user_browser="server";
+				$user_joindate="1979-06-06 00:41:00";
+				$user_login=addslashes($post_author);
+				$pass1=addslashes("password");
+				$user_nickname=addslashes($post_author);
+				$user_email=addslashes("user@deleted.com");
+				$user_url=addslashes("");
+				$user_joindate=addslashes($user_joindate);
+				$query = "INSERT INTO $wpdb->users (user_login,user_pass,user_nickname,user_email,user_url,user_ip,user_domain,user_browser,user_registered,user_level,user_idmode) VALUES ('$user_login','$pass1','$user_nickname','$user_email','$user_url','$user_ip','$user_domain','$user_browser','$user_joindate','0','nickname')";
+				$result = $wpdb->query($query);
+				if ($result==false) {
+					die ("<strong>ERROR</strong>: couldn't register an user!");
+				}
+				echo ": registered deleted user <i>$user_login</i> at level 0 ";
+			}
+
+			$sql = "SELECT ID FROM $wpdb->users WHERE user_login = '$post_author'";
+			$post_author_ID = $wpdb->get_var($sql);
+
+			$post_title=gm2autobr($postinfo[2]);
+			$post_title=addslashes($post_title);
+
+			$postyear=$postinfo[6];
+			$postmonth=zeroise($postinfo[4],2);
+			$postday=zeroise($postinfo[5],2);
+			$posthour=zeroise($postinfo[7],2);
+			$postminute=zeroise($postinfo[8],2);
+			$postsecond=zeroise($postinfo[9],2);
+
+			if (($postinfo[10]=="PM") && ($posthour!="12"))
+				$posthour=$posthour+12;
+
+			$post_date="$postyear-$postmonth-$postday $posthour:$postminute:$postsecond";
+
+			$post_content=$postmaincontent;
+			if (strlen($postmorecontent)>3)
+				$post_content .= "<!--more--><br /><br />".$postmorecontent;
+			$post_content=addslashes($post_content);
+
+			$post_karma=$postinfo[12];
+
+			$query = "INSERT INTO $wpdb->posts (post_author,post_date,post_content,post_title) VALUES ('$post_author_ID','$post_date','$post_content','$post_title')";
+			$result = $wpdb->query($query);
+
+			if (!$result)
+				die ("Error in posting...");
+			
+			$query = "SELECT ID FROM $wpdb->posts ORDER BY ID DESC LIMIT 1";
+			$post_ID = $wpdb->get_var($query);
+
+			// Grab a default category.
+			$post_category = $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories LIMIT 1");
+
+			// Update the post2cat table.
+			$exists = $wpdb->get_row("SELECT * FROM $wpdb->post2cat WHERE post_id = $post_ID AND category_id = $post_category");
+			  
+			if (!$exists) {
+			  $wpdb->query("
+					INSERT INTO $wpdb->post2cat
+					(post_id, category_id)
+					VALUES
+					($post_ID, $post_category)
+					");
+			}
+
+			$c=count($entry);
+			if ($c>4) {
+				for ($j=4;$j<$c;$j++) {
+					$entry[$j]=gm2autobr($entry[$j]);
+					$commentinfo=explode("|",$entry[$j]);
+					$comment_post_ID=$post_ID;
+					$comment_author=addslashes($commentinfo[0]);
+					$comment_author_email=addslashes($commentinfo[2]);
+					$comment_author_url=addslashes($commentinfo[3]);
+					$comment_author_IP=addslashes($commentinfo[1]);
+
+					$commentyear=$commentinfo[7];
+					$commentmonth=zeroise($commentinfo[5],2);
+					$commentday=zeroise($commentinfo[6],2);
+					$commenthour=zeroise($commentinfo[8],2);
+					$commentminute=zeroise($commentinfo[9],2);
+					$commentsecond=zeroise($commentinfo[10],2);
+					if (($commentinfo[11]=="PM") && ($commenthour!="12"))
+						$commenthour=$commenthour+12;
+					$comment_date="$commentyear-$commentmonth-$commentday $commenthour:$commentminute:$commentsecond";
+
+					$comment_content=addslashes($commentinfo[12]);
+
+					$sql3 = "INSERT INTO $wpdb->comments (comment_post_ID,comment_author,comment_author_email,comment_author_url,comment_author_IP,comment_date,comment_content) VALUES ('$comment_post_ID','$comment_author','$comment_author_email','$comment_author_url','$comment_author_IP','$comment_date','$comment_content')";
+					$result3 = $wpdb->query($sql3);
+					if (!$result3)
+						die ("There is an error with the database, it can't store your comment..");
+				}
+				$comments=$c-4;
+				echo ": imported $comments comment";
+				if ($comments>1)
+					echo "s";
+			}
+			echo "... <b>Done</b></li>";
+		}
+	} 
+	upgrade_all();
+	?>
+</ul><b>Done</b></li></ul>
+<p>&nbsp;</p>
+<p>Completed GM 2 WordPress import !</p>
+<p>Now you can go and <a href="wp-login.php">log in</a>, have fun !</p>
+	<?php
+	break;
+
+default:
+?>
+
+<p>This is a basic GreyMatter to WordPress import script.</p>
+<p>What it does:</p>
+<ul>
+<li>parses gm-authors.cgi to import authors: everyone is imported at level 1</li>
+<li>parses the entries cgi files to import posts, comments, and karma on posts (although karma is not used on WordPress); if authors are found not to be in gm-authors.cgi, imports them at level 0</li>
+</ul>
+<p>What it does not:</p>
+<ul>
+<li>parse gm-counter.cgi (what's the use of that file ?), gm-banlist.cgi, gm-cplog.cgi (you can make a CP log hack if you really feel like it, but I question the need of a CP log)</li>
+<li>import gm-templates. you'll start with the basic template wp.php</li>
+<li>doesn't keep entries on top</li>
+</ul>
+
+<h3>First step: Install WordPress</h3>
+<p>Install the WordPress blog as explained in the <a href="../readme.html" target="_blank">ReadMe</a>, then immediately come back here.</p>
+
+<form name="stepOne" method="get">
+<input type="hidden" name="action" value="step1" />
+<h3>Second step: Provide GreyMatter details</h3>
+<table cellpadding="0">
+<tr>
+<td>Path to GM files:</td>
+<td><input type="text" style="width:300px" name="gmpath" value="/home/my/site/cgi-bin/greymatter/" /></td>
+</tr>
+<tr>
+<td>Path to GM entries:</td>
+<td><input type="text" style="width:300px" name="archivespath" value="/home/my/site/cgi-bin/greymatter/archives/" /></td>
+</tr>
+</table>
+
+<p>This importer will search for files 00000001.cgi to 000-whatever.cgi, so you need to enter the number of the last GM post here. (If you don't know that number, just log into your FTP and look it up in the entries' folder)</p>
+
+<table>
+<tr>
+<td>Last entry's number:</td>
+<td><input type="text" name="lastentry" value="00000001" /></td>
+</tr>
+</table>
+
+<p>When you're ready, click OK to start importing: <input type="submit" name="submit" value="OK" class="search" /></p>
+</form>
+
+</body>
+</html>
+	<?php
+	break;
+}
+
+?>
--- a/wp-admin/import-livejournal.php
+++ b/wp-admin/import-livejournal.php
@@ -0,0 +1,124 @@
+<?php
+define('XMLFILE', '');
+// Example:
+// define('XMLFILE', '/home/example/public_html/rss.xml');
+// or if it's in the same directory as import-rss.php
+// define('XMLFILE', 'rss.xml');
+
+$post_author = 1; // Author to import posts as author ID
+$timezone_offset = 0; // GMT offset of posts your importing
+
+
+$add_hours = intval($timezone_offset);
+$add_minutes = intval(60 * ($timezone_offset - $add_hours));
+
+if (!file_exists('../wp-config.php')) die("There doesn't seem to be a wp-config.php file. You must install WordPress before you import any entries.");
+require('../wp-config.php');
+
+$step = $_GET['step'];
+if (!$step) $step = 0;
+header( 'Content-Type: text/html; charset=utf-8' );
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<title>WordPress &rsaquo; Import from RSS</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<style media="screen" type="text/css">
+	body {
+		font-family: Georgia, "Times New Roman", Times, serif;
+		margin-left: 20%;
+		margin-right: 20%;
+	}
+	#logo {
+		margin: 0;
+		padding: 0;
+		background-image: url(http://wordpress.org/images/logo.png);
+		background-repeat: no-repeat;
+		height: 60px;
+		border-bottom: 4px solid #333;
+	}
+	#logo a {
+		display: block;
+		text-decoration: none;
+		text-indent: -100em;
+		height: 60px;
+	}
+	p {
+		line-height: 140%;
+	}
+	</style>
+</head><body> 
+<h1 id="logo"><a href="http://wordpress.org/">WordPress</a></h1> 
+<?php
+switch($step) {
+
+	case 0:
+?> 
+<p>Howdy! This importer allows you to extract posts from a LiveJournal XML export file. To get started you must edit the following line in this file (<code>import-livejournal.php</code>) </p>
+<p><code>define('XMLFILE', '');</code></p>
+<p>You want to define where the XML file we'll be working with is, for example: </p>
+<p><code>define('XMLFILE', '2002-04.xml');</code></p>
+<p>You have to do this manually for security reasons.</p>
+<p>If you've done that and you&#8217;re all ready, <a href="import-livejournal.php?step=1">let's go</a>!</p>
+<?php
+	break;
+	
+	case 1:
+if ('' != XMLFILE && !file_exists(XMLFILE)) die("The file you specified does not seem to exist. Please check the path you've given.");
+if ('' == XMLFILE) die("You must edit the XMLFILE line as described on the <a href='import-rss.php'>previous page</a> to continue.");
+
+// Bring in the data
+set_magic_quotes_runtime(0);
+$datalines = file(XMLFILE); // Read the file into an array
+$importdata = implode('', $datalines); // squish it
+$importdata = str_replace(array("\r\n", "\r"), "\n", $importdata);
+
+preg_match_all('|<entry>(.*?)</entry>|is', $importdata, $posts);
+$posts = $posts[1];
+
+echo '<ol>';
+foreach ($posts as $post) :
+$title = $date = $categories = $content = $post_id =  '';
+echo "<li>Importing post... ";
+
+preg_match('|<subject>(.*?)</subject>|is', $post, $title);
+$title = addslashes( trim($title[1]) );
+$post_name = sanitize_title($title);
+
+preg_match('|<eventtime>(.*?)</eventtime>|is', $post, $date);
+$date = strtotime($date[1]);
+
+$post_date = date('Y-m-d H:i:s', $date);
+
+
+preg_match('|<event>(.*?)</event>|is', $post, $content);
+$content = str_replace( array('<![CDATA[', ']]>'), '', addslashes( trim($content[1]) ) );
+
+// Now lets put it in the DB
+if ($wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$title' AND post_date = '$post_date'")) :
+	echo 'Post already imported';
+else : 
+	
+	$wpdb->query("INSERT INTO $wpdb->posts 
+		(post_author, post_date, post_date_gmt, post_content, post_title,post_status, comment_status, ping_status, post_name)
+		VALUES 
+		('$post_author', '$post_date', DATE_ADD('$post_date', INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE), '$content', '$title', 'publish', '$comment_status', '$ping_status', '$post_name')");
+	$post_id = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$title' AND post_date = '$post_date'");
+	if (!$post_id) die("couldn't get post ID");
+	$exists = $wpdb->get_row("SELECT * FROM $wpdb->post2cat WHERE post_id = $post_id AND category_id = 1");
+	if (!$exists) $wpdb->query("INSERT INTO $wpdb->post2cat (post_id, category_id) VALUES ($post_id, 1) ");
+	echo 'Done!</li>';
+endif;
+
+
+endforeach;
+?>
+</ol>
+
+<h3>All done. <a href="../">Have fun!</a></h3>
+<?php
+	break;
+}
+?> 
+</body>
+</html>
--- a/wp-admin/import-mt.php
+++ b/wp-admin/import-mt.php
@@ -0,0 +1,418 @@
+<?php
+define('MTEXPORT', '');
+// enter the relative path of the import.txt file containing the mt entries. If the file is called import.txt and it is /wp-admin, then this line
+//should be define('MTEXPORT', 'import.txt');
+
+if (!file_exists('../wp-config.php')) die("There doesn't seem to be a wp-config.php file. You must install WordPress before you import any entries.");
+require('../wp-config.php');
+require ('upgrade-functions.php');
+$step = $_GET['step'];
+if (!$step) $step = 0;
+header( 'Content-Type: text/html; charset=utf-8' );
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<title>WordPress &rsaquo; Import from Movable Type</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<style media="screen" type="text/css">
+	body {
+		font-family: Georgia, "Times New Roman", Times, serif;
+		margin-left: 20%;
+		margin-right: 20%;
+	}
+	#logo {
+		margin: 0;
+		padding: 0;
+		background-image: url(http://wordpress.org/images/logo.png);
+		background-repeat: no-repeat;
+		height: 60px;
+		border-bottom: 4px solid #333;
+	}
+	#logo a {
+		display: block;
+		text-decoration: none;
+		text-indent: -100em;
+		height: 60px;
+	}
+	p {
+		line-height: 140%;
+	}
+	#authors li 	{
+		padding:3px;
+		border: 1px solid #ccc;
+		width: 40%;
+		margin-bottom:2px;
+	}
+	</style>
+</head><body> 
+<h1 id="logo"><a href="http://wordpress.org">WordPress</a></h1> 
+<?php
+switch($step) {
+
+	case 0:
+?> 
+<p>Howdy! We&#8217;re about to begin the process to import all of your Movable Type entries into WordPress. Before we get started, you need to edit this file (<code>import-mt.php</code>) and change one line so we know where to find your MT export file. To make this easy put the import file into the <code>wp-admin</code> directory. Look for the line that says:</p>
+<p><code>define('MTEXPORT', '');</code></p>
+<p>and change it to</p>
+<p><code>define('MTEXPORT', 'import.txt');</code></p>
+<p>You have to do this manually for security reasons.</p>
+<p>If you've done that and you&#8217;re all ready, <a href="import-mt.php?step=1">let's go</a>! Remember that the import process may take a minute or so if you have a large number of entries and comments. Think of all the rebuilding time you'll be saving once it's done. :)</p>
+<p>The importer is smart enough not to import duplicates, so you can run this multiple times without worry if&#8212;for whatever reason&#8212;it doesn't finish. If you get an <strong>out of memory</strong> error try splitting up the import file into pieces. </p>
+<?php
+	break;
+	
+	case 1:
+if ('' != MTEXPORT && !file_exists(MTEXPORT)) die("The file you specified does not seem to exist. Please check the path you've given.");
+if ('' == MTEXPORT) die("You must edit the MTEXPORT line as described on the <a href='import-mt.php'>previous page</a> to continue.");
+// Bring in the data
+set_magic_quotes_runtime(0);
+$importdata = file(MTEXPORT); // Read the file into an array
+$importdata = implode('', $importdata); // squish it
+$importdata = preg_replace("/(\r\n|\n|\r)/", "\n", $importdata);
+$importdata = preg_replace("/\n--------\n/", "--MT-ENTRY--\n", $importdata);
+$authors = array();
+$temp = array();
+$posts = explode("--MT-ENTRY--", $importdata);
+unset( $importdata ); // Free up memory
+
+function users_form($n) {
+	global $wpdb, $testing;
+	$users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY ID");
+	?><select name="userselect[<?php echo $n; ?>]">
+	<option value="#NONE#">- Select -</option>
+	<?php foreach($users as $user) {
+		echo '<option value="'.$user->user_login.'">'.$user->user_login.'</option>';
+		} ?>
+	</select>
+<?php }
+
+$i = -1;
+foreach ($posts as $post) { 
+	if ('' != trim($post)) {
+		++$i;
+		unset($post_categories);
+		preg_match("|AUTHOR:(.*)|", $post, $thematch);
+		$thematch = trim($thematch[1]);
+		array_push($temp,"$thematch"); //store the extracted author names in a temporary array
+		}
+	}//end of foreach
+//we need to find unique values of author names, while preserving the order, so this function emulates the unique_value(); php function, without the sorting.
+$authors[0] = array_shift($temp); 
+$y = count($temp) + 1;
+for ($x = 1; $x < $y; $x++) {
+	$next = array_shift($temp);
+	if (!(in_array($next,$authors))) array_push($authors, "$next");
+	}
+//by this point, we have all unique authors in the array $authors
+?><p><?php _e('To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as <code>admin</code>s entries.'); ?></p>
+<p><?php _e('Below, you can see the names of the authors of the MovableType posts in <i>italics</i>. For each of these names, you can either pick an author in your WordPress installation from the menu, or enter a name for the author in the textbox.'); ?></p>
+<p><?php _e('If a new user is created by WordPress, the password will be set, by default, to "changeme". Quite suggestive, eh? ;)'); ?></p>
+	<?php
+	echo '<ol id="authors">';
+	echo '<form action="?step=2" method="post">';
+	$j = -1;
+	foreach ($authors as $author) {
+	++$j;
+	echo '<li><i>'.$author.'</i><br />'.'<input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30">';
+	users_form($j);
+	echo '</li>';
+	}
+	echo '<input type="submit" value="Submit">'.'<br/>';
+	echo '</form>';
+	echo '</ol>';
+	
+	flush();
+
+	break;
+	
+	case 2:
+	$newauthornames = array();
+	$formnames = array();
+	$selectnames = array();
+	$mtnames = array();
+	foreach($_POST['user'] as $key => $line) { 
+	$newname = trim(stripslashes($line)); 
+	if ($newname == '') $newname = 'left_blank';//passing author names from step 1 to step 2 is accomplished by using POST. left_blank denotes an empty entry in the form.
+	array_push($formnames,"$newname");
+	}// $formnames is the array with the form entered names
+	foreach ($_POST['userselect'] as $user => $key) {
+	$selected = trim(stripslashes($key));
+	array_push($selectnames,"$selected");
+	}
+	$count = count($formnames);
+	for ($i = 0; $i < $count; $i++) {
+	if ( $selectnames[$i] != '#NONE#') {//if no name was selected from the select menu, use the name entered in the form
+	array_push($newauthornames,"$selectnames[$i]");
+	} 
+	else {
+	array_push($newauthornames,"$formnames[$i]");
+	}
+	}
+
+	$j = -1;
+	//function to check the authorname and do the mapping
+	function checkauthor($author) {
+	global $wpdb, $mtnames, $newauthornames, $j;//mtnames is an array with the names in the mt import file
+	$md5pass = md5(changeme);
+	if (!(in_array($author, $mtnames))) { //a new mt author name is found
+		++$j;
+		$mtnames[$j] = $author; //add that new mt author name to an array 
+		$user_id = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_login = '$newauthornames[$j]'"); //check if the new author name defined by the user is a pre-existing wp user
+		if (!$user_id) { //banging my head against the desk now. 
+			if ($newauthornames[$j] == 'left_blank') { //check if the user does not want to change the authorname
+				$wpdb->query("INSERT INTO $wpdb->users (user_level, user_login, user_pass, user_nickname) VALUES ('1', '$author', '$md5pass', '$author')"); // if user does not want to change, insert the authorname $author
+				$user_id = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_login = '$author'");
+				$newauthornames[$j] = $author; //now we have a name, in the place of left_blank.
+			} else {
+			$wpdb->query("INSERT INTO $wpdb->users (user_level, user_login, user_pass, user_nickname) VALUES ('1', '$newauthornames[$j]', '$md5pass', '$newauthornames[$j]')"); //if not left_blank, insert the user specified name
+			$user_id = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_login = '$newauthornames[$j]'");
+			}
+		} else return $user_id; // return pre-existing wp username if it exists
+    } else {
+    $key = array_search($author, $mtnames); //find the array key for $author in the $mtnames array
+    $user_id = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_login = '$newauthornames[$key]'");//use that key to get the value of the author's name from $newauthornames
+	}
+	return $user_id;
+}//function checkauthor ends here
+
+	//bring in the posts now
+set_magic_quotes_runtime(0);
+$importdata = file(MTEXPORT); // Read the file into an array
+$importdata = implode('', $importdata); // squish it
+$importdata = preg_replace("/(\r\n|\n|\r)/", "\n", $importdata);
+$importdata = preg_replace("/\n--------\n/", "--MT-ENTRY--", $importdata);
+$authors = array();
+$temp = array();
+$posts = explode("--MT-ENTRY--", $importdata);
+unset( $importdata ); // Free up memory
+
+$i = -1;
+echo "<ol>";
+foreach ($posts as $post) { if ('' != trim($post)) {
+	++$i;
+	unset($post_categories);
+	echo "<li>Processing post... ";
+
+	// Take the pings out first
+	preg_match("|(-----\n\nPING:.*)|s", $post, $pings);
+	$post = preg_replace("|(-----\n\nPING:.*)|s", '', $post);
+
+	// Then take the comments out
+	preg_match("|(-----\nCOMMENT:.*)|s", $post, $comments);
+	$post = preg_replace("|(-----\nCOMMENT:.*)|s", '', $post);
+	
+	// We ignore the keywords
+	$post = preg_replace("|(-----\nKEYWORDS:.*)|s", '', $post);
+	
+	// We want the excerpt
+	preg_match("|-----\nEXCERPT:(.*)|s", $post, $excerpt);
+	$excerpt = addslashes(trim($excerpt[1]));
+	$post = preg_replace("|(-----\nEXCERPT:.*)|s", '', $post);
+	
+	// We're going to put extended body into main body with a more tag
+	preg_match("|-----\nEXTENDED BODY:(.*)|s", $post, $extended);
+	$extended = trim($extended[1]);
+	if ('' != $extended) $extended = "\n<!--more-->\n$extended";
+	$post = preg_replace("|(-----\nEXTENDED BODY:.*)|s", '', $post);
+	
+	// Now for the main body
+	preg_match("|-----\nBODY:(.*)|s", $post, $body);
+	$body = trim($body[1]);
+	$post_content = addslashes($body . $extended);
+	$post = preg_replace("|(-----\nBODY:.*)|s", '', $post);
+	
+	// Grab the metadata from what's left
+	$metadata = explode("\n", $post);
+	foreach ($metadata as $line) {
+		preg_match("/^(.*?):(.*)/", $line, $token);
+		$key = trim($token[1]);
+		$value = trim($token[2]);
+		// Now we decide what it is and what to do with it
+        switch($key) {
+			case '':
+				break;
+            case 'AUTHOR':
+                $post_author = $value;
+                break;
+            case 'TITLE':
+                $post_title = addslashes($value);
+				echo '<i>'.stripslashes($post_title).'</i>... ';
+				$post_name = sanitize_title($post_title);
+                break;
+            case 'STATUS':
+                // "publish" and "draft" enumeration items match up; no change required
+                $post_status = $value;
+				if (empty($post_status)) $post_status = 'publish';
+                break;
+            case 'ALLOW COMMENTS':
+                $post_allow_comments = $value;
+                if ($post_allow_comments == 1) {
+                    $comment_status = 'open';
+                } else {
+                    $comment_status = 'closed';
+                }
+                break;
+            case 'CONVERT BREAKS':
+                $post_convert_breaks = $value;
+                break;
+            case 'ALLOW PINGS':
+                $post_allow_pings = trim($meta[2][0]);
+                if ($post_allow_pings == 1) {
+                    $post_allow_pings = 'open';
+                } else {
+                    $post_allow_pings = 'closed';
+                }
+                break;
+            case 'PRIMARY CATEGORY':
+				$post_categories[] = addslashes($value);
+                break;
+            case 'CATEGORY':    
+				$post_categories[] = addslashes($value);
+                break;
+			case 'DATE':
+				$post_date = strtotime($value);
+				$post_date = date('Y-m-d H:i:s', $post_date);
+				$post_date_gmt = get_gmt_from_date("$post_date");
+				break;
+			default:
+//				echo "\n$key: $value";
+				break;
+        } // end switch
+	} // End foreach
+
+	// Let's check to see if it's in already
+	if ($wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$post_title' AND post_date = '$post_date'")) {
+		echo "Post already imported.";
+	} else {
+		$post_author = checkauthor($post_author);//just so that if a post already exists, new users are not created by checkauthor
+	    $wpdb->query("INSERT INTO $wpdb->posts (
+			post_author, post_date, post_date_gmt, post_content, post_title, post_excerpt,  post_status, comment_status, ping_status, post_name, post_modified, post_modified_gmt)
+			VALUES 
+			('$post_author', '$post_date', '$post_date_gmt', '$post_content', '$post_title', '$excerpt', '$post_status', '$comment_status', '$ping_status', '$post_name','$post_date', '$post_date_gmt')");
+		$post_id = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$post_title' AND post_date = '$post_date'");
+		if (0 != count($post_categories)) {
+			foreach ($post_categories as $post_category) {
+			// See if the category exists yet
+			$cat_id = $wpdb->get_var("SELECT cat_ID from $wpdb->categories WHERE cat_name = '$post_category'");
+			if (!$cat_id && '' != trim($post_category)) {
+				$cat_nicename = sanitize_title($post_category);
+				$wpdb->query("INSERT INTO $wpdb->categories (cat_name, category_nicename) VALUES ('$post_category', '$cat_nicename')");
+				$cat_id = $wpdb->get_var("SELECT cat_ID from $wpdb->categories WHERE cat_name = '$post_category'");
+			}
+			if ('' == trim($post_category)) $cat_id = 1;
+			// Double check it's not there already
+			$exists = $wpdb->get_row("SELECT * FROM $wpdb->post2cat WHERE post_id = $post_id AND category_id = $cat_id");
+
+			 if (!$exists) { 
+				$wpdb->query("
+				INSERT INTO $wpdb->post2cat
+				(post_id, category_id)
+				VALUES
+				($post_id, $cat_id)
+				");
+			}
+		} // end category loop
+		} else {
+			$exists = $wpdb->get_row("SELECT * FROM $wpdb->post2cat WHERE post_id = $post_id AND category_id = 1");
+			if (!$exists) $wpdb->query("INSERT INTO $wpdb->post2cat (post_id, category_id) VALUES ($post_id, 1) ");
+		}
+		echo " Post imported successfully...";
+		// Now for comments
+		$comments = explode("-----\nCOMMENT:", $comments[0]);
+		foreach ($comments as $comment) {
+		if ('' != trim($comment)) {
+			// Author
+			preg_match("|AUTHOR:(.*)|", $comment, $comment_author);
+			$comment_author = addslashes(trim($comment_author[1]));
+			$comment = preg_replace('|(\n?AUTHOR:.*)|', '', $comment);
+
+			preg_match("|EMAIL:(.*)|", $comment, $comment_email);
+			$comment_email = addslashes(trim($comment_email[1]));
+			$comment = preg_replace('|(\n?EMAIL:.*)|', '', $comment);
+
+			preg_match("|IP:(.*)|", $comment, $comment_ip);
+			$comment_ip = trim($comment_ip[1]);
+			$comment = preg_replace('|(\n?IP:.*)|', '', $comment);
+
+			preg_match("|URL:(.*)|", $comment, $comment_url);
+			$comment_url = addslashes(trim($comment_url[1]));
+			$comment = preg_replace('|(\n?URL:.*)|', '', $comment);
+
+			preg_match("|DATE:(.*)|", $comment, $comment_date);
+			$comment_date = trim($comment_date[1]);
+			$comment_date = date('Y-m-d H:i:s', strtotime($comment_date));
+			$comment = preg_replace('|(\n?DATE:.*)|', '', $comment);
+
+			$comment_content = addslashes(trim($comment));
+			$comment_content = str_replace('-----', '', $comment_content);
+
+			// Check if it's already there
+			if (!$wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_date = '$comment_date' AND comment_content = '$comment_content'")) {
+				$wpdb->query("INSERT INTO $wpdb->comments (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_author_IP, comment_date, comment_content, comment_approved)
+				VALUES
+				($post_id, '$comment_author', '$comment_email', '$comment_url', '$comment_ip', '$comment_date', '$comment_content', '1')");
+				echo " Comment added.";
+			}
+		}
+		}
+
+		// Finally the pings
+		// fix the double newline on the first one
+		$pings[0] = str_replace("-----\n\n", "-----\n", $pings[0]);
+		$pings = explode("-----\nPING:", $pings[0]);
+		foreach ($pings as $ping) {
+		if ('' != trim($ping)) {
+			// 'Author'
+			preg_match("|BLOG NAME:(.*)|", $ping, $comment_author);
+			$comment_author = addslashes(trim($comment_author[1]));
+			$ping = preg_replace('|(\n?BLOG NAME:.*)|', '', $ping);
+
+			$comment_email = '';
+
+			preg_match("|IP:(.*)|", $ping, $comment_ip);
+			$comment_ip = trim($comment_ip[1]);
+			$ping = preg_replace('|(\n?IP:.*)|', '', $ping);
+
+			preg_match("|URL:(.*)|", $ping, $comment_url);
+			$comment_url = addslashes(trim($comment_url[1]));
+			$ping = preg_replace('|(\n?URL:.*)|', '', $ping);
+
+			preg_match("|DATE:(.*)|", $ping, $comment_date);
+			$comment_date = trim($comment_date[1]);
+			$comment_date = date('Y-m-d H:i:s', strtotime($comment_date));
+			$ping = preg_replace('|(\n?DATE:.*)|', '', $ping);
+      
+ 			preg_match("|TITLE:(.*)|", $ping, $ping_title);
+			$ping_title = addslashes(trim($ping_title[1]));
+			$ping = preg_replace('|(\n?TITLE:.*)|', '', $ping);
+
+			$comment_content = addslashes(trim($ping));
+			$comment_content = str_replace('-----', '', $comment_content);
+			
+			$comment_content = "<strong>$ping_title</strong>\n\n$comment_content";
+      
+			// Check if it's already there
+			if (!$wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_date = '$comment_date' AND comment_content = '$comment_content'")) {
+				$wpdb->query("INSERT INTO $wpdb->comments (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_author_IP, comment_date, comment_content, comment_approved, comment_type)
+				VALUES
+				($post_id, '$comment_author', '$comment_email', '$comment_url', '$comment_ip', '$comment_date', '$comment_content', '1', 'trackback')");
+				echo " Comment added.";
+			}
+
+		}
+		}
+	}
+	echo "</li>";
+	flush();
+
+} }
+upgrade_all();
+?>
+</ol>
+<h3>All done. <a href="../">Have fun!</a></h3>
+<?php
+	break;
+}
+?> 
+</body>
+</html>
--- a/wp-admin/import-rss.php
+++ b/wp-admin/import-rss.php
@@ -0,0 +1,191 @@
+<?php
+define('RSSFILE', '');
+// Example:
+// define('RSSFILE', '/home/example/public_html/rss.xml');
+// or if it's in the same directory as import-rss.php
+// define('RSSFILE', 'rss.xml');
+
+$post_author = 1; // Author to import posts as author ID
+$timezone_offset = 0; // GMT offset of posts your importing
+
+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);
+}
+
+$add_hours = intval($timezone_offset);
+$add_minutes = intval(60 * ($timezone_offset - $add_hours));
+
+if (!file_exists('../wp-config.php')) die("There doesn't seem to be a wp-config.php file. You must install WordPress before you import any entries.");
+require('../wp-config.php');
+
+$step = $_GET['step'];
+if (!$step) $step = 0;
+header( 'Content-Type: text/html; charset=utf-8' );
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<title>WordPress &rsaquo; Import from RSS</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<style media="screen" type="text/css">
+	body {
+		font-family: Georgia, "Times New Roman", Times, serif;
+		margin-left: 20%;
+		margin-right: 20%;
+	}
+	#logo {
+		margin: 0;
+		padding: 0;
+		background-image: url(http://wordpress.org/images/logo.png);
+		background-repeat: no-repeat;
+		height: 60px;
+		border-bottom: 4px solid #333;
+	}
+	#logo a {
+		display: block;
+		text-decoration: none;
+		text-indent: -100em;
+		height: 60px;
+	}
+	p {
+		line-height: 140%;
+	}
+	</style>
+</head><body> 
+<h1 id="logo"><a href="http://wordpress.org/">WordPress</a></h1> 
+<?php
+switch($step) {
+
+	case 0:
+?> 
+<p>Howdy! This importer allows you to extract posts from any RSS 2.0 file into your blog. This is useful if you want to import your posts from a system that is not handled by a custom import tool. To get started you must edit the following line in this file (<code>import-rss.php</code>) </p>
+<p><code>define('RSSFILE', '');</code></p>
+<p>You want to define where the RSS file we'll be working with is, for example: </p>
+<p><code>define('RSSFILE', 'rss.xml');</code></p>
+<p>You have to do this manually for security reasons. When you're done reload this page and we'll take you to the next step.</p>
+<?php if ('' != RSSFILE) : ?>
+<h2 style="text-align: right;"><a href="import-rss.php?step=1">Begin RSS Import &raquo;</a></h2>
+<?php endif; ?>
+<?php
+	break;
+
+	case 1:
+
+// Bring in the data
+set_magic_quotes_runtime(0);
+$datalines = file(RSSFILE); // Read the file into an array
+$importdata = implode('', $datalines); // squish it
+$importdata = str_replace(array("\r\n", "\r"), "\n", $importdata);
+
+preg_match_all('|<item>(.*?)</item>|is', $importdata, $posts);
+$posts = $posts[1];
+
+echo '<ol>';
+foreach ($posts as $post) :
+$title = $date = $categories = $content = $post_id =  '';
+echo "<li>Importing post... ";
+
+preg_match('|<title>(.*?)</title>|is', $post, $title);
+$title = addslashes( trim($title[1]) );
+$post_name = sanitize_title($title);
+
+preg_match('|<pubdate>(.*?)</pubdate>|is', $post, $date);
+
+if ($date) :
+	$date = strtotime($date[1]);
+else : // if we don't already have something from pubDate
+	preg_match('|<dc:date>(.*?)</dc:date>|is', $post, $date);
+	$date = preg_replace('|([-+])([0-9]+):([0-9]+)$|', '\1\2\3', $date[1]);
+	$date = str_replace('T', ' ', $date);
+	$date = strtotime($date);
+endif;
+
+$post_date = gmdate('Y-m-d H:i:s', $date);
+
+preg_match_all('|<category>(.*?)</category>|is', $post, $categories);
+$categories = $categories[1];
+
+if (!$categories) :
+	preg_match_all('|<dc:subject>(.*?)</dc:subject>|is', $post, $categories);
+	$categories = $categories[1];
+endif;
+
+preg_match('|<guid.+?>(.*?)</guid>|is', $post, $guid);
+if ($guid) $guid = addslashes( trim($guid[1]) );
+else $guid = '';
+
+preg_match('|<content:encoded>(.*?)</content:encoded>|is', $post, $content);
+$content = str_replace( array('<![CDATA[', ']]>'), '', addslashes( trim($content[1]) ) );
+
+if (!$content) : // This is for feeds that put content in description
+	preg_match('|<description>(.*?)</description>|is', $post, $content);
+	$content = $wpdb->escape( unhtmlentities( trim($content[1]) ) );
+endif;
+
+// Clean up content
+$content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $content);
+$content = str_replace('<br>', '<br />', $content);
+$content = str_replace('<hr>', '<hr />', $content);
+
+// This can mess up on posts with no titles, but checking content is much slower
+// So we do it as a last resort
+if ('' == $title) : 
+	$dupe = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_content = '$content' AND post_date = '$post_date'");
+else :
+	$dupe = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$title' AND post_date = '$post_date'");
+endif;
+
+// Now lets put it in the DB
+if ($dupe) :
+	echo 'Post already imported';
+else : 
+	
+	$wpdb->query("INSERT INTO $wpdb->posts 
+		(post_author, post_date, post_date_gmt, post_content, post_title,post_status, comment_status, ping_status, post_name, guid)
+		VALUES 
+		('$post_author', '$post_date', DATE_ADD('$post_date', INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE), '$content', '$title', 'publish', '$comment_status', '$ping_status', '$post_name', '$guid')");
+	$post_id = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$title' AND post_date = '$post_date'");
+	if (!$post_id) die("couldn't get post ID");
+	if (0 != count($categories)) :
+		foreach ($categories as $post_category) :
+		$post_category = unhtmlentities($post_category);
+		// See if the category exists yet
+		$cat_id = $wpdb->get_var("SELECT cat_ID from $wpdb->categories WHERE cat_name = '$post_category'");
+		if (!$cat_id && '' != trim($post_category)) {
+			$cat_nicename = sanitize_title($post_category);
+			$wpdb->query("INSERT INTO $wpdb->categories (cat_name, category_nicename) VALUES ('$post_category', '$cat_nicename')");
+			$cat_id = $wpdb->get_var("SELECT cat_ID from $wpdb->categories WHERE cat_name = '$post_category'");
+		}
+		if ('' == trim($post_category)) $cat_id = 1;
+		// Double check it's not there already
+		$exists = $wpdb->get_row("SELECT * FROM $wpdb->post2cat WHERE post_id = $post_id AND category_id = $cat_id");
+	
+		 if (!$exists) { 
+			$wpdb->query("
+			INSERT INTO $wpdb->post2cat
+			(post_id, category_id)
+			VALUES
+			($post_id, $cat_id)
+			");
+			}
+	endforeach;
+	else:
+		$exists = $wpdb->get_row("SELECT * FROM $wpdb->post2cat WHERE post_id = $post_id AND category_id = 1");
+		if (!$exists) $wpdb->query("INSERT INTO $wpdb->post2cat (post_id, category_id) VALUES ($post_id, 1) ");
+	endif;
+	echo 'Done!</li>';
+endif;
+
+
+endforeach;
+?>
+</ol>
+
+<h3>All done. <a href="../">Have fun!</a></h3>
+<?php
+	break;
+}
+?> 
+</body>
+</html>
--- a/wp-admin/import-textpattern.php
+++ b/wp-admin/import-textpattern.php
@@ -0,0 +1,138 @@
+<?php
+
+// For security reasons, fill in the connection details to your Textpattern database below:
+
+$tp_database_name = 'textpattern';
+$tp_database_username = 'username';
+$tp_database_password = 'password';
+$tp_database_host = 'localhost';
+
+if (!file_exists('../wp-config.php')) die("There doesn't seem to be a wp-config.php file. Double check that you updated wp-config-sample.php with the proper database connection information and renamed it to wp-config.php.");
+require('../wp-config.php');
+require('upgrade-functions.php');
+
+$step = $_GET['step'];
+if (!$step) $step = 0;
+header( 'Content-Type: text/html; charset=utf-8' );
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<title>WordPress &rsaquo; Textpattern Import</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<style media="screen" type="text/css">
+	body {
+		font-family: Georgia, "Times New Roman", Times, serif;
+		margin-left: 15%;
+		margin-right: 15%;
+	}
+	#logo {
+		margin: 0;
+		padding: 0;
+		background-image: url(http://wordpress.org/images/wordpress.gif);
+		background-repeat: no-repeat;
+		height: 60px;
+		border-bottom: 4px solid #333;
+	}
+	#logo a {
+		display: block;
+		text-decoration: none;
+		text-indent: -100em;
+		height: 60px;
+	}
+	p {
+		line-height: 140%;
+	}
+	</style>
+</head><body> 
+<h1 id="logo"><a href="http://wordpress.org">WordPress</a></h1> 
+<?php
+switch($step) {
+
+	case 0:
+?> 
+<p>This script imports your entries from Textpattern into WordPress. It should be relatively painless, and we hope you're happy with the result.</p>
+<p>To run this, you first need to edit this file (<code>import-textpattern.php</code>) and enter your Textpattern database connection details. Let's check if the database connection information works...</p>
+<?php
+$connection = @mysql_connect($tp_database_host, $tp_database_username, $tp_database_password);
+$database = @mysql_select_db($tp_database_name);
+if ($connection && $database) {
+?>
+<p>Everything seems dandy so far, <a href="?step=1">let's get started</a>!</p>
+<?php
+} else {
+?>
+<p><em>It looks like your database information is incorrect. Please re-edit this file and double-check all the settings.</em></p>
+<?php
+}
+	break;
+	
+	case 1:
+?> 
+<h1>Step 1</h1> 
+<p>First let's get posts and comments.</p> 
+<?php
+// For people running this on .72
+$query = "ALTER TABLE `$wpdb->posts` ADD `post_name` VARCHAR(200) NOT NULL";
+maybe_add_column($wpdb->posts, 'post_name', $query);
+
+// Create post_name field
+$connection = @mysql_connect($tp_database_host, $tp_database_username, $tp_database_password);
+$database = @mysql_select_db($tp_database_name);
+
+// For now we're going to give everything the same author and same category
+$author = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_level = 10 LIMIT 1");
+$category = $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories LIMIT 1");
+
+$posts = mysql_query('SELECT * FROM textpattern', $connection);
+
+while ($post = mysql_fetch_array($posts)) {
+	//  ID, AuthorID, LastMod, LastModID, Posted, Title, Body, Body_html, Abstract, Category1, Category2, Annotate, AnnotateInvite, Status, Listing1, Listing2, Section
+	$posted = $post['Posted'];
+	// 20030216162119
+	$year = substr($posted,0,4);
+	$month = substr($posted,4,2);
+	$day = substr($posted,6,2);
+	$hour = substr($posted,8,2);
+	$minute = substr($posted,10,2);
+	$second = substr($posted,12,2);
+	$timestamp = mktime($hour, $minute, $second, $month, $day, $year);
+	$posted = date('Y-m-d H:i:s', $timestamp);
+	
+	$content = addslashes($post['Body_html']);
+	$title = addslashes($post['Title']);
+	$post_name = sanitize_title($title);
+
+	$wpdb->query("INSERT INTO $wpdb->posts
+		(post_author, post_date, post_content, post_title, post_category, post_name, post_status)
+		VALUES
+		('$author', '$posted', '$content', '$title', '$category', '$post_name', 'publish')");
+
+	// Get wordpress post id
+	$wp_post_ID = $wpdb->get_var("SELECT ID FROM $wpdb->posts ORDER BY ID DESC LIMIT 1");
+	
+	// Now let's insert comments if there are any for the TP post
+	$tp_id = $post['ID'];
+	$comments = mysql_query("SELECT * FROM txp_Discuss WHERE parentid = $tp_id");
+	if ($comments) {
+		while($comment = mysql_fetch_object($comments)) {
+			//  discussid, parentid, name, email, web, ip, posted, message
+			// For some reason here "posted" is a real MySQL date, so we don't have to do anything about it
+			//  comment_post_ID  	 comment_author  	 comment_author_email  	 comment_author_url  	 comment_author_IP  	 comment_date  	 comment_content  	 comment_karma
+			$wpdb->query("INSERT INTO $wpdb->comments
+				(comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_author_IP, comment_date, comment_content)
+				VALUES
+				($wp_post_ID, '$comment->name', '$comment->email', '$comment->web', '$comment->ip', '$comment->posted', '$comment->message')");
+		}
+	}
+}
+
+upgrade_all();
+?>
+<p><strong>All done.</strong> Wasn&#8217;t that fun? <a href="../">Have fun</a>.</p> 
+<?php
+break;
+}
+?> 
+
+</body>
+</html>
--- a/wp-admin/import.php
+++ b/wp-admin/import.php
@@ -1,64 +0,0 @@
-<?php
-require_once ('admin.php');
-$title = __('Import');
-$parent_file = 'edit.php';
-require_once ('admin-header.php');
-?>
-
-<div class="wrap">
-<h2><?php _e('Import'); ?></h2>
-<p><?php _e('If you have posts or comments in another system, WordPress can import those into this blog. To get started, choose a system to import from below:'); ?></p>
-
-<?php
-
-// Load all importers so that they can register.
-$import_loc = 'wp-admin/import';
-$import_root = ABSPATH.$import_loc;
-$imports_dir = @ opendir($import_root);
-if ($imports_dir) {
-	while (($file = readdir($imports_dir)) !== false) {
-		if ($file{0} == '.') {
-			continue;
-		} elseif (substr($file, -4) == '.php') {
-			require_once($import_root . '/' . $file);
-		}
-	}
-}
-@closedir($imports_dir);
-
-$importers = get_importers();
-
-if (empty ($importers)) {
-	echo '<p>'.__('No importers are available.').'</p>'; // TODO: make more helpful
-} else {
-?>
-<table class="widefat">
-
-<?php
-	$style = '';
-	foreach ($importers as $id => $data) {
-		$style = ('class="alternate"' == $style || 'class="alternate active"' == $style) ? '' : 'alternate';
-		$action = "<a href='admin.php?import=$id' title='".wptexturize(strip_tags($data[1]))."'>{$data[0]}</a>";
-
-		if ($style != '')
-			$style = 'class="'.$style.'"';
-		echo "
-			<tr $style>
-				<td class='import-system'>$action</td>
-				<td class='desc'>{$data[1]}</td>
-			</tr>";
-	}
-?>
-
-</table>
-<?php
-}
-?>
-
-</div>
-
-<?php
-
-include ('admin-footer.php');
-?>
-
--- a/wp-admin/import/blogger.php
+++ b/wp-admin/import/blogger.php
--- a/wp-admin/import/blogware.php
+++ b/wp-admin/import/blogware.php
@@ -1,201 +0,0 @@
-<?php
-
-/* By Shayne Sweeney - http://www.theshayne.com/ */
-
-class BW_Import {
-
-	var $file;
-
-	function header() {
-		echo '<div class="wrap">';
-		echo '<h2>'.__('Import Blogware').'</h2>';
-	}
-
-	function footer() {
-		echo '</div>';
-	}
-
-	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 '<div class="narrow">';
-		echo '<p>'.__('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.').'</p>';
-		wp_import_upload_form("admin.php?import=blogware&amp;step=1");
-		echo '</div>';
-	}
-
-	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('|(<item[^>]+>(.*?)</item>)|is', $importdata, $posts);
-		$posts = $posts[1];
-		unset($importdata);
-		echo '<ol>';
-		foreach ($posts as $post) {
-			flush();
-			preg_match('|<item type=\"(.*?)\">|is', $post, $post_type);
-			$post_type = $post_type[1];
-			if($post_type == "photo") {
-				preg_match('|<photoFilename>(.*?)</photoFilename>|is', $post, $post_title);
-			} else {
-				preg_match('|<title>(.*?)</title>|is', $post, $post_title);
-			}
-			$post_title = $wpdb->escape(trim($post_title[1]));
-
-			preg_match('|<pubDate>(.*?)</pubDate>|is', $post, $post_date);
-			$post_date = strtotime($post_date[1]);
-			$post_date = gmdate('Y-m-d H:i:s', $post_date);
-
-			preg_match_all('|<category>(.*?)</category>|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('|<sizedPhotoUrl>(.*?)</sizedPhotoUrl>|is', $post, $post_content);
-				$post_content = '<img src="'.trim($post_content[1]).'" />';
-				$post_content = $this->unhtmlentities($post_content);
-			} else {
-				preg_match('|<body>(.*?)</body>|is', $post, $post_content);
-				$post_content = str_replace(array ('<![CDATA[', ']]>'), '', 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('<br>', '<br />', $post_content);
-			$post_content = str_replace('<hr>', '<hr />', $post_content);
-			$post_content = $wpdb->escape($post_content);
-
-			$post_author = $current_user->ID;
-			preg_match('|<postStatus>(.*?)</postStatus>|is', $post, $post_status);
-			$post_status = trim($post_status[1]);
-
-			echo '<li>';
-			if ($post_id = post_exists($post_title, $post_content, $post_date)) {
-				printf(__('Post <i>%s</i> already exists.'), stripslashes($post_title));
-			} else {
-				printf(__('Importing post <i>%s</i>...'), 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 '</li>';
-					break;
-				}
-				if(0 != count($categories))
-					wp_create_categories($categories, $post_id);
-			}
-
-			preg_match_all('|<comment>(.*?)</comment>|is', $post, $comments);
-			$comments = $comments[1];
-
-			if ( $comments ) {
-				$comment_post_ID = (int) $post_id;
-				$num_comments = 0;
-				foreach ($comments as $comment) {
-					preg_match('|<body>(.*?)</body>|is', $comment, $comment_content);
-					$comment_content = str_replace(array ('<![CDATA[', ']]>'), '', 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('<br>', '<br />', $comment_content);
-					$comment_content = str_replace('<hr>', '<hr />', $comment_content);
-					$comment_content = $wpdb->escape($comment_content);
-
-					preg_match('|<pubDate>(.*?)</pubDate>|is', $comment, $comment_date);
-					$comment_date = trim($comment_date[1]);
-					$comment_date = date('Y-m-d H:i:s', strtotime($comment_date));
-
-					preg_match('|<author>(.*?)</author>|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(__('(%s comments)'), $num_comments);
-			}
-			echo '</li>';
-			flush();
-			ob_flush();
-		}
-		echo '</ol>';
-	}
-
-	function import() {
-		$file = wp_import_handle_upload();
-		if ( isset($file['error']) ) {
-			echo $file['error'];
-			return;
-		}
-
-		$this->file = $file['file'];
-		$result = $this->import_posts();
-		if ( is_wp_error( $result ) )
-			return $result;
-		wp_import_cleanup($file['id']);
-
-		echo '<h3>';
-		printf(__('All done. <a href="%s">Have fun!</a>'), get_option('home'));
-		echo '</h3>';
-	}
-
-	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'));
-?>
--- a/wp-admin/import/btt.php
+++ b/wp-admin/import/btt.php
@@ -1,115 +0,0 @@
-<?php
-
-class BunnyTags_Import {
-
-	function header() {
-		echo '<div class="wrap">';
-		echo '<h2>'.__('Import Bunny&#8217;s Technorati Tags').'</h2>';
-		echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'<br /><br /></p>';
-	}
-
-	function footer() {
-		echo '</div>';
-	}
-
-	function greet() {
-		echo '<div class="narrow">';
-		echo '<p>'.__('Howdy! This imports tags from an existing Bunny&#8217;s Technorati Tags installation into this blog using the new WordPress native tagging structure.').'</p>';
-		echo '<p>'.__('This is suitable for Bunny&#8217;s Technorati Tags version 0.6.').'</p>';
-		echo '<p><strong>'.__('All existing Bunny&#8217;s Technorati Tags will be removed after import.').'</strong></p>';
-		echo '<p><strong>'.__('Don&#8217;t be stupid - backup your database before proceeding!').'</strong></p>';
-		echo '<form action="admin.php?import=btt&amp;step=1" method="post">';
-		wp_nonce_field('import-btt');
-		echo '<p class="submit"><input type="submit" name="submit" value="'.__('Import Tags &raquo;').'" /></p>';
-		echo '</form>';
-		echo '</div>';
-	}
-
-	function dispatch() {
-		if ( empty($_GET['step']) )
-			$step = 0;
-		else
-			$step = abs(intval($_GET['step']));
-
-		// load the header
-		$this->header();
-
-		switch ( $step ) {
-			case 0 :
-				$this->greet();
-				break;
-			case 1 :
-				check_admin_referer('import-btt');
-				$this->check_post_keyword( true );
-				break;
-			case 2 :
-				check_admin_referer('import-btt');
-				$this->check_post_keyword( false );
-				break;
-			case 3:
-				$this->done();
-				break;
-		}
-
-		// load the footer
-		$this->footer();
-	}
-
-	function check_post_keyword($precheck = true) {
-		global $wpdb;
-
-		echo '<div class="narrow">';
-		echo '<p><h3>'.__('Reading Bunny&#8217;s Technorati Tags&#8230;').'</h3></p>';
-
-		// import Bunny's Keywords tags 
-		$metakeys = $wpdb->get_results("SELECT post_id, meta_id, meta_key, meta_value FROM $wpdb->postmeta WHERE $wpdb->postmeta.meta_key = 'tags'");
-		if ( !is_array($metakeys)) {
-			echo '<p>' . __('No Tags Found!') . '</p>';
-			return false;
-		} else {
-			$count = count($metakeys);
-			echo '<p>' . sprintf( __('Done! <strong>%s</strong> posts with tags were read.'), $count ) . '<br /></p>';
-			echo '<ul>';
-			foreach ( $metakeys as $post_meta ) {
-				if ( $post_meta->meta_value != '' ) {
-					$post_keys = explode(' ', $post_meta->meta_value);
-					foreach ( $post_keys as $keyword ) {
-						$keyword = addslashes(trim(str_replace('+',' ',$keyword)));
-						if ( '' != $keyword ) {
-							echo '<li>' . $post_meta->post_id . '&nbsp;-&nbsp;' . $keyword . '</li>';
-							if ( !$precheck )
-								wp_add_post_tags($post_meta->post_id, $keyword);
-						}
-					}
-				}
-				if ( !$precheck )
-					delete_post_meta($post_meta->post_id, 'tags');
-			}
-			echo '</ul>';
-		}
-
-		echo '<form action="admin.php?import=btt&amp;step='.($precheck? 2:3).'" method="post">';
-		wp_nonce_field('import-btt');
-		echo '<p class="submit"><input type="submit" name="submit" value="'.__('Next &raquo;').'" /></p>';
-		echo '</form>';
-		echo '</div>';
-	}
-
-	function done() {
-		echo '<div class="narrow">';
-		echo '<p><h3>'.__('Import Complete!').'</h3></p>';
-		echo '</div>';
-	}
-
-	function BunnyTags_Import() {
-	}
-
-}
-
-// create the import object
-$btt_import = new BunnyTags_Import();
-
-// add it to the import page!
-register_importer('btt', 'Bunny&#8217;s Technorati Tags', __('Import Bunny&#8217;s Technorati Tags into the new native tagging structure.'), array($btt_import, 'dispatch'));
-
-?>
--- a/wp-admin/import/dotclear.php
+++ b/wp-admin/import/dotclear.php
@@ -1,745 +0,0 @@
-<?php
-/*
- * DotClear import plugin
- * by Thomas Quinot - http://thomas.quinot.org/
- */
-
-/**
-	Add These Functions to make our lives easier
-**/
-
-if(!function_exists('get_comment_count'))
-{
-	function get_comment_count($post_ID)
-	{
-		global $wpdb;
-		return $wpdb->get_var('SELECT count(*) FROM '.$wpdb->comments.' WHERE comment_post_ID = '.$post_ID);
-	}
-}
-
-if(!function_exists('link_exists'))
-{
-	function link_exists($linkname)
-	{
-		global $wpdb;
-		return $wpdb->get_var('SELECT link_id FROM '.$wpdb->links.' WHERE link_name = "'.$linkname.'"');
-	}
-}
-
-/*
- Identify UTF-8 text
- Taken from http://www.php.net/manual/fr/function.mb-detect-encoding.php#50087
-*/
-//
-//    utf8 encoding validation developed based on Wikipedia entry at:
-//    http://en.wikipedia.org/wiki/UTF-8
-//
-//    Implemented as a recursive descent parser based on a simple state machine
-//    copyright 2005 Maarten Meijer
-//
-//    This cries out for a C-implementation to be included in PHP core
-//
-
-function valid_1byte($char) {
-	if(!is_int($char)) return false;
-		return ($char & 0x80) == 0x00;
-}
-
-function valid_2byte($char) {
-	if(!is_int($char)) return false;
-		return ($char & 0xE0) == 0xC0;
-}
-
-function valid_3byte($char) {
-	if(!is_int($char)) return false;
-		return ($char & 0xF0) == 0xE0;
-}
-
-function valid_4byte($char) {
-	if(!is_int($char)) return false;
-		return ($char & 0xF8) == 0xF0;
-}
-
-function valid_nextbyte($char) {
-	if(!is_int($char)) return false;
-		return ($char & 0xC0) == 0x80;
-}
-
-function valid_utf8($string) {
-	$len = strlen($string);
-	$i = 0;
-	while( $i < $len ) {
-		$char = ord(substr($string, $i++, 1));
-		if(valid_1byte($char)) {    // continue
-			continue;
-		} else if(valid_2byte($char)) { // check 1 byte
-			if(!valid_nextbyte(ord(substr($string, $i++, 1))))
-				return false;
-		} else if(valid_3byte($char)) { // check 2 bytes
-			if(!valid_nextbyte(ord(substr($string, $i++, 1))))
-				return false;
-			if(!valid_nextbyte(ord(substr($string, $i++, 1))))
-				return false;
-		} else if(valid_4byte($char)) { // check 3 bytes
-			if(!valid_nextbyte(ord(substr($string, $i++, 1))))
-				return false;
-			if(!valid_nextbyte(ord(substr($string, $i++, 1))))
-				return false;
-			if(!valid_nextbyte(ord(substr($string, $i++, 1))))
-				return false;
-		} // goto next char
-	}
-	return true; // done
-}
-
-function csc ($s) {
-	if (valid_utf8 ($s)) {
-		return $s;
-	} else {
-		return iconv(get_option ("dccharset"),"UTF-8",$s);
-	}
-}
-
-function textconv ($s) {
-	return csc (preg_replace ('|(?<!<br />)\s*\n|', ' ', $s));
-}
-
-/**
-	The Main Importer Class
-**/
-class Dotclear_Import {
-
-	function header()
-	{
-		echo '<div class="wrap">';
-		echo '<h2>'.__('Import DotClear').'</h2>';
-		echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'</p>';
-	}
-
-	function footer()
-	{
-		echo '</div>';
-	}
-
-	function greet()
-	{
-		echo '<div class="narrow"><p>'.__('Howdy! This importer allows you to extract posts from a DotClear database into your blog.  Mileage may vary.').'</p>';
-		echo '<p>'.__('Your DotClear Configuration settings are as follows:').'</p>';
-		echo '<form action="admin.php?import=dotclear&amp;step=1" method="post">';
-		wp_nonce_field('import-dotclear');
-		$this->db_form();
-		echo '<p class="submit"><input type="submit" name="submit" value="'.attribute_escape(__('Import Categories &raquo;')).'" /></p>';
-		echo '</form></div>';
-	}
-
-	function get_dc_cats()
-	{
-		global $wpdb;
-		// General Housekeeping
-		$dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost'));
-		set_magic_quotes_runtime(0);
-		$dbprefix = get_option('dcdbprefix');
-
-		// Get Categories
-		return $dcdb->get_results('SELECT * FROM '.$dbprefix.'categorie', ARRAY_A);
-	}
-
-	function get_dc_users()
-	{
-		global $wpdb;
-		// General Housekeeping
-		$dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost'));
-		set_magic_quotes_runtime(0);
-		$dbprefix = get_option('dcdbprefix');
-
-		// Get Users
-
-		return $dcdb->get_results('SELECT * FROM '.$dbprefix.'user', ARRAY_A);
-	}
-
-	function get_dc_posts()
-	{
-		// General Housekeeping
-		$dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost'));
-		set_magic_quotes_runtime(0);
-		$dbprefix = get_option('dcdbprefix');
-
-		// Get Posts
-		return $dcdb->get_results('SELECT '.$dbprefix.'post.*, '.$dbprefix.'categorie.cat_libelle_url AS post_cat_name
-						FROM '.$dbprefix.'post INNER JOIN '.$dbprefix.'categorie
-						ON '.$dbprefix.'post.cat_id = '.$dbprefix.'categorie.cat_id', ARRAY_A);
-	}
-
-	function get_dc_comments()
-	{
-		global $wpdb;
-		// General Housekeeping
-		$dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost'));
-		set_magic_quotes_runtime(0);
-		$dbprefix = get_option('dcdbprefix');
-
-		// Get Comments
-		return $dcdb->get_results('SELECT * FROM '.$dbprefix.'comment', ARRAY_A);
-	}
-
-	function get_dc_links()
-	{
-		//General Housekeeping
-		$dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost'));
-		set_magic_quotes_runtime(0);
-		$dbprefix = get_option('dcdbprefix');
-
-		return $dcdb->get_results('SELECT * FROM '.$dbprefix.'link ORDER BY position', ARRAY_A);
-	}
-
-	function cat2wp($categories='')
-	{
-		// General Housekeeping
-		global $wpdb;
-		$count = 0;
-		$dccat2wpcat = array();
-		// Do the Magic
-		if(is_array($categories))
-		{
-			echo '<p>'.__('Importing Categories...').'<br /><br /></p>';
-			foreach ($categories as $category)
-			{
-				$count++;
-				extract($category);
-
-				// Make Nice Variables
-				$name = $wpdb->escape($cat_libelle_url);
-				$title = $wpdb->escape(csc ($cat_libelle));
-				$desc = $wpdb->escape(csc ($cat_desc));
-
-				if($cinfo = category_exists($name))
-				{
-					$ret_id = wp_insert_category(array('cat_ID' => $cinfo, 'category_nicename' => $name, 'cat_name' => $title, 'category_description' => $desc));
-				}
-				else
-				{
-					$ret_id = wp_insert_category(array('category_nicename' => $name, 'cat_name' => $title, 'category_description' => $desc));
-				}
-				$dccat2wpcat[$id] = $ret_id;
-			}
-
-			// Store category translation for future use
-			add_option('dccat2wpcat',$dccat2wpcat);
-			echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> categories imported.'), $count).'<br /><br /></p>';
-			return true;
-		}
-		echo __('No Categories to Import!');
-		return false;
-	}
-
-	function users2wp($users='')
-	{
-		// General Housekeeping
-		global $wpdb;
-		$count = 0;
-		$dcid2wpid = array();
-
-		// Midnight Mojo
-		if(is_array($users))
-		{
-			echo '<p>'.__('Importing Users...').'<br /><br /></p>';
-			foreach($users as $user)
-			{
-				$count++;
-				extract($user);
-
-				// Make Nice Variables
-				$name = $wpdb->escape(csc ($name));
-				$RealName = $wpdb->escape(csc ($user_pseudo));
-
-				if($uinfo = get_userdatabylogin($name))
-				{
-
-					$ret_id = wp_insert_user(array(
-								'ID'		=> $uinfo->ID,
-								'user_login'	=> $user_id,
-								'user_nicename'	=> $Realname,
-								'user_email'	=> $user_email,
-								'user_url'	=> 'http://',
-								'display_name'	=> $Realname)
-								);
-				}
-				else
-				{
-					$ret_id = wp_insert_user(array(
-								'user_login'	=> $user_id,
-								'user_nicename'	=> csc ($user_pseudo),
-								'user_email'	=> $user_email,
-								'user_url'	=> 'http://',
-								'display_name'	=> $Realname)
-								);
-				}
-				$dcid2wpid[$user_id] = $ret_id;
-
-				// Set DotClear-to-WordPress permissions translation
-
-				// Update Usermeta Data
-				$user = new WP_User($ret_id);
-				$wp_perms = $user_level + 1;
-				if(10 == $wp_perms) { $user->set_role('administrator'); }
-				else if(9  == $wp_perms) { $user->set_role('editor'); }
-				else if(5  <= $wp_perms) { $user->set_role('editor'); }
-				else if(4  <= $wp_perms) { $user->set_role('author'); }
-				else if(3  <= $wp_perms) { $user->set_role('contributor'); }
-				else if(2  <= $wp_perms) { $user->set_role('contributor'); }
-				else                     { $user->set_role('subscriber'); }
-
-				update_usermeta( $ret_id, 'wp_user_level', $wp_perms);
-				update_usermeta( $ret_id, 'rich_editing', 'false');
-				update_usermeta( $ret_id, 'first_name', csc ($user_prenom));
-				update_usermeta( $ret_id, 'last_name', csc ($user_nom));
-			}// End foreach($users as $user)
-
-			// Store id translation array for future use
-			add_option('dcid2wpid',$dcid2wpid);
-
-
-			echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> users imported.'), $count).'<br /><br /></p>';
-			return true;
-		}// End if(is_array($users)
-
-		echo __('No Users to Import!');
-		return false;
-
-	}// End function user2wp()
-
-	function posts2wp($posts='')
-	{
-		// General Housekeeping
-		global $wpdb;
-		$count = 0;
-		$dcposts2wpposts = array();
-		$cats = array();
-
-		// Do the Magic
-		if(is_array($posts))
-		{
-			echo '<p>'.__('Importing Posts...').'<br /><br /></p>';
-			foreach($posts as $post)
-			{
-				$count++;
-				extract($post);
-
-				// Set DotClear-to-WordPress status translation
-				$stattrans = array(0 => 'draft', 1 => 'publish');
-				$comment_status_map = array (0 => 'closed', 1 => 'open');
-
-				//Can we do this more efficiently?
-				$uinfo = ( get_userdatabylogin( $user_id ) ) ? get_userdatabylogin( $user_id ) : 1;
-				$authorid = ( is_object( $uinfo ) ) ? $uinfo->ID : $uinfo ;
-
-				$Title = $wpdb->escape(csc ($post_titre));
-				$post_content = textconv ($post_content);
-				$post_excerpt = "";
-				if ($post_chapo != "") {
-					$post_excerpt = textconv ($post_chapo);
-					$post_content = $post_excerpt ."\n<!--more-->\n".$post_content;
-				}
-				$post_excerpt = $wpdb->escape ($post_excerpt);
-				$post_content = $wpdb->escape ($post_content);
-				$post_status = $stattrans[$post_pub];
-
-				// Import Post data into WordPress
-
-				if($pinfo = post_exists($Title,$post_content))
-				{
-					$ret_id = wp_insert_post(array(
-							'ID'			=> $pinfo,
-							'post_author'		=> $authorid,
-							'post_date'		=> $post_dt,
-							'post_date_gmt'		=> $post_dt,
-							'post_modified'		=> $post_upddt,
-							'post_modified_gmt'	=> $post_upddt,
-							'post_title'		=> $Title,
-							'post_content'		=> $post_content,
-							'post_excerpt'		=> $post_excerpt,
-							'post_status'		=> $post_status,
-							'post_name'		=> $post_titre_url,
-							'comment_status'	=> $comment_status_map[$post_open_comment],
-							'ping_status'		=> $comment_status_map[$post_open_tb],
-							'comment_count'		=> $post_nb_comment + $post_nb_trackback)
-							);
-					if ( is_wp_error( $ret_id ) )
-						return $ret_id;
-				}
-				else
-				{
-					$ret_id = wp_insert_post(array(
-							'post_author'		=> $authorid,
-							'post_date'		=> $post_dt,
-							'post_date_gmt'		=> $post_dt,
-							'post_modified'		=> $post_modified_gmt,
-							'post_modified_gmt'	=> $post_modified_gmt,
-							'post_title'		=> $Title,
-							'post_content'		=> $post_content,
-							'post_excerpt'		=> $post_excerpt,
-							'post_status'		=> $post_status,
-							'post_name'		=> $post_titre_url,
-							'comment_status'	=> $comment_status_map[$post_open_comment],
-							'ping_status'		=> $comment_status_map[$post_open_tb],
-							'comment_count'		=> $post_nb_comment + $post_nb_trackback)
-							);
-					if ( is_wp_error( $ret_id ) )
-						return $ret_id;
-				}
-				$dcposts2wpposts[$post_id] = $ret_id;
-
-				// Make Post-to-Category associations
-				$cats = array();
-				$category1 = get_category_by_slug($post_cat_name);
-				$category1 = $category1->term_id;
-
-				if($cat1 = $category1) { $cats[1] = $cat1; }
-
-				if(!empty($cats)) { wp_set_post_categories($ret_id, $cats); }
-			}
-		}
-		// Store ID translation for later use
-		add_option('dcposts2wpposts',$dcposts2wpposts);
-
-		echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> posts imported.'), $count).'<br /><br /></p>';
-		return true;
-	}
-
-	function comments2wp($comments='')
-	{
-		// General Housekeeping
-		global $wpdb;
-		$count = 0;
-		$dccm2wpcm = array();
-		$postarr = get_option('dcposts2wpposts');
-
-		// Magic Mojo
-		if(is_array($comments))
-		{
-			echo '<p>'.__('Importing Comments...').'<br /><br /></p>';
-			foreach($comments as $comment)
-			{
-				$count++;
-				extract($comment);
-
-				// WordPressify Data
-				$comment_ID = (int) ltrim($comment_id, '0');
-				$comment_post_ID = (int) $postarr[$post_id];
-				$comment_approved = "$comment_pub";
-				$name = $wpdb->escape(csc ($comment_auteur));
-				$email = $wpdb->escape($comment_email);
-				$web = "http://".$wpdb->escape($comment_site);
-				$message = $wpdb->escape(textconv ($comment_content));
-
-				if($cinfo = comment_exists($name, $comment_dt))
-				{
-					// Update comments
-					$ret_id = wp_update_comment(array(
-							'comment_ID'		=> $cinfo,
-							'comment_post_ID'	=> $comment_post_ID,
-							'comment_author'	=> $name,
-							'comment_author_email'	=> $email,
-							'comment_author_url'	=> $web,
-							'comment_author_IP'	=> $comment_ip,
-							'comment_date'		=> $comment_dt,
-							'comment_date_gmt'	=> $comment_dt,
-							'comment_content'	=> $message,
-							'comment_approved'	=> $comment_approved)
-							);
-				}
-				else
-				{
-					// Insert comments
-					$ret_id = wp_insert_comment(array(
-							'comment_post_ID'	=> $comment_post_ID,
-							'comment_author'	=> $name,
-							'comment_author_email'	=> $email,
-							'comment_author_url'	=> $web,
-							'comment_author_IP'	=> $comment_ip,
-							'comment_date'		=> $comment_dt,
-							'comment_date_gmt'	=> $comment_dt,
-							'comment_content'	=> $message,
-							'comment_approved'	=> $comment_approved)
-							);
-				}
-				$dccm2wpcm[$comment_ID] = $ret_id;
-			}
-			// Store Comment ID translation for future use
-			add_option('dccm2wpcm', $dccm2wpcm);
-
-			// Associate newly formed categories with posts
-			get_comment_count($ret_id);
-
-
-			echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> comments imported.'), $count).'<br /><br /></p>';
-			return true;
-		}
-		echo __('No Comments to Import!');
-		return false;
-	}
-
-	function links2wp($links='')
-	{
-		// General Housekeeping
-		global $wpdb;
-		$count = 0;
-
-		// Deal with the links
-		if(is_array($links))
-		{
-			echo '<p>'.__('Importing Links...').'<br /><br /></p>';
-			foreach($links as $link)
-			{
-				$count++;
-				extract($link);
-
-				if ($title != "") {
-					if ($cinfo = is_term(csc ($title), 'link_category')) {
-						$category = $cinfo['term_id'];
-					} else {
-						$category = wp_insert_term($wpdb->escape (csc ($title)), 'link_category');
-						$category = $category['term_id'];
-					}
-				} else {
-					$linkname = $wpdb->escape(csc ($label));
-					$description = $wpdb->escape(csc ($title));
-
-					if($linfo = link_exists($linkname)) {
-						$ret_id = wp_insert_link(array(
-									'link_id'		=> $linfo,
-									'link_url'		=> $href,
-									'link_name'		=> $linkname,
-									'link_category'		=> $category,
-									'link_description'	=> $description)
-									);
-					} else {
-						$ret_id = wp_insert_link(array(
-									'link_url'		=> $url,
-									'link_name'		=> $linkname,
-									'link_category'		=> $category,
-									'link_description'	=> $description)
-									);
-					}
-					$dclinks2wplinks[$link_id] = $ret_id;
-				}
-			}
-			add_option('dclinks2wplinks',$dclinks2wplinks);
-			echo '<p>';
-			printf(__('Done! <strong>%s</strong> links or link categories imported'), $count);
-			echo '<br /><br /></p>';
-			return true;
-		}
-		echo __('No Links to Import!');
-		return false;
-	}
-
-	function import_categories()
-	{
-		// Category Import
-		$cats = $this->get_dc_cats();
-		$this->cat2wp($cats);
-		add_option('dc_cats', $cats);
-
-
-
-		echo '<form action="admin.php?import=dotclear&amp;step=2" method="post">';
-		wp_nonce_field('import-dotclear');
-		printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Users')));
-		echo '</form>';
-
-	}
-
-	function import_users()
-	{
-		// User Import
-		$users = $this->get_dc_users();
-		$this->users2wp($users);
-
-		echo '<form action="admin.php?import=dotclear&amp;step=3" method="post">';
-		wp_nonce_field('import-dotclear');
-		printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Posts')));
-		echo '</form>';
-	}
-
-	function import_posts()
-	{
-		// Post Import
-		$posts = $this->get_dc_posts();
-		$result = $this->posts2wp($posts);
-		if ( is_wp_error( $result ) )
-			return $result;
-
-		echo '<form action="admin.php?import=dotclear&amp;step=4" method="post">';
-		wp_nonce_field('import-dotclear');
-		printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Comments')));
-		echo '</form>';
-	}
-
-	function import_comments()
-	{
-		// Comment Import
-		$comments = $this->get_dc_comments();
-		$this->comments2wp($comments);
-
-		echo '<form action="admin.php?import=dotclear&amp;step=5" method="post">';
-		wp_nonce_field('import-dotclear');
-		printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Links')));
-		echo '</form>';
-	}
-
-	function import_links()
-	{
-		//Link Import
-		$links = $this->get_dc_links();
-		$this->links2wp($links);
-		add_option('dc_links', $links);
-
-		echo '<form action="admin.php?import=dotclear&amp;step=6" method="post">';
-		wp_nonce_field('import-dotclear');
-		printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Finish')));
-		echo '</form>';
-	}
-
-	function cleanup_dcimport()
-	{
-		delete_option('dcdbprefix');
-		delete_option('dc_cats');
-		delete_option('dcid2wpid');
-		delete_option('dccat2wpcat');
-		delete_option('dcposts2wpposts');
-		delete_option('dccm2wpcm');
-		delete_option('dclinks2wplinks');
-		delete_option('dcuser');
-		delete_option('dcpass');
-		delete_option('dcname');
-		delete_option('dchost');
-		delete_option('dccharset');
-		$this->tips();
-	}
-
-	function tips()
-	{
-		echo '<p>'.__('Welcome to WordPress.  We hope (and expect!) that you will find this platform incredibly rewarding!  As a new WordPress user coming from DotClear, there are some things that we would like to point out.  Hopefully, they will help your transition go as smoothly as possible.').'</p>';
-		echo '<h3>'.__('Users').'</h3>';
-		echo '<p>'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password.  Forget it.  You didn\'t have that login in DotClear, why should you have it here?  Instead we have taken care to import all of your users into our system.  Unfortunately there is one downside.  Because both WordPress and DotClear uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users.  <strong>Every user has the same username, but their passwords are reset to password123.</strong>  So <a href="%1$s">Login</a> and change it.'), '/wp-login.php').'</p>';
-		echo '<h3>'.__('Preserving Authors').'</h3>';
-		echo '<p>'.__('Secondly, we have attempted to preserve post authors.  If you are the only author or contributor to your blog, then you are safe.  In most cases, we are successful in this preservation endeavor.  However, if we cannot ascertain the name of the writer due to discrepancies between database tables, we assign it to you, the administrative user.').'</p>';
-		echo '<h3>'.__('Textile').'</h3>';
-		echo '<p>'.__('Also, since you\'re coming from DotClear, you probably have been using Textile to format your comments and posts.  If this is the case, we recommend downloading and installing <a href="http://www.huddledmasses.org/category/development/wordpress/textile/">Textile for WordPress</a>.  Trust me... You\'ll want it.').'</p>';
-		echo '<h3>'.__('WordPress Resources').'</h3>';
-		echo '<p>'.__('Finally, there are numerous WordPress resources around the internet.  Some of them are:').'</p>';
-		echo '<ul>';
-		echo '<li>'.__('<a href="http://www.wordpress.org">The official WordPress site</a>').'</li>';
-		echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums</a>').'</li>';
-		echo '<li>'.__('<a href="http://codex.wordpress.org">The Codex (In other words, the WordPress Bible)</a>').'</li>';
-		echo '</ul>';
-		echo '<p>'.sprintf(__('That\'s it! What are you waiting for? Go <a href="%1$s">login</a>!'), '../wp-login.php').'</p>';
-	}
-
-	function db_form()
-	{
-		echo '<table class="editform">';
-		printf('<tr><th><label for="dbuser">%s</label></th><td><input type="text" name="dbuser" id="dbuser" /></td></tr>', __('DotClear Database User:'));
-		printf('<tr><th><label for="dbpass">%s</label></th><td><input type="password" name="dbpass" id="dbpass" /></td></tr>', __('DotClear Database Password:'));
-		printf('<tr><th><label for="dbname">%s</label></th><td><input type="text" name="dbname" id="dbname" /></td></tr>', __('DotClear Database Name:'));
-		printf('<tr><th><label for="dbhost">%s</label></th><td><input type="text" name="dbhost" nameid="dbhost" value="localhost" /></td></tr>', __('DotClear Database Host:'));
-		printf('<tr><th><label for="dbprefix">%s</label></th><td><input type="text" name="dbprefix" id="dbprefix" value="dc_"/></td></tr>', __('DotClear Table prefix:'));
-		printf('<tr><th><label for="dccharset">%s</label></th><td><input type="text" name="dccharset" id="dccharset" value="ISO-8859-15"/></td></tr>', __('Originating character set:'));
-		echo '</table>';
-	}
-
-	function dispatch()
-	{
-
-		if (empty ($_GET['step']))
-			$step = 0;
-		else
-			$step = (int) $_GET['step'];
-		$this->header();
-
-		if ( $step > 0 )
-		{
-			check_admin_referer('import-dotclear');
-
-			if($_POST['dbuser'])
-			{
-				if(get_option('dcuser'))
-					delete_option('dcuser');
-				add_option('dcuser', sanitize_user($_POST['dbuser'], true));
-			}
-			if($_POST['dbpass'])
-			{
-				if(get_option('dcpass'))
-					delete_option('dcpass');
-				add_option('dcpass', sanitize_user($_POST['dbpass'], true));
-			}
-
-			if($_POST['dbname'])
-			{
-				if(get_option('dcname'))
-					delete_option('dcname');
-				add_option('dcname', sanitize_user($_POST['dbname'], true));
-			}
-			if($_POST['dbhost'])
-			{
-				if(get_option('dchost'))
-					delete_option('dchost');
-				add_option('dchost', sanitize_user($_POST['dbhost'], true));
-			}
-			if($_POST['dccharset'])
-			{
-				if(get_option('dccharset'))
-					delete_option('dccharset');
-				add_option('dccharset', sanitize_user($_POST['dccharset'], true));
-			}
-			if($_POST['dbprefix'])
-			{
-				if(get_option('dcdbprefix'))
-					delete_option('dcdbprefix');
-				add_option('dcdbprefix', sanitize_user($_POST['dbprefix'], true));
-			}
-
-
-		}
-
-		switch ($step)
-		{
-			default:
-			case 0 :
-				$this->greet();
-				break;
-			case 1 :
-				$this->import_categories();
-				break;
-			case 2 :
-				$this->import_users();
-				break;
-			case 3 :
-				$result = $this->import_posts();
-				if ( is_wp_error( $result ) )
-					echo $result->get_error_message();
-				break;
-			case 4 :
-				$this->import_comments();
-				break;
-			case 5 :
-				$this->import_links();
-				break;
-			case 6 :
-				$this->cleanup_dcimport();
-				break;
-		}
-
-		$this->footer();
-	}
-
-	function Dotclear_Import()
-	{
-		// Nothing.
-	}
-}
-
-$dc_import = new Dotclear_Import();
-register_importer('dotclear', __('DotClear'), __('Import categories, users, posts, comments, and links from a DotClear blog'), array ($dc_import, 'dispatch'));
-?>
--- a/wp-admin/import/greymatter.php
+++ b/wp-admin/import/greymatter.php
@@ -1,322 +0,0 @@
-<?php
-
-class GM_Import {
-
-	var $gmnames = array ();
-
-	function header() {
-		echo '<div class="wrap">';
-		echo '<h2>'.__('Import GreyMatter').'</h2>';
-	}
-
-	function footer() {
-		echo '</div>';
-	}
-
-	function greet() {
-		$this->header();
-?>
-<p><?php _e('This is a basic GreyMatter to WordPress import script.') ?></p>
-<p><?php _e('What it does:') ?></p>
-<ul>
-<li><?php _e('Parses gm-authors.cgi to import (new) authors. Everyone is imported at level 1.') ?></li>
-<li><?php _e('Parses the entries cgi files to import posts, comments, and karma on posts (although karma is not used on WordPress yet).<br />If authors are found not to be in gm-authors.cgi, imports them at level 0.') ?></li>
-<li><?php _e("Detects duplicate entries or comments. If you don't import everything the first time, or this import should fail in the middle, duplicate entries will not be made when you try again.") ?></li>
-</ul>
-<p><?php _e('What it does not:') ?></p>
-<ul>
-<li><?php _e('Parse gm-counter.cgi, gm-banlist.cgi, gm-cplog.cgi (you can make a CP log hack if you really feel like it, but I question the need of a CP log).') ?></li>
-<li><?php _e('Import gm-templates.') ?></li>
-<li><?php _e("Doesn't keep entries on top.")?></li>
-</ul>
-<p>&nbsp;</p>
-
-<form name="stepOne" method="get">
-<input type="hidden" name="import" value="greymatter" />
-<input type="hidden" name="step" value="1" />
-<?php wp_nonce_field('import-greymatter'); ?>
-<h3><?php _e('Second step: GreyMatter details:') ?></h3>
-<p><table cellpadding="0">
-<tr>
-<td><?php _e('Path to GM files:') ?></td>
-<td><input type="text" style="width:300px" name="gmpath" value="/home/my/site/cgi-bin/greymatter/" /></td>
-</tr>
-<tr>
-<td><?php _e('Path to GM entries:') ?></td>
-<td><input type="text" style="width:300px" name="archivespath" value="/home/my/site/cgi-bin/greymatter/archives/" /></td>
-</tr>
-<tr>
-<td colspan="2"><br /><?php _e("This importer will search for files 00000001.cgi to 000-whatever.cgi,<br />so you need to enter the number of the last GM post here.<br />(if you don't know that number, just log into your FTP and look it out<br />in the entries' folder)") ?></td>
-</tr>
-<tr>
-<td><?php _e("Last entry's number:") ?></td>
-<td><input type="text" name="lastentry" value="00000001" /></td>
-</tr>
-</table>
-</p>
-<p><?php _e("When you're ready, click OK to start importing: ") ?><input type="submit" name="submit" value="<?php _e('OK') ?>" class="search" /></p>
-</form>
-<p>&nbsp</p>
-<?php
-		$this->footer();
-	}
-
-
-
-	function gm2autobr($string) { // transforms GM's |*| into b2's <br />\n
-		$string = str_replace("|*|","<br />\n",$string);
-		return($string);
-	}
-
-	function import() {
-		global $wpdb;
-
-		$wpvarstoreset = array('gmpath', 'archivespath', 'lastentry');
-		for ($i=0; $i<count($wpvarstoreset); $i += 1) {
-			$wpvar = $wpvarstoreset[$i];
-			if (!isset($$wpvar)) {
-				if (empty($_POST["$wpvar"])) {
-					if (empty($_GET["$wpvar"])) {
-						$$wpvar = '';
-					} else {
-						$$wpvar = $_GET["$wpvar"];
-					}
-				} else {
-					$$wpvar = $_POST["$wpvar"];
-				}
-			}
-		}
-
-		if (!chdir($archivespath))
-			wp_die(__("Wrong path, the path to the GM entries does not exist on the server"));
-
-		if (!chdir($gmpath))
-			wp_die(__("Wrong path, the path to the GM files does not exist on the server"));
-
-		$lastentry = (int) $lastentry;
-
-		$this->header();
-?>
-<p><?php _e('The importer is running...') ?></p>
-<ul>
-<li><?php _e('importing users...') ?><ul><?php
-
-	chdir($gmpath);
-	$userbase = file("gm-authors.cgi");
-
-	foreach($userbase as $user) {
-		$userdata=explode("|", $user);
-
-		$user_ip="127.0.0.1";
-		$user_domain="localhost";
-		$user_browser="server";
-
-		$s=$userdata[4];
-		$user_joindate=substr($s,6,4)."-".substr($s,0,2)."-".substr($s,3,2)." 00:00:00";
-
-		$user_login=$wpdb->escape($userdata[0]);
-		$pass1=$wpdb->escape($userdata[1]);
-		$user_nickname=$wpdb->escape($userdata[0]);
-		$user_email=$wpdb->escape($userdata[2]);
-		$user_url=$wpdb->escape($userdata[3]);
-		$user_joindate=$wpdb->escape($user_joindate);
-
-		$user_id = username_exists($user_login);
-		if ($user_id) {
-			printf('<li>'.__('user %s').'<strong>'.__('Already exists').'</strong></li>', "<em>$user_login</em>");
-			$this->gmnames[$userdata[0]] = $user_id;
-			continue;
-		}
-
-		$user_info = array("user_login"=>"$user_login", "user_pass"=>"$pass1", "user_nickname"=>"$user_nickname", "user_email"=>"$user_email", "user_url"=>"$user_url", "user_ip"=>"$user_ip", "user_domain"=>"$user_domain", "user_browser"=>"$user_browser", "dateYMDhour"=>"$user_joindate", "user_level"=>"1", "user_idmode"=>"nickname");
-		$user_id = wp_insert_user($user_info);
-		$this->gmnames[$userdata[0]] = $user_id;
-
-		printf('<li>'.__('user %s...').' <strong>'.__('Done').'</strong></li>', "<em>$user_login</em>");
-	}
-
-?></ul><strong><?php _e('Done') ?></strong></li>
-<li><?php _e('importing posts, comments, and karma...') ?><br /><ul><?php
-
-	chdir($archivespath);
-
-	for($i = 0; $i <= $lastentry; $i = $i + 1) {
-
-		$entryfile = "";
-
-		if ($i<10000000) {
-			$entryfile .= "0";
-			if ($i<1000000) {
-				$entryfile .= "0";
-				if ($i<100000) {
-					$entryfile .= "0";
-					if ($i<10000) {
-						$entryfile .= "0";
-						if ($i<1000) {
-							$entryfile .= "0";
-							if ($i<100) {
-								$entryfile .= "0";
-								if ($i<10) {
-									$entryfile .= "0";
-		}}}}}}}
-
-		$entryfile .= "$i";
-
-		if (is_file($entryfile.".cgi")) {
-
-			$entry=file($entryfile.".cgi");
-			$postinfo=explode("|",$entry[0]);
-			$postmaincontent=$this->gm2autobr($entry[2]);
-			$postmorecontent=$this->gm2autobr($entry[3]);
-
-			$post_author=trim($wpdb->escape($postinfo[1]));
-
-			$post_title=$this->gm2autobr($postinfo[2]);
-			printf('<li>'.__('entry # %s : %s : by %s'), $entryfile, $post_title, $postinfo[1]);
-			$post_title=$wpdb->escape($post_title);
-
-			$postyear=$postinfo[6];
-			$postmonth=zeroise($postinfo[4],2);
-			$postday=zeroise($postinfo[5],2);
-			$posthour=zeroise($postinfo[7],2);
-			$postminute=zeroise($postinfo[8],2);
-			$postsecond=zeroise($postinfo[9],2);
-
-			if (($postinfo[10]=="PM") && ($posthour!="12"))
-				$posthour=$posthour+12;
-
-			$post_date="$postyear-$postmonth-$postday $posthour:$postminute:$postsecond";
-
-			$post_content=$postmaincontent;
-			if (strlen($postmorecontent)>3)
-				$post_content .= "<!--more--><br /><br />".$postmorecontent;
-			$post_content=$wpdb->escape($post_content);
-
-			$post_karma=$postinfo[12];
-
-			$post_status = 'publish'; //in greymatter, there are no drafts
-			$comment_status = 'open';
-			$ping_status = 'closed';
-
-			if ($post_ID = post_exists($post_title, '', $post_date)) {
-				echo ' ';
-				_e('(already exists)');
-			} else {
-				//just so that if a post already exists, new users are not created by checkauthor
-				// we'll check the author is registered, or if it's a deleted author
-				$user_id = username_exists($post_author);
-				if (!$user_id) {	// if deleted from GM, we register the author as a level 0 user
-					$user_ip="127.0.0.1";
-					$user_domain="localhost";
-					$user_browser="server";
-					$user_joindate="1979-06-06 00:41:00";
-					$user_login=$wpdb->escape($post_author);
-					$pass1=$wpdb->escape("password");
-					$user_nickname=$wpdb->escape($post_author);
-					$user_email=$wpdb->escape("user@deleted.com");
-					$user_url=$wpdb->escape("");
-					$user_joindate=$wpdb->escape($user_joindate);
-
-					$user_info = array("user_login"=>$user_login, "user_pass"=>$pass1, "user_nickname"=>$user_nickname, "user_email"=>$user_email, "user_url"=>$user_url, "user_ip"=>$user_ip, "user_domain"=>$user_domain, "user_browser"=>$user_browser, "dateYMDhour"=>$user_joindate, "user_level"=>0, "user_idmode"=>"nickname");
-					$user_id = wp_insert_user($user_info);
-					$this->gmnames[$postinfo[1]] = $user_id;
-
-					echo ': ';
-					printf(__('registered deleted user %s at level 0 '), "<em>$user_login</em>");
-				}
-
-				if (array_key_exists($postinfo[1], $this->gmnames)) {
-					$post_author = $this->gmnames[$postinfo[1]];
-				} else {
-					$post_author = $user_id;
-				}
-
-				$postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'comment_status', 'ping_status', 'post_modified', 'post_modified_gmt');
-				$post_ID = wp_insert_post($postdata);
-				if ( is_wp_error( $post_ID ) )
-					return $post_ID;
-			}
-
-			$c=count($entry);
-			if ($c>4) {
-				$numAddedComments = 0;
-				$numComments = 0;
-				for ($j=4;$j<$c;$j++) {
-					$entry[$j]=$this->gm2autobr($entry[$j]);
-					$commentinfo=explode("|",$entry[$j]);
-					$comment_post_ID=$post_ID;
-					$comment_author=$wpdb->escape($commentinfo[0]);
-					$comment_author_email=$wpdb->escape($commentinfo[2]);
-					$comment_author_url=$wpdb->escape($commentinfo[3]);
-					$comment_author_IP=$wpdb->escape($commentinfo[1]);
-
-					$commentyear=$commentinfo[7];
-					$commentmonth=zeroise($commentinfo[5],2);
-					$commentday=zeroise($commentinfo[6],2);
-					$commenthour=zeroise($commentinfo[8],2);
-					$commentminute=zeroise($commentinfo[9],2);
-					$commentsecond=zeroise($commentinfo[10],2);
-					if (($commentinfo[11]=="PM") && ($commenthour!="12"))
-						$commenthour=$commenthour+12;
-					$comment_date="$commentyear-$commentmonth-$commentday $commenthour:$commentminute:$commentsecond";
-
-					$comment_content=$wpdb->escape($commentinfo[12]);
-
-					if (!comment_exists($comment_author, $comment_date)) {
-						$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_author_email', 'comment_author_IP', 'comment_date', 'comment_content', 'comment_approved');
-						$commentdata = wp_filter_comment($commentdata);
-						wp_insert_comment($commentdata);
-						$numAddedComments++;
-					}
-					$numComments++;
-				}
-				if ($numAddedComments > 0) {
-					echo ': ';
-					printf(__('imported %d comment(s)'), $numAddedComments);
-				}
-				$preExisting = $numComments - numAddedComments;
-				if ($preExisting > 0) {
-					echo ' ';
-					printf(__('ignored %d pre-existing comments'), $preExisting);
-				}
-			}
-			echo '... <strong>'.__('Done').'</strong></li>';
-		}
-	}
-	?>
-</ul><strong><?php _e('Done') ?></strong></li></ul>
-<p>&nbsp;</p>
-<p><?php _e('Completed GreyMatter import!') ?></p>
-<?php
-	$this->footer();
-	return;
-	}
-
-	function dispatch() {
-		if (empty ($_GET['step']))
-			$step = 0;
-		else
-			$step = (int) $_GET['step'];
-
-		switch ($step) {
-			case 0 :
-				$this->greet();
-				break;
-			case 1:
-				check_admin_referer('import-greymatter');
-				$result = $this->import();
-				if ( is_wp_error( $result ) )
-					echo $result->get_error_message();
-				break;
-		}
-	}
-
-	function GM_Import() {
-		// Nothing.
-	}
-}
-
-$gm_import = new GM_Import();
-
-register_importer('greymatter', __('GreyMatter'), __('Import users, posts, and comments from a Greymatter blog'), array ($gm_import, 'dispatch'));
-?>
--- a/wp-admin/import/jkw.php
+++ b/wp-admin/import/jkw.php
@@ -1,178 +0,0 @@
-<?php
-
-class JeromesKeyword_Import {
-
-	function header() {
-		echo '<div class="wrap">';
-		echo '<h2>'.__('Import Jerome&#8217;s Keywords').'</h2>';
-		echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'<br /><br /></p>';
-	}
-
-	function footer() {
-		echo '</div>';
-	}
-
-	function greet() {
-		echo '<div class="narrow">';
-		echo '<p>'.__('Howdy! This imports tags from an existing Jerome&#8217;s Keywords installation into this blog using the new WordPress native tagging structure.').'</p>';
-		echo '<p>'.__('This is suitable for Jerome&#8217;s Keywords version 1.x and 2.0a.').'</p>';
-		echo '<p><strong>'.__('All existing Jerome&#8217;s Keywords will be removed after import.').'</strong></p>';
-		echo '<p><strong>'.__('Don&#8217;t be stupid - backup your database before proceeding!').'</strong></p>';
-		echo '<form action="admin.php?import=jkw&amp;step=1" method="post">';
-		wp_nonce_field('import-jkw');
-		echo '<p class="submit"><input type="submit" name="submit" value="'.__('Import Version 1.x &raquo;').'" /></p>';
-		echo '</form>';
-		echo '<form action="admin.php?import=jkw&amp;step=3" method="post">';
-		wp_nonce_field('import-jkw');
-		echo '<p class="submit"><input type="submit" name="submit" value="'.__('Import Version 2.0a &raquo;').'" /></p>';
-		echo '</form>';
-		echo '</div>';
-	}
-
-	function dispatch() {
-		if ( empty($_GET['step']) )
-			$step = 0;
-		else
-			$step = abs(intval($_GET['step']));
-
-		// load the header
-		$this->header();
-
-		switch ( $step ) {
-			case 0 :
-				$this->greet();
-				break;
-			case 1 :
-				check_admin_referer('import-jkw');
-				$this->check_V1_post_keyword( true );
-				break;
-			case 2 :
-				check_admin_referer('import-jkw');
-				$this->check_V1_post_keyword( false );
-				break;
-			case 3 :
-				check_admin_referer('import-jkw');
-				$this->check_V2_post_keyword( true );
-				break;
-			case 4 :
-				check_admin_referer('import-jkw');
-				$this->check_V2_post_keyword( false );
-				break;
-			case 5:
-				check_admin_referer('import-jkw');
-				$this->cleanup_V2_import();
-				break;
-			case 6:
-				$this->done();
-				break;
-		}
-
-		// load the footer
-		$this->footer();
-	}
-
-	function check_V1_post_keyword($precheck = true) {
-		global $wpdb;
-
-		echo '<div class="narrow">';
-		echo '<p><h3>'.__('Reading Jerome&#8217;s Keywords Tags&#8230;').'</h3></p>';
-
-		// import Jerome's Keywords tags 
-		$metakeys = $wpdb->get_results("SELECT post_id, meta_id, meta_key, meta_value FROM $wpdb->postmeta WHERE $wpdb->postmeta.meta_key = 'keywords'");
-		if ( !is_array($metakeys)) {
-			echo '<p>' . __('No Tags Found!') . '</p>';
-			return false;
-		} else {
-			$count = count($metakeys);
-			echo '<p>' . sprintf( __('Done! <strong>%s</strong> posts with tags were read.'), $count ) . '<br /></p>';
-			echo '<ul>';
-			foreach ( $metakeys as $post_meta ) {
-				if ( $post_meta->meta_value != '' ) {
-					$post_keys = explode(',', $post_meta->meta_value);
-					foreach ( $post_keys as $keyword ) {
-						$keyword = addslashes(trim($keyword));
-						if ( '' != $keyword ) {
-							echo '<li>' . $post_meta->post_id . '&nbsp;-&nbsp;' . $keyword . '</li>';
-							if ( !$precheck )
-								wp_add_post_tags($post_meta->post_id, $keyword);
-						}
-					}
-				}
-				if ( !$precheck )
-					delete_post_meta($post_meta->post_id, 'keywords');
-			}
-			echo '</ul>';
-		}
-
-		echo '<form action="admin.php?import=jkw&amp;step='.($precheck? 2:6).'" method="post">';
-		wp_nonce_field('import-jkw');
-		echo '<p class="submit"><input type="submit" name="submit" value="'.__('Next &raquo;').'" /></p>';
-		echo '</form>';
-		echo '</div>';
-	}
-
-	function check_V2_post_keyword($precheck = true) {
-		global $wpdb;
-
-		echo '<div class="narrow">';
-		echo '<p><h3>'.__('Reading Jerome&#8217;s Keywords Tags&#8230;').'</h3></p>';
-
-		// import Jerome's Keywords tags 
-		$tablename = $wpdb->prefix . substr(get_option('jkeywords_keywords_table'), 1, -1);
-		$metakeys = $wpdb->get_results("SELECT post_id, tag_name FROM $tablename");
-		if ( !is_array($metakeys) ) {
-			echo '<p>' . __('No Tags Found!') . '</p>';
-			return false;
-		} else {
-			$count = count($metakeys);
-			echo '<p>' . sprintf( __('Done! <strong>%s</strong> tags were read.'), $count ) . '<br /></p>';
-			echo '<ul>';
-			foreach ( $metakeys as $post_meta ) {
-				$keyword = addslashes(trim($post_meta->tag_name));
-				if ( $keyword != '' ) {
-					echo '<li>' . $post_meta->post_id . '&nbsp;-&nbsp;' . $keyword . '</li>';
-					if ( !$precheck )
-						wp_add_post_tags($post_meta->post_id, $keyword);
-				}
-			}
-		echo '</ul>';
-		}
-		echo '<form action="admin.php?import=jkw&amp;step='.($precheck? 4:5).'" method="post">';
-		wp_nonce_field('import-jkw');
-		echo '<p class="submit"><input type="submit" name="submit" value="'.__('Next &raquo;').'" /></p>';
-		echo '</form>';
-		echo '</div>';
-	}
-
-	function cleanup_V2_import() {
-		global $wpdb;
-
-		/* options from V2.0a (jeromes-keywords.php) */
-		$options = array('version', 'keywords_table', 'query_varname', 'template', 'meta_always_include', 'meta_includecats', 'meta_autoheader', 'search_strict', 'use_feed_cats', 'post_linkformat', 'post_tagseparator', 'post_includecats', 'post_notagstext', 'cloud_linkformat', 'cloud_tagseparator', 'cloud_includecats', 'cloud_sortorder', 'cloud_displaymax', 'cloud_displaymin', 'cloud_scalemax', 'cloud_scalemin');
-
-		$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . substr(get_option('jkeywords_keywords_table'), 1, -1));
-
-		foreach ( $options as $o )
-			delete_option('jkeywords_' . $o);
-
-		$this->done();
-	}
-
-	function done() {
-		echo '<div class="narrow">';
-		echo '<p><h3>'.__('Import Complete!').'</h3></p>';
-		echo '</div>';
-	}
-
-	function JeromesKeyword_Import() {
-	}
-
-}
-
-// create the import object
-$jkw_import = new JeromesKeyword_Import();
-
-// add it to the import page!
-register_importer('jkw', 'Jerome&#8217;s Keywords', __('Import Jerome&#8217;s Keywords into the new native tagging structure.'), array($jkw_import, 'dispatch'));
-
-?>
--- a/wp-admin/import/livejournal.php
+++ b/wp-admin/import/livejournal.php
@@ -1,178 +0,0 @@
-<?php
-
-class LJ_Import {
-
-	var $file;
-
-	function header() {
-		echo '<div class="wrap">';
-		echo '<h2>'.__('Import LiveJournal').'</h2>';
-	}
-
-	function footer() {
-		echo '</div>';
-	}
-
-	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 '<div class="narrow">';
-		echo '<p>'.__('Howdy! Upload your LiveJournal XML export file and we&#8217;ll import the posts into this blog.').'</p>';
-		echo '<p>'.__('Choose a LiveJournal XML file to upload, then click Upload file and import.').'</p>';
-		wp_import_upload_form("admin.php?import=livejournal&amp;step=1");
-		echo '</div>';
-	}
-
-	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('|<entry>(.*?)</entry>|is', $importdata, $posts);
-		$posts = $posts[1];
-		unset($importdata);
-		echo '<ol>';
-		foreach ($posts as $post) {
-			preg_match('|<subject>(.*?)</subject>|is', $post, $post_title);
-			$post_title = $wpdb->escape(trim($post_title[1]));
-			if ( empty($post_title) ) {
-				preg_match('|<itemid>(.*?)</itemid>|is', $post, $post_title);
-				$post_title = $wpdb->escape(trim($post_title[1]));
-			}
-
-			preg_match('|<eventtime>(.*?)</eventtime>|is', $post, $post_date);
-			$post_date = strtotime($post_date[1]);
-			$post_date = date('Y-m-d H:i:s', $post_date);
-
-			preg_match('|<event>(.*?)</event>|is', $post, $post_content);
-			$post_content = str_replace(array ('<![CDATA[', ']]>'), '', 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('<br>', '<br />', $post_content);
-			$post_content = str_replace('<hr>', '<hr />', $post_content);
-			$post_content = $wpdb->escape($post_content);
-
-			$post_author = $current_user->ID;
-			$post_status = 'publish';
-
-			echo '<li>';
-			if ($post_id = post_exists($post_title, $post_content, $post_date)) {
-				printf(__('Post <i>%s</i> already exists.'), stripslashes($post_title));
-			} else {
-				printf(__('Importing post <i>%s</i>...'), 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 '</li>';
-					break;
-				}
-			}
-
-			preg_match_all('|<comment>(.*?)</comment>|is', $post, $comments);
-			$comments = $comments[1];
-
-			if ( $comments ) {
-				$comment_post_ID = (int) $post_id;
-				$num_comments = 0;
-				foreach ($comments as $comment) {
-					preg_match('|<event>(.*?)</event>|is', $comment, $comment_content);
-					$comment_content = str_replace(array ('<![CDATA[', ']]>'), '', 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('<br>', '<br />', $comment_content);
-					$comment_content = str_replace('<hr>', '<hr />', $comment_content);
-					$comment_content = $wpdb->escape($comment_content);
-
-					preg_match('|<eventtime>(.*?)</eventtime>|is', $comment, $comment_date);
-					$comment_date = trim($comment_date[1]);
-					$comment_date = date('Y-m-d H:i:s', strtotime($comment_date));
-
-					preg_match('|<name>(.*?)</name>|is', $comment, $comment_author);
-					$comment_author = $wpdb->escape(trim($comment_author[1]));
-
-					preg_match('|<email>(.*?)</email>|is', $comment, $comment_author_email);
-					$comment_author_email = $wpdb->escape(trim($comment_author_email[1]));
-
-					$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(__('(%s comments)'), $num_comments);
-			}
-			echo '</li>';
-		}
-		echo '</ol>';
-	}
-
-	function import() {
-		$file = wp_import_handle_upload();
-		if ( isset($file['error']) ) {
-			echo $file['error'];
-			return;
-		}
-
-		$this->file = $file['file'];
-		$result = $this->import_posts();
-		if ( is_wp_error( $result ) )
-			return $result;
-		wp_import_cleanup($file['id']);
-
-		echo '<h3>';
-		printf(__('All done. <a href="%s">Have fun!</a>'), get_option('home'));
-		echo '</h3>';
-	}
-
-	function dispatch() {
-		if (empty ($_GET['step']))
-			$step = 0;
-		else
-			$step = (int) $_GET['step'];
-
-		$this->header();
-
-		switch ($step) {
-			case 0 :
-				$this->greet();
-				break;
-			case 1 :
-				check_admin_referer('import-upload');
-				$result = $this->import();
-				if ( is_wp_error( $result ) )
-					echo $result->get_error_message();
-				break;
-		}
-
-		$this->footer();
-	}
-
-	function LJ_Import() {
-		// Nothing.
-	}
-}
-
-$livejournal_import = new LJ_Import();
-
-register_importer('livejournal', __('LiveJournal'), __('Import posts from a LiveJournal XML export file'), array ($livejournal_import, 'dispatch'));
-?>
--- a/wp-admin/import/mt.php
+++ b/wp-admin/import/mt.php
@@ -1,458 +0,0 @@
-<?php
-
-class MT_Import {
-
-	var $posts = array ();
-	var $file;
-	var $id;
-	var $mtnames = array ();
-	var $newauthornames = array ();
-	var $j = -1;
-
-	function header() {
-		echo '<div class="wrap">';
-		echo '<h2>'.__('Import Movable Type or TypePad').'</h2>';
-	}
-
-	function footer() {
-		echo '</div>';
-	}
-
-	function greet() {
-		$this->header();
-?>
-<div class="narrow">
-<p><?php _e('Howdy! We&#8217;re about to begin importing all of your Movable Type or Typepad entries into WordPress. To begin, either choose a file to upload and click "Upload file and import," or use FTP to upload your MT export file as <code>mt-export.txt</code> in your <code>/wp-content/</code> directory and then click "Import mt-export.txt"'); ?></p>
-<?php wp_import_upload_form( add_query_arg('step', 1) ); ?>
-<form method="post" action="<?php echo add_query_arg('step', 1); ?>" class="import-upload-form">
-<?php wp_nonce_field('import-upload'); ?>
-<p>
-	<input type="hidden" name="upload_type" value="ftp" />
-<?php _e('Or use <code>mt-export.txt</code> in your <code>/wp-content/</code> directory'); ?></p>
-<p class="submit">
-<input type="submit" value="<?php _e(sprintf('Import %s', 'mt-export.txt &raquo;')); ?>" />
-</p>
-</form>
-<p><?php _e('The importer is smart enough not to import duplicates, so you can run this multiple times without worry if&#8212;for whatever reason&#8212;it doesn\'t finish. If you get an <strong>out of memory</strong> error try splitting up the import file into pieces.'); ?> </p>
-</div>
-<?php
-		$this->footer();
-	}
-
-	function users_form($n) {
-		global $wpdb, $testing;
-		$users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY ID");
-?><select name="userselect[<?php echo $n; ?>]">
-	<option value="#NONE#"><?php _e('- Select -') ?></option>
-	<?php
-
-
-		foreach ($users as $user) {
-			echo '<option value="'.$user->user_login.'">'.$user->user_login.'</option>';
-		}
-?>
-	</select>
-	<?php
-
-
-	}
-
-	//function to check the authorname and do the mapping
-	function checkauthor($author) {
-		global $wpdb;
-		//mtnames is an array with the names in the mt import file
-		$pass = 'changeme';
-		if (!(in_array($author, $this->mtnames))) { //a new mt author name is found
-			++ $this->j;
-			$this->mtnames[$this->j] = $author; //add that new mt author name to an array
-			$user_id = username_exists($this->newauthornames[$this->j]); //check if the new author name defined by the user is a pre-existing wp user
-			if (!$user_id) { //banging my head against the desk now.
-				if ($newauthornames[$this->j] == 'left_blank') { //check if the user does not want to change the authorname
-					$user_id = wp_create_user($author, $pass);
-					$this->newauthornames[$this->j] = $author; //now we have a name, in the place of left_blank.
-				} else {
-					$user_id = wp_create_user($this->newauthornames[$this->j], $pass);
-				}
-			} else {
-				return $user_id; // return pre-existing wp username if it exists
-			}
-		} else {
-			$key = array_search($author, $this->mtnames); //find the array key for $author in the $mtnames array
-			$user_id = username_exists($this->newauthornames[$key]); //use that key to get the value of the author's name from $newauthornames
-		}
-
-		return $user_id;
-	}
-
-	function get_mt_authors() {
-		$temp = array();
-		$authors = array();
-
-		$handle = fopen($this->file, 'r');
-		if ( $handle == null )
-			return false;
-
-		$in_comment = false;
-		while ( $line = fgets($handle) ) {
-			$line = trim($line);
-
-			if ( 'COMMENT:' == $line )
-				$in_comment = true;
-			else if ( '-----' == $line )
-				$in_comment = false;
-
-			if ( $in_comment || 0 !== strpos($line,"AUTHOR:") )
-				continue;
-
-			$temp[] = trim( substr($line, strlen("AUTHOR:")) );
-		}
-
-		//we need to find unique values of author names, while preserving the order, so this function emulates the unique_value(); php function, without the sorting.
-		$authors[0] = array_shift($temp);
-		$y = count($temp) + 1;
-		for ($x = 1; $x < $y; $x ++) {
-			$next = array_shift($temp);
-			if (!(in_array($next, $authors)))
-				array_push($authors, "$next");
-		}
-
-		fclose($handle);
-
-		return $authors;
-	}
-
-	function get_authors_from_post() {
-		$formnames = array ();
-		$selectnames = array ();
-
-		foreach ($_POST['user'] as $key => $line) {
-			$newname = trim(stripslashes($line));
-			if ($newname == '')
-				$newname = 'left_blank'; //passing author names from step 1 to step 2 is accomplished by using POST. left_blank denotes an empty entry in the form.
-			array_push($formnames, "$newname");
-		} // $formnames is the array with the form entered names
-
-		foreach ($_POST['userselect'] as $user => $key) {
-			$selected = trim(stripslashes($key));
-			array_push($selectnames, "$selected");
-		}
-
-		$count = count($formnames);
-		for ($i = 0; $i < $count; $i ++) {
-			if ($selectnames[$i] != '#NONE#') { //if no name was selected from the select menu, use the name entered in the form
-				array_push($this->newauthornames, "$selectnames[$i]");
-			} else {
-				array_push($this->newauthornames, "$formnames[$i]");
-			}
-		}
-	}
-
-	function mt_authors_form() {
-?>
-<div class="wrap">
-<h2><?php _e('Assign Authors'); ?></h2>
-<p><?php _e('To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as admin\'s entries.'); ?></p>
-<p><?php _e('Below, you can see the names of the authors of the MovableType posts in <i>italics</i>. For each of these names, you can either pick an author in your WordPress installation from the menu, or enter a name for the author in the textbox.'); ?></p>
-<p><?php _e('If a new user is created by WordPress, the password will be set, by default, to "changeme". Quite suggestive, eh? ;)'); ?></p>
-	<?php
-
-
-		$authors = $this->get_mt_authors();
-		echo '<ol id="authors">';
-		echo '<form action="?import=mt&amp;step=2&amp;id=' . $this->id . '" method="post">';
-		wp_nonce_field('import-mt');
-		$j = -1;
-		foreach ($authors as $author) {
-			++ $j;
-			echo '<li>'.__('Current author:').' <strong>'.$author.'</strong><br />'.sprintf(__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30"> <br />');
-			$this->users_form($j);
-			echo '</li>';
-		}
-
-		echo '<input type="submit" value="'.__('Submit').'">'.'<br />';
-		echo '</form>';
-		echo '</ol></div>';
-
-	}
-
-	function select_authors() {
-		if ( $_POST['upload_type'] === 'ftp' ) {
-			$file['file'] = ABSPATH . 'wp-content/mt-export.txt';
-			if ( !file_exists($file['file']) )
-				$file['error'] = __('<code>mt-export.txt</code> does not exist');
-		} else {
-			$file = wp_import_handle_upload();
-		}
-		if ( isset($file['error']) ) {
-			$this->header();
-			echo '<p>'.__('Sorry, there has been an error').'.</p>';
-			echo '<p><strong>' . $file['error'] . '</strong></p>';
-			$this->footer();
-			return;
-		}
-		$this->file = $file['file'];
-		$this->id = (int) $file['id'];
-
-		$this->mt_authors_form();
-	}
-
-	function save_post(&$post, &$comments, &$pings) {
-		// Reset the counter
-		set_time_limit(30);
-		$post = get_object_vars($post);
-		$post = add_magic_quotes($post);
-		$post = (object) $post;
-
-		if ( $post_id = post_exists($post->post_title, '', $post->post_date) ) {
-			echo '<li>';
-			printf(__('Post <i>%s</i> already exists.'), stripslashes($post->post_title));
-		} else {
-			echo '<li>';
-			printf(__('Importing post <i>%s</i>...'), stripslashes($post->post_title));
-
-			if ( '' != trim( $post->extended ) )
-					$post->post_content .= "\n<!--more-->\n$post->extended";
-
-			$post->post_author = $this->checkauthor($post->post_author); //just so that if a post already exists, new users are not created by checkauthor
-			$post_id = wp_insert_post($post);
-			if ( is_wp_error( $post_id ) ) 
-				return $post_id;
-
-			// Add categories.
-			if ( 0 != count($post->categories) ) {
-				wp_create_categories($post->categories, $post_id);
-			}
-		}
-
-		$num_comments = 0;
-		foreach ( $comments as $comment ) {
-			$comment = get_object_vars($comment);
-			$comment = add_magic_quotes($comment);
-
-			if ( !comment_exists($comment['comment_author'], $comment['comment_date'])) {
-				$comment['comment_post_ID'] = $post_id;
-				$comment = wp_filter_comment($comment);
-				wp_insert_comment($comment);
-				$num_comments++;
-			}
-		}
-
-		if ( $num_comments )
-			printf(' '.__('(%s comments)'), $num_comments);
-
-		$num_pings = 0;
-		foreach ( $pings as $ping ) {
-			$ping = get_object_vars($ping);
-			$ping = add_magic_quotes($ping);
-
-			if ( !comment_exists($ping['comment_author'], $ping['comment_date'])) {
-				$ping['comment_content'] = "<strong>{$ping['title']}</strong>\n\n{$ping['comment_content']}";
-				$ping['comment_post_ID'] = $post_id;
-				$ping = wp_filter_comment($ping);
-				wp_insert_comment($ping);
-				$num_pings++;
-			}
-		}
-
-		if ( $num_pings )
-			printf(' '.__('(%s pings)'), $num_pings);
-
-		echo "</li>";
-		//ob_flush();flush();
-	}
-
-	function process_posts() {
-		global $wpdb;
-
-		$handle = fopen($this->file, 'r');
-		if ( $handle == null )
-			return false;
-
-		$context = '';
-		$post = new StdClass();
-		$comment = new StdClass();
-		$comments = array();
-		$ping = new StdClass();
-		$pings = array();
-
-		echo "<div class='wrap'><ol>";
-
-		while ( $line = fgets($handle) ) {
-			$line = trim($line);
-
-			if ( '-----' == $line ) {
-				// Finishing a multi-line field
-				if ( 'comment' == $context ) {
-					$comments[] = $comment;
-					$comment = new StdClass();
-				} else if ( 'ping' == $context ) {
-					$pings[] = $ping;
-					$ping = new StdClass();
-				}
-				$context = '';
-			} else if ( '--------' == $line ) {
-				// Finishing a post.
-				$context = '';
-				$result = $this->save_post($post, $comments, $pings);
-				if ( is_wp_error( $result ) ) 
-					return $result;
-				$post = new StdClass;
-				$comment = new StdClass();
-				$ping = new StdClass();
-				$comments = array();
-				$pings = array();
-			} else if ( 'BODY:' == $line ) {
-				$context = 'body';
-			} else if ( 'EXTENDED BODY:' == $line ) {
-				$context = 'extended';
-			} else if ( 'EXCERPT:' == $line ) {
-				$context = 'excerpt';
-			} else if ( 'KEYWORDS:' == $line ) {
-				$context = 'keywords';
-			} else if ( 'COMMENT:' == $line ) {
-				$context = 'comment';
-			} else if ( 'PING:' == $line ) {
-				$context = 'ping';
-			} else if ( 0 === strpos($line, "AUTHOR:") ) {
-				$author = trim( substr($line, strlen("AUTHOR:")) );
-				if ( '' == $context )
-					$post->post_author = $author;
-				else if ( 'comment' == $context )
-					 $comment->comment_author = $author;
-			} else if ( 0 === strpos($line, "TITLE:") ) {
-				$title = trim( substr($line, strlen("TITLE:")) );
-				if ( '' == $context )
-					$post->post_title = $title;
-				else if ( 'ping' == $context )
-					$ping->title = $title;
-			} else if ( 0 === strpos($line, "STATUS:") ) {
-				$status = trim( substr($line, strlen("STATUS:")) );
-				if ( empty($status) )
-					$status = 'publish';
-				$post->post_status = $status;
-			} else if ( 0 === strpos($line, "ALLOW COMMENTS:") ) {
-				$allow = trim( substr($line, strlen("ALLOW COMMENTS:")) );
-				if ( $allow == 1 )
-					$post->comment_status = 'open';
-				else
-					$post->comment_status = 'closed';
-			} else if ( 0 === strpos($line, "ALLOW PINGS:") ) {
-				$allow = trim( substr($line, strlen("ALLOW PINGS:")) );
-				if ( $allow == 1 )
-					$post->ping_status = 'open';
-				else
-					$post->ping_status = 'closed';
-			} else if ( 0 === strpos($line, "CATEGORY:") ) {
-				$category = trim( substr($line, strlen("CATEGORY:")) );
-				if ( '' != $category )
-					$post->categories[] = $category;
-			} else if ( 0 === strpos($line, "PRIMARY CATEGORY:") ) {
-				$category = trim( substr($line, strlen("PRIMARY CATEGORY:")) );
-				if ( '' != $category )
-					$post->categories[] = $category;
-			} else if ( 0 === strpos($line, "DATE:") ) {
-				$date = trim( substr($line, strlen("DATE:")) );
-				$date = strtotime($date);
-				$date = date('Y-m-d H:i:s', $date);
-				$date_gmt = get_gmt_from_date($date);
-				if ( '' == $context ) {
-					$post->post_modified = $date;
-					$post->post_modified_gmt = $date_gmt;
-					$post->post_date = $date;
-					$post->post_date_gmt = $date_gmt;
-				} else if ( 'comment' == $context ) {
-					$comment->comment_date = $date;
-				} else if ( 'ping' == $context ) {
-					$ping->comment_date = $date;
-				}
-			} else if ( 0 === strpos($line, "EMAIL:") ) {
-				$email = trim( substr($line, strlen("EMAIL:")) );
-				if ( 'comment' == $context )
-					$comment->comment_author_email = $email;
-				else
-					$ping->comment_author_email = '';
-			} else if ( 0 === strpos($line, "IP:") ) {
-				$ip = trim( substr($line, strlen("IP:")) );
-				if ( 'comment' == $context )
-					$comment->comment_author_IP = $ip;
-				else
-					$ping->comment_author_IP = $ip;
-			} else if ( 0 === strpos($line, "URL:") ) {
-				$url = trim( substr($line, strlen("URL:")) );
-				if ( 'comment' == $context )
-					$comment->comment_author_url = $url;
-				else
-					$ping->comment_author_url = $url;
-			} else if ( 0 === strpos($line, "BLOG NAME:") ) {
-				$blog = trim( substr($line, strlen("BLOG NAME:")) );
-				$ping->comment_author = $blog;
-			} else {
-				// Processing multi-line field, check context.
-
-				$line .= "\n";
-				if ( 'body' == $context ) {
-					$post->post_content .= $line;
-				} else if ( 'extended' ==  $context ) {
-					$post->extended .= $line;
-				} else if ( 'excerpt' == $context ) {
-					$post->post_excerpt .= $line;
-				} else if ( 'comment' == $context ) {
-					$comment->comment_content .= $line;
-				} else if ( 'ping' == $context ) {
-					$ping->comment_content .= $line;
-				}
-			}
-		}
-
-		echo '</ol>';
-
-		wp_import_cleanup($this->id);
-		do_action('import_done', 'mt');
-
-		echo '<h3>'.sprintf(__('All done. <a href="%s">Have fun!</a>'), get_option('home')).'</h3></div>';
-	}
-
-	function import() {
-		$this->id = (int) $_GET['id'];
-		if ( $this->id == 0 )
-			$this->file = ABSPATH . 'wp-content/mt-export.txt';
-		else
-			$this->file = get_attached_file($this->id);
-		$this->get_authors_from_post();
-		$result = $this->process_posts();
-		if ( is_wp_error( $result ) ) 
-			return $result;
-	}
-
-	function dispatch() {
-		if (empty ($_GET['step']))
-			$step = 0;
-		else
-			$step = (int) $_GET['step'];
-
-		switch ($step) {
-			case 0 :
-				$this->greet();
-				break;
-			case 1 :
-				check_admin_referer('import-upload');
-				$this->select_authors();
-				break;
-			case 2:
-				check_admin_referer('import-mt');
-				$result = $this->import();
-				if ( is_wp_error( $result ) )
-					echo $result->get_error_message();
-				break;
-		}
-	}
-
-	function MT_Import() {
-		// Nothing.
-	}
-}
-
-$mt_import = new MT_Import();
-
-register_importer('mt', __('Movable Type and TypePad'), __('Import posts and comments from a Movable Type or Typepad blog'), array ($mt_import, 'dispatch'));
-?>
--- a/wp-admin/import/rss.php
+++ b/wp-admin/import/rss.php
@@ -1,181 +0,0 @@
-<?php
-
-class RSS_Import {
-
-	var $posts = array ();
-	var $file;
-
-	function header() {
-		echo '<div class="wrap">';
-		echo '<h2>'.__('Import RSS').'</h2>';
-	}
-
-	function footer() {
-		echo '</div>';
-	}
-
-	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 '<div class="narrow">';
-		echo '<p>'.__('Howdy! This importer allows you to extract posts from an RSS 2.0 file into your blog. This is useful if you want to import your posts from a system that is not handled by a custom import tool. Pick an RSS file to upload and click Import.').'</p>';
-		wp_import_upload_form("admin.php?import=rss&amp;step=1");
-		echo '</div>';
-	}
-
-	function get_posts() {
-		global $wpdb;
-
-		set_magic_quotes_runtime(0);
-		$datalines = file($this->file); // Read the file into an array
-		$importdata = implode('', $datalines); // squish it
-		$importdata = str_replace(array ("\r\n", "\r"), "\n", $importdata);
-
-		preg_match_all('|<item>(.*?)</item>|is', $importdata, $this->posts);
-		$this->posts = $this->posts[1];
-		$index = 0;
-		foreach ($this->posts as $post) {
-			preg_match('|<title>(.*?)</title>|is', $post, $post_title);
-			$post_title = str_replace(array('<![CDATA[', ']]>'), '', $wpdb->escape( trim($post_title[1]) ));
-
-			preg_match('|<pubdate>(.*?)</pubdate>|is', $post, $post_date_gmt);
-
-			if ($post_date_gmt) {
-				$post_date_gmt = strtotime($post_date_gmt[1]);
-			} else {
-				// if we don't already have something from pubDate
-				preg_match('|<dc:date>(.*?)</dc:date>|is', $post, $post_date_gmt);
-				$post_date_gmt = preg_replace('|([-+])([0-9]+):([0-9]+)$|', '\1\2\3', $post_date_gmt[1]);
-				$post_date_gmt = str_replace('T', ' ', $post_date_gmt);
-				$post_date_gmt = strtotime($post_date_gmt);
-			}
-
-			$post_date_gmt = gmdate('Y-m-d H:i:s', $post_date_gmt);
-			$post_date = get_date_from_gmt( $post_date_gmt );
-
-			preg_match_all('|<category>(.*?)</category>|is', $post, $categories);
-			$categories = $categories[1];
-
-			if (!$categories) {
-				preg_match_all('|<dc:subject>(.*?)</dc:subject>|is', $post, $categories);
-				$categories = $categories[1];
-			}
-
-			$cat_index = 0;
-			foreach ($categories as $category) {
-				$categories[$cat_index] = $wpdb->escape($this->unhtmlentities($category));
-				$cat_index++;
-			}
-
-			preg_match('|<guid.+?>(.*?)</guid>|is', $post, $guid);
-			if ($guid)
-				$guid = $wpdb->escape(trim($guid[1]));
-			else
-				$guid = '';
-
-			preg_match('|<content:encoded>(.*?)</content:encoded>|is', $post, $post_content);
-			$post_content = str_replace(array ('<![CDATA[', ']]>'), '', $wpdb->escape(trim($post_content[1])));
-
-			if (!$post_content) {
-				// This is for feeds that put content in description
-				preg_match('|<description>(.*?)</description>|is', $post, $post_content);
-				$post_content = $wpdb->escape($this->unhtmlentities(trim($post_content[1])));
-			}
-
-			// Clean up content
-			$post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
-			$post_content = str_replace('<br>', '<br />', $post_content);
-			$post_content = str_replace('<hr>', '<hr />', $post_content);
-
-			$post_author = 1;
-			$post_status = 'publish';
-			$this->posts[$index] = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_status', 'guid', 'categories');
-			$index++;
-		}
-	}
-
-	function import_posts() {
-		echo '<ol>';
-
-		foreach ($this->posts as $post) {
-			echo "<li>".__('Importing post...');
-
-			extract($post);
-
-			if ($post_id = post_exists($post_title, $post_content, $post_date)) {
-				_e('Post already imported');
-			} else {
-				$post_id = wp_insert_post($post);
-				if ( is_wp_error( $post_id ) )
-					return $post_id;
-				if (!$post_id) {
-					_e("Couldn't get post ID");
-					return;
-				}
-
-				if (0 != count($categories))
-					wp_create_categories($categories, $post_id);
-				_e('Done !');
-			}
-			echo '</li>';
-		}
-
-		echo '</ol>';
-
-	}
-
-	function import() {
-		$file = wp_import_handle_upload();
-		if ( isset($file['error']) ) {
-			echo $file['error'];
-			return;
-		}
-
-		$this->file = $file['file'];
-		$this->get_posts();
-		$result = $this->import_posts();
-		if ( is_wp_error( $result ) )
-			return $result;
-		wp_import_cleanup($file['id']);
-
-		echo '<h3>';
-		printf(__('All done. <a href="%s">Have fun!</a>'), get_option('home'));
-		echo '</h3>';
-	}
-
-	function dispatch() {
-		if (empty ($_GET['step']))
-			$step = 0;
-		else
-			$step = (int) $_GET['step'];
-
-		$this->header();
-
-		switch ($step) {
-			case 0 :
-				$this->greet();
-				break;
-			case 1 :
-				check_admin_referer('import-upload');
-				$result = $this->import();
-				if ( is_wp_error( $result ) )
-					echo $result->get_error_message();
-				break;
-		}
-
-		$this->footer();
-	}
-
-	function RSS_Import() {
-		// Nothing.
-	}
-}
-
-$rss_import = new RSS_Import();
-
-register_importer('rss', __('RSS'), __('Import posts from an RSS feed'), array ($rss_import, 'dispatch'));
-?>
--- a/wp-admin/import/stp.php
+++ b/wp-admin/import/stp.php
@@ -1,155 +0,0 @@
-<?php
-class STP_Import {
-	function header()  {
-		echo '<div class="wrap">';
-		echo '<h2>'.__('Import Simple Tagging').'</h2>';
-		echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'<br /><br /></p>';
-	}
-
-	function footer() {
-		echo '</div>';
-	}
-
-	function greet() {
-		echo '<div class="narrow">';
-		echo '<p>'.__('Howdy! This imports tags from an existing Simple Tagging 1.6.2 installation into this blog using the new WordPress native tagging structure.').'</p>';
-		echo '<p>'.__('This has not been tested on any other versions of Simple Tagging. Mileage may vary.').'</p>';
-		echo '<p>'.__('To accommodate larger databases for those tag-crazy authors out there, we have made this into an easy 4-step program to help you kick that nasty Simple Tagging habit. Just keep clicking along and we will let you know when you are in the clear!').'</p>';
-		echo '<p><strong>'.__('Don&#8217;t be stupid - backup your database before proceeding!').'</strong></p>';
-		echo '<form action="admin.php?import=stp&amp;step=1" method="post">';
-		wp_nonce_field('import-stp');
-		echo '<p class="submit"><input type="submit" name="submit" value="'.__('Step 1 &raquo;').'" /></p>';
-		echo '</form>';
-		echo '</div>';
-	}
-
-	function dispatch () {
-		if ( empty( $_GET['step'] ) ) {
-			$step = 0;
-		} else {
-			$step = (int) $_GET['step'];
-		}
-		// load the header
-		$this->header();
-		switch ( $step ) {
-			case 0 :
-				$this->greet();
-				break;
-			case 1 :
-				check_admin_referer('import-stp');
-				$this->import_posts();
-				break;
-			case 2:
-				check_admin_referer('import-stp');
-				$this->import_t2p();
-				break;
-			case 3:
-				check_admin_referer('import-stp');
-				$this->cleanup_import();
-				break;
-		}
-		// load the footer
-		$this->footer();
-	}
-
-
-	function import_posts ( ) {
-		echo '<div class="narrow">';
-		echo '<p><h3>'.__('Reading STP Post Tags&#8230;').'</h3></p>';
-
-		// read in all the STP tag -> post settings
-		$posts = $this->get_stp_posts();
-
-		// if we didn't get any tags back, that's all there is folks!
-		if ( !is_array($posts) ) {
-			echo '<p>' . __('No posts were found to have tags!') . '</p>';
-			return false;
-		}
-		else {
-			// if there's an existing entry, delete it
-			if ( get_option('stpimp_posts') ) {
-				delete_option('stpimp_posts');
-			}
-			
-			add_option('stpimp_posts', $posts);
-			$count = count($posts);
-			echo '<p>' . sprintf( __('Done! <strong>%s</strong> tag to post relationships were read.'), $count ) . '<br /></p>';
-		}
-
-		echo '<form action="admin.php?import=stp&amp;step=2" method="post">';
-		wp_nonce_field('import-stp');
-		echo '<p class="submit"><input type="submit" name="submit" value="'.__('Step 2 &raquo;').'" /></p>';
-		echo '</form>';
-		echo '</div>';
-	}
-
-
-	function import_t2p ( ) {
-		echo '<div class="narrow">';
-		echo '<p><h3>'.__('Adding Tags to Posts&#8230;').'</h3></p>';
-		
-		// run that funky magic!
-		$tags_added = $this->tag2post();
-		
-		echo '<p>' . sprintf( __('Done! <strong>%s</strong> tags where added!'), $tags_added ) . '<br /></p>';
-		echo '<form action="admin.php?import=stp&amp;step=3" method="post">';
-		wp_nonce_field('import-stp');
-		echo '<p class="submit"><input type="submit" name="submit" value="'.__('Step 3 &raquo;').'" /></p>';
-		echo '</form>';
-		echo '</div>';
-	}
-
-	function get_stp_posts ( ) {
-		global $wpdb;
-		// read in all the posts from the STP post->tag table: should be wp_post2tag
-		$posts_query = "SELECT post_id, tag_name FROM " . $wpdb->prefix . "stp_tags";
-		$posts = $wpdb->get_results($posts_query);
-		return $posts;
-	}
-
-	function tag2post ( ) {
-		global $wpdb;
-
-		// get the tags and posts we imported in the last 2 steps
-		$posts = get_option('stpimp_posts');
-
-		// null out our results
-		$tags_added = 0;
-
-		// loop through each post and add its tags to the db
-		foreach ( $posts as $this_post ) {
-			$the_post = (int) $this_post->post_id;
-			$the_tag = $wpdb->escape($this_post->tag_name);
-			// try to add the tag
-			wp_add_post_tags($the_post, $the_tag);
-			$tags_added++;
-		}
-
-		// that's it, all posts should be linked to their tags properly, pending any errors we just spit out!
-		return $tags_added;
-	}
-
-	function cleanup_import ( ) {
-		delete_option('stpimp_posts');
-		$this->done();
-	}
-
-	function done ( ) {
-		echo '<div class="narrow">';
-		echo '<p><h3>'.__('Import Complete!').'</h3></p>';
-		echo '<p>' . __('OK, so we lied about this being a 4-step program! You&#8217;re done!') . '</p>';
-		echo '<p>' . __('Now wasn&#8217;t that easy?') . '</p>';
-		echo '</div>';
-	}
-
-	function STP_Import ( ) {
-		// Nothing.
-	}
-}
-
-// create the import object
-$stp_import = new STP_Import();
-
-// add it to the import page!
-register_importer('stp', 'Simple Tagging', __('Import Simple Tagging tags into the new native tagging structure.'), array($stp_import, 'dispatch'));
-?>
--- a/wp-admin/import/textpattern.php
+++ b/wp-admin/import/textpattern.php
@@ -1,673 +0,0 @@
-<?php
-/**
-	Add These Functions to make our lives easier
-**/
-
-if(!function_exists('get_comment_count'))
-{
-	function get_comment_count($post_ID)
-	{
-		global $wpdb;
-		return $wpdb->get_var('SELECT count(*) FROM '.$wpdb->comments.' WHERE comment_post_ID = '.$post_ID);
-	}
-}
-
-if(!function_exists('link_exists'))
-{
-	function link_exists($linkname)
-	{
-		global $wpdb;
-		return $wpdb->get_var('SELECT link_id FROM '.$wpdb->links.' WHERE link_name = "'.$wpdb->escape($linkname).'"');
-	}
-}
-
-/**
-	The Main Importer Class
-**/
-class Textpattern_Import {
-
-	function header()
-	{
-		echo '<div class="wrap">';
-		echo '<h2>'.__('Import Textpattern').'</h2>';
-		echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'</p>';
-	}
-
-	function footer()
-	{
-		echo '</div>';
-	}
-
-	function greet() {
-		echo '<div class="narrow">';
-		echo '<p>'.__('Howdy! This imports categories, users, posts, comments, and links from any Textpattern 4.0.2+ into this blog.').'</p>';
-		echo '<p>'.__('This has not been tested on previous versions of Textpattern.  Mileage may vary.').'</p>';
-		echo '<p>'.__('Your Textpattern Configuration settings are as follows:').'</p>';
-		echo '<form action="admin.php?import=textpattern&amp;step=1" method="post">';
-		wp_nonce_field('import-textpattern');
-		$this->db_form();
-		echo '<p class="submit"><input type="submit" name="submit" value="'.attribute_escape(__('Import Categories &raquo;')).'" /></p>';
-		echo '</form>';
-		echo '</div>';
-	}
-
-	function get_txp_cats()
-	{
-		global $wpdb;
-		// General Housekeeping
-		$txpdb = new wpdb(get_option('txpuser'), get_option('txppass'), get_option('txpname'), get_option('txphost'));
-		set_magic_quotes_runtime(0);
-		$prefix = get_option('tpre');
-
-		// Get Categories
-		return $txpdb->get_results('SELECT
-			id,
-			name,
-			title
-			FROM '.$prefix.'txp_category
-			WHERE type = "article"',
-			ARRAY_A);
-	}
-
-	function get_txp_users()
-	{
-		global $wpdb;
-		// General Housekeeping
-		$txpdb = new wpdb(get_option('txpuser'), get_option('txppass'), get_option('txpname'), get_option('txphost'));
-		set_magic_quotes_runtime(0);
-		$prefix = get_option('tpre');
-
-		// Get Users
-
-		return $txpdb->get_results('SELECT
-			user_id,
-			name,
-			RealName,
-			email,
-			privs
-			FROM '.$prefix.'txp_users', ARRAY_A);
-	}
-
-	function get_txp_posts()
-	{
-		// General Housekeeping
-		$txpdb = new wpdb(get_option('txpuser'), get_option('txppass'), get_option('txpname'), get_option('txphost'));
-		set_magic_quotes_runtime(0);
-		$prefix = get_option('tpre');
-
-		// Get Posts
-		return $txpdb->get_results('SELECT
-			ID,
-			Posted,
-			AuthorID,
-			LastMod,
-			Title,
-			Body,
-			Excerpt,
-			Category1,
-			Category2,
-			Status,
-			Keywords,
-			url_title,
-			comments_count
-			FROM '.$prefix.'textpattern
-			', ARRAY_A);
-	}
-
-	function get_txp_comments()
-	{
-		global $wpdb;
-		// General Housekeeping
-		$txpdb = new wpdb(get_option('txpuser'), get_option('txppass'), get_option('txpname'), get_option('txphost'));
-		set_magic_quotes_runtime(0);
-		$prefix = get_option('tpre');
-
-		// Get Comments
-		return $txpdb->get_results('SELECT * FROM '.$prefix.'txp_discuss', ARRAY_A);
-	}
-
-		function get_txp_links()
-	{
-		//General Housekeeping
-		$txpdb = new wpdb(get_option('txpuser'), get_option('txppass'), get_option('txpname'), get_option('txphost'));
-		set_magic_quotes_runtime(0);
-		$prefix = get_option('tpre');
-
-		return $txpdb->get_results('SELECT
-			id,
-			date,
-			category,
-			url,
-			linkname,
-			description
-			FROM '.$prefix.'txp_link',
-			ARRAY_A);
-	}
-
-	function cat2wp($categories='')
-	{
-		// General Housekeeping
-		global $wpdb;
-		$count = 0;
-		$txpcat2wpcat = array();
-		// Do the Magic
-		if(is_array($categories))
-		{
-			echo '<p>'.__('Importing Categories...').'<br /><br /></p>';
-			foreach ($categories as $category)
-			{
-				$count++;
-				extract($category);
-
-
-				// Make Nice Variables
-				$name = $wpdb->escape($name);
-				$title = $wpdb->escape($title);
-
-				if($cinfo = category_exists($name))
-				{
-					$ret_id = wp_insert_category(array('cat_ID' => $cinfo, 'category_nicename' => $name, 'cat_name' => $title));
-				}
-				else
-				{
-					$ret_id = wp_insert_category(array('category_nicename' => $name, 'cat_name' => $title));
-				}
-				$txpcat2wpcat[$id] = $ret_id;
-			}
-
-			// Store category translation for future use
-			add_option('txpcat2wpcat',$txpcat2wpcat);
-			echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> categories imported.'), $count).'<br /><br /></p>';
-			return true;
-		}
-		echo __('No Categories to Import!');
-		return false;
-	}
-
-	function users2wp($users='')
-	{
-		// General Housekeeping
-		global $wpdb;
-		$count = 0;
-		$txpid2wpid = array();
-
-		// Midnight Mojo
-		if(is_array($users))
-		{
-			echo '<p>'.__('Importing Users...').'<br /><br /></p>';
-			foreach($users as $user)
-			{
-				$count++;
-				extract($user);
-
-				// Make Nice Variables
-				$name = $wpdb->escape($name);
-				$RealName = $wpdb->escape($RealName);
-
-				if($uinfo = get_userdatabylogin($name))
-				{
-
-					$ret_id = wp_insert_user(array(
-								'ID'			=> $uinfo->ID,
-								'user_login'	=> $name,
-								'user_nicename'	=> $RealName,
-								'user_email'	=> $email,
-								'user_url'		=> 'http://',
-								'display_name'	=> $name)
-								);
-				}
-				else
-				{
-					$ret_id = wp_insert_user(array(
-								'user_login'	=> $name,
-								'user_nicename'	=> $RealName,
-								'user_email'	=> $email,
-								'user_url'		=> 'http://',
-								'display_name'	=> $name)
-								);
-				}
-				$txpid2wpid[$user_id] = $ret_id;
-
-				// Set Textpattern-to-WordPress permissions translation
-				$transperms = array(1 => '10', 2 => '9', 3 => '5', 4 => '4', 5 => '3', 6 => '2', 7 => '0');
-
-				// Update Usermeta Data
-				$user = new WP_User($ret_id);
-				if('10' == $transperms[$privs]) { $user->set_role('administrator'); }
-				if('9'  == $transperms[$privs]) { $user->set_role('editor'); }
-				if('5'  == $transperms[$privs]) { $user->set_role('editor'); }
-				if('4'  == $transperms[$privs]) { $user->set_role('author'); }
-				if('3'  == $transperms[$privs]) { $user->set_role('contributor'); }
-				if('2'  == $transperms[$privs]) { $user->set_role('contributor'); }
-				if('0'  == $transperms[$privs]) { $user->set_role('subscriber'); }
-
-				update_usermeta( $ret_id, 'wp_user_level', $transperms[$privs] );
-				update_usermeta( $ret_id, 'rich_editing', 'false');
-			}// End foreach($users as $user)
-
-			// Store id translation array for future use
-			add_option('txpid2wpid',$txpid2wpid);
-
-
-			echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> users imported.'), $count).'<br /><br /></p>';
-			return true;
-		}// End if(is_array($users)
-
-		echo __('No Users to Import!');
-		return false;
-
-	}// End function user2wp()
-
-	function posts2wp($posts='')
-	{
-		// General Housekeeping
-		global $wpdb;
-		$count = 0;
-		$txpposts2wpposts = array();
-		$cats = array();
-
-		// Do the Magic
-		if(is_array($posts))
-		{
-			echo '<p>'.__('Importing Posts...').'<br /><br /></p>';
-			foreach($posts as $post)
-			{
-				$count++;
-				extract($post);
-
-				// Set Textpattern-to-WordPress status translation
-				$stattrans = array(1 => 'draft', 2 => 'private', 3 => 'draft', 4 => 'publish', 5 => 'publish');
-
-				//Can we do this more efficiently?
-				$uinfo = ( get_userdatabylogin( $AuthorID ) ) ? get_userdatabylogin( $AuthorID ) : 1;
-				$authorid = ( is_object( $uinfo ) ) ? $uinfo->ID : $uinfo ;
-
-				$Title = $wpdb->escape($Title);
-				$Body = $wpdb->escape($Body);
-				$Excerpt = $wpdb->escape($Excerpt);
-				$post_status = $stattrans[$Status];
-
-				// Import Post data into WordPress
-
-				if($pinfo = post_exists($Title,$Body))
-				{
-					$ret_id = wp_insert_post(array(
-						'ID'				=> $pinfo,
-						'post_date'			=> $Posted,
-						'post_date_gmt'		=> $post_date_gmt,
-						'post_author'		=> $authorid,
-						'post_modified'		=> $LastMod,
-						'post_modified_gmt' => $post_modified_gmt,
-						'post_title'		=> $Title,
-						'post_content'		=> $Body,
-						'post_excerpt'		=> $Excerpt,
-						'post_status'		=> $post_status,
-						'post_name'			=> $url_title,
-						'comment_count'		=> $comments_count)
-						);
-					if ( is_wp_error( $ret_id ) )
-						return $ret_id;
-				}
-				else
-				{
-					$ret_id = wp_insert_post(array(
-						'post_date'			=> $Posted,
-						'post_date_gmt'		=> $post_date_gmt,
-						'post_author'		=> $authorid,
-						'post_modified'		=> $LastMod,
-						'post_modified_gmt' => $post_modified_gmt,
-						'post_title'		=> $Title,
-						'post_content'		=> $Body,
-						'post_excerpt'		=> $Excerpt,
-						'post_status'		=> $post_status,
-						'post_name'			=> $url_title,
-						'comment_count'		=> $comments_count)
-						);
-					if ( is_wp_error( $ret_id ) )
-						return $ret_id;
-				}
-				$txpposts2wpposts[$ID] = $ret_id;
-
-				// Make Post-to-Category associations
-				$cats = array();
-				$category1 = get_category_by_slug($Category1);
-				$category1 = $category1->term_id;
-				$category2 = get_category_by_slug($Category2);
-				$category2 = $category1->term_id;
-				if($cat1 = $category1) { $cats[1] = $cat1; }
-				if($cat2 = $category2) { $cats[2] = $cat2; }
-
-				if(!empty($cats)) { wp_set_post_categories($ret_id, $cats); }
-			}
-		}
-		// Store ID translation for later use
-		add_option('txpposts2wpposts',$txpposts2wpposts);
-
-		echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> posts imported.'), $count).'<br /><br /></p>';
-		return true;
-	}
-
-	function comments2wp($comments='')
-	{
-		// General Housekeeping
-		global $wpdb;
-		$count = 0;
-		$txpcm2wpcm = array();
-		$postarr = get_option('txpposts2wpposts');
-
-		// Magic Mojo
-		if(is_array($comments))
-		{
-			echo '<p>'.__('Importing Comments...').'<br /><br /></p>';
-			foreach($comments as $comment)
-			{
-				$count++;
-				extract($comment);
-
-				// WordPressify Data
-				$comment_ID = ltrim($discussid, '0');
-				$comment_post_ID = $postarr[$parentid];
-				$comment_approved = (1 == $visible) ? 1 : 0;
-				$name = $wpdb->escape($name);
-				$email = $wpdb->escape($email);
-				$web = $wpdb->escape($web);
-				$message = $wpdb->escape($message);
-
-				if($cinfo = comment_exists($name, $posted))
-				{
-					// Update comments
-					$ret_id = wp_update_comment(array(
-						'comment_ID'			=> $cinfo,
-						'comment_post_ID'		=> $comment_post_ID,
-						'comment_author'		=> $name,
-						'comment_author_email'	=> $email,
-						'comment_author_url'	=> $web,
-						'comment_date'			=> $posted,
-						'comment_content'		=> $message,
-						'comment_approved'		=> $comment_approved)
-						);
-				}
-				else
-				{
-					// Insert comments
-					$ret_id = wp_insert_comment(array(
-						'comment_post_ID'		=> $comment_post_ID,
-						'comment_author'		=> $name,
-						'comment_author_email'	=> $email,
-						'comment_author_url'	=> $web,
-						'comment_author_IP'		=> $ip,
-						'comment_date'			=> $posted,
-						'comment_content'		=> $message,
-						'comment_approved'		=> $comment_approved)
-						);
-				}
-				$txpcm2wpcm[$comment_ID] = $ret_id;
-			}
-			// Store Comment ID translation for future use
-			add_option('txpcm2wpcm', $txpcm2wpcm);
-
-			// Associate newly formed categories with posts
-			get_comment_count($ret_id);
-
-
-			echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> comments imported.'), $count).'<br /><br /></p>';
-			return true;
-		}
-		echo __('No Comments to Import!');
-		return false;
-	}
-
-	function links2wp($links='')
-	{
-		// General Housekeeping
-		global $wpdb;
-		$count = 0;
-
-		// Deal with the links
-		if(is_array($links))
-		{
-			echo '<p>'.__('Importing Links...').'<br /><br /></p>';
-			foreach($links as $link)
-			{
-				$count++;
-				extract($link);
-
-				// Make nice vars
-				$category = $wpdb->escape($category);
-				$linkname = $wpdb->escape($linkname);
-				$description = $wpdb->escape($description);
-
-				if($linfo = link_exists($linkname))
-				{
-					$ret_id = wp_insert_link(array(
-								'link_id'			=> $linfo,
-								'link_url'			=> $url,
-								'link_name'			=> $linkname,
-								'link_category'		=> $category,
-								'link_description'	=> $description,
-								'link_updated'		=> $date)
-								);
-				}
-				else
-				{
-					$ret_id = wp_insert_link(array(
-								'link_url'			=> $url,
-								'link_name'			=> $linkname,
-								'link_category'		=> $category,
-								'link_description'	=> $description,
-								'link_updated'		=> $date)
-								);
-				}
-				$txplinks2wplinks[$link_id] = $ret_id;
-			}
-			add_option('txplinks2wplinks',$txplinks2wplinks);
-			echo '<p>';
-			printf(__('Done! <strong>%s</strong> Links imported'), $count);
-			echo '<br /><br /></p>';
-			return true;
-		}
-		echo __('No Links to Import!');
-		return false;
-	}
-
-	function import_categories()
-	{
-		// Category Import
-		$cats = $this->get_txp_cats();
-		$this->cat2wp($cats);
-		add_option('txp_cats', $cats);
-
-
-
-		echo '<form action="admin.php?import=textpattern&amp;step=2" method="post">';
-		wp_nonce_field('import-textpattern');
-		printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Users')));
-		echo '</form>';
-
-	}
-
-	function import_users()
-	{
-		// User Import
-		$users = $this->get_txp_users();
-		$this->users2wp($users);
-
-		echo '<form action="admin.php?import=textpattern&amp;step=3" method="post">';
-		wp_nonce_field('import-textpattern');
-		printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Posts')));
-		echo '</form>';
-	}
-
-	function import_posts()
-	{
-		// Post Import
-		$posts = $this->get_txp_posts();
-		$result = $this->posts2wp($posts);
-		if ( is_wp_error( $result ) )
-			return $result;
-
-		echo '<form action="admin.php?import=textpattern&amp;step=4" method="post">';
-		wp_nonce_field('import-textpattern');
-		printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Comments')));
-		echo '</form>';
-	}
-
-	function import_comments()
-	{
-		// Comment Import
-		$comments = $this->get_txp_comments();
-		$this->comments2wp($comments);
-
-		echo '<form action="admin.php?import=textpattern&amp;step=5" method="post">';
-		wp_nonce_field('import-textpattern');
-		printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Links')));
-		echo '</form>';
-	}
-
-	function import_links()
-	{
-		//Link Import
-		$links = $this->get_txp_links();
-		$this->links2wp($links);
-		add_option('txp_links', $links);
-
-		echo '<form action="admin.php?import=textpattern&amp;step=6" method="post">';
-		wp_nonce_field('import-textpattern');
-		printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Finish')));
-		echo '</form>';
-	}
-
-	function cleanup_txpimport()
-	{
-		delete_option('tpre');
-		delete_option('txp_cats');
-		delete_option('txpid2wpid');
-		delete_option('txpcat2wpcat');
-		delete_option('txpposts2wpposts');
-		delete_option('txpcm2wpcm');
-		delete_option('txplinks2wplinks');
-		delete_option('txpuser');
-		delete_option('txppass');
-		delete_option('txpname');
-		delete_option('txphost');
-		$this->tips();
-	}
-
-	function tips()
-	{
-		echo '<p>'.__('Welcome to WordPress.  We hope (and expect!) that you will find this platform incredibly rewarding!  As a new WordPress user coming from Textpattern, there are some things that we would like to point out.  Hopefully, they will help your transition go as smoothly as possible.').'</p>';
-		echo '<h3>'.__('Users').'</h3>';
-		echo '<p>'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password.  Forget it.  You didn&#8217;t have that login in Textpattern, why should you have it here?  Instead we have taken care to import all of your users into our system.  Unfortunately there is one downside.  Because both WordPress and Textpattern uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users.  <strong>Every user has the same username, but their passwords are reset to password123.</strong>  So <a href="%1$s">Login</a> and change it.'), get_bloginfo( 'wpurl' ) . '/wp-login.php').'</p>';
-		echo '<h3>'.__('Preserving Authors').'</h3>';
-		echo '<p>'.__('Secondly, we have attempted to preserve post authors.  If you are the only author or contributor to your blog, then you are safe.  In most cases, we are successful in this preservation endeavor.  However, if we cannot ascertain the name of the writer due to discrepancies between database tables, we assign it to you, the administrative user.').'</p>';
-		echo '<h3>'.__('Textile').'</h3>';
-		echo '<p>'.__('Also, since you&#8217;re coming from Textpattern, you probably have been using Textile to format your comments and posts.  If this is the case, we recommend downloading and installing <a href="http://www.huddledmasses.org/category/development/wordpress/textile/">Textile for WordPress</a>.  Trust me... You&#8217;ll want it.').'</p>';
-		echo '<h3>'.__('WordPress Resources').'</h3>';
-		echo '<p>'.__('Finally, there are numerous WordPress resources around the internet.  Some of them are:').'</p>';
-		echo '<ul>';
-		echo '<li>'.__('<a href="http://www.wordpress.org">The official WordPress site</a>').'</li>';
-		echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums</a>').'</li>';
-		echo '<li>'.__('<a href="http://codex.wordpress.org">The Codex (In other words, the WordPress Bible)</a>').'</li>';
-		echo '</ul>';
-		echo '<p>'.sprintf(__('That&#8217;s it! What are you waiting for? Go <a href="%1$s">login</a>!'), get_bloginfo( 'wpurl' ) . '/wp-login.php').'</p>';
-	}
-
-	function db_form()
-	{
-		echo '<table class="editform">';
-		printf('<tr><th scope="row"><label for="dbuser">%s</label></th><td><input type="text" name="dbuser" id="dbuser" /></td></tr>', __('Textpattern Database User:'));
-		printf('<tr><th scope="row"><label for="dbpass">%s</label></th><td><input type="password" name="dbpass" id="dbpass" /></td></tr>', __('Textpattern Database Password:'));
-		printf('<tr><th scope="row"><label for="dbname">%s</label></th><td><input type="text" id="dbname" name="dbname" /></td></tr>', __('Textpattern Database Name:'));
-		printf('<tr><th scope="row"><label for="dbhost">%s</label></th><td><input type="text" id="dbhost" name="dbhost" value="localhost" /></td></tr>', __('Textpattern Database Host:'));
-		printf('<tr><th scope="row"><label for="dbprefix">%s</label></th><td><input type="text" name="dbprefix" id="dbprefix"  /></td></tr>', __('Textpattern Table prefix (if any):'));
-		echo '</table>';
-	}
-
-	function dispatch()
-	{
-
-		if (empty ($_GET['step']))
-			$step = 0;
-		else
-			$step = (int) $_GET['step'];
-		$this->header();
-
-		if ( $step > 0 )
-		{
-			check_admin_referer('import-textpattern');
-
-			if($_POST['dbuser'])
-			{
-				if(get_option('txpuser'))
-					delete_option('txpuser');
-				add_option('txpuser', sanitize_user($_POST['dbuser'], true));
-			}
-			if($_POST['dbpass'])
-			{
-				if(get_option('txppass'))
-					delete_option('txppass');
-				add_option('txppass',  sanitize_user($_POST['dbpass'], true));
-			}
-
-			if($_POST['dbname'])
-			{
-				if(get_option('txpname'))
-					delete_option('txpname');
-				add_option('txpname',  sanitize_user($_POST['dbname'], true));
-			}
-			if($_POST['dbhost'])
-			{
-				if(get_option('txphost'))
-					delete_option('txphost');
-				add_option('txphost',  sanitize_user($_POST['dbhost'], true));
-			}
-			if($_POST['dbprefix'])
-			{
-				if(get_option('tpre'))
-					delete_option('tpre');
-				add_option('tpre',  sanitize_user($_POST['dbprefix']));
-			}
-
-
-		}
-
-		switch ($step)
-		{
-			default:
-			case 0 :
-				$this->greet();
-				break;
-			case 1 :
-				$this->import_categories();
-				break;
-			case 2 :
-				$this->import_users();
-				break;
-			case 3 :
-				$result = $this->import_posts();
-				if ( is_wp_error( $result ) ) 
-					echo $result->get_error_message();
-				break;
-			case 4 :
-				$this->import_comments();
-				break;
-			case 5 :
-				$this->import_links();
-				break;
-			case 6 :
-				$this->cleanup_txpimport();
-				break;
-		}
-
-		$this->footer();
-	}
-
-	function Textpattern_Import()
-	{
-		// Nothing.
-	}
-}
-
-$txp_import = new Textpattern_Import();
-register_importer('textpattern', __('Textpattern'), __('Import categories, users, posts, comments, and links from a Textpattern blog'), array ($txp_import, 'dispatch'));
-?>
--- a/wp-admin/import/utw.php
+++ b/wp-admin/import/utw.php
@@ -1,276 +0,0 @@
-<?php
-
-class UTW_Import {
-
-	function header()  {
-		echo '<div class="wrap">';
-		echo '<h2>'.__('Import Ultimate Tag Warrior').'</h2>';
-		echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'<br /><br /></p>';
-	}
-
-	function footer() {
-		echo '</div>';
-	}
-
-	function greet() {
-		echo '<div class="narrow">';
-		echo '<p>'.__('Howdy! This imports tags from an existing Ultimate Tag Warrior 3 installation into this blog using the new WordPress native tagging structure.').'</p>';
-		echo '<p>'.__('This has not been tested on any other versions of Ultimate Tag Warrior. Mileage may vary.').'</p>';
-		echo '<p>'.__('To accommodate larger databases for those tag-crazy authors out there, we have made this into an easy 5-step program to help you kick that nasty UTW habit. Just keep clicking along and we will let you know when you are in the clear!').'</p>';
-		echo '<p><strong>'.__('Don&#8217;t be stupid - backup your database before proceeding!').'</strong></p>';
-		echo '<form action="admin.php?import=utw&amp;step=1" method="post">';
-		echo '<p class="submit"><input type="submit" name="submit" value="'.__('Step 1 &raquo;').'" /></p>';
-		echo '</form>';
-		echo '</div>';
-	}
-
-
-	function dispatch () {
-		if ( empty( $_GET['step'] ) ) {
-			$step = 0;
-		} else {
-			$step = (int) $_GET['step'];
-		}
-
-		if ( $step > 1 )
-			check_admin_referer('import-utw');
-
-		// load the header
-		$this->header();
-
-		switch ( $step ) {
-			case 0 :
-				$this->greet();
-				break;
-			case 1 :
-				$this->import_tags();
-				break;
-			case 2 :
-				$this->import_posts();
-				break;
-			case 3:
-				$this->import_t2p();
-				break;
-			case 4:
-				$this->cleanup_import();
-				break;
-		}
-
-		// load the footer
-		$this->footer();
-	}
-
-
-	function import_tags ( ) {
-		echo '<div class="narrow">';
-		echo '<p><h3>'.__('Reading UTW Tags&#8230;').'</h3></p>';
-
-		$tags = $this->get_utw_tags();
-
-		// if we didn't get any tags back, that's all there is folks!
-		if ( !is_array($tags) ) {
-			echo '<p>' . __('No Tags Found!') . '</p>';
-			return false;
-		}
-		else {
-
-			// if there's an existing entry, delete it
-			if ( get_option('utwimp_tags') ) {
-				delete_option('utwimp_tags');
-			}
-
-			add_option('utwimp_tags', $tags);
-
-
-			$count = count($tags);
-
-			echo '<p>' . sprintf( __('Done! <strong>%s</strong> tags were read.'), $count ) . '<br /></p>';
-			echo '<p>' . __('The following tags were found:') . '</p>';
-
-			echo '<ul>';
-
-			foreach ( $tags as $tag_id => $tag_name ) {
-
-				echo '<li>' . $tag_name . '</li>';
-
-			}
-
-			echo '</ul>';
-
-			echo '<br />';
-
-			echo '<p>' . __('If you don&#8217;t want to import any of these tags, you should delete them from the UTW tag management page and then re-run this import.') . '</p>';
-
-
-		}
-
-		echo '<form action="admin.php?import=utw&amp;step=2" method="post">';
-		wp_nonce_field('import-utw');
-		echo '<p class="submit"><input type="submit" name="submit" value="'.__('Step 2 &raquo;').'" /></p>';
-		echo '</form>';
-		echo '</div>';
-	}
-
-
-	function import_posts ( ) {
-		echo '<div class="narrow">';
-		echo '<p><h3>'.__('Reading UTW Post Tags&#8230;').'</h3></p>';
-
-		// read in all the UTW tag -> post settings
-		$posts = $this->get_utw_posts();
-
-		// if we didn't get any tags back, that's all there is folks!
-		if ( !is_array($posts) ) {
-			echo '<p>' . __('No posts were found to have tags!') . '</p>';
-			return false;
-		}
-		else {
-
-			// if there's an existing entry, delete it
-			if ( get_option('utwimp_posts') ) {
-				delete_option('utwimp_posts');
-			}
-
-			add_option('utwimp_posts', $posts);
-
-
-			$count = count($posts);
-
-			echo '<p>' . sprintf( __('Done! <strong>%s</strong> tag to post relationships were read.'), $count ) . '<br /></p>';
-
-		}
-
-		echo '<form action="admin.php?import=utw&amp;step=3" method="post">';
-		wp_nonce_field('import-utw');
-		echo '<p class="submit"><input type="submit" name="submit" value="'.__('Step 3 &raquo;').'" /></p>';
-		echo '</form>';
-		echo '</div>';
-
-	}
-
-
-	function import_t2p ( ) {
-
-		echo '<div class="narrow">';
-		echo '<p><h3>'.__('Adding Tags to Posts&#8230;').'</h3></p>';
-
-		// run that funky magic!
-		$tags_added = $this->tag2post();
-
-		echo '<p>' . sprintf( __('Done! <strong>%s</strong> tags where added!'), $tags_added ) . '<br /></p>';
-
-		echo '<form action="admin.php?import=utw&amp;step=4" method="post">';
-		wp_nonce_field('import-utw');
-		echo '<p class="submit"><input type="submit" name="submit" value="'.__('Step 4 &raquo;').'" /></p>';
-		echo '</form>';
-		echo '</div>';
-
-	}
-
-
-	function get_utw_tags ( ) {
-
-		global $wpdb;
-
-		// read in all the tags from the UTW tags table: should be wp_tags
-		$tags_query = "SELECT tag_id, tag FROM " . $wpdb->prefix . "tags";
-
-		$tags = $wpdb->get_results($tags_query);
-
-		// rearrange these tags into something we can actually use
-		foreach ( $tags as $tag ) {
-
-			$new_tags[$tag->tag_id] = $tag->tag;
-
-		}
-
-		return $new_tags;
-
-	}
-
-	function get_utw_posts ( ) {
-
-		global $wpdb;
-
-		// read in all the posts from the UTW post->tag table: should be wp_post2tag
-		$posts_query = "SELECT tag_id, post_id FROM " . $wpdb->prefix . "post2tag";
-
-		$posts = $wpdb->get_results($posts_query);
-
-		return $posts;
-
-	}
-
-
-	function tag2post ( ) {
-
-		// get the tags and posts we imported in the last 2 steps
-		$tags = get_option('utwimp_tags');
-		$posts = get_option('utwimp_posts');
-
-		// null out our results
-		$tags_added = 0;
-
-		// loop through each post and add its tags to the db
-		foreach ( $posts as $this_post ) {
-
-			$the_post = (int) $this_post->post_id;
-			$the_tag = (int) $this_post->tag_id;
-
-			// what's the tag name for that id?
-			$the_tag = $tags[$the_tag];
-
-			// screw it, just try to add the tag
-			wp_add_post_tags($the_post, $the_tag);
-
-			$tags_added++;
-
-		}
-
-		// that's it, all posts should be linked to their tags properly, pending any errors we just spit out!
-		return $tags_added;
-
-
-	}
-
-
-	function cleanup_import ( ) {
-
-		delete_option('utwimp_tags');
-		delete_option('utwimp_posts');
-
-		$this->done();
-
-	}
-
-
-	function done ( ) {
-
-		echo '<div class="narrow">';
-		echo '<p><h3>'.__('Import Complete!').'</h3></p>';
-
-		echo '<p>' . __('OK, so we lied about this being a 5-step program! You&#8217;re done!') . '</p>';
-
-		echo '<p>' . __('Now wasn&#8217;t that easy?') . '</p>';
-
-		echo '</div>';
-
-	}
-
-
-	function UTW_Import ( ) {
-
-		// Nothing.
-
-	}
-
-}
-
-
-// create the import object
-$utw_import = new UTW_Import();
-
-// add it to the import page!
-register_importer('utw', 'Ultimate Tag Warrior', __('Import Ultimate Tag Warrior tags into the new native tagging structure.'), array($utw_import, 'dispatch'));
-
-?>
--- a/wp-admin/import/wordpress.php
+++ b/wp-admin/import/wordpress.php
@@ -1,489 +0,0 @@
-<?php
-
-class WP_Import {
-
-	var $posts = array ();
-	var $posts_processed = array ();
-    // Array of arrays. [[0] => XML fragment, [1] => New post ID]
-	var $file;
-	var $id;
-	var $mtnames = array ();
-	var $newauthornames = array ();
-	var $j = -1;
-
-	function header() {
-		echo '<div class="wrap">';
-		echo '<h2>'.__('Import WordPress').'</h2>';
-	}
-
-	function footer() {
-		echo '</div>';
-	}
-
-	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 '<div class="narrow">';
-		echo '<p>'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts, comments, custom fields, and categories into this blog.').'</p>';
-		echo '<p>'.__('Choose a WordPress WXR file to upload, then click Upload file and import.').'</p>';
-		wp_import_upload_form("admin.php?import=wordpress&amp;step=1");
-		echo '</div>';
-	}
-
-	function get_tag( $string, $tag ) {
-		global $wpdb;
-		preg_match("|<$tag.*?>(.*?)</$tag>|is", $string, $return);
-		$return = preg_replace('|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1]);
-		$return = $wpdb->escape( trim( $return ) );
-		return $return;
-	}
-
-	function users_form($n) {
-		global $wpdb, $testing;
-		$users = $wpdb->get_results("SELECT user_login FROM $wpdb->users ORDER BY user_login");
-?><select name="userselect[<?php echo $n; ?>]">
-	<option value="#NONE#">- Select -</option>
-	<?php
-		foreach ($users as $user) {
-			echo '<option value="'.$user->user_login.'">'.$user->user_login.'</option>';
-		}
-?>
-	</select>
-	<?php
-	}
-
-	//function to check the authorname and do the mapping
-	function checkauthor($author) {
-		global $wpdb;
-		//mtnames is an array with the names in the mt import file
-		$pass = 'changeme';
-		if (!(in_array($author, $this->mtnames))) { //a new mt author name is found
-			++ $this->j;
-			$this->mtnames[$this->j] = $author; //add that new mt author name to an array
-			$user_id = username_exists($this->newauthornames[$this->j]); //check if the new author name defined by the user is a pre-existing wp user
-			if (!$user_id) { //banging my head against the desk now.
-				if ($this->newauthornames[$this->j] == 'left_blank') { //check if the user does not want to change the authorname
-					$user_id = wp_create_user($author, $pass);
-					$this->newauthornames[$this->j] = $author; //now we have a name, in the place of left_blank.
-				} else {
-					$user_id = wp_create_user($this->newauthornames[$this->j], $pass);
-				}
-			} else {
-				return $user_id; // return pre-existing wp username if it exists
-			}
-		} else {
-			$key = array_search($author, $this->mtnames); //find the array key for $author in the $mtnames array
-			$user_id = username_exists($this->newauthornames[$key]); //use that key to get the value of the author's name from $newauthornames
-		}
-
-		return $user_id;
-	}
-
-	function get_entries() {
-		set_magic_quotes_runtime(0);
-
-		$this->posts = array();
-		$this->categories = array();
-		$this->tags = array();
-		$num = 0;
-		$doing_entry = false;
-
-		$fp = fopen($this->file, 'r');
-		if ($fp) {
-			while ( !feof($fp) ) {
-				$importline = rtrim(fgets($fp));
-
-				if ( false !== strpos($importline, '<wp:category>') ) {
-					preg_match('|<wp:category>(.*?)</wp:category>|is', $importline, $category);
-					$this->categories[] = $category[1];
-					continue;
-				}
-				if ( false !== strpos($importline, '<wp:tag>') ) {
-					preg_match('|<wp:tag>(.*?)</wp:tag>|is', $importline, $tag);
-					$this->tags[] = $tag[1];
-					continue;
-				}
-				if ( false !== strpos($importline, '<item>') ) {
-					$this->posts[$num] = '';
-					$doing_entry = true;
-					continue;
-				}
-				if ( false !== strpos($importline, '</item>') ) {
-					$num++;
-					$doing_entry = false;
-					continue;
-				}
-				if ( $doing_entry ) {
-					$this->posts[$num] .= $importline . "\n";
-				}
-			}
-
-			foreach ($this->posts as $post) {
-				$post_ID = (int) $this->get_tag( $post, 'wp:post_id' );
-				if ($post_ID) {
-					$this->posts_processed[$post_ID][0] = &$post;
-					$this->posts_processed[$post_ID][1] = 0;
-				}
-			}
-
-			fclose($fp);
-		}
-	}
-
-	function get_wp_authors() {
-		$temp = array ();
-		$i = -1;
-		foreach ($this->posts as $post) {
-			if ('' != trim($post)) {
-				++ $i;
-				$author = $this->get_tag( $post, 'dc:creator' );
-				array_push($temp, "$author"); //store the extracted author names in a temporary array
-			}
-		}
-
-		// We need to find unique values of author names, while preserving the order, so this function emulates the unique_value(); php function, without the sorting.
-		$authors[0] = array_shift($temp);
-		$y = count($temp) + 1;
-		for ($x = 1; $x < $y; $x ++) {
-			$next = array_shift($temp);
-			if (!(in_array($next, $authors)))
-				array_push($authors, "$next");
-		}
-
-		return $authors;
-	}
-
-	function get_authors_from_post() {
-		$formnames = array ();
-		$selectnames = array ();
-
-		foreach ($_POST['user'] as $key => $line) {
-			$newname = trim(stripslashes($line));
-			if ($newname == '')
-				$newname = 'left_blank'; //passing author names from step 1 to step 2 is accomplished by using POST. left_blank denotes an empty entry in the form.
-			array_push($formnames, "$newname");
-		} // $formnames is the array with the form entered names
-
-		foreach ($_POST['userselect'] as $user => $key) {
-			$selected = trim(stripslashes($key));
-			array_push($selectnames, "$selected");
-		}
-
-		$count = count($formnames);
-		for ($i = 0; $i < $count; $i ++) {
-			if ($selectnames[$i] != '#NONE#') { //if no name was selected from the select menu, use the name entered in the form
-				array_push($this->newauthornames, "$selectnames[$i]");
-			} else {
-				array_push($this->newauthornames, "$formnames[$i]");
-			}
-		}
-	}
-
-	function wp_authors_form() {
-?>
-<h2><?php _e('Assign Authors'); ?></h2>
-<p><?php _e('To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as <code>admin</code>s entries.'); ?></p>
-<p><?php _e('If a new user is created by WordPress, the password will be set, by default, to "changeme". Quite suggestive, eh? ;)'); ?></p>
-	<?php
-
-
-		$authors = $this->get_wp_authors();
-		echo '<ol id="authors">';
-		echo '<form action="?import=wordpress&amp;step=2&amp;id=' . $this->id . '" method="post">';
-		wp_nonce_field('import-wordpress');
-		$j = -1;
-		foreach ($authors as $author) {
-			++ $j;
-			echo '<li>'.__('Current author:').' <strong>'.$author.'</strong><br />'.sprintf(__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30"> <br />');
-			$this->users_form($j);
-			echo '</li>';
-		}
-
-		echo '<input type="submit" value="Submit">'.'<br />';
-		echo '</form>';
-		echo '</ol>';
-
-	}
-
-	function select_authors() {
-		$file = wp_import_handle_upload();
-		if ( isset($file['error']) ) {
-			echo '<p>'.__('Sorry, there has been an error.').'</p>';
-			echo '<p><strong>' . $file['error'] . '</strong></p>';
-			return;
-		}
-		$this->file = $file['file'];
-		$this->id = (int) $file['id'];
-
-		$this->get_entries();
-		$this->wp_authors_form();
-	}
-
-	function process_categories() {
-		global $wpdb;
-
-		$cat_names = (array) get_terms('category', 'fields=names');
-
-		while ( $c = array_shift($this->categories) ) {
-			$cat_name = trim($this->get_tag( $c, 'wp:cat_name' ));
-
-			// If the category exists we leave it alone
-			if ( in_array($cat_name, $cat_names) )
-				continue;
-
-			$category_nicename	= $this->get_tag( $c, 'wp:category_nicename' );
-			$posts_private		= (int) $this->get_tag( $c, 'wp:posts_private' );
-			$links_private		= (int) $this->get_tag( $c, 'wp:links_private' );
-
-			$parent = $this->get_tag( $c, 'wp:category_parent' );
-
-			if ( empty($parent) )
-				$category_parent = '0';
-			else
-				$category_parent = category_exists($parent);
-
-			$catarr = compact('category_nicename', 'category_parent', 'posts_private', 'links_private', 'posts_private', 'cat_name');
-
-			$cat_ID = wp_insert_category($catarr);
-		}
-	}
-
-	function process_tags() {
-		global $wpdb;
-
-		$tag_names = (array) get_terms('post_tag', 'fields=names');
-
-		while ( $c = array_shift($this->tags) ) {
-			$tag_name = trim($this->get_tag( $c, 'wp:tag_name' ));
-
-			// If the category exists we leave it alone
-			if ( in_array($tag_name, $tag_names) )
-				continue;
-
-			$slug = $this->get_tag( $c, 'wp:tag_slug' );
-			$description = $this->get_tag( $c, 'wp:tag_description' );
-
-			$tagarr = compact('slug', 'description');
-
-			$tag_ID = wp_insert_term($tag_name, 'post_tag', $tagarr);
-		}
-	}
-
-	function process_posts() {
-		$i = -1;
-		echo '<ol>';
-
-		foreach ($this->posts as $post) {
-			$result = $this->process_post($post);
-			if ( is_wp_error( $result ) )
-				return $result;
-		}
-
-		echo '</ol>';
-
-		wp_import_cleanup($this->id);
-
-		echo '<h3>'.sprintf(__('All done.').' <a href="%s">'.__('Have fun!').'</a>', get_option('home')).'</h3>';
-	}
-
-	function process_post($post) {
-		global $wpdb;
-
-		$post_ID = (int) $this->get_tag( $post, 'wp:post_id' );
-  		if ( $post_ID && !empty($this->posts_processed[$post_ID][1]) ) // Processed already
-			return 0;
-
-		// There are only ever one of these
-		$post_title     = $this->get_tag( $post, 'title' );
-		$post_date      = $this->get_tag( $post, 'wp:post_date' );
-		$post_date_gmt  = $this->get_tag( $post, 'wp:post_date_gmt' );
-		$comment_status = $this->get_tag( $post, 'wp:comment_status' );
-		$ping_status    = $this->get_tag( $post, 'wp:ping_status' );
-		$post_status    = $this->get_tag( $post, 'wp:status' );
-		$post_name      = $this->get_tag( $post, 'wp:post_name' );
-		$post_parent    = $this->get_tag( $post, 'wp:post_parent' );
-		$menu_order     = $this->get_tag( $post, 'wp:menu_order' );
-		$post_type      = $this->get_tag( $post, 'wp:post_type' );
-		$guid           = $this->get_tag( $post, 'guid' );
-		$post_author    = $this->get_tag( $post, 'dc:creator' );
-
-		$post_content = $this->get_tag( $post, 'content:encoded' );
-		$post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
-		$post_content = str_replace('<br>', '<br />', $post_content);
-		$post_content = str_replace('<hr>', '<hr />', $post_content);
-
-		preg_match_all('|<category domain="tag">(.*?)</category>|is', $post, $tags);
-		$tags = $tags[1];
-
-		$tag_index = 0;
-		foreach ($tags as $tag) {
-			$tags[$tag_index] = $wpdb->escape($this->unhtmlentities(str_replace(array ('<![CDATA[', ']]>'), '', $tag)));
-			$tag_index++;
-		}
-
-		preg_match_all('|<category>(.*?)</category>|is', $post, $categories);
-		$categories = $categories[1];
-
-		$cat_index = 0;
-		foreach ($categories as $category) {
-			$categories[$cat_index] = $wpdb->escape($this->unhtmlentities(str_replace(array ('<![CDATA[', ']]>'), '', $category)));
-			$cat_index++;
-		}
-
-		if ($post_id = post_exists($post_title, '', $post_date)) {
-			echo '<li>';
-			printf(__('Post <i>%s</i> already exists.'), stripslashes($post_title));
-		} else {
-
-			// If it has parent, process parent first.
-			$post_parent = (int) $post_parent;
-			if ($parent = $this->posts_processed[$post_parent]) {
-				if (!$parent[1]) { 
-					$result = $this->process_post($parent[0]); // If not yet, process the parent first.
-					if ( is_wp_error( $result ) )
-						return $result;
-				}
-				$post_parent = $parent[1]; // New ID of the parent;
-			}
-
-			echo '<li>';
-			printf(__('Importing post <i>%s</i>...'), stripslashes($post_title));
-
-			$post_author = $this->checkauthor($post_author); //just so that if a post already exists, new users are not created by checkauthor
-
-			$postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'post_name', 'comment_status', 'ping_status', 'post_modified', 'post_modified_gmt', 'guid', 'post_parent', 'menu_order', 'post_type');
-			$comment_post_ID = $post_id = wp_insert_post($postdata);
-			if ( is_wp_error( $post_id ) )
-				return $post_id;
-
-			// Memorize old and new ID.
-			if ( $post_id && $post_ID && $this->posts_processed[$post_ID] )
-				$this->posts_processed[$post_ID][1] = $post_id; // New ID.
-
-			// Add categories.
-			if (count($categories) > 0) {
-				$post_cats = array();
-				foreach ($categories as $category) {
-					$slug = sanitize_term_field('slug', $category, 0, 'category', 'db');
-					$cat = get_term_by('slug', $slug, 'category');
-					$cat_ID = 0;
-					if ( ! empty($cat) )
-						$cat_ID = $cat->term_id;
-					if ($cat_ID == 0) {
-						$category = $wpdb->escape($category);
-						$cat_ID = wp_insert_category(array('cat_name' => $category));
-					}
-					$post_cats[] = $cat_ID;
-				}
-				wp_set_post_categories($post_id, $post_cats);
-			}
-
-			// Add tags.
-			if (count($tags) > 0) {
-				$post_tags = array();
-				foreach ($tags as $tag) {
-					$slug = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
-					$tag_obj = get_term_by('slug', $slug, 'post_tag');
-					$tag_id = 0;
-					if ( ! empty($tag_obj) )
-						$tag_id = $tag_obj->term_id;
-					if ( $tag_id == 0 ) {
-						$tag = $wpdb->escape($tag);
-						$tag_id = wp_insert_term($tag, 'post_tag');
-						$tag_id = $tag_id['term_id'];
-					}
-					$post_tags[] = $tag_id;
-				}
-				wp_set_post_tags($post_id, $post_tags);
-			}
-		}
-
-		// Now for comments
-		preg_match_all('|<wp:comment>(.*?)</wp:comment>|is', $post, $comments);
-		$comments = $comments[1];
-		$num_comments = 0;
-		if ( $comments) { foreach ($comments as $comment) {
-			$comment_author       = $this->get_tag( $comment, 'wp:comment_author');
-			$comment_author_email = $this->get_tag( $comment, 'wp:comment_author_email');
-			$comment_author_IP    = $this->get_tag( $comment, 'wp:comment_author_IP');
-			$comment_author_url   = $this->get_tag( $comment, 'wp:comment_author_url');
-			$comment_date         = $this->get_tag( $comment, 'wp:comment_date');
-			$comment_date_gmt     = $this->get_tag( $comment, 'wp:comment_date_gmt');
-			$comment_content      = $this->get_tag( $comment, 'wp:comment_content');
-			$comment_approved     = $this->get_tag( $comment, 'wp:comment_approved');
-			$comment_type         = $this->get_tag( $comment, 'wp:comment_type');
-			$comment_parent       = $this->get_tag( $comment, 'wp:comment_parent');
-
-			if ( !comment_exists($comment_author, $comment_date) ) {
-				$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_author_email', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_approved', 'comment_type', 'comment_parent');
-				wp_insert_comment($commentdata);
-				$num_comments++;
-			}
-		} }
-
-		if ( $num_comments )
-			printf(' '.__('(%s comments)'), $num_comments);
-
-		// Now for post meta
-		preg_match_all('|<wp:postmeta>(.*?)</wp:postmeta>|is', $post, $postmeta);
-		$postmeta = $postmeta[1];
-		if ( $postmeta) { foreach ($postmeta as $p) {
-			$key   = $this->get_tag( $p, 'wp:meta_key' );
-			$value = $this->get_tag( $p, 'wp:meta_value' );
-			$value = stripslashes($value); // add_post_meta() will escape.
-			add_post_meta( $post_id, $key, $value );
-		} }
-	}
-
-	function import() {
-		$this->id = (int) $_GET['id'];
-
-		$this->file = get_attached_file($this->id);
-		$this->get_authors_from_post();
-		$this->get_entries();
-		$this->process_categories();
-		$this->process_tags();
-		$result = $this->process_posts();
-		if ( is_wp_error( $result ) )
-			return $result;
-	}
-
-	function dispatch() {
-		if (empty ($_GET['step']))
-			$step = 0;
-		else
-			$step = (int) $_GET['step'];
-
-		$this->header();
-		switch ($step) {
-			case 0 :
-				$this->greet();
-				break;
-			case 1 :
-				check_admin_referer('import-upload');
-				$this->select_authors();
-				break;
-			case 2:
-				check_admin_referer('import-wordpress');
-				$result = $this->import();
-				if ( is_wp_error( $result ) )
-					echo $result->get_error_message();
-				break;
-		}
-		$this->footer();
-	}
-
-	function WP_Import() {
-		// Nothing.
-	}
-}
-
-$wp_import = new WP_Import();
-
-register_importer('wordpress', 'WordPress', __('Import <strong>posts, comments, custom fields, pages, and categories</strong> from a WordPress export file'), array ($wp_import, 'dispatch'));
-
-?>
--- a/wp-admin/import/wp-cat2tag.php
+++ b/wp-admin/import/wp-cat2tag.php
@@ -1,240 +0,0 @@
-<?php
-
-class WP_Categories_to_Tags {
-	var $categories_to_convert = array();
-	var $all_categories = array();
-
-	function header() {
-		print '<div class="wrap">';
-		print '<h2>' . __('Convert Categories to Tags') . '</h2>';
-	}
-
-	function footer() {
-		print '</div>';
-	}
-
-	function populate_all_categories() {
-		global $wpdb;
-
-		$categories = get_categories('get=all');
-		foreach ( $categories as $category ) {
-			if ( !tag_exists($wpdb->escape($category->name)) )
-				$this->all_categories[] = $category;	
-		}
-	}
-
-	function welcome() {
-		$this->populate_all_categories();
-
-		print '<div class="narrow">';
-
-		if (count($this->all_categories) > 0) {
-			print '<p>' . __('Howdy! This converter allows you to selectively convert existing categories to tags. To get started, check the checkboxes of the categories you wish to be converted, then click the Convert button.') . '</p>';
-			print '<p>' . __('Keep in mind that if you convert a category with child categories, those child categories get their parent setting removed, so they\'re in the root.') . '</p>';
-
-			$this->categories_form();
-		} else {
-			print '<p>'.__('You have no categories to convert!').'</p>';
-		}
-
-		print '</div>';
-	}
-
-	function categories_form() {
-		print '<form action="admin.php?import=wp-cat2tag&amp;step=2" method="post">';
-		wp_nonce_field('import-cat2tag');
-		print '<ul style="list-style:none">';
-
-		$hier = _get_term_hierarchy('category');
-
-		foreach ($this->all_categories as $category) {
-			$category = sanitize_term( $category, 'category', 'display' );
-		
-			if ((int) $category->parent == 0) {
-				print '<li><label><input type="checkbox" name="cats_to_convert[]" value="' . intval($category->term_id) . '" /> ' . $category->name . ' (' . $category->count . ')</label>';
-
-				if (isset($hier[$category->term_id])) {
-					$this->_category_children($category, $hier);
-				}
-
-				print '</li>';
-			}
-		}
-
-		print '</ul>';
-
-		print '<p class="submit"><input type="submit" name="maybe_convert_all_cats" value="' . __('Convert All Categories') . '" /> <input type="submit" name="submit" value="' . __('Convert &raquo;') . '" /></p>';
-		print '</form>';
-	}
-
-	function _category_children($parent, $hier) {
-		print '<ul style="list-style:none">';
-
-		foreach ($hier[$parent->term_id] as $child_id) {
-			$child =& get_category($child_id);
-
-			print '<li><label><input type="checkbox" name="cats_to_convert[]" value="' . intval($child->term_id) . '" /> ' . $child->name . ' (' . $child->count . ')</label>';
-
-			if (isset($hier[$child->term_id])) {
-				$this->_category_children($child, $hier);
-			}
-
-			print '</li>';
-		}
-
-		print '</ul>';
-	}
-
-	function _category_exists($cat_id) {
-		global $wpdb;
-
-		$cat_id = (int) $cat_id;
-
-		$maybe_exists = category_exists($cat_id);
-
-		if ( $maybe_exists ) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	function convert_them() {
-		global $wpdb;
-
-		if ( (!isset($_POST['cats_to_convert']) || !is_array($_POST['cats_to_convert'])) && empty($this->categories_to_convert)) {
-			print '<div class="narrow">';
-			print '<p>' . sprintf(__('Uh, oh. Something didn\'t work. Please <a href="%s">try again</a>.'), 'admin.php?import=wp-cat2tag') . '</p>';
-			print '</div>';
-			return;
-		}
-
-
-		if ( empty($this->categories_to_convert) )
-			$this->categories_to_convert = $_POST['cats_to_convert'];
-		$hier = _get_term_hierarchy('category');
-
-		print '<ul>';
-
-		foreach ( (array) $this->categories_to_convert as $cat_id) {
-			$cat_id = (int) $cat_id;
-
-			print '<li>' . sprintf(__('Converting category #%s ... '),  $cat_id);
-
-			if (!$this->_category_exists($cat_id)) {
-				_e('Category doesn\'t exist!');
-			} else {
-				$category =& get_category($cat_id);
-
-				if ( tag_exists($wpdb->escape($category->name)) ) {
-					_e('Category is already a tag.');
-					print '</li>';
-					continue;
-				}
-
-				// If the category is the default, leave category in place and create tag.
-				if ( get_option('default_category') == $category->term_id ) {
-					$id = wp_insert_term($category->name, 'post_tag', array('slug' => $category->slug));
-					$id = $id['term_taxonomy_id'];
-					$posts = get_objects_in_term($category->term_id, 'category');
-					foreach ( $posts as $post ) {
-						if ( !$wpdb->get_var("SELECT object_id FROM $wpdb->term_relationships WHERE object_id = '$post' AND term_taxonomy_id = '$id'") )						
-							$wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id) VALUES ('$post', '$id')");
-					}
-				} else {
-					// Change the category to a tag.
-					$wpdb->query("UPDATE $wpdb->term_taxonomy SET taxonomy = 'post_tag' WHERE term_id = '{$category->term_id}' AND taxonomy = 'category'");
-
-					// Set all parents to 0 (root-level) if their parent was the converted tag
-					$wpdb->query("UPDATE $wpdb->term_taxonomy SET parent = 0 WHERE parent = '{$category->term_id}' AND taxonomy = 'category'");
-				}
-				// Clean the cache
-				clean_category_cache($category->term_id);
-
-				_e('Converted successfully.');
-			}
-
-			print '</li>';
-		}
-
-		print '</ul>';
-	}
-
-	function convert_all_confirm() {
-		print '<div class="narrow">';
-
-		print '<h3>' . __('Confirm') . '</h3>';
-
-		print '<p>' . __('You are about to convert all categories to tags. Are you sure you want to continue?') . '</p>';
-
-		print '<form action="admin.php?import=wp-cat2tag" method="post">';
-		wp_nonce_field('import-cat2tag');
-		print '<p style="text-align:center" class="submit"><input type="submit" value="' . __('Yes') . '" name="yes_convert_all_cats" />&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" value="' . __('No') . '" name="no_dont_do_it" /></p>';
-		print '</form>';
-
-		print '</div>';
-	}
-
-	function convert_all() {
-		global $wpdb;
-
-		$this->populate_all_categories();
-		foreach ( $this->all_categories as $category )
-			$this->categories_to_convert[] = $category->term_id;
-		$this->convert_them();
-	}
-
-	function init() {
-
-		if (isset($_POST['maybe_convert_all_cats'])) {
-			$step = 3;
-		} elseif (isset($_POST['yes_convert_all_cats'])) {
-			$step = 4;
-		} elseif (isset($_POST['no_dont_do_it'])) {
-			die('no_dont_do_it');
-		} else {
-			$step = (isset($_GET['step'])) ? (int) $_GET['step'] : 1;
-		}
-
-		$this->header();
-
-		if (!current_user_can('manage_categories')) {
-			print '<div class="narrow">';
-			print '<p>' . __('Cheatin&#8217; uh?') . '</p>';
-			print '</div>';
-		} else {
-			if ( $step > 1 )
-				check_admin_referer('import-cat2tag');
-
-			switch ($step) {
-				case 1 :
-					$this->welcome();
-				break;
-
-				case 2 :
-					$this->convert_them();
-				break;
-
-				case 3 :
-					$this->convert_all_confirm();
-				break;
-
-				case 4 :
-					$this->convert_all();
-				break;
-			}
-		}
-
-		$this->footer();
-	}
-
-	function WP_Categories_to_Tags() {
-		// Do nothing.
-	}
-}
-
-$wp_cat2tag_importer = new WP_Categories_to_Tags();
-
-register_importer('wp-cat2tag', __('Categories to Tags Converter'), __('Convert existing categories to tags, selectively.'), array(&$wp_cat2tag_importer, 'init'));
-
-?>
--- a/wp-admin/includes/admin.php
+++ b/wp-admin/includes/admin.php
@@ -1,19 +0,0 @@
-<?php
-
-require_once(ABSPATH . 'wp-admin/includes/bookmark.php');
-require_once(ABSPATH . 'wp-admin/includes/comment.php');
-require_once(ABSPATH . 'wp-admin/includes/file.php');
-require_once(ABSPATH . 'wp-admin/includes/image.php');
-require_once(ABSPATH . 'wp-admin/includes/import.php');
-require_once(ABSPATH . 'wp-admin/includes/misc.php');
-require_once(ABSPATH . 'wp-admin/includes/plugin.php');
-require_once(ABSPATH . 'wp-admin/includes/post.php');
-require_once(ABSPATH . 'wp-admin/includes/taxonomy.php');
-require_once(ABSPATH . 'wp-admin/includes/template.php');
-require_once(ABSPATH . 'wp-admin/includes/theme.php');
-require_once(ABSPATH . 'wp-admin/includes/user.php');
-require_once(ABSPATH . 'wp-admin/includes/update.php');
-
-require_once(ABSPATH . WPINC . '/registration.php');
-
-?>
--- a/wp-admin/includes/bookmark.php
+++ b/wp-admin/includes/bookmark.php
@@ -1,177 +0,0 @@
-<?php
-
-function add_link() {
-	return edit_link();
-}
-
-function edit_link( $link_id = '' ) {
-	if (!current_user_can( 'manage_links' ))
-		wp_die( __( 'Cheatin&#8217; uh?' ));
-
-	$_POST['link_url'] = wp_specialchars( $_POST['link_url'] );
-	$_POST['link_url'] = clean_url($_POST['link_url']);
-	$_POST['link_name'] = wp_specialchars( $_POST['link_name'] );
-	$_POST['link_image'] = wp_specialchars( $_POST['link_image'] );
-	$_POST['link_rss'] = clean_url($_POST['link_rss']);
-
-	if ( !empty( $link_id ) ) {
-		$_POST['link_id'] = $link_id;
-		return wp_update_link( $_POST);
-	} else {
-		return wp_insert_link( $_POST);
-	}
-}
-
-function get_default_link_to_edit() {
-	if ( isset( $_GET['linkurl'] ) )
-		$link->link_url = clean_url( $_GET['linkurl']);
-	else
-		$link->link_url = '';
-
-	if ( isset( $_GET['name'] ) )
-		$link->link_name = attribute_escape( $_GET['name']);
-	else
-		$link->link_name = '';
-
-	$link->link_visible = 'Y';
-
-	return $link;
-}
-
-function wp_delete_link($link_id) {
-	global $wpdb;
-
-	do_action('delete_link', $link_id);
-
-	wp_delete_object_term_relationships($link_id, 'link_category');
-
-	$wpdb->query("DELETE FROM $wpdb->links WHERE link_id = '$link_id'");
-
-	do_action('deleted_link', $link_id);
-
-	return true;
-}
-
-function wp_get_link_cats($link_id = 0) {
-
-	$cats = wp_get_object_terms($link_id, 'link_category', 'fields=ids');
-
-	return array_unique($cats);
-}
-
-function get_link_to_edit( $link_id ) {
-	return get_link( $link_id, OBJECT, 'edit' );
-}
-
-function wp_insert_link($linkdata) {
-	global $wpdb, $current_user;
-
-	$defaults = array('link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0 );
-
-	$linkdata = wp_parse_args($linkdata, $defaults);
-	$linkdata = sanitize_bookmark($linkdata, 'db');
-
-	extract($linkdata, EXTR_SKIP);
-
-	$update = false;
-
-	if ( !empty($link_id) )
-		$update = true;
-
-	if ( trim( $link_name ) == '' )
-		return 0;
-
-	if ( trim( $link_url ) == '' )
-		return 0;
-
-	if ( empty($link_rating) )
-		$link_rating = 0;
-
-	if ( empty($link_image) )
-		$link_image = '';
-
-	if ( empty($link_target) )
-		$link_target = '';
-
-	if ( empty($link_visible) )
-		$link_visible = 'Y';
-
-	if ( empty($link_owner) )
-		$link_owner = $current_user->id;
-
-	if ( empty($link_notes) )
-		$link_notes = '';
-
-	if ( empty($link_description) )
-		$link_description = '';
-
-	if ( empty($link_rss) )
-		$link_rss = '';
-
-	if ( empty($link_rel) )
-		$link_rel = '';
-
-	// Make sure we set a valid category
-	if (0 == count($link_category) || !is_array($link_category)) {
-		$link_category = array(get_option('default_link_category'));
-	}
-
-	if ( $update ) {
-		$wpdb->query("UPDATE $wpdb->links SET link_url='$link_url',
-			link_name='$link_name', link_image='$link_image',
-			link_target='$link_target',
-			link_visible='$link_visible', link_description='$link_description',
-			link_rating='$link_rating', link_rel='$link_rel',
-			link_notes='$link_notes', link_rss = '$link_rss'
-			WHERE link_id='$link_id'");
-	} else {
-		$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_image, link_target, link_description, link_visible, link_owner, link_rating, link_rel, link_notes, link_rss) VALUES('$link_url','$link_name', '$link_image', '$link_target', '$link_description', '$link_visible', '$link_owner', '$link_rating', '$link_rel', '$link_notes', '$link_rss')");
-		$link_id = (int) $wpdb->insert_id;
-	}
-
-	wp_set_link_cats($link_id, $link_category);
-
-	if ( $update )
-		do_action('edit_link', $link_id);
-	else
-		do_action('add_link', $link_id);
-
-	return $link_id;
-}
-
-function wp_set_link_cats($link_id = 0, $link_categories = array()) {
-	// If $link_categories isn't already an array, make it one:
-	if (!is_array($link_categories) || 0 == count($link_categories))
-		$link_categories = array(get_option('default_link_category'));
-
-	$link_categories = array_map('intval', $link_categories);
-	$link_categories = array_unique($link_categories);
-
-	wp_set_object_terms($link_id, $link_categories, 'link_category');
-}	// wp_set_link_cats()
-
-function wp_update_link($linkdata) {
-	global $wpdb;
-
-	$link_id = (int) $linkdata['link_id'];
-
-	$link = get_link($link_id, ARRAY_A);
-
-	// Escape data pulled from DB.
-	$link = add_magic_quotes($link);
-
-	// Passed link category list overwrites existing category list if not empty.
-	if ( isset($linkdata['link_category']) && is_array($linkdata['link_category'])
-			 && 0 != count($linkdata['link_category']) )
-		$link_cats = $linkdata['link_category'];
-	else
-		$link_cats = $link['link_category'];
-
-	// Merge old and new fields with new fields overwriting old ones.
-	$linkdata = array_merge($link, $linkdata);
-	$linkdata['link_category'] = $link_cats;
-
-	return wp_insert_link($linkdata);
-}
-
-?>
--- a/wp-admin/includes/comment.php
+++ b/wp-admin/includes/comment.php
@@ -1,68 +0,0 @@
-<?php
-
-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 edit_comment() {
-	global $user_ID;
-
-	$comment_ID = (int) $_POST['comment_ID'];
-	$comment_post_ID = (int) $_POST['comment_post_ID'];
-
-	if (!current_user_can( 'edit_post', $comment_post_ID ))
-		wp_die( __('You are not allowed to edit comments on this post, so you cannot edit this comment.' ));
-
-	$_POST['comment_author'] = $_POST['newcomment_author'];
-	$_POST['comment_author_email'] = $_POST['newcomment_author_email'];
-	$_POST['comment_author_url'] = $_POST['newcomment_author_url'];
-	$_POST['comment_approved'] = $_POST['comment_status'];
-	$_POST['comment_content'] = $_POST['content'];
-	$_POST['comment_ID'] = (int) $_POST['comment_ID'];
-
-	if (!empty ( $_POST['edit_date'] ) ) {
-		$aa = $_POST['aa'];
-		$mm = $_POST['mm'];
-		$jj = $_POST['jj'];
-		$hh = $_POST['hh'];
-		$mn = $_POST['mn'];
-		$ss = $_POST['ss'];
-		$jj = ($jj > 31 ) ? 31 : $jj;
-		$hh = ($hh > 23 ) ? $hh -24 : $hh;
-		$mn = ($mn > 59 ) ? $mn -60 : $mn;
-		$ss = ($ss > 59 ) ? $ss -60 : $ss;
-		$_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
-	}
-
-	wp_update_comment( $_POST);
-}
-
-function get_comment_to_edit( $id ) {
-	if ( !$comment = get_comment($id) )
-		return false;
-
-	$comment->comment_ID = (int) $comment->comment_ID;
-	$comment->comment_post_ID = (int) $comment->comment_post_ID;
-
-	$comment->comment_content = format_to_edit( $comment->comment_content );
-	$comment->comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content);
-
-	$comment->comment_author = format_to_edit( $comment->comment_author );
-	$comment->comment_author_email = format_to_edit( $comment->comment_author_email );
-	$comment->comment_author_url = clean_url($comment->comment_author_url);
-	$comment->comment_author_url = format_to_edit( $comment->comment_author_url );
-
-	return $comment;
-}
-
-function get_pending_comments_num( $post_id ) {
-	global $wpdb;
-	$post_id = (int) $post_id;
-	$pending = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = $post_id AND comment_approved = '0'" );
-	return $pending;
-}
-
-?>
--- a/wp-admin/includes/file.php
+++ b/wp-admin/includes/file.php
@@ -1,189 +0,0 @@
-<?php
-
-$wp_file_descriptions = array ('index.php' => __( 'Main Index Template' ), 'style.css' => __( 'Stylesheet' ), 'comments.php' => __( 'Comments' ), 'comments-popup.php' => __( 'Popup Comments' ), 'footer.php' => __( 'Footer' ), 'header.php' => __( 'Header' ), 'sidebar.php' => __( 'Sidebar' ), 'archive.php' => __( 'Archives' ), 'category.php' => __( 'Category Template' ), 'page.php' => __( 'Page Template' ), 'search.php' => __( 'Search Results' ), 'single.php' => __( 'Single Post' ), '404.php' => __( '404 Template' ), 'my-hacks.php' => __( 'my-hacks.php (legacy hacks support)' ), '.htaccess' => __( '.htaccess (for rewrite rules )' ),
-	// Deprecated files
-	'wp-layout.css' => __( 'Stylesheet' ), 'wp-comments.php' => __( 'Comments Template' ), 'wp-comments-popup.php' => __( 'Popup Comments Template' ));
-function get_file_description( $file ) {
-	global $wp_file_descriptions;
-
-	if ( isset( $wp_file_descriptions[basename( $file )] ) ) {
-		return $wp_file_descriptions[basename( $file )];
-	}
-	elseif ( file_exists( ABSPATH . $file ) && is_file( ABSPATH . $file ) ) {
-		$template_data = implode( '', file( ABSPATH . $file ) );
-		if ( preg_match( "|Template Name:(.*)|i", $template_data, $name ))
-			return $name[1];
-	}
-
-	return basename( $file );
-}
-
-function get_home_path() {
-	$home = get_option( 'home' );
-	if ( $home != '' && $home != get_option( 'siteurl' ) ) {
-		$home_path = parse_url( $home );
-		$home_path = $home_path['path'];
-		$root = str_replace( $_SERVER["PHP_SELF"], '', $_SERVER["SCRIPT_FILENAME"] );
-		$home_path = trailingslashit( $root.$home_path );
-	} else {
-		$home_path = ABSPATH;
-	}
-
-	return $home_path;
-}
-
-function get_real_file_to_edit( $file ) {
-	if ('index.php' == $file || '.htaccess' == $file ) {
-		$real_file = get_home_path().$file;
-	} else {
-		$real_file = ABSPATH.$file;
-	}
-
-	return $real_file;
-}
-
-function validate_file( $file, $allowed_files = '' ) {
-	if ( false !== strpos( $file, './' ))
-		return 1;
-
-	if (':' == substr( $file, 1, 1 ))
-		return 2;
-
-	if (!empty ( $allowed_files ) && (!in_array( $file, $allowed_files ) ) )
-		return 3;
-
-	return 0;
-}
-
-function validate_file_to_edit( $file, $allowed_files = '' ) {
-	$file = stripslashes( $file );
-
-	$code = validate_file( $file, $allowed_files );
-
-	if (!$code )
-		return $file;
-
-	switch ( $code ) {
-		case 1 :
-			wp_die( __('Sorry, can&#8217;t edit files with ".." in the name. If you are trying to edit a file in your WordPress home directory, you can just type the name of the file in.' ));
-
-		case 2 :
-			wp_die( __('Sorry, can&#8217;t call files with their real path.' ));
-
-		case 3 :
-			wp_die( __('Sorry, that file cannot be edited.' ));
-	}
-}
-
-// array wp_handle_upload ( array &file [, array overrides] )
-// file: reference to a single element of $_FILES. Call the function once for each uploaded file.
-// overrides: an associative array of names=>values to override default variables with extract( $overrides, EXTR_OVERWRITE ).
-// On success, returns an associative array of file attributes.
-// On failure, returns $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ).
-function wp_handle_upload( &$file, $overrides = false ) {
-	// The default error handler.
-	if (! function_exists( 'wp_handle_upload_error' ) ) {
-		function wp_handle_upload_error( &$file, $message ) {
-			return array( 'error'=>$message );
-		}
-	}
-
-	// You may define your own function and pass the name in $overrides['upload_error_handler']
-	$upload_error_handler = 'wp_handle_upload_error';
-
-	// $_POST['action'] must be set and its value must equal $overrides['action'] or this:
-	$action = 'wp_handle_upload';
-
-	// Courtesy of php.net, the strings that describe the error indicated in $_FILES[{form field}]['error'].
-	$upload_error_strings = array( false,
-		__( "The uploaded file exceeds the <code>upload_max_filesize</code> directive in <code>php.ini</code>." ),
-		__( "The uploaded file exceeds the <em>MAX_FILE_SIZE</em> directive that was specified in the HTML form." ),
-		__( "The uploaded file was only partially uploaded." ),
-		__( "No file was uploaded." ),
-		__( "Missing a temporary folder." ),
-		__( "Failed to write file to disk." ));
-
-	// All tests are on by default. Most can be turned off by $override[{test_name}] = false;
-	$test_form = true;
-	$test_size = true;
-
-	// If you override this, you must provide $ext and $type!!!!
-	$test_type = true;
-
-	// Install user overrides. Did we mention that this voids your warranty?
-	if ( is_array( $overrides ) )
-		extract( $overrides, EXTR_OVERWRITE );
-
-	// A correct form post will pass this test.
-	if ( $test_form && (!isset( $_POST['action'] ) || ($_POST['action'] != $action ) ) )
-		return $upload_error_handler( $file, __( 'Invalid form submission.' ));
-
-	// A successful upload will pass this test. It makes no sense to override this one.
-	if ( $file['error'] > 0 )
-		return $upload_error_handler( $file, $upload_error_strings[$file['error']] );
-
-	// A non-empty file will pass this test.
-	if ( $test_size && !($file['size'] > 0 ) )
-		return $upload_error_handler( $file, __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini.' ));
-
-	// A properly uploaded file will pass this test. There should be no reason to override this one.
-	if (! @ is_uploaded_file( $file['tmp_name'] ) )
-		return $upload_error_handler( $file, __( 'Specified file failed upload test.' ));
-
-	// A correct MIME type will pass this test. Override $mimes or use the upload_mimes filter.
-	if ( $test_type ) {
-		$wp_filetype = wp_check_filetype( $file['name'], $mimes );
-
-		extract( $wp_filetype );
-
-		if ( ( !$type || !$ext ) && !current_user_can( 'unfiltered_upload' ) )
-			return $upload_error_handler( $file, __( 'File type does not meet security guidelines. Try another.' ));
-
-		if ( !$ext )
-			$ext = ltrim(strrchr($file['name'], '.'), '.');
-	}
-
-	// A writable uploads dir will pass this test. Again, there's no point overriding this one.
-	if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
-		return $upload_error_handler( $file, $uploads['error'] );
-
-	// Increment the file number until we have a unique file to save in $dir. Use $override['unique_filename_callback'] if supplied.
-	if ( isset( $unique_filename_callback ) && function_exists( $unique_filename_callback ) ) {
-		$filename = $unique_filename_callback( $uploads['path'], $file['name'] );
-	} else {
-		$number = '';
-		$filename = str_replace( '#', '_', $file['name'] );
-		$filename = str_replace( array( '\\', "'" ), '', $filename );
-		if ( empty( $ext) )
-			$ext = '';
-		else
-			$ext = ".$ext";
-		while ( file_exists( $uploads['path'] . "/$filename" ) ) {
-			if ( '' == "$number$ext" )
-				$filename = $filename . ++$number . $ext;
-			else
-				$filename = str_replace( "$number$ext", ++$number . $ext, $filename );
-		}
-		$filename = str_replace( $ext, '', $filename );
-		$filename = sanitize_title_with_dashes( $filename ) . $ext;
-	}
-
-	// Move the file to the uploads dir
-	$new_file = $uploads['path'] . "/$filename";
-	if ( false === @ move_uploaded_file( $file['tmp_name'], $new_file ) )
-		wp_die( printf( __('The uploaded file could not be moved to %s.' ), $uploads['path'] ));
-
-	// Set correct file permissions
-	$stat = stat( dirname( $new_file ));
-	$perms = $stat['mode'] & 0000666;
-	@ chmod( $new_file, $perms );
-
-	// Compute the URL
-	$url = $uploads['url'] . "/$filename";
-
-	$return = apply_filters( 'wp_handle_upload', array( 'file' => $new_file, 'url' => $url, 'type' => $type ) );
-
-	return $return;
-}
-
-?>
--- a/wp-admin/includes/image.php
+++ b/wp-admin/includes/image.php
@@ -1,192 +0,0 @@
-<?php
-
-function get_udims( $width, $height) {
-	if ( $height <= 96 && $width <= 128 )
-		return array( $width, $height);
-	elseif ( $width / $height > 4 / 3 )
-		return array( 128, (int) ($height / $width * 128 ));
-	else
-		return array( (int) ($width / $height * 96 ), 96 );
-}
-
-function wp_create_thumbnail( $file, $max_side, $effect = '' ) {
-
-		// 1 = GIF, 2 = JPEG, 3 = PNG
-
-	if ( file_exists( $file ) ) {
-		$type = getimagesize( $file );
-
-		// if the associated function doesn't exist - then it's not
-		// handle. duh. i hope.
-
-		if (!function_exists( 'imagegif' ) && $type[2] == 1 ) {
-			$error = __( 'Filetype not supported. Thumbnail not created.' );
-		}
-		elseif (!function_exists( 'imagejpeg' ) && $type[2] == 2 ) {
-			$error = __( 'Filetype not supported. Thumbnail not created.' );
-		}
-		elseif (!function_exists( 'imagepng' ) && $type[2] == 3 ) {
-			$error = __( 'Filetype not supported. Thumbnail not created.' );
-		} else {
-
-			// create the initial copy from the original file
-			if ( $type[2] == 1 ) {
-				$image = imagecreatefromgif( $file );
-			}
-			elseif ( $type[2] == 2 ) {
-				$image = imagecreatefromjpeg( $file );
-			}
-			elseif ( $type[2] == 3 ) {
-				$image = imagecreatefrompng( $file );
-			}
-
-			if ( function_exists( 'imageantialias' ))
-				imageantialias( $image, TRUE );
-
-			$image_attr = getimagesize( $file );
-
-			// figure out the longest side
-
-			if ( $image_attr[0] > $image_attr[1] ) {
-				$image_width = $image_attr[0];
-				$image_height = $image_attr[1];
-				$image_new_width = $max_side;
-
-				$image_ratio = $image_width / $image_new_width;
-				$image_new_height = $image_height / $image_ratio;
-				//width is > height
-			} else {
-				$image_width = $image_attr[0];
-				$image_height = $image_attr[1];
-				$image_new_height = $max_side;
-
-				$image_ratio = $image_height / $image_new_height;
-				$image_new_width = $image_width / $image_ratio;
-				//height > width
-			}
-
-			$thumbnail = imagecreatetruecolor( $image_new_width, $image_new_height);
-			@ imagecopyresampled( $thumbnail, $image, 0, 0, 0, 0, $image_new_width, $image_new_height, $image_attr[0], $image_attr[1] );
-
-			// If no filters change the filename, we'll do a default transformation.
-			if ( basename( $file ) == $thumb = apply_filters( 'thumbnail_filename', basename( $file ) ) )
-				$thumb = preg_replace( '!(\.[^.]+)?$!', '.thumbnail' . '$1', basename( $file ), 1 );
-
-			$thumbpath = str_replace( basename( $file ), $thumb, $file );
-
-			// move the thumbnail to its final destination
-			if ( $type[2] == 1 ) {
-				if (!imagegif( $thumbnail, $thumbpath ) ) {
-					$error = __( "Thumbnail path invalid" );
-				}
-			}
-			elseif ( $type[2] == 2 ) {
-				if (!imagejpeg( $thumbnail, $thumbpath ) ) {
-					$error = __( "Thumbnail path invalid" );
-				}
-			}
-			elseif ( $type[2] == 3 ) {
-				if (!imagepng( $thumbnail, $thumbpath ) ) {
-					$error = __( "Thumbnail path invalid" );
-				}
-			}
-
-		}
-	} else {
-		$error = __( 'File not found' );
-	}
-
-	if (!empty ( $error ) ) {
-		return $error;
-	} else {
-		return apply_filters( 'wp_create_thumbnail', $thumbpath );
-	}
-}
-
-function wp_crop_image( $src_file, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
-	if ( ctype_digit( $src_file ) ) // Handle int as attachment ID
-		$src_file = get_attached_file( $src_file );
-
-	$src = wp_load_image( $src_file );
-
-	if ( !is_resource( $src ))
-		return $src;
-
-	$dst = imagecreatetruecolor( $dst_w, $dst_h );
-
-	if ( $src_abs ) {
-		$src_w -= $src_x;
-		$src_h -= $src_y;
-	}
-
-	if (function_exists('imageantialias'))
-		imageantialias( $dst, true );
-
-	imagecopyresampled( $dst, $src, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
-
-	if ( !$dst_file )
-		$dst_file = str_replace( basename( $src_file ), 'cropped-'.basename( $src_file ), $src_file );
-
-	$dst_file = preg_replace( '/\\.[^\\.]+$/', '.jpg', $dst_file );
-
-	if ( imagejpeg( $dst, $dst_file ) )
-		return $dst_file;
-	else
-		return false;
-}
-
-function wp_generate_attachment_metadata( $attachment_id, $file ) {
-	$attachment = get_post( $attachment_id );
-
-	$metadata = array();
-	if ( preg_match('!^image/!', get_post_mime_type( $attachment )) ) {
-		$imagesize = getimagesize($file);
-		$metadata['width'] = $imagesize['0'];
-		$metadata['height'] = $imagesize['1'];
-		list($uwidth, $uheight) = get_udims($metadata['width'], $metadata['height']);
-		$metadata['hwstring_small'] = "height='$uheight' width='$uwidth'";
-		$metadata['file'] = $file;
-
-		$max = apply_filters( 'wp_thumbnail_creation_size_limit', 3 * 1024 * 1024, $attachment_id, $file );
-
-		if ( $max < 0 || $metadata['width'] * $metadata['height'] < $max ) {
-			$max_side = apply_filters( 'wp_thumbnail_max_side_length', 128, $attachment_id, $file );
-			$thumb = wp_create_thumbnail( $file, $max_side );
-
-			if ( @file_exists($thumb) )
-				$metadata['thumb'] = basename($thumb);
-		}
-	}
-	return apply_filters( 'wp_generate_attachment_metadata', $metadata );
-}
-
-function wp_load_image( $file ) {
-	if ( ctype_digit( $file ) )
-		$file = get_attached_file( $file );
-
-	if ( !file_exists( $file ) )
-		return sprintf(__("File '%s' doesn't exist?"), $file);
-
-	if ( ! function_exists('imagecreatefromstring') )
-		return __('The GD image library is not installed.');
-
-	$contents = file_get_contents( $file );
-
-	$image = imagecreatefromstring( $contents );
-
-	if ( !is_resource( $image ) )
-		return sprintf(__("File '%s' is not an image."), $file);
-
-	return $image;
-}
-
-function wp_shrink_dimensions( $width, $height, $wmax = 128, $hmax = 96 ) {
-	if ( $height <= $hmax && $width <= $wmax )
-		return array( $width, $height);
-	elseif ( $width / $height > $wmax / $hmax )
-		return array( $wmax, (int) ($height / $width * $wmax ));
-	else
-		return array( (int) ($width / $height * $hmax ), $hmax );
-}
-
-?>
--- a/wp-admin/includes/import.php
+++ b/wp-admin/includes/import.php
@@ -1,45 +0,0 @@
-<?php
-
-function get_importers() {
-	global $wp_importers;
-	uasort($wp_importers, create_function('$a, $b', 'return strcmp($a[0], $b[0]);'));
-	return $wp_importers;
-}
-
-function register_importer( $id, $name, $description, $callback ) {
-	global $wp_importers;
-	if ( is_wp_error( $callback ) )
-		return $callback;
-	$wp_importers[$id] = array ( $name, $description, $callback );
-}
-
-function wp_import_cleanup( $id ) {
-	wp_delete_attachment( $id );
-}
-
-function wp_import_handle_upload() {
-	$overrides = array( 'test_form' => false, 'test_type' => false );
-	$file = wp_handle_upload( $_FILES['import'], $overrides );
-
-	if ( isset( $file['error'] ) )
-		return $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
-	);
-
-	// Save the data
-	$id = wp_insert_attachment( $object, $file );
-
-	return array( 'file' => $file, 'id' => $id );
-}
-
-?>
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -1,177 +0,0 @@
-<?php
-
-function got_mod_rewrite() {
-	global $is_apache;
-
-	// take 3 educated guesses as to whether or not mod_rewrite is available
-	if ( !$is_apache )
-		return false;
-
-	if ( function_exists( 'apache_get_modules' ) ) {
-		if ( !in_array( 'mod_rewrite', apache_get_modules() ) )
-			return false;
-	}
-
-	return true;
-}
-
-// Returns an array of strings from a file (.htaccess ) from between BEGIN
-// and END markers.
-function extract_from_markers( $filename, $marker ) {
-	$result = array ();
-
-	if (!file_exists( $filename ) ) {
-		return $result;
-	}
-
-	if ( $markerdata = explode( "\n", implode( '', file( $filename ) ) ));
-	{
-		$state = false;
-		foreach ( $markerdata as $markerline ) {
-			if (strpos($markerline, '# END ' . $marker) !== false)
-				$state = false;
-			if ( $state )
-				$result[] = $markerline;
-			if (strpos($markerline, '# BEGIN ' . $marker) !== false)
-				$state = true;
-		}
-	}
-
-	return $result;
-}
-
-// Inserts an array of strings into a file (.htaccess ), placing it between
-// BEGIN and END markers.  Replaces existing marked info.  Retains surrounding
-// data.  Creates file if none exists.
-// Returns true on write success, false on failure.
-function insert_with_markers( $filename, $marker, $insertion ) {
-	if (!file_exists( $filename ) || is_writeable( $filename ) ) {
-		if (!file_exists( $filename ) ) {
-			$markerdata = '';
-		} else {
-			$markerdata = explode( "\n", implode( '', file( $filename ) ) );
-		}
-
-		$f = fopen( $filename, 'w' );
-		$foundit = false;
-		if ( $markerdata ) {
-			$state = true;
-			foreach ( $markerdata as $n => $markerline ) {
-				if (strpos($markerline, '# BEGIN ' . $marker) !== false)
-					$state = false;
-				if ( $state ) {
-					if ( $n + 1 < count( $markerdata ) )
-						fwrite( $f, "{$markerline}\n" );
-					else
-						fwrite( $f, "{$markerline}" );
-				}
-				if (strpos($markerline, '# END ' . $marker) !== false) {
-					fwrite( $f, "# BEGIN {$marker}\n" );
-					if ( is_array( $insertion ))
-						foreach ( $insertion as $insertline )
-							fwrite( $f, "{$insertline}\n" );
-					fwrite( $f, "# END {$marker}\n" );
-					$state = true;
-					$foundit = true;
-				}
-			}
-		}
-		if (!$foundit) {
-			fwrite( $f, "# BEGIN {$marker}\n" );
-			foreach ( $insertion as $insertline )
-				fwrite( $f, "{$insertline}\n" );
-			fwrite( $f, "# END {$marker}\n" );
-		}
-		fclose( $f );
-		return true;
-	} else {
-		return false;
-	}
-}
-
-/**
- * Updates the htaccess file with the current rules if it is writable.
- *
- * Always writes to the file if it exists and is writable to ensure that we blank out old rules.
- */
-
-function save_mod_rewrite_rules() {
-	global $wp_rewrite;
-
-	$home_path = get_home_path();
-	$htaccess_file = $home_path.'.htaccess';
-
-	// If the file doesn't already exists check for write access to the directory and whether of not we have some rules.
-	// else check for write access to the file.
-	if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
-		if ( got_mod_rewrite() ) {
-			$rules = explode( "\n", $wp_rewrite->mod_rewrite_rules() );
-			return insert_with_markers( $htaccess_file, 'WordPress', $rules );
-		}
-	}
-
-	return false;
-}
-
-function update_recently_edited( $file ) {
-	$oldfiles = (array ) get_option( 'recently_edited' );
-	if ( $oldfiles ) {
-		$oldfiles = array_reverse( $oldfiles );
-		$oldfiles[] = $file;
-		$oldfiles = array_reverse( $oldfiles );
-		$oldfiles = array_unique( $oldfiles );
-		if ( 5 < count( $oldfiles ))
-			array_pop( $oldfiles );
-	} else {
-		$oldfiles[] = $file;
-	}
-	update_option( 'recently_edited', $oldfiles );
-}
-
-// If siteurl or home changed, reset cookies and flush rewrite rules.
-function update_home_siteurl( $old_value, $value ) {
-	global $wp_rewrite, $user_login, $user_pass_md5;
-
-	if ( defined( "WP_INSTALLING" ) )
-		return;
-
-	// If home changed, write rewrite rules to new location.
-	$wp_rewrite->flush_rules();
-	// Clear cookies for old paths.
-	wp_clearcookie();
-	// Set cookies for new paths.
-	wp_setcookie( $user_login, $user_pass_md5, true, get_option( 'home' ), get_option( 'siteurl' ));
-}
-
-add_action( 'update_option_home', 'update_home_siteurl', 10, 2 );
-add_action( 'update_option_siteurl', 'update_home_siteurl', 10, 2 );
-
-function url_shorten( $url ) {
-	$short_url = str_replace( 'http://', '', stripslashes( $url ));
-	$short_url = str_replace( 'www.', '', $short_url );
-	if ('/' == substr( $short_url, -1 ))
-		$short_url = substr( $short_url, 0, -1 );
-	if ( strlen( $short_url ) > 35 )
-		$short_url = substr( $short_url, 0, 32 ).'...';
-	return $short_url;
-}
-
-function wp_reset_vars( $vars ) {
-	for ( $i=0; $i<count( $vars ); $i += 1 ) {
-		$var = $vars[$i];
-		global $$var;
-
-		if (!isset( $$var ) ) {
-			if ( empty( $_POST["$var"] ) ) {
-				if ( empty( $_GET["$var"] ) )
-					$$var = '';
-				else
-					$$var = $_GET["$var"];
-			} else {
-				$$var = $_POST["$var"];
-			}
-		}
-	}
-}
-
-?>
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -1,382 +0,0 @@
-<?php
-
-function get_plugin_data( $plugin_file ) {
-	$plugin_data = implode( '', file( $plugin_file ));
-	preg_match( '|Plugin Name:(.*)$|mi', $plugin_data, $plugin_name );
-	preg_match( '|Plugin URI:(.*)$|mi', $plugin_data, $plugin_uri );
-	preg_match( '|Description:(.*)$|mi', $plugin_data, $description );
-	preg_match( '|Author:(.*)$|mi', $plugin_data, $author_name );
-	preg_match( '|Author URI:(.*)$|mi', $plugin_data, $author_uri );
-
-	if ( preg_match( "|Version:(.*)|i", $plugin_data, $version ))
-		$version = trim( $version[1] );
-	else
-		$version = '';
-
-	$description = wptexturize( trim( $description[1] ));
-
-	$name = $plugin_name[1];
-	$name = trim( $name );
-	$plugin = $name;
-	if ('' != trim($plugin_uri[1]) && '' != $name ) {
-		$plugin = '<a href="' . trim( $plugin_uri[1] ) . '" title="'.__( 'Visit plugin homepage' ).'">'.$plugin.'</a>';
-	}
-
-	if ('' == $author_uri[1] ) {
-		$author = trim( $author_name[1] );
-	} else {
-		$author = '<a href="' . trim( $author_uri[1] ) . '" title="'.__( 'Visit author homepage' ).'">' . trim( $author_name[1] ) . '</a>';
-	}
-
-	return array('Name' => $name, 'Title' => $plugin, 'Description' => $description, 'Author' => $author, 'Version' => $version);
-}
-
-function get_plugins() {
-	global $wp_plugins;
-
-	if ( isset( $wp_plugins ) ) {
-		return $wp_plugins;
-	}
-
-	$wp_plugins = array ();
-	$plugin_root = ABSPATH . PLUGINDIR;
-
-	// Files in wp-content/plugins directory
-	$plugins_dir = @ opendir( $plugin_root);
-	if ( $plugins_dir ) {
-		while (($file = readdir( $plugins_dir ) ) !== false ) {
-			if ( substr($file, 0, 1) == '.' )
-				continue;
-			if ( is_dir( $plugin_root.'/'.$file ) ) {
-				$plugins_subdir = @ opendir( $plugin_root.'/'.$file );
-				if ( $plugins_subdir ) {
-					while (($subfile = readdir( $plugins_subdir ) ) !== false ) {
-						if ( substr($subfile, 0, 1) == '.' )
-							continue;
-						if ( substr($subfile, -4) == '.php' )
-							$plugin_files[] = "$file/$subfile";
-					}
-				}
-			} else {
-				if ( substr($file, -4) == '.php' )
-					$plugin_files[] = $file;
-			}
-		}
-	}
-	@closedir( $plugins_dir );
-	@closedir( $plugins_subdir );
-
-	if ( !$plugins_dir || !$plugin_files )
-		return $wp_plugins;
-
-	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( "$plugin_root/$plugin_file" ) )
-			continue;
-
-		$plugin_data = get_plugin_data( "$plugin_root/$plugin_file" );
-
-		if ( empty ( $plugin_data['Name'] ) )
-			continue;
-
-		$wp_plugins[plugin_basename( $plugin_file )] = $plugin_data;
-	}
-
-	uasort( $wp_plugins, create_function( '$a, $b', 'return strnatcasecmp( $a["Name"], $b["Name"] );' ));
-
-	return $wp_plugins;
-}
-
-//
-// Menu
-//
-
-function add_menu_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
-	global $menu, $admin_page_hooks;
-
-	$file = plugin_basename( $file );
-
-	$menu[] = array ( $menu_title, $access_level, $file, $page_title );
-
-	$admin_page_hooks[$file] = sanitize_title( $menu_title );
-
-	$hookname = get_plugin_page_hookname( $file, '' );
-	if (!empty ( $function ) && !empty ( $hookname ))
-		add_action( $hookname, $function );
-
-	return $hookname;
-}
-
-function add_submenu_page( $parent, $page_title, $menu_title, $access_level, $file, $function = '' ) {
-	global $submenu;
-	global $menu;
-	global $_wp_real_parent_file;
-	global $_wp_submenu_nopriv;
-	global $_wp_menu_nopriv;
-
-	$file = plugin_basename( $file );
-
-	$parent = plugin_basename( $parent);
-	if ( isset( $_wp_real_parent_file[$parent] ) )
-		$parent = $_wp_real_parent_file[$parent];
-
-	if ( !current_user_can( $access_level ) ) {
-		$_wp_submenu_nopriv[$parent][$file] = true;
-		return false;
-	}
-
-	// If the parent doesn't already have a submenu, add a link to the parent
-	// as the first item in the submenu.  If the submenu file is the same as the
-	// parent file someone is trying to link back to the parent manually.  In
-	// this case, don't automatically add a link back to avoid duplication.
-	if (!isset( $submenu[$parent] ) && $file != $parent  ) {
-		foreach ( $menu as $parent_menu ) {
-			if ( $parent_menu[2] == $parent && current_user_can( $parent_menu[1] ) )
-				$submenu[$parent][] = $parent_menu;
-		}
-	}
-
-	$submenu[$parent][] = array ( $menu_title, $access_level, $file, $page_title );
-
-	$hookname = get_plugin_page_hookname( $file, $parent);
-	if (!empty ( $function ) && !empty ( $hookname ))
-		add_action( $hookname, $function );
-
-	return $hookname;
-}
-
-function add_management_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
-	return add_submenu_page( 'edit.php', $page_title, $menu_title, $access_level, $file, $function );
-}
-
-function add_options_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
-	return add_submenu_page( 'options-general.php', $page_title, $menu_title, $access_level, $file, $function );
-}
-
-function add_theme_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
-	return add_submenu_page( 'themes.php', $page_title, $menu_title, $access_level, $file, $function );
-}
-
-function add_users_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
-	if ( current_user_can('edit_users') )
-		$parent = 'users.php';
-	else
-		$parent = 'profile.php';
-	return add_submenu_page( $parent, $page_title, $menu_title, $access_level, $file, $function );
-}
-
-//
-// Pluggable Menu Support -- Private
-//
-
-function get_admin_page_parent() {
-	global $parent_file;
-	global $menu;
-	global $submenu;
-	global $pagenow;
-	global $plugin_page;
-	global $_wp_real_parent_file;
-	global $_wp_menu_nopriv;
-	global $_wp_submenu_nopriv;
-
-	if ( !empty ( $parent_file ) ) {
-		if ( isset( $_wp_real_parent_file[$parent_file] ) )
-			$parent_file = $_wp_real_parent_file[$parent_file];
-
-		return $parent_file;
-	}
-
-	if ( $pagenow == 'admin.php' && isset( $plugin_page ) ) {
-		foreach ( $menu as $parent_menu ) {
-			if ( $parent_menu[2] == $plugin_page ) {
-				$parent_file = $plugin_page;
-				if ( isset( $_wp_real_parent_file[$parent_file] ) )
-					$parent_file = $_wp_real_parent_file[$parent_file];
-				return $parent_file;
-			}
-		}
-		if ( isset( $_wp_menu_nopriv[$plugin_page] ) ) {
-			$parent_file = $plugin_page;
-			if ( isset( $_wp_real_parent_file[$parent_file] ) )
-					$parent_file = $_wp_real_parent_file[$parent_file];
-			return $parent_file;
-		}
-	}
-
-	if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) ) {
-		$parent_file = $pagenow;
-		if ( isset( $_wp_real_parent_file[$parent_file] ) )
-			$parent_file = $_wp_real_parent_file[$parent_file];
-		return $parent_file;
-	}
-
-	foreach (array_keys( $submenu ) as $parent) {
-		foreach ( $submenu[$parent] as $submenu_array ) {
-			if ( isset( $_wp_real_parent_file[$parent] ) )
-				$parent = $_wp_real_parent_file[$parent];
-			if ( $submenu_array[2] == $pagenow ) {
-				$parent_file = $parent;
-				return $parent;
-			} else
-				if ( isset( $plugin_page ) && ($plugin_page == $submenu_array[2] ) ) {
-					$parent_file = $parent;
-					return $parent;
-				}
-		}
-	}
-
-	$parent_file = '';
-	return '';
-}
-
-function get_admin_page_title() {
-	global $title;
-	global $menu;
-	global $submenu;
-	global $pagenow;
-	global $plugin_page;
-
-	if ( isset( $title ) && !empty ( $title ) ) {
-		return $title;
-	}
-
-	$hook = get_plugin_page_hook( $plugin_page, $pagenow );
-
-	$parent = $parent1 = get_admin_page_parent();
-	if ( empty ( $parent) ) {
-		foreach ( $menu as $menu_array ) {
-			if ( isset( $menu_array[3] ) ) {
-				if ( $menu_array[2] == $pagenow ) {
-					$title = $menu_array[3];
-					return $menu_array[3];
-				} else
-					if ( isset( $plugin_page ) && ($plugin_page == $menu_array[2] ) && ($hook == $menu_array[3] ) ) {
-						$title = $menu_array[3];
-						return $menu_array[3];
-					}
-			} else {
-				$title = $menu_array[0];
-				return $title;
-			}
-		}
-	} else {
-		foreach (array_keys( $submenu ) as $parent) {
-			foreach ( $submenu[$parent] as $submenu_array ) {
-				if ( isset( $plugin_page ) &&
-					($plugin_page == $submenu_array[2] ) &&
-					(($parent == $pagenow ) || ($parent == $plugin_page ) || ($plugin_page == $hook ) || (($pagenow == 'admin.php' ) && ($parent1 != $submenu_array[2] ) ) )
-					) {
-						$title = $submenu_array[3];
-						return $submenu_array[3];
-					}
-
-				if ( $submenu_array[2] != $pagenow || isset( $_GET['page'] ) ) // not the current page
-					continue;
-
-				if ( isset( $submenu_array[3] ) ) {
-					$title = $submenu_array[3];
-					return $submenu_array[3];
-				} else {
-					$title = $submenu_array[0];
-					return $title;
-				}
-			}
-		}
-	}
-
-	return $title;
-}
-
-function get_plugin_page_hook( $plugin_page, $parent_page ) {
-	global $wp_filter;
-
-	$hook = get_plugin_page_hookname( $plugin_page, $parent_page );
-	if ( isset( $wp_filter[$hook] ))
-		return $hook;
-	else
-		return null;
-}
-
-function get_plugin_page_hookname( $plugin_page, $parent_page ) {
-	global $admin_page_hooks;
-
-	$parent = get_admin_page_parent();
-
-	if ( empty ( $parent_page ) || 'admin.php' == $parent_page ) {
-		if ( isset( $admin_page_hooks[$plugin_page] ))
-			$page_type = 'toplevel';
-		else
-			if ( isset( $admin_page_hooks[$parent] ))
-				$page_type = $admin_page_hooks[$parent];
-	} else
-		if ( isset( $admin_page_hooks[$parent_page] ) ) {
-			$page_type = $admin_page_hooks[$parent_page];
-		} else {
-			$page_type = 'admin';
-		}
-
-	$plugin_name = preg_replace( '!\.php!', '', $plugin_page );
-
-	return $page_type.'_page_'.$plugin_name;
-}
-
-function user_can_access_admin_page() {
-	global $pagenow;
-	global $menu;
-	global $submenu;
-	global $_wp_menu_nopriv;
-	global $_wp_submenu_nopriv;
-	global $plugin_page;
-
-	$parent = get_admin_page_parent();
-
-	if ( isset( $_wp_submenu_nopriv[$parent][$pagenow] ) )
-		return false;
-
-	if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) )
-		return false;
-
-	if ( empty( $parent) ) {
-		if ( isset( $_wp_menu_nopriv[$pagenow] ) )
-			return false;
-		if ( isset( $_wp_submenu_nopriv[$pagenow][$pagenow] ) )
-			return false;
-		if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) )
-			return false;
-		foreach (array_keys( $_wp_submenu_nopriv ) as $key ) {
-			if ( isset( $_wp_submenu_nopriv[$key][$pagenow] ) )
-				return false;
-			if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) )
-			return false;
-		}
-		return true;
-	}
-
-	if ( isset( $submenu[$parent] ) ) {
-		foreach ( $submenu[$parent] as $submenu_array ) {
-			if ( isset( $plugin_page ) && ( $submenu_array[2] == $plugin_page ) ) {
-				if ( current_user_can( $submenu_array[1] ))
-					return true;
-				else
-					return false;
-			} else if ( $submenu_array[2] == $pagenow ) {
-				if ( current_user_can( $submenu_array[1] ))
-					return true;
-				else
-					return false;
-			}
-		}
-	}
-
-	foreach ( $menu as $menu_array ) {
-		if ( $menu_array[2] == $parent) {
-			if ( current_user_can( $menu_array[1] ))
-				return true;
-			else
-				return false;
-		}
-	}
-
-	return true;
-}
-
-?>
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -1,471 +0,0 @@
-<?php
-
-// Update an existing post with values provided in $_POST.
-function edit_post() {
-	global $user_ID;
-
-	$post_ID = (int) $_POST['post_ID'];
-
-	if ( 'page' == $_POST['post_type'] ) {
-		if ( !current_user_can( 'edit_page', $post_ID ) )
-			wp_die( __('You are not allowed to edit this page.' ));
-	} else {
-		if ( !current_user_can( 'edit_post', $post_ID ) )
-			wp_die( __('You are not allowed to edit this post.' ));
-	}
-
-	// Autosave shouldn't save too soon after a real save
-	if ( 'autosave' == $_POST['action'] ) {
-		$post =& get_post( $post_ID );
-		$now = time();
-		$then = strtotime($post->post_date_gmt . ' +0000');
-		// Keep autosave_interval in sync with autosave-js.php.
-		$delta = apply_filters( 'autosave_interval', 120 ) / 2;
-		if ( ($now - $then) < $delta )
-			return $post_ID;
-	}
-
-	// Rename.
-	$_POST['ID'] = (int) $_POST['post_ID'];
-	$_POST['post_content'] = $_POST['content'];
-	$_POST['post_excerpt'] = $_POST['excerpt'];
-	$_POST['post_parent'] = $_POST['parent_id'];
-	$_POST['to_ping'] = $_POST['trackback_url'];
-
-	if (!empty ( $_POST['post_author_override'] ) ) {
-		$_POST['post_author'] = (int) $_POST['post_author_override'];
-	} else
-		if (!empty ( $_POST['post_author'] ) ) {
-			$_POST['post_author'] = (int) $_POST['post_author'];
-		} else {
-			$_POST['post_author'] = (int) $_POST['user_ID'];
-		}
-
-	if ( $_POST['post_author'] != $_POST['user_ID'] ) {
-		if ( 'page' == $_POST['post_type'] ) {
-			if ( !current_user_can( 'edit_others_pages' ) )
-				wp_die( __('You are not allowed to edit pages as this user.' ));
-		} else {
-			if ( !current_user_can( 'edit_others_posts' ) )
-				wp_die( __('You are not allowed to edit posts as this user.' ));
-
-		}
-	}
-
-	// What to do based on which button they pressed
-	if ('' != $_POST['saveasdraft'] )
-		$_POST['post_status'] = 'draft';
-	if ('' != $_POST['saveasprivate'] )
-		$_POST['post_status'] = 'private';
-	if ('' != $_POST['publish'] )
-		$_POST['post_status'] = 'publish';
-	if ('' != $_POST['advanced'] )
-		$_POST['post_status'] = 'draft';
-
-	if ( 'page' == $_POST['post_type'] ) {
-		if ('publish' == $_POST['post_status'] && !current_user_can( 'edit_published_pages' ))
-			$_POST['post_status'] = 'pending';
-	} else {
-		if ('publish' == $_POST['post_status'] && !current_user_can( 'edit_published_posts' ))
-			$_POST['post_status'] = 'pending';
-	}
-
-	if (!isset( $_POST['comment_status'] ))
-		$_POST['comment_status'] = 'closed';
-
-	if (!isset( $_POST['ping_status'] ))
-		$_POST['ping_status'] = 'closed';
-
-	if (!empty ( $_POST['edit_date'] ) ) {
-		$aa = $_POST['aa'];
-		$mm = $_POST['mm'];
-		$jj = $_POST['jj'];
-		$hh = $_POST['hh'];
-		$mn = $_POST['mn'];
-		$ss = $_POST['ss'];
-		$jj = ($jj > 31 ) ? 31 : $jj;
-		$hh = ($hh > 23 ) ? $hh -24 : $hh;
-		$mn = ($mn > 59 ) ? $mn -60 : $mn;
-		$ss = ($ss > 59 ) ? $ss -60 : $ss;
-		$_POST['post_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
-		$_POST['post_date_gmt'] = get_gmt_from_date( "$aa-$mm-$jj $hh:$mn:$ss" );
-	}
-
-	// Meta Stuff
-	if ( $_POST['meta'] ) {
-		foreach ( $_POST['meta'] as $key => $value )
-			update_meta( $key, $value['key'], $value['value'] );
-	}
-
-	if ( $_POST['deletemeta'] ) {
-		foreach ( $_POST['deletemeta'] as $key => $value )
-			delete_meta( $key );
-	}
-
-	add_meta( $post_ID );
-
-	wp_update_post( $_POST );
-
-	// Reunite any orphaned attachments with their parent
-	if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) )
-		$draft_ids = array();
-	if ( $draft_temp_id = (int) array_search( $post_ID, $draft_ids ) )
-		_relocate_children( $draft_temp_id, $post_ID );
-
-	// Now that we have an ID we can fix any attachment anchor hrefs
-	_fix_attachment_links( $post_ID );
-
-	return $post_ID;
-}
-
-// Default post information to use when populating the "Write Post" form.
-function get_default_post_to_edit() {
-	if ( !empty( $_REQUEST['post_title'] ) )
-		$post_title = wp_specialchars( stripslashes( $_REQUEST['post_title'] ));
-	else if ( !empty( $_REQUEST['popuptitle'] ) ) {
-		$post_title = wp_specialchars( stripslashes( $_REQUEST['popuptitle'] ));
-		$post_title = funky_javascript_fix( $post_title );
-	} else {
-		$post_title = '';
-	}
-
-	if ( !empty( $_REQUEST['content'] ) )
-		$post_content = wp_specialchars( stripslashes( $_REQUEST['content'] ));
-	else if ( !empty( $post_title ) ) {
-		$text       = wp_specialchars( stripslashes( urldecode( $_REQUEST['text'] ) ) );
-		$text       = funky_javascript_fix( $text);
-		$popupurl   = clean_url($_REQUEST['popupurl']);
-        $post_content = '<a href="'.$popupurl.'">'.$post_title.'</a>'."\n$text";
-    }
-
-	if ( !empty( $_REQUEST['excerpt'] ) )
-		$post_excerpt = wp_specialchars( stripslashes( $_REQUEST['excerpt'] ));
-	else
-		$post_excerpt = '';
-
-	$post->post_status = 'draft';
-	$post->comment_status = get_option( 'default_comment_status' );
-	$post->ping_status = get_option( 'default_ping_status' );
-	$post->post_pingback = get_option( 'default_pingback_flag' );
-	$post->post_category = get_option( 'default_category' );
-	$post->post_content = apply_filters( 'default_content', $post_content);
-	$post->post_title = apply_filters( 'default_title', $post_title );
-	$post->post_excerpt = apply_filters( 'default_excerpt', $post_excerpt);
-	$post->page_template = 'default';
-	$post->post_parent = 0;
-	$post->menu_order = 0;
-
-	return $post;
-}
-
-// Get an existing post and format it for editing.
-function get_post_to_edit( $id ) {
-
-	$post = get_post( $id, OBJECT, 'edit' );
-
-	if ( $post->post_type == 'page' )
-		$post->page_template = get_post_meta( $id, '_wp_page_template', true );
-
-	return $post;
-}
-
-function post_exists($title, $content = '', $post_date = '') {
-	global $wpdb;
-
-	if (!empty ($post_date))
-		$post_date = "AND post_date = '$post_date'";
-
-	if (!empty ($title))
-		return $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$title' $post_date");
-	else
-		if (!empty ($content))
-			return $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_content = '$content' $post_date");
-
-	return 0;
-}
-
-// Creates a new post from the "Write Post" form using $_POST information.
-function wp_write_post() {
-	global $user_ID;
-
-	if ( 'page' == $_POST['post_type'] ) {
-		if ( !current_user_can( 'edit_pages' ) )
-			return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this blog.' ) );
-	} else {
-		if ( !current_user_can( 'edit_posts' ) )
-			return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this blog.' ) );
-	}
-
-
-	// Check for autosave collisions
-	$temp_id = false;
-	if ( isset($_POST['temp_ID']) ) {
-		$temp_id = (int) $_POST['temp_ID'];
-		if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) )
-			$draft_ids = array();
-		foreach ( $draft_ids as $temp => $real )
-			if ( time() + $temp > 86400 ) // 1 day: $temp is equal to -1 * time( then )
-				unset($draft_ids[$temp]);
-
-		if ( isset($draft_ids[$temp_id]) ) { // Edit, don't write
-			$_POST['post_ID'] = $draft_ids[$temp_id];
-			unset($_POST['temp_ID']);
-			update_user_option( $user_ID, 'autosave_draft_ids', $draft_ids );
-			return edit_post();
-		}
-	}
-
-	// Rename.
-	$_POST['post_content'] = $_POST['content'];
-	$_POST['post_excerpt'] = $_POST['excerpt'];
-	$_POST['post_parent'] = $_POST['parent_id'];
-	$_POST['to_ping'] = $_POST['trackback_url'];
-
-	if (!empty ( $_POST['post_author_override'] ) ) {
-		$_POST['post_author'] = (int) $_POST['post_author_override'];
-	} else {
-		if (!empty ( $_POST['post_author'] ) ) {
-			$_POST['post_author'] = (int) $_POST['post_author'];
-		} else {
-			$_POST['post_author'] = (int) $_POST['user_ID'];
-		}
-
-	}
-
-	if ( $_POST['post_author'] != $_POST['user_ID'] ) {
-		if ( 'page' == $_POST['post_type'] ) {
-			if ( !current_user_can( 'edit_others_pages' ) )
-				return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
-		} else {
-			if ( !current_user_can( 'edit_others_posts' ) )
-				return new WP_Error( 'edit_others_posts', __( 'You are not allowed to post as this user.' ) );
-
-		}
-	}
-
-	// What to do based on which button they pressed
-	if ('' != $_POST['saveasdraft'] )
-		$_POST['post_status'] = 'draft';
-	if ('' != $_POST['saveasprivate'] )
-		$_POST['post_status'] = 'private';
-	if ('' != $_POST['publish'] )
-		$_POST['post_status'] = 'publish';
-	if ('' != $_POST['advanced'] )
-		$_POST['post_status'] = 'draft';
-
-	if ( 'page' == $_POST['post_type'] ) {
-		if ('publish' == $_POST['post_status'] && !current_user_can( 'publish_pages' ) )
-			$_POST['post_status'] = 'pending';
-	} else {
-		if ('publish' == $_POST['post_status'] && !current_user_can( 'publish_posts' ) )
-			$_POST['post_status'] = 'pending';
-	}
-
-	if (!isset( $_POST['comment_status'] ))
-		$_POST['comment_status'] = 'closed';
-
-	if (!isset( $_POST['ping_status'] ))
-		$_POST['ping_status'] = 'closed';
-
-	if (!empty ( $_POST['edit_date'] ) ) {
-		$aa = $_POST['aa'];
-		$mm = $_POST['mm'];
-		$jj = $_POST['jj'];
-		$hh = $_POST['hh'];
-		$mn = $_POST['mn'];
-		$ss = $_POST['ss'];
-		$jj = ($jj > 31 ) ? 31 : $jj;
-		$hh = ($hh > 23 ) ? $hh -24 : $hh;
-		$mn = ($mn > 59 ) ? $mn -60 : $mn;
-		$ss = ($ss > 59 ) ? $ss -60 : $ss;
-		$_POST['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss );
-		$_POST['post_date_gmt'] = get_gmt_from_date( $_POST['post_date'] );
-	}
-
-	// Create the post.
-	$post_ID = wp_insert_post( $_POST );
-	if ( is_wp_error( $post_ID ) )
-		return $post_ID;
-
-	if ( empty($post_ID) )
-		return 0;
-
-	add_meta( $post_ID );
-
-	// Reunite any orphaned attachments with their parent
-	if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) )
-		$draft_ids = array();
-	if ( $draft_temp_id = (int) array_search( $post_ID, $draft_ids ) )
-		_relocate_children( $draft_temp_id, $post_ID );
-	if ( $temp_id && $temp_id != $draft_temp_id )
-		_relocate_children( $temp_id, $post_ID );
-
-	// Update autosave collision detection
-	if ( $temp_id ) {
-		$draft_ids[$temp_id] = $post_ID;
-		update_user_option( $user_ID, 'autosave_draft_ids', $draft_ids );
-	}
-
-	// Now that we have an ID we can fix any attachment anchor hrefs
-	_fix_attachment_links( $post_ID );
-
-	return $post_ID;
-}
-
-function write_post() {
-	$result = wp_write_post();
-	if( is_wp_error( $result ) )
-		wp_die( $result->get_error_message() );
-	else
-		return $result;
-}
-
-//
-// Post Meta
-//
-
-function add_meta( $post_ID ) {
-	global $wpdb;
-	$post_ID = (int) $post_ID;
-
-	$protected = array( '_wp_attached_file', '_wp_attachment_metadata', '_wp_old_slug', '_wp_page_template' );
-
-	$metakeyselect = $wpdb->escape( stripslashes( trim( $_POST['metakeyselect'] ) ) );
-	$metakeyinput = $wpdb->escape( stripslashes( trim( $_POST['metakeyinput'] ) ) );
-	$metavalue = maybe_serialize( stripslashes( (trim( $_POST['metavalue'] ) ) ));
-	$metavalue = $wpdb->escape( $metavalue );
-
-	if ( ('0' === $metavalue || !empty ( $metavalue ) ) && ((('#NONE#' != $metakeyselect) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput) ) ) {
-		// We have a key/value pair. If both the select and the
-		// input for the key have data, the input takes precedence:
-
- 		if ('#NONE#' != $metakeyselect)
-			$metakey = $metakeyselect;
-
-		if ( $metakeyinput)
-			$metakey = $metakeyinput; // default
-
-		if ( in_array($metakey, $protected) )
-			return false;
-
-		$result = $wpdb->query( "
-						INSERT INTO $wpdb->postmeta
-						(post_id,meta_key,meta_value )
-						VALUES ('$post_ID','$metakey','$metavalue' )
-					" );
-		return $wpdb->insert_id;
-	}
-	return false;
-} // add_meta
-
-function delete_meta( $mid ) {
-	global $wpdb;
-	$mid = (int) $mid;
-
-	return $wpdb->query( "DELETE FROM $wpdb->postmeta WHERE meta_id = '$mid'" );
-}
-
-// Get a list of previously defined keys
-function get_meta_keys() {
-	global $wpdb;
-
-	$keys = $wpdb->get_col( "
-			SELECT meta_key
-			FROM $wpdb->postmeta
-			GROUP BY meta_key
-			ORDER BY meta_key" );
-
-	return $keys;
-}
-
-function get_post_meta_by_id( $mid ) {
-	global $wpdb;
-	$mid = (int) $mid;
-
-	$meta = $wpdb->get_row( "SELECT * FROM $wpdb->postmeta WHERE meta_id = '$mid'" );
-	if ( is_serialized_string( $meta->meta_value ) )
-		$meta->meta_value = maybe_unserialize( $meta->meta_value );
-	return $meta;
-}
-
-// Some postmeta stuff
-function has_meta( $postid ) {
-	global $wpdb;
-
-	return $wpdb->get_results( "
-			SELECT meta_key, meta_value, meta_id, post_id
-			FROM $wpdb->postmeta
-			WHERE post_id = '$postid'
-			ORDER BY meta_key,meta_id", ARRAY_A );
-
-}
-
-function update_meta( $mid, $mkey, $mvalue ) {
-	global $wpdb;
-
-	$protected = array( '_wp_attached_file', '_wp_attachment_metadata', '_wp_old_slug', '_wp_page_template' );
-
-	if ( in_array($mkey, $protected) )
-		return false;
-
-	$mvalue = maybe_serialize( stripslashes( $mvalue ));
-	$mvalue = $wpdb->escape( $mvalue );
-	$mid = (int) $mid;
-	return $wpdb->query( "UPDATE $wpdb->postmeta SET meta_key = '$mkey', meta_value = '$mvalue' WHERE meta_id = '$mid'" );
-}
-
-//
-// Private
-//
-
-// Replace hrefs of attachment anchors with up-to-date permalinks.
-function _fix_attachment_links( $post_ID ) {
-	global $wp_rewrite;
-
-	$post = & get_post( $post_ID, ARRAY_A );
-
-	$search = "#<a[^>]+rel=('|\")[^'\"]*attachment[^>]*>#ie";
-
-	// See if we have any rel="attachment" links
-	if ( 0 == preg_match_all( $search, $post['post_content'], $anchor_matches, PREG_PATTERN_ORDER ) )
-		return;
-
-	$i = 0;
-	$search = "#[\s]+rel=(\"|')(.*?)wp-att-(\d+)\\1#i";
-	foreach ( $anchor_matches[0] as $anchor ) {
-		if ( 0 == preg_match( $search, $anchor, $id_matches ) )
-			continue;
-
-		$id = (int) $id_matches[3];
-
-		// While we have the attachment ID, let's adopt any orphans.
-		$attachment = & get_post( $id, ARRAY_A );
-		if ( ! empty( $attachment) && ! is_object( get_post( $attachment['post_parent'] ) ) ) {
-			$attachment['post_parent'] = $post_ID;
-			// Escape data pulled from DB.
-			$attachment = add_magic_quotes( $attachment);
-			wp_update_post( $attachment);
-		}
-
-		$post_search[$i] = $anchor;
-		$post_replace[$i] = preg_replace( "#href=(\"|')[^'\"]*\\1#e", "stripslashes( 'href=\\1' ).get_attachment_link( $id ).stripslashes( '\\1' )", $anchor );
-		++$i;
-	}
-
-	$post['post_content'] = str_replace( $post_search, $post_replace, $post['post_content'] );
-
-	// Escape data pulled from DB.
-	$post = add_magic_quotes( $post);
-
-	return wp_update_post( $post);
-}
-
-// Move child posts to a new parent
-function _relocate_children( $old_ID, $new_ID ) {
-	global $wpdb;
-	$old_ID = (int) $old_ID;
-	$new_ID = (int) $new_ID;
-	return $wpdb->query( "UPDATE $wpdb->posts SET post_parent = $new_ID WHERE post_parent = $old_ID" );
-}
-
-?>
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -1,395 +0,0 @@
-<?php
-// Here we keep the DB structure and option values
-
-$charset_collate = '';
-
-if ( version_compare(mysql_get_server_info(), '4.1.0', '>=') ) {
-	if ( ! empty($wpdb->charset) )
-		$charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-	if ( ! empty($wpdb->collate) )
-		$charset_collate .= " COLLATE $wpdb->collate";
-}
-
-$wp_queries="CREATE TABLE $wpdb->terms (
- term_id bigint(20) NOT NULL auto_increment,
- name varchar(55) NOT NULL default '',
- slug varchar(200) NOT NULL default '',
- term_group bigint(10) NOT NULL default 0,
- PRIMARY KEY  (term_id),
- UNIQUE KEY slug (slug)
-) $charset_collate;
-CREATE TABLE $wpdb->term_taxonomy (
- term_taxonomy_id bigint(20) NOT NULL auto_increment,
- term_id bigint(20) NOT NULL default 0,
- taxonomy varchar(32) NOT NULL default '',
- description longtext NOT NULL,
- parent bigint(20) NOT NULL default 0,
- count bigint(20) NOT NULL default 0,
- PRIMARY KEY  (term_taxonomy_id),
- UNIQUE KEY term_id_taxonomy (term_id,taxonomy)
-) $charset_collate;
-CREATE TABLE $wpdb->term_relationships (
- object_id bigint(20) NOT NULL default 0,
- term_taxonomy_id bigint(20) NOT NULL default 0,
- PRIMARY KEY  (object_id,term_taxonomy_id),
- KEY term_taxonomy_id (term_taxonomy_id)
-) $charset_collate;
-CREATE TABLE $wpdb->comments (
-  comment_ID bigint(20) unsigned NOT NULL auto_increment,
-  comment_post_ID int(11) NOT NULL default '0',
-  comment_author tinytext NOT NULL,
-  comment_author_email varchar(100) NOT NULL default '',
-  comment_author_url varchar(200) NOT NULL default '',
-  comment_author_IP varchar(100) NOT NULL default '',
-  comment_date datetime NOT NULL default '0000-00-00 00:00:00',
-  comment_date_gmt datetime NOT NULL default '0000-00-00 00:00:00',
-  comment_content text NOT NULL,
-  comment_karma int(11) NOT NULL default '0',
-  comment_approved enum('0','1','spam') NOT NULL default '1',
-  comment_agent varchar(255) NOT NULL default '',
-  comment_type varchar(20) NOT NULL default '',
-  comment_parent bigint(20) NOT NULL default '0',
-  user_id bigint(20) NOT NULL default '0',
-  PRIMARY KEY  (comment_ID),
-  KEY comment_approved (comment_approved),
-  KEY comment_post_ID (comment_post_ID)
-) $charset_collate;
-CREATE TABLE $wpdb->links (
-  link_id bigint(20) NOT NULL auto_increment,
-  link_url varchar(255) NOT NULL default '',
-  link_name varchar(255) NOT NULL default '',
-  link_image varchar(255) NOT NULL default '',
-  link_target varchar(25) NOT NULL default '',
-  link_category bigint(20) NOT NULL default '0',
-  link_description varchar(255) NOT NULL default '',
-  link_visible enum('Y','N') NOT NULL default 'Y',
-  link_owner int(11) NOT NULL default '1',
-  link_rating int(11) NOT NULL default '0',
-  link_updated datetime NOT NULL default '0000-00-00 00:00:00',
-  link_rel varchar(255) NOT NULL default '',
-  link_notes mediumtext NOT NULL,
-  link_rss varchar(255) NOT NULL default '',
-  PRIMARY KEY  (link_id),
-  KEY link_category (link_category),
-  KEY link_visible (link_visible)
-) $charset_collate;
-CREATE TABLE $wpdb->options (
-  option_id bigint(20) NOT NULL auto_increment,
-  blog_id int(11) NOT NULL default '0',
-  option_name varchar(64) NOT NULL default '',
-  option_value longtext NOT NULL,
-  autoload enum('yes','no') NOT NULL default 'yes',
-  PRIMARY KEY  (option_id,blog_id,option_name),
-  KEY option_name (option_name)
-) $charset_collate;
-CREATE TABLE $wpdb->postmeta (
-  meta_id bigint(20) NOT NULL auto_increment,
-  post_id bigint(20) NOT NULL default '0',
-  meta_key varchar(255) default NULL,
-  meta_value longtext,
-  PRIMARY KEY  (meta_id),
-  KEY post_id (post_id),
-  KEY meta_key (meta_key)
-) $charset_collate;
-CREATE TABLE $wpdb->posts (
-  ID bigint(20) unsigned NOT NULL auto_increment,
-  post_author bigint(20) NOT NULL default '0',
-  post_date datetime NOT NULL default '0000-00-00 00:00:00',
-  post_date_gmt datetime NOT NULL default '0000-00-00 00:00:00',
-  post_content longtext NOT NULL,
-  post_title text NOT NULL,
-  post_category int(4) NOT NULL default '0',
-  post_excerpt text NOT NULL,
-  post_status enum('publish','draft','private','static','object','attachment','inherit','future', 'pending') NOT NULL default 'publish',
-  comment_status enum('open','closed','registered_only') NOT NULL default 'open',
-  ping_status enum('open','closed') NOT NULL default 'open',
-  post_password varchar(20) NOT NULL default '',
-  post_name varchar(200) NOT NULL default '',
-  to_ping text NOT NULL,
-  pinged text NOT NULL,
-  post_modified datetime NOT NULL default '0000-00-00 00:00:00',
-  post_modified_gmt datetime NOT NULL default '0000-00-00 00:00:00',
-  post_content_filtered text NOT NULL,
-  post_parent bigint(20) NOT NULL default '0',
-  guid varchar(255) NOT NULL default '',
-  menu_order int(11) NOT NULL default '0',
-  post_type varchar(20) NOT NULL default 'post',
-  post_mime_type varchar(100) NOT NULL default '',
-  comment_count bigint(20) NOT NULL default '0',
-  PRIMARY KEY  (ID),
-  KEY post_name (post_name),
-  KEY type_status_date (post_type,post_status,post_date,ID)
-) $charset_collate;
-CREATE TABLE $wpdb->users (
-  ID bigint(20) unsigned NOT NULL auto_increment,
-  user_login varchar(60) NOT NULL default '',
-  user_pass varchar(64) NOT NULL default '',
-  user_nicename varchar(50) NOT NULL default '',
-  user_email varchar(100) NOT NULL default '',
-  user_url varchar(100) NOT NULL default '',
-  user_registered datetime NOT NULL default '0000-00-00 00:00:00',
-  user_activation_key varchar(60) NOT NULL default '',
-  user_status int(11) NOT NULL default '0',
-  display_name varchar(250) NOT NULL default '',
-  PRIMARY KEY  (ID),
-  KEY user_login_key (user_login),
-  KEY user_nicename (user_nicename)
-) $charset_collate;
-CREATE TABLE $wpdb->usermeta (
-  umeta_id bigint(20) NOT NULL auto_increment,
-  user_id bigint(20) NOT NULL default '0',
-  meta_key varchar(255) default NULL,
-  meta_value longtext,
-  PRIMARY KEY  (umeta_id),
-  KEY user_id (user_id),
-  KEY meta_key (meta_key)
-) $charset_collate;";
-
-function populate_options() {
-	global $wpdb, $wp_db_version;
-
-	$schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
-	$guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-	add_option('siteurl', $guessurl);
-	add_option('blogname', __('My Blog'));
-	add_option('blogdescription', __('Just another WordPress weblog'));
-	add_option('users_can_register', 0);
-	add_option('admin_email', 'you@example.com');
-	add_option('start_of_week', 1);
-	add_option('use_balanceTags', 0);
-	add_option('use_smilies', 1);
-	add_option('require_name_email', 1);
-	add_option('comments_notify', 1);
-	add_option('posts_per_rss', 10);
-	add_option('rss_excerpt_length', 50);
-	add_option('rss_use_excerpt', 0);
-	add_option('mailserver_url', 'mail.example.com');
-	add_option('mailserver_login', 'login@example.com');
-	add_option('mailserver_pass', 'password');
-	add_option('mailserver_port', 110);
-	add_option('default_category', 1);
-	add_option('default_comment_status', 'open');
-	add_option('default_ping_status', 'open');
-	add_option('default_pingback_flag', 1);
-	add_option('default_post_edit_rows', 10);
-	add_option('posts_per_page', 10);
-	add_option('what_to_show', 'posts');
-	add_option('date_format', __('F j, Y'));
-	add_option('time_format', __('g:i a'));
-	add_option('links_updated_date_format', __('F j, Y g:i a'));
-	add_option('links_recently_updated_prepend', '<em>');
-	add_option('links_recently_updated_append', '</em>');
-	add_option('links_recently_updated_time', 120);
-	add_option('comment_moderation', 0);
-	add_option('moderation_notify', 1);
-	add_option('permalink_structure');
-	add_option('gzipcompression', 0);
-	add_option('hack_file', 0);
-	add_option('blog_charset', 'UTF-8');
-	add_option('moderation_keys');
-	add_option('active_plugins');
-	add_option('home', $guessurl);
-	// in case it is set, but blank, update "home"
-	if ( !__get_option('home') ) update_option('home', $guessurl);
-	add_option('category_base');
-	add_option('ping_sites', 'http://rpc.pingomatic.com/');
-	add_option('advanced_edit', 0);
-	add_option('comment_max_links', 2);
-	add_option('gmt_offset', date('Z') / 3600);
-	// 1.5
-	add_option('default_email_category', 1);
-	add_option('recently_edited');
-	add_option('use_linksupdate', 0);
-	add_option('template', 'default');
-	add_option('stylesheet', 'default');
-	add_option('comment_whitelist', 1);
-	add_option('page_uris');
-	add_option('blacklist_keys');
-	add_option('comment_registration', 0);
-	add_option('rss_language', 'en');
-	add_option('html_type', 'text/html');
-	// 1.5.1
-	add_option('use_trackback', 0);
-	// 2.0
-	add_option('default_role', 'subscriber');
-	add_option('db_version', $wp_db_version);
-	// 2.0.1
-	if ( ini_get('safe_mode') ) {
-		// Safe mode screws up mkdir(), so we must use a flat structure.
-		add_option('uploads_use_yearmonth_folders', 0);
-		add_option('upload_path', 'wp-content');
-	} else {
-		add_option('uploads_use_yearmonth_folders', 1);
-		add_option('upload_path', 'wp-content/uploads');
-	}
-
-	// 2.0.3
-	add_option('secret', md5(uniqid(microtime())));
-
-	// 2.1
-	add_option('blog_public', '1');
-	add_option('default_link_category', 2);
-	add_option('show_on_front', 'posts');
-
-	// 2.2
-	add_option('tag_base');
-
-	// Delete unused options
-	$unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing');
-	foreach ($unusedoptions as $option) :
-		delete_option($option);
-	endforeach;
-
-	// Set up a few options not to load by default
-	$fatoptions = array( 'moderation_keys', 'recently_edited', 'blacklist_keys' );
-	foreach ($fatoptions as $fatoption) :
-		$wpdb->query("UPDATE $wpdb->options SET `autoload` = 'no' WHERE option_name = '$fatoption'");
-	endforeach;
-}
-
-function populate_roles() {
-	populate_roles_160();
-	populate_roles_210();
-	populate_roles_230();
-}
-
-function populate_roles_160() {
-	global $wp_roles;
-
-	// Add roles
-	add_role('administrator', __('Administrator'));
-	add_role('editor', __('Editor'));
-	add_role('author', __('Author'));
-	add_role('contributor', __('Contributor'));
-	add_role('subscriber', __('Subscriber'));
-
-	// Add caps for Administrator role
-	$role = get_role('administrator');
-	$role->add_cap('switch_themes');
-	$role->add_cap('edit_themes');
-	$role->add_cap('activate_plugins');
-	$role->add_cap('edit_plugins');
-	$role->add_cap('edit_users');
-	$role->add_cap('edit_files');
-	$role->add_cap('manage_options');
-	$role->add_cap('moderate_comments');
-	$role->add_cap('manage_categories');
-	$role->add_cap('manage_links');
-	$role->add_cap('upload_files');
-	$role->add_cap('import');
-	$role->add_cap('unfiltered_html');
-	$role->add_cap('edit_posts');
-	$role->add_cap('edit_others_posts');
-	$role->add_cap('edit_published_posts');
-	$role->add_cap('publish_posts');
-	$role->add_cap('edit_pages');
-	$role->add_cap('read');
-	$role->add_cap('level_10');
-	$role->add_cap('level_9');
-	$role->add_cap('level_8');
-	$role->add_cap('level_7');
-	$role->add_cap('level_6');
-	$role->add_cap('level_5');
-	$role->add_cap('level_4');
-	$role->add_cap('level_3');
-	$role->add_cap('level_2');
-	$role->add_cap('level_1');
-	$role->add_cap('level_0');
-
-	// Add caps for Editor role
-	$role = get_role('editor');
-	$role->add_cap('moderate_comments');
-	$role->add_cap('manage_categories');
-	$role->add_cap('manage_links');
-	$role->add_cap('upload_files');
-	$role->add_cap('unfiltered_html');
-	$role->add_cap('edit_posts');
-	$role->add_cap('edit_others_posts');
-	$role->add_cap('edit_published_posts');
-	$role->add_cap('publish_posts');
-	$role->add_cap('edit_pages');
-	$role->add_cap('read');
-	$role->add_cap('level_7');
-	$role->add_cap('level_6');
-	$role->add_cap('level_5');
-	$role->add_cap('level_4');
-	$role->add_cap('level_3');
-	$role->add_cap('level_2');
-	$role->add_cap('level_1');
-	$role->add_cap('level_0');
-
-	// Add caps for Author role
-	$role = get_role('author');
-	$role->add_cap('upload_files');
-	$role->add_cap('edit_posts');
-	$role->add_cap('edit_published_posts');
-	$role->add_cap('publish_posts');
-	$role->add_cap('read');
-	$role->add_cap('level_2');
-	$role->add_cap('level_1');
-	$role->add_cap('level_0');
-
-	// Add caps for Contributor role
-	$role = get_role('contributor');
-	$role->add_cap('edit_posts');
-	$role->add_cap('read');
-	$role->add_cap('level_1');
-	$role->add_cap('level_0');
-
-	// Add caps for Subscriber role
-	$role = get_role('subscriber');
-	$role->add_cap('read');
-	$role->add_cap('level_0');
-}
-
-function populate_roles_210() {
-	$roles = array('administrator', 'editor');
-	foreach ($roles as $role) {
-		$role = get_role($role);
-		if ( empty($role) )
-			continue;
-
-		$role->add_cap('edit_others_pages');
-		$role->add_cap('edit_published_pages');
-		$role->add_cap('publish_pages');
-		$role->add_cap('delete_pages');
-		$role->add_cap('delete_others_pages');
-		$role->add_cap('delete_published_pages');
-		$role->add_cap('delete_posts');
-		$role->add_cap('delete_others_posts');
-		$role->add_cap('delete_published_posts');
-		$role->add_cap('delete_private_posts');
-		$role->add_cap('edit_private_posts');
-		$role->add_cap('read_private_posts');
-		$role->add_cap('delete_private_pages');
-		$role->add_cap('edit_private_pages');
-		$role->add_cap('read_private_pages');
-	}
-
-	$role = get_role('administrator');
-	if ( ! empty($role) ) {
-		$role->add_cap('delete_users');
-		$role->add_cap('create_users');
-	}
-
-	$role = get_role('author');
-	if ( ! empty($role) ) {
-		$role->add_cap('delete_posts');
-		$role->add_cap('delete_published_posts');
-	}
-
-	$role = get_role('contributor');
-	if ( ! empty($role) ) {
-		$role->add_cap('delete_posts');
-	}
-}
-
-function populate_roles_230() {
-	$role = get_role( 'administrator' );
-
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'unfiltered_upload' );
-	}
-}
-
-?>
--- a/wp-admin/includes/taxonomy.php
+++ b/wp-admin/includes/taxonomy.php
@@ -1,148 +0,0 @@
-<?php
-
-//
-// Category
-//
-
-function category_exists($cat_name) {
-	$id = is_term($cat_name, 'category');
-	if ( is_array($id) )
-		$id = $id['term_id'];
-	return $id;
-}
-
-function get_category_to_edit( $id ) {
-	$category = get_category( $id, OBJECT, 'edit' );
-	return $category;
-}
-
-function wp_create_category($cat_name) {
-	if ( $id = category_exists($cat_name) )
-		return $id;
-
-	return wp_insert_category( array('cat_name' => $cat_name) );
-}
-
-function wp_create_categories($categories, $post_id = '') {
-	$cat_ids = array ();
-	foreach ($categories as $category) {
-		if ($id = category_exists($category))
-			$cat_ids[] = $id;
-		else
-			if ($id = wp_create_category($category))
-				$cat_ids[] = $id;
-	}
-
-	if ($post_id)
-		wp_set_post_categories($post_id, $cat_ids);
-
-	return $cat_ids;
-}
-
-function wp_delete_category($cat_ID) {
-	global $wpdb;
-
-	$cat_ID = (int) $cat_ID;
-	$default = get_option('default_category');
-
-	// Don't delete the default cat
-	if ( $cat_ID == $default )
-		return 0;
-
-	return wp_delete_term($cat_ID, 'category', "default=$default");
-}
-
-function wp_insert_category($catarr) {
-	global $wpdb;
-
-	extract($catarr, EXTR_SKIP);
-
-	if ( trim( $cat_name ) == '' )
-		return 0;
-
-	$cat_ID = (int) $cat_ID;
-
-	// Are we updating or creating?
-	if ( !empty ($cat_ID) )
-		$update = true;
-	else
-		$update = false;
-
-	$name = $cat_name;
-	$description = $category_description;
-	$slug = $category_nicename;
-	$parent = $category_parent;
-
-	$parent = (int) $parent;
-	if ( empty($parent) || !category_exists( $parent ) || ($cat_ID && cat_is_ancestor_of($cat_ID, $parent) ) )
-		$parent = 0;
-
-	$args = compact('name', 'slug', 'parent', 'description');
-
-	if ( $update )
-		$cat_ID = wp_update_term($cat_ID, 'category', $args);
-	else
-		$cat_ID = wp_insert_term($cat_name, 'category', $args);
-
-	if ( is_wp_error($cat_ID) )
-		return 0;
-
-	return $cat_ID['term_id'];
-}
-
-function wp_update_category($catarr) {
-	global $wpdb;
-
-	$cat_ID = (int) $catarr['cat_ID'];
-
-	if ( $cat_ID == $catarr['category_parent'] )
-		return false;
-
-	// First, get all of the original fields
-	$category = get_category($cat_ID, ARRAY_A);
-
-	// Escape data pulled from DB.
-	$category = add_magic_quotes($category);
-
-	// Merge old and new fields with new fields overwriting old ones.
-	$catarr = array_merge($category, $catarr);
-
-	return wp_insert_category($catarr);
-}
-
-//
-// Tags
-//
-
-function get_tags_to_edit( $post_id ) {
-	global $wpdb;
-
-	$post_id = (int) $post_id;
-	if ( !$post_id )
-		return false;
-
-	$tags = wp_get_post_tags($post_id);
-
-	if ( !$tags )
-		return false;
-
-	foreach ( $tags as $tag )
-		$tag_names[] = $tag->name;
-	$tags_to_edit = join( ', ', $tag_names );
-	$tags_to_edit = attribute_escape( $tags_to_edit );
-	$tags_to_edit = apply_filters( 'tags_to_edit', $tags_to_edit );
-	return $tags_to_edit;
-}
-
-function tag_exists($tag_name) {
-	return is_term($tag_name, 'post_tag');
-}
-
-function wp_create_tag($tag_name) {
-	if ( $id = tag_exists($tag_name) )
-		return $id;
-
-	return wp_insert_term($tag_name, 'post_tag');
-}
-
-?>
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -1,616 +0,0 @@
-<?php
-
-//
-// Big Mess
-//
-
-// Dandy new recursive multiple category stuff.
-function cat_rows( $parent = 0, $level = 0, $categories = 0 ) {
-	if ( !$categories )
-		$categories = get_categories( 'hide_empty=0' );
-
-	$children = _get_term_hierarchy('category');
-
-	if ( $categories ) {
-		ob_start();
-		foreach ( $categories as $category ) {
-			if ( $category->parent == $parent) {
-				echo "\t" . _cat_row( $category, $level );
-				if ( isset($children[$category->term_id]) )
-					cat_rows( $category->term_id, $level +1, $categories );
-			}
-		}
-		$output = ob_get_contents();
-		ob_end_clean();
-
-		$output = apply_filters('cat_rows', $output);
-
-		echo $output;
-	} else {
-		return false;
-	}
-}
-
-function _cat_row( $category, $level, $name_override = false ) {
-	global $class;
-
-	$pad = str_repeat( '&#8212; ', $level );
-	if ( current_user_can( 'manage_categories' ) ) {
-		$edit = "<a href='categories.php?action=edit&amp;cat_ID=$category->term_id' class='edit'>".__( 'Edit' )."</a></td>";
-		$default_cat_id = (int) get_option( 'default_category' );
-
-		if ( $category->term_id != $default_cat_id )
-			$edit .= "<td><a href='" . wp_nonce_url( "categories.php?action=delete&amp;cat_ID=$category->term_id", 'delete-category_' . $category->term_id ) . "' onclick=\"return deleteSomething( 'cat', $category->term_id, '" . js_escape(sprintf( __("You are about to delete the category '%s'.\nAll posts that were only assigned to this category will be assigned to the '%s' category.\nAll links that were only assigned to this category will be assigned to the '%s' category.\n'OK' to delete, 'Cancel' to stop." ), $category->name, get_catname( $default_cat_id ), get_catname( $default_link_cat_id ) )) . "' );\" class='delete'>".__( 'Delete' )."</a>";
-		else
-			$edit .= "<td style='text-align:center'>".__( "Default" );
-	} else
-		$edit = '';
-
-	$class = ( ( defined( 'DOING_AJAX' ) && DOING_AJAX ) || " class='alternate'" == $class ) ? '' : " class='alternate'";
-
-	$category->count = number_format_i18n( $category->count );
-	$posts_count = ( $category->count > 0 ) ? "<a href='edit.php?cat=$category->term_id'>$category->count</a>" : $category->count;
-	$output = "<tr id='cat-$category->term_id'$class>
-		<th scope='row' style='text-align: center'>$category->term_id</th>
-		<td>" . ( $name_override ? $name_override : $pad . ' ' . $category->name ) . "</td>
-		<td>$category->description</td>
-		<td align='center'>$posts_count</td>
-		<td>$edit</td>\n\t</tr>\n";
-
-	return apply_filters('cat_row', $output);
-}
-
-function checked( $checked, $current) {
-	if ( $checked == $current)
-		echo ' checked="checked"';
-}
-
-// TODO: Remove?
-function documentation_link( $for ) {
-	return;
-}
-
-function selected( $selected, $current) {
-	if ( $selected == $current)
-		echo ' selected="selected"';
-}
-
-//
-// Nasty Category Stuff
-//
-
-function sort_cats( $cat1, $cat2 ) {
-	if ( $cat1['checked'] || $cat2['checked'] )
-		return ( $cat1['checked'] && !$cat2['checked'] ) ? -1 : 1;
-	else
-		return strcasecmp( $cat1['cat_name'], $cat2['cat_name'] );
-}
-
-function get_nested_categories( $default = 0, $parent = 0 ) {
-	global $post_ID, $mode, $wpdb, $checked_categories;
-
-	if ( empty($checked_categories) ) {
-		if ( $post_ID ) {
-			$checked_categories = wp_get_post_categories($post_ID);
-
-			if ( count( $checked_categories ) == 0 ) {
-				// No selected categories, strange
-			$checked_categories[] = $default;
-			}
-		} else {
-			$checked_categories[] = $default;
-		}
-	}
-
-	$cats = get_categories("parent=$parent&hide_empty=0&fields=ids");
-
-	$result = array ();
-	if ( is_array( $cats ) ) {
-		foreach ( $cats as $cat) {
-			$result[$cat]['children'] = get_nested_categories( $default, $cat);
-			$result[$cat]['cat_ID'] = $cat;
-			$result[$cat]['checked'] = in_array( $cat, $checked_categories );
-			$result[$cat]['cat_name'] = get_the_category_by_ID( $cat);
-		}
-	}
-
-	$result = apply_filters('get_nested_categories', $result);
-	usort( $result, 'sort_cats' );
-
-	return $result;
-}
-
-function write_nested_categories( $categories ) {
-	foreach ( $categories as $category ) {
-		echo '<li id="category-', $category['cat_ID'], '"><label for="in-category-', $category['cat_ID'], '" class="selectit"><input value="', $category['cat_ID'], '" type="checkbox" name="post_category[]" id="in-category-', $category['cat_ID'], '"', ($category['checked'] ? ' checked="checked"' : "" ), '/> ', wp_specialchars( apply_filters('the_category', $category['cat_name'] )), "</label></li>";
-
-		if ( $category['children'] ) {
-			echo "<ul>\n";
-			write_nested_categories( $category['children'] );
-			echo "</ul>\n";
-		}
-	}
-}
-
-function dropdown_categories( $default = 0 ) {
-	write_nested_categories( get_nested_categories( $default) );
-}
-
-function dropdown_link_categories( $default = 0 ) {
-	global $link_id;
-
-	if ( $link_id ) {
-		$checked_categories = wp_get_link_cats($link_id);
-
-		if ( count( $checked_categories ) == 0 ) {
-			// No selected categories, strange
-			$checked_categories[] = $default;
-		}
-	} else {
-		$checked_categories[] = $default;
-	}
-
-	$categories = get_terms('link_category', 'orderby=count&hide_empty=0');
-
-	if ( empty($categories) )
-		return;
-
-	foreach ( $categories as $category ) {
-		$cat_id = $category->term_id;
-		$name = wp_specialchars( apply_filters('the_category', $category->name));
-		$checked = in_array( $cat_id, $checked_categories );
-		echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', ($checked ? ' checked="checked"' : "" ), '/> ', $name, "</label></li>";
-	}
-}
-
-function page_rows( $parent = 0, $level = 0, $pages = 0, $hierarchy = true ) {
-	global $wpdb, $class, $post;
-
-	if (!$pages )
-		$pages = get_pages( 'sort_column=menu_order' );
-
-	if (! $pages )
-		return false;
-
-	foreach ( $pages as $post) {
-		setup_postdata( $post);
-		if ( $hierarchy && ($post->post_parent != $parent) )
-			continue;
-
-		$post->post_title = wp_specialchars( $post->post_title );
-		$pad = str_repeat( '&#8212; ', $level );
-		$id = (int) $post->ID;
-		$class = ('alternate' == $class ) ? '' : 'alternate';
-?>
-  <tr id='page-<?php echo $id; ?>' class='<?php echo $class; ?>'>
-    <th scope="row" style="text-align: center"><?php echo $post->ID; ?></th>
-    <td>
-      <?php echo $pad; ?><?php the_title() ?>
-    </td>
-    <td><?php the_author() ?></td>
-    <td><?php if ( '0000-00-00 00:00:00' ==$post->post_modified ) _e('Unpublished'); else echo mysql2date( __('Y-m-d g:i a'), $post->post_modified ); ?></td>
-	<td><a href="<?php the_permalink(); ?>" rel="permalink" class="view"><?php _e( 'View' ); ?></a></td>
-    <td><?php if ( current_user_can( 'edit_page', $id ) ) { echo "<a href='page.php?action=edit&amp;post=$id' class='edit'>" . __( 'Edit' ) . "</a>"; } ?></td>
-    <td><?php if ( current_user_can( 'delete_page', $id ) ) { echo "<a href='" . wp_nonce_url( "page.php?action=delete&amp;post=$id", 'delete-page_' . $id ) .  "' class='delete' onclick=\"return deleteSomething( 'page', " . $id . ", '" . js_escape(sprintf( __("You are about to delete the '%s' page.\n'OK' to delete, 'Cancel' to stop." ), get_the_title() ) ) . "' );\">" . __( 'Delete' ) . "</a>"; } ?></td>
-  </tr>
-
-<?php
-		if ( $hierarchy ) page_rows( $id, $level + 1, $pages );
-	}
-}
-
-function user_row( $user_object, $style = '' ) {
-	if ( !(is_object( $user_object) && is_a( $user_object, 'WP_User' ) ) )
-		$user_object = new WP_User( (int) $user_object );
-	$email = $user_object->user_email;
-	$url = $user_object->user_url;
-	$short_url = str_replace( 'http://', '', $url );
-	$short_url = str_replace( 'www.', '', $short_url );
-	if ('/' == substr( $short_url, -1 ))
-		$short_url = substr( $short_url, 0, -1 );
-	if ( strlen( $short_url ) > 35 )
-		$short_url =  substr( $short_url, 0, 32 ).'...';
-	$numposts = get_usernumposts( $user_object->ID );
-	$r = "<tr id='user-$user_object->ID'$style>
-		<td><input type='checkbox' name='users[]' id='user_{$user_object->ID}' value='{$user_object->ID}' /> <label for='user_{$user_object->ID}'>{$user_object->ID}</label></td>
-		<td><label for='user_{$user_object->ID}'><strong>$user_object->user_login</strong></label></td>
-		<td><label for='user_{$user_object->ID}'>$user_object->first_name $user_object->last_name</label></td>
-		<td><a href='mailto:$email' title='" . sprintf( __('e-mail: %s' ), $email ) . "'>$email</a></td>
-		<td><a href='$url' title='website: $url'>$short_url</a></td>";
-	$r .= "\n\t\t<td align='center'>";
-	if ( $numposts > 0 ) {
-		$r .= "<a href='edit.php?author=$user_object->ID' title='" . __( 'View posts by this author' ) . "' class='edit'>";
-		$r .= sprintf(__ngettext( 'View %s post', 'View %s posts', $numposts ), $numposts);
-		$r .= '</a>';
-	}
-	$r .= "</td>\n\t\t<td>";
-	if ( current_user_can( 'edit_user', $user_object->ID ) ) {
-		$edit_link = add_query_arg( 'wp_http_referer', urlencode( clean_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" );
-		$r .= "<a href='$edit_link' class='edit'>".__( 'Edit' )."</a>";
-	}
-	$r .= "</td>\n\t</tr>";
-	return $r;
-}
-
-function _wp_get_comment_list( $s = false, $start, $num ) {
-	global $wpdb;
-
-	$start = abs( (int) $start );
-	$num = (int) $num;
-
-	if ( $s ) {
-		$s = $wpdb->escape($s);
-		$comments = $wpdb->get_results("SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments WHERE
-			(comment_author LIKE '%$s%' OR
-			comment_author_email LIKE '%$s%' OR
-			comment_author_url LIKE ('%$s%') OR
-			comment_author_IP LIKE ('%$s%') OR
-			comment_content LIKE ('%$s%') ) AND
-			comment_approved != 'spam'
-			ORDER BY comment_date DESC LIMIT $start, $num");
-	} else {
-		$comments = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments WHERE comment_approved = '0' OR comment_approved = '1' ORDER BY comment_date DESC LIMIT $start, $num" );
-	}
-
-	update_comment_cache($comments);
-
-	$total = $wpdb->get_var( "SELECT FOUND_ROWS()" );
-
-	return array($comments, $total);
-}
-
-function _wp_comment_list_item( $id, $alt = 0 ) {
-	global $authordata, $comment, $wpdb;
-	$id = (int) $id;
-	$comment =& get_comment( $id );
-	$class = '';
-	$post = get_post($comment->comment_post_ID);
-	$authordata = get_userdata($post->post_author);
-	$comment_status = wp_get_comment_status($comment->comment_ID);
-	if ( 'unapproved' == $comment_status )
-		$class .= ' unapproved';
-	if ( $alt % 2 )
-		$class .= ' alternate';
-	echo "<li id='comment-$comment->comment_ID' class='$class'>";
-?>
-<p><strong><?php comment_author(); ?></strong> <?php if ($comment->comment_author_email) { ?>| <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> | <?php comment_author_url_link() ?> <?php } ?>| <?php _e('IP:') ?> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
-
-<?php comment_text() ?>
-
-<p><?php comment_date(__('M j, g:i A'));  ?> &#8212; [
-<?php
-if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-	echo " <a href='comment.php?action=editcomment&amp;c=".$comment->comment_ID."'>" .  __('Edit') . '</a>';
-	echo ' | <a href="' . wp_nonce_url('comment.php?action=deletecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . '" onclick="return deleteSomething( \'comment\', ' . $comment->comment_ID . ', \'' . js_escape(sprintf(__("You are about to delete this comment by '%s'.\n'Cancel' to stop, 'OK' to delete."), $comment->comment_author)) . "', theCommentList );\">" . __('Delete') . '</a> ';
-	if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) {
-		echo '<span class="unapprove"> | <a href="' . wp_nonce_url('comment.php?action=unapprovecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'unapprove-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Unapprove') . '</a> </span>';
-		echo '<span class="approve"> | <a href="' . wp_nonce_url('comment.php?action=approvecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'approve-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Approve') . '</a> </span>';
-	}
-	echo " | <a href=\"" . wp_nonce_url("comment.php?action=deletecomment&amp;dt=spam&amp;p=" . $comment->comment_post_ID . "&amp;c=" . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to mark as spam this comment by '%s'.\n'Cancel' to stop, 'OK' to mark as spam."), $comment->comment_author))  . "', theCommentList );\">" . __('Spam') . "</a> ";
-}
-$post = get_post($comment->comment_post_ID, OBJECT, 'display');
-$post_title = wp_specialchars( $post->post_title, 'double' );
-$post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
-?>
- ] &#8212; <a href="<?php echo get_permalink($comment->comment_post_ID); ?>"><?php echo $post_title; ?></a></p>
-		</li>
-<?php
-}
-
-function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) {
-	global $wpdb;
-	if (!$categories )
-		$categories = get_categories( 'hide_empty=0' );
-
-	if ( $categories ) {
-		foreach ( $categories as $category ) {
-			if ( $currentcat != $category->term_id && $parent == $category->parent) {
-				$pad = str_repeat( '&#8211; ', $level );
-				$category->name = wp_specialchars( $category->name );
-				echo "\n\t<option value='$category->term_id'";
-				if ( $currentparent == $category->term_id )
-					echo " selected='selected'";
-				echo ">$pad$category->name</option>";
-				wp_dropdown_cats( $currentcat, $currentparent, $category->term_id, $level +1, $categories );
-			}
-		}
-	} else {
-		return false;
-	}
-}
-
-function list_meta( $meta ) {
-	global $post_ID;
-	// Exit if no meta
-	if (!$meta ) {
-		echo '<tbody id="the-list"><tr style="display: none;"><td>&nbsp;</td></tr></tbody>'; //TBODY needed for list-manipulation JS
-		return;
-	}
-	$count = 0;
-?>
-	<thead>
-	<tr>
-		<th><?php _e( 'Key' ) ?></th>
-		<th><?php _e( 'Value' ) ?></th>
-		<th colspan='2'><?php _e( 'Action' ) ?></th>
-	</tr>
-	</thead>
-<?php
-	$r ="\n\t<tbody id='the-list'>";
-	foreach ( $meta as $entry ) {
-		++ $count;
-		if ( $count % 2 )
-			$style = 'alternate';
-		else
-			$style = '';
-		if ('_' == $entry['meta_key'] { 0 } )
-			$style .= ' hidden';
-
-		if ( is_serialized( $entry['meta_value'] ) ) {
-			if ( is_serialized_string( $entry['meta_value'] ) ) {
-				// this is a serialized string, so we should display it
-				$entry['meta_value'] = maybe_unserialize( $entry['meta_value'] );
-			} else {
-				// this is a serialized array/object so we should NOT display it
-				--$count;
-				continue;
-			}
-		}
-
-		$key_js = js_escape( $entry['meta_key'] );
-		$entry['meta_key']   = attribute_escape($entry['meta_key']);
-		$entry['meta_value'] = attribute_escape($entry['meta_value']);
-		$entry['meta_id'] = (int) $entry['meta_id'];
-		$r .= "\n\t<tr id='meta-{$entry['meta_id']}' class='$style'>";
-		$r .= "\n\t\t<td valign='top'><input name='meta[{$entry['meta_id']}][key]' tabindex='6' type='text' size='20' value='{$entry['meta_key']}' /></td>";
-		$r .= "\n\t\t<td><textarea name='meta[{$entry['meta_id']}][value]' tabindex='6' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>";
-		$r .= "\n\t\t<td align='center'><input name='updatemeta' type='submit' class='updatemeta' tabindex='6' value='".attribute_escape(__( 'Update' ))."' /><br />";
-		$r .= "\n\t\t<input name='deletemeta[{$entry['meta_id']}]' type='submit' onclick=\"return deleteSomething( 'meta', {$entry['meta_id']}, '";
-		$r .= js_escape(sprintf( __("You are about to delete the '%s' custom field on this post.\n'OK' to delete, 'Cancel' to stop." ), $key_js ) );
-		$r .= "' );\" class='deletemeta' tabindex='6' value='".attribute_escape(__( 'Delete' ))."' /></td>";
-		$r .= "\n\t</tr>";
-	}
-	echo $r;
-	echo "\n\t</tbody>";
-}
-
-function meta_form() {
-	global $wpdb;
-	$limit = (int) apply_filters( 'postmeta_form_limit', 30 );
-	$keys = $wpdb->get_col( "
-		SELECT meta_key
-		FROM $wpdb->postmeta
-		WHERE meta_key NOT LIKE '\_%'
-		GROUP BY meta_key
-		ORDER BY meta_id DESC
-		LIMIT $limit" );
-	if ( $keys )
-		natcasesort($keys);
-?>
-<h3><?php _e( 'Add a new custom field:' ) ?></h3>
-<table id="newmeta" cellspacing="3" cellpadding="3">
-	<tr>
-<th colspan="2"><?php _e( 'Key' ) ?></th>
-<th><?php _e( 'Value' ) ?></th>
-</tr>
-	<tr valign="top">
-		<td align="right" width="18%">
-<?php if ( $keys ) : ?>
-<select id="metakeyselect" name="metakeyselect" tabindex="7">
-<option value="#NONE#"><?php _e( '- Select -' ); ?></option>
-<?php
-
-	foreach ( $keys as $key ) {
-		$key = attribute_escape( $key );
-		echo "\n\t<option value='$key'>$key</option>";
-	}
-?>
-</select> <?php _e( 'or' ); ?>
-<?php endif; ?>
-</td>
-<td><input type="text" id="metakeyinput" name="metakeyinput" tabindex="7" /></td>
-		<td><textarea id="metavalue" name="metavalue" rows="3" cols="25" tabindex="8"></textarea></td>
-	</tr>
-
-</table>
-<p class="submit"><input type="submit" id="updatemetasub" name="updatemeta" tabindex="9" value="<?php _e( 'Add Custom Field &raquo;' ) ?>" /></p>
-<?php
-
-}
-
-function touch_time( $edit = 1, $for_post = 1, $tab_index = 0 ) {
-	global $wp_locale, $post, $comment;
-
-	if ( $for_post )
-		$edit = ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date || '0000-00-00 00:00:00' == $post->post_date ) ) ? false : true;
-	
-	$tab_index_attribute = '';
-	if ( (int) $tab_index > 0 )
-		$tab_index_attribute = " tabindex=\"$tab_index\"";
-
-	echo '<fieldset><legend><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> <label for="timestamp">'.__( 'Edit timestamp' ).'</label></legend>';
-
-	$time_adj = time() + (get_option( 'gmt_offset' ) * 3600 );
-	$post_date = ($for_post) ? $post->post_date : $comment->comment_date;
-	$jj = ($edit) ? mysql2date( 'd', $post_date ) : gmdate( 'd', $time_adj );
-	$mm = ($edit) ? mysql2date( 'm', $post_date ) : gmdate( 'm', $time_adj );
-	$aa = ($edit) ? mysql2date( 'Y', $post_date ) : gmdate( 'Y', $time_adj );
-	$hh = ($edit) ? mysql2date( 'H', $post_date ) : gmdate( 'H', $time_adj );
-	$mn = ($edit) ? mysql2date( 'i', $post_date ) : gmdate( 'i', $time_adj );
-	$ss = ($edit) ? mysql2date( 's', $post_date ) : gmdate( 's', $time_adj );
-
-	echo "<select name=\"mm\" onchange=\"edit_date.checked=true\"$tab_index_attribute>\n";
-	for ( $i = 1; $i < 13; $i = $i +1 ) {
-		echo "\t\t\t<option value=\"$i\"";
-		if ( $i == $mm )
-			echo ' selected="selected"';
-		echo '>' . $wp_locale->get_month( $i ) . "</option>\n";
-	}
-?>
-</select>
-<input type="text" id="jj" name="jj" value="<?php echo $jj; ?>" size="2" maxlength="2" onchange="edit_date.checked=true"<?php echo $tab_index_attribute ?> />
-<input type="text" id="aa" name="aa" value="<?php echo $aa ?>" size="4" maxlength="5" onchange="edit_date.checked=true"<?php echo $tab_index_attribute ?> /> @
-<input type="text" id="hh" name="hh" value="<?php echo $hh ?>" size="2" maxlength="2" onchange="edit_date.checked=true"<?php echo $tab_index_attribute ?> /> :
-<input type="text" id="mn" name="mn" value="<?php echo $mn ?>" size="2" maxlength="2" onchange="edit_date.checked=true"<?php echo $tab_index_attribute ?> />
-<input type="hidden" id="ss" name="ss" value="<?php echo $ss ?>" size="2" maxlength="2" onchange="edit_date.checked=true" />
-<?php
-	if ( $edit ) {
-		printf( _c( 'Existing timestamp: %1$s %2$s, %3$s @ %4$s:%5$s|1: month, 2: month string, 3: full year, 4: hours, 5: minutes' ), $wp_locale->get_month( $mm ), $jj, $aa, $hh, $mn );
-	}
-?>
-</fieldset>
-	<?php
-
-}
-
-function page_template_dropdown( $default = '' ) {
-	$templates = get_page_templates();
-	ksort( $templates );
-	foreach (array_keys( $templates ) as $template )
-		: if ( $default == $templates[$template] )
-			$selected = " selected='selected'";
-		else
-			$selected = '';
-	echo "\n\t<option value='".$templates[$template]."' $selected>$template</option>";
-	endforeach;
-}
-
-function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) {
-	global $wpdb, $post_ID;
-	$items = $wpdb->get_results( "SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = $parent AND post_type = 'page' ORDER BY menu_order" );
-
-	if ( $items ) {
-		foreach ( $items as $item ) {
-			// A page cannot be its own parent.
-			if (!empty ( $post_ID ) ) {
-				if ( $item->ID == $post_ID ) {
-					continue;
-				}
-			}
-			$pad = str_repeat( '&nbsp;', $level * 3 );
-			if ( $item->ID == $default)
-				$current = ' selected="selected"';
-			else
-				$current = '';
-
-			echo "\n\t<option value='$item->ID'$current>$pad $item->post_title</option>";
-			parent_dropdown( $default, $item->ID, $level +1 );
-		}
-	} else {
-		return false;
-	}
-}
-
-function browse_happy() {
-	$getit = __( 'WordPress recommends a better browser' );
-	echo '
-		<p id="bh" style="text-align: center;"><a href="http://browsehappy.com/" title="'.$getit.'"><img src="images/browse-happy.gif" alt="Browse Happy" /></a></p>
-		';
-}
-
-if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)
-	add_action( 'admin_footer', 'browse_happy' );
-
-function the_attachment_links( $id = false ) {
-	$id = (int) $id;
-	$post = & get_post( $id );
-
-	if ( $post->post_type != 'attachment' )
-		return false;
-
-	$icon = get_attachment_icon( $post->ID );
-	$attachment_data = wp_get_attachment_metadata( $id );
-	$thumb = isset( $attachment_data['thumb'] );
-?>
-<form id="the-attachment-links">
-<table>
-	<col />
-	<col class="widefat" />
-	<tr>
-		<th scope="row"><?php _e( 'URL' ) ?></th>
-		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><?php echo wp_get_attachment_url(); ?></textarea></td>
-	</tr>
-<?php if ( $icon ) : ?>
-	<tr>
-		<th scope="row"><?php $thumb ? _e( 'Thumbnail linked to file' ) : _e( 'Image linked to file' ); ?></th>
-		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo wp_get_attachment_url(); ?>"><?php echo $icon ?></a></textarea></td>
-	</tr>
-	<tr>
-		<th scope="row"><?php $thumb ? _e( 'Thumbnail linked to page' ) : _e( 'Image linked to page' ); ?></th>
-		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link( $post->ID ) ?>" rel="attachment wp-att-<?php echo $post->ID; ?>"><?php echo $icon ?></a></textarea></td>
-	</tr>
-<?php else : ?>
-	<tr>
-		<th scope="row"><?php _e( 'Link to file' ) ?></th>
-		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo wp_get_attachment_url(); ?>" class="attachmentlink"><?php echo basename( wp_get_attachment_url() );  ?></a></textarea></td>
-	</tr>
-	<tr>
-		<th scope="row"><?php _e( 'Link to page' ) ?></th>
-		<td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link( $post->ID ) ?>" rel="attachment wp-att-<?php echo $post->ID ?>"><?php the_title(); ?></a></textarea></td>
-	</tr>
-<?php endif; ?>
-</table>
-</form>
-<?php
-}
-
-function wp_dropdown_roles( $default = false ) {
-	global $wp_roles;
-	$r = '';
-	foreach( $wp_roles->role_names as $role => $name )
-		if ( $default == $role ) // Make default first in list
-			$p = "\n\t<option selected='selected' value='$role'>$name</option>";
-		else
-			$r .= "\n\t<option value='$role'>$name</option>";
-	echo $p . $r;
-}
-
-function wp_convert_hr_to_bytes( $size ) {
-	$size = strtolower($size);
-	$bytes = (int) $size;
-	if ( strpos($size, 'k') !== false )
-		$bytes = intval($size) * 1024;
-	elseif ( strpos($size, 'm') !== false )
-		$bytes = intval($size) * 1024 * 1024;
-	elseif ( strpos($size, 'g') !== false )
-		$bytes = intval($size) * 1024 * 1024 * 1024;
-	return $bytes;
-}
-
-function wp_convert_bytes_to_hr( $bytes ) {
-	$units = array( 0 => 'B', 1 => 'kB', 2 => 'MB', 3 => 'GB' );
-	$log = log( $bytes, 1024 );
-	$power = (int) $log;
-	$size = pow(1024, $log - $power);
-	return $size . $units[$power];
-}
-
-function wp_import_upload_form( $action ) {
-	$u_bytes = wp_convert_hr_to_bytes( ini_get( 'upload_max_filesize' ) );
-	$p_bytes = wp_convert_hr_to_bytes( ini_get( 'post_max_size' ) );
-	$bytes = apply_filters( 'import_upload_size_limit', min($u_bytes, $p_bytes), $u_bytes, $p_bytes );
-	$size = wp_convert_bytes_to_hr( $bytes );
-?>
-<form enctype="multipart/form-data" id="import-upload-form" method="post" action="<?php echo attribute_escape($action) ?>">
-<p>
-<?php wp_nonce_field('import-upload'); ?>
-<label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __('Maximum size: %s' ), $size ); ?>)
-<input type="file" id="upload" name="import" size="25" />
-<input type="hidden" name="action" value="save" />
-<input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
-</p>
-<p class="submit">
-<input type="submit" value="<?php _e( 'Upload file and import &raquo;' ); ?>" />
-</p>
-</form>
-<?php
-}
-
-function wp_remember_old_slug() {
-	global $post;
-	$name = attribute_escape($post->post_name); // just in case
-	if ( strlen($name) )
-		echo '<input type="hidden" id="wp-old-slug" name="wp-old-slug" value="' . $name . '" />';
-}
-
-?>
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -1,52 +0,0 @@
-<?php
-
-function current_theme_info() {
-	$themes = get_themes();
-	$current_theme = get_current_theme();
-	$ct->name = $current_theme;
-	$ct->title = $themes[$current_theme]['Title'];
-	$ct->version = $themes[$current_theme]['Version'];
-	$ct->parent_theme = $themes[$current_theme]['Parent Theme'];
-	$ct->template_dir = $themes[$current_theme]['Template Dir'];
-	$ct->stylesheet_dir = $themes[$current_theme]['Stylesheet Dir'];
-	$ct->template = $themes[$current_theme]['Template'];
-	$ct->stylesheet = $themes[$current_theme]['Stylesheet'];
-	$ct->screenshot = $themes[$current_theme]['Screenshot'];
-	$ct->description = $themes[$current_theme]['Description'];
-	$ct->author = $themes[$current_theme]['Author'];
-	return $ct;
-}
-
-function get_broken_themes() {
-	global $wp_broken_themes;
-
-	get_themes();
-	return $wp_broken_themes;
-}
-
-function get_page_templates() {
-	$themes = get_themes();
-	$theme = get_current_theme();
-	$templates = $themes[$theme]['Template Files'];
-	$page_templates = array ();
-
-	if ( is_array( $templates ) ) {
-		foreach ( $templates as $template ) {
-			$template_data = implode( '', file( ABSPATH.$template ));
-
-			preg_match( '|Template Name:(.*)$|mi', $template_data, $name );
-			preg_match( '|Description:(.*)$|mi', $template_data, $description );
-
-			$name = $name[1];
-			$description = $description[1];
-
-			if ( !empty( $name ) ) {
-				$page_templates[trim( $name )] = basename( $template );
-			}
-		}
-	}
-
-	return $page_templates;
-}
-
-?>
--- a/wp-admin/includes/update.php
+++ b/wp-admin/includes/update.php
@@ -1,122 +0,0 @@
-<?php
-
-// The admin side of our 1.0 update system
-
-function core_update_footer( $msg ) {
-	if ( !current_user_can('manage_options') )
-		return sprintf( '| '.__( 'Version %s' ), $GLOBALS['wp_version'] );
-
-	$cur = get_option( 'update_core' );
-
-	switch ( $cur->response ) {
-	case 'development' :
-		return sprintf( '| '.__( 'You are using a development version (%s). Cool! Please <a href="%s">stay updated</a>.' ), $GLOBALS['wp_version'], 'http://wordpress.org/download/svn/' );
-	break;
-
-	case 'upgrade' :
-		return sprintf( '| <strong>'.__( 'Your WordPress %s is out of date. <a href="%s">Please update</a>.' ).'</strong>', $GLOBALS['wp_version'], $cur->url );
-	break;
-
-	case 'latest' :
-	default :
-		return sprintf( '| '.__( 'Version %s' ), $GLOBALS['wp_version'] );
-	break;
-	}
-}
-add_filter( 'update_footer', 'core_update_footer' );
-
-function update_nag() {
-	$cur = get_option( 'update_core' );
-
-	if ( ! isset( $cur->response ) || $cur->response != 'upgrade' )
-		return false;
-
-	if ( current_user_can('manage_options') )
-		$msg = sprintf( __('A new version of WordPress is available! <a href="%s">Please update now</a>.'), $cur->url );
-	else
-		$msg = __('A new version of WordPress is available! Please notify the site administrator.');
-
-	echo "<div id='update-nag'>$msg</div>";
-}
-add_action( 'admin_notices', 'update_nag', 3 );
-
-function wp_update_plugins() {
-	global $wp_version;
-
-	if ( !function_exists('fsockopen') )
-		return false;
-
-	$plugins = get_plugins();
-	$active  = get_option( 'active_plugins' );
-	$current = get_option( 'update_plugins' );
-
-	$new_option = '';
-	$new_option->last_checked = time();
-
-	$plugin_changed = false;
-	foreach ( $plugins as $file => $p ) {
-		$new_option->checked[ $file ] = $p['Version'];
-
-		if ( !isset( $current->checked[ $file ] ) ) {
-			$plugin_changed = true;
-			continue;
-		}
-
-		if ( $current->checked[ $file ] != $p['Version'] )
-			$plugin_changed = true;
-	}
-
-	if (
-		isset( $current->last_checked ) &&
-		43200 > ( time() - $current->last_checked ) &&
-		!$plugin_changed
-	)
-		return false;
-
-	$to_send->plugins = $plugins;
-	$to_send->active = $active;
-	$send = serialize( $to_send );
-
-	$request = 'plugins=' . urlencode( $send );
-	$http_request  = "POST /plugins/update-check/1.0/ HTTP/1.0\r\n";
-	$http_request .= "Host: api.wordpress.org\r\n";
-	$http_request .= "Content-Type: application/x-www-form-urlencoded; charset=" . get_option('blog_charset') . "\r\n";
-	$http_request .= "Content-Length: " . strlen($request) . "\r\n";
-	$http_request .= 'User-Agent: WordPress/' . $wp_version . '; ' . get_bloginfo('url') . "\r\n";
-	$http_request .= "\r\n";
-	$http_request .= $request;
-
-	$response = '';
-	if( false != ( $fs = @fsockopen( 'api.wordpress.org', 80, $errno, $errstr, 3) ) && is_resource($fs) ) {
-		fwrite($fs, $http_request);
-
-		while ( !feof($fs) )
-			$response .= fgets($fs, 1160); // One TCP-IP packet
-		fclose($fs);
-		$response = explode("\r\n\r\n", $response, 2);
-	}
-
-	$response = unserialize( $response[1] );
-
-	if ( $response )
-		$new_option->response = $response;
-
-	update_option( 'update_plugins', $new_option );
-}
-add_action( 'load-plugins.php', 'wp_update_plugins' );
-
-function wp_plugin_update_row( $file ) {
-	global $plugin_data;
-	$current = get_option( 'update_plugins' );
-	if ( !isset( $current->response[ $file ] ) )
-		return false;
-
-	$r = $current->response[ $file ];
-
-	echo "<tr><td colspan='5' class='plugin-update'>";
-	printf( __('There is a new version of %s available. <a href="%s">Download version %s here</a>.'), $plugin_data['Name'], $r->url, $r->new_version );
-	echo "</td></tr>";
-}
-add_action( 'after_plugin_row', 'wp_plugin_update_row' );
-
-?>
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
--- a/wp-admin/includes/upload.php
+++ b/wp-admin/includes/upload.php
@@ -1,353 +0,0 @@
-<?php
-
-function wp_upload_display( $dims = false, $href = '' ) {
-	global $post;
-	$id = get_the_ID();
-	$attachment_data = wp_get_attachment_metadata( $id );
-	$is_image = (int) wp_attachment_is_image();
-	$filesystem_path = get_attached_file( $id );
-	if ( !isset($attachment_data['width']) && $is_image ) {
-		if ( $image_data = getimagesize( $filesystem_path ) ) {
-			$attachment_data['width'] = $image_data[0];
-			$attachment_data['height'] = $image_data[1];
-			wp_update_attachment_metadata( $id, $attachment_data );
-		}
-	}
-	if ( isset($attachment_data['width']) )
-		list($width,$height) = wp_shrink_dimensions($attachment_data['width'], $attachment_data['height'], 171, 128);
-
-	$post_title = attribute_escape( the_title( '', '', false ) );
-	$post_content = attribute_escape(apply_filters( 'content_edit_pre', $post->post_content ));
-
-	$class = 'text';
-	$innerHTML = get_attachment_innerHTML( $id, false, $dims );
-	if ( $image_src = get_attachment_icon_src() ) {
-		$image_rel = wp_make_link_relative($image_src);
-		$innerHTML = '&nbsp;' . str_replace($image_src, $image_rel, $innerHTML);
-		$class = 'image';
-	}
-
-	$src_base = wp_get_attachment_url();
-	$src = wp_make_link_relative( $src_base );
-	$src_base = str_replace($src, '', $src_base);
-
-	$r = '';
-
-	if ( $href )
-		$r .= "<a id='file-link-$id' href='$href' title='$post_title' class='file-link $class'>\n";
-	if ( $href || $image_src )
-		$r .= "\t\t\t$innerHTML";
-	if ( $href )
-		$r .= "</a>\n";
-	$r .= "\t\t\t\t<span class='upload-file-size'>".size_format(filesize($filesystem_path))."</span>\n";
-	$r .= "\n\t\t<div class='upload-file-data'>\n\t\t\t<p>\n";
-	$r .= "\t\t\t\t<input type='hidden' name='attachment-url-$id' id='attachment-url-$id' value='$src' />\n";
-	$r .= "\t\t\t\t<input type='hidden' name='attachment-url-base-$id' id='attachment-url-base-$id' value='$src_base' />\n";
-
-	if ( !$thumb_base = wp_get_attachment_thumb_url() )
-		$thumb_base = wp_mime_type_icon();
-	if ( $thumb_base ) {
-		$thumb_rel = wp_make_link_relative( $thumb_base );
-		$thumb_base = str_replace( $thumb_rel, '', $thumb_base );
-		$r .= "\t\t\t\t<input type='hidden' name='attachment-thumb-url-$id' id='attachment-thumb-url-$id' value='$thumb_rel' />\n";
-		$r .= "\t\t\t\t<input type='hidden' name='attachment-thumb-url-base-$id' id='attachment-thumb-url-base-$id' value='$thumb_base' />\n";
-	}
-
-	$r .= "\t\t\t\t<input type='hidden' name='attachment-is-image-$id' id='attachment-is-image-$id' value='$is_image' />\n";
-
-	if ( isset($width) ) {
-		$r .= "\t\t\t\t<input type='hidden' name='attachment-width-$id' id='attachment-width-$id' value='$width' />\n";
-		$r .= "\t\t\t\t<input type='hidden' name='attachment-height-$id' id='attachment-height-$id' value='$height' />\n";
-	}
-	$r .= "\t\t\t\t<input type='hidden' name='attachment-page-url-$id' id='attachment-page-url-$id' value='" . get_attachment_link( $id ) . "' />\n";
-	$r .= "\t\t\t\t<input type='hidden' name='attachment-title-$id' id='attachment-title-$id' value='$post_title' />\n";
-	$r .= "\t\t\t\t<input type='hidden' name='attachment-description-$id' id='attachment-description-$id' value='$post_content' />\n";
-	$r .= "\t\t\t</p>\n\t\t</div>\n";
-	return $r;
-}
-
-function wp_upload_view() {
-	global $style, $post_id, $style;
-	$id = get_the_ID();
-	$attachment_data = wp_get_attachment_metadata( $id );
-?>
-	<div id="upload-file">
-		<div id="file-title">
-			<h2><?php if ( !isset($attachment_data['width']) && 'inline' != $style )
-					echo "<a href='" . wp_get_attachment_url() . "' title='" . __('Direct link to file') . "'>";
-				the_title();
-				if ( !isset($attachment_data['width']) && 'inline' != $style )
-					echo '</a>';
-			?></h2>
-			<span><?php
-				echo '[&nbsp;';
-				echo '<a href="' . get_permalink() . '">' . __('view') . '</a>';
-				echo '&nbsp;|&nbsp;';
-					echo '<a href="' . clean_url(add_query_arg('action', 'edit')) . '" title="' . __('Edit this file') . '">' . __('edit') . '</a>';
-				echo '&nbsp;|&nbsp;';
-				echo '<a href="' . clean_url(remove_query_arg(array('action', 'ID'))) . '" title="' . __('Browse your files') . '">' . __('cancel') . '</a>';
-				echo '&nbsp;]'; ?></span>
-		</div>
-
-		<div id="upload-file-view" class="alignleft">
-<?php		if ( isset($attachment_data['width']) && 'inline' != $style )
-			echo "<a href='" . wp_get_attachment_url() . "' title='" . __('Direct link to file') . "'>";
-		echo wp_upload_display( array(171, 128) );
-		if ( isset($attachment_data['width']) && 'inline' != $style )
-			echo '</a>'; ?>
-		</div>
-		<?php the_attachment_links( $id ); ?>
-	</div>
-<?php	echo "<form action='' id='browse-form'><input type='hidden' id='nonce-value' value='" . wp_create_nonce( 'inlineuploading' )  . "' /></form>\n";
-}
-
-function wp_upload_form() {
-	$id = get_the_ID();
-	global $post_id, $tab, $style;
-	$enctype = $id ? '' : ' enctype="multipart/form-data"';
-	$post_id = (int) $post_id;
-?>
-	<form<?php echo $enctype; ?> id="upload-file" method="post" action="<?php echo get_option('siteurl') . '/wp-admin/upload.php?style=' . attribute_escape($style . '&amp;tab=upload&amp;post_id=' . $post_id); ?>">
-<?php
-	if ( $id ) :
-		$attachment = get_post_to_edit( $id );
-		$attachment_data = wp_get_attachment_metadata( $id );
-?>
-		<div id="file-title">
-			<h2><?php if ( !isset($attachment_data['width']) && 'inline' != $style )
-					echo "<a href='" . wp_get_attachment_url() . "' title='" . __('Direct link to file') . "'>";
-				the_title();
-				if ( !isset($attachment_data['width']) && 'inline' != $style )
-					echo '</a>';
-			?></h2>
-			<span><?php
-				echo '[&nbsp;';
-				echo '<a href="' . get_permalink() . '">' . __('view') . '</a>';
-				echo '&nbsp;|&nbsp;';
-					echo '<a href="' . clean_url(add_query_arg('action', 'view')) . '">' . __('links') . '</a>';
-				echo '&nbsp;|&nbsp;';
-				echo '<a href="' . clean_url(remove_query_arg(array('action','ID'))) . '" title="' . __('Browse your files') . '">' . __('cancel') . '</a>';
-				echo '&nbsp;]'; ?></span>
-		</div>
-
-	<div id="upload-file-view" class="alignleft">
-<?php		if ( isset($attachment_data['width']) && 'inline' != $style )
-			echo "<a href='" . wp_get_attachment_url() . "' title='" . __('Direct link to file') . "'>";
-		echo wp_upload_display( array(171, 128) );
-		if ( isset($attachment_data['width']) && 'inline' != $style )
-			echo '</a>'; ?>
-	</div>
-<?php	endif; ?>
-		<table><col /><col class="widefat" />
-<?php	if ( $id ): ?>
-			<tr>
-				<th scope="row"><label for="url"><?php _e('URL'); ?></label></th>
-				<td><input type="text" id="url" class="readonly" value="<?php echo wp_get_attachment_url(); ?>" readonly="readonly" /></td>
-			</tr>
-<?php	else : ?>
-			<tr>
-				<th scope="row"><label for="upload"><?php _e('File'); ?></label></th>
-				<td><input type="file" id="upload" name="image" /></td>
-			</tr>
-<?php	endif; ?>
-			<tr>
-				<th scope="row"><label for="post_title"><?php _e('Title'); ?></label></th>
-				<td><input type="text" id="post_title" name="post_title" value="<?php echo $attachment->post_title; ?>" /></td>
-			</tr>
-			<tr>
-				<th scope="row"><label for="post_content"><?php _e('Description'); ?></label></th>
-				<td><textarea name="post_content" id="post_content"><?php echo $attachment->post_content; ?></textarea></td>
-			</tr>
-			<tr id="buttons" class="submit">
-				<td colspan='2'>
-<?php	if ( $id ) : ?>
-					<input type="submit" name="delete" id="delete" class="delete alignleft" value="<?php _e('Delete File'); ?>" />
-<?php	endif; ?>
-					<input type="hidden" name="from_tab" value="<?php echo $tab; ?>" />
-					<input type="hidden" name="action" value="<?php echo $id ? 'save' : 'upload'; ?>" />
-<?php	if ( $post_id ) : ?>
-					<input type="hidden" name="post_id" value="<?php echo $post_id; ?>" />
-<?php	endif; if ( $id ) : ?>
-					<input type="hidden" name="ID" value="<?php echo $id; ?>" />
-<?php	endif; ?>
-					<?php wp_nonce_field( 'inlineuploading' ); ?>
-					<div class="submit">
-						<input type="submit" value="<?php $id ? _e('Save &raquo;') : _e('Upload &raquo;'); ?>" />
-					</div>
-				</td>
-			</tr>
-		</table>
-	</form>
-<?php
-}
-
-function wp_upload_tab_upload() {
-	wp_upload_form();
-}
-
-function wp_upload_tab_upload_action() {
-	global $action;
-	if ( isset($_POST['delete']) )
-		$action = 'delete';
-
-	switch ( $action ) :
-	case 'upload' :
-		global $from_tab, $post_id, $style;
-		if ( !$from_tab )
-			$from_tab = 'upload';
-
-		check_admin_referer( 'inlineuploading' );
-
-		global $post_id, $post_title, $post_content;
-
-		if ( !current_user_can( 'upload_files' ) )
-			wp_die( __('You are not allowed to upload files.')
-				. " <a href='" . get_option('siteurl') . "/wp-admin/upload.php?style=" . attribute_escape($style . "&amp;tab=browse-all&amp;post_id=$post_id") . "'>"
-				. __('Browse Files') . '</a>'
-			);
-
-		$overrides = array('action'=>'upload');
-
-		$file = wp_handle_upload($_FILES['image'], $overrides);
-
-		if ( isset($file['error']) )
-			wp_die($file['error'] . "<br /><a href='" . get_option('siteurl')
-			. "/wp-admin/upload.php?style=" . attribute_escape($style . "&amp;tab=$from_tab&amp;post_id=$post_id") . "'>" . __('Back to Image Uploading') . '</a>'
-		);
-
-		$url = $file['url'];
-		$type = $file['type'];
-		$file = $file['file'];
-		$filename = basename($file);
-
-		// Construct the attachment array
-		$attachment = array(
-			'post_title' => $post_title,
-			'post_content' => $post_content,
-			'post_type' => 'attachment',
-			'post_parent' => $post_id,
-			'post_mime_type' => $type,
-			'guid' => $url
-		);
-
-		// Save the data
-		$id = wp_insert_attachment($attachment, $file, $post_id);
-
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-
-		wp_redirect( get_option('siteurl') . "/wp-admin/upload.php?style=$style&tab=browse&action=view&ID=$id&post_id=$post_id");
-		die;
-		break;
-
-	case 'save' :
-		global $from_tab, $post_id, $style;
-		if ( !$from_tab )
-			$from_tab = 'upload';
-		check_admin_referer( 'inlineuploading' );
-
-		wp_update_post($_POST);
-		wp_redirect( get_option('siteurl') . "/wp-admin/upload.php?style=$style&tab=$from_tab&post_id=$post_id");
-		die;
-		break;
-
-	case 'delete' :
-		global $ID, $post_id, $from_tab, $style;
-		if ( !$from_tab )
-			$from_tab = 'upload';
-
-		check_admin_referer( 'inlineuploading' );
-
-		if ( !current_user_can('edit_post', (int) $ID) )
-			wp_die( __('You are not allowed to delete this attachment.')
-				. " <a href='" . get_option('siteurl') . "/wp-admin/upload.php?style=" . attribute_escape($style . "&amp;tab=$from_tab&amp;post_id=$post_id") . "'>"
-				. __('Go back') . '</a>'
-			);
-
-		wp_delete_attachment($ID);
-
-		wp_redirect( get_option('siteurl') . "/wp-admin/upload.php?style=$style&tab=$from_tab&post_id=$post_id" );
-		die;
-		break;
-
-	endswitch;
-}
-
-add_action( 'upload_files_upload', 'wp_upload_tab_upload_action' );
-
-function wp_upload_grab_attachments( $obj ) {
-	$obj->is_attachment = true;
-}
-
-function wp_upload_posts_where( $where ) {
-	global $post_id;
-	return $where . " AND post_parent = '" . (int) $post_id . "'";
-}
-
-function wp_upload_tab_browse() {
-	global $action, $paged;
-	$old_vars = compact( 'paged' );
-
-	switch ( $action ) :
-	case 'edit' :
-	case 'view' :
-		global $ID;
-		$attachments = query_posts("attachment_id=$ID");
-		if ( have_posts() ) : while ( have_posts() ) : the_post();
-			'edit' == $action ? wp_upload_form() : wp_upload_view();
-		endwhile; endif;
-		break;
-	default :
-		global $tab, $post_id, $style;
-		add_action( 'pre_get_posts', 'wp_upload_grab_attachments' );
-		if ( 'browse' == $tab && $post_id )
-			add_filter( 'posts_where', 'wp_upload_posts_where' );
-		$attachments = query_posts("what_to_show=posts&post_status=any&posts_per_page=10&paged=$paged");
-
-		echo "<ul id='upload-files'>\n";
-		if ( have_posts() ) : while ( have_posts() ) : the_post();
-			$href = wp_specialchars( add_query_arg( array(
-				'action' => 'inline' == $style ? 'view' : 'edit',
-				'ID' => get_the_ID())
-			 ), 1 );
-
-			echo "\t<li id='file-";
-			the_ID();
-			echo "' class='alignleft'>\n";
-			echo wp_upload_display( array(128,128), $href );
-			echo "\t</li>\n";
-		endwhile;
-		else :
-			echo "\t<li>" . __('There are no attachments to show.') . "</li>\n";
-		endif;
-		echo "</ul>\n\n";
-
-		echo "<form action='' id='browse-form'><input type='hidden' id='nonce-value' value='" . wp_create_nonce( 'inlineuploading' )  . "' /></form>\n";
-		break;
-	endswitch;
-
-	extract($old_vars);
-}
-
-
-function wp_upload_tab_browse_action() {
-	global $style;
-	if ( 'inline' == $style )
-		wp_enqueue_script('upload');
-}
-
-add_action( 'upload_files_browse', 'wp_upload_tab_browse_action' );
-add_action( 'upload_files_browse-all', 'wp_upload_tab_browse_action' );
-
-function wp_upload_admin_head() {
-	wp_admin_css( 'css/upload' );
-	if ( 'inline' == @$_GET['style'] ) {
-		echo "<style type='text/css' media='screen'>\n";
-		echo "\t#upload-menu { position: absolute; z-index: 2; }\n";
-		echo "\tbody > #upload-menu { position: fixed; }\n";
-		echo "\t#upload-content { top: 2em; }\n";
-		echo "\t#upload-file { position: absolute; top: 15px; }\n";
-		echo "</style>";
-	}
-}
-
-?>
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -1,282 +0,0 @@
-<?php
-
-// Creates a new user from the "Users" form using $_POST information.
-function add_user() {
-	if ( func_num_args() ) { // The hackiest hack that ever did hack
-		global $current_user, $wp_roles;
-		$user_id = (int) func_get_arg( 0 );
-
-		if ( isset( $_POST['role'] ) ) {
-			if( $user_id != $current_user->id || $wp_roles->role_objects[$_POST['role']]->has_cap( 'edit_users' ) ) {
-				$user = new WP_User( $user_id );
-				$user->set_role( $_POST['role'] );
-			}
-		}
-	} else {
-		add_action( 'user_register', 'add_user' ); // See above
-		return edit_user();
-	}
-}
-
-function edit_user( $user_id = 0 ) {
-	global $current_user, $wp_roles, $wpdb;
-	if ( $user_id != 0 ) {
-		$update = true;
-		$user->ID = (int) $user_id;
-		$userdata = get_userdata( $user_id );
-		$user->user_login = $wpdb->escape( $userdata->user_login );
-	} else {
-		$update = false;
-		$user = '';
-	}
-
-	if ( isset( $_POST['user_login'] ))
-		$user->user_login = wp_specialchars( trim( $_POST['user_login'] ));
-
-	$pass1 = $pass2 = '';
-	if ( isset( $_POST['pass1'] ))
-		$pass1 = $_POST['pass1'];
-	if ( isset( $_POST['pass2'] ))
-		$pass2 = $_POST['pass2'];
-
-	if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) {
-		if( $user_id != $current_user->id || $wp_roles->role_objects[$_POST['role']]->has_cap( 'edit_users' ))
-			$user->role = $_POST['role'];
-	}
-
-	if ( isset( $_POST['email'] ))
-		$user->user_email = wp_specialchars( trim( $_POST['email'] ));
-	if ( isset( $_POST['url'] ) ) {
-		$user->user_url = clean_url( trim( $_POST['url'] ));
-		$user->user_url = preg_match('/^(https?|ftps?|mailto|news|irc|gopher|nntp|feed|telnet):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
-	}
-	if ( isset( $_POST['first_name'] ))
-		$user->first_name = wp_specialchars( trim( $_POST['first_name'] ));
-	if ( isset( $_POST['last_name'] ))
-		$user->last_name = wp_specialchars( trim( $_POST['last_name'] ));
-	if ( isset( $_POST['nickname'] ))
-		$user->nickname = wp_specialchars( trim( $_POST['nickname'] ));
-	if ( isset( $_POST['display_name'] ))
-		$user->display_name = wp_specialchars( trim( $_POST['display_name'] ));
-	if ( isset( $_POST['description'] ))
-		$user->description = trim( $_POST['description'] );
-	if ( isset( $_POST['jabber'] ))
-		$user->jabber = wp_specialchars( trim( $_POST['jabber'] ));
-	if ( isset( $_POST['aim'] ))
-		$user->aim = wp_specialchars( trim( $_POST['aim'] ));
-	if ( isset( $_POST['yim'] ))
-		$user->yim = wp_specialchars( trim( $_POST['yim'] ));
-	if ( !$update )
-		$user->rich_editing = 'true';  // Default to true for new users.
-	else if ( isset( $_POST['rich_editing'] ) )
-		$user->rich_editing = $_POST['rich_editing'];
-	else
-		$user->rich_editing = 'false';
-
-	$errors = new WP_Error();
-
-	/* checking that username has been typed */
-	if ( $user->user_login == '' )
-		$errors->add( 'user_login', __( '<strong>ERROR</strong>: Please enter a username.' ));
-
-	/* checking the password has been typed twice */
-	do_action_ref_array( 'check_passwords', array ( $user->user_login, & $pass1, & $pass2 ));
-
-	if (!$update ) {
-		if ( $pass1 == '' || $pass2 == '' )
-			$errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter your password twice.' ));
-	} else {
-		if ((empty ( $pass1 ) && !empty ( $pass2 ) ) || (empty ( $pass2 ) && !empty ( $pass1 ) ) )
-			$errors->add( 'pass', __( "<strong>ERROR</strong>: you typed your new password only once." ));
-	}
-
-	/* Check for "\" in password */
-	if( strpos( " ".$pass1, "\\" ) )
-		$errors->add( 'pass', __( '<strong>ERROR</strong>: Passwords may not contain the character "\\".' ));
-
-	/* checking the password has been typed twice the same */
-	if ( $pass1 != $pass2 )
-		$errors->add( 'pass', __( '<strong>ERROR</strong>: Please type the same password in the two password fields.' ));
-
-	if (!empty ( $pass1 ))
-		$user->user_pass = $pass1;
-
-	if ( !$update && !validate_username( $user->user_login ) )
-		$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.' ));
-
-	if (!$update && username_exists( $user->user_login ))
-		$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered, please choose another one.' ));
-
-	/* checking e-mail address */
-	if ( empty ( $user->user_email ) ) {
-		$errors->add( 'user_email', __( "<strong>ERROR</strong>: please type an e-mail address" ));
-	} else
-		if (!is_email( $user->user_email ) ) {
-			$errors->add( 'user_email', __( "<strong>ERROR</strong>: the email address isn't correct" ));
-		}
-
-	if ( $errors->get_error_codes() )
-		return $errors;
-
-	if ( $update ) {
-		$user_id = wp_update_user( get_object_vars( $user ));
-	} else {
-		$user_id = wp_insert_user( get_object_vars( $user ));
-		wp_new_user_notification( $user_id );
-	}
-	return $user_id;
-}
-
-function get_author_user_ids() {
-	global $wpdb;
-	$level_key = $wpdb->prefix . 'user_level';
-
-	$query = "SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$level_key' AND meta_value != '0'";
-
-	return $wpdb->get_col( $query );
-}
-
-function get_editable_authors( $user_id ) {
-	global $wpdb;
-
-	$editable = get_editable_user_ids( $user_id );
-
-	if( !$editable ) {
-		return false;
-	} else {
-		$editable = join(',', $editable);
-		$authors = $wpdb->get_results( "SELECT * FROM $wpdb->users WHERE ID IN ($editable) ORDER BY display_name" );
-	}
-
-	return apply_filters('get_editable_authors', $authors);
-}
-
-function get_editable_user_ids( $user_id, $exclude_zeros = true ) {
-	global $wpdb;
-
-	$user = new WP_User( $user_id );
-
-	if ( ! $user->has_cap('edit_others_posts') ) {
-		if ( $user->has_cap('edit_posts') || $exclude_zeros == false )
-			return array($user->id);
-		else
-			return false;
-	}
-
-	$level_key = $wpdb->prefix . 'user_level';
-
-	$query = "SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$level_key'";
-	if ( $exclude_zeros )
-		$query .= " AND meta_value != '0'";
-
-	return $wpdb->get_col( $query );
-}
-
-function get_nonauthor_user_ids() {
-	global $wpdb;
-	$level_key = $wpdb->prefix . 'user_level';
-
-	$query = "SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$level_key' AND meta_value = '0'";
-
-	return $wpdb->get_col( $query );
-}
-
-function get_others_unpublished_posts($user_id, $type='any') {
-	global $wpdb;
-	$user = get_userdata( $user_id );
-	$level_key = $wpdb->prefix . 'user_level';
-
-	$editable = get_editable_user_ids( $user_id );
-
-	if ( in_array($type, array('draft', 'pending')) )
-		$type_sql = " post_status = '$type' ";
-	else
-		$type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
-
-	$dir = ( 'pending' == $type ) ? 'ASC' : 'DESC';
-
-	if( !$editable ) {
-		$other_unpubs = '';
-	} else {
-		$editable = join(',', $editable);
-		$other_unpubs = $wpdb->get_results("SELECT ID, post_title, post_author FROM $wpdb->posts WHERE post_type = 'post' AND $type_sql AND post_author IN ($editable) AND post_author != '$user_id' ORDER BY post_modified $dir");
-	}
-
-	return apply_filters('get_others_drafts', $other_unpubs);
-}
-
-function get_others_drafts($user_id) {
-	return get_others_unpublished_posts($user_id, 'draft');
-}
-
-function get_others_pending($user_id) {
-	return get_others_unpublished_posts($user_id, 'pending');
-}
-
-function get_user_to_edit( $user_id ) {
-	$user = new WP_User( $user_id );
-	$user->user_login   = attribute_escape($user->user_login);
-	$user->user_email   = attribute_escape($user->user_email);
-	$user->user_url     = clean_url($user->user_url);
-	$user->first_name   = attribute_escape($user->first_name);
-	$user->last_name    = attribute_escape($user->last_name);
-	$user->display_name = attribute_escape($user->display_name);
-	$user->nickname     = attribute_escape($user->nickname);
-	$user->aim          = attribute_escape($user->aim);
-	$user->yim          = attribute_escape($user->yim);
-	$user->jabber       = attribute_escape($user->jabber);
-	$user->description  =  wp_specialchars($user->description);
-
-	return $user;
-}
-
-function get_users_drafts( $user_id ) {
-	global $wpdb;
-	$user_id = (int) $user_id;
-	$query = "SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'draft' AND post_author = $user_id ORDER BY post_modified DESC";
-	$query = apply_filters('get_users_drafts', $query);
-	return $wpdb->get_results( $query );
-}
-
-function wp_delete_user($id, $reassign = 'novalue') {
-	global $wpdb;
-
-	$id = (int) $id;
-	$user = get_userdata($id);
-
-	if ($reassign == 'novalue') {
-		$post_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_author = $id");
-
-		if ($post_ids) {
-			foreach ($post_ids as $post_id)
-				wp_delete_post($post_id);
-		}
-
-		// Clean links
-		$wpdb->query("DELETE FROM $wpdb->links WHERE link_owner = $id");
-	} else {
-		$reassign = (int) $reassign;
-		$wpdb->query("UPDATE $wpdb->posts SET post_author = {$reassign} WHERE post_author = {$id}");
-		$wpdb->query("UPDATE $wpdb->links SET link_owner = {$reassign} WHERE link_owner = {$id}");
-	}
-
-	// FINALLY, delete user
-	do_action('delete_user', $id);
-
-	$wpdb->query("DELETE FROM $wpdb->users WHERE ID = $id");
-	$wpdb->query("DELETE FROM $wpdb->usermeta WHERE user_id = '$id'");
-
-	wp_cache_delete($id, 'users');
-	wp_cache_delete($user->user_login, 'userlogins');
-
-	return true;
-}
-
-function wp_revoke_user($id) {
-	$id = (int) $id;
-
-	$user = new WP_User($id);
-	$user->remove_all_caps();
-}
-
-?>
--- a/wp-admin/index-extra.php
+++ b/wp-admin/index-extra.php
@@ -1,73 +0,0 @@
-<?php
-require_once('admin.php');
-require_once (ABSPATH . WPINC . '/rss.php');
-
-@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
-
-switch ( $_GET['jax'] ) {
-
-case 'incominglinks' :
-
-$rss_feed = apply_filters( 'dashboard_incoming_links_feed', 'http://blogsearch.google.com/blogsearch_feeds?hl=en&scoring=d&ie=utf-8&num=10&output=rss&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) );
-$more_link = apply_filters( 'dashboard_incoming_links_link', 'http://blogsearch.google.com/blogsearch?hl=en&scoring=d&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) );
-
-$rss = @fetch_rss( $rss_feed );
-if ( isset($rss->items) && 1 < count($rss->items) ) { // Technorati returns a 1-item feed when it has no results
-?>
-<h3><?php _e('Incoming Links'); ?> <cite><a href="<?php echo htmlspecialchars( $more_link ); ?>"><?php _e('More &raquo;'); ?></a></cite></h3>
-<ul>
-<?php
-$rss->items = array_slice($rss->items, 0, 10);
-foreach ($rss->items as $item ) {
-?>
-	<li><a href="<?php echo wp_filter_kses($item['link']); ?>"><?php echo wptexturize(wp_specialchars($item['title'])); ?></a></li>
-<?php } ?>
-</ul>
-<?php
-}
-break;
-
-case 'devnews' :
-$rss = @fetch_rss(apply_filters( 'dashboard_primary_feed', 'http://wordpress.org/development/feed/' ));
-if ( isset($rss->items) && 0 != count($rss->items) ) {
-?>
-<h3><?php echo apply_filters( 'dashboard_primary_title', __('WordPress Development Blog') ); ?></h3>
-<?php
-$rss->items = array_slice($rss->items, 0, 3);
-foreach ($rss->items as $item ) {
-?>
-<h4><a href='<?php echo wp_filter_kses($item['link']); ?>'><?php echo wp_specialchars($item['title']); ?></a> &#8212; <?php printf(__('%s ago'), human_time_diff(strtotime($item['pubdate'], time() ) ) ); ?></h4>
-<p><?php echo $item['description']; ?></p>
-<?php
-	}
-}
-?>
-
-<?php
-break;
-
-case 'planetnews' :
-$rss = @fetch_rss(apply_filters( 'dashboard_secondary_feed', 'http://planet.wordpress.org/feed/' ));
-if ( isset($rss->items) && 0 != count($rss->items) ) {
-?>
-<h3><?php echo apply_filters( 'dashboard_secondary_title', __('Other WordPress News') ); ?></h3>
-<ul>
-<?php
-$rss->items = array_slice($rss->items, 0, 20);
-foreach ($rss->items as $item ) {
-$title = wp_specialchars($item['title']);
-$author = preg_replace( '|(.+?):.+|s', '$1', $item['title'] );
-$post = preg_replace( '|.+?:(.+)|s', '$1', $item['title'] );
-?>
-<li><a href='<?php echo wp_filter_kses($item['link']); ?>'><span class="post"><?php echo $post; ?></span><span class="hidden"> - </span><cite><?php echo $author; ?></cite></a></li>
-<?php
-	}
-?>
-</ul>
-<p class="readmore"><a href="<?php echo apply_filters( 'dashboard_secondary_link', 'http://planet.wordpress.org/' ); ?>"><?php _e('Read more &raquo;'); ?></a></p>
-<?php
-}
-break;
-}
-
-?>
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -1,69 +1,20 @@
 <?php
-require_once('admin.php');
-
-function index_js() {
-?>
-<script type="text/javascript">
-	jQuery(function() {
-		jQuery('#incominglinks').load('index-extra.php?jax=incominglinks');
-		jQuery('#devnews').load('index-extra.php?jax=devnews');
-		jQuery('#planetnews').load('index-extra.php?jax=planetnews');
-	});
-</script>
-<?php
-}
-add_action( 'admin_head', 'index_js' );
-
-wp_enqueue_script( 'jquery' );
-
-$title = __('Dashboard');
-$parent_file = 'index.php';
+require_once('admin.php'); 
+$title = __('Dashboard'); 
 require_once('admin-header.php');
+require_once (ABSPATH . WPINC . '/rss-functions.php');

 $today = current_time('mysql', 1);
 ?>

 <div class="wrap">
-
-<h2><?php _e('Welcome to WordPress'); ?></h2>
-
 <div id="zeitgeist">
 <h2><?php _e('Latest Activity'); ?></h2>
-
-<div id="incominglinks"></div>
-
 <?php
-$comments = $wpdb->get_results("SELECT comment_author, comment_author_url, comment_ID, comment_post_ID FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 5");
-$numcomments = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'");
-
-if ( $comments || $numcomments ) :
+if ( $recentposts = $wpdb->get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_status = 'publish' AND post_date_gmt < '$today' ORDER BY post_date DESC LIMIT 5") ) :
 ?>
 <div>
-<h3><?php printf( __( 'Comments <a href="%s" title="More comments&#8230;">&raquo;</a>' ), 'edit-comments.php' ); ?></h3>
-
-<?php if ( $numcomments ) : ?>
-<p><strong><a href="moderation.php"><?php echo sprintf(__('Comments in moderation (%s) &raquo;'), number_format_i18n($numcomments) ); ?></a></strong></p>
-<?php endif; ?>
-
-<ul>
-<?php
-if ( $comments ) {
-foreach ($comments as $comment) {
-	echo '<li>' . sprintf(__('%1$s on %2$s'), get_comment_author_link(), '<a href="'. get_permalink($comment->comment_post_ID) . '#comment-' . $comment->comment_ID . '">' . get_the_title($comment->comment_post_ID) . '</a>');
-	edit_comment_link(__("Edit"), ' <small>(', ')</small>');
-	echo '</li>';
-}
-}
-?>
-</ul>
-</div>
-<?php endif; ?>
-
-<?php
-if ( $recentposts = $wpdb->get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND " . get_private_posts_cap_sql('post') . " AND post_date_gmt < '$today' ORDER BY post_date DESC LIMIT 5") ) :
-?>
-<div>
-<h3><?php printf( __( 'Posts <a href="%s" title="More posts&#8230;">&raquo;</a>' ), 'edit.php' ); ?></h3>
+<h3><?php _e('Posts'); ?> <a href="edit.php" title="<?php _e('More posts...'); ?>">&raquo;</a></h3>
 <ul>
 <?php
 foreach ($recentposts as $post) {
@@ -79,8 +30,8 @@ foreach ($recentposts as $post) {
 <?php endif; ?>

 <?php
-if ( $scheduled = $wpdb->get_results("SELECT ID, post_title, post_date_gmt FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'future' ORDER BY post_date ASC") ) :
-?>
+if ( $scheduled = $wpdb->get_results("SELECT ID, post_title, post_date_gmt FROM $wpdb->posts WHERE post_status = 'publish' AND post_date_gmt > '$today'") ) :
+?> 
 <div>
 <h3><?php _e('Scheduled Entries:') ?></h3>
 <ul>
@@ -90,56 +41,133 @@ foreach ($scheduled as $post) {
 		$post->post_title = sprintf(__('Post #%s'), $post->ID);
 	echo "<li>" . sprintf(__('%1$s in %2$s'), "<a href='post.php?action=edit&amp;post=$post->ID' title='" . __('Edit this post') . "'>$post->post_title</a>", human_time_diff( current_time('timestamp', 1), strtotime($post->post_date_gmt. ' GMT') ))  . "</li>";
 }
-?>
+?> 
 </ul>
 </div>
 <?php endif; ?>

+<?php
+if ( $comments = $wpdb->get_results("SELECT comment_author, comment_author_url, comment_ID, comment_post_ID FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 5") ) :
+?>
+<div>
+<h3><?php _e('Comments'); ?> <a href="edit-comments.php" title="<?php _e('More comments...'); ?>">&raquo;</a></h3>
+<ul>
+<?php 
+foreach ($comments as $comment) {
+	echo '<li>' . sprintf(__('%1$s on %2$s'), get_comment_author_link(), '<a href="'. get_permalink($comment->comment_post_ID) . '#comment-' . $comment->comment_ID . '">' . get_the_title($comment->comment_post_ID) . '</a>');
+	edit_comment_link(__("Edit"), ' <small>(', ')</small>'); 
+	echo '</li>';
+}
+?>
+</ul>
+<?php 
+if ( $numcomments = $wpdb->get_var("SELECT COUNT(*) FROM $tablecomments WHERE comment_approved = '0'") ) :
+?>
+<p><strong><a href="moderation.php"><?php echo sprintf(__('There are comments in moderation (%s)'), number_format($numcomments) ); ?> &raquo;</a></strong></p>
+<?php endif; ?>
+</div>
+
+<?php endif; ?>
+
 <div>
 <h3><?php _e('Blog Stats'); ?></h3>
 <?php
-$numposts = (int) $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish'");
-$numcomms = (int) $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '1'");
-$numcats  = wp_count_terms('category');
-$numtags = wp_count_terms('post_tag');
+$numposts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_status = 'publish'");
+if (0 < $numposts) $numposts = number_format($numposts); 

-$post_str = sprintf(__ngettext('%1$s <a href="%2$s" title="Posts">post</a>', '%1$s <a href="%2$s" title="Posts">posts</a>', $numposts), number_format_i18n($numposts), 'edit.php');
-$comm_str = sprintf(__ngettext('%1$s <a href="%2$s" title="Comments">comment</a>', '%1$s <a href="%2$s" title="Comments">comments</a>', $numcomms), number_format_i18n($numcomms), 'edit-comments.php');
-$cat_str  = sprintf(__ngettext('%1$s <a href="%2$s" title="Categories">category</a>', '%1$s <a href="%2$s" title="Categories">categories</a>', $numcats), number_format_i18n($numcats), 'categories.php');
-$tag_str  = sprintf(__ngettext('%1$s tag', '%1$s tags', $numtags), number_format_i18n($numtags));
+$numcomms = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '1'");
+if (0 < $numcomms) $numcomms = number_format($numcomms);
+
+$numcats = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->categories");
+if (0 < $numcats) $numcats = number_format($numcats);
+?>
+<p><?php printf(__('There are currently %1$s <a href="%2$s" title="Posts">posts</a> and %3$s <a href="%4$s" title="Comments">comments</a>, contained within %5$s <a href="%6$s" title="categories">categories</a>.'), $numposts, 'edit.php',  $numcomms, 'edit-comments.php', $numcats, 'categories.php'); ?></p>
+</div>
+
+<?php
+$rss = @fetch_rss('http://feeds.technorati.com/cosmos/rss/?url='. trailingslashit(get_option('home')) .'&partner=wordpress');
+if ( isset($rss->items) && 0 != count($rss->items) ) {
+?>
+<div id="incominglinks">
+<h3><?php _e('Incoming Links'); ?> <cite><a href="http://www.technorati.com/cosmos/search.html?url=<?php echo trailingslashit(get_option('home')); ?>&amp;partner=wordpress"><?php _e('More'); ?> &raquo;</a></cite></h3>
+<ul>
+<?php
+$rss->items = array_slice($rss->items, 0, 10);
+foreach ($rss->items as $item ) {
+?>
+	<li><a href="<?php echo wp_filter_kses($item['link']); ?>"><?php echo wp_specialchars($item['title']); ?></a></li>
+<?php } ?>
+</ul>
+</div>
+<?php } ?>
+
+</div>
+
+<h2><?php _e('Dashboard'); ?></h2>
+<p><?php _e('Below is the latest news from the official WordPress development blog, click on a title to read the full entry.'); ?></p>
+<?php
+$rss = @fetch_rss('http://wordpress.org/development/feed/');
+if ( isset($rss->items) && 0 != count($rss->items) ) {
+?>
+<h3>WordPress Development Blog</h3>
+<?php
+$rss->items = array_slice($rss->items, 0, 3);
+foreach ($rss->items as $item ) {
+?>
+<h4><a href='<?php echo wp_filter_kses($item['link']); ?>'><?php echo wp_specialchars($item['title']); ?></a> &#8212; <?php echo human_time_diff( strtotime($item['pubdate'], time() ) ); ?> <?php _e('ago'); ?></h4>
+<p><?php echo $item['description']; ?></p>
+<?php
+	}
+}
 ?>

-<p><?php printf(__('There are currently %1$s and %2$s, contained within %3$s and %4$s.'), $post_str, $comm_str, $cat_str, $tag_str); ?></p>
-</div>
-
-<?php do_action('activity_box_end'); ?>
-</div>
-
-<p><?php _e('Use these links to get started:'); ?></p>

+<?php
+$rss = @fetch_rss('http://planet.wordpress.org/feed/');
+if ( isset($rss->items) && 0 != count($rss->items) ) {
+?>
+<div id="planetnews">
+<h3><?php _e('Other WordPress News'); ?> <a href="http://planet.wordpress.org/"><?php _e('more'); ?> &raquo;</a></h3>
 <ul>
-<?php if ( current_user_can('edit_posts') ) : ?>
-	<li><a href="post-new.php"><?php _e('Write a post'); ?></a></li>
-<?php endif; ?>
-	<li><a href="profile.php"><?php _e('Update your profile or change your password'); ?></a></li>
-<?php if ( current_user_can('manage_links') ) : ?>
-	<li><a href="link-add.php"><?php _e('Add a link to your blogroll'); ?></a></li>
-<?php endif; ?>
-<?php if ( current_user_can('switch_themes') ) : ?>
-	<li><a href="themes.php"><?php _e('Change your site&#8217;s look or theme'); ?></a></li>
-<?php endif; ?>
+<?php
+$rss->items = array_slice($rss->items, 0, 20);
+foreach ($rss->items as $item ) {
+?>
+<li><a href='<?php echo wp_filter_kses($item['link']); ?>'><?php echo wp_specialchars($item['title']); ?></a></li>
+<?php
+	}
+?>
 </ul>
-<p><?php _e("Need help with WordPress? Please see our <a href='http://codex.wordpress.org/'>documentation</a> or visit the <a href='http://wordpress.org/support/'>support forums</a>."); ?></p>
-
-<div id="devnews"></div>
-
-<div id="planetnews"></div>
-
+</div>
+<?php
+}
+?>
 <div style="clear: both">&nbsp;
 <br clear="all" />
 </div>
 </div>
+<?php
+$drafts = $wpdb->get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_status = 'draft' AND post_author = $user_ID");
+if ($drafts) {
+?>
+<div class="wrap">

+    <p><strong><?php _e('Your Drafts:') ?></strong> 
+    <?php
+	$i = 0;
+	foreach ($drafts as $draft) {
+		if (0 != $i)
+			echo ', ';
+		$draft->post_title = stripslashes($draft->post_title);
+		if ($draft->post_title == '')
+			$draft->post_title = sprintf(__('Post #%s'), $draft->ID);
+		echo "<a href='post.php?action=edit&amp;post=$draft->ID' title='" . __('Edit this draft') . "'>$draft->post_title</a>";
+		++$i;
+		}
+	?> 
+    .</p> 
+</div>
+<?php } ?>
 <?php
 require('./admin-footer.php');
-?>
+?>
--- a/wp-admin/install-helper.php
+++ b/wp-admin/install-helper.php
@@ -9,21 +9,21 @@ $debug = 0;
 **           false on error
 */
 function maybe_create_table($table_name, $create_ddl) {
-	global $wpdb;
-	foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
-		if ($table == $table_name) {
-			return true;
-		}
-	}
-	//didn't find it try to create it.
-	$q = $wpdb->query($create_ddl);
-	// we cannot directly tell that whether this succeeded!
-	foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
-		if ($table == $table_name) {
-			return true;
-		}
-	}
-	return false;
+    global $wpdb;
+    foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
+        if ($table == $table_name) {
+            return true;
+        }
+    }
+    //didn't find it try to create it.
+    $q = $wpdb->query($create_ddl);
+    // we cannot directly tell that whether this succeeded!
+    foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
+        if ($table == $table_name) {
+            return true;
+        }
+    }
+    return false;
 }

 /**
@@ -33,22 +33,22 @@ function maybe_create_table($table_name, $create_ddl) {
 **           false on error
 */
 function maybe_add_column($table_name, $column_name, $create_ddl) {
-	global $wpdb, $debug;
-	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
-		if ($debug) echo("checking $column == $column_name<br />");
-			if ($column == $column_name) {
-				return true;
-			}
-	}
-	//didn't find it try to create it.
-	$q = $wpdb->query($create_ddl);
-	// we cannot directly tell that whether this succeeded!
-	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
-		if ($column == $column_name) {
-			return true;
-		}
-	}
-	return false;
+    global $wpdb, $debug;
+    foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+        if ($debug) echo("checking $column == $column_name<br />");
+        if ($column == $column_name) {
+            return true;
+        }
+    }
+    //didn't find it try to create it.
+    $q = $wpdb->query($create_ddl);
+    // we cannot directly tell that whether this succeeded!
+    foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+        if ($column == $column_name) {
+            return true;
+        }
+    }
+    return false;
 }


@@ -59,21 +59,21 @@ function maybe_add_column($table_name, $column_name, $create_ddl) {
 **           false on error
 */
 function maybe_drop_column($table_name, $column_name, $drop_ddl) {
-	global $wpdb;
-	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
-		if ($column == $column_name) {
-			//found it try to drop it.
-			$q = $wpdb->query($drop_ddl);
-			// we cannot directly tell that whether this succeeded!
-			foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
-				if ($column == $column_name) {
-					return false;
-				}
-			}
-		}
-	}
-	// else didn't find it
-	return true;
+    global $wpdb;
+    foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+        if ($column == $column_name) {
+            //found it try to drop it.
+            $q = $wpdb->query($drop_ddl);
+            // we cannot directly tell that whether this succeeded!
+            foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+                if ($column == $column_name) {
+                    return false;
+                }
+            }
+        }
+    }
+    // else didn't find it
+    return true;
 }


@@ -92,45 +92,45 @@ function maybe_drop_column($table_name, $column_name, $drop_ddl) {
 **      Extra
 */
 function check_column($table_name, $col_name, $col_type, $is_null = null, $key = null, $default = null, $extra = null) {
-	global $wpdb, $debug;
-	$diffs = 0;
-	$results = $wpdb->get_results("DESC $table_name");
-
-	foreach ($results as $row ) {
-		if ($debug > 1) print_r($row);
-			if ($row->Field == $col_name) {
-				// got our column, check the params
-				if ($debug) echo ("checking $row->Type against $col_type\n");
-				if (($col_type != null) && ($row->Type != $col_type)) {
-					++$diffs;
-				}
-				if (($is_null != null) && ($row->Null != $is_null)) {
-					++$diffs;
-				}
-				if (($key != null) && ($row->Key  != $key)) {
-					++$diffs;
-				}
-				if (($default != null) && ($row->Default != $default)) {
-					++$diffs;
-				}
-				if (($extra != null) && ($row->Extra != $extra)) {
-					++$diffs;
-				}
-				if ($diffs > 0) {
-					if ($debug) echo ("diffs = $diffs returning false\n");
-					return false;
-				}
-				return true;
-			} // end if found our column
-	}
-	return false;
+    global $wpdb, $debug;
+    $diffs = 0;
+    $results = $wpdb->get_results("DESC $table_name");
+    
+    foreach ($results as $row ) {
+        if ($debug > 1) print_r($row);
+        if ($row->Field == $col_name) {
+            // got our column, check the params
+            if ($debug) echo ("checking $row->Type against $col_type\n");
+            if (($col_type != null) && ($row->Type != $col_type)) {
+                ++$diffs;
+            }
+            if (($is_null != null) && ($row->Null != $is_null)) {
+                ++$diffs;
+            }
+            if (($key != null) && ($row->Key  != $key)) {
+                ++$diffs;
+            }
+            if (($default != null) && ($row->Default != $default)) {
+                ++$diffs;
+            }
+            if (($extra != null) && ($row->Extra != $extra)) {
+                ++$diffs;
+            }
+            if ($diffs > 0) {
+                if ($debug) echo ("diffs = $diffs returning false\n");
+                return false;
+            }
+            return true;
+        } // end if found our column
+    }
+    return false;
 }
-
+    
 /*
 echo "<p>testing</p>";
 echo "<pre>";

-//check_column('wp_links', 'link_description', 'mediumtext');
+//check_column('wp_links', 'link_description', 'mediumtext'); 
 //if (check_column($wpdb->comments, 'comment_author', 'tinytext'))
 //    echo "ok\n";
 $error_count = 0;
@@ -138,14 +138,14 @@ $tablename = $wpdb->links;
 // check the column
 if (!check_column($wpdb->links, 'link_description', 'varchar(255)'))
 {
-	$ddl = "ALTER TABLE $wpdb->links MODIFY COLUMN link_description varchar(255) NOT NULL DEFAULT '' ";
-	$q = $wpdb->query($ddl);
+    $ddl = "ALTER TABLE $wpdb->links MODIFY COLUMN link_description varchar(255) NOT NULL DEFAULT '' ";
+    $q = $wpdb->query($ddl);
 }
 if (check_column($wpdb->links, 'link_description', 'varchar(255)')) {
-	$res .= $tablename . ' - ok <br />';
+    $res .= $tablename . ' - ok <br />';
 } else {
-	$res .= 'There was a problem with ' . $tablename . '<br />';
-	++$error_count;
+    $res .= 'There was a problem with ' . $tablename . '<br />';
+    ++$error_count;
 }
 echo "</pre>";
 */
--- a/wp-admin/install.php
+++ b/wp-admin/install.php
@@ -1,13 +1,12 @@
 <?php
 define('WP_INSTALLING', true);
-if (!file_exists('../wp-config.php')) {
-  require_once('../wp-includes/compat.php');
-  require_once('../wp-includes/functions.php');
-  wp_die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can <a href='setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.", "WordPress &rsaquo; Error");
-}
+if (!file_exists('../wp-config.php')) 
+    die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://wordpress.org/docs/faq/#wp-config'>We got it</a>. You can <a href='setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");

 require_once('../wp-config.php');
-require_once('./includes/upgrade.php');
+require_once('./upgrade-functions.php');
+
+$guessurl = str_replace('/wp-admin/install.php?step=2', '', 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) );

 if (isset($_GET['step']))
 	$step = $_GET['step'];
@@ -16,88 +15,200 @@ else
 header( 'Content-Type: text/html; charset=utf-8' );
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title><?php _e('WordPress &rsaquo; Installation'); ?></title>
-	<?php wp_admin_css( 'css/install' ); ?>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<style media="screen" type="text/css">
+	<!--
+	html {
+		background: #eee;
+	}
+	body {
+		background: #fff;
+		color: #000;
+		font-family: Georgia, "Times New Roman", Times, serif;
+		margin-left: 20%;
+		margin-right: 20%;
+		padding: .2em 2em;
+	}
+	
+	h1 {
+		color: #006;
+		font-size: 18px;
+		font-weight: lighter;
+	}
+	
+	h2 {
+		font-size: 16px;
+	}
+	
+	p, li, dt {
+		line-height: 140%;
+		padding-bottom: 2px;
+	}
+
+	ul, ol {
+		padding: 5px 5px 5px 20px;
+	}
+	#logo {
+		margin-bottom: 2em;
+	}
+	.step a, .step input {
+		font-size: 2em;
+	}
+	td input {
+		font-size: 1.5em;
+	}
+	.step, th {
+		text-align: right;
+	}
+	#footer {
+		text-align: center; 
+		border-top: 1px solid #ccc; 
+		padding-top: 1em; 
+		font-style: italic;
+	}
+	-->
+	</style>
 </head>
 <body>
-<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
+<h1 id="logo"><img alt="WordPress" src="http://static.wordpress.org/logo.png" /></h1>
 <?php
 // Let's check to make sure WP isn't already installed.
-if ( is_blog_installed() ) die('<h1>'.__('Already Installed').'</h1><p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p></body></html>');
+$wpdb->hide_errors();
+$installed = $wpdb->get_results("SELECT * FROM $wpdb->users");
+if ($installed) die(__('<h1>Already Installed</h1><p>You appear to have already installed WordPress. To reinstall please clear your old database tables first.</p>') . '</body></html>');
+$wpdb->show_errors();

 switch($step) {
-	case 0:
-	case 1: // in case people are directly linking to this
-?>
-<h1><?php _e('Welcome'); ?></h1>
-<p><?php printf(__('Welcome to the famous five minute WordPress installation process! You may want to browse the <a href="%s">ReadMe documentation</a> at your leisure.  Otherwise, just fill in the information below and you\'ll be on your way to using the most extendable and powerful personal publishing platform in the world.'), '../readme.html'); ?></p>
-<!--<h2 class="step"><a href="install.php?step=1"><?php _e('First Step &raquo;'); ?></a></h2>-->

-<h1><?php _e('Information needed'); ?></h1>
-<p><?php _e("Please provide the following information.  Don't worry, you can always change these settings later."); ?></p>
+	case 0:
+?>
+<p><?php printf(__('Welcome to WordPress installation. We&#8217;re now going to go through a few steps to get you up and running with the latest in personal publishing platforms. You may want to peruse the <a href="%s">ReadMe documentation</a> at your leisure.'), '../readme.html'); ?></p>
+	<h2 class="step"><a href="install.php?step=1"><?php _e('First Step &raquo;'); ?></a></h2>
+<?php
+	break;
+
+	case 1:
+
+?>
+<h1><?php _e('First Step'); ?></h1>
+<p><?php _e("Before we begin we need a little bit of information. Don't worry, you can always change these later."); ?></p>

 <form id="setup" method="post" action="install.php?step=2">
-	<table width="100%">
-		<tr>
-			<th width="33%"><?php _e('Blog title:'); ?></th>
-			<td><input name="weblog_title" type="text" id="weblog_title" size="25" /></td>
-		</tr>
-		<tr>
-			<th><?php _e('Your e-mail:'); ?></th>
-			<td><input name="admin_email" type="text" id="admin_email" size="25" /></td>
-		</tr>
-		<tr>
-			<td>&nbsp;</td>
-			<td><label><input type="checkbox" name="blog_public" value="1" checked="checked" /> <?php _e('Allow my blog to appear in search engines like Google and Technorati.'); ?></label></td>
-		</tr>
-	</table>
-	<p><em><?php _e('Double-check your email address before continuing.'); ?></em></p>
-	<h2 class="step"><input type="submit" name="Submit" value="<?php _e('Install WordPress &raquo;'); ?>" /></h2>
+<table width="100%">
+<tr>
+<th width="33%"><?php _e('Weblog title:'); ?></th>
+<td><input name="weblog_title" type="text" id="weblog_title" size="25" /></td>
+</tr>
+<tr>
+<th><?php _e('Your e-mail:'); ?></th>
+	<td><input name="admin_email" type="text" id="admin_email" size="25" /></td>
+</tr>
+</table>
+<p><em><?php _e('Double-check that email address before continuing.'); ?></em></p>
+<h2 class="step">
+<input type="submit" name="Submit" value="<?php _e('Continue to Second Step &raquo;'); ?>" />
+</h2>
 </form>

 <?php
-		break;
+	break;
 	case 2:
-		// Fill in the data we gathered
-		$weblog_title = stripslashes($_POST['weblog_title']);
-		$admin_email = stripslashes($_POST['admin_email']);
-		$public = (int) $_POST['blog_public'];
-		// check e-mail address
-		if (empty($admin_email)) {
-			// TODO: poka-yoke
-			die(__("<strong>ERROR</strong>: you must provide an e-mail address"));
-		} else if (!is_email($admin_email)) {
-			// TODO: poka-yoke
-			die(__('<strong>ERROR</strong>: that isn\'t a valid e-mail address.  E-mail addresses look like: <code>username@example.com</code>'));
-		}

-	$result = wp_install($weblog_title, 'admin', $admin_email, $public);
-	extract($result, EXTR_SKIP);
+// Fill in the data we gathered
+$weblog_title = $_POST['weblog_title'];
+$admin_email = $_POST['admin_email'];
+// check e-mail address
+if (empty($admin_email)) {
+	die (__("<strong>ERROR</strong>: please type your e-mail address"));
+} else if (!is_email($admin_email)) {
+	die (__("<strong>ERROR</strong>: the e-mail address isn't correct"));
+}
+	
 ?>
+<h1><?php _e('Second Step'); ?></h1>
+<p><?php _e('Now we&#8217;re going to create the database tables and fill them with some default data.'); ?></p>

-<h1><?php _e('Success!'); ?></h1>
-
-<p><?php printf(__('WordPress has been installed.  Now you can <a href="%1$s">log in</a> with the <strong>username</strong> "<code>admin</code>" and <strong>password</strong> "<code>%2$s</code>".'), '../wp-login.php', $password); ?></p>
-<p><?php _e('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.'); ?></p>
-
-<dl>
-	<dt><?php _e('Username'); ?></dt>
-		<dd><code>admin</code></dd>
-	<dt><?php _e('Password'); ?></dt>
-		<dd><code><?php echo $password; ?></code></dd>
-	<dt><?php _e('Login address'); ?></dt>
-		<dd><a href="../wp-login.php">wp-login.php</a></dd>
-</dl>
-<p><?php _e('Were you expecting more steps? Sorry to disappoint. :)'); ?></p>

 <?php
-		break;
-}
+flush();
+
+// Set everything up
+make_db_current_silent();
+populate_options();
+
+$wpdb->query("UPDATE $wpdb->options SET option_value = '$weblog_title' WHERE option_name = 'blogname'");
+$wpdb->query("UPDATE $wpdb->options SET option_value = '$admin_email' WHERE option_name = 'admin_email'");
+
+// Now drop in some default links
+$wpdb->query("INSERT INTO $wpdb->linkcategories (cat_id, cat_name) VALUES (1, '".addslashes(__('Blogroll'))."')");
+$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://blog.carthik.net/index.php', 'Carthik', 1, 'http://blog.carthik.net/feed/');");
+$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://blogs.linux.ie/xeer/', 'Donncha', 1, 'http://blogs.linux.ie/xeer/feed/');");
+$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://zengun.org/weblog/', 'Michel', 1, 'http://zengun.org/weblog/feed/');");
+$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://boren.nu/', 'Ryan', 1, 'http://boren.nu/feed/');");
+$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://photomatt.net/', 'Matt', 1, 'http://xml.photomatt.net/feed/');");
+$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://zed1.com/journalized/', 'Mike', 1, 'http://zed1.com/journalized/feed/');");
+$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://www.alexking.org/', 'Alex', 1, 'http://www.alexking.org/blog/wp-rss2.php');");
+$wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss) VALUES ('http://dougal.gunters.org/', 'Dougal', 1, 'http://dougal.gunters.org/feed/');");
+
+// Default category
+$wpdb->query("INSERT INTO $wpdb->categories (cat_ID, cat_name, category_nicename) VALUES ('0', '".addslashes(__('Uncategorized'))."', '".sanitize_title(__('Uncategorized'))."')");
+
+// First post
+$now = date('Y-m-d H:i:s');
+$now_gmt = gmdate('Y-m-d H:i:s');
+$wpdb->query("INSERT INTO $wpdb->posts (post_author, post_date, post_date_gmt, post_content, post_title, post_category, post_name, post_modified, post_modified_gmt) VALUES ('1', '$now', '$now_gmt', '".addslashes(__('Welcome to WordPress. This is your first post. Edit or delete it, then start blogging!'))."', '".addslashes(__('Hello world!'))."', '0', '".addslashes(__('hello-world'))."', '$now', '$now_gmt')");
+
+$wpdb->query( "INSERT INTO $wpdb->post2cat (`rel_id`, `post_id`, `category_id`) VALUES (1, 1, 1)" );
+
+// Default comment
+$wpdb->query("INSERT INTO $wpdb->comments (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_author_IP, comment_date, comment_date_gmt, comment_content) VALUES ('1', '".addslashes(__('Mr WordPress'))."', '', 'http://wordpress.org', '127.0.0.1', '$now', '$now_gmt', '".addslashes(__('Hi, this is a comment.<br />To delete a comment, just log in, and view the posts\' comments, there you will have the option to edit or delete them.'))."')");
+
+// Set up admin user
+$random_password = substr(md5(uniqid(microtime())), 0, 6);
+$wpdb->query("INSERT INTO $wpdb->users (ID, user_login, user_pass, user_nickname, user_email, user_level, user_idmode, user_registered) VALUES ( '1', 'admin', MD5('$random_password'), '".addslashes(__('Administrator'))."', '$admin_email', '10', 'nickname', NOW() )");
+
+$message_headers = 'From: ' . stripslashes($_POST['weblog_title']) . ' <wordpress@' . $_SERVER['SERVER_NAME'] . '>';
+$message = sprintf(__("Your new WordPress blog has been successfully set up at:
+
+%1\$s
+
+You can log in to the administrator account with the following information:
+
+Username: admin
+Password: %2\$s
+
+We hope you enjoy your new weblog. Thanks!
+
+--The WordPress Team
+http://wordpress.org/
+"), $guessurl, $random_password);
+
+@mail($admin_email, __('New WordPress Blog'), $message, $message_headers);
+
+upgrade_all();
 ?>

+<p><em><?php _e('Finished!'); ?></em></p>
+
+<p><?php printf(__('Now you can <a href="%1$s">log in</a> with the <strong>username</strong> "<code>admin</code>" and <strong>password</strong> "<code>%2$s</code>".'), '../wp-login.php', $random_password); ?></p>
+<p><?php _e('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you. If you lose it, you will have to delete the tables from the database yourself, and re-install WordPress. So to review:'); ?>
+</p>
+<dl>
+<dt><?php _e('Username'); ?></dt>
+<dd><code>admin</code></dd>
+<dt><?php _e('Password'); ?></dt>
+<dd><code><?php echo $random_password; ?></code></dd>
+	<dt><?php _e('Login address'); ?></dt>
+<dd><a href="../wp-login.php">wp-login.php</a></dd>
+</dl>
+<p><?php _e('Were you expecting more steps? Sorry to disappoint. All done! :)'); ?></p>
+<?php
+	break;
+}
+?>
 <p id="footer"><?php _e('<a href="http://wordpress.org/">WordPress</a>, personal publishing platform.'); ?></p>
 </body>
-</html>
+</html>
--- a/wp-admin/js/cat.js
+++ b/wp-admin/js/cat.js
@@ -1,11 +0,0 @@
-addLoadEvent(function(){catList=new listMan('categorychecklist');catList.ajaxRespEl='jaxcat';catList.topAdder=1;catList.alt=0;catList.showLink=0;});
-addLoadEvent(newCatAddIn);
-function newCatAddIn() {
-	var jaxcat = $('jaxcat');
-	if ( !jaxcat )
-		return false;
-	// These multiple blank hidden inputs are needed: https://bugzilla.mozilla.org/show_bug.cgi?id=377815 , #3895 , #4664
-	Element.update(jaxcat,'<span id="ajaxcat"><input type="text" name="newcat" id="newcat" size="16" autocomplete="off"/><input type="button" name="Button" id="catadd" value="' + catL10n.add + '"/><input type="hidden"/><input type="hidden"/><span id="howto">' + catL10n.how + '</span></span>');
-	$('newcat').onkeypress = function(e) { return killSubmit("catList.ajaxAdder('category','jaxcat');", e); };
-	$('catadd').onclick = function() { catList.ajaxAdder('category', 'jaxcat'); };
-}
--- a/wp-admin/js/categories.js
+++ b/wp-admin/js/categories.js
@@ -1,16 +0,0 @@
-addLoadEvent(function() {
-	if (!theList.theList) return false;
-	document.forms.addcat.submit.onclick = function(e) {return killSubmit('theList.ajaxAdder("cat", "addcat");', e); };
-	theList.addComplete = function(what, where, update, transport) {
-		var name = getNodeValue(transport.responseXML, 'name').unescapeHTML();
-		var id = transport.responseXML.getElementsByTagName(what)[0].getAttribute('id');
-		var options = document.forms['addcat'].category_parent.options;
-		options[options.length] = new Option(name, id);
-	};
-	theList.delComplete = function(what, id) {
-		var options = document.forms['addcat'].category_parent.options;
-		for ( var o = 0; o < options.length; o++ )
-			if ( id == options[o].value )
-				options[o] = null;
-	};
-});
--- a/wp-admin/js/custom-fields.js
+++ b/wp-admin/js/custom-fields.js
@@ -1,26 +0,0 @@
-function customFieldsOnComplete( what, where, update, transport ) {
-	var pidEl = $('post_ID');
-	pidEl.name = 'post_ID';
-	pidEl.value = getNodeValue(transport.responseXML, 'postid');
-	var aEl = $('hiddenaction')
-	if ( aEl.value == 'post' ) aEl.value = 'postajaxpost';
-}
-addLoadEvent(customFieldsAddIn);
-function customFieldsAddIn() {
-	theList.showLink=0;
-	theList.addComplete = customFieldsOnComplete;
-	if (!theList.theList) return false;
-	inputs = theList.theList.getElementsByTagName('input');
-	for ( var i=0; i < inputs.length; i++ ) {
-		if ('text' == inputs[i].type) {
-			inputs[i].setAttribute('autocomplete', 'off');
-			inputs[i].onkeypress = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.name.slice(5),10) + '");', e); };
-		}
-		if ('updatemeta' == inputs[i].className) {
-			inputs[i].onclick = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.parentNode.parentNode.id.slice(5),10) + '");', e); };
-		}
-	}
-
-	$('metakeyinput').onkeypress = function(e) {return killSubmit('theList.inputData+="&id="+$("post_ID").value;theList.ajaxAdder("meta", "newmeta");', e); };
-	$('updatemetasub').onclick = function(e) {return killSubmit('theList.inputData+="&id="+$("post_ID").value;theList.ajaxAdder("meta", "newmeta");', e); };
-}
--- a/wp-admin/js/dbx-admin-key.js
+++ b/wp-admin/js/dbx-admin-key.js
@@ -1,47 +0,0 @@
-addLoadEvent( function() {var manager = new dbxManager( dbxL10n.manager );} );
-
-addLoadEvent( function()
-{
-	//create new docking boxes group
-	var meta = new dbxGroup(
-		'grabit', 		// container ID [/-_a-zA-Z0-9/]
-		'vertical', 		// orientation ['vertical'|'horizontal']
-		'10', 			// drag threshold ['n' pixels]
-		'no',			// restrict drag movement to container axis ['yes'|'no']
-		'10', 			// animate re-ordering [frames per transition, or '0' for no effect]
-		'yes', 			// include open/close toggle buttons ['yes'|'no']
-		'closed', 		// default state ['open'|'closed']
-		dbxL10n.open, 		// word for "open", as in "open this box"
-		dbxL10n.close, 		// word for "close", as in "close this box"
-		dbxL10n.moveMouse,	// sentence for "move this box" by mouse
-		dbxL10n.toggleMouse,	// pattern-match sentence for "(open|close) this box" by mouse
-		dbxL10n.moveKey,	// sentence for "move this box" by keyboard
-		dbxL10n.toggleKey,	// pattern-match sentence-fragment for "(open|close) this box" by keyboard
-		'%mytitle%  [%dbxtitle%]' // pattern-match syntax for title-attribute conflicts
-		);
-
-	// Boxes are closed by default. Open the Category box if the cookie isn't already set.
-	var catdiv = document.getElementById('categorydiv');
-	if ( catdiv ) {
-		var button = catdiv.getElementsByTagName('A')[0];
-		if ( dbx.cookiestate == null && /dbx\-toggle\-closed/.test(button.className) )
-			meta.toggleBoxState(button, true);
-	}
-
-	var advanced = new dbxGroup(
-		'advancedstuff',
-		'vertical',
-		'10',
-		'yes',			// restrict drag movement to container axis ['yes'|'no']
-		'10',
-		'yes',
-		'closed',
-		dbxL10n.open,
-		dbxL10n.close,
-		dbxL10n.moveMouse,
-		dbxL10n.toggleMouse,
-		dbxL10n.moveKey,
-		dbxL10n.toggleKey,
-		'%mytitle%  [%dbxtitle%]' // pattern-match syntax for title-attribute conflicts
-		);
-});
--- a/wp-admin/js/edit-comments.js
+++ b/wp-admin/js/edit-comments.js
@@ -1,59 +0,0 @@
-addLoadEvent(function() {
-	theCommentList = new listMan('the-comment-list');
-	if ( !theCommentList )
-		return false;
-
-	theExtraCommentList = new listMan('the-extra-comment-list');
-	if ( theExtraCommentList ) {
-		theExtraCommentList.showLink = 0;
-		theExtraCommentList.altOffset = 1;
-		if ( theExtraCommentList.theList && theExtraCommentList.theList.childNodes )
-			var commentNum = $A(theExtraCommentList.theList.childNodes).findAll( function(i) { return Element.visible(i) } ).length;
-		else
-			var commentNum = 0;
-		var urlQ   = document.location.href.split('?');
-		var params = urlQ[1] ? urlQ[1].toQueryParams() : [];
-		var search = params['s'] ? params['s'] : '';
-		var page   = params['apage'] ? params['apage'] : 1;
-	}
-
-	theCommentList.dimComplete = function(what,id,dimClass) {
-		var m = document.getElementById('awaitmod');
-		if ( document.getElementById(what + '-' + id).className.match(dimClass) )
-			m.innerHTML = parseInt(m.innerHTML,10) + 1;
-		else
-			m.innerHTML = parseInt(m.innerHTML,10) - 1;
-	}
-
-	theCommentList.delComplete = function(what,id) {
-		var m = document.getElementById('awaitmod');
-		what = what.split('-')[0];
-		if ( document.getElementById(what + '-' + id).className.match('unapproved') )
-			m.innerHTML = parseInt(m.innerHTML,10) - 1;
-		if ( theExtraCommentList && commentNum ) {
-			var theMover = theExtraCommentList.theList.childNodes[0];
-			Element.removeClassName(theMover,'alternate');
-			theCommentList.theList.appendChild(theMover);
-			theExtraCommentList.inputData += '&page=' + page;
-			if ( search )
-				theExtraCommentList.inputData += '&s=' + search; // trust the URL not the search box
-			theExtraCommentList.addComplete = function() {
-				if ( theExtraCommentList.theList.childNodes )
-					var commentNum = $A(theExtraCommentList.theList.childNodes).findAll( function(i) { return Element.visible(i) } ).length;
-				else
-					var commentNum = 0;
-			}
-			theExtraCommentList.ajaxAdder( 'comment', 'ajax-response' ); // Dummy Request
-		}
-	}
-
-	if ( theList ) // the post list: edit.php
-		theList.delComplete = function() {
-			var comments = document.getElementById('comments');
-			var commdel = encloseFunc(function(a){a.parentNode.removeChild(a);},comments);
-			var listdel = encloseFunc(function(a){a.parentNode.removeChild(a);},theCommentList.theList);
-			setTimeout(commdel,705);
-			setTimeout(listdel,705);
-		}
-});
-
--- a/wp-admin/js/link-cat.js
+++ b/wp-admin/js/link-cat.js
@@ -1,10 +0,0 @@
-addLoadEvent(function(){linkcatList=new listMan('linkcategorychecklist');linkcatList.ajaxRespEl='jaxcat';linkcatList.topAdder=1;linkcatList.alt=0;linkcatList.showLink=0;});
-addLoadEvent(newLinkCatAddIn);
-function newLinkCatAddIn() {
-	var jaxcat = $('jaxcat');
-	if ( !jaxcat )
-		return false;
-	Element.update(jaxcat,'<span id="ajaxcat"><input type="text" name="newcat" id="newcat" size="16" autocomplete="off"/><input type="button" name="Button" id="catadd" value="' + linkcatL10n.add + '"/><input type="hidden"/><span id="howto">' + linkcatL10n.how + '</span></span>');
-	$('newcat').onkeypress = function(e) { return killSubmit("linkcatList.ajaxAdder('link-category','jaxcat');", e); };
-	$('catadd').onclick = function() { linkcatList.ajaxAdder('link-category', 'jaxcat'); };
-}
--- a/wp-admin/js/upload.js
+++ b/wp-admin/js/upload.js
@@ -1,295 +0,0 @@
-addLoadEvent( function() {
-	theFileList = {
-		currentImage: {ID: 0},
-		nonce: '',
-		tab: '',
-		postID: 0,
-
-		toQueryParams: function(qryStrOrig) {
-			var params = new Object();
-			var qryStr = qryStrOrig;
-			var i = 0;
-			do {
-				params[qryStr.split("=")[0].replace(/&/, "")] = ( qryStr.split("=")[1] ) ? qryStr.split("=")[1].split(/&|$/)[0] : '';
-				qryStr = ( qryStr.split("=")[1] ) ? qryStr.split(qryStr.split("=")[1].split(/&|$/)[0])[1] : '';
-				i++;
-			} 
-			while(i < (qryStrOrig.split("=").length - 1));
-			return params;
-		},
-
-		toQueryString: function(params) {
-			var qryStr = '';
-			for ( var key in params )
-				qryStr += key + '=' + params[key] + '&';
-			return qryStr;
-		},
-
-		initializeVars: function() {
-			this.urlData  = document.location.href.split('?');
-			this.params = this.toQueryParams(this.urlData[1]);
-			this.postID = this.params['post_id'];
-			this.tab = this.params['tab'];
-			this.style = this.params['style'];
-			this.ID = this.params['ID'];
-			if ( !this.style )
-				this.style = 'default';
-			var nonceEl = jQuery('#nonce-value');
-			if ( nonceEl )
-				this.nonce = jQuery(nonceEl).val();
-			if ( this.ID ) {
-				this.grabImageData( this.ID );
-				this.imageView( this.ID );
-			}
-		},
-
-		initializeLinks: function() {
-			if ( this.ID )
-				return;
-			jQuery('a.file-link').each(function() {
-				var id = jQuery(this).attr('id').split('-').pop();
-				jQuery(this).attr('href','javascript:void(0)').click(function(e) {
-					theFileList[ 'inline' == theFileList.style ? 'imageView' : 'editView' ](id, e);
-				});
-			});
-		},
-
-		grabImageData: function(id) {
-			if ( id == this.currentImage.ID )
-				return;
-			var thumbEl = jQuery('#attachment-thumb-url-' + id);
-			if ( thumbEl ) {
-				this.currentImage.thumb = ( 0 == id ? '' : jQuery(thumbEl).val() );
-				this.currentImage.thumbBase = ( 0 == id ? '' : jQuery('#attachment-thumb-url-base-' + id).val() );
-			} else {
-				this.currentImage.thumb = false;
-			}
-			this.currentImage.src = ( 0 == id ? '' : jQuery('#attachment-url-' + id).val() );
-			this.currentImage.srcBase = ( 0 == id ? '' : jQuery('#attachment-url-base-' + id).val() );
-			this.currentImage.page = ( 0 == id ? '' : jQuery('#attachment-page-url-' + id).val() );
-			this.currentImage.title = ( 0 == id ? '' : jQuery('#attachment-title-' + id).val() );
-			this.currentImage.description = ( 0 == id ? '' : jQuery('#attachment-description-' + id).val() );
-			var widthEl = jQuery('#attachment-width-' + id);
-			if ( widthEl ) {
-				this.currentImage.width = ( 0 == id ? '' : jQuery(widthEl).val() );
-				this.currentImage.height = ( 0 == id ? '' : jQuery('#attachment-height-' + id).val() );
-			} else {
-				this.currentImage.width = false;
-				this.currentImage.height = false;
-			}
-			this.currentImage.isImage = ( 0 == id ? 0 : jQuery('#attachment-is-image-' + id).val() );
-			this.currentImage.ID = id;
-		},
-
-		imageView: function(id, e) {
-			this.prepView(id);
-			var h = '';
-
-			h += "<div id='upload-file'>"
-			if ( this.ID ) {
-				var params = this.params;
-				params.ID = '';
-				params.action = '';
-				h += "<a href='" + this.urlData[0] + '?' + this.toQueryString(params) + "'";
-			} else {
-				h += "<a href='#' onclick='return theFileList.cancelView();'";
-			}
-			h += " title='" + this.browseTitle + "' class='back'>" + this.back + "</a>";
-			h += "<div id='file-title'>"
-			if ( 0 == this.currentImage.isImage )
-				h += "<h2><a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='" + this.directTitle + "'>" + this.currentImage.title + "</a></h2>";
-			else
-				h += "<h2>" + this.currentImage.title + "</h2>";
-			h += " &#8212; <span>";
-			h += "<a href='#' onclick='return theFileList.editView(" + id + ");'>" + this.edit + "</a>"
-			h += "</span>";
-			h += '</div>'
-			h += "<div id='upload-file-view' class='alignleft'>";
-			if ( 1 == this.currentImage.isImage ) {
-				h += "<a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='" + this.directTitle + "'>";
-				h += "<img src='" + ( this.currentImage.thumb ? this.currentImage.thumb : this.currentImage.src ) + "' alt='" + this.currentImage.title + "' width='" + this.currentImage.width + "' height='" + this.currentImage.height + "' />";
-				h += "</a>";
-			} else
-				h += '&nbsp;';
-			h += "</div>";
-
-			h += "<form name='uploadoptions' id='uploadoptions' class='alignleft'>";
-			h += "<table>";
-			var display = [];
-			var checked = 'display-title';
-			if ( 1 == this.currentImage.isImage ) {
-				checked = 'display-full';
-				if ( this.currentImage.thumb ) {
-					display.push("<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' /> " + this.thumb + "</label><br />");
-					checked = 'display-thumb';
-				}
-				display.push("<label for='display-full'><input type='radio' name='display' id='display-full' value='full' /> " + this.full + "</label>");
-			} else if ( this.currentImage.thumb ) {
-				display.push("<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' /> " + this.icon + "</label>");
-			}
-			if ( display.length ) {
-				display.push("<br /><label for='display-title'><input type='radio' name='display' id='display-title' value='title' /> " + this.title + "</label>");
-				h += "<tr><th style='padding-bottom:.5em'>" + this.show + "</th><td style='padding-bottom:.5em'>";
-				jQuery(display).each( function() { h += this; } );
-				h += "</td></tr>";
-			}
-
-			h += "<tr><th>" + this.link + "</th><td>";
-			h += "<label for='link-file'><input type='radio' name='link' id='link-file' value='file' checked='checked'/> " + this.file + "</label><br />";
-			h += "<label for='link-page'><input type='radio' name='link' id='link-page' value='page' /> " + this.page + "</label><br />";
-			h += "<label for='link-none'><input type='radio' name='link' id='link-none' value='none' /> " + this.none + "</label>";
-			h += "</td></tr>";
-
-			h += "<tr><td colspan='2'><p class='submit'>";
-			h += "<input type='button' class='button' name='send' onclick='theFileList.sendToEditor(" + id + ")' value='" + this.editorText + "' />";
-			h += "</p></td></tr></table>";
-			h += "</form>";
-
-			h += "</div>";
-
-			jQuery(h).prependTo('#upload-content');
-			jQuery('#' + checked).attr('checked','checked');
-			if (e) return e.stopPropagation();
-			return false;
-		},
-
-		editView: function(id, e) {
-			this.prepView(id);
-			var h = '';
-
-			var action = 'upload.php?style=' + this.style + '&amp;tab=upload';
-			if ( this.postID )
-				action += '&amp;post_id=' + this.postID;
-
-			h += "<form id='upload-file' method='post' action='" + action + "'>";
-			if ( this.ID ) {
-				var params = this.params;
-				params.ID = '';
-				params.action = '';
-				h += "<a href='" + this.urlData[0] + '?' + this.toQueryString(params) + "'";
-			} else {
-				h += "<a href='#' onclick='return theFileList.cancelView();'";
-			}
-			h += " title='" + this.browseTitle + "' class='back'>" + this.back + "</a>";
-			h += "<div id='file-title'>"
-			if ( 0 == this.currentImage.isImage )
-				h += "<h2><a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='" + this.directTitle + "'>" + this.currentImage.title + "</a></h2>";
-			else
-				h += "<h2>" + this.currentImage.title + "</h2>";
-			h += " &#8212; <span>";
-			h += "<a href='#' onclick='return theFileList.imageView(" + id + ");'>" + this.insert + "</a>";
-			h += "</span>";
-			h += '</div>'
-			h += "<div id='upload-file-view' class='alignleft'>";
-			if ( 1 == this.currentImage.isImage ) {
-				h += "<a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='" + this.directTitle + "'>";
-				h += "<img src='" + ( this.currentImage.thumb ? this.currentImage.thumb : this.currentImage.src ) + "' alt='" + this.currentImage.title + "' width='" + this.currentImage.width + "' height='" + this.currentImage.height + "' />";
-				h += "</a>";
-			} else
-				h += '&nbsp;';
-			h += "</div>";
-
-
-			h += "<table><col /><col class='widefat' /><tr>";
-			h += "<th scope='row'><label for='url'>" + this.urlText + "</label></th>";
-			h += "<td><input type='text' id='url' class='readonly' value='" + this.currentImage.srcBase + this.currentImage.src + "' readonly='readonly' /></td>";
-			h += "</tr><tr>";
-			h += "<th scope='row'><label for='post_title'>" + this.title + "</label></th>";
-			h += "<td><input type='text' id='post_title' name='post_title' value='" + this.currentImage.title + "' /></td>";
-			h += "</tr><tr>";
-			h += "<th scope='row'><label for='post_content'>" + this.desc + "</label></th>";
-			h += "<td><textarea name='post_content' id='post_content'>" + this.currentImage.description + "</textarea></td>";
-			h += "</tr><tr id='buttons' class='submit'><td colspan='2'><input type='button' id='delete' name='delete' class='delete alignleft' value='" + this.deleteText + "' onclick='theFileList.deleteFile(" + id + ");' />";
-			h += "<input type='hidden' name='from_tab' value='" + this.tab + "' />";
-			h += "<input type='hidden' name='post_parent' value='" + parseInt(this.postID,10) + "' />";
-			h += "<input type='hidden' name='action' id='action-value' value='save' />";
-			h += "<input type='hidden' name='ID' value='" + id + "' />";
-			h += "<input type='hidden' name='_wpnonce' value='" + this.nonce + "' />";
-			h += "<div class='submit'><input type='submit' value='" + this.saveText + "' /></div>";
-			h += "</td></tr></table></form>";
-
-			jQuery(h).prependTo('#upload-content');
-			if (e) e.stopPropagation();
-			return false;
-		},
-
-		prepView: function(id) {
-			this.cancelView( true );
-			var filesEl = jQuery('#upload-files');
-			if ( filesEl )
-				filesEl.hide();
-			var navEl = jQuery('#current-tab-nav');
-			if ( navEl )
-				navEl.hide();
-			this.grabImageData(id);
-		},
-
-		cancelView: function( prep ) {
-			if ( !prep ) {
-				var filesEl = jQuery('#upload-files');
-				if ( filesEl )
-					jQuery(filesEl).show();
-				var navEl = jQuery('#current-tab-nav');
-				if ( navEl )
-					jQuery(navEl).show();
-			}
-			if ( !this.ID )
-				this.grabImageData(0);
-			var div = jQuery('#upload-file');
-			if ( div )
-				jQuery(div).remove();
-			return false;
-		},
-
-		sendToEditor: function(id) {
-			this.grabImageData(id);
-			var link = '';
-			var display = '';
-			var h = '';
-
-			link = jQuery('input[@type=radio][@name="link"][@checked]','#uploadoptions').val();
-			displayEl = jQuery('input[@type=radio][@name="display"][@checked]','#uploadoptions');
-			if ( displayEl )
-				display = jQuery(displayEl).val();
-			else if ( 1 == this.currentImage.isImage )
-				display = 'full';
-
-			if ( 'none' != link )
-				h += "<a href='" + ( 'file' == link ? ( this.currentImage.srcBase + this.currentImage.src ) : ( this.currentImage.page + "' rel='attachment wp-att-" + this.currentImage.ID ) ) + "' title='" + this.currentImage.title + "'>";
-			if ( display && 'title' != display )
-				h += "<img src='" + ( 'thumb' == display ? ( this.currentImage.thumbBase + this.currentImage.thumb ) : ( this.currentImage.srcBase + this.currentImage.src ) ) + "' alt='" + this.currentImage.title + "' />";
-			else
-				h += this.currentImage.title;
-			if ( 'none' != link )
-				h += "</a>";
-
-			var win = window.opener ? window.opener : window.dialogArguments;
-			if ( !win )
-				win = top;
-			tinyMCE = win.tinyMCE;
-			if ( typeof tinyMCE != 'undefined' && tinyMCE.getInstanceById('content') ) {
-				tinyMCE.selectedInstance.getWin().focus();
-				tinyMCE.execCommand('mceInsertContent', false, h);
-			} else
-				win.edInsertContent(win.edCanvas, h);
-			if ( !this.ID )
-				this.cancelView();
-			return false;
-		},
-
-		deleteFile: function(id) {
-			if ( confirm( this.confirmText.replace(/%title%/g, this.currentImage.title) ) ) {
-				jQuery('#action-value').attr('value','delete');
-				jQuery('#upload-file').submit();
-				return true;
-			}
-			return false;
-		}
-
-	};
-
-	for ( var property in uploadL10n ) 
-		theFileList[property] = uploadL10n[property];
-	theFileList.initializeVars();
-	theFileList.initializeLinks();
-} );
--- a/wp-admin/js/users.js
+++ b/wp-admin/js/users.js
@@ -1,21 +0,0 @@
-addLoadEvent(function() {
-	theListEls = document.getElementsByTagName('tbody');
-	theUserLists = new Array();
-	for ( var l = 0; l < theListEls.length; l++ ) {
-		if ( theListEls[l].id )
-			theUserLists[theListEls[l].id] = new listMan(theListEls[l].id);
-	}
-	addUserInputs = document.getElementById('adduser').getElementsByTagName('input');
-	for ( var i = 0; i < addUserInputs.length; i++ ) {
-		addUserInputs[i].onkeypress = function(e) { return killSubmit('addUserSubmit();', e); }
-	}
-	document.getElementById('addusersub').onclick = function(e) { return killSubmit('addUserSubmit();', e); }
-}
-);
-
-function addUserSubmit() {
-	var roleEl = document.getElementById('role');
-	var role = roleEl.options[roleEl.selectedIndex].value;
-	if ( !theUserLists['role-' + role] ) return true;
-	return theUserLists['role-' + role].ajaxAdder('user', 'adduser');
-}
--- a/wp-admin/js/xfn.js
+++ b/wp-admin/js/xfn.js
@@ -1,46 +0,0 @@
-function GetElementsWithClassName(elementName, className) {
-	var allElements = document.getElementsByTagName(elementName);
-	var elemColl = new Array();
-	for (i = 0; i < allElements.length; i++) {
-		if (allElements[i].className == className) {
-			elemColl[elemColl.length] = allElements[i];
-		}
-	}
-	return elemColl;
-}
-
-function meChecked() {
-	var undefined;
-	var eMe = document.getElementById('me');
-	if (eMe == undefined) return false;
-	else return eMe.checked;
-}
-
-function upit() {
-	var isMe = meChecked(); //document.getElementById('me').checked;
-	var inputColl = GetElementsWithClassName('input', 'valinp');
-	var results = document.getElementById('link_rel');
-	var linkText, linkUrl, inputs = '';
-	for (i = 0; i < inputColl.length; i++) {
-		 inputColl[i].disabled = isMe;
-		 inputColl[i].parentNode.className = isMe ? 'disabled' : '';
-		 if (!isMe && inputColl[i].checked && inputColl[i].value != '') {
-			inputs += inputColl[i].value + ' ';
-				}
-		 }
-	inputs = inputs.substr(0,inputs.length - 1);
-	if (isMe) inputs='me';
-	results.value = inputs;
-	}
-
-function blurry() {
-	if (!document.getElementById) return;
-
-	var aInputs = document.getElementsByTagName('input');
-
-	for (var i = 0; i < aInputs.length; i++) {
-		 aInputs[i].onclick = aInputs[i].onkeyup = upit;
-	}
-}
-
-addLoadEvent(blurry);
--- a/wp-admin/link-add.php
+++ b/wp-admin/link-add.php
@@ -5,31 +5,266 @@ $title = __('Add Link');
 $this_file = 'link-manager.php';
 $parent_file = 'link-manager.php';

+function category_dropdown($fieldname, $selected = 0) {
+	global $wpdb;
+	
+	$results = $wpdb->get_results("SELECT cat_id, cat_name, auto_toggle FROM $wpdb->linkcategories ORDER BY cat_id");
+	echo "\n<select name='$fieldname' size='1'>\n";
+	foreach ($results as $row) {
+		echo "\n\t<option value='$row->cat_id'";
+		if ($row->cat_id == $selected)
+			echo " selected='selected'";
+		echo ">$row->cat_id : " . wp_specialchars($row->cat_name);
+		if ($row->auto_toggle == 'Y')
+			echo ' (auto toggle)';
+		echo "</option>";
+	}
+	echo "\n</select>\n";
+}

-wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image',
-	'description', 'visible', 'target', 'category', 'link_id',
-	'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel',
-	'notes', 'linkcheck[]'));
+function xfn_check($class, $value = '', $type = 'check') {
+	global $link_rel;
+	$rels = preg_split('/\s+/', $link_rel);

-wp_enqueue_script( array('xfn', 'dbx-admin-key?pagenow=link.php') );
-if ( current_user_can( 'manage_categories' ) )
-	wp_enqueue_script( 'ajaxlinkcat' );
+	if ('' != $value && in_array($value, $rels) ) {
+		echo ' checked="checked"';
+	}
+
+	if ('' == $value) {
+		if ('family' == $class && !strstr($link_rel, 'child') && !strstr($link_rel, 'parent') && !strstr($link_rel, 'sibling') && !strstr($link_rel, 'spouse') && !strstr($link_rel, 'kin')) echo ' checked="checked"';
+		if ('friendship' == $class && !strstr($link_rel, 'friend') && !strstr($link_rel, 'acquaintance') && !strstr($link_rel, 'contact') ) echo ' checked="checked"';
+		if ('geographical' == $class && !strstr($link_rel, 'co-resident') && !strstr($link_rel, 'neighbor') ) echo ' checked="checked"';
+		if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"';
+	}
+}
+
+$wpvarstoreset = array('action', 'cat_id', 'linkurl', 'name', 'image',
+                       'description', 'visible', 'target', 'category', 'link_id',
+                       'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel',
+                       'notes', 'linkcheck[]');
+for ($i=0; $i<count($wpvarstoreset); $i += 1) {
+    $wpvar = $wpvarstoreset[$i];
+    if (!isset($$wpvar)) {
+        if (empty($_POST["$wpvar"])) {
+            if (empty($_GET["$wpvar"])) {
+                $$wpvar = '';
+            } else {
+                $$wpvar = $_GET["$wpvar"];
+            }
+        } else {
+            $$wpvar = $_POST["$wpvar"];
+        }
+    }
+}
+$link_url = stripslashes($_GET['linkurl']);
+$link_name = htmlentities(stripslashes(urldecode($_GET['name'])));
+
+
+$xfn = true;
 require('admin-header.php');
 ?>

-<?php if ($_GET['added'] && '' != $_POST['link_name']) : ?>
-<div id="message" class="updated fade"><p><?php _e('Link added.'); ?></p></div>
+<?php if ($_GET['added']) : ?>
+<div class="updated"><p><?php _e('Link added.'); ?></p></div>
 <?php endif; ?>
-
-<?php
-	$link = get_default_link_to_edit();
-	include('edit-link-form.php');
+<div class="wrap">
+<h2><?php _e('<strong>Add</strong> a link:') ?></h2>
+     <form name="addlink" method="post" action="link-manager.php">
+<fieldset class="options">
+	<legend><?php _e('Basics') ?></legend>
+        <table class="editform" width="100%" cellspacing="2" cellpadding="5">
+         <tr>
+           <th width="33%" scope="row"><?php _e('URI:') ?></th>
+           <td width="67%"><input type="text" name="linkurl" value="<?php echo wp_specialchars($_GET['linkurl'], 1); ?>" style="width: 95%;" /></td>
+         </tr>
+         <tr>
+           <th scope="row"><?php _e('Link Name:') ?></th>
+           <td><input type="text" name="name" value="<?php echo wp_specialchars( urldecode($_GET['name']), 1 ); ?>" style="width: 95%" /></td>
+         </tr>
+         <tr>
+         	<th scope="row"><?php _e('Short description:') ?></th>
+         	<td><input type="text" name="description" value="" style="width: 95%" /></td>
+         	</tr>
+        <tr>
+           <th scope="row"><?php _e('Category:') ?></th>
+           <td><?php category_dropdown('category'); ?></td>
+         </tr>
+</table>
+</fieldset>
+       <p class="submit">
+         <input type="submit" name="submit" value="<?php _e('Add Link &raquo;') ?>" /> 
+       </p>
+	<fieldset class="options">
+	<legend><?php _e('Link Relationship (XFN)') ?></legend>
+        <table class="editform" width="100%" cellspacing="2" cellpadding="5">
+            <tr>
+                <th width="33%" scope="row"><?php _e('rel:') ?></th>
+            	<td width="67%"><input type="text" name="rel" id="rel" size="50" value="<?php echo $link_rel; ?>" /></td>
+           	</tr>
+            <tr>
+                <th scope="row"><?php _e('<a href="http://gmpg.org/xfn/">XFN</a> Creator:') ?></th>
+            	<td>
+					<table cellpadding="3" cellspacing="5">
+	          <tr>
+              <th scope="row"> <?php _e('identity') ?> </th>
+              <td>
+                <label for="me">
+                <input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> />
+          <?php _e('another web address of mine') ?></label>
+              </td>
+            </tr>
+            <tr>
+              <th scope="row"> <?php _e('friendship') ?> </th>
+              <td>
+			    <label for="contact">
+                <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php _e('contact') ?></label>
+                <label for="acquaintance">
+                <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance', 'radio'); ?> />  <?php _e('acquaintance') ?></label>
+                <label id="friend">
+                <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php _e('friend') ?></label>
+                <label for="friendship">
+                <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php _e('none') ?></label>
+              </td>
+            </tr>
+            <tr>
+              <th scope="row"> <?php _e('physical') ?> </th>
+              <td>
+                <label for="met">
+                <input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />
+          <?php _e('met') ?></label>
+              </td>
+            </tr>
+            <tr>
+              <th scope="row"> <?php _e('professional') ?> </th>
+              <td>
+                <label for="co-worker">
+                <input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> />
+          <?php _e('co-worker') ?></label>
+                <label for="colleague">
+                <input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> />
+          <?php _e('colleague') ?></label>
+              </td>
+            </tr>
+            <tr>
+              <th scope="row"> <?php _e('geographical') ?> </th>
+              <td>
+                <label for="co-resident">
+                <input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident', 'radio'); ?> />
+          <?php _e('co-resident') ?></label>
+                <label for="neighbor">
+                <input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check('geographical', 'neighbor', 'radio'); ?> />
+          <?php _e('neighbor') ?></label>
+                <label for="geographical">
+                <input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical', '', 'radio'); ?> />
+          <?php _e('none') ?></label>
+              </td>
+            </tr>
+            <tr>
+              <th scope="row"> <?php _e('family'); ?> </th>
+              <td>
+                <label for="child">
+                <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child', 'radio'); ?>  />
+          <?php _e('child') ?></label>
+                <label for="kin">
+                <input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin', 'radio'); ?>  />
+          <?php _e('kin') ?></label>
+                <label for="parent">
+                <input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent', 'radio'); ?> />
+          <?php _e('parent') ?></label>
+                <label for="sibling">
+                <input class="valinp" type="radio" name="family" value="sibling" id="sibling" <?php xfn_check('family', 'sibling', 'radio'); ?> />
+          <?php _e('sibling') ?></label>
+                <label for="spouse">
+                <input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check('family', 'spouse', 'radio'); ?> />
+          <?php _e('spouse') ?></label>
+                <label for="family">
+                <input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family', '', 'radio'); ?> />
+          <?php _e('none') ?></label>
+              </td>
+            </tr>
+            <tr>
+              <th scope="row"> <?php _e('romantic') ?> </th>
+              <td>
+                <label for="muse">
+                <input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> />
+         <?php _e('muse') ?></label>
+                <label for="crush">
+                <input class="valinp" type="checkbox" name="romantic" value="crush" id="crush" <?php xfn_check('romantic', 'crush'); ?> />
+         <?php _e('crush') ?></label>
+                <label for="date">
+                <input class="valinp" type="checkbox" name="romantic" value="date" id="date" <?php xfn_check('romantic', 'date'); ?> />
+         <?php _e('date') ?></label>
+                <label for="romantic">
+                <input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> />
+         <?php _e('sweetheart') ?></label>
+              </td>
+            </tr>
+        </table>
+		  </td>
+           	</tr>
+</table>
+</fieldset>
+       <p class="submit">
+         <input type="submit" name="submit" value="<?php _e('Add Link &raquo;') ?>" /> 
+       </p>
+<fieldset class="options">
+	<legend><?php _e('Advanced') ?></legend>
+        <table class="editform" width="100%" cellspacing="2" cellpadding="5">
+         <tr>
+           <th width="33%" scope="row"><?php _e('Image URI:') ?></th>
+           <td width="67%"><input type="text" name="image" size="50" value="" style="width: 95%" /></td>
+         </tr>
+<tr>
+           <th scope="row"><?php _e('RSS URI:') ?> </th>
+           <td><input name="rss_uri" type="text" id="rss_uri" value="" size="50" style="width: 95%" /></td>
+         </tr>
+         <tr>
+           <th scope="row"><?php _e('Notes:') ?></th>
+           <td><textarea name="notes" cols="50" rows="10" style="width: 95%"></textarea></td>
+         </tr>
+         <tr>
+           <th scope="row"><?php _e('Rating:') ?></th>
+           <td><select name="rating" size="1">
+             <?php
+    for ($r = 0; $r < 10; $r++) {
+      echo('            <option value="'.$r.'">'.$r.'</option>');
+    }
 ?>
+           </select>
+           &nbsp;<?php _e('(Leave at 0 for no rating.)') ?> </td>
+         </tr>
+         <tr>
+           <th scope="row"><?php _e('Target') ?></th>
+           <td><label>
+             <input type="radio" name="target" value="_blank" />
+             <code>_blank</code></label>
+<br />
+<label><input type="radio" name="target" value="_top" />
+<code>_top</code></label>
+<br />
+<label><input type="radio" name="target" value="" checked="checked" />
+<?php _e('none') ?></label>
+<?php _e('(Note that the <code>target</code> attribute is illegal in XHTML 1.1 and 1.0 Strict.)') ?></td>
+         </tr>
+         <tr>
+           <th scope="row"><?php _e('Visible:') ?></th>
+           <td><label>
+             <input type="radio" name="visible" checked="checked" value="Y" />
+<?php _e('Yes') ?></label><br />
+<label><input type="radio" name="visible" value="N" /> <input type="hidden" name="action" value="Add" /> 
+<?php _e('No') ?></label></td>
+         </tr>
+</table>
+</fieldset>

-<div id="wp-link-bookmarklet"  class="wrap">
-<h3><?php _e('Add Link Bookmarklet'); ?></h3>
-<p><?php _e('Right click on the following link and choose &#0147;Bookmark This Link...&#0148; or &#0147;Add to Favorites...&#0148; to create a Link This shortcut.'); ?></p>
-<?php printf('<p><a href="%s" title="'.__('Link add bookmarklet').'">'.__('Link This').'</a></p>', "javascript:void(linkmanpopup=window.open('" . get_option('siteurl') . "/wp-admin/link-add.php?action=popup&amp;linkurl='+escape(location.href)+'&amp;name='+escape(document.title),'LinkManager','scrollbars=yes,width=750,height=550,left=15,top=15,status=yes,resizable=yes'));linkmanpopup.focus();window.focus();linkmanpopup.focus();") ?>
+       <p class="submit">
+         <input type="submit" name="submit" value="<?php _e('Add Link &raquo;') ?>" /> 
+       </p>
+  </form>
+</div>
+
+<div class="wrap">
+<?php printf(__('<p>You can drag <a href="%s" title="Link add bookmarklet">Link This</a> to your toolbar and when you click it a window will pop up that will allow you to add whatever site you&#8217;re on to your links! Right now this only works on Mozilla or Netscape, but we&#8217;re working on it.</p>'), "javascript:void(linkmanpopup=window.open('" . get_settings('siteurl') . "/wp-admin/link-add.php?action=popup&amp;linkurl='+escape(location.href)+'&amp;name='+escape(document.title),'LinkManager','scrollbars=yes,width=750,height=550,left=15,top=15,status=yes,resizable=yes'));linkmanpopup.focus();window.focus();linkmanpopup.focus();") ?>
 </div>

 <?php
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ryan	bc050faba8	Backport from Mark J. git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@3642 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2006-03-14 06:12:59 +00:00
ryan	814aaddaaa	Version bump git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@3628 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2006-03-07 01:52:01 +00:00
ryan	0aa07547e2	Security back ports from masquerade and MarkJaquith. git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@3627 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2006-03-07 01:47:45 +00:00
dougal	658b7540d5	Fix user cookie verification. git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@3304 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-12-13 21:32:46 +00:00
matt	71a8451159	Typos and more secure unsetting. git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2783 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-08-15 03:57:54 +00:00
matt	43f3ec3827	Fixes #1282 git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2781 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-08-14 18:21:38 +00:00
matt	626c316ed1	Fixes #967 , Fixes #972 , Fixes #1578 , Fixes #1580 , Fixes #1567 , Fixes #1481 , Fixes #1186 git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2780 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-08-14 18:06:02 +00:00
matt	ec02dedc48	Move above git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2779 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-08-12 07:09:09 +00:00
matt	16db18f5f6	Re fixes #1541 git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2778 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-08-12 07:07:52 +00:00
matt	d5c9f3e85c	Fixes #1575 git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2777 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-08-12 07:03:13 +00:00
matt	90c4ec0c9d	Missing translation git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2773 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-08-10 06:48:12 +00:00
matt	d707353a40	Backport from 1.6 git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2771 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-08-09 20:14:58 +00:00
ryan	38dc5dd279	Another attempt to fix xmlrpc category handling for ecto. git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2690 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-07-03 01:03:13 +00:00
ryan	a5475b1b3e	Use default_category option instead of now defunct post_default_category. git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2681 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-06-30 18:44:14 +00:00
ryan	b5a9432efc	Fix ping status check. git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2679 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-06-30 16:05:39 +00:00
ryan	6251f851df	Attempt to fix extra default category bug. git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2678 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-06-30 00:53:44 +00:00
ryan	ea9c93a64c	Don't escape image bits. git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2677 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-06-30 00:12:58 +00:00
ryan	9097e32aa5	Don't escape objects git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2673 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-06-29 16:37:37 +00:00
matt	bcb43dd535	Okay now. git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2672 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-06-29 06:23:24 +00:00
ryan	e2a2039164	Oops. Remove some unwanted 1.6-isms. git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2670 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-06-28 23:39:07 +00:00
ryan	4e88e96128	Bumpity-bump-bump git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2669 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-06-28 22:18:02 +00:00
ryan	aadbabc73e	Escape XMLRPC args. git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2667 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-06-28 22:16:08 +00:00
ryan	f518948ccf	Int-ify IDs. git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2666 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-06-28 05:29:25 +00:00
ryan	26ed4e2a86	Init message before concat. git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2661 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-06-26 16:27:37 +00:00
ryan	3ce18b9a3c	1.5 branch git-svn-id: http://svn.automattic.com/wordpress/branches/1.5@2660 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-06-26 16:26:05 +00:00
ryan	dea69baaef	Tagging WordPress 1.5.1.2 git-svn-id: http://svn.automattic.com/wordpress/tags/1.5.1.2@2621 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2005-06-07 02:47:59 +00:00